From fb19811cf89c64517865ba85437115b674a09c56 Mon Sep 17 00:00:00 2001
From: Conor Barnes <conorbarnes93@gmail.com>
Date: Thu, 25 Apr 2024 21:42:28 +0100
Subject: [PATCH] fix broken loads

---
 src/lib/components/InternalLink.svelte    |  2 +-
 src/lib/funcs/collectionsDataTransform.ts |  2 +-
 src/lib/funcs/metaculusDataTransform.ts   |  2 +-
 src/lib/funcs/predictDataTransform.ts     |  2 +-
 src/routes/+page.server.ts                | 12 +++++---
 src/routes/+page.svelte                   | 37 ++++++++++++-----------
 src/routes/collection/+page.server.ts     |  9 +++---
 src/routes/collection/+page.svelte        | 24 +++++++--------
 svelte.config.js                          |  7 +++--
 9 files changed, 51 insertions(+), 46 deletions(-)

diff --git a/src/lib/components/InternalLink.svelte b/src/lib/components/InternalLink.svelte
index 6e9bc79..040d100 100644
--- a/src/lib/components/InternalLink.svelte
+++ b/src/lib/components/InternalLink.svelte
@@ -2,6 +2,6 @@
 	export let href: string;
 </script>
 
-<a sveltekit:prefetch {href} class="text-green-theme hover:text-black transition-colors font-bold"
+<a data-sveltekit-preload-data {href} class="text-green-theme hover:text-black transition-colors font-bold"
 	><slot /></a
 >
