chore: upgrade SvelteKit to latest version

Due to a bug in Vite, we had to replace our dynamic import inside a group. See vitejs/vite#11824 (comment)
Devessier · May 13, 2023 · 8e7eb82 · 8e7eb82
1 parent 7c6b9c3
commit 8e7eb82
Show file tree

Hide file tree

Showing 10 changed files with 2,957 additions and 2,739 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -16,14 +16,14 @@
 	"devDependencies": {
 		"@commitlint/cli": "^16.2.3",
 		"@commitlint/config-conventional": "^16.2.1",
-		"@sveltejs/adapter-static": "next",
-		"@sveltejs/kit": "next",
+		"@sveltejs/adapter-static": "^2.0.2",
+		"@sveltejs/kit": "^1.5.0",
 		"@tailwindcss/typography": "^0.5.0",
 		"@types/react": "^18.0.5",
 		"@typescript-eslint/eslint-plugin": "^5.27.0",
 		"@typescript-eslint/parser": "^5.27.0",
 		"@xstate/react": "^3.0.0",
-		"autoprefixer": "^10.4.7",
+		"autoprefixer": "^10.4.14",
 		"eslint": "^8.16.0",
 		"eslint-config-prettier": "^8.3.0",
 		"eslint-plugin-svelte3": "^4.0.0",
@@ -33,7 +33,7 @@
 		"lint-staged": "^11.1.2",
 		"mdsvex": "^0.10.6",
 		"outdent": "^0.8.0",
-		"postcss": "^8.4.14",
+		"postcss": "^8.4.23",
 		"postcss-load-config": "^4.0.1",
 		"prettier": "^2.6.2",
 		"prettier-plugin-svelte": "^2.7.0",
@@ -43,13 +43,13 @@
 		"rehype-slug": "^5.0.0",
 		"shiki-twoslash": "^3.0.2",
 		"snipsync": "^1.8.0",
-		"svelte": "^3.44.0",
-		"svelte-check": "^2.7.1",
-		"svelte-preprocess": "^4.10.7",
+		"svelte": "^3.54.0",
+		"svelte-check": "^3.0.1",
+		"svelte-preprocess": "^5.0.3",
 		"tailwindcss": "^3.1.5",
-		"tslib": "^2.3.1",
-		"typescript": "^4.7.4",
-		"vite": "^3.1.0",
+		"tslib": "^2.4.1",
+		"typescript": "^5.0.0",
+		"vite": "^4.3.0",
 		"xstate": "^4.33.6"
 	},
 	"dependencies": {

diff --git a/src/routes/(portfolio)/+layout.ts b/src/routes/(portfolio)/+layout.ts
diff --git a/src/routes/(portfolio)/note/[slug]/+page.ts b/src/routes/(portfolio)/note/[slug]/+page.ts
@@ -8,13 +8,14 @@ type GetResult = {
 };
 
 export const load: PageLoad<GetResult> = async ({ params: { slug } }) => {
+	const allNotes = import.meta.glob('../*.svx');
 	const {
 		metadata: { title, datetime },
 		default: content
-	}: {
+	} = (await allNotes[`../${slug}.svx`]()) as {
 		metadata: { title: string; datetime: string };
 		default: ComponentType;
-	} = await import(`../${slug}.svx`);
+	};
 
 	return {
 		title,

diff --git a/src/routes/(portfolio)/[tag]/+page.server.ts → ...es/(portfolio)/tags/[tag]/+page.server.ts b/src/routes/(portfolio)/[tag]/+page.server.ts → ...es/(portfolio)/tags/[tag]/+page.server.ts
diff --git a/src/routes/(portfolio)/[tag]/+page.svelte → ...outes/(portfolio)/tags/[tag]/+page.svelte b/src/routes/(portfolio)/[tag]/+page.svelte → ...outes/(portfolio)/tags/[tag]/+page.svelte
diff --git a/src/routes/(portfolio)/writing/[slug]/+page.ts b/src/routes/(portfolio)/writing/[slug]/+page.ts
@@ -11,10 +11,11 @@ type GetResult = {
 };
 
 export const load: PageLoad<GetResult> = async ({ params: { slug } }) => {
+	const allWritings = import.meta.glob('../*.svx');
 	const {
 		metadata: { title, description, datetime, last_updated_datetime, tags },
 		default: content
-	}: {
+	} = (await allWritings[`../${slug}.svx`]()) as {
 		metadata: {
 			title: string;
 			description: string;
@@ -23,7 +24,7 @@ export const load: PageLoad<GetResult> = async ({ params: { slug } }) => {
 			tags: string[];
 		};
 		default: ComponentType;
-	} = await import(`../${slug}.svx`);
+	};
 
 	return {
 		title,

diff --git a/src/routes/+layout.ts b/src/routes/+layout.ts
@@ -0,0 +1,2 @@
+export const trailingSlash = 'always';
+export const prerender = true;
diff --git a/src/routes/state-of-xstate/survey/+page.svelte b/src/routes/state-of-xstate/survey/+page.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import '../app.postcss';
+	import '../../../app.postcss';
 </script>
 
 <p>Hello</p>
diff --git a/svelte.config.js b/svelte.config.js
@@ -1,4 +1,5 @@
 import { mdsvex } from 'mdsvex';
+import { vitePreprocess } from '@sveltejs/kit/vite';
 import mdsvexConfig from './mdsvex.config.js';
 import adapter from '@sveltejs/adapter-static';
 import preprocess from 'svelte-preprocess';
@@ -10,6 +11,7 @@ const config = {
 	// Consult https://github.com/sveltejs/svelte-preprocess
 	// for more information about preprocessors
 	preprocess: [
+		vitePreprocess(),
 		preprocess({
 			postcss: true
 		}),
@@ -20,11 +22,8 @@ const config = {
 		adapter: adapter(),
 		prerender: {
 			crawl: true,
-			enabled: true,
-			onError: 'continue',
 			entries: ['*']
-		},
-		trailingSlash: 'always',
+		}
 	}
 };
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		export const trailingSlash = 'always';
		export const prerender = true;