From 8fcd9d23b7f27690ef5d2784fb36f5d81fdc46c1 Mon Sep 17 00:00:00 2001
From: Thomas <thomas@thomaswilson.xyz>
Date: Sun, 17 Mar 2024 09:37:49 +0000
Subject: [PATCH] migration to SvelteKit 2

---
 package.json                                  | 25 ++++++++++---------
 src/routes/+layout.svelte                     |  4 +--
 src/routes/api/blog/[slug].json/+server.ts    |  2 +-
 src/routes/api/blog/new.json/+server.ts       |  6 ++---
 .../book-reviews/[slug]/+page.server.ts       |  2 +-
 src/routes/sunrise-sunset/+page.ts            |  2 +-
 6 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/package.json b/package.json
index d153542..2ac453f 100644
--- a/package.json
+++ b/package.json
@@ -13,26 +13,27 @@
 		"test": "vitest"
 	},
 	"devDependencies": {
-		"@sveltejs/adapter-auto": "^1.0.2",
-		"@sveltejs/adapter-netlify": "^1.0.5",
-		"@sveltejs/kit": "^1.2.8",
+		"@sveltejs/adapter-auto": "^3.0.0",
+		"@sveltejs/adapter-netlify": "^3.0.0",
+		"@sveltejs/kit": "^2.0.0",
+		"@sveltejs/vite-plugin-svelte": "^3.0.0",
 		"@types/leaflet": "^1.7.11",
 		"@types/sanitize-html": "^2.6.2",
 		"@typescript-eslint/eslint-plugin": "^5.32.0",
 		"@typescript-eslint/parser": "^5.32.0",
 		"eslint": "^7.32.0",
 		"eslint-config-prettier": "^8.3.0",
-		"eslint-plugin-svelte3": "^3.2.1",
+		"eslint-plugin-svelte3": "^4.0.0",
 		"prettier": "^2.5.1",
-		"prettier-plugin-svelte": "^2.5.0",
+		"prettier-plugin-svelte": "^2.10.1",
 		"sass": "^1.54.9",
-		"svelte": "^3.55.1",
-		"svelte-check": "^3.0.3",
-		"svelte-preprocess": "^5.0.1",
+		"svelte": "^4.0.0",
+		"svelte-check": "^3.4.3",
+		"svelte-preprocess": "^5.0.3",
 		"tslib": "^2.3.1",
-		"typescript": "^4.7.4",
-		"vite": "^4.0.4",
-		"vitest": "^0.28.3"
+		"typescript": "^5.0.0",
+		"vite": "^5.0.0",
+		"vitest": "^1.0.0"
 	},
 	"type": "module",
 	"dependencies": {
@@ -58,4 +59,4 @@
 		"unified": "^10.1.2",
 		"zod": "^3.22.2"
 	}
-}
+}
\ No newline at end of file
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index 431ad44..e185261 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -1,6 +1,6 @@
-<script>
+<script lang="ts">
   import "../styles/thomaswilson.css";
-  import { colourSchemeStore } from "../stores/colourSchemeStore";
+  import { colourSchemeStore } from "../stores/colourSchemeStore.ts";
   import { browser } from "$app/environment";
 
   colourSchemeStore.subscribe((value) => {
diff --git a/src/routes/api/blog/[slug].json/+server.ts b/src/routes/api/blog/[slug].json/+server.ts
index 64cc820..b74d8e6 100644
--- a/src/routes/api/blog/[slug].json/+server.ts
+++ b/src/routes/api/blog/[slug].json/+server.ts
@@ -8,7 +8,7 @@ export const GET = async ({ params }: LoadEvent) => {
     const post = await controller.getAnyKindOfContentBySlug(slug);
 
     if (!post) {
-        throw error(404, `Could not find blog post with slug '${slug}'`);
+        error(404, `Could not find blog post with slug '${slug}'`);
     }
 
     return json({ post });
diff --git a/src/routes/api/blog/new.json/+server.ts b/src/routes/api/blog/new.json/+server.ts
index e09b4a2..32cee3c 100644
--- a/src/routes/api/blog/new.json/+server.ts
+++ b/src/routes/api/blog/new.json/+server.ts
@@ -30,14 +30,14 @@ export const POST: RequestHandler = async ({ getClientAddress, request }) => {
     } catch (e: any) {
         console.log(`Caught error destructuring request body`);
         console.error(e);
-        throw error(400, 'Error in request body.');
+        error(400, 'Error in request body.');
     }
 
     if ([fileName, markdownContent, title, date, slug, author].includes(undefined)) {
-        throw error(400, `Missing parameters.`);
+        error(400, `Missing parameters.`);
     } else if (!['127.0.0.1', '::1'].includes(address) ) {
         console.log(address); 
-        throw error(403, `Forbidden.`);
+        error(403, `Forbidden.`);
     }
 
     const controller = await BlogController.singleton();
diff --git a/src/routes/book-reviews/[slug]/+page.server.ts b/src/routes/book-reviews/[slug]/+page.server.ts
index 48ada44..dde80f2 100644
--- a/src/routes/book-reviews/[slug]/+page.server.ts
+++ b/src/routes/book-reviews/[slug]/+page.server.ts
@@ -4,5 +4,5 @@ import { redirect } from '@sveltejs/kit';
 export async function load({ params }: LoadEvent) {
     const { slug } = params;
     // redirect to 404 if post not found
-    throw redirect(307, `/blog/${slug}`);
+    redirect(307, `/blog/${slug}`);
 }
diff --git a/src/routes/sunrise-sunset/+page.ts b/src/routes/sunrise-sunset/+page.ts
index ea644c4..c56e5fe 100644
--- a/src/routes/sunrise-sunset/+page.ts
+++ b/src/routes/sunrise-sunset/+page.ts
@@ -13,5 +13,5 @@ export const load: PageLoad = async ({ fetch }) => {
         };
     }
 
-    throw error(500, 'Failed to fetch sunrise-sunset photo');
+    error(500, 'Failed to fetch sunrise-sunset photo');
 };