fix: upgrade to sveltekit 2 and update deps

.vscode/extensions.json

@@ -38,7 +38,8 @@
 		"stylelint.vscode-stylelint",
 		"svelte.svelte-vscode",
 		"ardenivanov.svelte-intellisense",
-		"fivethree.vscode-svelte-snippets",
+		"JakobKruse.svelte-kit-snippets",
+		"pivaszbs.svelte-autoimport",
 		"Tyriar.sort-lines",
 		"VisualStudioExptTeam.vscodeintellicode",
 		"vunguyentuan.vscode-css-variables",

apps/console/package.json

@@ -28,38 +28,39 @@
 		"generate": "concurrently pnpm:generate:*"
 	},
 	"devDependencies": {
-		"@auth/core": "0.18.4",
-		"@auth/hasura-adapter": "0.2.8",
-		"@auth/sveltekit": "0.3.15",
+		"@auth/core": "0.18.6",
+		"@auth/hasura-adapter": "0.2.10",
+		"@auth/sveltekit": "0.4.0",
 		"@ethercorps/sveltekit-og": "2.0.2",
 		"@neoconfetti/svelte": "1.0.0",
 		"@neodrag/svelte": "2.0.3",
 		"@popperjs/core": "2.11.8",
 		"@skeletonlabs/skeleton": "2.6.0",
 		"@svelte-put/resize": "3.0.0",
-		"@sveltejs/adapter-auto": "2.1.1",
-		"@sveltejs/adapter-node": "1.3.1",
-		"@sveltejs/adapter-vercel": "3.1.0",
-		"@sveltejs/enhanced-img": "0.1.5",
-		"@sveltejs/kit": "1.27.7",
+		"@sveltejs/adapter-auto": "3.0.0",
+		"@sveltejs/adapter-node": "2.0.0",
+		"@sveltejs/adapter-vercel": "4.0.2",
+		"@sveltejs/enhanced-img": "0.1.6",
+		"@sveltejs/kit": "2.0.1",
+		"@sveltejs/vite-plugin-svelte": "3.0.1",
 		"@tailwindcss/container-queries": "0.1.1",
 		"@testing-library/jest-dom": "6.1.5",
 		"@testing-library/svelte": "4.0.5",
 		"@types/gtag.js": "0.0.18",
 		"@types/js-cookie": "3.0.6",
-		"@typescript-eslint/eslint-plugin": "6.13.2",
-		"@typescript-eslint/parser": "6.13.2",
+		"@typescript-eslint/eslint-plugin": "6.14.0",
+		"@typescript-eslint/parser": "6.14.0",
 		"@vercel/analytics": "1.1.1",
 		"@vite-pwa/sveltekit": "0.2.10",
-		"@vitest/coverage-v8": "0.34.6",
+		"@vitest/coverage-v8": "1.0.4",
 		"autoprefixer": "10.4.16",
 		"c8": "8.0.1",
 		"cross-fetch": "4.0.0",
-		"cssnano": "6.0.1",
+		"cssnano": "6.0.2",
 		"d3-force": "3.0.0",
 		"d3-scale": "4.0.2",
 		"date-fns": "2.30.0",
-		"eslint": "8.55.0",
+		"eslint": "8.56.0",
 		"eslint-config-custom": "workspace:*",
 		"eslint-config-prettier": "9.1.0",
 		"eslint-plugin-svelte": "2.35.1",
@@ -76,10 +77,10 @@
 		"js-cookie": "3.0.5",
 		"jsdom": "23.0.1",
 		"layercake": "8.0.2",
-		"msw": "2.0.10",
+		"msw": "2.0.11",
 		"postcss": "8.4.32",
 		"postcss-preset-env": "9.3.0",
-		"prettier": "3.1.0",
+		"prettier": "3.1.1",
 		"prettier-plugin-svelte": "3.1.2",
 		"prettier-plugin-tailwindcss": "0.5.9",
 		"svelte": "4.2.8",
@@ -89,27 +90,27 @@
 		"svelte-meta-tags": "3.1.0",
 		"svelte-select": "5.8.1",
 		"svelte-time-distance": "0.0.3",
-		"sveltekit-flash-message": "2.2.2",
+		"sveltekit-flash-message": "2.3.0",
 		"sveltekit-rate-limiter": "0.4.1",
-		"sveltekit-superforms": "1.11.0",
-		"sveltekit-view-transition": "0.5.2",
+		"sveltekit-superforms": "1.12.0",
+		"sveltekit-view-transition": "0.5.3",
 		"tailwind-config": "workspace:*",
 		"tailwind-merge": "2.1.0",
 		"tailwindcss": "3.3.6",
 		"tailwindcss-animate": "1.0.7",
 		"tslib": "2.6.2",
 		"typescript": "5.3.3",
 		"ui-flowbite": "workspace:*",
-		"vite": "4.5.1",
+		"vite": "5.0.10",
 		"vite-plugin-pwa": "0.17.4",
-		"vite-plugin-tailwind-purgecss": "0.1.4",
-		"vitest": "0.34.6",
+		"vite-plugin-tailwind-purgecss": "0.2.0",
+		"vitest": "1.0.4",
 		"workbox-window": "7.0.0",
 		"zod": "3.22.4"
 	},
 	"optionalDependencies": {
 		"@playwright/test": "1.40.1",
-		"@vitest/ui": "0.34.6"
+		"@vitest/ui": "1.0.4"
 	},
 	"dependencies": {
 		"cookie": "0.6.0"

apps/console/src/app.d.ts

@@ -1,6 +1,6 @@
 // See https://kit.svelte.dev/docs/types#app
 // for information about these interfaces
-// and what to do when importing types
+
 import { DefaultSession } from '@auth/core/types';
 declare global {
 	namespace App {
@@ -30,6 +30,7 @@ declare global {
 			session: Session | null;
 			flash?: Toast;
 		}
+		// interface PageState {}
 		// interface Platform {}
 		interface Metadata {
 			logResult?: boolean | null;

apps/console/src/lib/errors/handle.ts

@@ -8,28 +8,28 @@ import { getAppError, isAppError, isHttpError, isRedirect, ResponseError, Valida
 export function handleLoadErrors(err: unknown) {
 	// console.error(error.stack);
 	if (err instanceof NotFoundError && err.name === 'NOT_FOUND_ERROR') {
-		throw error(404, { message: err.message, context: err.toJSON() });
+		error(404, { message: err.message, context: err.toJSON() });
 	} else if (err instanceof ResponseError) {
 		switch (err.response.status) {
 			case 401:
 			case 403: {
-				throw error(err.response.status, err.response.statusText);
+				error(err.response.status, err.response.statusText);
 			}
 			case 400:
 			case 404:
 			case 405: {
-				throw error(err.response.status, err.response.statusText);
+				error(err.response.status, err.response.statusText);
 			}
 			default: {
-				throw error(err.response.status, err.response.statusText);
+				error(err.response.status, err.response.statusText);
 			}
 		}
 	} else if (isHttpError(err)) {
-		throw error(err.status, err.body);
+		error(err.status, err.body);
 	} else if (isAppError(err)) {
-		throw error(500, err);
+		error(500, err);
 	} else {
-		throw error(500, getAppError(err));
+		error(500, getAppError(err));
 	}
 }
 
@@ -47,8 +47,8 @@ export function handleActionErrors(err: unknown) {
 	} else if (isRedirect(err)) {
 		if (err.status < 310) throw err;
 	} else if (isHttpError(err)) {
-		throw error(err.status, err.body);
+		error(err.status, err.body);
 	} else {
-		throw error(500, getAppError(err));
+		error(500, getAppError(err));
 	}
 }

apps/console/src/lib/server/middleware/dead-links.ts

@@ -18,7 +18,7 @@ export const deadLinks = (async ({ event, resolve }) => {
 	const redirectTo = dead_links_redirect_to[event.url.pathname];
 	if (redirectTo) {
 		log.debug(`redirecting ${event.url.pathname} to  ${redirectTo}`);
-		throw redirect(303, `${event.url.origin}${redirectTo}`);
+		redirect(303, `${event.url.origin}${redirectTo}`);
 	}
 	return await resolve(event);
 }) satisfies Handle;

apps/console/src/lib/server/middleware/guard.ts

@@ -34,20 +34,20 @@ export const guard = (async ({ event, resolve }) => {
 
 	if (!user) {
 		// FIXME: redirect from middleware may cause recursion
-		throw redirect(303, `${origin}/auth/signin?callbackUrl=${pathname}`);
+		redirect(303, `${origin}/auth/signin?callbackUrl=${pathname}`);
 	}
 	if (expires && new Date(expires) < new Date()) {
 		log.debug('session expired at: ', expires);
-		throw redirect(303, `${origin}/auth/signout?callbackUrl=/blog`);
+		redirect(303, `${origin}/auth/signout?callbackUrl=/blog`);
 	}
 	if (startsWith(pathname, userPaths)) {
 		if (!roles?.includes('user')) {
-			throw redirect(303, `${origin}/home`);
+			redirect(303, `${origin}/home`);
 		}
 	}
 	if (startsWith(pathname, adminPaths)) {
 		if (!roles?.includes('Policy.Write')) {
-			throw redirect(303, `${origin}/dashboard`);
+			redirect(303, `${origin}/dashboard`);
 		}
 	}
 

apps/console/src/routes/(app)/dashboard/devices/+page.ts

@@ -38,6 +38,6 @@ export const load = async (event) => {
 		return { status: 500, form };
 	}
 	const items = data?.devices;
-	if (!items) throw error(404, 'devices not found');
+	if (!items) error(404, 'devices not found');
 	return { form, items };
 };

apps/console/src/routes/(app)/dashboard/devices/[id]/+page.ts

@@ -16,9 +16,9 @@ export const load = async (event) => {
 		policy: CachePolicy.NetworkOnly,
 		variables
 	});
-	if (errors) throw error(400, errors[0] as GraphQLError);
+	if (errors) error(400, errors[0] as GraphQLError);
 	const device = data?.devices_by_pk;
-	if (!device) throw error(404, 'Device not found');
+	if (!device) error(404, 'Device not found');
 	const form = await superValidate(device, schema);
 	return { form };
 };

apps/console/src/routes/(app)/dashboard/policies/+page.ts

@@ -45,6 +45,6 @@ export const load = async (event) => {
 		return { status: 500, form };
 	}
 	const items = data?.policies;
-	if (!items) throw error(404, 'policies not found');
+	if (!items) error(404, 'policies not found');
 	return { form, items };
 };

apps/console/src/routes/(app)/dashboard/policies/[id]/+page.ts

@@ -16,9 +16,9 @@ export const load = async (event) => {
 		policy: CachePolicy.CacheAndNetwork,
 		variables
 	});
-	if (errors) throw error(400, errors[0] as GraphQLError);
+	if (errors) error(400, errors[0] as GraphQLError);
 	const policy = data?.policies_by_pk;
-	if (!policy) throw error(404, 'policy not found');
+	if (!policy) error(404, 'policy not found');
 	const form = await superValidate(policy, schema);
 	// we need `originalShared` to track if `rule.shared` is changeing from false ==> true
 	form.data.originalShared = form.data.rule.shared;

apps/console/src/routes/(app)/dashboard/pools/+page.ts

@@ -38,6 +38,6 @@ export const load = async (event) => {
 		return { status: 500, form };
 	}
 	const items = data?.pools;
-	if (!items) throw error(404, 'pools not found');
+	if (!items) error(404, 'pools not found');
 	return { form, items };
 };

