From 6071077e607fc7bc4e0a88109fb02fed15ff2907 Mon Sep 17 00:00:00 2001
From: Simon Holthausen <simon.holthausen@vercel.com>
Date: Wed, 5 Feb 2025 16:21:44 +0100
Subject: [PATCH 1/3] feat: add server reroute hook

closes #13176
---
 documentation/docs/30-advanced/20-hooks.md    |  32 +++++++++++++++
 packages/kit/src/core/sync/write_server.js    |  13 +++++-
 packages/kit/src/exports/public.d.ts          |  14 +++++++
 .../src/runtime/server/page/server_routing.js |   5 ++-
 packages/kit/src/runtime/server/respond.js    |   9 ++++-
 packages/kit/src/types/internal.d.ts          |   5 ++-
 .../apps/server-reroute-hook/package.json     |  25 ++++++++++++
 .../server-reroute-hook/playwright.config.js  |   1 +
 .../apps/server-reroute-hook/src/app.html     |  12 ++++++
 .../server-reroute-hook/src/hooks.server.js   |  18 +++++++++
 .../server-reroute-hook/src/routes/+layout.js |   7 ++++
 .../src/routes/+layout.svelte                 |  14 +++++++
 .../src/routes/+page.svelte                   |   1 +
 .../src/routes/not-rerouted/+page.svelte      |   1 +
 .../src/routes/rerouted-cookie/+page.svelte   |   1 +
 .../src/routes/rerouted-header/+page.svelte   |   1 +
 .../src/routes/rerouted/+page.svelte          |   1 +
 .../server-reroute-hook/static/favicon.png    | Bin 0 -> 1571 bytes
 .../apps/server-reroute-hook/svelte.config.js |   8 ++++
 .../apps/server-reroute-hook/test/test.js     |  37 ++++++++++++++++++
 .../apps/server-reroute-hook/tsconfig.json    |  10 +++++
 .../apps/server-reroute-hook/vite.config.js   |  21 ++++++++++
 packages/kit/types/index.d.ts                 |  14 +++++++
 23 files changed, 243 insertions(+), 7 deletions(-)
 create mode 100644 packages/kit/test/apps/server-reroute-hook/package.json
 create mode 100644 packages/kit/test/apps/server-reroute-hook/playwright.config.js
 create mode 100644 packages/kit/test/apps/server-reroute-hook/src/app.html
 create mode 100644 packages/kit/test/apps/server-reroute-hook/src/hooks.server.js
 create mode 100644 packages/kit/test/apps/server-reroute-hook/src/routes/+layout.js
 create mode 100644 packages/kit/test/apps/server-reroute-hook/src/routes/+layout.svelte
 create mode 100644 packages/kit/test/apps/server-reroute-hook/src/routes/+page.svelte
 create mode 100644 packages/kit/test/apps/server-reroute-hook/src/routes/not-rerouted/+page.svelte
 create mode 100644 packages/kit/test/apps/server-reroute-hook/src/routes/rerouted-cookie/+page.svelte
 create mode 100644 packages/kit/test/apps/server-reroute-hook/src/routes/rerouted-header/+page.svelte
 create mode 100644 packages/kit/test/apps/server-reroute-hook/src/routes/rerouted/+page.svelte
 create mode 100644 packages/kit/test/apps/server-reroute-hook/static/favicon.png
 create mode 100644 packages/kit/test/apps/server-reroute-hook/svelte.config.js
 create mode 100644 packages/kit/test/apps/server-reroute-hook/test/test.js
 create mode 100644 packages/kit/test/apps/server-reroute-hook/tsconfig.json
 create mode 100644 packages/kit/test/apps/server-reroute-hook/vite.config.js

