From 6d3b6584b7cfdb9c7cab0a38a5431cf020d8b97d Mon Sep 17 00:00:00 2001 From: Djuri Baars Date: Fri, 29 Nov 2024 00:10:33 +0100 Subject: [PATCH] Dependency updates and small fixes --- patches/@sveltejs+kit+2.8.5.patch | 17 +++++++++++++++++ src/components/ColorSchemeSwitcher.svelte | 2 +- src/icons/EyeIcon.svelte | 13 ------------- src/icons/EyeSlashIcon.svelte | 18 ------------------ src/routes/+layout.svelte | 2 +- src/routes/Settings.svelte | 6 ++++-- svelte.config.js | 4 ++-- yarn.lock | 21 +++++++-------------- 8 files changed, 32 insertions(+), 51 deletions(-) create mode 100644 patches/@sveltejs+kit+2.8.5.patch delete mode 100644 src/icons/EyeIcon.svelte delete mode 100644 src/icons/EyeSlashIcon.svelte diff --git a/patches/@sveltejs+kit+2.8.5.patch b/patches/@sveltejs+kit+2.8.5.patch new file mode 100644 index 0000000..80f5dba --- /dev/null +++ b/patches/@sveltejs+kit+2.8.5.patch @@ -0,0 +1,17 @@ +diff --git a/node_modules/@sveltejs/kit/src/exports/vite/index.js b/node_modules/@sveltejs/kit/src/exports/vite/index.js +index e6521e9..f31c28b 100644 +--- a/node_modules/@sveltejs/kit/src/exports/vite/index.js ++++ b/node_modules/@sveltejs/kit/src/exports/vite/index.js +@@ -639,9 +639,9 @@ async function kit({ svelte_config }) { + input, + output: { + format: 'esm', +- entryFileNames: ssr ? '[name].js' : `${prefix}/[name].[hash].${ext}`, +- chunkFileNames: ssr ? 'chunks/[name].js' : `${prefix}/chunks/[name].[hash].${ext}`, +- assetFileNames: `${prefix}/assets/[name].[hash][extname]`, ++ entryFileNames: ssr ? '[name].js' : `${prefix}/[hash].${ext}`, ++ chunkFileNames: ssr ? 'chunks/[name].js' : `${prefix}/chunks/[hash].${ext}`, ++ assetFileNames: `${prefix}/assets/[hash][extname]`, + hoistTransitiveImports: false, + sourcemapIgnoreList + }, diff --git a/src/components/ColorSchemeSwitcher.svelte b/src/components/ColorSchemeSwitcher.svelte index 49e3175..9d7e32a 100644 --- a/src/components/ColorSchemeSwitcher.svelte +++ b/src/components/ColorSchemeSwitcher.svelte @@ -39,7 +39,7 @@ }); - + {theme === 'auto' ? '🌗' : theme === 'dark' ? '🌙' : '☀️'} diff --git a/src/icons/EyeIcon.svelte b/src/icons/EyeIcon.svelte deleted file mode 100644 index dd7513a..0000000 --- a/src/icons/EyeIcon.svelte +++ /dev/null @@ -1,13 +0,0 @@ - - - - diff --git a/src/icons/EyeSlashIcon.svelte b/src/icons/EyeSlashIcon.svelte deleted file mode 100644 index bf45888..0000000 --- a/src/icons/EyeSlashIcon.svelte +++ /dev/null @@ -1,18 +0,0 @@ - - - - - diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte index 494ab86..0faad53 100644 --- a/src/routes/+layout.svelte +++ b/src/routes/+layout.svelte @@ -78,7 +78,7 @@ {#if !$isLoading} - + {getFlagEmoji($locale)} {languageNames[$locale]} {#each $locales as locale} diff --git a/src/routes/Settings.svelte b/src/routes/Settings.svelte index dbaf3b1..14c5fb7 100644 --- a/src/routes/Settings.svelte +++ b/src/routes/Settings.svelte @@ -21,8 +21,10 @@ Tooltip, Row } from '@sveltestrap/sveltestrap'; - import EyeIcon from '../icons/EyeIcon.svelte'; - import EyeSlashIcon from '../icons/EyeSlashIcon.svelte'; + + import EyeIcon from 'svelte-bootstrap-icons/lib/Eye.svelte'; + import EyeSlashIcon from 'svelte-bootstrap-icons/lib/EyeSlash.svelte'; + import { derived } from 'svelte/store'; import ToggleHeader from '../components/ToggleHeader.svelte'; diff --git a/svelte.config.js b/svelte.config.js index 4088002..2ec510a 100644 --- a/svelte.config.js +++ b/svelte.config.js @@ -1,11 +1,11 @@ import adapter from '@sveltejs/adapter-static'; -import preprocess from 'svelte-preprocess'; +import { sveltePreprocess } from 'svelte-preprocess' /** @type {import('@sveltejs/kit').Config} */ const config = { // Consult https://kit.svelte.dev/docs/integrations#preprocessors // for more information about preprocessors - preprocess: preprocess({}), + preprocess: sveltePreprocess({}), build: { rollupOptions: { output: { diff --git a/yarn.lock b/yarn.lock index 9773fce..dd85206 100644 --- a/yarn.lock +++ b/yarn.lock @@ -887,9 +887,9 @@ integrity sha512-MGJcesnJWj7FxDcB/GbrdYD3q24Uk0PIL4QIX149ku+hlJuj//nxUbb0HxUTpjkecWfHjVveSUnUaQWnPRXlpg== "@sveltejs/kit@^2.0.0": - version "2.7.5" - resolved "https://registry.yarnpkg.com/@sveltejs/kit/-/kit-2.7.5.tgz#234ffbb4a0b7df9146807992849e9f0fedc2b94d" - integrity sha512-8WIrVch2Ze2Rq3eIMPTqIIRFPM2zGQcGKHim2z43KVRdgdtYWBugAQ7nemH9ATnzlvbgztk6hwhEZOi8A8ZOPg== + version "2.8.5" + resolved "https://registry.yarnpkg.com/@sveltejs/kit/-/kit-2.8.5.tgz#6eb3617547619cf38b19fb2e00da6aa00d0a44c8" + integrity sha512-5ry1jPd4r9knsphDK2eTYUFPhFZMqF0PHFfa8MdMQCqWaKwLSXdFMU/Vevih1I7C1/VNB5MvTuFl1kXu5vx8UA== dependencies: "@types/cookie" "^0.6.0" cookie "^0.6.0" @@ -1779,9 +1779,9 @@ eslint@^9.11.0: optionator "^0.9.3" esm-env@^1.0.0: - version "1.1.4" - resolved "https://registry.yarnpkg.com/esm-env/-/esm-env-1.1.4.tgz#340c78b03ee2298d31c5b9fab9793468ede828b0" - integrity sha512-oO82nKPHKkzIj/hbtuDYy/JHqBHFlMIW36SDiPCVsj87ntDLcWN+sJ1erdVryd4NxODacFTsdrIE3b7IamqbOg== + version "1.2.0" + resolved "https://registry.yarnpkg.com/esm-env/-/esm-env-1.2.0.tgz#637c0586244c0eb14bfd7f5e96a6b43b9e8f5c2b" + integrity sha512-OhSQuHL3mUcaQHjGe8UMG8GsJIJHYYz0flR0h9fiTPNMupLMkb7TvcRD0EeJXW5a8GHBgfz08b6FDLNK7kkPQA== esniff@^2.0.1: version "2.0.1" @@ -2397,20 +2397,13 @@ magic-string@^0.30.10, magic-string@^0.30.4: dependencies: "@jridgewell/sourcemap-codec" "^1.5.0" -magic-string@^0.30.12: +magic-string@^0.30.12, magic-string@^0.30.5: version "0.30.14" resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.30.14.tgz#e9bb29870b81cfc1ec3cc656552f5a7fcbf19077" integrity sha512-5c99P1WKTed11ZC0HMJOj6CDIue6F8ySu+bJL+85q1zBEIY8IklrJ1eiKC2NDRh3Ct3FcvmJPyQHb9erXMTJNw== dependencies: "@jridgewell/sourcemap-codec" "^1.5.0" -magic-string@^0.30.5: - version "0.30.12" - resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.30.12.tgz#9eb11c9d072b9bcb4940a5b2c2e1a217e4ee1a60" - integrity sha512-Ea8I3sQMVXr8JhN4z+H/d8zwo+tYDgHE9+5G4Wnrwhs0gaK9fXTKx0Tw5Xwsd/bCPTTZNRAdpyzvoeORe9LYpw== - dependencies: - "@jridgewell/sourcemap-codec" "^1.5.0" - mdn-data@2.0.30: version "2.0.30" resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.30.tgz#ce4df6f80af6cfbe218ecd5c552ba13c4dfa08cc"