Sveltekit 2 migration! (#76)

* Sveltekit 2 migration!

Mostly just running `npx svelte-migrate@latest sveltekit-2` and fixing package conflicts.

Use @supabase/auth-helpers-sveltekit to ^0.11 to avoid supabase/auth-js#888

package.json

@@ -15,8 +15,9 @@
     "format_check": "prettier --check --plugin prettier-plugin-svelte ./"
   },
   "devDependencies": {
-    "@sveltejs/adapter-auto": "^2.0.0",
-    "@sveltejs/kit": "^1.30.4",
+    "@sveltejs/adapter-auto": "^3.2.0",
+    "@sveltejs/kit": "^2.0.0",
+    "@sveltejs/vite-plugin-svelte": "^3.0.0",
     "@tailwindcss/typography": "^0.5.13",
     "@typescript-eslint/eslint-plugin": "^6.20.0",
     "@typescript-eslint/parser": "^6.19.0",
@@ -32,12 +33,12 @@
     "svelte-check": "^3.4.3",
     "tailwindcss": "^3.4.1",
     "typescript": "^5.0.0",
-    "vite": "^4.4.2",
-    "vitest": "^0.34.0"
+    "vite": "^5.0.0",
+    "vitest": "^1.0.0"
   },
   "type": "module",
   "dependencies": {
-    "@supabase/auth-helpers-sveltekit": "^0.10.2",
+    "@supabase/auth-helpers-sveltekit": "^0.11.0",
     "@supabase/auth-ui-svelte": "^0.2.9",
     "@supabase/supabase-js": "^2.33.0",
     "stripe": "^13.3.0"

src/routes/(admin)/account/(menu)/+page.server.ts

@@ -5,7 +5,7 @@ export const actions = {
     const { session } = await safeGetSession()
     if (session) {
       await supabase.auth.signOut()
-      throw redirect(303, "/")
+      redirect(303, "/")
     }
   },
 }

src/routes/(admin)/account/(menu)/billing/+page.server.ts