diff --git a/src/lib/funcs/collectionsDataTransform.ts b/src/lib/funcs/collectionsDataTransform.ts
index 66c0664..14442c4 100644
--- a/src/lib/funcs/collectionsDataTransform.ts
+++ b/src/lib/funcs/collectionsDataTransform.ts
@@ -41,5 +41,5 @@ function outcomeTransform(outcome: { name: string; probabilities: GoodOutcome |
 }
 
 export default function entryTransform(outcomes: Outcomes): TreeData {
-	return { name: '2022', children: outcomes.map((o) => outcomeTransform(o)) };
+	return { name: '2024', children: outcomes.map((o) => outcomeTransform(o)) };
 }
\ No newline at end of file
diff --git a/src/lib/funcs/metaculusDataTransform.ts b/src/lib/funcs/metaculusDataTransform.ts
index 952fb8e..b93f067 100644
--- a/src/lib/funcs/metaculusDataTransform.ts
+++ b/src/lib/funcs/metaculusDataTransform.ts
@@ -14,7 +14,7 @@ export default function metaculusDataTransform(vals: {
 	bioX: number;
 }): TreeData {
 	const transformed = {
-		name: '2022',
+		name: '2024',
 		children: [
 			{
 				name: 'climate',
diff --git a/src/lib/funcs/predictDataTransform.ts b/src/lib/funcs/predictDataTransform.ts
index faaad4c..42138fd 100644
--- a/src/lib/funcs/predictDataTransform.ts
+++ b/src/lib/funcs/predictDataTransform.ts
@@ -21,5 +21,5 @@ export default function selfDataTransform(
 				.flat()
 		};
 	});
-	return { name: '2022', children: ch };
+	return { name: '2024', children: ch };
 }
diff --git a/src/routes/+page.server.ts b/src/routes/+page.server.ts
index a1fea3f..56d0969 100644
--- a/src/routes/+page.server.ts
+++ b/src/routes/+page.server.ts
@@ -1,5 +1,3 @@
-import type { RequestHandlerOutput } from '@sveltejs/kit';
-
 async function metaculusFetch(question: number): Promise<number> {
 	if (process.env.NODE_ENV === 'production') {
 		const res = await fetch(`https://www.metaculus.com/api2/questions/${question}`);
@@ -22,7 +20,8 @@ function makeRelative(total: number, particular: number, xRisk: number) {
 	return [roundedParticular, roundedXRisk];
 }
 
-export async function load(): Promise<RequestHandlerOutput> {
+/** @type {import('./$types').PageServerLoad} */
+export async function load(): Promise<any> {
 	// GET THE DATA
 	// By 2100 will the human population decrease by at least 10% during any period of 5 years?
 	const totalQuestion = metaculusFetch(1493);
@@ -95,7 +94,10 @@ export async function load(): Promise<RequestHandlerOutput> {
 
 	console.log('BUILD COMPLETE'); // make sure this only logs during build, not runtime.
 	return {
-		vals,
-		time: new Date().toString()
+		props: {
+			vals,
+			time: new Date().toString(),
+			test: 'fake'
+		}
 	};
 }
diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
index a6149c6..68a663f 100644
--- a/src/routes/+page.svelte
+++ b/src/routes/+page.svelte
@@ -1,5 +1,4 @@
 <script lang="ts">
-	// throw new Error("@migration task: Add data prop (https://github.com/sveltejs/kit/discussions/5774#discussioncomment-3292707)");
 
 	import Details from '$lib/components/details.svelte';
 	import { browser } from '$app/environment';
@@ -21,22 +20,26 @@
 		highlight = e.detail.highlight;
 	}
 
-	export let time: string;
-	export let vals: {
-		total: number;
-		climate: number;
-		climateX: number;
-		nano: number;
-		nanoX: number;
-		nuke: number;
-		nukeX: number;
-		ai: number;
-		aiX: number;
-		bio: number;
-		bioX: number;
+	export let data: {
+		props: {
+			time: string;
+			vals: {
+				total: number;
+				climate: number;
+				climateX: number;
+				nano: number;
+				nanoX: number;
+				nuke: number;
+				nukeX: number;
+				ai: number;
+				aiX: number;
+				bio: number;
+				bioX: number;
+			}
+		}
 	};
 
-	let input = metaculusDataTransform(vals);
+	let input = metaculusDataTransform(data.props.vals);
 
 	let chart: SVGSVGElement | null = null;
 	if (browser) {
@@ -75,7 +78,7 @@
 	<div class="flex  px-6 lg:px-0 justify-between w-full">
 		<Legend on:message={handleMessage} />
 		<div>
-			<Details {vals} {highlight} />
+			<Details vals={data.props.vals} {highlight} />
 		</div>
 	</div>
 	<!-- prevent CLS -->
@@ -114,7 +117,7 @@
 	<p>
 		This tree is built from the prediction platform Metaculus's <ExternalLink
 			href="https://www.metaculus.com/questions/2568">Ragnarok series</ExternalLink
-		>. It is updated every night (last: {new Date(time).toDateString()}). It tracks predictions
+		>. It is updated every night (last: {new Date(data.props.time).toDateString()}). It tracks predictions
 		concerning
 		<span class="text-yellow-theme font-bold">global catastrophes</span>
 		and
diff --git a/src/routes/collection/+page.server.ts b/src/routes/collection/+page.server.ts
index b3dbb02..2e5b1ed 100644
--- a/src/routes/collection/+page.server.ts
+++ b/src/routes/collection/+page.server.ts
@@ -1,9 +1,8 @@
-import type { RequestHandlerOutput } from '@sveltejs/kit';
 import estimates from '$lib/data/estimates.json';
 import collectionsDataTransform from '$lib/funcs/collectionsDataTransform';
 
-export async function load(): Promise<RequestHandlerOutput> {
-	let data: {
+export async function load(): Promise<any> {
+	let info: {
 		title: string;
 		link: string;
 		notes: string[];
@@ -17,7 +16,7 @@ export async function load(): Promise<RequestHandlerOutput> {
 	}[] = [];
 
 	for (const entry of estimates) {
-		data.push({
+		info.push({
 			...collectionsDataTransform(entry.outcomes),
 			title: entry.title,
 			notes: entry.notes,
@@ -25,5 +24,5 @@ export async function load(): Promise<RequestHandlerOutput> {
 		});
 	}
 
-	return { data, time: new Date().toString() };
+	return { info, time: new Date().toString() };
 }
diff --git a/src/routes/collection/+page.svelte b/src/routes/collection/+page.svelte
index 2081bee..0bc5e4c 100644
--- a/src/routes/collection/+page.svelte
+++ b/src/routes/collection/+page.svelte
@@ -13,17 +13,17 @@
 	let width: number;
 
 	export let data: {
-		title: string;
-		link: string;
-		notes: string[];
-		name: string; // the future
-		children: {
-			name: string;
-			children: {
-				name: string;
-			}[];
-		}[];
-	}[] = [];
+			info: 
+				{
+					title: string; 
+					link: string; 
+					notes: string[]; 
+					name: string; 
+					children: {
+						name: string; children: {name: string}[]
+					}[]
+			}[]
+	};
 
 	let predictions: { chart: SVGElement; title: string; notes: string[]; link: string }[] = [];
 
@@ -33,7 +33,7 @@
 		// do we want animations?
 		let classes = mediaQuery.matches || (width && width < 767) ? 'instant' : '';
 
-		for (const [ind, entry] of Object.entries(data)) {
+		for (const [ind, entry] of Object.entries(data.info)) {
 			// use this later for sharing
 			const newTree = treeify(entry, {
 				label: (d) => d.name,
diff --git a/svelte.config.js b/svelte.config.js
index 909efbb..ef2c64e 100644
--- a/svelte.config.js
+++ b/svelte.config.js
@@ -3,14 +3,15 @@ import adapter from '@sveltejs/adapter-static';
 
 import preprocess from 'svelte-preprocess';
 
-/** @type {import('@sveltejs/kit').Config} */
+// /** @type {import('@sveltejs/kit').Config} */
 const config = {
 	// Consult https://github.com/sveltejs/svelte-preprocess
 	// for more information about preprocessors
 	preprocess: [
 		preprocess({
-			postcss: true
-		})
+			postcss: true,
+		}),
+		preprocess.typescript()
 	],
 
 	kit: {