diff --git a/documentation/docs/30-advanced/20-hooks.md b/documentation/docs/30-advanced/20-hooks.md
index b35e66b73a09..5d3345ec706e 100644
--- a/documentation/docs/30-advanced/20-hooks.md
+++ b/documentation/docs/30-advanced/20-hooks.md
@@ -147,6 +147,33 @@ export async function handleFetch({ event, request, fetch }) {
 }
 ```
 
+### reroute
+
+This function runs before `handle` and allows you to change how URLs are translated into routes. The returned pathname (which defaults to `url.pathname`) is used to select the route and its parameters. In order to use this hook, you need to opt in to [server-side route resolution](configuration#router), which means a server request is made before each navigation in order to invoke the server `reroute` hook.
+
+In contrast to the [universal `reroute` hook](#universal-hooks-reroute), it
+
+- is allowed to be async (though you should take extra caution to not do long running operations here, as it will delay navigation)
+- also receives headers and cookies (though you cannot modify them)
+
+For example, you might have two variants of a page via `src/routes/sale/variant-a/+page.svelte` and `src/routes/sale/variant-b/+page.svelte`, which should be accessible as `/sale` and want to use a cookie to determine what variant of the sales page to load. You could implement this with `reroute`:
+
+```js
+/// file: src/hooks.js
+// @errors: 2345
+// @errors: 2304
+
+/** @type {import('@sveltejs/kit').Reroute} */
+export function reroute({ url, cookies }) {
+	if (url.pathname === '/sale') {
+		const variant = cookies.get('sales-variant') ?? 'variant-a';
+		return `/sale/${variant}`;
+	}
+}
+```
+
+Using `reroute` will _not_ change the contents of the browser's address bar, or the value of `event.url`.
+
 ## Shared hooks
 
 The following can be added to `src/hooks.server.js` _and_ `src/hooks.client.js`:
@@ -273,6 +300,11 @@ The following can be added to `src/hooks.js`. Universal hooks run on both server
 
 This function runs before `handle` and allows you to change how URLs are translated into routes. The returned pathname (which defaults to `url.pathname`) is used to select the route and its parameters.
 
+In contrast to the [server `reroute` hook](#server-hooks-reroute), it
+
+- must be synchronous
+- only receives the URL
+
 For example, you might have a `src/routes/[[lang]]/about/+page.svelte` page, which should be accessible as `/en/about` or `/de/ueber-uns` or `/fr/a-propos`. You could implement this with `reroute`:
 
 ```js
diff --git a/packages/kit/src/core/sync/write_server.js b/packages/kit/src/core/sync/write_server.js
index 5e93d5c1cd25..a0273eaad3ee 100644
--- a/packages/kit/src/core/sync/write_server.js
+++ b/packages/kit/src/core/sync/write_server.js
@@ -68,18 +68,27 @@ export async function get_hooks() {
 	let handleFetch;
 	let handleError;
 	let init;
-	${server_hooks ? `({ handle, handleFetch, handleError, init } = await import(${s(server_hooks)}));` : ''}
+	let server_reroute;
+	${server_hooks ? `({ handle, handleFetch, handleError, init, reroute: server_reroute } = await import(${s(server_hooks)}));` : ''}
 
 	let reroute;
 	let transport;
 	${universal_hooks ? `({ reroute, transport } = await import(${s(universal_hooks)}));` : ''}
 
+	if (server_reroute && reroute) {
+		throw new Error('Cannot define "reroute" in both server hooks and universal hooks. Remove the function from one of the files.'); 
+	}
+
+	if (server_reroute && ${config.kit.router.resolution === 'client'}) {
+		throw new Error('Cannot define "reroute" in server hooks when router.resolution is set to "client". Remove the function from the file, or set router.resolution to "server".');
+	}
+
 	return {
 		handle,
 		handleFetch,
 		handleError,
 		init,
-		reroute,
+		reroute: server_reroute ?? reroute,
 		transport
 	};
 }
diff --git a/packages/kit/src/exports/public.d.ts b/packages/kit/src/exports/public.d.ts
index 06bb38fd768c..272db857192b 100644
--- a/packages/kit/src/exports/public.d.ts
+++ b/packages/kit/src/exports/public.d.ts
@@ -816,6 +816,20 @@ export type ClientInit = () => MaybePromise<void>;
  */
 export type Reroute = (event: { url: URL }) => void | string;
 
