Hard navigate on server version change (#559)

Author: ptlthg

package.json

@@ -32,7 +32,7 @@
 	},
 	"dependencies": {
 		"@napi-rs/canvas": "^0.1.81",
-		"@sentry/sveltekit": "^10.22.0",
+		"@sentry/sveltekit": "^10.25.0",
 		"isomorphic-dompurify": "^2.31.0",
 		"vanilla-cookieconsent": "^3.1.0"
 	},
@@ -48,9 +48,9 @@
 		"@quantco/pnpm-licenses": "^2.2.1",
 		"@sinclair/typebox": "^0.34.41",
 		"@sveltejs/adapter-node": "^5.4.0",
-		"@sveltejs/kit": "2.47.0",
+		"@sveltejs/kit": "2.48.4",
 		"@sveltejs/vite-plugin-svelte": "6.2.0",
-		"@tailwindcss/vite": "^4.1.16",
+		"@tailwindcss/vite": "^4.1.17",
 		"@tanstack/table-core": "^8.21.3",
 		"@types/d3-array": "^3.2.2",
 		"@types/d3-format": "^3.0.4",
@@ -62,7 +62,7 @@
 		"@typeschema/class-validator": "^0.2.0",
 		"@vinejs/vine": "^1.8.0",
 		"arktype": "^2.1.25",
-		"bits-ui": "2.9.6",
+		"bits-ui": "2.14.3",
 		"class-validator": "^0.14.2",
 		"classnames": "^2.5.1",
 		"clsx": "^2.1.1",
@@ -86,11 +86,11 @@
 		"joi": "^17.13.3",
 		"layercake": "^10.0.2",
 		"layerchart": "2.0.0-next.42",
-		"marked": "^16.4.1",
+		"marked": "^16.4.2",
 		"mdsx": "^0.0.7",
 		"mode-watcher": "^1.1.0",
 		"orval": "^7.16.0",
-		"paneforge": "1.0.0-next.6",
+		"paneforge": "1.0.2",
 		"prettier": "^3.6.2",
 		"prettier-plugin-svelte": "^3.4.0",
 		"prettier-plugin-tailwindcss": "^0.6.14",
@@ -99,27 +99,27 @@
 		"rehype-pretty-code": "^0.14.1",
 		"rehype-slug": "^6.0.0",
 		"remark-gfm": "^4.0.1",
-		"runed": "^0.31.1",
+		"runed": "^0.36.0",
 		"superstruct": "^2.0.2",
-		"svelte": "^5.43.2",
+		"svelte": "^5.43.6",
 		"svelte-check": "^4.3.3",
 		"svelte-dnd-action": "^0.9.67",
 		"svelte-sonner": "^1.0.5",
 		"svelte-time": "^2.0.2",
 		"sveltekit-rate-limiter": "^0.7.0",
 		"sveltekit-superforms": "^2.28.0",
-		"tailwind-merge": "^3.3.1",
-		"tailwind-variants": "^1.0.0",
-		"tailwindcss": "^4.1.16",
-		"ts-morph": "^26.0.0",
+		"tailwind-merge": "^3.4.0",
+		"tailwind-variants": "^3.1.1",
+		"tailwindcss": "^4.1.17",
+		"ts-morph": "^27.0.2",
 		"tslib": "^2.8.1",
 		"tw-animate-css": "^1.4.0",
 		"typescript": "^5.9.3",
-		"typescript-eslint": "^8.46.2",
-		"valibot": "^0.42.1",
+		"typescript-eslint": "^8.46.4",
+		"valibot": "^1.1.0",
 		"vaul-svelte": "1.0.0-next.7",
 		"velite": "^0.3.0",
-		"vite": "^7.1.12",
+		"vite": "^7.2.2",
 		"yup": "^1.7.1",
 		"zod": "^4.1.12"
 	}

pnpm-lock.yaml

@@ -21,6 +21,10 @@ declare global {
 		interface Session {
 			session?: AuthSession;
 		}
+		interface PageData {
+			session?: AuthSession;
+			bot: boolean;
+		}
 		// interface Stuff {}
 	}
 

src/app.d.ts

