chore: update to SvelteKit 2 (#831)

* chore: update deps * chore: migrate
sveltejs · Dec 26, 2023 · 833d66c · 833d66c
1 parent 4a8d590
commit 833d66c
Show file tree

Hide file tree

Showing 10 changed files with 479 additions and 741 deletions.
diff --git a/package.json b/package.json
@@ -25,7 +25,7 @@
     "@changesets/cli": "^2.27.1",
     "@svitejs/changesets-changelog-github-compact": "^1.1.0",
     "@types/fs-extra": "^11.0.4",
-    "@types/node": "^18.19.3",
+    "@types/node": "^20.10.5",
     "@typescript-eslint/eslint-plugin": "^6.16.0",
     "@typescript-eslint/parser": "^6.16.0",
     "cross-env": "^7.0.3",
@@ -66,11 +66,11 @@
   },
   "pnpm": {
     "overrides": {
+      "@sveltejs/kit>@sveltejs/vite-plugin-svelte": "^3.0.0",
       "@sveltejs/vite-plugin-svelte": "workspace:^",
       "@sveltejs/vite-plugin-svelte-inspector": "workspace:^",
       "svelte": "$svelte",
-      "vite": "$vite",
-      "@adobe/css-tools@<4.3.1": "^4.3.1"
+      "vite": "$vite"
     }
   }
 }
diff --git a/packages/e2e-tests/_test_dependencies/svelte-hybrid/package.json b/packages/e2e-tests/_test_dependencies/svelte-hybrid/package.json
@@ -18,7 +18,7 @@
     }
   },
   "dependencies": {
-    "@types/node": "^18.19.3",
+    "@types/node": "^20.10.5",
     "e2e-test-dep-cjs-only": "file:../cjs-only"
   },
   "type": "module"

diff --git a/packages/e2e-tests/inspector-kit/package.json b/packages/e2e-tests/inspector-kit/package.json
@@ -8,7 +8,8 @@
     "preview": "vite preview"
   },
   "devDependencies": {
-    "@sveltejs/kit": "^1.30.3",
+    "@sveltejs/kit": "^2.0.6",
+    "@sveltejs/vite-plugin-svelte": "workspace:^",
     "svelte": "^4.2.8",
     "vite": "^5.0.10"
   },

diff --git a/packages/e2e-tests/kit-node/package.json b/packages/e2e-tests/kit-node/package.json
@@ -11,9 +11,10 @@
     "package": "svelte-package && echo just here for testing, don't remove svelte-package!"
   },
   "devDependencies": {
-    "@sveltejs/adapter-node": "^1.3.1",
-    "@sveltejs/kit": "^1.30.3",
+    "@sveltejs/adapter-node": "^2.0.2",
+    "@sveltejs/kit": "^2.0.6",
     "@sveltejs/package": "^2.2.4",
+    "@sveltejs/vite-plugin-svelte": "workspace:^",
     "e2e-test-dep-svelte-api-only": "file:../_test_dependencies/svelte-api-only",
     "e2e-test-dep-vite-plugins": "file:../_test_dependencies/vite-plugins",
     "svelte": "^4.2.8",

diff --git a/packages/e2e-tests/ts-type-import/package.json b/packages/e2e-tests/ts-type-import/package.json
@@ -10,7 +10,7 @@
   "devDependencies": {
     "@sveltejs/vite-plugin-svelte": "workspace:^",
     "@tsconfig/svelte": "^5.0.2",
-    "@types/node": "^18.19.3",
+    "@types/node": "^20.10.5",
     "svelte": "^4.2.8",
     "svelte-preprocess": "^5.1.3",
     "vite": "^5.0.10"

diff --git a/packages/playground/big-component-library-kit/package.json b/packages/playground/big-component-library-kit/package.json
@@ -10,8 +10,9 @@
     "check:watch": "svelte-kit sync && svelte-check --tsconfig ./jsconfig.json --watch"
   },
   "devDependencies": {
-    "@sveltejs/adapter-auto": "2.1.1",
-    "@sveltejs/kit": "^1.30.3",
+    "@sveltejs/adapter-auto": "3.0.1",
+    "@sveltejs/kit": "^2.0.6",
+    "@sveltejs/vite-plugin-svelte": "workspace:^",
     "carbon-components-svelte": "^0.82.7",
     "carbon-icons-svelte": "^12.4.2",
     "carbon-preprocess-svelte": "^0.10.0",

diff --git a/packages/playground/kit-demo-app/package.json b/packages/playground/kit-demo-app/package.json
@@ -12,8 +12,9 @@
   "devDependencies": {
     "@fontsource/fira-mono": "^5.0.8",
     "@neoconfetti/svelte": "^2.2.1",
-    "@sveltejs/adapter-auto": "^2.1.1",
-    "@sveltejs/kit": "^1.30.3",
+    "@sveltejs/adapter-auto": "^3.0.1",
+    "@sveltejs/kit": "^2.0.6",
+    "@sveltejs/vite-plugin-svelte": "workspace:^",
     "@types/cookie": "^0.6.0",
     "svelte": "^4.2.8",
     "svelte-check": "^3.6.2",

diff --git a/packages/playground/kit-demo-app/src/routes/sverdle/+page.server.js b/packages/playground/kit-demo-app/src/routes/sverdle/+page.server.js
@@ -1,4 +1,4 @@
-import { invalid } from '@sveltejs/kit';
+import { fail } from '@sveltejs/kit';
 import { words, allowed } from './words.server';
 
 /** @type {import('./$types').PageServerLoad} */
@@ -44,7 +44,7 @@ export const actions = {
 			game.guesses[i] += key;
 		}
 
-		cookies.set('sverdle', game.toString());
+		cookies.set('sverdle', game.toString(), { path: '/' });
 	},
 
 	/**
@@ -58,14 +58,14 @@ export const actions = {
 		const guess = /** @type {string[]} */ (data.getAll('guess'));
 
 		if (!game.enter(guess)) {
-			return invalid(400, { badGuess: true });
+			return fail(400, { badGuess: true });
 		}
 
-		cookies.set('sverdle', game.toString());
+		cookies.set('sverdle', game.toString(), { path: '/' });
 	},
 
 	restart: async ({ cookies }) => {
-		cookies.delete('sverdle');
+		cookies.delete('sverdle', { path: '/' });
 	}
 };
 

diff --git a/packages/vite-plugin-svelte/package.json b/packages/vite-plugin-svelte/package.json
@@ -41,7 +41,7 @@
   },
   "homepage": "https://github.com/sveltejs/vite-plugin-svelte#readme",
   "dependencies": {
-    "@sveltejs/vite-plugin-svelte-inspector": "^2.0.0-next.0 || ^2.0.0",
+    "@sveltejs/vite-plugin-svelte-inspector": "workspace:^",
     "debug": "^4.3.4",
     "deepmerge": "^4.3.1",
     "kleur": "^4.1.5",