From 7fbb38d9f0c44bcd260f974a0282cd19c667a5e2 Mon Sep 17 00:00:00 2001
From: TZGyn <ca538901d@mozmail.com>
Date: Wed, 6 Mar 2024 13:14:43 +0800
Subject: [PATCH] migrate to sveltekit 2

---
 frontend/package.json                                | 9 +++++----
 frontend/src/hooks.server.ts                         | 4 ++--
 frontend/src/routes/(app)/+page.server.ts            | 4 ++--
 frontend/src/routes/(app)/links/[id]/+page.server.ts | 3 ++-
 frontend/src/routes/(app)/settings/+page.server.ts   | 2 +-
 frontend/src/routes/api/logout/+server.ts            | 2 +-
 frontend/svelte.config.js                            | 2 +-
 7 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/frontend/package.json b/frontend/package.json
index 9062b0d..7734fcd 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -12,8 +12,9 @@
     "format": "prettier --write ."
   },
   "devDependencies": {
-    "@sveltejs/adapter-node": "^1.3.1",
-    "@sveltejs/kit": "^1.20.4",
+    "@sveltejs/adapter-node": "^2.0.0",
+    "@sveltejs/kit": "^2.0.0",
+    "@sveltejs/vite-plugin-svelte": "^3.0.0",
     "autoprefixer": "^10.4.14",
     "bun-types": "^1.0.11",
     "drizzle-kit": "^0.20.1",
@@ -28,7 +29,7 @@
     "tailwindcss": "^3.3.2",
     "tslib": "^2.4.1",
     "typescript": "^5.0.0",
-    "vite": "^4.4.2"
+    "vite": "^5.0.0"
   },
   "type": "module",
   "dependencies": {
@@ -53,4 +54,4 @@
     "tailwind-variants": "^0.1.18",
     "zod": "^3.22.4"
   }
-}
+}
\ No newline at end of file
diff --git a/frontend/src/hooks.server.ts b/frontend/src/hooks.server.ts
index ac3e3c4..e460ddb 100644
--- a/frontend/src/hooks.server.ts
+++ b/frontend/src/hooks.server.ts
@@ -15,7 +15,7 @@ export const handle: Handle = async ({ event, resolve }) => {
 
 	if (allowedPath.includes(pathname)) {
 		if (userObject) {
-			throw redirect(303, '/')
+			redirect(303, '/');
 		}
 		const response = await resolve(event)
 
@@ -23,7 +23,7 @@ export const handle: Handle = async ({ event, resolve }) => {
 	}
 
 	if (!userObject) {
-		throw redirect(303, '/login')
+		redirect(303, '/login');
 	}
 
 	event.locals.userObject = userObject
diff --git a/frontend/src/routes/(app)/+page.server.ts b/frontend/src/routes/(app)/+page.server.ts
index d4c7212..50619c4 100644
--- a/frontend/src/routes/(app)/+page.server.ts
+++ b/frontend/src/routes/(app)/+page.server.ts
@@ -30,7 +30,7 @@ export const load = (async (event) => {
 export const actions = {
 	signout: async (event) => {
 		console.log('signout')
-		event.cookies.delete('token')
-		throw redirect(303, '/login')
+		event.cookies.delete('token', { path: '/' })
+		redirect(303, '/login')
 	},
 } satisfies Actions
diff --git a/frontend/src/routes/(app)/links/[id]/+page.server.ts b/frontend/src/routes/(app)/links/[id]/+page.server.ts
index 9cd55a3..9c9990e 100644
--- a/frontend/src/routes/(app)/links/[id]/+page.server.ts
+++ b/frontend/src/routes/(app)/links/[id]/+page.server.ts
@@ -20,7 +20,8 @@ export const load = (async (event) => {
 	})
 
 	if (!shortener) {
-		throw redirect(303, '/')
+		redirect(303, '/')
+		return
 	}
 
 	const now = new Date()
diff --git a/frontend/src/routes/(app)/settings/+page.server.ts b/frontend/src/routes/(app)/settings/+page.server.ts
index 39f30d7..80f0002 100644
--- a/frontend/src/routes/(app)/settings/+page.server.ts
+++ b/frontend/src/routes/(app)/settings/+page.server.ts
@@ -2,5 +2,5 @@ import { redirect } from '@sveltejs/kit'
 import type { PageServerLoad } from './$types'
 
 export const load = (async () => {
-	throw redirect(300, '/settings/account')
+	redirect(300, '/settings/account');
 }) satisfies PageServerLoad
diff --git a/frontend/src/routes/api/logout/+server.ts b/frontend/src/routes/api/logout/+server.ts
index b05a59e..2782906 100644
--- a/frontend/src/routes/api/logout/+server.ts
+++ b/frontend/src/routes/api/logout/+server.ts
@@ -16,6 +16,6 @@ export const POST: RequestHandler = async (event) => {
 		)
 	}
 	logoutUser(token)
-	event.cookies.delete('token')
+	event.cookies.delete('token', { path: '/' })
 	return new Response(JSON.stringify({ success: true }))
 }
diff --git a/frontend/svelte.config.js b/frontend/svelte.config.js
index fbf6a6c..6a8ca36 100644
--- a/frontend/svelte.config.js
+++ b/frontend/svelte.config.js
@@ -1,6 +1,6 @@
 // import adapter from 'svelte-adapter-bun'
 import adapter from '@sveltejs/adapter-node'
-import { vitePreprocess } from '@sveltejs/kit/vite'
+import { vitePreprocess } from '@sveltejs/vite-plugin-svelte'
 
 /** @type {import('@sveltejs/kit').Config} */
 const config = {