From 2265d603612676318f73967386ee284947c34591 Mon Sep 17 00:00:00 2001 From: OrigamingWasTaken <74014262+OrigamingWasTaken@users.noreply.github.com> Date: Mon, 28 Oct 2024 18:58:55 +0100 Subject: [PATCH] Fix update popup and DiscordRPC on x64 versions of the app --- bun.lockb | Bin 170736 -> 172748 bytes .../src/windows/main/components/Link.svelte | 15 ------- .../windows/main/components/Updater.svelte | 17 +++----- .../main/components/markdown-viewer.svelte | 39 ++++++++++++++++++ package.json | 10 +++-- tailwind.config.js | 3 ++ 6 files changed, 54 insertions(+), 30 deletions(-) delete mode 100644 frontend/src/windows/main/components/Link.svelte create mode 100644 frontend/src/windows/main/components/markdown-viewer.svelte diff --git a/bun.lockb b/bun.lockb index 7c42e27148ca194060f16e46286787b2e8d4a9c6..e42b906e7d5a5a7ff5c0217bc275a0d6114795a3 100755 GIT binary patch delta 31214 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 (CtN3o(Y%_Py_Uw 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 delta 30015 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

50j}6kr-K9hd=(LY~pU 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 z - import { os } from '@neutralinojs/lib'; - - export const href = ''; - export const title = undefined; - - - { - e.preventDefault(); - os.open(href); - }} - {title}> diff --git a/frontend/src/windows/main/components/Updater.svelte b/frontend/src/windows/main/components/Updater.svelte index cc721e2..c21711e 100644 --- a/frontend/src/windows/main/components/Updater.svelte +++ b/frontend/src/windows/main/components/Updater.svelte @@ -3,13 +3,12 @@ import { Button } from '$lib/components/ui/button/index.js'; import { os } from '@neutralinojs/lib'; import compare from 'semver-compare'; - import SvelteMarkdown from 'svelte-markdown'; import { toast } from 'svelte-sonner'; import { version } from '../../../../../package.json'; import { shell } from '../ts/tools/shell'; import { curlGet } from '../ts/utils'; - import Link from './Link.svelte'; import { loadSettings, saveSettings } from './settings'; + import MarkdownViewer from './markdown-viewer.svelte'; let showUpdatePopup = false; let updateVersion = version; @@ -60,16 +59,12 @@ } - - + + - A new release is available (v{updateVersion}) - -
')} - options={{ gfm: true, breaks: true }} - renderers={{ link: Link }} - /> + +

A new release is available (v{updateVersion})

+ diff --git a/frontend/src/windows/main/components/markdown-viewer.svelte b/frontend/src/windows/main/components/markdown-viewer.svelte new file mode 100644 index 0000000..cfe1265 --- /dev/null +++ b/frontend/src/windows/main/components/markdown-viewer.svelte @@ -0,0 +1,39 @@ + + + + + diff --git a/package.json b/package.json index e13707d..f7c9bfb 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "appleblox", - "version": "0.8.0-dev.15", + "version": "0.8.1", "description": "Lightweight and fast Roblox launcher for MacOS", "main": "frontend/src/windows/main/main.ts", "scripts": { @@ -25,6 +25,7 @@ "@neutralinojs/neu": "^10.1.0", "@sveltejs/vite-plugin-svelte": "^3.0.2", "@tsconfig/svelte": "^5.0.2", + "@types/dompurify": "^3.0.5", "@types/path-browserify": "^1.0.2", "@types/semver-compare": "^1.0.3", "@types/signale": "^1.4.7", @@ -48,17 +49,19 @@ }, "dependencies": { "@neutralinojs/lib": "^5.1.0", + "@tailwindcss/typography": "^0.5.15", "@types/bun": "^1.1.9", "bits-ui": "^0.21.16", "clsx": "^2.1.1", "cmdk-sv": "^0.0.18", + "dompurify": "^3.1.7", "hotkeys-js": "^3.13.7", "json-beautify": "^1.1.1", "lucide-svelte": "^0.453.0", + "marked": "^14.1.3", "mode-watcher": "^0.3.1", "path-browserify": "^1.0.1", "semver-compare": "^1.0.0", - "svelte-markdown": "^0.4.1", "svelte-sonner": "^0.3.21", "tailwind-merge": "^2.5.2", "tailwind-variants": "^0.2.1" @@ -68,7 +71,6 @@ "core-js", "es5-ext", "esbuild", - "svelte-preprocess", - "utf-8-validate" + "svelte-preprocess" ] } diff --git a/tailwind.config.js b/tailwind.config.js index e56a1d3..4df7fe1 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -5,6 +5,9 @@ const config = { darkMode: ['class'], content: ['./frontend/src/**/*.{html,js,svelte,ts}'], safelist: ['dark'], + plugins: [ + require('@tailwindcss/typography'), + ], theme: { container: { center: true,