Merge pull request #2116 from scpwiki/sveltekit-update

Upgrade SvelteKit to v2
scpwiki · Oct 6, 2024 · a8012e0 · a8012e0
2 parents 0be2d3e + 212be2a
commit a8012e0
Show file tree

Hide file tree

Showing 9 changed files with 482 additions and 350 deletions.
diff --git a/framerail/package.json b/framerail/package.json
@@ -16,10 +16,11 @@
   },
   "devDependencies": {
     "@playwright/test": "^1.47.1",
-    "@typescript-eslint/eslint-plugin": "^5.62.0",
-    "@typescript-eslint/parser": "^5.62.0",
+    "@sveltejs/vite-plugin-svelte": "^3.1.2",
     "@types/accept-language-parser": "^1.5.6",
     "@types/node": "^22.7.4",
+    "@typescript-eslint/eslint-plugin": "^5.62.0",
+    "@typescript-eslint/parser": "^5.62.0",
     "eslint": "^8.57.1",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-svelte": "^2.44.0",
@@ -36,17 +37,17 @@
     "stylelint-config-recess-order": "^5.1.1",
     "stylelint-order": "^6.0.4",
     "stylelint-scss": "^6.7.0",
-    "typescript": "^5.5.4"
+    "typescript": "^5.6.2"
   },
   "dependencies": {
-    "@sveltejs/adapter-node": "next",
-    "@sveltejs/kit": "next",
+    "@sveltejs/adapter-node": "^5.2.5",
+    "@sveltejs/kit": "^2.6.1",
     "accept-language-parser": "^1.5.0",
     "json-rpc-2.0": "^1.7.0",
     "svelte": "^4.2.19",
     "svelte-check": "^4.0.2",
     "svelte-preprocess": "^5.1.4",
     "tslib": "^2.7.0",
-    "vite": "^4.5.3"
+    "vite": "^5.4.8"
   }
 }
diff --git a/framerail/pnpm-lock.yaml b/framerail/pnpm-lock.yaml
diff --git a/framerail/src/lib/server/deepwell/index.ts b/framerail/src/lib/server/deepwell/index.ts
@@ -1,6 +1,6 @@
 // TODO refactor into proper TS service
 
-import { JSONRPCClient, JSONRPCRequest } from "json-rpc-2.0"
+import { JSONRPCClient, type JSONRPCRequest } from "json-rpc-2.0"
 
 export const DEEPWELL_HOST = process.env.DEEPWELL_HOST || "localhost"
 export const DEEPWELL_PORT = 2747

diff --git a/framerail/src/lib/server/load/admin.ts b/framerail/src/lib/server/load/admin.ts
@@ -66,7 +66,7 @@ export async function loadAdminPage(request, cookies) {
   viewData.internationalization = translated
 
   if (errorStatus !== null) {
-    throw error(errorStatus, viewData)
+    error(errorStatus, viewData)
   }
 
   return viewData

diff --git a/framerail/src/lib/server/load/page.ts b/framerail/src/lib/server/load/page.ts
@@ -145,7 +145,7 @@ export async function loadPage(
   viewData.internationalization = translated
 
   if (errorStatus !== null) {
-    throw error(errorStatus, viewData)
+    error(errorStatus, viewData)
   }
 
   // TODO remove checkRedirect when errorStatus is fixed
@@ -171,7 +171,7 @@ function runRedirect(
   const domain: string = viewData.redirectSite || originalDomain
   const slug: Optional<string> = viewData.redirectPage || originalSlug
   const route: string = buildRoute(slug, extra)
-  throw redirect(308, `https://${domain}/${route}`)
+  redirect(308, `https://${domain}/${route}`)
 }
 
 function buildRoute(slug: Optional<string>, extra: Optional<string>): string {

diff --git a/framerail/src/lib/server/load/user.ts b/framerail/src/lib/server/load/user.ts
@@ -37,7 +37,7 @@ export async function loadUser(username?: string, request, cookies) {
   }
 
   if (errorStatus === null && username && viewData.user.slug !== username) {
-    throw redirect(308, `/-/user/${viewData.user.slug}`)
+    redirect(308, `/-/user/${viewData.user.slug}`)
   }
 
   if (errorStatus !== null) {
@@ -93,7 +93,7 @@ export async function loadUser(username?: string, request, cookies) {
   viewData.internationalization = translated
 
   if (errorStatus !== null) {
-    throw error(errorStatus, viewData)
+    error(errorStatus, viewData)
   }
 
   return viewData

diff --git a/framerail/tsconfig.json b/framerail/tsconfig.json
@@ -2,18 +2,17 @@
   "extends": "./.svelte-kit/tsconfig.json",
   "compilerOptions": {
     "paths": {
-      "$lib": ["src/lib"],
-      "$lib/*": ["src/lib/*"],
-      "$static": ["static"],
-      "$static/*": ["static/*"],
-      "$assets": ["../assets", "src/assets"],
-      "$assets/*": ["../assets/*", "src/assets/*"]
+      "$lib": ["./src/lib"],
+      "$lib/*": ["./src/lib/*"],
+      "$static": ["./static"],
+      "$static/*": ["./static/*"],
+      "$assets": ["../assets", "./src/assets"],
+      "$assets/*": ["../assets/*", "./src/assets/*"]
     },
     "allowJs": true,
     "checkJs": true,
     "esModuleInterop": true,
     "forceConsistentCasingInFileNames": true,
-    "ignoreDeprecations": "5.0",
     "verbatimModuleSyntax": true,
     "resolveJsonModule": true,
     "skipLibCheck": true,

diff --git a/install/aws/prod/docker/web/Dockerfile b/install/aws/prod/docker/web/Dockerfile
@@ -2,7 +2,7 @@
 # Framerail build
 #
 
-FROM node:19-alpine
+FROM node:20-alpine
 
 # Install pnpm
 RUN npm install -g pnpm

diff --git a/install/dev/digitalocean/web/Dockerfile b/install/dev/digitalocean/web/Dockerfile
@@ -2,7 +2,7 @@
 # Framerail build
 #
 
-FROM node:19-alpine
+FROM node:20-alpine
 
 # Install pnpm
 RUN npm install -g pnpm