diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..ab315e1 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "i18n-ally.localesPaths": ["src/lib/i18n", "src/lib/locales"] +} diff --git a/package.json b/package.json index e73ee10..42341cc 100644 --- a/package.json +++ b/package.json @@ -41,9 +41,10 @@ "type": "module", "dependencies": { "@fontsource/libre-franklin": "^5.0.17", + "@sveltestrap/sveltestrap": "^6.2.7", "bootstrap": "^5.3.3", "date-fns": "^3.5.0", "svelte-i18n": "^4.0.0", - "sveltestrap": "^5.11.3" + "svelte-preprocess": "^6.0.3" } } diff --git a/patches/@sveltejs+kit+2.5.4.patch b/patches/@sveltejs+kit+2.13.0+001+initial.patch similarity index 50% rename from patches/@sveltejs+kit+2.5.4.patch rename to patches/@sveltejs+kit+2.13.0+001+initial.patch index 5a4eb0b..0a1083b 100644 --- a/patches/@sveltejs+kit+2.5.4.patch +++ b/patches/@sveltejs+kit+2.13.0+001+initial.patch @@ -1,13 +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 e80fb78..4536af4 100644 +index ad519c9..44d7d66 100644 --- a/node_modules/@sveltejs/kit/src/exports/vite/index.js +++ b/node_modules/@sveltejs/kit/src/exports/vite/index.js -@@ -637,7 +637,7 @@ async function kit({ svelte_config }) { +@@ -644,9 +644,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}`, +- 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 - }, + sourcemapIgnoreList, + manualChunks: diff --git a/src/lib/style/app.scss b/src/lib/style/app.scss index 4953b3b..c2daa81 100644 --- a/src/lib/style/app.scss +++ b/src/lib/style/app.scss @@ -1,6 +1,6 @@ -@import '../node_modules/bootstrap/scss/functions'; -@import '../node_modules/bootstrap/scss/variables'; -@import '../node_modules/bootstrap/scss/variables-dark'; +@import 'bootstrap/scss/functions'; +@import 'bootstrap/scss/variables'; +@import 'bootstrap/scss/variables-dark'; @import '@fontsource/libre-franklin'; @@ -30,31 +30,31 @@ $input-font-size-sm: $font-size-base * 0.875; // $border-radius: .675rem; -@import '../node_modules/bootstrap/scss/mixins'; -@import '../node_modules/bootstrap/scss/maps'; -@import '../node_modules/bootstrap/scss/utilities'; +@import 'bootstrap/scss/mixins'; +@import 'bootstrap/scss/maps'; +@import 'bootstrap/scss/utilities'; -@import '../node_modules/bootstrap/scss/root'; -@import '../node_modules/bootstrap/scss/reboot'; -@import '../node_modules/bootstrap/scss/type'; -@import '../node_modules/bootstrap/scss/containers'; -@import '../node_modules/bootstrap/scss/grid'; -@import '../node_modules/bootstrap/scss/forms'; -@import '../node_modules/bootstrap/scss/buttons'; -@import '../node_modules/bootstrap/scss/button-group'; -@import '../node_modules/bootstrap/scss/pagination'; +@import 'bootstrap/scss/root'; +@import 'bootstrap/scss/reboot'; +@import 'bootstrap/scss/type'; +@import 'bootstrap/scss/containers'; +@import 'bootstrap/scss/grid'; +@import 'bootstrap/scss/forms'; +@import 'bootstrap/scss/buttons'; +@import 'bootstrap/scss/button-group'; +@import 'bootstrap/scss/pagination'; -@import '../node_modules/bootstrap/scss/dropdown'; +@import 'bootstrap/scss/dropdown'; -@import '../node_modules/bootstrap/scss/navbar'; -@import '../node_modules/bootstrap/scss/nav'; -@import '../node_modules/bootstrap/scss/card'; -@import '../node_modules/bootstrap/scss/progress'; -@import '../node_modules/bootstrap/scss/tooltip'; -@import '../node_modules/bootstrap/scss/toasts'; +@import 'bootstrap/scss/navbar'; +@import 'bootstrap/scss/nav'; +@import 'bootstrap/scss/card'; +@import 'bootstrap/scss/progress'; +@import 'bootstrap/scss/tooltip'; +@import 'bootstrap/scss/toasts'; -@import '../node_modules/bootstrap/scss/helpers'; -@import '../node_modules/bootstrap/scss/utilities/api'; +@import 'bootstrap/scss/helpers'; +@import 'bootstrap/scss/utilities/api'; @include media-breakpoint-down(xl) { html { diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte index 7768e5c..c8e73f2 100644 --- a/src/routes/+layout.svelte +++ b/src/routes/+layout.svelte @@ -10,7 +10,7 @@ NavLink, Navbar, NavbarBrand - } from 'sveltestrap'; + } from '@sveltestrap/sveltestrap'; import { page } from '$app/stores'; import { locale, locales, isLoading } from 'svelte-i18n'; diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte index 872ed6c..6ebed18 100644 --- a/src/routes/+page.svelte +++ b/src/routes/+page.svelte @@ -1,7 +1,7 @@