From 689f232cbb05a13528ff1ecd3924e5bba0ccafeb Mon Sep 17 00:00:00 2001
From: Maxime Cannoodt <maxime@qargo.io>
Date: Sun, 13 Nov 2022 14:16:28 +0100
Subject: [PATCH] chore: :building_construction: Migrate to SvelteKit 1.0.0

---
 proxy.js                                     |  2 +-
 webapp/package.json                          |  5 ++---
 webapp/src/lib/components/Dismissable.svelte |  2 +-
 webapp/src/lib/marked/renderers/Code.svelte  |  2 +-
 webapp/src/routes/+layout.svelte             |  2 +-
 webapp/src/routes/note/[id]/+page.server.ts  |  6 +++---
 webapp/src/routes/note/[id]/+page.svelte     |  2 +-
 webapp/src/routes/note/[id]/+page.ts         | 14 --------------
 8 files changed, 10 insertions(+), 25 deletions(-)
 delete mode 100644 webapp/src/routes/note/[id]/+page.ts

diff --git a/proxy.js b/proxy.js
index 4b16912..64f4258 100644
--- a/proxy.js
+++ b/proxy.js
@@ -14,7 +14,7 @@ app.use(
 app.use(
   "/",
   createProxyMiddleware({
-    target: "http://localhost:3000",
+    target: "http://localhost:5173",
     changeOrigin: true,
   })
 );
diff --git a/webapp/package.json b/webapp/package.json
index a743e81..0440eb5 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -6,9 +6,8 @@
 	"license": "MIT",
 	"scripts": {
 		"dev": "vite dev",
-		"build": "svelte-kit build",
-		"package": "svelte-kit package",
-		"preview": "svelte-kit preview",
+		"build": "vite build",
+		"preview": "vite preview",
 		"check": "svelte-check --tsconfig ./tsconfig.json",
 		"check:watch": "svelte-check --tsconfig ./tsconfig.json --watch",
 		"lint": "prettier --check --plugin-search-dir=. . && eslint .",
diff --git a/webapp/src/lib/components/Dismissable.svelte b/webapp/src/lib/components/Dismissable.svelte
index 5340802..4101acb 100644
--- a/webapp/src/lib/components/Dismissable.svelte
+++ b/webapp/src/lib/components/Dismissable.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { browser } from '$app/env';
+	import { browser } from '$app/environment';
 
 	import { onMount } from 'svelte';
 	import Callout from './Callout.svelte';
diff --git a/webapp/src/lib/marked/renderers/Code.svelte b/webapp/src/lib/marked/renderers/Code.svelte
index 0936e38..96fe97b 100644
--- a/webapp/src/lib/marked/renderers/Code.svelte
+++ b/webapp/src/lib/marked/renderers/Code.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { browser } from '$app/env';
+	import { browser } from '$app/environment';
 
 	import { onMount } from 'svelte';
 
diff --git a/webapp/src/routes/+layout.svelte b/webapp/src/routes/+layout.svelte
index fbe708e..a5681c2 100644
--- a/webapp/src/routes/+layout.svelte
+++ b/webapp/src/routes/+layout.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { browser } from '$app/env';
+	import { browser } from '$app/environment';
 
 	import Footer from '$lib/components/Footer.svelte';
 	import NavBar from '$lib/components/navbar/NavBar.svelte';
diff --git a/webapp/src/routes/note/[id]/+page.server.ts b/webapp/src/routes/note/[id]/+page.server.ts
index 3dba32b..e8f580e 100644
--- a/webapp/src/routes/note/[id]/+page.server.ts
+++ b/webapp/src/routes/note/[id]/+page.server.ts
@@ -3,8 +3,8 @@ import type { PageServerLoad } from './$types';
 
 import { error } from '@sveltejs/kit';
 
-export const get: PageServerLoad = async ({ request, clientAddress, params, setHeaders }) => {
-	const ip = (request.headers.get('x-forwarded-for') || clientAddress) as string;
+export const load: PageServerLoad = async ({ request, params, setHeaders, getClientAddress }) => {
+	const ip = (request.headers.get('x-forwarded-for') || getClientAddress()) as string;
 	const url = `${import.meta.env.VITE_SERVER_INTERNAL}/api/note/${params.id}`;
 	const response = await fetch(url, {
 		headers: {
@@ -20,7 +20,7 @@ export const get: PageServerLoad = async ({ request, clientAddress, params, setH
 			const maxage = Math.floor((note.expire_time.valueOf() - note.insert_time.valueOf()) / 1000);
 
 			setHeaders({
-				maxage: maxage,
+				maxage: `${maxage}`,
 				'Cache-Control': `max-age=${maxage}, public`
 			});
 			return { note };
diff --git a/webapp/src/routes/note/[id]/+page.svelte b/webapp/src/routes/note/[id]/+page.svelte
index 137fe33..71ed894 100644
--- a/webapp/src/routes/note/[id]/+page.svelte
+++ b/webapp/src/routes/note/[id]/+page.svelte
@@ -4,7 +4,7 @@
 	import MarkdownRenderer from '$lib/components/MarkdownRenderer.svelte';
 	import LogoMarkdown from 'svelte-icons/io/IoLogoMarkdown.svelte';
 	import IconEncrypted from 'svelte-icons/md/MdLockOutline.svelte';
-	import { browser } from '$app/env';
+	import { browser } from '$app/environment';
 	import RawRenderer from '$lib/components/RawRenderer.svelte';
 	import LogoDocument from 'svelte-icons/md/MdUndo.svelte';
 	import Dismissable from '$lib/components/Dismissable.svelte';
diff --git a/webapp/src/routes/note/[id]/+page.ts b/webapp/src/routes/note/[id]/+page.ts
deleted file mode 100644
index da3333d..0000000
--- a/webapp/src/routes/note/[id]/+page.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import type { EncryptedNote } from '$lib/model/EncryptedNote';
-import type { PageLoad } from './$types';
-
-export const load: PageLoad = async ({ data, setHeaders }) => {
-	const note: EncryptedNote = data.note;
-	const maxage = Math.floor((note.expire_time.valueOf() - note.insert_time.valueOf()) / 1000);
-
-	setHeaders({
-		maxage: maxage,
-		'Cache-Control': `max-age=${maxage}, public`
-	});
-
-	return { note };
-};