+/**
+ * The [`reroute`](https://svelte.dev/docs/kit/hooks#Server-hooks-reroute) hook on the server allows you to modify the URL before it is used to determine which route to render.
+ * In contrast to the universal [`reroute`](https://svelte.dev/docs/kit/hooks#Universal-hooks-reroute) hook, it
+ * - is allowed to be async (though you should take extra caution to not do long running operations here, as it will delay navigation)
+ * - also receives headers and cookies (though you cannot modify them)
+ *
+ * @since 2.18.0
+ */
+export type ServerReroute = (event: {
+	url: URL;
+	headers: Omit<Headers, 'set' | 'delete' | 'append'>;
+	cookies: { get: Cookies['get'] };
+}) => MaybePromise<void | string>;
+
 /**
  * The [`transport`](https://svelte.dev/docs/kit/hooks#Universal-hooks-transport) hook allows you to transport custom types across the server/client boundary.
  *
diff --git a/packages/kit/src/runtime/server/page/server_routing.js b/packages/kit/src/runtime/server/page/server_routing.js
index 8f66fb8eb65d..e158744bca2c 100644
--- a/packages/kit/src/runtime/server/page/server_routing.js
+++ b/packages/kit/src/runtime/server/page/server_routing.js
@@ -100,7 +100,10 @@ export async function resolve_route(resolved_path, url, manifest) {
  */
 export function create_server_routing_response(route, params, url, manifest) {
 	const headers = new Headers({
-		'content-type': 'application/javascript; charset=utf-8'
+		'content-type': 'application/javascript; charset=utf-8',
+		// Because we load this on the client via import('...') it's only requested once per session.
+		// We make sure that it is not cached beyond that.
+		'cache-control': 'no-store'
 	});
 
 	if (route) {
diff --git a/packages/kit/src/runtime/server/respond.js b/packages/kit/src/runtime/server/respond.js
index 429d523c3715..57551afa5d1b 100644
--- a/packages/kit/src/runtime/server/respond.js
+++ b/packages/kit/src/runtime/server/respond.js
@@ -114,8 +114,13 @@ export async function respond(request, options, manifest, state) {
 	let resolved_path;
 
 	try {
-		// reroute could alter the given URL, so we pass a copy
-		resolved_path = options.hooks.reroute({ url: new URL(url) }) ?? url.pathname;
+		// reroute could alter the given arguments, so we pass copies
+		resolved_path =
+			(await options.hooks.reroute({
+				url: new URL(url),
+				headers: new Headers(request.headers),
+				cookies: { get: get_cookies(request, url, 'never').cookies.get }
+			})) ?? url.pathname;
 	} catch {
 		return text('Internal Server Error', {
 			status: 500
diff --git a/packages/kit/src/types/internal.d.ts b/packages/kit/src/types/internal.d.ts
index c5d2609fc006..246868807503 100644
--- a/packages/kit/src/types/internal.d.ts
+++ b/packages/kit/src/types/internal.d.ts
@@ -20,7 +20,8 @@ import {
 	Adapter,
 	ServerInit,
 	ClientInit,
-	Transporter
+	Transporter,
+	ServerReroute
 } from '@sveltejs/kit';
 import {
 	HttpMethod,
@@ -142,7 +143,7 @@ export interface ServerHooks {
 	handleFetch: HandleFetch;
 	handle: Handle;
 	handleError: HandleServerError;
-	reroute: Reroute;
+	reroute: ServerReroute;
 	transport: Record<string, Transporter>;
 	init?: ServerInit;
 }
diff --git a/packages/kit/test/apps/server-reroute-hook/package.json b/packages/kit/test/apps/server-reroute-hook/package.json
new file mode 100644
index 000000000000..68690381d77b
--- /dev/null
+++ b/packages/kit/test/apps/server-reroute-hook/package.json
@@ -0,0 +1,25 @@
+{
+	"name": "test-server-reroute-hook",
+	"private": true,
+	"version": "0.0.1",
+	"scripts": {
+		"dev": "vite dev",
+		"build": "vite build",
+		"preview": "vite preview",
+		"prepare": "svelte-kit sync",
+		"check": "svelte-kit sync && tsc && svelte-check",
+		"test": "pnpm test:dev && pnpm test:build",
+		"test:dev": "cross-env DEV=true playwright test",
+		"test:build": "playwright test"
+	},
+	"devDependencies": {
+		"@sveltejs/kit": "workspace:^",
+		"@sveltejs/vite-plugin-svelte": "^5.0.1",
+		"cross-env": "^7.0.3",
+		"svelte": "^5.2.9",
+		"svelte-check": "^4.1.1",
+		"typescript": "^5.5.4",
+		"vite": "^6.0.11"
+	},
+	"type": "module"
+}
diff --git a/packages/kit/test/apps/server-reroute-hook/playwright.config.js b/packages/kit/test/apps/server-reroute-hook/playwright.config.js
new file mode 100644
index 000000000000..33d36b651014
--- /dev/null
+++ b/packages/kit/test/apps/server-reroute-hook/playwright.config.js
@@ -0,0 +1 @@
+export { config as default } from '../../utils.js';
diff --git a/packages/kit/test/apps/server-reroute-hook/src/app.html b/packages/kit/test/apps/server-reroute-hook/src/app.html
new file mode 100644
index 000000000000..79d946ed86a3
--- /dev/null
+++ b/packages/kit/test/apps/server-reroute-hook/src/app.html
@@ -0,0 +1,12 @@
+<!doctype html>
+<html lang="en">
+	<head>
+		<meta charset="utf-8" />
+		<meta name="viewport" content="width=device-width, initial-scale=1" />
+		<link rel="icon" type="image/png" href="%sveltekit.assets%/favicon.png" />
+		%sveltekit.head%
+	</head>
+	<body>
+		<div style="display: contents">%sveltekit.body%</div>
+	</body>
+</html>
diff --git a/packages/kit/test/apps/server-reroute-hook/src/hooks.server.js b/packages/kit/test/apps/server-reroute-hook/src/hooks.server.js
new file mode 100644
index 000000000000..0c47f237a14d
--- /dev/null
+++ b/packages/kit/test/apps/server-reroute-hook/src/hooks.server.js
@@ -0,0 +1,18 @@
+export async function reroute({ url, headers, cookies }) {
+	if (url.pathname === '/not-rerouted') {
+		return;
+	}
+
+	if (url.pathname === '/reroute') {
+		await new Promise((resolve) => setTimeout(resolve, 100)); // simulate async
+		return '/rerouted';
+	}
+
+	if (headers.get('x-reroute')) {
+		return '/rerouted-header';
+	}
+
+	if (cookies.get('reroute')) {
+		return '/rerouted-cookie';
+	}
+}
diff --git a/packages/kit/test/apps/server-reroute-hook/src/routes/+layout.js b/packages/kit/test/apps/server-reroute-hook/src/routes/+layout.js
new file mode 100644
index 000000000000..2b6766631e95
--- /dev/null
+++ b/packages/kit/test/apps/server-reroute-hook/src/routes/+layout.js
@@ -0,0 +1,7 @@
+export function load({ params, route, url }) {
+	return {
+		params,
+		route,
+		url: new URL(url)
+	};
+}
diff --git a/packages/kit/test/apps/server-reroute-hook/src/routes/+layout.svelte b/packages/kit/test/apps/server-reroute-hook/src/routes/+layout.svelte
new file mode 100644
index 000000000000..d27a99a69e85
--- /dev/null
+++ b/packages/kit/test/apps/server-reroute-hook/src/routes/+layout.svelte
@@ -0,0 +1,14 @@
+<script>
+	import { setup } from '../../../../setup.js';
+
+	setup();
+
+	let { children } = $props();
+</script>
+
+<a href="/">/</a>
+<a href="/reroute">/reroute</a>
+<a href="/somewhere">/somewhere</a>
+<a href="/not-rerouted">/not-rerouted</a>
+
+{@render children()}
diff --git a/packages/kit/test/apps/server-reroute-hook/src/routes/+page.svelte b/packages/kit/test/apps/server-reroute-hook/src/routes/+page.svelte
new file mode 100644
index 000000000000..0a88878c34c2
--- /dev/null
+++ b/packages/kit/test/apps/server-reroute-hook/src/routes/+page.svelte
@@ -0,0 +1 @@
+<p>home</p>
diff --git a/packages/kit/test/apps/server-reroute-hook/src/routes/not-rerouted/+page.svelte b/packages/kit/test/apps/server-reroute-hook/src/routes/not-rerouted/+page.svelte
new file mode 100644
index 000000000000..11b7b212e6bd
--- /dev/null
+++ b/packages/kit/test/apps/server-reroute-hook/src/routes/not-rerouted/+page.svelte
@@ -0,0 +1 @@
+<p>not-rerouted</p>
diff --git a/packages/kit/test/apps/server-reroute-hook/src/routes/rerouted-cookie/+page.svelte b/packages/kit/test/apps/server-reroute-hook/src/routes/rerouted-cookie/+page.svelte
new file mode 100644
index 000000000000..c09f27daf1e4
--- /dev/null
+++ b/packages/kit/test/apps/server-reroute-hook/src/routes/rerouted-cookie/+page.svelte
@@ -0,0 +1 @@
+<p>rerouted-cookie</p>
diff --git a/packages/kit/test/apps/server-reroute-hook/src/routes/rerouted-header/+page.svelte b/packages/kit/test/apps/server-reroute-hook/src/routes/rerouted-header/+page.svelte
new file mode 100644
index 000000000000..c4775fd8e2f3
--- /dev/null
+++ b/packages/kit/test/apps/server-reroute-hook/src/routes/rerouted-header/+page.svelte
@@ -0,0 +1 @@
+<p>rerouted-header</p>
diff --git a/packages/kit/test/apps/server-reroute-hook/src/routes/rerouted/+page.svelte b/packages/kit/test/apps/server-reroute-hook/src/routes/rerouted/+page.svelte
new file mode 100644
index 000000000000..0ee3066bba03
--- /dev/null
+++ b/packages/kit/test/apps/server-reroute-hook/src/routes/rerouted/+page.svelte
@@ -0,0 +1 @@
+<p>rerouted</p>
diff --git a/packages/kit/test/apps/server-reroute-hook/static/favicon.png b/packages/kit/test/apps/server-reroute-hook/static/favicon.png
new file mode 100644
index 0000000000000000000000000000000000000000..825b9e65af7c104cfb07089bb28659393b4f2097
GIT binary patch
literal 1571
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
VHuiSbmk|H}002ovPDHLkV1f%e^4kCa

literal 0
HcmV?d00001

diff --git a/packages/kit/test/apps/server-reroute-hook/svelte.config.js b/packages/kit/test/apps/server-reroute-hook/svelte.config.js
new file mode 100644
index 000000000000..cdede3d0b2ea
--- /dev/null
+++ b/packages/kit/test/apps/server-reroute-hook/svelte.config.js
@@ -0,0 +1,8 @@
+/** @type {import('@sveltejs/kit').Config} */
+const config = {
+	kit: {
+		router: { resolution: 'server' }
+	}
+};
+
+export default config;
diff --git a/packages/kit/test/apps/server-reroute-hook/test/test.js b/packages/kit/test/apps/server-reroute-hook/test/test.js
new file mode 100644
index 000000000000..c4c98036b9f4
--- /dev/null
+++ b/packages/kit/test/apps/server-reroute-hook/test/test.js
@@ -0,0 +1,37 @@
+import { expect } from '@playwright/test';
+import { test } from '../../../utils.js';
+
+/** @typedef {import('@playwright/test').Response} Response */
+
+test.describe.configure({ mode: 'parallel' });
+
+test.describe('server-side route resolution with server reroute', () => {
+	test('can reroute based on header', async ({ page, context }) => {
+		await page.goto('/');
+		await expect(page.locator('p')).toHaveText('home');
+
+		context.setExtraHTTPHeaders({ 'x-reroute': 'true' });
+		await page.locator('a[href="/somewhere"]').click();
+		await expect(page.locator('p')).toHaveText('rerouted-header');
+	});
+
+	test('can reroute based on cookie', async ({ page, context }) => {
+		await page.goto('/');
+		await expect(page.locator('p')).toHaveText('home');
+
+		await context.addCookies([{ name: 'reroute', value: 'true', path: '/', domain: 'localhost' }]);
+		await page.locator('a[href="/somewhere"]').click();
+		await expect(page.locator('p')).toHaveText('rerouted-cookie');
+	});
+
+	test('can reroute based on pathname', async ({ page }) => {
+		await page.goto('/');
+		await expect(page.locator('p')).toHaveText('home');
+
+		await page.locator('a[href="/reroute"]').click();
+		await expect(page.locator('p')).toHaveText('rerouted');
+
+		await page.locator('a[href="/not-rerouted"]').click();
+		await expect(page.locator('p')).toHaveText('not-rerouted');
+	});
+});
diff --git a/packages/kit/test/apps/server-reroute-hook/tsconfig.json b/packages/kit/test/apps/server-reroute-hook/tsconfig.json
new file mode 100644
index 000000000000..1d665886266b
--- /dev/null
+++ b/packages/kit/test/apps/server-reroute-hook/tsconfig.json
@@ -0,0 +1,10 @@
+{
+	"compilerOptions": {
+		"allowJs": true,
+		"checkJs": true,
+		"esModuleInterop": true,
+		"noEmit": true,
+		"resolveJsonModule": true
+	},
+	"extends": "./.svelte-kit/tsconfig.json"
+}
diff --git a/packages/kit/test/apps/server-reroute-hook/vite.config.js b/packages/kit/test/apps/server-reroute-hook/vite.config.js
new file mode 100644
index 000000000000..9640847b2704
--- /dev/null
+++ b/packages/kit/test/apps/server-reroute-hook/vite.config.js
@@ -0,0 +1,21 @@
+import * as path from 'node:path';
+import { sveltekit } from '@sveltejs/kit/vite';
+
+/** @type {import('vite').UserConfig} */
+const config = {
+	build: {
+		minify: false
+	},
+	clearScreen: false,
+	plugins: [sveltekit()],
+	server: {
+		fs: {
+			allow: [path.resolve('../../../src')]
+		}
+	},
+	optimizeDeps: {
+		exclude: ['svelte']
+	}
+};
+
+export default config;
diff --git a/packages/kit/types/index.d.ts b/packages/kit/types/index.d.ts
index 39247ec06dd7..2a5681dc9843 100644
--- a/packages/kit/types/index.d.ts
+++ b/packages/kit/types/index.d.ts
@@ -798,6 +798,20 @@ declare module '@sveltejs/kit' {
 	 */
 	export type Reroute = (event: { url: URL }) => void | string;
 
+	/**
+	 * The [`reroute`](https://svelte.dev/docs/kit/hooks#Server-hooks-reroute) hook on the server allows you to modify the URL before it is used to determine which route to render.
+	 * In contrast to the universal [`reroute`](https://svelte.dev/docs/kit/hooks#Universal-hooks-reroute) hook, it
+	 * - is allowed to be async (though you should take extra caution to not do long running operations here, as it will delay navigation)
+	 * - also receives headers and cookies (though you cannot modify them)
+	 *
+	 * @since 2.18.0
+	 */
+	export type ServerReroute = (event: {
+		url: URL;
+		headers: Omit<Headers, 'set' | 'delete' | 'append'>;
+		cookies: { get: Cookies['get'] };
+	}) => MaybePromise<void | string>;
+
 	/**
 	 * The [`transport`](https://svelte.dev/docs/kit/hooks#Universal-hooks-transport) hook allows you to transport custom types across the server/client boundary.
 	 *

From c27da476c34c38d1be8536bbc774ef02c2e7f7f3 Mon Sep 17 00:00:00 2001
From: Simon Holthausen <simon.holthausen@vercel.com>
Date: Wed, 5 Feb 2025 16:23:13 +0100
Subject: [PATCH 2/3] note

---
 packages/kit/src/exports/public.d.ts | 4 +++-
 packages/kit/types/index.d.ts        | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/kit/src/exports/public.d.ts b/packages/kit/src/exports/public.d.ts
index 272db857192b..c48161e4dbda 100644
--- a/packages/kit/src/exports/public.d.ts
+++ b/packages/kit/src/exports/public.d.ts
@@ -672,9 +672,11 @@ export interface KitConfig {
 		 * - The client does not need to load the routing manifest upfront, which can lead to faster initial page loads
 		 * - The list of routes is hidden from public view
 		 * - The server has an opportunity to intercept each navigation (for example through a middleware), enabling (for example) A/B testing opaque to SvelteKit
-
+		 *
 		 * The drawback is that for unvisited paths, resolution will take slightly longer (though this is mitigated by [preloading](https://svelte.dev/docs/kit/link-options#data-sveltekit-preload-data)).
 		 *
+		 * > [!NOTE] When using `reroute` inside `hooks.server.js`, you _must_ use server-side route resolution.
+		 *
 		 * > [!NOTE] When using server-side route resolution and prerendering, the resolution is prerendered along with the route itself.
 		 *
 		 * @default "client"
diff --git a/packages/kit/types/index.d.ts b/packages/kit/types/index.d.ts
index 2a5681dc9843..8390df023eeb 100644
--- a/packages/kit/types/index.d.ts
+++ b/packages/kit/types/index.d.ts
@@ -654,9 +654,11 @@ declare module '@sveltejs/kit' {
 			 * - The client does not need to load the routing manifest upfront, which can lead to faster initial page loads
 			 * - The list of routes is hidden from public view
 			 * - The server has an opportunity to intercept each navigation (for example through a middleware), enabling (for example) A/B testing opaque to SvelteKit
-
+			 *
 			 * The drawback is that for unvisited paths, resolution will take slightly longer (though this is mitigated by [preloading](https://svelte.dev/docs/kit/link-options#data-sveltekit-preload-data)).
 			 *
+			 * > [!NOTE] When using `reroute` inside `hooks.server.js`, you _must_ use server-side route resolution.
+			 *
 			 * > [!NOTE] When using server-side route resolution and prerendering, the resolution is prerendered along with the route itself.
 			 *
 			 * @default "client"

From 637709b54f68e8dd8b71ea2e9bf68865a194a1a5 Mon Sep 17 00:00:00 2001
From: Simon Holthausen <simon.holthausen@vercel.com>
Date: Thu, 6 Feb 2025 13:40:40 +0100
Subject: [PATCH 3/3] lockfile

---
 pnpm-lock.yaml | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index e918a1764f38..fb11c262b1b7 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -647,6 +647,30 @@ importers:
         specifier: ^6.0.11
         version: 6.0.11(@types/node@18.19.50)(lightningcss@1.24.1)
 
+  packages/kit/test/apps/server-reroute-hook:
+    devDependencies:
+      '@sveltejs/kit':
+        specifier: workspace:^
+        version: link:../../..
+      '@sveltejs/vite-plugin-svelte':
+        specifier: ^5.0.1
+        version: 5.0.1(svelte@5.2.9)(vite@6.0.11(@types/node@18.19.50)(lightningcss@1.24.1))
+      cross-env:
+        specifier: ^7.0.3
+        version: 7.0.3
+      svelte:
+        specifier: ^5.2.9
+        version: 5.2.9
+      svelte-check:
+        specifier: ^4.1.1
+        version: 4.1.1(picomatch@4.0.2)(svelte@5.2.9)(typescript@5.6.3)
+      typescript:
+        specifier: ^5.5.4
+        version: 5.6.3
+      vite:
+        specifier: ^6.0.11
+        version: 6.0.11(@types/node@18.19.50)(lightningcss@1.24.1)
+
   packages/kit/test/apps/writes:
     devDependencies:
       '@sveltejs/kit':