apps/console/src/routes/(app)/dashboard/pools/[id]/+page.ts

@@ -16,9 +16,9 @@ export const load = async (event) => {
 		policy: CachePolicy.NetworkOnly,
 		variables
 	});
-	if (errors) throw error(400, errors[0] as GraphQLError);
+	if (errors) error(400, errors[0] as GraphQLError);
 	const { pools_by_pk, devices_not_in_pool } = data ?? {};
-	if (!pools_by_pk) throw error(404, 'Pool not found');
+	if (!pools_by_pk) error(404, 'Pool not found');
 	const { displayName, description, tags, annotations, pool_devices } = pools_by_pk;
 
 	const form = await superValidate({ displayName, description, tags, annotations }, schema);

apps/console/src/routes/(app)/dashboard/rules/+page.ts

@@ -38,6 +38,6 @@ export const load = async (event) => {
 		return { status: 500, form };
 	}
 	const items = data?.rules;
-	if (!items) throw error(404, 'rules not found');
+	if (!items) error(404, 'rules not found');
 	return { form, items };
 };

apps/console/src/routes/(app)/dashboard/rules/[id]/+page.ts

@@ -16,9 +16,9 @@ export const load = async (event) => {
 		policy: CachePolicy.NetworkOnly,
 		variables
 	});