@@ -1,7 +1,9 @@
 <script lang="ts">
+	import { page } from '$app/state';
 	import { PUBLIC_GTAG_MEASUREMENT_ID } from '$env/static/public';
 	import { onMount } from 'svelte';
 	import CookieConsent from './cookie-consent.svelte';
+	import { ADDITIONAL_TAGS } from './tag-config';
 
 	onMount(() => {
 		if (PUBLIC_GTAG_MEASUREMENT_ID) {
@@ -22,6 +24,14 @@
 			window.gtag = gtag;
 		</script>
 	{/if}
+	{#if ADDITIONAL_TAGS && ADDITIONAL_TAGS.length > 0}
+		{#each ADDITIONAL_TAGS as tag, i (i)}
+			{#if tag.condition === undefined || tag.condition(page.data)}
+				<!-- eslint-disable-next-line -->
+				{@html tag.content}
+			{/if}
+		{/each}
+	{/if}
 </svelte:head>
 
 {#if PUBLIC_GTAG_MEASUREMENT_ID}

src/components/analytics/g-tag.svelte

@@ -0,0 +1,2 @@
+// Additional script tags to be included on pages
+export const ADDITIONAL_TAGS: { name: string; content: string; condition: (page: App.PageData) => boolean }[] = [];

src/components/analytics/tag-config.ts

@@ -54,7 +54,7 @@
 	};
 </script>
 
-<div class="m-2 h-[200px] rounded">
+<div class="m-2 h-[200px] rounded dark:scheme-dark">
 	<Chart
 		{data}
 		x="date"
@@ -116,7 +116,7 @@
 					<Tooltip.Header>
 						{tooltipFormatter.format(new Date(data.date * 1000))}
 					</Tooltip.Header>
-					<div class="">
+					<div class="" id="tooltip-content">
 						<p>{getCropDisplayName(getCropFromName(crop) ?? Crop.Wheat)} Collection</p>
 						<p class="font-mono">{(+data.value).toLocaleString()}</p>
 						{#if pests}

src/components/charts/crop-graph.svelte

@@ -70,6 +70,8 @@
 	</div>
 	<div class="flex w-full flex-col gap-2 px-4 md:px-8">
 		<span data-ccpa-link="1" class="text-sm hover:underline"></span>
+		<div id="ncmp-consent-link" class="text-sm hover:underline"></div>
+
 		<div class="flex w-full flex-wrap items-start justify-center gap-x-4 gap-y-2 md:gap-x-8">
 			{#if PUBLIC_COMMIT_HASH !== ''}
 				<p class="text-muted-foreground/50 flex-1 text-xs">

src/components/footer/footer.svelte

@@ -0,0 +1,13 @@
+<script lang="ts">
+	interface Props {
+		content: unknown;
+	}
+
+	let { content }: Props = $props();
+</script>
+
+<svelte:head>
+	<svelte:element this={'script'} type="application/ld+json">
+		{JSON.stringify(content)}
+	</svelte:element>
+</svelte:head>

src/components/head-ld-json.svelte

@@ -1,6 +1,7 @@
 <script lang="ts">
 	import { page } from '$app/state';
 	import { PUBLIC_HOST_URL } from '$env/static/public';
+	import HeadLdJson from './head-ld-json.svelte';
 
 	interface Props {
 		title: string | undefined; // 'Elite | Skyblock Farming Weight';
@@ -56,11 +57,7 @@
 	{/if}
 
 	{#if ldJson}
-		<!-- eslint-disable-next-line svelte/no-at-html-tags -->
-		{@html `<[placeholder] type="application/ld+json">${JSON.stringify(ldJson)}</[placeholder]>`.replaceAll(
-			'[placeholder]',
-			'script'
-		)}`}
+		<HeadLdJson content={ldJson} />
 	{/if}
 
 	{@render children?.()}

src/components/head.svelte

@@ -86,7 +86,7 @@
 					<Clover />
 					My Fortune
 				</DropdownMenu.LinkItem>
-				{#if session.flags.moderator}
+				{#if session.perms.moderator}
 					<DropdownMenu.LinkItem href="/admin">
 						<Shield />
 						Admin