@@ -10,15 +10,15 @@ export const load: PageServerLoad = async ({
 }) => {
   const { session } = await safeGetSession()
   if (!session) {
-    throw redirect(303, "/login")
+    redirect(303, "/login")
   }
 
   const { error: idError, customerId } = await getOrCreateCustomerId({
     supabaseServiceRole,
     session,
   })
   if (idError || !customerId) {
-    throw error(500, {
+    error(500, {
       message: "Unknown error. If issue persists, please contact us.",
     })
   }
@@ -31,7 +31,7 @@ export const load: PageServerLoad = async ({
     customerId,
   })
   if (fetchErr) {
-    throw error(500, {
+    error(500, {
       message: "Unknown error. If issue persists, please contact us.",
     })
   }

src/routes/(admin)/account/(menu)/billing/manage/+page.server.ts

@@ -11,15 +11,15 @@ export const load: PageServerLoad = async ({
 }) => {
   const { session } = await safeGetSession()
   if (!session) {
-    throw redirect(303, "/login")
+    redirect(303, "/login")
   }
 
   const { error: idError, customerId } = await getOrCreateCustomerId({
     supabaseServiceRole,
     session,
   })
   if (idError || !customerId) {
-    throw error(500, {
+    error(500, {
       message: "Unknown error (PCID). If issue persists, please contact us.",
     })
   }
@@ -32,11 +32,8 @@ export const load: PageServerLoad = async ({
     })
     portalLink = portalSession?.url
   } catch (e) {
-    throw error(
-      500,
-      "Unknown error (PSE). If issue persists, please contact us.",
-    )
+    error(500, "Unknown error (PSE). If issue persists, please contact us.")
   }
 
-  throw redirect(303, portalLink ?? "/account/billing")
+  redirect(303, portalLink ?? "/account/billing")
 }

src/routes/(admin)/account/+layout.server.ts

@@ -7,7 +7,7 @@ export const load: LayoutServerLoad = async ({
   const { session } = await safeGetSession()
 
   if (!session) {
-    throw redirect(303, "/login")
+    redirect(303, "/login")
   }
 
   const { data: profile } = await supabase

src/routes/(admin)/account/+layout.ts

@@ -29,7 +29,7 @@ export const load = async ({ fetch, data, depends, url }) => {
     !_hasFullProfile(profile) &&
     url.pathname !== createProfilePath
   ) {
-    throw redirect(303, createProfilePath)
+    redirect(303, createProfilePath)
   }
 
   return { supabase, session, profile }

src/routes/(admin)/account/api/+page.server.ts

@@ -4,7 +4,7 @@ export const actions = {
   updateEmail: async ({ request, locals: { supabase, safeGetSession } }) => {
     const { session } = await safeGetSession()
     if (!session) {
-      throw redirect(303, "/login")
+      redirect(303, "/login")
     }
 
     const formData = await request.formData()
@@ -46,7 +46,7 @@ export const actions = {
   updatePassword: async ({ request, locals: { supabase, safeGetSession } }) => {
     const { session } = await safeGetSession()
     if (!session) {
-      throw redirect(303, "/login")
+      redirect(303, "/login")
     }
 
     const formData = await request.formData()
@@ -124,7 +124,7 @@ export const actions = {
       })
       if (error) {
         // The user was logged out because of bad password. Redirect to error page explaining.
-        throw redirect(303, "/login/current_password_error")
+        redirect(303, "/login/current_password_error")
       }
     }
 
@@ -152,7 +152,7 @@ export const actions = {
   }) => {
     const { session } = await safeGetSession()
     if (!session) {
-      throw redirect(303, "/login")
+      redirect(303, "/login")
     }
 
     const formData = await request.formData()
@@ -174,7 +174,7 @@ export const actions = {
     })
     if (pwError) {
       // The user was logged out because of bad password. Redirect to error page explaining.
-      throw redirect(303, "/login/current_password_error")
+      redirect(303, "/login/current_password_error")
     }
 
     const { error } = await supabaseServiceRole.auth.admin.deleteUser(
@@ -189,12 +189,12 @@ export const actions = {
     }
 
     await supabase.auth.signOut()
-    throw redirect(303, "/")
+    redirect(303, "/")
   },
   updateProfile: async ({ request, locals: { supabase, safeGetSession } }) => {
     const { session } = await safeGetSession()
     if (!session) {
-      throw redirect(303, "/login")
+      redirect(303, "/login")
     }
 
     const formData = await request.formData()
@@ -265,9 +265,9 @@ export const actions = {
     const { session } = await safeGetSession()
     if (session) {
       await supabase.auth.signOut()
-      throw redirect(303, "/")
+      redirect(303, "/")
     } else {
-      throw redirect(303, "/")
+      redirect(303, "/")
     }
   },
 }

src/routes/(admin)/account/create_profile/+page.ts

@@ -6,7 +6,7 @@ export async function load({ parent }) {
 
   // They completed their profile! Redirect to "Select a Plan" screen.
   if (_hasFullProfile(data?.profile)) {
-    throw redirect(303, "/account/select_plan")
+    redirect(303, "/account/select_plan")
   }
 
   return data

src/routes/(admin)/account/subscribe/[slug]/+page.server.ts

@@ -15,20 +15,20 @@ export const load: PageServerLoad = async ({
 }) => {
   const { session } = await safeGetSession()
   if (!session) {
-    throw redirect(303, "/login")
+    redirect(303, "/login")
   }
 
   if (params.slug === "free_plan") {
     // plan with no stripe_price_id. Redirect to account home
-    throw redirect(303, "/account")
+    redirect(303, "/account")
   }
 
   const { error: idError, customerId } = await getOrCreateCustomerId({
     supabaseServiceRole,
     session,
   })
   if (idError || !customerId) {
-    throw error(500, {
+    error(500, {
       message: "Unknown error. If issue persists, please contact us.",
     })
   }
@@ -38,7 +38,7 @@ export const load: PageServerLoad = async ({
   })
   if (primarySubscription) {
     // User already has plan, we shouldn't let them buy another
-    throw redirect(303, "/account/billing")
+    redirect(303, "/account/billing")
   }
 
   let checkoutUrl
@@ -57,11 +57,8 @@ export const load: PageServerLoad = async ({
     })
     checkoutUrl = stripeSession.url
   } catch (e) {
-    throw error(
-      500,
-      "Unknown Error (SSE): If issue persists please contact us.",
-    )
+    error(500, "Unknown Error (SSE): If issue persists please contact us.")
   }
 
-  throw redirect(303, checkoutUrl ?? "/pricing")
+  redirect(303, checkoutUrl ?? "/pricing")
 }

src/routes/(marketing)/auth/callback/+server.js

@@ -11,7 +11,7 @@ export const GET = async ({ url, locals: { supabase } }) => {
       // If you open in another browser, need to redirect to login.
       // Should not display error
       if (isAuthApiError(error)) {
-        throw redirect(303, "/login/sign_in?verified=true")
+        redirect(303, "/login/sign_in?verified=true")
       } else {
         throw error
       }
@@ -20,8 +20,8 @@ export const GET = async ({ url, locals: { supabase } }) => {
 
   const next = url.searchParams.get("next")
   if (next) {
-    throw redirect(303, next)
+    redirect(303, next)
   }
 
-  throw redirect(303, "/account")
+  redirect(303, "/account")
 }

src/routes/(marketing)/blog/(posts)/+layout.svelte

@@ -13,7 +13,7 @@
       }
     }
     if (!searchPost) {
-      throw error(404, "Blog post not found")
+      error(404, "Blog post not found")
     }
     return searchPost
   }

src/routes/(marketing)/login/+layout.server.ts

@@ -9,7 +9,7 @@ export const load: LayoutServerLoad = async ({
 
   // if the user is already logged in return them to the account page
   if (session) {
-    throw redirect(303, "/account")
+    redirect(303, "/account")
   }
 
   return {

svelte.config.js

@@ -1,5 +1,5 @@
 import adapter from "@sveltejs/adapter-auto"
-import { vitePreprocess } from "@sveltejs/kit/vite"
+import { vitePreprocess } from "@sveltejs/vite-plugin-svelte"
 
 /** @type {import('@sveltejs/kit').Config} */
 const config = {