-	if (errors) throw error(400, errors[0] as GraphQLError);
+	if (errors) error(400, errors[0] as GraphQLError);
 	const rule = data?.rules_by_pk;
-	if (!rule) throw error(404, 'Rule not found');
+	if (!rule) error(404, 'Rule not found');
 	const form = await superValidate(rule, schema);
 	return { form };
 };

apps/console/src/routes/(play)/play/houdini/+page.ts

@@ -32,7 +32,7 @@ export function _houdini_beforeLoad({ url }: BeforeLoadEvent) {
 			return { formErrors, fieldErrors };
 		} else {
 			log.error('search:_houdini_beforeLoad:', err);
-			throw error(500, err as Error);
+			error(500, err as Error);
 		}
 	}
 }

apps/console/src/routes/api/demo/+server.ts

@@ -10,7 +10,7 @@ export async function GET({ url }) {
 	const d = max - min;
 
 	if (isNaN(d) || d < 0) {
-		throw error(400, { message: 'min and max must be numbers, and min must be less than max' });
+		error(400, { message: 'min and max must be numbers, and min must be less than max' });
 	}
 
 	const random = min + Math.random() * d;

apps/console/svelte.config.js

@@ -1,7 +1,7 @@
 import adapterNode from '@sveltejs/adapter-node';
 import adapterAuto from '@sveltejs/adapter-auto';
 import adapterBun from 'svelte-adapter-bun';
-import { vitePreprocess } from '@sveltejs/kit/vite';
+import { vitePreprocess } from '@sveltejs/vite-plugin-svelte';
 
 /** @type {import('@sveltejs/kit').Config} */
 const config = {

apps/console2/package.json

@@ -29,20 +29,21 @@
 		"@nhost/nhost-js": "2.2.18",
 		"@skeletonlabs/skeleton": "2.6.0",
 		"@skeletonlabs/tw-plugin": "0.3.0",
-		"@sveltejs/adapter-auto": "2.1.1",
-		"@sveltejs/adapter-node": "1.3.1",
-		"@sveltejs/adapter-vercel": "3.1.0",
-		"@sveltejs/enhanced-img": "0.1.5",
-		"@sveltejs/kit": "1.29.1",
+		"@sveltejs/adapter-auto": "3.0.0",
+		"@sveltejs/adapter-node": "2.0.0",
+		"@sveltejs/adapter-vercel": "4.0.2",
+		"@sveltejs/enhanced-img": "0.1.6",
+		"@sveltejs/kit": "2.0.1",
+		"@sveltejs/vite-plugin-svelte": "3.0.1",
 		"@tailwindcss/container-queries": "0.1.1",
 		"@tailwindcss/forms": "0.5.7",
 		"@tailwindcss/typography": "0.5.10",
 		"@types/node": "20.10.4",
 		"@typescript-eslint/eslint-plugin": "6.14.0",
 		"@typescript-eslint/parser": "6.14.0",
-		"@vitest/coverage-v8": "0.34.6",
+		"@vitest/coverage-v8": "1.0.4",
 		"autoprefixer": "10.4.16",
-		"eslint": "8.55.0",
+		"eslint": "8.56.0",
 		"eslint-config-custom": "workspace:*",
 		"eslint-config-prettier": "9.1.0",
 		"eslint-plugin-svelte": "2.35.1",
@@ -58,25 +59,25 @@
 		"svelte-check": "3.6.2",
 		"svelte-meta-tags": "3.1.0",
 		"sveltekit-rate-limiter": "0.4.1",
-		"sveltekit-superforms": "1.11.0",
-		"sveltekit-view-transition": "0.5.2",
+		"sveltekit-superforms": "1.12.0",
+		"sveltekit-view-transition": "0.5.3",
 		"tailwind-config": "workspace:*",
 		"tailwind-merge": "2.1.0",
 		"tailwindcss": "3.3.6",
 		"tailwindcss-animate": "1.0.7",
 		"tslib": "2.6.2",
 		"typescript": "5.3.3",
 		"ui": "workspace:*",
-		"vite": "4.5.1",
-		"vite-plugin-tailwind-purgecss": "0.1.4",
-		"vitest": "0.34.6",
+		"vite": "5.0.10",
+		"vite-plugin-tailwind-purgecss": "0.2.0",
+		"vitest": "1.0.4",
 		"zod": "3.22.4"
 	},
 	"trustedDependencies": [
 		"sharp"
 	],
 	"optionalDependencies": {
 		"@playwright/test": "1.40.1",
-		"@vitest/ui": "0.34.6"
+		"@vitest/ui": "1.0.4"
 	}
-}
+}

apps/console2/src/app.d.ts

@@ -1,9 +1,13 @@
 // See https://kit.svelte.dev/docs/types#app
 // for information about these interfaces
-// and what to do when importing types
-declare namespace App {
-	// interface Locals {}
-	// interface PageData {}
-	// interface Error {}
-	// interface Platform {}
+declare global {
+	namespace App {
+		// interface Error {}
+		// interface Locals {}
+		// interface PageData {}
+		// interface PageState {}
+		// interface Platform {}
+	}
 }
+
+export {};