feat: some more migration work

src/app.d.ts

@@ -7,9 +7,9 @@ declare namespace App {
 	// interface Locals {}
 	// interface Platform {}
 	// interface Session {}
-	interface Stuff {
-		title?: string;
-		description?: string;
-		keywords?: string[];
-	}
+	// interface Stuff {
+	// 	title?: string;
+	// 	description?: string;
+	// 	keywords?: string[];
+	// }
 }

src/lib/utils/types.ts

@@ -27,3 +27,11 @@ export interface Thumbnail {
 	width: number;
 	height: number;
 }
+
+export interface PageData {
+	seo: {
+		title: string;
+		description: string;
+		keywords: string[];
+	};
+}

src/routes/+layout.svelte

@@ -5,11 +5,20 @@
 	import Header from '$lib/components/Header.svelte';
 	import '@fontsource/ubuntu-mono/400.css';
 
-	$: wrappedTitle = $page.stuff.title
-		? `${$page.stuff.title} - Alex Daichendt`
-		: "Alex Daichendt's website";
-	$: description = $page.stuff.description;
-	$: keywords = $page.stuff.keywords;
+	// svelte-ignore unused-export-let
+	export let data;
+
+	let seo = $page.data?.seo;
+
+	let wrappedTitle = "Alex Daichendt's website";
+	let description = '';
+	let keywords: string[] = [];
+
+	if (seo) {
+		wrappedTitle = seo.title ? `${seo.title} - Alex Daichendt` : "Alex Daichendt's website";
+		description = seo.description;
+		keywords = seo.keywords;
+	}
 </script>
 
 <svelte:head

src/routes/+page.svelte

@@ -1,19 +1,11 @@
-<script context="module" lang="ts">
-	export async function load() {
-		return {
-			stuff: {
-				title: 'Home',
-				description:
-					'Alex Daichendt"s website, blog, and yard of stuffs and things of modern tech.',
-			},
-		};
-	}
-</script>
-
 <script lang="ts">
 	import ListItem from '$components/ListItem.svelte';
 	import Link from '$components/Link.svelte';
-	import type { Skill } from '../lib/utils/types';
+	import type { Skill } from '$lib/utils/types';
+	// svelte-ignore unused-export-let
+	export let data;
+	// svelte-ignore unused-export-let
+	export let errors;
 
 	let _SKILLS = [
 		{ name: 'React/Svelte', started: 2019 },

src/routes/+page.ts

@@ -0,0 +1,8 @@
+export async function load() {
+	return {
+		seo: {
+			title: 'Home',
+			description: 'Alex Daichendt"s website, blog, and yard of stuffs and things of modern tech.',
+		},
+	};
+}

src/routes/blog/+page.server.ts

@@ -1,8 +1,9 @@
-import type { BlogPostFrontmatter, BlogPostMeta } from '../../lib/utils/types';
+import type { BlogPostFrontmatter, BlogPostMeta } from '$lib/utils/types';
+import type { PageServerLoad } from './$types';
 
-const removeExtension = (path: string) => path.replace(/\.[^.]*$/g, '').replace('/index', '');
+const removeExtension = (path: string) => path.replace(/\.[^.]*$/g, '').replace('/+page', '');
 
-export async function GET() {
+export const load: PageServerLoad = async () => {
 	const modulesSVX = import.meta.glob('./**/*.svx');
 	const modulesMD = import.meta.glob('./**/*.md');
 	const modules = { ...modulesMD, ...modulesSVX };
@@ -19,7 +20,5 @@ export async function GET() {
 
 	posts.sort((a, b) => new Date(b.created).valueOf() - new Date(a.created).valueOf());
 
-	return {
-		body: { posts },
-	};
-}
+	return { posts };
+};

src/routes/blog/+page.svelte

@@ -1,30 +1,10 @@
-<script context="module" lang="ts">
-	import type { LoadEvent, LoadOutput } from '@sveltejs/kit';
-
-	export async function load({ fetch }: LoadEvent): LoadOutput {
-		const response = await fetch(`/blog/posts.json`);
-		const asJson = await response.json();
-
-		return {
-			status: response.status,
-			props: {
-				posts: response.ok && asJson.posts,
-			},
-			stuff: {
-				title: 'Blog',
-				description:
-					'My blogposts, where I occasionally document things, that I think are not accessible or badly documented.',
-			},
-		};
-	}
-</script>
-
 <script lang="ts">
 	import type { BlogPostMeta } from '$lib/utils/types';
 	import Link from '$components/Link.svelte';
 	import ListItem from '$components/ListItem.svelte';
 
-	export let posts: BlogPostMeta[];
+	export let data;
+	const posts: BlogPostMeta[] = data.posts;
 </script>
 
 <h1>Blog Posts</h1>

src/routes/blog/+page.ts

@@ -0,0 +1,13 @@
+import type { LoadEvent } from '@sveltejs/kit';
+import type { PageLoad } from './$types';
+
+export async function load({ data }: LoadEvent): PageLoad {
+	return {
+		posts: data.posts,
+		seo: {
+			title: 'Blog',
+			description:
+				'My blogposts, where I occasionally document things, that I think are not accessible or badly documented.',
+		},
+	};
+}

src/routes/blog/lxcanddpdk/+page.md

@@ -7,18 +7,6 @@ keywords:
   - DPDK
 ---
 
-<script context="module" lang="ts">
-	export async function load() {
-		return {
-			stuff: {
-				title,
-				description,
-        		keywords,
-			},
-		};
-	}
-</script>
-
 For my thesis, I evaluated if containers are viable for low-latency networking. I
 decided to pick LXC as my container implementation due to them being extremely
 lightweight compared to its peers and also related work indicating, that LXC beats

src/routes/blog/ondemand-image-optimization-catapi/+page.md

@@ -10,18 +10,6 @@ keywords:
 hidden: true
 ---
 
-<script context="module" lang="ts">
-	export async function load() {
-		return {
-			stuff: {
-				title,
-				description,
-        keywords,
-			},
-		};
-	}
-</script>
-
 <script>
 import architecture from "./_architecture.png?width=360;720;1280;1920&webp&metadata"
 import Image from "$components/Image.svelte"

src/routes/blog/redminote7-arrowos/+page.svx

@@ -11,18 +11,6 @@ keywords:
   - Magisk
 ---
 
-<script context="module" lang="ts">
-	export async function load() {
-		return {
-			stuff: {
-				title,
-				description,
-        keywords,
-			},
-		};
-	}
-</script>
-
 This tutorial will show you how to flash ArrowOS, a nice android 12 rom, together with magisk to get root access to the phone and also microG, the google alternative to google play services. This tutorial is tailored for the Redmi Note 7, commonly referred to as lavender. Other phones might work differently due to not having a ramdisk, or being an A/B device, or ... something else. Proceed with caution. You can't blame me for bricked devices.
 
 Prerequisites:

src/routes/blog/software-recommendations/+page.svx

@@ -8,19 +8,6 @@ keywords:
 hidden: false
 ---
 
-<script context="module" lang="ts">
-	export async function load() {
-		return {
-			stuff: {
-				title,
-				description,
-        keywords,
-			},
-		};
-	}
-</script>
-
-
 Moving away from BigTech is not an easy task. However, in these days, there are plenty polished
 alternatives out there. Over the years I tried out many different services and software. I will
 present what worked best for me here.

src/routes/cat/+page.svelte

@@ -1,19 +1,6 @@
-<script context="module" lang="ts">
-	import type { LoadEvent, LoadOutput } from '@sveltejs/kit';
-
-	export async function load({ fetch }: LoadEvent): LoadOutput {
-		const response = await fetch('https://cats.daichendt.one/list');
-		const asJson = await response.json();
-		return {
-			status: response.status,
-			props: {
-				cats: response.ok && asJson,
-			},
-		};
-	}
-</script>
-
 <script lang="ts">
+	throw new Error("@migration task: Add data prop (https://github.com/sveltejs/kit/discussions/5774#discussioncomment-3292707)");
+
 	import Image from '$lib/components/CatImage.svelte';
 	import type { ImageMetadata } from '$lib/utils/types';
 	import Link from '$lib/components/Link.svelte';

src/routes/cat/+page.ts

@@ -0,0 +1,13 @@
+import type { LoadEvent, LoadOutput } from '@sveltejs/kit';
+
+export async function load({ fetch }: LoadEvent): PageLoadOutput {
+	const response = await fetch('https://cats.daichendt.one/list');
+	const asJson = await response.json();
+	throw new Error("@migration task: Migrate this return statement (https://github.com/sveltejs/kit/discussions/5774#discussioncomment-3292693)");
+	return {
+		status: response.status,
+		props: {
+			cats: response.ok && asJson,
+		},
+	};
+}

src/routes/contact/+page.svelte

@@ -1,14 +1,3 @@
-<script context="module" lang="ts">
-	export async function load() {
-		return {
-			stuff: {
-				title: 'Contact',
-				description: 'All the communication channels for contacting Alex Daichendt ',
-			},
-		};
-	}
-</script>
-
 <script>
 	import { mdiEmailEditOutline, mdiKey } from '@mdi/js';
 	import { mdiGithub } from '@mdi/js';

src/routes/contact/+page.ts

@@ -0,0 +1,9 @@
+export async function load() {
+	throw new Error("@migration task: Migrate this return statement (https://github.com/sveltejs/kit/discussions/5774#discussioncomment-3292693)");
+	return {
+		stuff: {
+			title: 'Contact',
+			description: 'All the communication channels for contacting Alex Daichendt ',
+		},
+	};
+}

src/routes/impressum/+page.svelte

@@ -1,14 +1,3 @@
-<script context="module" lang="ts">
-	export async function load() {
-		return {
-			stuff: {
-				title: 'Impressum',
-				description: 'The impressum I have to include for Germany.',
-			},
-		};
-	}
-</script>
-
 <h1>Impressum</h1>
 
 <p>Information according to §5 TMG:</p>

src/routes/impressum/+page.ts

@@ -0,0 +1,9 @@
+export async function load() {
+	throw new Error("@migration task: Migrate this return statement (https://github.com/sveltejs/kit/discussions/5774#discussioncomment-3292693)");
+	return {
+		stuff: {
+			title: 'Impressum',
+			description: 'The impressum I have to include for Germany.',
+		},
+	};
+}

src/routes/privacy/+page.svelte

@@ -1,15 +1,3 @@
-<script context="module" lang="ts">
-	export async function load() {
-		return {
-			stuff: {
-				title: 'Privacy',
-				description:
-					'The privacy policy I have to include even though I don"t collect any data or use shady services.',
-			},
-		};
-	}
-</script>
-
 <h1>Privacy Policy for AlexDaichendt</h1>
 
 <p>

src/routes/privacy/+page.ts

@@ -0,0 +1,10 @@
+export async function load() {
+	throw new Error("@migration task: Migrate this return statement (https://github.com/sveltejs/kit/discussions/5774#discussioncomment-3292693)");
+	return {
+		stuff: {
+			title: 'Privacy',
+			description:
+				'The privacy policy I have to include even though I don"t collect any data or use shady services.',
+		},
+	};
+}