From 94b0939c695635f762104f9681e173d2edf72b04 Mon Sep 17 00:00:00 2001
From: Rich Harris <hello@rich-harris.dev>
Date: Wed, 29 Dec 2021 14:37:05 +0000
Subject: [PATCH 01/45] replace request.origin/path/query with request.url

---
 .../src/routes/[list]/[page].svelte           |   3 +-
 .../hn.svelte.dev/src/routes/__layout.svelte  |  13 +-
 .../hn.svelte.dev/src/routes/index.svelte     |   5 +-
 .../hn.svelte.dev/src/routes/item/[id].svelte |  18 +-
 .../src/routes/user/[name].svelte             |  11 +-
 .../default/src/lib/header/Header.svelte      |  12 +-
 packages/kit/src/core/adapt/prerender.js      |  10 +-
 packages/kit/src/core/build/build_server.js   |   2 +-
 packages/kit/src/core/create_app/index.js     |  11 +-
 packages/kit/src/core/dev/index.js            |   6 +-
 packages/kit/src/core/preview/index.js        |   5 +-
 packages/kit/src/runtime/app/stores.js        |  22 ++-
 packages/kit/src/runtime/client/renderer.js   | 159 ++++++++----------
 packages/kit/src/runtime/client/router.js     |  15 +-
 packages/kit/src/runtime/client/start.js      |   3 +-
 packages/kit/src/runtime/client/types.d.ts    |  12 +-
 packages/kit/src/runtime/server/endpoint.js   |   2 +-
 packages/kit/src/runtime/server/index.js      |  19 ++-
 packages/kit/src/runtime/server/page/index.js |  11 +-
 .../kit/src/runtime/server/page/load_node.js  |  76 ++++-----
 .../kit/src/runtime/server/page/render.js     |  26 ++-
 .../kit/src/runtime/server/page/respond.js    |   5 +-
 .../runtime/server/page/respond_with_error.js |  17 +-
 .../apps/amp/src/routes/origin/index.json.js  |   4 +-
 .../apps/amp/src/routes/origin/index.svelte   |   8 +-
 .../routes/caching/private/uses-fetch.svelte  |   4 +-
 .../basics/src/routes/encoded/[slug].svelte   |  10 +-
 .../encoded/\350\213\227\346\235\241.svelte"  |   8 +-
 .../basics/src/routes/keepfocus/index.svelte  |   4 +-
 .../basics/src/routes/load/[dynamic].svelte   |   4 +-
 .../load/change-detection/one/[x].svelte      |   4 +-
 .../load/change-detection/two/[y].svelte      |   4 +-
 .../src/routes/load/large-response.svelte     |   4 +-
 .../routes/load/server-fetch-request.svelte   |   6 +-
 .../src/routes/load/stuff/[x]/[y]/[z].svelte  |   6 +-
 .../routes/load/stuff/[x]/[y]/__layout.svelte |   6 +-
 .../src/routes/load/stuff/[x]/__layout.svelte |   6 +-
 .../basics/src/routes/origin/index.svelte     |   4 +-
 .../apps/basics/src/routes/query/echo.svelte  |   8 +-
 .../basics/src/routes/routing/[slug].svelte   |   4 +-
 .../fallthrough-advanced/[animal].svelte      |   8 +-
 .../fallthrough-advanced/[mineral].svelte     |   8 +-
 .../fallthrough-advanced/[vegetable].svelte   |   8 +-
 .../routing/fallthrough-simple/[legal].svelte |   4 +-
 .../routes/routing/rest/[...rest]/deep.svelte |   8 +-
 .../routing/rest/[...rest]/index.svelte       |   8 +-
 .../non-greedy/[dynamic]-bar/[...rest].svelte |   4 +-
 .../rest/non-greedy/foo/[...rest].svelte      |   4 +-
 .../routing/rest/path/[...ignored].svelte     |   6 +-
 .../routes/routing/skipped/[one]/[two].svelte |   4 +-
 .../routing/split-params/[a]-[b].svelte       |   6 +-
 .../apps/basics/src/routes/store/index.svelte |   6 +-
 .../routes/store/navigating/__layout.svelte   |   2 +-
 .../apps/basics/src/routes/xss/[path].svelte  |   4 +-
 .../apps/basics/src/routes/xss/query.svelte   |   9 +-
 .../pages/custom-extensions/[slug].svelte.md  |   4 +-
 .../options/source/pages/origin/index.json.js |   4 +-
 .../options/source/pages/origin/index.svelte  |   8 +-
 .../options/source/pages/slash/child.svelte   |   4 +-
 .../options/source/pages/slash/index.svelte   |   4 +-
 packages/kit/types/ambient-modules.d.ts       |  18 +-
 packages/kit/types/app.d.ts                   |   3 +-
 packages/kit/types/hooks.d.ts                 |  12 +-
 packages/kit/types/index.d.ts                 |   2 +-
 packages/kit/types/page.d.ts                  |  10 +-
 65 files changed, 349 insertions(+), 366 deletions(-)

diff --git a/examples/hn.svelte.dev/src/routes/[list]/[page].svelte b/examples/hn.svelte.dev/src/routes/[list]/[page].svelte
index ae13c0ad39eb..44b661e01ca6 100644
--- a/examples/hn.svelte.dev/src/routes/[list]/[page].svelte
+++ b/examples/hn.svelte.dev/src/routes/[list]/[page].svelte
@@ -1,7 +1,8 @@
 <script context="module">
 	const valid_lists = new Set(['news', 'newest', 'show', 'ask', 'jobs']);
 
-	export async function load({ page: { params }, fetch }) {
+	/** @type {import('@sveltejs/kit').Load} */
+	export async function load({ params, fetch }) {
 		const list = params.list === 'top' ? 'news' : params.list === 'new' ? 'newest' : params.list;
 
 		if (!valid_lists.has(list)) {
diff --git a/examples/hn.svelte.dev/src/routes/__layout.svelte b/examples/hn.svelte.dev/src/routes/__layout.svelte
index e071fb2a860f..81d98605e36a 100644
--- a/examples/hn.svelte.dev/src/routes/__layout.svelte
+++ b/examples/hn.svelte.dev/src/routes/__layout.svelte
@@ -1,25 +1,24 @@
 <script>
-	import { page, navigating } from '$app/stores';
+	import { url, navigating } from '$app/stores';
 	import Nav from '$lib/Nav.svelte';
 	import PreloadingIndicator from '$lib/PreloadingIndicator.svelte';
 	import ThemeToggler from '$lib/ThemeToggler.svelte';
 	import '../app.css';
 
-
-	$: section = $page.path.split('/')[1];
+	$: section = $url.pathname.split('/')[1];
 </script>
 
-<Nav {section}/>
+<Nav {section} />
 
 {#if $navigating}
-	<PreloadingIndicator/>
+	<PreloadingIndicator />
 {/if}
 
 <main>
-	<slot></slot>
+	<slot />
 </main>
 
-<ThemeToggler/>
+<ThemeToggler />
 
 <style>
 	main {
diff --git a/examples/hn.svelte.dev/src/routes/index.svelte b/examples/hn.svelte.dev/src/routes/index.svelte
index 721c0e9c7555..711c3a0fe835 100644
--- a/examples/hn.svelte.dev/src/routes/index.svelte
+++ b/examples/hn.svelte.dev/src/routes/index.svelte
@@ -1,6 +1,7 @@
 <script context="module">
-	export function load({ page }) {
-		let host = page.host;
+	/** @type {import('@sveltejs/kit').Load} */
+	export function load({ url }) {
+		let host = url.host;
 		const i = host.indexOf(':');
 		if (i >= 0) {
 			host = host.substring(0, i);
diff --git a/examples/hn.svelte.dev/src/routes/item/[id].svelte b/examples/hn.svelte.dev/src/routes/item/[id].svelte
index 9578e5336095..668f939ce47c 100644
--- a/examples/hn.svelte.dev/src/routes/item/[id].svelte
+++ b/examples/hn.svelte.dev/src/routes/item/[id].svelte
@@ -1,6 +1,7 @@
 <script context="module">
-	export async function load({ page, fetch }) {
-		const res = await fetch(`https://api.hnpwa.com/v0/item/${page.params.id}.json`);
+	/** @type {import('@sveltejs/kit').Load} */
+	export async function load({ params, fetch }) {
+		const res = await fetch(`https://api.hnpwa.com/v0/item/${params.id}.json`);
 		const item = await res.json();
 
 		return { props: { item } };
@@ -24,7 +25,10 @@
 			{#if item.domain}<small>{item.domain}</small>{/if}
 		</a>
 
-		<p class="meta">{item.points} points by <a href="/user/{item.user}">{item.user}</a> {item.time_ago}</p>
+		<p class="meta">
+			{item.points} points by <a href="/user/{item.user}">{item.user}</a>
+			{item.time_ago}
+		</p>
 
 		{#if item.content}
 			{@html item.content}
@@ -33,7 +37,7 @@
 
 	<div class="comments">
 		{#each item.comments as comment}
-			<Comment comment='{comment}'/>
+			<Comment {comment} />
 		{/each}
 	</div>
 </div>
@@ -44,13 +48,13 @@
 	}
 
 	.item {
-		border-bottom: 1em solid rgba(0,0,0,0.1);
+		border-bottom: 1em solid rgba(0, 0, 0, 0.1);
 		margin: 0 -2em 2em -2em;
 		padding: 0 2em 2em 2em;
 	}
 
 	:global(html).dark .item {
-		border-bottom: 1em solid rgba(255,255,255,0.1);;
+		border-bottom: 1em solid rgba(255, 255, 255, 0.1);
 	}
 
 	.main-link {
@@ -72,4 +76,4 @@
 	.comments > :global(.comment):first-child {
 		border-top: none;
 	}
-</style>
\ No newline at end of file
+</style>
diff --git a/examples/hn.svelte.dev/src/routes/user/[name].svelte b/examples/hn.svelte.dev/src/routes/user/[name].svelte
index 77159e799882..c8256ce12f58 100644
--- a/examples/hn.svelte.dev/src/routes/user/[name].svelte
+++ b/examples/hn.svelte.dev/src/routes/user/[name].svelte
@@ -1,13 +1,14 @@
 <script context="module">
 	export const hydrate = false;
 
-	export async function load({ page, fetch }) {
-		const res = await fetch(`https://api.hnpwa.com/v0/user/${page.params.name}.json`);
+	/** @type {import('@sveltejs/kit').Load} */
+	export async function load({ params, fetch }) {
+		const res = await fetch(`https://api.hnpwa.com/v0/user/${params.name}.json`);
 		const user = await res.json();
 
 		return {
 			props: {
-				name: page.params.name,
+				name: params.name,
 				user
 			}
 		};
@@ -39,7 +40,7 @@
 
 	{#if user.about}
 		<div class="about">
-			{@html '<p>' + user.about }
+			{@html '<p>' + user.about}
 		</div>
 	{/if}
-</div>
\ No newline at end of file
+</div>
diff --git a/packages/create-svelte/templates/default/src/lib/header/Header.svelte b/packages/create-svelte/templates/default/src/lib/header/Header.svelte
index a6c484e49482..b4e08fde6f9f 100644
--- a/packages/create-svelte/templates/default/src/lib/header/Header.svelte
+++ b/packages/create-svelte/templates/default/src/lib/header/Header.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { page } from '$app/stores';
+	import { url } from '$app/stores';
 	import logo from './svelte-logo.svg';
 </script>
 
@@ -15,9 +15,13 @@
 			<path d="M0,0 L1,2 C1.5,3 1.5,3 2,3 L2,0 Z" />
 		</svg>
 		<ul>
-			<li class:active={$page.path === '/'}><a sveltekit:prefetch href="/">Home</a></li>
-			<li class:active={$page.path === '/about'}><a sveltekit:prefetch href="/about">About</a></li>
-			<li class:active={$page.path === '/todos'}><a sveltekit:prefetch href="/todos">Todos</a></li>
+			<li class:active={$url.pathname === '/'}><a sveltekit:prefetch href="/">Home</a></li>
+			<li class:active={$url.pathname === '/about'}>
+				<a sveltekit:prefetch href="/about">About</a>
+			</li>
+			<li class:active={$url.pathname === '/todos'}>
+				<a sveltekit:prefetch href="/todos">Todos</a>
+			</li>
 		</ul>
 		<svg viewBox="0 0 2 3" aria-hidden="true">
 			<path d="M0,0 L0,3 C0.5,3 0.5,3 1,2 L2,0 Z" />
diff --git a/packages/kit/src/core/adapt/prerender.js b/packages/kit/src/core/adapt/prerender.js
index 6474f3823036..367ae381ce4f 100644
--- a/packages/kit/src/core/adapt/prerender.js
+++ b/packages/kit/src/core/adapt/prerender.js
@@ -180,11 +180,10 @@ export async function prerender({ cwd, out, log, config, build_data, fallback, a
 
 		const rendered = await app.render(
 			{
+				url: `${config.kit.protocol || 'sveltekit'}://${config.kit.host || 'prerender'}${path}`,
 				method: 'GET',
 				headers: {},
-				path,
-				rawBody: null,
-				query: new URLSearchParams()
+				rawBody: null
 			},
 			{
 				prerender: {
@@ -330,11 +329,10 @@ export async function prerender({ cwd, out, log, config, build_data, fallback, a
 	if (fallback) {
 		const rendered = await app.render(
 			{
+				url: `${config.kit.host || 'sveltekit'}://${config.kit.host || 'prerender'}/[fallback]`,
 				method: 'GET',
 				headers: {},
-				path: '[fallback]', // this doesn't matter, but it's easiest if it's a string
-				rawBody: null,
-				query: new URLSearchParams()
+				rawBody: null
 			},
 			{
 				prerender: {
diff --git a/packages/kit/src/core/build/build_server.js b/packages/kit/src/core/build/build_server.js
index e38d90851691..0411241f351c 100644
--- a/packages/kit/src/core/build/build_server.js
+++ b/packages/kit/src/core/build/build_server.js
@@ -101,7 +101,7 @@ export class App {
 				: 'default_protocol'
 		};
 
-		return respond({ ...request, origin: protocol + '://' + host }, this.options, { prerender });
+		return respond({ ...request, url: new URL(request.url, protocol + '://' + host) }, this.options, { prerender });
 	}
 }
 `;
diff --git a/packages/kit/src/core/create_app/index.js b/packages/kit/src/core/create_app/index.js
index ec4ec77dc918..6b8ffe65f2ce 100644
--- a/packages/kit/src/core/create_app/index.js
+++ b/packages/kit/src/core/create_app/index.js
@@ -130,7 +130,7 @@ function generate_app(manifest_data) {
 	while (l--) {
 		pyramid = `
 			{#if components[${l + 1}]}
-				<svelte:component this={components[${l}]} {...(props_${l} || {})}>				
+				<svelte:component this={components[${l}]} {...(props_${l} || {})}>
 					${pyramid.replace(/\n/g, '\n\t\t\t\t\t')}
 				</svelte:component>
 			{:else}
@@ -148,22 +148,23 @@ function generate_app(manifest_data) {
 
 			// stores
 			export let stores;
-			export let page;
+			export let url;
+			export let params;
 
 			export let components;
 			${levels.map((l) => `export let props_${l} = null;`).join('\n\t\t\t')}
 
 			setContext('__svelte__', stores);
 
-			$: stores.page.set(page);
-			afterUpdate(stores.page.notify);
+			$: stores.url.set(url);
+			afterUpdate(stores.url.notify);
 
 			let mounted = false;
 			let navigated = false;
 			let title = null;
 
 			onMount(() => {
-				const unsubscribe = stores.page.subscribe(() => {
+				const unsubscribe = stores.url.subscribe(() => {
 					if (mounted) {
 						navigated = true;
 						title = document.title || 'untitled page';
diff --git a/packages/kit/src/core/dev/index.js b/packages/kit/src/core/dev/index.js
index 049288e5eb84..6f6a6a294177 100644
--- a/packages/kit/src/core/dev/index.js
+++ b/packages/kit/src/core/dev/index.js
@@ -395,15 +395,11 @@ async function create_plugin(config, dir, https, get_manifest) {
 					return res.end(err.reason || 'Invalid request body');
 				}
 
-				const origin = `${https ? 'https' : 'http'}://${req.headers.host}`;
-
 				const rendered = await respond(
 					{
+						url: new URL(`${https ? 'https' : 'http'}://${req.headers.host}${req.url}`),
 						headers: /** @type {import('types/helper').RequestHeaders} */ (req.headers),
 						method: req.method,
-						origin,
-						path: parsed.pathname.replace(config.kit.paths.base, ''),
-						query: parsed.searchParams,
 						rawBody: body
 					},
 					{
diff --git a/packages/kit/src/core/preview/index.js b/packages/kit/src/core/preview/index.js
index fba7ee83a813..53c24ab15087 100644
--- a/packages/kit/src/core/preview/index.js
+++ b/packages/kit/src/core/preview/index.js
@@ -93,12 +93,11 @@ export async function preview({
 			const parsed = new URL(initial_url, 'http://localhost/');
 
 			const rendered =
-				parsed.pathname.startsWith(config.kit.paths.base) &&
+				initial_url.startsWith(config.kit.paths.base) &&
 				(await app.render({
+					url: `${use_https ? 'https' : 'http'}://${req.headers.host}${initial_url}`,
 					method: req.method,
 					headers: /** @type {import('types/helper').RequestHeaders} */ (req.headers),
-					path: parsed.pathname.replace(config.kit.paths.base, ''),
-					query: parsed.searchParams,
 					rawBody: body
 				}));
 
diff --git a/packages/kit/src/runtime/app/stores.js b/packages/kit/src/runtime/app/stores.js
index 01aff2cadba2..5a61f3a2df50 100644
--- a/packages/kit/src/runtime/app/stores.js
+++ b/packages/kit/src/runtime/app/stores.js
@@ -20,8 +20,11 @@ export const getStores = () => {
 	const stores = getContext('__svelte__');
 
 	return {
-		page: {
-			subscribe: stores.page.subscribe
+		url: {
+			subscribe: stores.url.subscribe
+		},
+		params: {
+			subscribe: stores.params.subscribe
 		},
 		navigating: {
 			subscribe: stores.navigating.subscribe
@@ -38,11 +41,20 @@ export const getStores = () => {
 	};
 };
 
-/** @type {typeof import('$app/stores').page} */
-export const page = {
+/** @type {typeof import('$app/stores').url} */
+export const url = {
+	/** @param {(value: any) => void} fn */
+	subscribe(fn) {
+		const store = getStores().url;
+		return store.subscribe(fn);
+	}
+};
+
+/** @type {typeof import('$app/stores').url} */
+export const params = {
 	/** @param {(value: any) => void} fn */
 	subscribe(fn) {
-		const store = getStores().page;
+		const store = getStores().params;
 		return store.subscribe(fn);
 	}
 };
diff --git a/packages/kit/src/runtime/client/renderer.js b/packages/kit/src/runtime/client/renderer.js
index 666ed2b20eae..b54546bafa70 100644
--- a/packages/kit/src/runtime/client/renderer.js
+++ b/packages/kit/src/runtime/client/renderer.js
@@ -5,13 +5,11 @@ import { normalize } from '../load.js';
 
 /**
  * @typedef {import('types/internal').CSRComponent} CSRComponent
- *
- * @typedef {Partial<import('types/page').Page>} Page
- * @typedef {{ from: Page; to: Page }} Navigating
+ * @typedef {{ from: URL; to: URL }} Navigating
  */
 
 /** @param {any} value */
-function page_store(value) {
+function notifiable_store(value) {
 	const store = writable(value);
 	let ready = true;
 
@@ -91,7 +89,7 @@ export class Renderer {
 		/** @type {import('./types').NavigationState} */
 		this.current = {
 			// @ts-ignore - we need the initial value to be null
-			page: null,
+			url: null,
 			session_id: 0,
 			branch: []
 		};
@@ -106,7 +104,8 @@ export class Renderer {
 		};
 
 		this.stores = {
-			page: page_store({}),
+			url: notifiable_store({}),
+			params: notifiable_store({}),
 			navigating: writable(/** @type {Navigating | null} */ (null)),
 			session: writable(session)
 		};
@@ -133,10 +132,11 @@ export class Renderer {
 	 *   status: number;
 	 *   error: Error;
 	 *   nodes: Array<Promise<CSRComponent>>;
-	 *   page: import('types/page').Page;
+	 *   url: URL;
+	 *   params: Record<string, string>;
 	 * }} selected
 	 */
-	async start({ status, error, nodes, page }) {
+	async start({ status, error, nodes, url, params }) {
 		/** @type {Array<import('./types').BranchNode | undefined>} */
 		const branch = [];
 
@@ -154,7 +154,8 @@ export class Renderer {
 
 				const node = await this._load_node({
 					module: await nodes[i],
-					page,
+					url,
+					params,
 					stuff,
 					status: is_leaf ? status : undefined,
 					error: is_leaf ? error : undefined
@@ -168,8 +169,7 @@ export class Renderer {
 						error_args = {
 							status: node.loaded.status,
 							error: node.loaded.error,
-							path: page.path,
-							query: page.query
+							url
 						};
 					} else if (node.loaded.stuff) {
 						stuff = {
@@ -182,15 +182,14 @@ export class Renderer {
 
 			result = error_args
 				? await this._load_error(error_args)
-				: await this._get_navigation_result_from_branch({ page, branch });
+				: await this._get_navigation_result_from_branch({ url, params, branch });
 		} catch (e) {
 			if (error) throw e;
 
 			result = await this._load_error({
 				status: 500,
 				error: coalesce_to_error(e),
-				path: page.path,
-				query: page.query
+				url
 			});
 		}
 
@@ -213,14 +212,8 @@ export class Renderer {
 	async handle_navigation(info, chain, no_cache, opts) {
 		if (this.started) {
 			this.stores.navigating.set({
-				from: {
-					path: this.current.page.path,
-					query: this.current.page.query
-				},
-				to: {
-					path: info.path,
-					query: info.query
-				}
+				from: this.current.url,
+				to: info.url
 			});
 		}
 
@@ -243,18 +236,17 @@ export class Renderer {
 		this.invalid.clear();
 
 		if (navigation_result.redirect) {
-			if (chain.length > 10 || chain.includes(info.path)) {
+			if (chain.length > 10 || chain.includes(info.url.pathname)) {
 				navigation_result = await this._load_error({
 					status: 500,
 					error: new Error('Redirect loop'),
-					path: info.path,
-					query: info.query
+					url: info.url
 				});
 			} else {
 				if (this.router) {
 					this.router.goto(navigation_result.redirect, { replaceState: true }, [
 						...chain,
-						info.path
+						info.url.pathname
 					]);
 				} else {
 					location.href = new URL(navigation_result.redirect, location.href).href;
@@ -416,20 +408,20 @@ export class Renderer {
 
 		return await this._load_error({
 			status: 404,
-			error: new Error(`Not found: ${info.path}`),
-			path: info.path,
-			query: info.query
+			error: new Error(`Not found: ${info.url.pathname}`),
+			url: info.url
 		});
 	}
 
 	/**
 	 *
 	 * @param {{
-	 *   page: import('types/page').Page;
-	 *   branch: Array<import('./types').BranchNode | undefined>
+	 *   url: URL;
+	 *   params: Record<string, string>;
+	 *   branch: Array<import('./types').BranchNode | undefined>;
 	 * }} opts
 	 */
-	async _get_navigation_result_from_branch({ page, branch }) {
+	async _get_navigation_result_from_branch({ url, params, branch }) {
 		const filtered = /** @type {import('./types').BranchNode[] } */ (branch.filter(Boolean));
 		const redirect = filtered.find((f) => f.loaded && f.loaded.redirect);
 
@@ -437,7 +429,8 @@ export class Renderer {
 		const result = {
 			redirect: redirect && redirect.loaded ? redirect.loaded.redirect : undefined,
 			state: {
-				page,
+				url,
+				params,
 				branch,
 				session_id: this.session_id
 			},
@@ -451,19 +444,19 @@ export class Renderer {
 			result.props[`props_${i}`] = loaded ? await loaded.props : null;
 		}
 
-		if (
-			!this.current.page ||
-			page.path !== this.current.page.path ||
-			page.query.toString() !== this.current.page.query.toString()
-		) {
-			result.props.page = page;
+		if (!this.current.url || url.href !== this.current.url.href) {
+			result.props.url = url;
+		}
+
+		if (!this.current.params || JSON.stringify(params) !== JSON.stringify(this.current.params)) {
+			result.props.params = params;
 		}
 
 		const leaf = filtered[filtered.length - 1];
 		const maxage = leaf.loaded && leaf.loaded.maxage;
 
 		if (maxage) {
-			const key = `${page.path}?${page.query}`;
+			const key = url.origin + url.pathname; // omit hash
 			let ready = false;
 
 			const clear = () => {
@@ -494,19 +487,19 @@ export class Renderer {
 	 *   status?: number;
 	 *   error?: Error;
 	 *   module: CSRComponent;
-	 *   page: import('types/page').Page;
+	 *   url: URL;
+	 *   params: Record<string, string>;
 	 *   stuff: Record<string, any>;
 	 * }} options
 	 * @returns
 	 */
-	async _load_node({ status, error, module, page, stuff }) {
+	async _load_node({ status, error, module, url, params, stuff }) {
 		/** @type {import('./types').BranchNode} */
 		const node = {
 			module,
 			uses: {
 				params: new Set(),
-				path: false,
-				query: false,
+				url: false,
 				session: false,
 				stuff: false,
 				dependencies: []
@@ -516,12 +509,12 @@ export class Renderer {
 		};
 
 		/** @type {Record<string, string>} */
-		const params = {};
-		for (const key in page.params) {
-			Object.defineProperty(params, key, {
+		const uses_params = {};
+		for (const key in params) {
+			Object.defineProperty(uses_params, key, {
 				get() {
 					node.uses.params.add(key);
-					return page.params[key];
+					return params[key];
 				},
 				enumerable: true
 			});
@@ -534,17 +527,10 @@ export class Renderer {
 
 			/** @type {import('types/page').LoadInput | import('types/page').ErrorLoadInput} */
 			const load_input = {
-				page: {
-					origin: page.origin,
-					params,
-					get path() {
-						node.uses.path = true;
-						return page.path;
-					},
-					get query() {
-						node.uses.query = true;
-						return page.query;
-					}
+				params: uses_params,
+				get url() {
+					node.uses.url = true;
+					return url;
 				},
 				get session() {
 					node.uses.session = true;
@@ -555,8 +541,8 @@ export class Renderer {
 					return { ...stuff };
 				},
 				fetch(resource, info) {
-					const url = typeof resource === 'string' ? resource : resource.url;
-					const { href } = new URL(url, new URL(page.path, document.baseURI));
+					const requested = typeof resource === 'string' ? resource : resource.url;
+					const { href } = new URL(requested, url);
 					node.uses.dependencies.push(href);
 
 					return started ? fetch(resource, info) : initial_fetch(resource, info);
@@ -585,8 +571,8 @@ export class Renderer {
 	 * @param {boolean} no_cache
 	 * @returns {Promise<import('./types').NavigationResult | undefined>} undefined if fallthrough
 	 */
-	async _load({ route, info: { path, decoded_path, query } }, no_cache) {
-		const key = `${decoded_path}?${query}`;
+	async _load({ route, info: { url } }, no_cache) {
+		const key = url.pathname + url.search;
 
 		if (!no_cache) {
 			const cached = this.cache.get(key);
@@ -596,19 +582,15 @@ export class Renderer {
 		const [pattern, a, b, get_params] = route;
 		const params = get_params
 			? // the pattern is for the route which we've already matched to this path
-			  get_params(/** @type {RegExpExecArray}  */ (pattern.exec(decoded_path)))
+			  get_params(/** @type {RegExpExecArray}  */ (pattern.exec(url.pathname))) // TODO this needs to account for paths.base
 			: {};
 
-		const changed = this.current.page && {
-			path: path !== this.current.page.path,
-			params: Object.keys(params).filter((key) => this.current.page.params[key] !== params[key]),
-			query: query.toString() !== this.current.page.query.toString(),
+		const changed = this.current.url && {
+			url: key !== this.current.url.pathname + this.current.url.search,
+			params: Object.keys(params).filter((key) => this.current.params[key] !== params[key]),
 			session: this.session_id !== this.current.session_id
 		};
 
-		/** @type {import('types/page').Page} */
-		const page = { origin: this.origin, path, query, params };
-
 		/** @type {Array<import('./types').BranchNode | undefined>} */
 		let branch = [];
 
@@ -638,9 +620,8 @@ export class Renderer {
 				const changed_since_last_render =
 					!previous ||
 					module !== previous.module ||
-					(changed.path && previous.uses.path) ||
+					(changed.url && previous.uses.url) ||
 					changed.params.some((param) => previous.uses.params.has(param)) ||
-					(changed.query && previous.uses.query) ||
 					(changed.session && previous.uses.session) ||
 					previous.uses.dependencies.some((dep) => this.invalid.has(dep)) ||
 					(stuff_changed && previous.uses.stuff);
@@ -648,7 +629,8 @@ export class Renderer {
 				if (changed_since_last_render) {
 					node = await this._load_node({
 						module,
-						page,
+						url,
+						params,
 						stuff
 					});
 
@@ -701,7 +683,8 @@ export class Renderer {
 								status,
 								error,
 								module: await b[i](),
-								page,
+								url,
+								params,
 								stuff: node_loaded.stuff
 							});
 
@@ -720,8 +703,7 @@ export class Renderer {
 				return await this._load_error({
 					status,
 					error,
-					path,
-					query
+					url
 				});
 			} else {
 				if (node && node.loaded && node.loaded.stuff) {
@@ -735,28 +717,24 @@ export class Renderer {
 			}
 		}
 
-		return await this._get_navigation_result_from_branch({ page, branch });
+		return await this._get_navigation_result_from_branch({ url, params, branch });
 	}
 
 	/**
 	 * @param {{
 	 *   status?: number;
 	 *   error: Error;
-	 *   path: string;
-	 *   query: URLSearchParams
+	 *   url: URL;
 	 * }} opts
 	 */
-	async _load_error({ status, error, path, query }) {
-		const page = {
-			origin: this.origin,
-			path,
-			query,
-			params: {}
-		};
+	async _load_error({ status, error, url }) {
+		/** @type {Record<string, string>} */
+		const params = {}; // error page does not have params
 
 		const node = await this._load_node({
 			module: await this.fallback[0],
-			page,
+			url,
+			params,
 			stuff: {}
 		});
 
@@ -766,11 +744,12 @@ export class Renderer {
 				status,
 				error,
 				module: await this.fallback[1],
-				page,
+				url,
+				params,
 				stuff: (node && node.loaded && node.loaded.stuff) || {}
 			})
 		];
 
-		return await this._get_navigation_result_from_branch({ page, branch });
+		return await this._get_navigation_result_from_branch({ url, params, branch });
 	}
 }
diff --git a/packages/kit/src/runtime/client/router.js b/packages/kit/src/runtime/client/router.js
index 81fb8941c67c..726e0680f239 100644
--- a/packages/kit/src/runtime/client/router.js
+++ b/packages/kit/src/runtime/client/router.js
@@ -195,10 +195,9 @@ export class Router {
 			const decoded_path = decodeURI(path);
 			const routes = this.routes.filter(([pattern]) => pattern.test(decoded_path));
 
-			const query = new URLSearchParams(url.search);
-			const id = `${path}?${query}`;
+			const id = url.pathname + url.search;
 
-			return { id, routes, path, decoded_path, query };
+			return { id, routes, url };
 		}
 	}
 
@@ -269,18 +268,18 @@ export class Router {
 		this.navigating++;
 
 		// remove trailing slashes
-		if (info.path !== '/') {
-			const has_trailing_slash = info.path.endsWith('/');
+		if (url.pathname !== '/') {
+			const has_trailing_slash = url.pathname.endsWith('/');
 
 			const incorrect =
 				(has_trailing_slash && this.trailing_slash === 'never') ||
 				(!has_trailing_slash &&
 					this.trailing_slash === 'always' &&
-					!(info.path.split('/').pop() || '').includes('.'));
+					!(url.pathname.split('/').pop() || '').includes('.'));
 
 			if (incorrect) {
-				info.path = has_trailing_slash ? info.path.slice(0, -1) : info.path + '/';
-				history.replaceState({}, '', `${this.base}${info.path}${location.search}`);
+				url.pathname = has_trailing_slash ? url.pathname.slice(0, -1) : url.pathname + '/';
+				history.replaceState({}, '', url);
 			}
 		}
 
diff --git a/packages/kit/src/runtime/client/start.js b/packages/kit/src/runtime/client/start.js
index b06d0fca9039..e1422ebb5686 100644
--- a/packages/kit/src/runtime/client/start.js
+++ b/packages/kit/src/runtime/client/start.js
@@ -23,7 +23,8 @@ import { set_paths } from '../paths.js';
  *     status: number;
  *     error: Error;
  *     nodes: Array<Promise<import('types/internal').CSRComponent>>;
- *     page: import('types/page').Page;
+ *     url: URL;
+ *     params: Record<string, string>;
  *   };
  * }} opts
  */
diff --git a/packages/kit/src/runtime/client/types.d.ts b/packages/kit/src/runtime/client/types.d.ts
index 26a4f8030bb7..f4cbb70ff7c7 100644
--- a/packages/kit/src/runtime/client/types.d.ts
+++ b/packages/kit/src/runtime/client/types.d.ts
@@ -1,12 +1,10 @@
 import { CSRComponent, CSRRoute, NormalizedLoadOutput } from 'types/internal';
-import { Page } from 'types/page';
 
 export type NavigationInfo = {
 	id: string;
 	routes: CSRRoute[];
-	path: string;
-	decoded_path: string;
-	query: URLSearchParams;
+	url: URL;
+	// decoded_path: string; TODO do we need this?
 };
 
 export type NavigationCandidate = {
@@ -25,8 +23,7 @@ export type BranchNode = {
 	loaded: NormalizedLoadOutput | null;
 	uses: {
 		params: Set<string>;
-		path: boolean;
-		query: boolean;
+		url: boolean; // TODO make more granular?
 		session: boolean;
 		stuff: boolean;
 		dependencies: string[];
@@ -35,7 +32,8 @@ export type BranchNode = {
 };
 
 export type NavigationState = {
-	page: Page;
+	url: URL;
+	params: Record<string, string>;
 	branch: Array<BranchNode | undefined>;
 	session_id: number;
 };
diff --git a/packages/kit/src/runtime/server/endpoint.js b/packages/kit/src/runtime/server/endpoint.js
index c513da3fa76c..d75435041281 100644
--- a/packages/kit/src/runtime/server/endpoint.js
+++ b/packages/kit/src/runtime/server/endpoint.js
@@ -51,7 +51,7 @@ export async function render_endpoint(request, route, match) {
 	const params = route.params ? decode_params(route.params(match)) : {};
 
 	const response = await handler({ ...request, params });
-	const preface = `Invalid response from route ${request.path}`;
+	const preface = `Invalid response from route ${request.url.pathname}`;
 
 	if (!response) {
 		return;
diff --git a/packages/kit/src/runtime/server/index.js b/packages/kit/src/runtime/server/index.js
index e63482a77150..e2b9cd9010dd 100644
--- a/packages/kit/src/runtime/server/index.js
+++ b/packages/kit/src/runtime/server/index.js
@@ -10,22 +10,23 @@ import { coalesce_to_error } from '../../utils/error.js';
 
 /** @type {import('@sveltejs/kit/ssr').Respond} */
 export async function respond(incoming, options, state = {}) {
-	if (incoming.path !== '/' && options.trailing_slash !== 'ignore') {
-		const has_trailing_slash = incoming.path.endsWith('/');
+	if (incoming.url.pathname !== '/' && options.trailing_slash !== 'ignore') {
+		const has_trailing_slash = incoming.url.pathname.endsWith('/');
 
 		if (
 			(has_trailing_slash && options.trailing_slash === 'never') ||
 			(!has_trailing_slash &&
 				options.trailing_slash === 'always' &&
-				!(incoming.path.split('/').pop() || '').includes('.'))
+				!(incoming.url.pathname.split('/').pop() || '').includes('.'))
 		) {
-			const path = has_trailing_slash ? incoming.path.slice(0, -1) : incoming.path + '/';
-			const q = incoming.query.toString();
+			incoming.url.pathname = has_trailing_slash
+				? incoming.url.pathname.slice(0, -1)
+				: incoming.url.pathname + '/';
 
 			return {
 				status: 301,
 				headers: {
-					location: options.paths.base + path + (q ? `?${q}` : '')
+					location: incoming.url.pathname + incoming.url.search
 				}
 			};
 		}
@@ -46,6 +47,8 @@ export async function respond(incoming, options, state = {}) {
 			resolve: async (request) => {
 				if (state.prerender && state.prerender.fallback) {
 					return await render_response({
+						url: request.url,
+						params: request.params,
 						options,
 						$session: await options.hooks.getSession(request),
 						page_config: { ssr: false, router: true, hydrate: true },
@@ -54,7 +57,7 @@ export async function respond(incoming, options, state = {}) {
 					});
 				}
 
-				const decoded = decodeURI(request.path);
+				const decoded = decodeURI(request.url.pathname); // TODO account for paths.base
 				for (const route of options.manifest._.routes) {
 					const match = route.pattern.exec(decoded);
 					if (!match) continue;
@@ -102,7 +105,7 @@ export async function respond(incoming, options, state = {}) {
 						state,
 						$session,
 						status: 404,
-						error: new Error(`Not found: ${request.path}`)
+						error: new Error(`Not found: ${request.url.pathname}`)
 					});
 				}
 			}
diff --git a/packages/kit/src/runtime/server/page/index.js b/packages/kit/src/runtime/server/page/index.js
index d32ef3740435..4eeceea8d67b 100644
--- a/packages/kit/src/runtime/server/page/index.js
+++ b/packages/kit/src/runtime/server/page/index.js
@@ -15,19 +15,12 @@ export async function render_page(request, route, match, options, state) {
 		return {
 			status: 404,
 			headers: {},
-			body: `Not found: ${request.path}`
+			body: `Not found: ${request.url.pathname}`
 		};
 	}
 
 	const params = route.params ? decode_params(route.params(match)) : {};
 
-	const page = {
-		origin: request.origin,
-		path: request.path,
-		query: request.query,
-		params
-	};
-
 	const $session = await options.hooks.getSession(request);
 
 	const response = await respond({
@@ -36,7 +29,7 @@ export async function render_page(request, route, match, options, state) {
 		state,
 		$session,
 		route,
-		page
+		params
 	});
 
 	if (response) {
diff --git a/packages/kit/src/runtime/server/page/load_node.js b/packages/kit/src/runtime/server/page/load_node.js
index a5018bdf2025..19493692f900 100644
--- a/packages/kit/src/runtime/server/page/load_node.js
+++ b/packages/kit/src/runtime/server/page/load_node.js
@@ -10,7 +10,8 @@ import { is_root_relative, resolve } from '../../../utils/url.js';
  *   options: import('types/internal').SSRRenderOptions;
  *   state: import('types/internal').SSRRenderState;
  *   route: import('types/internal').SSRPage | null;
- *   page: import('types/page').Page;
+ *   url: URL;
+ *   params: Record<string, string>;
  *   node: import('types/internal').SSRNode;
  *   $session: any;
  *   stuff: Record<string, any>;
@@ -27,7 +28,8 @@ export async function load_node({
 	options,
 	state,
 	route,
-	page,
+	url,
+	params,
 	node,
 	$session,
 	stuff,
@@ -57,9 +59,9 @@ export async function load_node({
 
 	let loaded;
 
-	const page_proxy = new Proxy(page, {
+	const url_proxy = new Proxy(url, {
 		get: (target, prop, receiver) => {
-			if (prop === 'query' && prerender_enabled) {
+			if (prerender_enabled && (prop === 'search' || prop === 'searchParams')) {
 				throw new Error('Cannot access query on a page with prerendering enabled');
 			}
 			return Reflect.get(target, prop, receiver);
@@ -69,7 +71,8 @@ export async function load_node({
 	if (module.load) {
 		/** @type {import('types/page').LoadInput | import('types/page').ErrorLoadInput} */
 		const load_input = {
-			page: page_proxy,
+			url: url_proxy,
+			params,
 			get session() {
 				uses_credentials = true;
 				return $session;
@@ -80,12 +83,12 @@ export async function load_node({
 			 */
 			fetch: async (resource, opts = {}) => {
 				/** @type {string} */
-				let url;
+				let requested;
 
 				if (typeof resource === 'string') {
-					url = resource;
+					requested = resource;
 				} else {
-					url = resource.url;
+					requested = resource.url;
 
 					opts = {
 						method: resource.method,
@@ -103,7 +106,7 @@ export async function load_node({
 
 				opts.headers = new Headers(opts.headers);
 
-				const resolved = resolve(request.path, url.split('?')[0]);
+				const resolved = resolve(request.url.pathname, requested.split('?')[0]);
 
 				let response;
 
@@ -130,7 +133,7 @@ export async function load_node({
 							headers: type ? { 'content-type': type } : {}
 						});
 					} else {
-						response = await fetch(`${page.origin}/${file}`, /** @type {RequestInit} */ (opts));
+						response = await fetch(`${url.origin}/${file}`, /** @type {RequestInit} */ (opts));
 					}
 				} else if (is_root_relative(resolved)) {
 					const relative = resolved;
@@ -156,20 +159,18 @@ export async function load_node({
 						throw new Error('Request body must be a string');
 					}
 
-					const search = url.includes('?') ? url.slice(url.indexOf('?') + 1) : '';
+					const search = requested.includes('?') ? requested.slice(requested.indexOf('?') + 1) : '';
 
 					const rendered = await respond(
 						{
-							origin: request.origin,
+							url: new URL(requested, request.url),
 							method: opts.method || 'GET',
 							headers: Object.fromEntries(opts.headers),
-							path: relative,
-							rawBody: opts.body == null ? null : new TextEncoder().encode(opts.body),
-							query: new URLSearchParams(search)
+							rawBody: opts.body == null ? null : new TextEncoder().encode(opts.body)
 						},
 						options,
 						{
-							fetched: url,
+							fetched: requested,
 							initiator: route
 						}
 					);
@@ -189,7 +190,7 @@ export async function load_node({
 					} else {
 						// we can't load the endpoint from our own manifest,
 						// so we need to make an actual HTTP request
-						return fetch(request.origin + relative + search, {
+						return fetch(new URL(requested, request.url).href, {
 							method: opts.method || 'GET',
 							headers: opts.headers
 						});
@@ -197,32 +198,29 @@ export async function load_node({
 				} else {
 					// external
 					if (resolved.startsWith('//')) {
-						throw new Error(`Cannot request protocol-relative URL (${url}) in server-side fetch`);
+						throw new Error(
+							`Cannot request protocol-relative URL (${requested}) in server-side fetch`
+						);
 					}
 
 					// external fetch
-					if (typeof request.origin !== 'undefined') {
-						const fetch_hostname = new URL(url).hostname;
-						const server_hostname = new URL(request.origin).hostname;
-
-						// allow cookie passthrough for "same-origin"
-						// if SvelteKit is serving my.domain.com:
-						// -        domain.com WILL NOT receive cookies
-						// -     my.domain.com WILL receive cookies
-						// -    api.domain.dom WILL NOT receive cookies
-						// - sub.my.domain.com WILL receive cookies
-						// ports do not affect the resolution
-						// leading dot prevents mydomain.com matching domain.com
-						if (
-							`.${fetch_hostname}`.endsWith(`.${server_hostname}`) &&
-							opts.credentials !== 'omit'
-						) {
-							uses_credentials = true;
-							opts.headers.set('cookie', request.headers.cookie);
-						}
+					// allow cookie passthrough for "same-origin"
+					// if SvelteKit is serving my.domain.com:
+					// -        domain.com WILL NOT receive cookies
+					// -     my.domain.com WILL receive cookies
+					// -    api.domain.dom WILL NOT receive cookies
+					// - sub.my.domain.com WILL receive cookies
+					// ports do not affect the resolution
+					// leading dot prevents mydomain.com matching domain.com
+					if (
+						`.${new URL(requested).hostname}`.endsWith(`.${request.url.hostname}`) &&
+						opts.credentials !== 'omit'
+					) {
+						uses_credentials = true;
+						opts.headers.set('cookie', request.headers.cookie);
 					}
 
-					const external_request = new Request(url, /** @type {RequestInit} */ (opts));
+					const external_request = new Request(requested, /** @type {RequestInit} */ (opts));
 					response = await options.hooks.externalFetch.call(null, external_request);
 				}
 
@@ -245,7 +243,7 @@ export async function load_node({
 								if (!opts.body || typeof opts.body === 'string') {
 									// prettier-ignore
 									fetched.push({
-										url,
+										url: requested,
 										body: /** @type {string} */ (opts.body),
 										json: `{"status":${response.status},"statusText":${s(response.statusText)},"headers":${s(headers)},"body":"${escape_json_string_in_html(body)}"}`
 									});
diff --git a/packages/kit/src/runtime/server/page/render.js b/packages/kit/src/runtime/server/page/render.js
index d0bdaa5ecc56..8e9e17a7baec 100644
--- a/packages/kit/src/runtime/server/page/render.js
+++ b/packages/kit/src/runtime/server/page/render.js
@@ -15,7 +15,8 @@ import { s } from '../../../utils/misc.js';
  *   page_config: { hydrate: boolean, router: boolean, ssr: boolean };
  *   status: number;
  *   error?: Error,
- *   page?: import('types/page').Page
+ *   url: URL;
+ *   params: Record<string, string>
  * }} opts
  */
 export async function render_response({
@@ -25,7 +26,8 @@ export async function render_response({
 	page_config,
 	status,
 	error,
-	page
+	url,
+	params
 }) {
 	const css = new Set(options.manifest._.entry.css);
 	const js = new Set(options.manifest._.entry.js);
@@ -62,11 +64,13 @@ export async function render_response({
 		/** @type {Record<string, any>} */
 		const props = {
 			stores: {
-				page: writable(null),
+				url: writable(null),
+				params: writable(null),
 				navigating: writable(null),
 				session
 			},
-			page,
+			url,
+			params,
 			components: branch.map(({ node }) => node.module.default)
 		};
 
@@ -125,7 +129,7 @@ export async function render_response({
 				session: ${try_serialize($session, (error) => {
 					throw new Error(`Failed to serialize session data: ${error.message}`);
 				})},
-				origin: ${page && page.origin ? s(page.origin) : 'location.origin'},
+				url: new URL(${s(url.href)}),
 				route: ${!!page_config.router},
 				spa: ${!page_config.ssr},
 				trailing_slash: ${s(options.trailing_slash)},
@@ -137,16 +141,8 @@ export async function render_response({
 						.map(({ node }) => `import(${s(options.prefix + node.entry)})`)
 						.join(',\n\t\t\t\t\t\t')}
 					],
-					page: {
-						origin: ${page && page.origin ? s(page.origin) : 'location.origin'}, // TODO this is redundant
-						path: ${page && page.path ? try_serialize(page.path, error => {
-							throw new Error(`Failed to serialize page.path: ${error.message}`);
-						}) : null},
-						query: new URLSearchParams(${page && page.query ? s(page.query.toString()) : ''}),
-						params: ${page && page.params ? try_serialize(page.params, error => {
-							throw new Error(`Failed to serialize page.params: ${error.message}`);
-						}) : null}
-					}
+					url: new URL(${s(url.href)}),
+					params: ${s(params)}
 				}` : 'null'}
 			});
 		</script>`;
diff --git a/packages/kit/src/runtime/server/page/respond.js b/packages/kit/src/runtime/server/page/respond.js
index edc1d43d203f..9b99ab2ed7f5 100644
--- a/packages/kit/src/runtime/server/page/respond.js
+++ b/packages/kit/src/runtime/server/page/respond.js
@@ -18,7 +18,7 @@ import { coalesce_to_error } from '../../../utils/error.js';
  *   state: SSRRenderState;
  *   $session: any;
  *   route: import('types/internal').SSRPage;
- *   page: import('types/page').Page;
+ *   params: Record<string, string>;
  * }} opts
  * @returns {Promise<ServerResponse | undefined>}
  */
@@ -86,6 +86,7 @@ export async function respond(opts) {
 				try {
 					loaded = await load_node({
 						...opts,
+						url: request.url,
 						node,
 						stuff,
 						prerender_enabled: is_prerender_enabled(options, node, state),
@@ -142,6 +143,7 @@ export async function respond(opts) {
 								const error_loaded = /** @type {import('./types').Loaded} */ (
 									await load_node({
 										...opts,
+										url: request.url,
 										node: error_node,
 										stuff: node_loaded.stuff,
 										prerender_enabled: is_prerender_enabled(options, error_node, state),
@@ -199,6 +201,7 @@ export async function respond(opts) {
 		return with_cookies(
 			await render_response({
 				...opts,
+				url: request.url,
 				page_config,
 				status,
 				error,
diff --git a/packages/kit/src/runtime/server/page/respond_with_error.js b/packages/kit/src/runtime/server/page/respond_with_error.js
index 588083622430..0a84d48a7c8c 100644
--- a/packages/kit/src/runtime/server/page/respond_with_error.js
+++ b/packages/kit/src/runtime/server/page/respond_with_error.js
@@ -23,12 +23,8 @@ export async function respond_with_error({ request, options, state, $session, st
 	const default_layout = await options.manifest._.nodes[0](); // 0 is always the root layout
 	const default_error = await options.manifest._.nodes[1](); // 1 is always the root error
 
-	const page = {
-		origin: request.origin,
-		path: request.path,
-		query: request.query,
-		params: {}
-	};
+	/** @type {Record<string, string>} */
+	const params = {}; // error page has no params
 
 	// error pages don't fall through, so we know it's not undefined
 	const loaded = /** @type {Loaded} */ (
@@ -37,7 +33,8 @@ export async function respond_with_error({ request, options, state, $session, st
 			options,
 			state,
 			route: null,
-			page,
+			url: request.url, // TODO this is redundant, no?
+			params,
 			node: default_layout,
 			$session,
 			stuff: {},
@@ -55,7 +52,8 @@ export async function respond_with_error({ request, options, state, $session, st
 				options,
 				state,
 				route: null,
-				page,
+				url: request.url,
+				params,
 				node: default_error,
 				$session,
 				stuff: loaded ? loaded.stuff : {},
@@ -80,7 +78,8 @@ export async function respond_with_error({ request, options, state, $session, st
 			status,
 			error,
 			branch,
-			page
+			url: request.url,
+			params
 		});
 	} catch (err) {
 		const error = coalesce_to_error(err);
diff --git a/packages/kit/test/apps/amp/src/routes/origin/index.json.js b/packages/kit/test/apps/amp/src/routes/origin/index.json.js
index 743f7cc6cee8..7930839485c8 100644
--- a/packages/kit/test/apps/amp/src/routes/origin/index.json.js
+++ b/packages/kit/test/apps/amp/src/routes/origin/index.json.js
@@ -1,6 +1,6 @@
 /** @type {import('@sveltejs/kit').RequestHandler} */
-export function get({ origin }) {
+export function get({ url }) {
 	return {
-		body: { origin }
+		body: { origin: url.origin }
 	};
 }
diff --git a/packages/kit/test/apps/amp/src/routes/origin/index.svelte b/packages/kit/test/apps/amp/src/routes/origin/index.svelte
index 24f066165751..97b938069473 100644
--- a/packages/kit/test/apps/amp/src/routes/origin/index.svelte
+++ b/packages/kit/test/apps/amp/src/routes/origin/index.svelte
@@ -1,12 +1,12 @@
 <script context="module">
 	/** @type {import('@sveltejs/kit').Load} */
-	export async function load({ page, fetch }) {
+	export async function load({ url, fetch }) {
 		const res = await fetch('/origin.json');
 		const data = await res.json();
 
 		return {
 			props: {
-				origin: page.origin,
+				origin: url.origin,
 				data
 			}
 		};
@@ -14,7 +14,7 @@
 </script>
 
 <script>
-	import { page } from '$app/stores';
+	import { url } from '$app/stores';
 
 	/** @type {string} */
 	export let origin;
@@ -24,5 +24,5 @@
 </script>
 
 <p data-source="load">{origin}</p>
-<p data-source="store">{$page.origin}</p>
+<p data-source="store">{$url.origin}</p>
 <p data-source="endpoint">{data.origin}</p>
diff --git a/packages/kit/test/apps/basics/src/routes/caching/private/uses-fetch.svelte b/packages/kit/test/apps/basics/src/routes/caching/private/uses-fetch.svelte
index 6391989f9a52..09f5aefe0fb5 100644
--- a/packages/kit/test/apps/basics/src/routes/caching/private/uses-fetch.svelte
+++ b/packages/kit/test/apps/basics/src/routes/caching/private/uses-fetch.svelte
@@ -1,8 +1,8 @@
 <script context="module">
 	/** @type {import('@sveltejs/kit').Load} */
-	export async function load({ page, fetch }) {
+	export async function load({ url, fetch }) {
 		const res = await fetch('/caching/private/uses-fetch.json', {
-			credentials: /** @type {RequestCredentials} */ (page.query.get('credentials'))
+			credentials: /** @type {RequestCredentials} */ (url.searchParams.get('credentials'))
 		});
 
 		return {
diff --git a/packages/kit/test/apps/basics/src/routes/encoded/[slug].svelte b/packages/kit/test/apps/basics/src/routes/encoded/[slug].svelte
index 838d597c15dc..4224c15ae54a 100644
--- a/packages/kit/test/apps/basics/src/routes/encoded/[slug].svelte
+++ b/packages/kit/test/apps/basics/src/routes/encoded/[slug].svelte
@@ -1,17 +1,17 @@
 <script context="module">
 	/** @type {import('@sveltejs/kit').Load} */
-	export function load({ page }) {
+	export function load({ url, params }) {
 		return {
 			props: {
-				path: page.path,
-				slug: page.params.slug
+				path: url.pathname,
+				slug: params.slug
 			}
 		};
 	}
 </script>
 
 <script>
-	import { page } from '$app/stores';
+	import { url, params } from '$app/stores';
 
 	/** @type {string} */
 	export let path;
@@ -22,4 +22,4 @@
 
 <h1>dynamic</h1>
 <h2>{path}: {slug}</h2>
-<h3>{$page.path}: {$page.params.slug}</h3>
+<h3>{$url.pathname}: {$params.slug}</h3>
diff --git "a/packages/kit/test/apps/basics/src/routes/encoded/\350\213\227\346\235\241.svelte" "b/packages/kit/test/apps/basics/src/routes/encoded/\350\213\227\346\235\241.svelte"
index d67682c75f4d..d9eac0487868 100644
--- "a/packages/kit/test/apps/basics/src/routes/encoded/\350\213\227\346\235\241.svelte"
+++ "b/packages/kit/test/apps/basics/src/routes/encoded/\350\213\227\346\235\241.svelte"
@@ -1,16 +1,16 @@
 <script context="module">
 	/** @type {import('@sveltejs/kit').Load} */
-	export function load({ page }) {
+	export function load({ url }) {
 		return {
 			props: {
-				path: page.path
+				path: url.pathname
 			}
 		};
 	}
 </script>
 
 <script>
-	import { page } from '$app/stores';
+	import { url } from '$app/stores';
 
 	/** @type {string} */
 	export let path;
@@ -18,4 +18,4 @@
 
 <h1>static</h1>
 <h2>{path}</h2>
-<h3>{$page.path}</h3>
+<h3>{$url.pathname}</h3>
diff --git a/packages/kit/test/apps/basics/src/routes/keepfocus/index.svelte b/packages/kit/test/apps/basics/src/routes/keepfocus/index.svelte
index 460d432d66b1..2570932aba0b 100644
--- a/packages/kit/test/apps/basics/src/routes/keepfocus/index.svelte
+++ b/packages/kit/test/apps/basics/src/routes/keepfocus/index.svelte
@@ -1,12 +1,12 @@
 <script>
 	import { goto } from '$app/navigation';
-	import { page } from '$app/stores';
+	import { url } from '$app/stores';
 </script>
 
 <input
 	id="input"
 	type="text"
-	value={$page.query.get('foo')}
+	value={$url.searchParams.get('foo')}
 	on:input={(e) => {
 		goto('?foo=' + e.currentTarget?.value, { keepfocus: true });
 	}}
diff --git a/packages/kit/test/apps/basics/src/routes/load/[dynamic].svelte b/packages/kit/test/apps/basics/src/routes/load/[dynamic].svelte
index 24d58cbca66a..fb4e204f5e70 100644
--- a/packages/kit/test/apps/basics/src/routes/load/[dynamic].svelte
+++ b/packages/kit/test/apps/basics/src/routes/load/[dynamic].svelte
@@ -1,7 +1,7 @@
 <script context="module">
 	/** @type {import('@sveltejs/kit').Load} */
-	export async function load({ page, fetch }) {
-		const res = await fetch(`/load/${page.params.dynamic}.json`);
+	export async function load({ params, fetch }) {
+		const res = await fetch(`/load/${params.dynamic}.json`);
 		return {
 			props: await res.json()
 		};
diff --git a/packages/kit/test/apps/basics/src/routes/load/change-detection/one/[x].svelte b/packages/kit/test/apps/basics/src/routes/load/change-detection/one/[x].svelte
index d3ec4555c21e..174dd7f46887 100644
--- a/packages/kit/test/apps/basics/src/routes/load/change-detection/one/[x].svelte
+++ b/packages/kit/test/apps/basics/src/routes/load/change-detection/one/[x].svelte
@@ -2,13 +2,13 @@
 	let count = 0;
 
 	/** @type {import('@sveltejs/kit').Load} */
-	export async function load({ page }) {
+	export async function load({ params }) {
 		count += 1;
 
 		return {
 			maxage: 5,
 			props: {
-				x: page.params.x,
+				x: params.x,
 				loads: count
 			}
 		};
diff --git a/packages/kit/test/apps/basics/src/routes/load/change-detection/two/[y].svelte b/packages/kit/test/apps/basics/src/routes/load/change-detection/two/[y].svelte
index d8251088135d..f4d23ff39206 100644
--- a/packages/kit/test/apps/basics/src/routes/load/change-detection/two/[y].svelte
+++ b/packages/kit/test/apps/basics/src/routes/load/change-detection/two/[y].svelte
@@ -2,13 +2,13 @@
 	let count = 0;
 
 	/** @type {import('@sveltejs/kit').Load} */
-	export async function load({ page }) {
+	export async function load({ params }) {
 		count += 1;
 
 		return {
 			maxage: 5,
 			props: {
-				y: page.params.y,
+				y: params.y,
 				loads: count
 			}
 		};
diff --git a/packages/kit/test/apps/basics/src/routes/load/large-response.svelte b/packages/kit/test/apps/basics/src/routes/load/large-response.svelte
index 2f1d3fadef74..1ac6566d53d9 100644
--- a/packages/kit/test/apps/basics/src/routes/load/large-response.svelte
+++ b/packages/kit/test/apps/basics/src/routes/load/large-response.svelte
@@ -1,7 +1,7 @@
 <script context="module">
 	/** @type {import('@sveltejs/kit').Load} */
-	export async function load({ page, fetch }) {
-		const res = await fetch(`http://localhost:${page.query.get('port')}/large-response.json`);
+	export async function load({ url, fetch }) {
+		const res = await fetch(`http://localhost:${url.searchParams.get('port')}/large-response.json`);
 		const text = await res.text();
 
 		return {
diff --git a/packages/kit/test/apps/basics/src/routes/load/server-fetch-request.svelte b/packages/kit/test/apps/basics/src/routes/load/server-fetch-request.svelte
index 1d371de835aa..c1f3661c5a56 100644
--- a/packages/kit/test/apps/basics/src/routes/load/server-fetch-request.svelte
+++ b/packages/kit/test/apps/basics/src/routes/load/server-fetch-request.svelte
@@ -1,9 +1,9 @@
 <script context="module">
 	/** @type {import('@sveltejs/kit').Load} */
-	export async function load({ page, fetch }) {
-		const url = `http://localhost:${page.query.get('port')}/server-fetch-request.json`;
+	export async function load({ url, fetch }) {
+		const href = `http://localhost:${url.searchParams.get('port')}/server-fetch-request.json`;
 
-		const res = await fetch(url);
+		const res = await fetch(href);
 		const { answer } = await res.json();
 		return {
 			props: { answer }
diff --git a/packages/kit/test/apps/basics/src/routes/load/stuff/[x]/[y]/[z].svelte b/packages/kit/test/apps/basics/src/routes/load/stuff/[x]/[y]/[z].svelte
index 5c471c980f9a..f5795357b64f 100644
--- a/packages/kit/test/apps/basics/src/routes/load/stuff/[x]/[y]/[z].svelte
+++ b/packages/kit/test/apps/basics/src/routes/load/stuff/[x]/[y]/[z].svelte
@@ -1,10 +1,10 @@
 <script context="module">
 	/** @type {import('@sveltejs/kit').Load} */
-	export async function load({ page, stuff }) {
+	export async function load({ params, stuff }) {
 		return {
 			props: {
 				...stuff,
-				z: page.params.z
+				z: params.z
 			}
 		};
 	}
@@ -25,4 +25,4 @@
 </script>
 
 <h1>message: {message}</h1>
-<pre>{JSON.stringify({x, y, z})}</pre>
+<pre>{JSON.stringify({ x, y, z })}</pre>
diff --git a/packages/kit/test/apps/basics/src/routes/load/stuff/[x]/[y]/__layout.svelte b/packages/kit/test/apps/basics/src/routes/load/stuff/[x]/[y]/__layout.svelte
index 65888aabf5fd..dfc6f03d8e2d 100644
--- a/packages/kit/test/apps/basics/src/routes/load/stuff/[x]/[y]/__layout.svelte
+++ b/packages/kit/test/apps/basics/src/routes/load/stuff/[x]/[y]/__layout.svelte
@@ -1,12 +1,12 @@
 <script context="module">
 	/** @type {import('@sveltejs/kit').Load} */
-	export async function load({ page }) {
+	export async function load({ params }) {
 		return {
 			stuff: {
-				y: page.params.y
+				y: params.y
 			}
 		};
 	}
 </script>
 
-<slot></slot>
+<slot />
diff --git a/packages/kit/test/apps/basics/src/routes/load/stuff/[x]/__layout.svelte b/packages/kit/test/apps/basics/src/routes/load/stuff/[x]/__layout.svelte
index 73de16a709bb..87cda94c6eb5 100644
--- a/packages/kit/test/apps/basics/src/routes/load/stuff/[x]/__layout.svelte
+++ b/packages/kit/test/apps/basics/src/routes/load/stuff/[x]/__layout.svelte
@@ -1,13 +1,13 @@
 <script context="module">
 	/** @type {import('@sveltejs/kit').Load} */
-	export async function load({ page, stuff }) {
+	export async function load({ params, stuff }) {
 		return {
 			stuff: {
 				message: `${stuff.message} + new`,
-				x: page.params.x
+				x: params.x
 			}
 		};
 	}
 </script>
 
-<slot></slot>
+<slot />
diff --git a/packages/kit/test/apps/basics/src/routes/origin/index.svelte b/packages/kit/test/apps/basics/src/routes/origin/index.svelte
index 3cf0adceb58d..af6910df41f6 100644
--- a/packages/kit/test/apps/basics/src/routes/origin/index.svelte
+++ b/packages/kit/test/apps/basics/src/routes/origin/index.svelte
@@ -1,5 +1,5 @@
 <script>
-	import { page } from '$app/stores';
+	import { url } from '$app/stores';
 </script>
 
-<h1>{$page.origin}</h1>
+<h1>{$url.origin}</h1>
diff --git a/packages/kit/test/apps/basics/src/routes/query/echo.svelte b/packages/kit/test/apps/basics/src/routes/query/echo.svelte
index c69b7aa99e07..6c8481772e4a 100644
--- a/packages/kit/test/apps/basics/src/routes/query/echo.svelte
+++ b/packages/kit/test/apps/basics/src/routes/query/echo.svelte
@@ -15,23 +15,23 @@
 	}
 
 	/** @type {import('@sveltejs/kit').Load} */
-	export function load({ page }) {
+	export function load({ url }) {
 		return {
 			props: {
-				values: to_pojo(page.query)
+				values: to_pojo(url.searchParams)
 			}
 		};
 	}
 </script>
 
 <script>
-	import { page } from '$app/stores';
+	import { url } from '$app/stores';
 
 	/** @type {Query}*/
 	export let values;
 </script>
 
 <pre id="one">{JSON.stringify(values)}</pre>
-<pre id="two">{JSON.stringify(to_pojo($page.query))}</pre>
+<pre id="two">{JSON.stringify(to_pojo($url.searchParams))}</pre>
 
 <a href="/query/echo?bar=2">?bar=2</a>
diff --git a/packages/kit/test/apps/basics/src/routes/routing/[slug].svelte b/packages/kit/test/apps/basics/src/routes/routing/[slug].svelte
index 9873d6864ea3..3e2a797ef70a 100644
--- a/packages/kit/test/apps/basics/src/routes/routing/[slug].svelte
+++ b/packages/kit/test/apps/basics/src/routes/routing/[slug].svelte
@@ -1,5 +1,5 @@
 <script>
-	import { page } from '$app/stores';
+	import { params } from '$app/stores';
 </script>
 
-<h1>{$page.params.slug}</h1>
+<h1>{$params.slug}</h1>
diff --git a/packages/kit/test/apps/basics/src/routes/routing/fallthrough-advanced/[animal].svelte b/packages/kit/test/apps/basics/src/routes/routing/fallthrough-advanced/[animal].svelte
index 7d5a2ddf6b43..2160a3cd0768 100644
--- a/packages/kit/test/apps/basics/src/routes/routing/fallthrough-advanced/[animal].svelte
+++ b/packages/kit/test/apps/basics/src/routes/routing/fallthrough-advanced/[animal].svelte
@@ -1,7 +1,7 @@
 <script context="module">
 	/** @type {import("@sveltejs/kit").Load} */
-	export async function load({ page, fetch }) {
-		const res = await fetch(`/routing/fallthrough-advanced/${page.params.animal}.json`);
+	export async function load({ params, fetch }) {
+		const res = await fetch(`/routing/fallthrough-advanced/${params.animal}.json`);
 
 		if (res.ok) {
 			const { type } = await res.json();
@@ -9,7 +9,7 @@
 			if (type === 'animal') {
 				return {
 					props: {
-						animal: page.params.animal
+						animal: params.animal
 					}
 				};
 			}
@@ -22,4 +22,4 @@
 	export let animal;
 </script>
 
-<h1>{animal} is an animal</h1>
\ No newline at end of file
+<h1>{animal} is an animal</h1>
diff --git a/packages/kit/test/apps/basics/src/routes/routing/fallthrough-advanced/[mineral].svelte b/packages/kit/test/apps/basics/src/routes/routing/fallthrough-advanced/[mineral].svelte
index 5fa721fbd01a..15b6f51d0986 100644
--- a/packages/kit/test/apps/basics/src/routes/routing/fallthrough-advanced/[mineral].svelte
+++ b/packages/kit/test/apps/basics/src/routes/routing/fallthrough-advanced/[mineral].svelte
@@ -1,7 +1,7 @@
 <script context="module">
 	/** @type {import("@sveltejs/kit").Load} */
-	export async function load({ page, fetch }) {
-		const res = await fetch(`/routing/fallthrough-advanced/${page.params.mineral}.json`);
+	export async function load({ params, fetch }) {
+		const res = await fetch(`/routing/fallthrough-advanced/${params.mineral}.json`);
 
 		if (res.ok) {
 			const { type } = await res.json();
@@ -9,7 +9,7 @@
 			if (type === 'mineral') {
 				return {
 					props: {
-						mineral: page.params.mineral
+						mineral: params.mineral
 					}
 				};
 			}
@@ -22,4 +22,4 @@
 	export let mineral;
 </script>
 
-<h1>{mineral} is a mineral</h1>
\ No newline at end of file
+<h1>{mineral} is a mineral</h1>
diff --git a/packages/kit/test/apps/basics/src/routes/routing/fallthrough-advanced/[vegetable].svelte b/packages/kit/test/apps/basics/src/routes/routing/fallthrough-advanced/[vegetable].svelte
index 585b06691192..9033eb36c36d 100644
--- a/packages/kit/test/apps/basics/src/routes/routing/fallthrough-advanced/[vegetable].svelte
+++ b/packages/kit/test/apps/basics/src/routes/routing/fallthrough-advanced/[vegetable].svelte
@@ -1,7 +1,7 @@
 <script context="module">
 	/** @type {import("@sveltejs/kit").Load} */
-	export async function load({ page, fetch }) {
-		const res = await fetch(`/routing/fallthrough-advanced/${page.params.vegetable}.json`);
+	export async function load({ params, fetch }) {
+		const res = await fetch(`/routing/fallthrough-advanced/${params.vegetable}.json`);
 
 		if (res.ok) {
 			const { type } = await res.json();
@@ -9,7 +9,7 @@
 			if (type === 'vegetable') {
 				return {
 					props: {
-						vegetable: page.params.vegetable
+						vegetable: params.vegetable
 					}
 				};
 			}
@@ -22,4 +22,4 @@
 	export let vegetable;
 </script>
 
-<h1>{vegetable} is a vegetable</h1>
\ No newline at end of file
+<h1>{vegetable} is a vegetable</h1>
diff --git a/packages/kit/test/apps/basics/src/routes/routing/fallthrough-simple/[legal].svelte b/packages/kit/test/apps/basics/src/routes/routing/fallthrough-simple/[legal].svelte
index 161a8df62c3b..2bb5fd56451f 100644
--- a/packages/kit/test/apps/basics/src/routes/routing/fallthrough-simple/[legal].svelte
+++ b/packages/kit/test/apps/basics/src/routes/routing/fallthrough-simple/[legal].svelte
@@ -1,7 +1,7 @@
 <script context="module">
 	/** @type {import("@sveltejs/kit").Load} */
-	export const load = ({ page }) => {
-		if (page.path === '/valid') {
+	export const load = ({ url }) => {
+		if (url.pathname === '/valid') {
 			return {
 				props: {}
 			};
diff --git a/packages/kit/test/apps/basics/src/routes/routing/rest/[...rest]/deep.svelte b/packages/kit/test/apps/basics/src/routes/routing/rest/[...rest]/deep.svelte
index bd442553cad3..c56b627fc414 100644
--- a/packages/kit/test/apps/basics/src/routes/routing/rest/[...rest]/deep.svelte
+++ b/packages/kit/test/apps/basics/src/routes/routing/rest/[...rest]/deep.svelte
@@ -1,19 +1,19 @@
 <script context="module">
 	/** @type {import('@sveltejs/kit').Load} */
-	export function load({ page }) {
-		const { rest } = page.params;
+	export function load({ params }) {
+		const { rest } = params;
 		return { props: { rest } };
 	}
 </script>
 
 <script>
-	import { page } from '$app/stores';
+	import { params } from '$app/stores';
 
 	/** @type {string} */
 	export let rest;
 </script>
 
-<h1>{$page.params.rest}</h1>
+<h1>{$params.rest}</h1>
 <h2>{rest}</h2>
 
 <a href="/routing/rest/xyz/abc/qwe/deep.json" rel="external">deep</a>
diff --git a/packages/kit/test/apps/basics/src/routes/routing/rest/[...rest]/index.svelte b/packages/kit/test/apps/basics/src/routes/routing/rest/[...rest]/index.svelte
index d15f8691a962..3a2f312cbb3b 100644
--- a/packages/kit/test/apps/basics/src/routes/routing/rest/[...rest]/index.svelte
+++ b/packages/kit/test/apps/basics/src/routes/routing/rest/[...rest]/index.svelte
@@ -1,19 +1,19 @@
 <script context="module">
 	/** @type {import('@sveltejs/kit').Load} */
-	export function load({ page }) {
-		const { rest } = page.params;
+	export function load({ params }) {
+		const { rest } = params;
 		return { props: { rest } };
 	}
 </script>
 
 <script>
-	import { page } from '$app/stores';
+	import { params } from '$app/stores';
 
 	/** @type {string} */
 	export let rest;
 </script>
 
-<h1>{$page.params.rest}</h1>
+<h1>{$params.rest}</h1>
 <h2>{rest}</h2>
 
 <a href="/routing/rest/xyz/abc/deep">deep</a>
diff --git a/packages/kit/test/apps/basics/src/routes/routing/rest/non-greedy/[dynamic]-bar/[...rest].svelte b/packages/kit/test/apps/basics/src/routes/routing/rest/non-greedy/[dynamic]-bar/[...rest].svelte
index 42ec3d05ec80..ffef0de393b6 100644
--- a/packages/kit/test/apps/basics/src/routes/routing/rest/non-greedy/[dynamic]-bar/[...rest].svelte
+++ b/packages/kit/test/apps/basics/src/routes/routing/rest/non-greedy/[dynamic]-bar/[...rest].svelte
@@ -1,5 +1,5 @@
 <script>
-	import { page } from '$app/stores';
+	import { params } from '$app/stores';
 </script>
 
-<h2>{JSON.stringify($page.params)}</h2>
\ No newline at end of file
+<h2>{JSON.stringify($params)}</h2>
diff --git a/packages/kit/test/apps/basics/src/routes/routing/rest/non-greedy/foo/[...rest].svelte b/packages/kit/test/apps/basics/src/routes/routing/rest/non-greedy/foo/[...rest].svelte
index 42ec3d05ec80..ffef0de393b6 100644
--- a/packages/kit/test/apps/basics/src/routes/routing/rest/non-greedy/foo/[...rest].svelte
+++ b/packages/kit/test/apps/basics/src/routes/routing/rest/non-greedy/foo/[...rest].svelte
@@ -1,5 +1,5 @@
 <script>
-	import { page } from '$app/stores';
+	import { params } from '$app/stores';
 </script>
 
-<h2>{JSON.stringify($page.params)}</h2>
\ No newline at end of file
+<h2>{JSON.stringify($params)}</h2>
diff --git a/packages/kit/test/apps/basics/src/routes/routing/rest/path/[...ignored].svelte b/packages/kit/test/apps/basics/src/routes/routing/rest/path/[...ignored].svelte
index 29acf1bc3d53..9ec935d3b738 100644
--- a/packages/kit/test/apps/basics/src/routes/routing/rest/path/[...ignored].svelte
+++ b/packages/kit/test/apps/basics/src/routes/routing/rest/path/[...ignored].svelte
@@ -1,7 +1,7 @@
 <script context="module">
 	/** @type {import('@sveltejs/kit').Load} */
-	export function load({ page }) {
-		const { path } = page;
+	export function load({ url }) {
+		const { pathname: path } = url;
 
 		return {
 			props: { path }
@@ -14,4 +14,4 @@
 	export let path;
 </script>
 
-<h1>path: {path}</h1>
\ No newline at end of file
+<h1>path: {path}</h1>
diff --git a/packages/kit/test/apps/basics/src/routes/routing/skipped/[one]/[two].svelte b/packages/kit/test/apps/basics/src/routes/routing/skipped/[one]/[two].svelte
index 29b4effd51d1..8ba2d8ac7cef 100644
--- a/packages/kit/test/apps/basics/src/routes/routing/skipped/[one]/[two].svelte
+++ b/packages/kit/test/apps/basics/src/routes/routing/skipped/[one]/[two].svelte
@@ -1,7 +1,7 @@
 <script context="module">
 	/** @type {import('@sveltejs/kit').Load} */
-	export function load({ page }) {
-		return { props: page.params };
+	export function load({ params }) {
+		return { props: params };
 	}
 </script>
 
diff --git a/packages/kit/test/apps/basics/src/routes/routing/split-params/[a]-[b].svelte b/packages/kit/test/apps/basics/src/routes/routing/split-params/[a]-[b].svelte
index 79d7e8609222..863e5c360ece 100644
--- a/packages/kit/test/apps/basics/src/routes/routing/split-params/[a]-[b].svelte
+++ b/packages/kit/test/apps/basics/src/routes/routing/split-params/[a]-[b].svelte
@@ -1,6 +1,6 @@
 <script>
-	import { page } from '$app/stores';
+	import { params } from '$app/stores';
 </script>
 
-<h1>{$page.params.a}</h1>
-<h2>{$page.params.b}</h2>
+<h1>{$params.a}</h1>
+<h2>{$params.b}</h2>
diff --git a/packages/kit/test/apps/basics/src/routes/store/index.svelte b/packages/kit/test/apps/basics/src/routes/store/index.svelte
index 66f5cdcea714..c2688a1e56dd 100644
--- a/packages/kit/test/apps/basics/src/routes/store/index.svelte
+++ b/packages/kit/test/apps/basics/src/routes/store/index.svelte
@@ -2,7 +2,7 @@
 	import { getStores } from '$app/stores';
 	import { onMount, onDestroy } from 'svelte';
 
-	const { page, session } = getStores(); // TODO note to self: getStores() appears to be masking a bug here
+	const { url, session } = getStores(); // TODO note to self: getStores() appears to be masking a bug here
 
 	let calls = 0;
 
@@ -10,7 +10,7 @@
 		session.set(calls);
 	});
 
-	const unsubscribe = page.subscribe(() => {
+	const unsubscribe = url.subscribe(() => {
 		calls++;
 		session.set(calls);
 	});
@@ -22,4 +22,4 @@
 <h2>Calls: {calls}</h2>
 <a href="/store/result">results</a>
 
-{#if $page.path === '/store/result'}{console.log((window.oops = 'this should not happen'))}{/if}
+{#if $url.pathname === '/store/result'}{console.log((window.oops = 'this should not happen'))}{/if}
diff --git a/packages/kit/test/apps/basics/src/routes/store/navigating/__layout.svelte b/packages/kit/test/apps/basics/src/routes/store/navigating/__layout.svelte
index 1db4b2cf4d6e..d4ced38d1d87 100644
--- a/packages/kit/test/apps/basics/src/routes/store/navigating/__layout.svelte
+++ b/packages/kit/test/apps/basics/src/routes/store/navigating/__layout.svelte
@@ -6,7 +6,7 @@
 
 <div id="navigating">
 	{#if $navigating}
-		<p>navigating from {$navigating.from.path} to {$navigating.to.path}</p>
+		<p>navigating from {$navigating.from.pathname} to {$navigating.to.pathname}</p>
 	{:else}
 		<p id="not-navigating">not currently navigating</p>
 	{/if}
diff --git a/packages/kit/test/apps/basics/src/routes/xss/[path].svelte b/packages/kit/test/apps/basics/src/routes/xss/[path].svelte
index d4f9139135dc..1026ce167783 100644
--- a/packages/kit/test/apps/basics/src/routes/xss/[path].svelte
+++ b/packages/kit/test/apps/basics/src/routes/xss/[path].svelte
@@ -1,5 +1,5 @@
 <script>
-	import { page } from '$app/stores';
+	import { params } from '$app/stores';
 </script>
 
-<h1 id="one">{$page.params.slug}</h1>
+<h1 id="one">{$params.slug}</h1>
diff --git a/packages/kit/test/apps/basics/src/routes/xss/query.svelte b/packages/kit/test/apps/basics/src/routes/xss/query.svelte
index 5c542f4bd75d..9a2475a736aa 100644
--- a/packages/kit/test/apps/basics/src/routes/xss/query.svelte
+++ b/packages/kit/test/apps/basics/src/routes/xss/query.svelte
@@ -15,22 +15,21 @@
 	}
 
 	/** @type {import('@sveltejs/kit').Load} */
-	export function load({ page }) {
+	export function load({ url }) {
 		return {
 			props: {
-				values: to_pojo(page.query)
+				values: to_pojo(url.searchParams)
 			}
 		};
 	}
 </script>
 
 <script>
-	import { page } from '$app/stores';
+	import { url } from '$app/stores';
 
 	/** @type {Query}*/
 	export let values;
 </script>
 
 <pre id="one">{JSON.stringify(values)}</pre>
-<pre id="two">{JSON.stringify(to_pojo($page.query))}</pre>
-
+<pre id="two">{JSON.stringify(to_pojo($url.searchParams))}</pre>
diff --git a/packages/kit/test/apps/options/source/pages/custom-extensions/[slug].svelte.md b/packages/kit/test/apps/options/source/pages/custom-extensions/[slug].svelte.md
index 31caa519d76a..d56e24e45b47 100644
--- a/packages/kit/test/apps/options/source/pages/custom-extensions/[slug].svelte.md
+++ b/packages/kit/test/apps/options/source/pages/custom-extensions/[slug].svelte.md
@@ -1,3 +1,3 @@
-<script>import {page} from '$app/stores';</script>
+<script>import { params } from '$app/stores';</script>
 
-<h2>{$page.params.slug.toUpperCase()}</h2>
+<h2>{$params.slug.toUpperCase()}</h2>
diff --git a/packages/kit/test/apps/options/source/pages/origin/index.json.js b/packages/kit/test/apps/options/source/pages/origin/index.json.js
index 743f7cc6cee8..7930839485c8 100644
--- a/packages/kit/test/apps/options/source/pages/origin/index.json.js
+++ b/packages/kit/test/apps/options/source/pages/origin/index.json.js
@@ -1,6 +1,6 @@
 /** @type {import('@sveltejs/kit').RequestHandler} */
-export function get({ origin }) {
+export function get({ url }) {
 	return {
-		body: { origin }
+		body: { origin: url.origin }
 	};
 }
diff --git a/packages/kit/test/apps/options/source/pages/origin/index.svelte b/packages/kit/test/apps/options/source/pages/origin/index.svelte
index 24f066165751..97b938069473 100644
--- a/packages/kit/test/apps/options/source/pages/origin/index.svelte
+++ b/packages/kit/test/apps/options/source/pages/origin/index.svelte
@@ -1,12 +1,12 @@
 <script context="module">
 	/** @type {import('@sveltejs/kit').Load} */
-	export async function load({ page, fetch }) {
+	export async function load({ url, fetch }) {
 		const res = await fetch('/origin.json');
 		const data = await res.json();
 
 		return {
 			props: {
-				origin: page.origin,
+				origin: url.origin,
 				data
 			}
 		};
@@ -14,7 +14,7 @@
 </script>
 
 <script>
-	import { page } from '$app/stores';
+	import { url } from '$app/stores';
 
 	/** @type {string} */
 	export let origin;
@@ -24,5 +24,5 @@
 </script>
 
 <p data-source="load">{origin}</p>
-<p data-source="store">{$page.origin}</p>
+<p data-source="store">{$url.origin}</p>
 <p data-source="endpoint">{data.origin}</p>
diff --git a/packages/kit/test/apps/options/source/pages/slash/child.svelte b/packages/kit/test/apps/options/source/pages/slash/child.svelte
index 2529728f93db..ddc03b0d607d 100644
--- a/packages/kit/test/apps/options/source/pages/slash/child.svelte
+++ b/packages/kit/test/apps/options/source/pages/slash/child.svelte
@@ -1,5 +1,5 @@
 <script>
-	import { page } from '$app/stores';
+	import { url } from '$app/stores';
 </script>
 
-<h2>{$page.path}</h2>
+<h2>{$url.pathname}</h2>
diff --git a/packages/kit/test/apps/options/source/pages/slash/index.svelte b/packages/kit/test/apps/options/source/pages/slash/index.svelte
index 2d76378f7443..cc79e7763f90 100644
--- a/packages/kit/test/apps/options/source/pages/slash/index.svelte
+++ b/packages/kit/test/apps/options/source/pages/slash/index.svelte
@@ -1,8 +1,8 @@
 <script>
 	import { base } from '$app/paths';
-	import { page } from '$app/stores';
+	import { url } from '$app/stores';
 </script>
 
-<h2>{$page.path}</h2>
+<h2>{$url.pathname}</h2>
 
 <a href="{base}/slash/child">/slash/child</a>
diff --git a/packages/kit/types/ambient-modules.d.ts b/packages/kit/types/ambient-modules.d.ts
index ec38f363153a..2924ca16792e 100644
--- a/packages/kit/types/ambient-modules.d.ts
+++ b/packages/kit/types/ambient-modules.d.ts
@@ -82,8 +82,7 @@ declare module '$app/paths' {
 
 declare module '$app/stores' {
 	import { Readable, Writable } from 'svelte/store';
-	import { Page } from '@sveltejs/kit';
-	type Navigating = { from: Page; to: Page };
+	type Navigating = { from: URL; to: URL };
 
 	/**
 	 * A convenience function around `getContext` that returns `{ navigating, page, session }`.
@@ -91,16 +90,21 @@ declare module '$app/stores' {
 	 */
 	export function getStores<Session = any>(): {
 		navigating: Readable<Navigating | null>;
-		page: Readable<Page>;
+		url: Readable<URL>;
+		params: Readable<Record<string, string>>;
 		session: Writable<Session>;
 	};
 	/**
-	 * A readable store whose value reflects the object passed to load functions.
+	 * A readable store whose value contains the current URL.
 	 */
-	export const page: Readable<Page>;
+	export const url: Readable<URL>;
+	/**
+	 * A readable store whose value contains the current page parameters.
+	 */
+	export const params: Readable<Record<string, string>>;
 	/**
 	 * A readable store.
-	 * When navigating starts, its value is `{ from, to }`, where from and to both mirror the page store value.
+	 * When navigating starts, its value is `{ from: URL, to: URL }`
 	 * When navigating finishes, its value reverts to `null`.
 	 */
 	export const navigating: Readable<Navigating | null>;
@@ -161,7 +165,7 @@ declare module '@sveltejs/kit/ssr' {
 	type State = import('@sveltejs/kit/types/internal').SSRRenderState;
 
 	export interface Respond {
-		(incoming: IncomingRequest & { origin: string }, options: Options, state?: State): Promise<
+		(incoming: IncomingRequest & { url: URL }, options: Options, state?: State): Promise<
 			Response | undefined
 		>;
 	}
diff --git a/packages/kit/types/app.d.ts b/packages/kit/types/app.d.ts
index bc659d869407..c62a12e8f9c2 100644
--- a/packages/kit/types/app.d.ts
+++ b/packages/kit/types/app.d.ts
@@ -22,9 +22,8 @@ export type ParameterizedBody<Body = unknown> = Body extends FormData
 	: (string | RawBody | ReadOnlyFormData) & Body;
 
 export interface IncomingRequest {
+	url: string | URL;
 	method: string;
-	path: string;
-	query: URLSearchParams;
 	headers: RequestHeaders;
 	rawBody: RawBody;
 }
diff --git a/packages/kit/types/hooks.d.ts b/packages/kit/types/hooks.d.ts
index 43afa3d040bd..e6532b9d3107 100644
--- a/packages/kit/types/hooks.d.ts
+++ b/packages/kit/types/hooks.d.ts
@@ -1,11 +1,13 @@
-import { IncomingRequest, ParameterizedBody } from './app';
-import { MaybePromise, ResponseHeaders } from './helper';
+import { ParameterizedBody, RawBody } from './app';
+import { MaybePromise, RequestHeaders, ResponseHeaders } from './helper';
 
 export type StrictBody = string | Uint8Array;
 
-export interface ServerRequest<Locals = Record<string, any>, Body = unknown>
-	extends IncomingRequest {
-	origin: string;
+export interface ServerRequest<Locals = Record<string, any>, Body = unknown> {
+	url: URL;
+	method: string;
+	headers: RequestHeaders;
+	rawBody: RawBody;
 	params: Record<string, string>;
 	body: ParameterizedBody<Body>;
 	locals: Locals;
diff --git a/packages/kit/types/index.d.ts b/packages/kit/types/index.d.ts
index c56ce65c4d45..fd7c1aa2fa21 100644
--- a/packages/kit/types/index.d.ts
+++ b/packages/kit/types/index.d.ts
@@ -6,7 +6,7 @@ import './ambient-modules';
 export { App, IncomingRequest, RawBody, SSRManifest } from './app';
 export { Adapter, Builder, Config, PrerenderErrorHandler, ValidatedConfig } from './config';
 export { EndpointOutput, RequestHandler } from './endpoint';
-export { ErrorLoad, ErrorLoadInput, Load, LoadInput, LoadOutput, Page } from './page';
+export { ErrorLoad, ErrorLoadInput, Load, LoadInput, LoadOutput } from './page';
 export {
 	ExternalFetch,
 	GetSession,
diff --git a/packages/kit/types/page.d.ts b/packages/kit/types/page.d.ts
index 4372e83d5cb9..e3a227360701 100644
--- a/packages/kit/types/page.d.ts
+++ b/packages/kit/types/page.d.ts
@@ -1,18 +1,12 @@
 import { InferValue, MaybePromise, Rec } from './helper';
 
-export interface Page<Params extends Record<string, string> = Record<string, string>> {
-	origin: string;
-	path: string;
-	params: Params;
-	query: URLSearchParams;
-}
-
 export interface LoadInput<
 	PageParams extends Rec<string> = Rec<string>,
 	Stuff extends Rec = Rec,
 	Session = any
 > {
-	page: Page<PageParams>;
+	url: URL;
+	params: PageParams;
 	fetch(info: RequestInfo, init?: RequestInit): Promise<Response>;
 	session: Session;
 	stuff: Stuff;

From f17bcbfc82d563128fcef9297114eadd93eb6c9c Mon Sep 17 00:00:00 2001
From: Rich Harris <hello@rich-harris.dev>
Date: Wed, 29 Dec 2021 15:53:00 +0000
Subject: [PATCH 02/45] fix some stuff

---
 packages/kit/src/core/create_app/index.js |  3 +++
 packages/kit/src/runtime/client/router.js | 24 ++++++++++-------------
 packages/kit/src/runtime/server/index.js  |  5 ++++-
 packages/kit/src/runtime/server/utils.js  |  1 +
 4 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/packages/kit/src/core/create_app/index.js b/packages/kit/src/core/create_app/index.js
index 6b8ffe65f2ce..b8d91604d55c 100644
--- a/packages/kit/src/core/create_app/index.js
+++ b/packages/kit/src/core/create_app/index.js
@@ -159,6 +159,9 @@ function generate_app(manifest_data) {
 			$: stores.url.set(url);
 			afterUpdate(stores.url.notify);
 
+			$: stores.params.set(params);
+			afterUpdate(stores.params.notify);
+
 			let mounted = false;
 			let navigated = false;
 			let title = null;
diff --git a/packages/kit/src/runtime/client/router.js b/packages/kit/src/runtime/client/router.js
index 726e0680f239..cbfad2f41362 100644
--- a/packages/kit/src/runtime/client/router.js
+++ b/packages/kit/src/runtime/client/router.js
@@ -267,22 +267,18 @@ export class Router {
 		}
 		this.navigating++;
 
-		// remove trailing slashes
-		if (url.pathname !== '/') {
-			const has_trailing_slash = url.pathname.endsWith('/');
-
-			const incorrect =
-				(has_trailing_slash && this.trailing_slash === 'never') ||
-				(!has_trailing_slash &&
-					this.trailing_slash === 'always' &&
-					!(url.pathname.split('/').pop() || '').includes('.'));
-
-			if (incorrect) {
-				url.pathname = has_trailing_slash ? url.pathname.slice(0, -1) : url.pathname + '/';
-				history.replaceState({}, '', url);
-			}
+		let { pathname } = url;
+
+		if (this.trailing_slash === 'never') {
+			if (pathname !== '/' && pathname.endsWith('/')) pathname = pathname.slice(0, -1);
+		} else if (this.trailing_slash === 'always') {
+			const is_file = (/** @type {string} */ (url.pathname.split('/').pop()).includes('.');
+			if (!is_file) pathname += '/';
 		}
 
+		const normalized_url = new URL(url.origin + pathname + url.search + url.hash);
+		history.replaceState({}, '', normalized_url);
+
 		await this.renderer.handle_navigation(info, chain, false, { hash, scroll, keepfocus });
 
 		this.navigating--;
diff --git a/packages/kit/src/runtime/server/index.js b/packages/kit/src/runtime/server/index.js
index e2b9cd9010dd..3f7e3058b310 100644
--- a/packages/kit/src/runtime/server/index.js
+++ b/packages/kit/src/runtime/server/index.js
@@ -23,6 +23,8 @@ export async function respond(incoming, options, state = {}) {
 				? incoming.url.pathname.slice(0, -1)
 				: incoming.url.pathname + '/';
 
+			if (incoming.url.search === '?') incoming.url.search = '';
+
 			return {
 				status: 301,
 				headers: {
@@ -57,7 +59,8 @@ export async function respond(incoming, options, state = {}) {
 					});
 				}
 
-				const decoded = decodeURI(request.url.pathname); // TODO account for paths.base
+				const decoded = decodeURI(request.url.pathname).replace(options.paths.base, '');
+
 				for (const route of options.manifest._.routes) {
 					const match = route.pattern.exec(decoded);
 					if (!match) continue;
diff --git a/packages/kit/src/runtime/server/utils.js b/packages/kit/src/runtime/server/utils.js
index ea7c26765a0d..a48f6c9d251f 100644
--- a/packages/kit/src/runtime/server/utils.js
+++ b/packages/kit/src/runtime/server/utils.js
@@ -15,6 +15,7 @@ export function decode_params(params) {
 	for (const key in params) {
 		// input has already been decoded by decodeURI
 		// now handle the rest that decodeURIComponent would do
+		// TODO shouldn't we just use decodeURIComponent in the first place?
 		params[key] = params[key]
 			.replace(/%23/g, '#')
 			.replace(/%3[Bb]/g, ';')

From 941b3b6ac469ef86425add9830fb3a0d9b9db855 Mon Sep 17 00:00:00 2001
From: Rich Harris <hello@rich-harris.dev>
Date: Wed, 29 Dec 2021 16:14:24 +0000
Subject: [PATCH 03/45] typo

---
 packages/kit/src/runtime/client/router.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/kit/src/runtime/client/router.js b/packages/kit/src/runtime/client/router.js
index cbfad2f41362..0f11d3cb9b7b 100644
--- a/packages/kit/src/runtime/client/router.js
+++ b/packages/kit/src/runtime/client/router.js
@@ -272,7 +272,7 @@ export class Router {
 		if (this.trailing_slash === 'never') {
 			if (pathname !== '/' && pathname.endsWith('/')) pathname = pathname.slice(0, -1);
 		} else if (this.trailing_slash === 'always') {
-			const is_file = (/** @type {string} */ (url.pathname.split('/').pop()).includes('.');
+			const is_file = /** @type {string} */ (url.pathname.split('/').pop()).includes('.');
 			if (!is_file) pathname += '/';
 		}
 

From 55fa638f38990b956a1996f755c419717e8e900b Mon Sep 17 00:00:00 2001
From: Rich Harris <hello@rich-harris.dev>
Date: Wed, 29 Dec 2021 16:15:34 +0000
Subject: [PATCH 04/45] lint

---
 packages/kit/src/core/preview/index.js            | 2 --
 packages/kit/src/runtime/server/page/load_node.js | 2 --
 2 files changed, 4 deletions(-)

diff --git a/packages/kit/src/core/preview/index.js b/packages/kit/src/core/preview/index.js
index 53c24ab15087..dd20113f3b06 100644
--- a/packages/kit/src/core/preview/index.js
+++ b/packages/kit/src/core/preview/index.js
@@ -90,8 +90,6 @@ export async function preview({
 				return res.end(err.reason || 'Invalid request body');
 			}
 
-			const parsed = new URL(initial_url, 'http://localhost/');
-
 			const rendered =
 				initial_url.startsWith(config.kit.paths.base) &&
 				(await app.render({
diff --git a/packages/kit/src/runtime/server/page/load_node.js b/packages/kit/src/runtime/server/page/load_node.js
index 19493692f900..91dee6be8dc4 100644
--- a/packages/kit/src/runtime/server/page/load_node.js
+++ b/packages/kit/src/runtime/server/page/load_node.js
@@ -159,8 +159,6 @@ export async function load_node({
 						throw new Error('Request body must be a string');
 					}
 
-					const search = requested.includes('?') ? requested.slice(requested.indexOf('?') + 1) : '';
-
 					const rendered = await respond(
 						{
 							url: new URL(requested, request.url),

From 92094b1c7668976e91f4918df869397f6ee4f590 Mon Sep 17 00:00:00 2001
From: Rich Harris <hello@rich-harris.dev>
Date: Wed, 29 Dec 2021 16:27:48 +0000
Subject: [PATCH 05/45] fix test

---
 packages/kit/src/core/preview/index.js                    | 2 +-
 packages/kit/test/apps/basics/src/routes/origin/_tests.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/kit/src/core/preview/index.js b/packages/kit/src/core/preview/index.js
index dd20113f3b06..d04ea8da1506 100644
--- a/packages/kit/src/core/preview/index.js
+++ b/packages/kit/src/core/preview/index.js
@@ -93,7 +93,7 @@ export async function preview({
 			const rendered =
 				initial_url.startsWith(config.kit.paths.base) &&
 				(await app.render({
-					url: `${use_https ? 'https' : 'http'}://${req.headers.host}${initial_url}`,
+					url: initial_url,
 					method: req.method,
 					headers: /** @type {import('types/helper').RequestHeaders} */ (req.headers),
 					rawBody: body
diff --git a/packages/kit/test/apps/basics/src/routes/origin/_tests.js b/packages/kit/test/apps/basics/src/routes/origin/_tests.js
index 7b9f88b54769..cee03516fa69 100644
--- a/packages/kit/test/apps/basics/src/routes/origin/_tests.js
+++ b/packages/kit/test/apps/basics/src/routes/origin/_tests.js
@@ -2,7 +2,7 @@ import * as assert from 'uvu/assert';
 
 /** @type {import('test').TestMaker} */
 export default function (test, is_dev) {
-	test('can access origin through page store', null, async ({ base, page }) => {
+	test('can access origin through url store', null, async ({ base, page }) => {
 		if (!is_dev) {
 			page.setExtraHTTPHeaders({
 				'x-forwarded-host': 'forwarded.com',

From 5c15f7e93665322ba9dd7bc14f9e4457e208a910 Mon Sep 17 00:00:00 2001
From: Rich Harris <hello@rich-harris.dev>
Date: Wed, 29 Dec 2021 16:35:27 +0000
Subject: [PATCH 06/45] fix xss vuln

---
 packages/kit/src/runtime/server/page/render.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/kit/src/runtime/server/page/render.js b/packages/kit/src/runtime/server/page/render.js
index 8e9e17a7baec..f30e16f0f1df 100644
--- a/packages/kit/src/runtime/server/page/render.js
+++ b/packages/kit/src/runtime/server/page/render.js
@@ -142,7 +142,7 @@ export async function render_response({
 						.join(',\n\t\t\t\t\t\t')}
 					],
 					url: new URL(${s(url.href)}),
-					params: ${s(params)}
+					params: ${devalue(params)}
 				}` : 'null'}
 			});
 		</script>`;

From 2bc4cd5f6154f6f0a71cba451556fc30a27228d8 Mon Sep 17 00:00:00 2001
From: Rich Harris <hello@rich-harris.dev>
Date: Wed, 29 Dec 2021 16:58:45 +0000
Subject: [PATCH 07/45] fix test

---
 .../kit/test/apps/basics/src/routes/store/_tests.js  | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/packages/kit/test/apps/basics/src/routes/store/_tests.js b/packages/kit/test/apps/basics/src/routes/store/_tests.js
index a93f00fc7a67..381ccc57c49c 100644
--- a/packages/kit/test/apps/basics/src/routes/store/_tests.js
+++ b/packages/kit/test/apps/basics/src/routes/store/_tests.js
@@ -1,8 +1,16 @@
 import * as assert from 'uvu/assert';
 
 /** @type {import('test').TestMaker} */
-export default function (test) {
-	test('page store functions as expected', '/store', async ({ page, clicknav, js }) => {
+export default function (test, is_dev) {
+	test('url store functions as expected', '/store', async ({ page, clicknav, js }) => {
+		if (!is_dev) {
+			// this prevents the URL from changing on hydration
+			page.setExtraHTTPHeaders({
+				'x-forwarded-host': 'forwarded.com',
+				'x-forwarded-proto': 'https'
+			});
+		}
+
 		assert.equal(await page.textContent('h1'), 'Test');
 		assert.equal(await page.textContent('h2'), 'Calls: 1');
 

From 39f25b1c8f56a92ee57668f6ca8973e84e341074 Mon Sep 17 00:00:00 2001
From: Rich Harris <hello@rich-harris.dev>
Date: Wed, 29 Dec 2021 17:18:04 +0000
Subject: [PATCH 08/45] gah

---
 .../test/apps/basics/src/routes/store/_tests.js    | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/packages/kit/test/apps/basics/src/routes/store/_tests.js b/packages/kit/test/apps/basics/src/routes/store/_tests.js
index 381ccc57c49c..a2d47392b105 100644
--- a/packages/kit/test/apps/basics/src/routes/store/_tests.js
+++ b/packages/kit/test/apps/basics/src/routes/store/_tests.js
@@ -2,15 +2,19 @@ import * as assert from 'uvu/assert';
 
 /** @type {import('test').TestMaker} */
 export default function (test, is_dev) {
-	test('url store functions as expected', '/store', async ({ page, clicknav, js }) => {
+	test('url store functions as expected', null, async ({ base, page, clicknav, js }) => {
 		if (!is_dev) {
-			// this prevents the URL from changing on hydration
+			// this prevents the URL from changing on hydration — we need to
+			// do this because these values are set in the config for a
+			// different test
 			page.setExtraHTTPHeaders({
-				'x-forwarded-host': 'forwarded.com',
-				'x-forwarded-proto': 'https'
+				'x-forwarded-host': 'localhost:3000',
+				'x-forwarded-proto': 'http'
 			});
 		}
 
+		await page.goto(`${base}/store`);
+
 		assert.equal(await page.textContent('h1'), 'Test');
 		assert.equal(await page.textContent('h2'), 'Calls: 1');
 
@@ -20,6 +24,8 @@ export default function (test, is_dev) {
 
 		const oops = await page.evaluate(() => window.oops);
 		assert.ok(!oops, oops);
+
+		page.setExtraHTTPHeaders({});
 	});
 
 	test(

From 145aaae37ef96e0bdb02688260cdedd37018f31e Mon Sep 17 00:00:00 2001
From: Rich Harris <hello@rich-harris.dev>
Date: Wed, 29 Dec 2021 17:28:05 +0000
Subject: [PATCH 09/45] fixes

---
 packages/kit/src/runtime/client/router.js                   | 6 +++---
 .../kit/test/apps/options/source/pages/slash/child.svelte   | 3 ++-
 .../kit/test/apps/options/source/pages/slash/index.svelte   | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/packages/kit/src/runtime/client/router.js b/packages/kit/src/runtime/client/router.js
index 0f11d3cb9b7b..b57b9e8c3b8f 100644
--- a/packages/kit/src/runtime/client/router.js
+++ b/packages/kit/src/runtime/client/router.js
@@ -273,11 +273,11 @@ export class Router {
 			if (pathname !== '/' && pathname.endsWith('/')) pathname = pathname.slice(0, -1);
 		} else if (this.trailing_slash === 'always') {
 			const is_file = /** @type {string} */ (url.pathname.split('/').pop()).includes('.');
-			if (!is_file) pathname += '/';
+			if (!is_file && !pathname.endsWith('/')) pathname += '/';
 		}
 
-		const normalized_url = new URL(url.origin + pathname + url.search + url.hash);
-		history.replaceState({}, '', normalized_url);
+		info.url = new URL(url.origin + pathname + url.search + url.hash);
+		history.replaceState({}, '', info.url);
 
 		await this.renderer.handle_navigation(info, chain, false, { hash, scroll, keepfocus });
 
diff --git a/packages/kit/test/apps/options/source/pages/slash/child.svelte b/packages/kit/test/apps/options/source/pages/slash/child.svelte
index ddc03b0d607d..d8bf4fadac4c 100644
--- a/packages/kit/test/apps/options/source/pages/slash/child.svelte
+++ b/packages/kit/test/apps/options/source/pages/slash/child.svelte
@@ -1,5 +1,6 @@
 <script>
+	import { base } from '$app/paths';
 	import { url } from '$app/stores';
 </script>
 
-<h2>{$url.pathname}</h2>
+<h2>{$url.pathname.replace(base, '')}</h2>
diff --git a/packages/kit/test/apps/options/source/pages/slash/index.svelte b/packages/kit/test/apps/options/source/pages/slash/index.svelte
index cc79e7763f90..6ba53b5a73ed 100644
--- a/packages/kit/test/apps/options/source/pages/slash/index.svelte
+++ b/packages/kit/test/apps/options/source/pages/slash/index.svelte
@@ -3,6 +3,6 @@
 	import { url } from '$app/stores';
 </script>
 
-<h2>{$url.pathname}</h2>
+<h2>{$url.pathname.replace(base, '')}</h2>
 
 <a href="{base}/slash/child">/slash/child</a>

From 9f454bf41af7bb4c1423b238c694ff99552b5b12 Mon Sep 17 00:00:00 2001
From: Rich Harris <hello@rich-harris.dev>
Date: Wed, 29 Dec 2021 17:42:27 +0000
Subject: [PATCH 10/45] simplify

---
 examples/hn.svelte.dev/src/routes/index.svelte | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/examples/hn.svelte.dev/src/routes/index.svelte b/examples/hn.svelte.dev/src/routes/index.svelte
index 711c3a0fe835..9da5bb196fe1 100644
--- a/examples/hn.svelte.dev/src/routes/index.svelte
+++ b/examples/hn.svelte.dev/src/routes/index.svelte
@@ -1,14 +1,9 @@
 <script context="module">
 	/** @type {import('@sveltejs/kit').Load} */
 	export function load({ url }) {
-		let host = url.host;
-		const i = host.indexOf(':');
-		if (i >= 0) {
-			host = host.substring(0, i);
-		}
 		return {
 			redirect: '/top/1',
-			status: host === 'localhost' || host === '127.0.0.1' ? 302 : 301
+			status: url.hostname === 'localhost' || url.hostname === '127.0.0.1' ? 302 : 301
 		};
 	}
 </script>

From 0a6e6cf535c088a7a17e5effeca047cd43b43fb2 Mon Sep 17 00:00:00 2001
From: Rich Harris <hello@rich-harris.dev>
Date: Wed, 29 Dec 2021 17:45:34 +0000
Subject: [PATCH 11/45] use pathname+search as key

---
 packages/kit/src/runtime/client/renderer.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/kit/src/runtime/client/renderer.js b/packages/kit/src/runtime/client/renderer.js
index b54546bafa70..e04b2869a237 100644
--- a/packages/kit/src/runtime/client/renderer.js
+++ b/packages/kit/src/runtime/client/renderer.js
@@ -456,7 +456,7 @@ export class Renderer {
 		const maxage = leaf.loaded && leaf.loaded.maxage;
 
 		if (maxage) {
-			const key = url.origin + url.pathname; // omit hash
+			const key = url.pathname + url.search; // omit hash
 			let ready = false;
 
 			const clear = () => {

From 4511c61f3a6a560f260c2233012f7413b707aa54 Mon Sep 17 00:00:00 2001
From: Rich Harris <hello@rich-harris.dev>
Date: Wed, 29 Dec 2021 18:19:33 +0000
Subject: [PATCH 12/45] all tests passing

---
 .../kit/test/apps/basics/src/routes/origin/_tests.js | 12 +-----------
 .../kit/test/apps/basics/src/routes/store/_tests.js  | 12 ------------
 packages/kit/test/apps/basics/svelte.config.js       |  4 ----
 3 files changed, 1 insertion(+), 27 deletions(-)

diff --git a/packages/kit/test/apps/basics/src/routes/origin/_tests.js b/packages/kit/test/apps/basics/src/routes/origin/_tests.js
index cee03516fa69..8a18d8e2c08f 100644
--- a/packages/kit/test/apps/basics/src/routes/origin/_tests.js
+++ b/packages/kit/test/apps/basics/src/routes/origin/_tests.js
@@ -3,17 +3,7 @@ import * as assert from 'uvu/assert';
 /** @type {import('test').TestMaker} */
 export default function (test, is_dev) {
 	test('can access origin through url store', null, async ({ base, page }) => {
-		if (!is_dev) {
-			page.setExtraHTTPHeaders({
-				'x-forwarded-host': 'forwarded.com',
-				'x-forwarded-proto': 'https'
-			});
-		}
-
 		await page.goto(`${base}/origin`);
-		assert.equal(await page.textContent('h1'), is_dev ? base : 'https://forwarded.com');
-
-		// reset
-		page.setExtraHTTPHeaders({});
+		assert.equal(await page.textContent('h1'), base);
 	});
 }
diff --git a/packages/kit/test/apps/basics/src/routes/store/_tests.js b/packages/kit/test/apps/basics/src/routes/store/_tests.js
index a2d47392b105..f1d3450cfddb 100644
--- a/packages/kit/test/apps/basics/src/routes/store/_tests.js
+++ b/packages/kit/test/apps/basics/src/routes/store/_tests.js
@@ -3,16 +3,6 @@ import * as assert from 'uvu/assert';
 /** @type {import('test').TestMaker} */
 export default function (test, is_dev) {
 	test('url store functions as expected', null, async ({ base, page, clicknav, js }) => {
-		if (!is_dev) {
-			// this prevents the URL from changing on hydration — we need to
-			// do this because these values are set in the config for a
-			// different test
-			page.setExtraHTTPHeaders({
-				'x-forwarded-host': 'localhost:3000',
-				'x-forwarded-proto': 'http'
-			});
-		}
-
 		await page.goto(`${base}/store`);
 
 		assert.equal(await page.textContent('h1'), 'Test');
@@ -24,8 +14,6 @@ export default function (test, is_dev) {
 
 		const oops = await page.evaluate(() => window.oops);
 		assert.ok(!oops, oops);
-
-		page.setExtraHTTPHeaders({});
 	});
 
 	test(
diff --git a/packages/kit/test/apps/basics/svelte.config.js b/packages/kit/test/apps/basics/svelte.config.js
index 5619c319a01d..e5e3f5df2ed2 100644
--- a/packages/kit/test/apps/basics/svelte.config.js
+++ b/packages/kit/test/apps/basics/svelte.config.js
@@ -1,10 +1,6 @@
 /** @type {import('@sveltejs/kit').Config} */
 const config = {
 	kit: {
-		headers: {
-			host: 'x-forwarded-host',
-			protocol: 'x-forwarded-proto'
-		},
 		vite: {
 			build: {
 				minify: false

From bd496f39d81b94f41c09cc1aa57d8d6ffa127318 Mon Sep 17 00:00:00 2001
From: Rich Harris <hello@rich-harris.dev>
Date: Wed, 29 Dec 2021 18:21:04 +0000
Subject: [PATCH 13/45] lint

---
 packages/kit/test/apps/basics/src/routes/origin/_tests.js | 2 +-
 packages/kit/test/apps/basics/src/routes/store/_tests.js  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/kit/test/apps/basics/src/routes/origin/_tests.js b/packages/kit/test/apps/basics/src/routes/origin/_tests.js
index 8a18d8e2c08f..22f012a74bd1 100644
--- a/packages/kit/test/apps/basics/src/routes/origin/_tests.js
+++ b/packages/kit/test/apps/basics/src/routes/origin/_tests.js
@@ -1,7 +1,7 @@
 import * as assert from 'uvu/assert';
 
 /** @type {import('test').TestMaker} */
-export default function (test, is_dev) {
+export default function (test) {
 	test('can access origin through url store', null, async ({ base, page }) => {
 		await page.goto(`${base}/origin`);
 		assert.equal(await page.textContent('h1'), base);
diff --git a/packages/kit/test/apps/basics/src/routes/store/_tests.js b/packages/kit/test/apps/basics/src/routes/store/_tests.js
index f1d3450cfddb..783c30cf82f4 100644
--- a/packages/kit/test/apps/basics/src/routes/store/_tests.js
+++ b/packages/kit/test/apps/basics/src/routes/store/_tests.js
@@ -1,7 +1,7 @@
 import * as assert from 'uvu/assert';
 
 /** @type {import('test').TestMaker} */
-export default function (test, is_dev) {
+export default function (test) {
 	test('url store functions as expected', null, async ({ base, page, clicknav, js }) => {
 		await page.goto(`${base}/store`);
 

From c581a24b117c42902aec050fb14343925acfa22e Mon Sep 17 00:00:00 2001
From: Rich Harris <hello@rich-harris.dev>
Date: Wed, 29 Dec 2021 18:26:48 +0000
Subject: [PATCH 14/45] tidy up

---
 packages/kit/src/runtime/client/renderer.js    |  4 +---
 packages/kit/src/runtime/client/start.js       | 15 ++-------------
 packages/kit/src/runtime/server/page/render.js |  1 -
 3 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/packages/kit/src/runtime/client/renderer.js b/packages/kit/src/runtime/client/renderer.js
index e04b2869a237..2feb9b13852a 100644
--- a/packages/kit/src/runtime/client/renderer.js
+++ b/packages/kit/src/runtime/client/renderer.js
@@ -67,13 +67,11 @@ export class Renderer {
 	 *   fallback: [CSRComponent, CSRComponent];
 	 *   target: Node;
 	 *   session: any;
-	 *   origin: string;
 	 * }} opts
 	 */
-	constructor({ Root, fallback, target, session, origin }) {
+	constructor({ Root, fallback, target, session }) {
 		this.Root = Root;
 		this.fallback = fallback;
-		this.origin = origin;
 
 		/** @type {import('./router').Router | undefined} */
 		this.router;
diff --git a/packages/kit/src/runtime/client/start.js b/packages/kit/src/runtime/client/start.js
index e1422ebb5686..5eb941771861 100644
--- a/packages/kit/src/runtime/client/start.js
+++ b/packages/kit/src/runtime/client/start.js
@@ -15,7 +15,6 @@ import { set_paths } from '../paths.js';
  *   },
  *   target: Node;
  *   session: any;
- *   origin: string;
  *   route: boolean;
  *   spa: boolean;
  *   trailing_slash: import('types/internal').TrailingSlash;
@@ -28,16 +27,7 @@ import { set_paths } from '../paths.js';
  *   };
  * }} opts
  */
-export async function start({
-	paths,
-	target,
-	session,
-	origin,
-	route,
-	spa,
-	trailing_slash,
-	hydrate
-}) {
+export async function start({ paths, target, session, route, spa, trailing_slash, hydrate }) {
 	if (import.meta.env.DEV && !target) {
 		throw new Error('Missing target element. See https://kit.svelte.dev/docs#configuration-target');
 	}
@@ -46,8 +36,7 @@ export async function start({
 		Root,
 		fallback,
 		target,
-		session,
-		origin
+		session
 	});
 
 	const router = route
diff --git a/packages/kit/src/runtime/server/page/render.js b/packages/kit/src/runtime/server/page/render.js
index f30e16f0f1df..3903677af76b 100644
--- a/packages/kit/src/runtime/server/page/render.js
+++ b/packages/kit/src/runtime/server/page/render.js
@@ -129,7 +129,6 @@ export async function render_response({
 				session: ${try_serialize($session, (error) => {
 					throw new Error(`Failed to serialize session data: ${error.message}`);
 				})},
-				url: new URL(${s(url.href)}),
 				route: ${!!page_config.router},
 				spa: ${!page_config.ssr},
 				trailing_slash: ${s(options.trailing_slash)},

From 109108f32cfd2573082b1001d0702bf5d5a55076 Mon Sep 17 00:00:00 2001
From: Rich Harris <hello@rich-harris.dev>
Date: Wed, 29 Dec 2021 18:26:58 +0000
Subject: [PATCH 15/45] update types in docs

---
 documentation/docs/01-routing.md | 21 ++++++++-----------
 documentation/docs/04-hooks.md   | 35 +++++++++++++-------------------
 2 files changed, 22 insertions(+), 34 deletions(-)

diff --git a/documentation/docs/01-routing.md b/documentation/docs/01-routing.md
index eadcdac009b3..d65e2f030d3c 100644
--- a/documentation/docs/01-routing.md
+++ b/documentation/docs/01-routing.md
@@ -57,24 +57,19 @@ type ResponseHeaders = Record<string, string | string[]>;
 type RequestHeaders = Record<string, string>;
 
 export type RawBody = null | Uint8Array;
-export interface IncomingRequest {
-	method: string;
-	path: string;
-	query: URLSearchParams;
-	headers: RequestHeaders;
-	rawBody: RawBody;
-}
 
 type ParameterizedBody<Body = unknown> = Body extends FormData
 	? ReadOnlyFormData
 	: (string | RawBody | ReadOnlyFormData) & Body;
-// ServerRequest is exported as Request
-export interface ServerRequest<Locals = Record<string, any>, Body = unknown>
-	extends IncomingRequest {
-	origin: string;
+
+export interface Request<Locals = Record<string, any>, Body = unknown> {
+	url: URL;
+	method: string;
+	headers: RequestHeaders;
+	rawBody: RawBody;
 	params: Record<string, string>;
 	body: ParameterizedBody<Body>;
-	locals: Locals; // populated by hooks handle
+	locals: Locals;
 }
 
 type DefaultBody = JSONResponse | Uint8Array;
@@ -89,7 +84,7 @@ export interface RequestHandler<
 	Input = unknown,
 	Output extends DefaultBody = DefaultBody
 > {
-	(request: ServerRequest<Locals, Input>):
+	(request: Request<Locals, Input>):
 		| void
 		| EndpointOutput<Output>
 		| Promise<void | EndpointOutput<Output>>;
diff --git a/documentation/docs/04-hooks.md b/documentation/docs/04-hooks.md
index dcb776969cc7..3cd587b8a62d 100644
--- a/documentation/docs/04-hooks.md
+++ b/documentation/docs/04-hooks.md
@@ -24,29 +24,24 @@ type ResponseHeaders = Record<string, string | string[]>;
 type RequestHeaders = Record<string, string>;
 
 export type RawBody = null | Uint8Array;
-export interface IncomingRequest {
-	method: string;
-	path: string;
-	query: URLSearchParams;
-	headers: RequestHeaders;
-	rawBody: RawBody;
-}
 
 type ParameterizedBody<Body = unknown> = Body extends FormData
 	? ReadOnlyFormData
 	: (string | RawBody | ReadOnlyFormData) & Body;
-// ServerRequest is exported as Request
-export interface ServerRequest<Locals = Record<string, any>, Body = unknown>
-	extends IncomingRequest {
-	origin: string;
+
+export interface Request<Locals = Record<string, any>, Body = unknown> {
+	url: URL;
+	method: string;
+	headers: RequestHeaders;
+	rawBody: RawBody;
 	params: Record<string, string>;
 	body: ParameterizedBody<Body>;
-	locals: Locals; // populated by hooks handle
+	locals: Locals;
 }
 
 type StrictBody = string | Uint8Array;
-// ServerResponse is exported as Response
-export interface ServerResponse {
+
+export interface Response {
 	status: number;
 	headers: ResponseHeaders;
 	body?: StrictBody;
@@ -54,9 +49,9 @@ export interface ServerResponse {
 
 export interface Handle<Locals = Record<string, any>, Body = unknown> {
 	(input: {
-		request: ServerRequest<Locals, Body>;
-		resolve(request: ServerRequest<Locals, Body>): ServerResponse | Promise<ServerResponse>;
-	}): ServerResponse | Promise<ServerResponse>;
+		request: Request<Locals, Body>;
+		resolve(request: Request<Locals, Body>): Response | Promise<Response>;
+	}): Response | Promise<Response>;
 }
 ```
 
@@ -91,9 +86,8 @@ If unimplemented, SvelteKit will log the error with default formatting.
 
 ```ts
 // Declaration types for handleError hook
-
 export interface HandleError<Locals = Record<string, any>, Body = unknown> {
-	(input: { error: Error & { frame?: string }; request: ServerRequest<Locals, Body> }): void;
+	(input: { error: Error & { frame?: string }; request: Request<Locals, Body> }): void;
 }
 ```
 
@@ -115,9 +109,8 @@ If unimplemented, session is `{}`.
 
 ```ts
 // Declaration types for getSession hook
-
 export interface GetSession<Locals = Record<string, any>, Body = unknown, Session = any> {
-	(request: ServerRequest<Locals, Body>): Session | Promise<Session>;
+	(request: Request<Locals, Body>): Session | Promise<Session>;
 }
 ```
 

From c74cfe743a572dfc0d748f92d2e4f030fa1a5215 Mon Sep 17 00:00:00 2001
From: Rich Harris <hello@rich-harris.dev>
Date: Wed, 29 Dec 2021 18:43:42 +0000
Subject: [PATCH 16/45] update docs

---
 documentation/docs/03-loading.md | 32 +++++++++++++++++---------------
 documentation/docs/05-modules.md |  3 ++-
 2 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/documentation/docs/03-loading.md b/documentation/docs/03-loading.md
index 348b50a5f48e..cf8b9977e688 100644
--- a/documentation/docs/03-loading.md
+++ b/documentation/docs/03-loading.md
@@ -13,12 +13,8 @@ export interface LoadInput<
 	Stuff extends Record<string, any> = Record<string, any>,
 	Session = any
 > {
-	page: {
-		origin: string;
-		path: string;
-		params: PageParams;
-		query: URLSearchParams;
-	};
+	url: URL;
+	params: PageParams;
 	fetch(info: RequestInfo, init?: RequestInit): Promise<Response>;
 	session: Session;
 	stuff: Stuff;
@@ -90,18 +86,24 @@ It is recommended that you not store pre-request state in global variables, but
 
 The `load` function receives an object containing four fields — `page`, `fetch`, `session` and `stuff`. The `load` function is reactive, and will re-run when its parameters change, but only if they are used in the function. Specifically, if `page.query`, `page.path`, `session`, or `stuff` are used in the function, they will be re-run whenever their value changes. Note that destructuring parameters in the function declaration is enough to count as using them. In the example above, the `load({ page, fetch, session, stuff })` function will re-run every time `session` or `stuff` is changed, even though they are not used in the body of the function. If it was re-written as `load({ page, fetch })`, then it would only re-run when `page.params.slug` changes. The same reactivity applies to `page.params`, but only to the params actually used in the function. If `page.params.foo` changes, the example above would not re-run, because it did not access `page.params.foo`, only `page.params.slug`.
 
-#### page
+#### url
 
-`page` is an `{ origin, path, params, query }` object where `origin` is the URL's origin, `path` is its pathname, `params` is derived from `path` and the route filename, and `query` is an instance of [`URLSearchParams`](https://developer.mozilla.org/en-US/docs/Web/API/URLSearchParams). Mutating `page` does not update the current URL; you should instead navigate using [`goto`](#modules-$app-navigation).
+`url` is an instance of [`URL`](https://developer.mozilla.org/en-US/docs/Web/API/URL), containing properties like the `origin`, `hostname`, `pathname` and `searchParams`.
 
-So if the example above was `src/routes/blog/[slug].svelte` and the URL was `https://example.com/blog/some-post?foo=bar&baz&bizz=a&bizz=b`, the following would be true:
+> In some environments this is derived from request headers, which you [may need to configure](#configuration-headers), during server-side rendering
 
-- `page.origin === 'https://example.com'`
-- `page.path === '/blog/some-post'`
-- `page.params.slug === 'some-post'`
-- `page.query.get('foo') === 'bar'`
-- `page.query.has('baz')`
-- `page.query.getAll('bizz') === ['a', 'b']`
+#### params
+
+`params` is derived from `url.pathname` and the route filename.
+
+For a route filename example like `src/routes/a/[b]/[c]` and a `url.pathname` of `/a/x/y/z`, the `params` object would look like this:
+
+```js
+{
+	"b": "x",
+	"c": "y/z"
+}
+```
 
 #### fetch
 
diff --git a/documentation/docs/05-modules.md b/documentation/docs/05-modules.md
index 9a085d046507..22ae854137db 100644
--- a/documentation/docs/05-modules.md
+++ b/documentation/docs/05-modules.md
@@ -57,7 +57,8 @@ Because of that, the stores are not free-floating objects: they must be accessed
 The stores themselves attach to the correct context at the point of subscription, which means you can import and use them directly in components without boilerplate. However, it still needs to be called synchronously on component or page initialisation when `$`-prefix isn't used. Use `getStores` to safely `.subscribe` asynchronously instead.
 
 - `navigating` is a [readable store](https://svelte.dev/tutorial/readable-stores). When navigating starts, its value is `{ from, to }`, where `from` and `to` both mirror the `page` store value. When navigating finishes, its value reverts to `null`.
-- `page` is a readable store whose value reflects the object passed to `load` functions — it contains `origin`, `path`, `params` and `query`. See the [`page` section](#loading-input-page) above for more details.
+- `url` is a readable store whose value contains a [`URL`](https://developer.mozilla.org/en-US/docs/Web/API/URL) object for the current page.
+- `params` contains the current page parameters. See the [`params` section](#loading-input-params) above for more details.
 - `session` is a [writable store](https://svelte.dev/tutorial/writable-stores) whose initial value is whatever was returned from [`getSession`](#hooks-getsession). It can be written to, but this will _not_ cause changes to persist on the server — this is something you must implement yourself.
 
 ### $lib

From c9a2794b50a696d5d9947a7b247db5ab40db6e26 Mon Sep 17 00:00:00 2001
From: Rich Harris <hello@rich-harris.dev>
Date: Wed, 29 Dec 2021 18:45:16 +0000
Subject: [PATCH 17/45] more docs

---
 documentation/docs/03-loading.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/documentation/docs/03-loading.md b/documentation/docs/03-loading.md
index cf8b9977e688..6c6b1d3d4273 100644
--- a/documentation/docs/03-loading.md
+++ b/documentation/docs/03-loading.md
@@ -38,8 +38,8 @@ Our example blog page might contain a `load` function like the following:
 ```html
 <script context="module">
 	/** @type {import('@sveltejs/kit').Load} */
-	export async function load({ page, fetch, session, stuff }) {
-		const url = `/blog/${page.params.slug}.json`;
+	export async function load({ params, fetch, session, stuff }) {
+		const url = `/blog/${params.slug}.json`;
 		const res = await fetch(url);
 
 		if (res.ok) {
@@ -84,7 +84,7 @@ It is recommended that you not store pre-request state in global variables, but
 
 ### Input
 
-The `load` function receives an object containing four fields — `page`, `fetch`, `session` and `stuff`. The `load` function is reactive, and will re-run when its parameters change, but only if they are used in the function. Specifically, if `page.query`, `page.path`, `session`, or `stuff` are used in the function, they will be re-run whenever their value changes. Note that destructuring parameters in the function declaration is enough to count as using them. In the example above, the `load({ page, fetch, session, stuff })` function will re-run every time `session` or `stuff` is changed, even though they are not used in the body of the function. If it was re-written as `load({ page, fetch })`, then it would only re-run when `page.params.slug` changes. The same reactivity applies to `page.params`, but only to the params actually used in the function. If `page.params.foo` changes, the example above would not re-run, because it did not access `page.params.foo`, only `page.params.slug`.
+The `load` function receives an object containing four fields — `page`, `fetch`, `session` and `stuff`. The `load` function is reactive, and will re-run when its parameters change, but only if they are used in the function. Specifically, if `page.query`, `page.path`, `session`, or `stuff` are used in the function, they will be re-run whenever their value changes. Note that destructuring parameters in the function declaration is enough to count as using them. In the example above, the `load({ params, fetch, session, stuff })` function will re-run every time `session` or `stuff` is changed, even though they are not used in the body of the function. If it was re-written as `load({ params, fetch })`, then it would only re-run when `params.slug` changes. The same reactivity applies to `params`, but only to the params actually used in the function. If `params.foo` changes, the example above would not re-run, because it did not access `params.foo`, only `params.slug`.
 
 #### url
 

From 921e572c69627243db215bb57bd66ca628e7ec78 Mon Sep 17 00:00:00 2001
From: Rich Harris <hello@rich-harris.dev>
Date: Wed, 29 Dec 2021 18:45:30 +0000
Subject: [PATCH 18/45] more docs

---
 documentation/docs/03-loading.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/documentation/docs/03-loading.md b/documentation/docs/03-loading.md
index 6c6b1d3d4273..095024fe82dc 100644
--- a/documentation/docs/03-loading.md
+++ b/documentation/docs/03-loading.md
@@ -84,7 +84,7 @@ It is recommended that you not store pre-request state in global variables, but
 
 ### Input
 
-The `load` function receives an object containing four fields — `page`, `fetch`, `session` and `stuff`. The `load` function is reactive, and will re-run when its parameters change, but only if they are used in the function. Specifically, if `page.query`, `page.path`, `session`, or `stuff` are used in the function, they will be re-run whenever their value changes. Note that destructuring parameters in the function declaration is enough to count as using them. In the example above, the `load({ params, fetch, session, stuff })` function will re-run every time `session` or `stuff` is changed, even though they are not used in the body of the function. If it was re-written as `load({ params, fetch })`, then it would only re-run when `params.slug` changes. The same reactivity applies to `params`, but only to the params actually used in the function. If `params.foo` changes, the example above would not re-run, because it did not access `params.foo`, only `params.slug`.
+The `load` function receives an object containing four fields — `page`, `fetch`, `session` and `stuff`. The `load` function is reactive, and will re-run when its parameters change, but only if they are used in the function. Specifically, if `url`, `session`, or `stuff` are used in the function, they will be re-run whenever their value changes. Note that destructuring parameters in the function declaration is enough to count as using them. In the example above, the `load({ params, fetch, session, stuff })` function will re-run every time `session` or `stuff` is changed, even though they are not used in the body of the function. If it was re-written as `load({ params, fetch })`, then it would only re-run when `params.slug` changes. The same reactivity applies to `params`, but only to the params actually used in the function. If `params.foo` changes, the example above would not re-run, because it did not access `params.foo`, only `params.slug`.
 
 #### url
 

From a1ae42d1389b63c7f1aa5a19093e4cc942222e30 Mon Sep 17 00:00:00 2001
From: Rich Harris <hello@rich-harris.dev>
Date: Wed, 29 Dec 2021 18:45:48 +0000
Subject: [PATCH 19/45] more docs

---
 documentation/docs/14-configuration.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/documentation/docs/14-configuration.md b/documentation/docs/14-configuration.md
index c9707584f4b4..533b191d2739 100644
--- a/documentation/docs/14-configuration.md
+++ b/documentation/docs/14-configuration.md
@@ -109,7 +109,7 @@ Permissions-Policy: interest-cohort=()
 
 ### headers
 
-The [`page.origin`] property is derived from the request protocol (normally `https`) and the host, which is taken from the `Host` header by default.
+The current page or endpoint's `url` is, in some environments, derived from the request protocol (normally `https`) and the host, which is taken from the `Host` header by default.
 
 If your app is behind a reverse proxy (think load balancers and CDNs) then the `Host` header will be incorrect. In most cases, the underlying protocol and host are exposed via the [`X-Forwarded-Host`](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/X-Forwarded-Host) and [`X-Forwarded-Proto`](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/X-Forwarded-Proto) headers, which can be specified in your config:
 

From 0d70de66e6201e19083f9907d472516d032dcb62 Mon Sep 17 00:00:00 2001
From: Rich Harris <hello@rich-harris.dev>
Date: Wed, 29 Dec 2021 18:51:07 +0000
Subject: [PATCH 20/45] i would be lost without conduitry

---
 documentation/docs/03-loading.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/documentation/docs/03-loading.md b/documentation/docs/03-loading.md
index 095024fe82dc..fb522e7d0457 100644
--- a/documentation/docs/03-loading.md
+++ b/documentation/docs/03-loading.md
@@ -96,7 +96,7 @@ The `load` function receives an object containing four fields — `page`, `fetch
 
 `params` is derived from `url.pathname` and the route filename.
 
-For a route filename example like `src/routes/a/[b]/[c]` and a `url.pathname` of `/a/x/y/z`, the `params` object would look like this:
+For a route filename example like `src/routes/a/[b]/[...c]` and a `url.pathname` of `/a/x/y/z`, the `params` object would look like this:
 
 ```js
 {

From 28d5c1eac965f71b36e40501e6b416907622d44f Mon Sep 17 00:00:00 2001
From: Rich Harris <hello@rich-harris.dev>
Date: Wed, 29 Dec 2021 19:19:57 +0000
Subject: [PATCH 21/45] update template app

---
 packages/create-svelte/templates/default/src/hooks.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/create-svelte/templates/default/src/hooks.ts b/packages/create-svelte/templates/default/src/hooks.ts
index 157882f2cb71..622443f5030d 100644
--- a/packages/create-svelte/templates/default/src/hooks.ts
+++ b/packages/create-svelte/templates/default/src/hooks.ts
@@ -7,7 +7,7 @@ export const handle: Handle = async ({ request, resolve }) => {
 	request.locals.userid = cookies.userid || uuid();
 
 	// TODO https://github.com/sveltejs/kit/issues/1046
-	const method = request.query.get('_method');
+	const method = request.url.searchParams.get('_method');
 	if (method) {
 		request.method = method.toUpperCase();
 	}

From b12931f64a12f28f1350000a16cd4708b1e67a34 Mon Sep 17 00:00:00 2001
From: Rich Harris <hello@rich-harris.dev>
Date: Wed, 29 Dec 2021 19:22:15 +0000
Subject: [PATCH 22/45] throw useful error when trying to access
 path/query/origin/page

---
 packages/kit/src/runtime/client/renderer.js     |  6 ++++++
 packages/kit/src/runtime/server/endpoint.js     |  7 +++++--
 packages/kit/src/runtime/server/index.js        | 17 +++++++++++++++++
 .../kit/src/runtime/server/page/load_node.js    |  8 +++++++-
 4 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/packages/kit/src/runtime/client/renderer.js b/packages/kit/src/runtime/client/renderer.js
index 2feb9b13852a..d32b31bbaa4f 100644
--- a/packages/kit/src/runtime/client/renderer.js
+++ b/packages/kit/src/runtime/client/renderer.js
@@ -544,6 +544,12 @@ export class Renderer {
 					node.uses.dependencies.push(href);
 
 					return started ? fetch(resource, info) : initial_fetch(resource, info);
+				},
+
+				// TODO remove this for 1.0
+				// @ts-expect-error
+				get page() {
+					throw new Error('`page` in `load` functions has been replaced by `url` and `params`');
 				}
 			};
 
diff --git a/packages/kit/src/runtime/server/endpoint.js b/packages/kit/src/runtime/server/endpoint.js
index d75435041281..12bda1601ccb 100644
--- a/packages/kit/src/runtime/server/endpoint.js
+++ b/packages/kit/src/runtime/server/endpoint.js
@@ -48,9 +48,12 @@ export async function render_endpoint(request, route, match) {
 		return;
 	}
 
-	const params = route.params ? decode_params(route.params(match)) : {};
+	// we're mutating `request` so that we don't have to do { ...request, params }
+	// on the next line, since that breaks the getters used to deprecate path,
+	// query and origin. We could revert that once we remove the getters
+	request.params = route.params ? decode_params(route.params(match)) : {};
 
-	const response = await handler({ ...request, params });
+	const response = await handler(request);
 	const preface = `Invalid response from route ${request.url.pathname}`;
 
 	if (!response) {
diff --git a/packages/kit/src/runtime/server/index.js b/packages/kit/src/runtime/server/index.js
index 3f7e3058b310..fdc718db9d35 100644
--- a/packages/kit/src/runtime/server/index.js
+++ b/packages/kit/src/runtime/server/index.js
@@ -43,6 +43,23 @@ export async function respond(incoming, options, state = {}) {
 		locals: {}
 	};
 
+	// TODO remove this for 1.0
+	/**
+	 * @param {string} property
+	 * @param {string} replacement
+	 */
+	function deprecate(property, replacement) {
+		Object.defineProperty(request, property, {
+			get: () => {
+				throw new Error(`request.${property} has been replaced by request.url.${replacement}`);
+			}
+		});
+	}
+
+	deprecate('origin', 'origin');
+	deprecate('path', 'pathname');
+	deprecate('query', 'searchParams');
+
 	try {
 		return await options.hooks.handle({
 			request,
diff --git a/packages/kit/src/runtime/server/page/load_node.js b/packages/kit/src/runtime/server/page/load_node.js
index 91dee6be8dc4..4c93af1a2f83 100644
--- a/packages/kit/src/runtime/server/page/load_node.js
+++ b/packages/kit/src/runtime/server/page/load_node.js
@@ -276,7 +276,13 @@ export async function load_node({
 					})
 				);
 			},
-			stuff: { ...stuff }
+			stuff: { ...stuff },
+
+			// TODO remove this for 1.0
+			// @ts-expect-error
+			get page() {
+				throw new Error('`page` in `load` functions has been replaced by `url` and `params`');
+			}
 		};
 
 		if (is_error) {

From bc8c0ce783997c1d6be8ab40500cf2b351aa3bb1 Mon Sep 17 00:00:00 2001
From: Rich Harris <hello@rich-harris.dev>
Date: Wed, 29 Dec 2021 19:45:12 +0000
Subject: [PATCH 23/45] $params -> $route.params, only use getters in dev,
 remove the word "deprecate"

---
 packages/kit/src/core/create_app/index.js     |  6 ++--
 packages/kit/src/runtime/app/stores.js        | 10 +++---
 packages/kit/src/runtime/client/renderer.js   | 13 +++++--
 packages/kit/src/runtime/server/endpoint.js   |  4 +--
 packages/kit/src/runtime/server/index.js      | 32 +++++++++--------
 .../kit/src/runtime/server/page/load_node.js  | 15 ++++----
 .../kit/src/runtime/server/page/render.js     |  4 +--
 .../basics/src/routes/encoded/[slug].svelte   |  4 +--
 .../basics/src/routes/routing/[slug].svelte   |  4 +--
 .../routes/routing/rest/[...rest]/deep.svelte |  4 +--
 .../routing/rest/[...rest]/index.svelte       |  4 +--
 .../non-greedy/[dynamic]-bar/[...rest].svelte |  4 +--
 .../rest/non-greedy/foo/[...rest].svelte      |  4 +--
 .../routing/split-params/[a]-[b].svelte       |  6 ++--
 .../apps/basics/src/routes/xss/[path].svelte  |  4 +--
 .../pages/custom-extensions/[slug].svelte.md  |  4 +--
 packages/kit/types/ambient-modules.d.ts       | 10 ++++--
 pnpm-lock.yaml                                | 36 +++----------------
 18 files changed, 80 insertions(+), 88 deletions(-)

diff --git a/packages/kit/src/core/create_app/index.js b/packages/kit/src/core/create_app/index.js
index b8d91604d55c..26ee1596439e 100644
--- a/packages/kit/src/core/create_app/index.js
+++ b/packages/kit/src/core/create_app/index.js
@@ -149,7 +149,7 @@ function generate_app(manifest_data) {
 			// stores
 			export let stores;
 			export let url;
-			export let params;
+			export let route;
 
 			export let components;
 			${levels.map((l) => `export let props_${l} = null;`).join('\n\t\t\t')}
@@ -159,8 +159,8 @@ function generate_app(manifest_data) {
 			$: stores.url.set(url);
 			afterUpdate(stores.url.notify);
 
-			$: stores.params.set(params);
-			afterUpdate(stores.params.notify);
+			$: stores.route.set(route);
+			afterUpdate(stores.route.notify);
 
 			let mounted = false;
 			let navigated = false;
diff --git a/packages/kit/src/runtime/app/stores.js b/packages/kit/src/runtime/app/stores.js
index 5a61f3a2df50..cd44dacb50c0 100644
--- a/packages/kit/src/runtime/app/stores.js
+++ b/packages/kit/src/runtime/app/stores.js
@@ -23,8 +23,8 @@ export const getStores = () => {
 		url: {
 			subscribe: stores.url.subscribe
 		},
-		params: {
-			subscribe: stores.params.subscribe
+		route: {
+			subscribe: stores.route.subscribe
 		},
 		navigating: {
 			subscribe: stores.navigating.subscribe
@@ -50,11 +50,11 @@ export const url = {
 	}
 };
 
-/** @type {typeof import('$app/stores').url} */
-export const params = {
+/** @type {typeof import('$app/stores').route} */
+export const route = {
 	/** @param {(value: any) => void} fn */
 	subscribe(fn) {
-		const store = getStores().params;
+		const store = getStores().route;
 		return store.subscribe(fn);
 	}
 };
diff --git a/packages/kit/src/runtime/client/renderer.js b/packages/kit/src/runtime/client/renderer.js
index d32b31bbaa4f..428d05406838 100644
--- a/packages/kit/src/runtime/client/renderer.js
+++ b/packages/kit/src/runtime/client/renderer.js
@@ -103,7 +103,7 @@ export class Renderer {
 
 		this.stores = {
 			url: notifiable_store({}),
-			params: notifiable_store({}),
+			route: notifiable_store({}),
 			navigating: writable(/** @type {Navigating | null} */ (null)),
 			session: writable(session)
 		};
@@ -447,7 +447,7 @@ export class Renderer {
 		}
 
 		if (!this.current.params || JSON.stringify(params) !== JSON.stringify(this.current.params)) {
-			result.props.params = params;
+			result.props.route = { params };
 		}
 
 		const leaf = filtered[filtered.length - 1];
@@ -553,6 +553,15 @@ export class Renderer {
 				}
 			};
 
+			if (import.meta.env.DEV) {
+				// TODO remove this for 1.0
+				Object.defineProperty(load_input, 'page', {
+					get: () => {
+						throw new Error('`page` in `load` functions has been replaced by `url` and `params`');
+					}
+				});
+			}
+
 			if (error) {
 				/** @type {import('types/page').ErrorLoadInput} */ (load_input).status = status;
 				/** @type {import('types/page').ErrorLoadInput} */ (load_input).error = error;
diff --git a/packages/kit/src/runtime/server/endpoint.js b/packages/kit/src/runtime/server/endpoint.js
index 12bda1601ccb..e93cb8a87450 100644
--- a/packages/kit/src/runtime/server/endpoint.js
+++ b/packages/kit/src/runtime/server/endpoint.js
@@ -49,8 +49,8 @@ export async function render_endpoint(request, route, match) {
 	}
 
 	// we're mutating `request` so that we don't have to do { ...request, params }
-	// on the next line, since that breaks the getters used to deprecate path,
-	// query and origin. We could revert that once we remove the getters
+	// on the next line, since that breaks the getters that replace path, query and
+	// origin. We could revert that once we remove the getters
 	request.params = route.params ? decode_params(route.params(match)) : {};
 
 	const response = await handler(request);
diff --git a/packages/kit/src/runtime/server/index.js b/packages/kit/src/runtime/server/index.js
index fdc718db9d35..2fe7037f9fba 100644
--- a/packages/kit/src/runtime/server/index.js
+++ b/packages/kit/src/runtime/server/index.js
@@ -43,22 +43,24 @@ export async function respond(incoming, options, state = {}) {
 		locals: {}
 	};
 
-	// TODO remove this for 1.0
-	/**
-	 * @param {string} property
-	 * @param {string} replacement
-	 */
-	function deprecate(property, replacement) {
-		Object.defineProperty(request, property, {
-			get: () => {
-				throw new Error(`request.${property} has been replaced by request.url.${replacement}`);
-			}
-		});
-	}
+	if (options.dev) {
+		// TODO remove this for 1.0
+		/**
+		 * @param {string} property
+		 * @param {string} replacement
+		 */
+		const print_error = (property, replacement) => {
+			Object.defineProperty(request, property, {
+				get: () => {
+					throw new Error(`request.${property} has been replaced by request.url.${replacement}`);
+				}
+			});
+		};
 
-	deprecate('origin', 'origin');
-	deprecate('path', 'pathname');
-	deprecate('query', 'searchParams');
+		print_error('origin', 'origin');
+		print_error('path', 'pathname');
+		print_error('query', 'searchParams');
+	}
 
 	try {
 		return await options.hooks.handle({
diff --git a/packages/kit/src/runtime/server/page/load_node.js b/packages/kit/src/runtime/server/page/load_node.js
index 4c93af1a2f83..2bc63c3553ed 100644
--- a/packages/kit/src/runtime/server/page/load_node.js
+++ b/packages/kit/src/runtime/server/page/load_node.js
@@ -276,14 +276,17 @@ export async function load_node({
 					})
 				);
 			},
-			stuff: { ...stuff },
+			stuff: { ...stuff }
+		};
 
+		if (options.dev) {
 			// TODO remove this for 1.0
-			// @ts-expect-error
-			get page() {
-				throw new Error('`page` in `load` functions has been replaced by `url` and `params`');
-			}
-		};
+			Object.defineProperty(load_input, 'page', {
+				get: () => {
+					throw new Error('`page` in `load` functions has been replaced by `url` and `params`');
+				}
+			});
+		}
 
 		if (is_error) {
 			/** @type {import('types/page').ErrorLoadInput} */ (load_input).status = status;
diff --git a/packages/kit/src/runtime/server/page/render.js b/packages/kit/src/runtime/server/page/render.js
index 3903677af76b..cbcdef21de97 100644
--- a/packages/kit/src/runtime/server/page/render.js
+++ b/packages/kit/src/runtime/server/page/render.js
@@ -65,12 +65,12 @@ export async function render_response({
 		const props = {
 			stores: {
 				url: writable(null),
-				params: writable(null),
+				route: writable(null),
 				navigating: writable(null),
 				session
 			},
 			url,
-			params,
+			route: { params },
 			components: branch.map(({ node }) => node.module.default)
 		};
 
diff --git a/packages/kit/test/apps/basics/src/routes/encoded/[slug].svelte b/packages/kit/test/apps/basics/src/routes/encoded/[slug].svelte
index 4224c15ae54a..97c1200f8f77 100644
--- a/packages/kit/test/apps/basics/src/routes/encoded/[slug].svelte
+++ b/packages/kit/test/apps/basics/src/routes/encoded/[slug].svelte
@@ -11,7 +11,7 @@
 </script>
 
 <script>
-	import { url, params } from '$app/stores';
+	import { url, route } from '$app/stores';
 
 	/** @type {string} */
 	export let path;
@@ -22,4 +22,4 @@
 
 <h1>dynamic</h1>
 <h2>{path}: {slug}</h2>
-<h3>{$url.pathname}: {$params.slug}</h3>
+<h3>{$url.pathname}: {$route.params.slug}</h3>
diff --git a/packages/kit/test/apps/basics/src/routes/routing/[slug].svelte b/packages/kit/test/apps/basics/src/routes/routing/[slug].svelte
index 3e2a797ef70a..798c1a96695b 100644
--- a/packages/kit/test/apps/basics/src/routes/routing/[slug].svelte
+++ b/packages/kit/test/apps/basics/src/routes/routing/[slug].svelte
@@ -1,5 +1,5 @@
 <script>
-	import { params } from '$app/stores';
+	import { route } from '$app/stores';
 </script>
 
-<h1>{$params.slug}</h1>
+<h1>{$route.params.slug}</h1>
diff --git a/packages/kit/test/apps/basics/src/routes/routing/rest/[...rest]/deep.svelte b/packages/kit/test/apps/basics/src/routes/routing/rest/[...rest]/deep.svelte
index c56b627fc414..06c42a7e5b2f 100644
--- a/packages/kit/test/apps/basics/src/routes/routing/rest/[...rest]/deep.svelte
+++ b/packages/kit/test/apps/basics/src/routes/routing/rest/[...rest]/deep.svelte
@@ -7,13 +7,13 @@
 </script>
 
 <script>
-	import { params } from '$app/stores';
+	import { route } from '$app/stores';
 
 	/** @type {string} */
 	export let rest;
 </script>
 
-<h1>{$params.rest}</h1>
+<h1>{$route.params.rest}</h1>
 <h2>{rest}</h2>
 
 <a href="/routing/rest/xyz/abc/qwe/deep.json" rel="external">deep</a>
diff --git a/packages/kit/test/apps/basics/src/routes/routing/rest/[...rest]/index.svelte b/packages/kit/test/apps/basics/src/routes/routing/rest/[...rest]/index.svelte
index 3a2f312cbb3b..59e59540913d 100644
--- a/packages/kit/test/apps/basics/src/routes/routing/rest/[...rest]/index.svelte
+++ b/packages/kit/test/apps/basics/src/routes/routing/rest/[...rest]/index.svelte
@@ -7,13 +7,13 @@
 </script>
 
 <script>
-	import { params } from '$app/stores';
+	import { route } from '$app/stores';
 
 	/** @type {string} */
 	export let rest;
 </script>
 
-<h1>{$params.rest}</h1>
+<h1>{$route.params.rest}</h1>
 <h2>{rest}</h2>
 
 <a href="/routing/rest/xyz/abc/deep">deep</a>
diff --git a/packages/kit/test/apps/basics/src/routes/routing/rest/non-greedy/[dynamic]-bar/[...rest].svelte b/packages/kit/test/apps/basics/src/routes/routing/rest/non-greedy/[dynamic]-bar/[...rest].svelte
index ffef0de393b6..826ee6168440 100644
--- a/packages/kit/test/apps/basics/src/routes/routing/rest/non-greedy/[dynamic]-bar/[...rest].svelte
+++ b/packages/kit/test/apps/basics/src/routes/routing/rest/non-greedy/[dynamic]-bar/[...rest].svelte
@@ -1,5 +1,5 @@
 <script>
-	import { params } from '$app/stores';
+	import { route } from '$app/stores';
 </script>
 
-<h2>{JSON.stringify($params)}</h2>
+<h2>{JSON.stringify($route.params)}</h2>
diff --git a/packages/kit/test/apps/basics/src/routes/routing/rest/non-greedy/foo/[...rest].svelte b/packages/kit/test/apps/basics/src/routes/routing/rest/non-greedy/foo/[...rest].svelte
index ffef0de393b6..826ee6168440 100644
--- a/packages/kit/test/apps/basics/src/routes/routing/rest/non-greedy/foo/[...rest].svelte
+++ b/packages/kit/test/apps/basics/src/routes/routing/rest/non-greedy/foo/[...rest].svelte
@@ -1,5 +1,5 @@
 <script>
-	import { params } from '$app/stores';
+	import { route } from '$app/stores';
 </script>
 
-<h2>{JSON.stringify($params)}</h2>
+<h2>{JSON.stringify($route.params)}</h2>
diff --git a/packages/kit/test/apps/basics/src/routes/routing/split-params/[a]-[b].svelte b/packages/kit/test/apps/basics/src/routes/routing/split-params/[a]-[b].svelte
index 863e5c360ece..952246f491e8 100644
--- a/packages/kit/test/apps/basics/src/routes/routing/split-params/[a]-[b].svelte
+++ b/packages/kit/test/apps/basics/src/routes/routing/split-params/[a]-[b].svelte
@@ -1,6 +1,6 @@
 <script>
-	import { params } from '$app/stores';
+	import { route } from '$app/stores';
 </script>
 
-<h1>{$params.a}</h1>
-<h2>{$params.b}</h2>
+<h1>{$route.params.a}</h1>
+<h2>{$route.params.b}</h2>
diff --git a/packages/kit/test/apps/basics/src/routes/xss/[path].svelte b/packages/kit/test/apps/basics/src/routes/xss/[path].svelte
index 1026ce167783..9adb1f4e295d 100644
--- a/packages/kit/test/apps/basics/src/routes/xss/[path].svelte
+++ b/packages/kit/test/apps/basics/src/routes/xss/[path].svelte
@@ -1,5 +1,5 @@
 <script>
-	import { params } from '$app/stores';
+	import { route } from '$app/stores';
 </script>
 
-<h1 id="one">{$params.slug}</h1>
+<h1 id="one">{$route.params.slug}</h1>
diff --git a/packages/kit/test/apps/options/source/pages/custom-extensions/[slug].svelte.md b/packages/kit/test/apps/options/source/pages/custom-extensions/[slug].svelte.md
index d56e24e45b47..d7f4aa934ace 100644
--- a/packages/kit/test/apps/options/source/pages/custom-extensions/[slug].svelte.md
+++ b/packages/kit/test/apps/options/source/pages/custom-extensions/[slug].svelte.md
@@ -1,3 +1,3 @@
-<script>import { params } from '$app/stores';</script>
+<script>import { route } from '$app/stores';</script>
 
-<h2>{$params.slug.toUpperCase()}</h2>
+<h2>{$route.params.slug.toUpperCase()}</h2>
diff --git a/packages/kit/types/ambient-modules.d.ts b/packages/kit/types/ambient-modules.d.ts
index 2924ca16792e..15fb04bfc5a5 100644
--- a/packages/kit/types/ambient-modules.d.ts
+++ b/packages/kit/types/ambient-modules.d.ts
@@ -91,7 +91,9 @@ declare module '$app/stores' {
 	export function getStores<Session = any>(): {
 		navigating: Readable<Navigating | null>;
 		url: Readable<URL>;
-		params: Readable<Record<string, string>>;
+		route: Readable<{
+			params: Record<string, string>;
+		}>;
 		session: Writable<Session>;
 	};
 	/**
@@ -99,9 +101,11 @@ declare module '$app/stores' {
 	 */
 	export const url: Readable<URL>;
 	/**
-	 * A readable store whose value contains the current page parameters.
+	 * A readable store whose value contains route data.
 	 */
-	export const params: Readable<Record<string, string>>;
+	export const route: Readable<{
+		params: Record<string, string>;
+	}>;
 	/**
 	 * A readable store.
 	 * When navigating starts, its value is `{ from: URL, to: URL }`
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 304861fe29f1..879f4d752482 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -222,8 +222,8 @@ importers:
       '@lukeed/uuid': 2.0.0
       cookie: 0.4.1
     devDependencies:
-      '@sveltejs/adapter-auto': 1.0.0-next.5
-      '@sveltejs/kit': 1.0.0-next.203_svelte@3.44.2
+      '@sveltejs/adapter-auto': link:../../../adapter-auto
+      '@sveltejs/kit': 1.0.0-next.206_svelte@3.44.2
       svelte: 3.44.2
       svelte-preprocess: 4.9.8_svelte@3.44.2+typescript@4.5.2
       typescript: 4.5.2
@@ -561,6 +561,7 @@ packages:
 
   /@iarna/toml/2.2.5:
     resolution: {integrity: sha512-trnsAYxU3xnS1gPHPyU961coFyLkh4gAD/0zQ5mymY4yOZ+CYvsPqUbOFSw0aDM4y0tV7tiFxL/1XfXPNC6IPg==}
+    dev: false
 
   /@istanbuljs/schema/0.1.3:
     resolution: {integrity: sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==}
@@ -780,35 +781,8 @@ packages:
       estree-walker: 2.0.2
       picomatch: 2.3.0
 
-  /@sveltejs/adapter-auto/1.0.0-next.5:
-    resolution: {integrity: sha512-pD0iULDFuOQ0I9fLvdjL9BrA90hZwYtcaI25pNCdxGzdn9sgpXhxmON807fJgn1lG9HQ1LBTABz4gUMXviVAdg==}
-    dependencies:
-      '@sveltejs/adapter-cloudflare': 1.0.0-next.4
-      '@sveltejs/adapter-netlify': 1.0.0-next.36
-      '@sveltejs/adapter-vercel': 1.0.0-next.32
-    dev: true
-
-  /@sveltejs/adapter-cloudflare/1.0.0-next.4:
-    resolution: {integrity: sha512-c792TBbVhWtqAjxeorkHUArz4bTFpvAXfgMZALakNV4lakUH/1bgjisrSg5xMNQlUqu1kkUlKQic61avsKH8gw==}
-    dependencies:
-      esbuild: 0.13.15
-    dev: true
-
-  /@sveltejs/adapter-netlify/1.0.0-next.36:
-    resolution: {integrity: sha512-LdrIXCTBnIubtt/lthcnyt5VljuHpZlVzUqpWXk9Eu6bpNKblqQLMHkTBQfIbPfanmNSDZXJQVsdcFLqF2/+Cw==}
-    dependencies:
-      '@iarna/toml': 2.2.5
-      esbuild: 0.13.15
-    dev: true
-
-  /@sveltejs/adapter-vercel/1.0.0-next.32:
-    resolution: {integrity: sha512-ZcltaS5bAobGD5P0z7xJIjPHSlGpF7padMIkqTzJxwMEb/acGgdO5yzDS8XUEaSNgj+prpD2oG8+gm33ds8x0A==}
-    dependencies:
-      esbuild: 0.13.15
-    dev: true
-
-  /@sveltejs/kit/1.0.0-next.203_svelte@3.44.2:
-    resolution: {integrity: sha512-+bhfmkzquWMSCCFIJoh36U9D6IKC0p/NrIr4CBHMAdRpqzL9lMP0AYQm1fUDH20F/6b2tWvGxmEg+gAmHikRfA==}
+  /@sveltejs/kit/1.0.0-next.206_svelte@3.44.2:
+    resolution: {integrity: sha512-AQEOKZLG1GKkuBfWUKKxMs9A3AzE9tSHYc4Lu+AL/4BAs4erIFdOei2ldsxak2ICxxeaCloqVRPvIOtj7UEacg==}
     engines: {node: '>=14.13'}
     hasBin: true
     peerDependencies:

From c83cad6a7d02c693316e106889109e805c3839b9 Mon Sep 17 00:00:00 2001
From: Rich Harris <hello@rich-harris.dev>
Date: Wed, 29 Dec 2021 19:48:08 +0000
Subject: [PATCH 24/45] update docs

---
 documentation/docs/05-modules.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/documentation/docs/05-modules.md b/documentation/docs/05-modules.md
index 22ae854137db..e74fda5a9ce2 100644
--- a/documentation/docs/05-modules.md
+++ b/documentation/docs/05-modules.md
@@ -52,13 +52,13 @@ Stores are _contextual_ — they are added to the [context](https://svelte.dev/t
 
 Because of that, the stores are not free-floating objects: they must be accessed during component initialisation, like anything else that would be accessed with `getContext`.
 
-- `getStores` is a convenience function around `getContext` that returns `{ navigating, page, session }`. This needs to be called at the top-level or synchronously during component or page initialisation.
+- `getStores` is a convenience function around `getContext` that returns `{ navigating, url, route, session }`. This needs to be called at the top-level or synchronously during component or page initialisation.
 
-The stores themselves attach to the correct context at the point of subscription, which means you can import and use them directly in components without boilerplate. However, it still needs to be called synchronously on component or page initialisation when `$`-prefix isn't used. Use `getStores` to safely `.subscribe` asynchronously instead.
+The stores themselves attach to the correct context at the point of subscription, which means you can import and use them directly in components without boilerplate. However, it still needs to be called synchronously on component or page initialisation when the `$`-prefix isn't used. Use `getStores` to safely `.subscribe` asynchronously instead.
 
 - `navigating` is a [readable store](https://svelte.dev/tutorial/readable-stores). When navigating starts, its value is `{ from, to }`, where `from` and `to` both mirror the `page` store value. When navigating finishes, its value reverts to `null`.
 - `url` is a readable store whose value contains a [`URL`](https://developer.mozilla.org/en-US/docs/Web/API/URL) object for the current page.
-- `params` contains the current page parameters. See the [`params` section](#loading-input-params) above for more details.
+- `route` contains an object with the current [`params`](#loading-input-params).
 - `session` is a [writable store](https://svelte.dev/tutorial/writable-stores) whose initial value is whatever was returned from [`getSession`](#hooks-getsession). It can be written to, but this will _not_ cause changes to persist on the server — this is something you must implement yourself.
 
 ### $lib

From f9e80febabe62d1406399dbfbeed3521d5ccbc73 Mon Sep 17 00:00:00 2001
From: Rich Harris <hello@rich-harris.dev>
Date: Wed, 29 Dec 2021 19:55:31 +0000
Subject: [PATCH 25/45] finish updating load input section

---
 documentation/docs/03-loading.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/documentation/docs/03-loading.md b/documentation/docs/03-loading.md
index fb522e7d0457..468158968166 100644
--- a/documentation/docs/03-loading.md
+++ b/documentation/docs/03-loading.md
@@ -84,7 +84,7 @@ It is recommended that you not store pre-request state in global variables, but
 
 ### Input
 
-The `load` function receives an object containing four fields — `page`, `fetch`, `session` and `stuff`. The `load` function is reactive, and will re-run when its parameters change, but only if they are used in the function. Specifically, if `url`, `session`, or `stuff` are used in the function, they will be re-run whenever their value changes. Note that destructuring parameters in the function declaration is enough to count as using them. In the example above, the `load({ params, fetch, session, stuff })` function will re-run every time `session` or `stuff` is changed, even though they are not used in the body of the function. If it was re-written as `load({ params, fetch })`, then it would only re-run when `params.slug` changes. The same reactivity applies to `params`, but only to the params actually used in the function. If `params.foo` changes, the example above would not re-run, because it did not access `params.foo`, only `params.slug`.
+The `load` function receives an object containing five fields — `url`, `params`, `fetch`, `session` and `stuff`. The `load` function is reactive, and will re-run when its parameters change, but only if they are used in the function. Specifically, if `url`, `params`, `session` or `stuff` are used in the function, they will be re-run whenever their value changes. Note that destructuring parameters in the function declaration is enough to count as using them. In the example above, the `load({ params, fetch, session, stuff })` function will re-run every time `session` or `stuff` is changed, even though they are not used in the body of the function. If it was re-written as `load({ params, fetch })`, then it would only re-run when `params.slug` changes. The same reactivity applies to `params`, but only to the params actually used in the function. If `params.foo` changes, the example above would not re-run, because it did not access `params.foo`, only `params.slug`.
 
 #### url
 

From efacc7599d21b2dcb0bac289c500e364f3b0c08f Mon Sep 17 00:00:00 2001
From: Rich Harris <hello@rich-harris.dev>
Date: Wed, 29 Dec 2021 19:56:35 +0000
Subject: [PATCH 26/45] update

---
 documentation/docs/05-modules.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/documentation/docs/05-modules.md b/documentation/docs/05-modules.md
index e74fda5a9ce2..f001843dbc1b 100644
--- a/documentation/docs/05-modules.md
+++ b/documentation/docs/05-modules.md
@@ -56,7 +56,7 @@ Because of that, the stores are not free-floating objects: they must be accessed
 
 The stores themselves attach to the correct context at the point of subscription, which means you can import and use them directly in components without boilerplate. However, it still needs to be called synchronously on component or page initialisation when the `$`-prefix isn't used. Use `getStores` to safely `.subscribe` asynchronously instead.
 
-- `navigating` is a [readable store](https://svelte.dev/tutorial/readable-stores). When navigating starts, its value is `{ from, to }`, where `from` and `to` both mirror the `page` store value. When navigating finishes, its value reverts to `null`.
+- `navigating` is a [readable store](https://svelte.dev/tutorial/readable-stores). When navigating starts, its value is `{ from, to }`, where `from` and `to` are both [`URL`](https://developer.mozilla.org/en-US/docs/Web/API/URL) instances. When navigating finishes, its value reverts to `null`.
 - `url` is a readable store whose value contains a [`URL`](https://developer.mozilla.org/en-US/docs/Web/API/URL) object for the current page.
 - `route` contains an object with the current [`params`](#loading-input-params).
 - `session` is a [writable store](https://svelte.dev/tutorial/writable-stores) whose initial value is whatever was returned from [`getSession`](#hooks-getsession). It can be written to, but this will _not_ cause changes to persist on the server — this is something you must implement yourself.

From 310c10ab42dcc20b54da36c2f8c627a2460cc88b Mon Sep 17 00:00:00 2001
From: Rich Harris <hello@rich-harris.dev>
Date: Wed, 29 Dec 2021 20:08:50 +0000
Subject: [PATCH 27/45] make this section less verbose

---
 documentation/docs/03-loading.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/documentation/docs/03-loading.md b/documentation/docs/03-loading.md
index 468158968166..e460734d1a0c 100644
--- a/documentation/docs/03-loading.md
+++ b/documentation/docs/03-loading.md
@@ -84,7 +84,9 @@ It is recommended that you not store pre-request state in global variables, but
 
 ### Input
 
-The `load` function receives an object containing five fields — `url`, `params`, `fetch`, `session` and `stuff`. The `load` function is reactive, and will re-run when its parameters change, but only if they are used in the function. Specifically, if `url`, `params`, `session` or `stuff` are used in the function, they will be re-run whenever their value changes. Note that destructuring parameters in the function declaration is enough to count as using them. In the example above, the `load({ params, fetch, session, stuff })` function will re-run every time `session` or `stuff` is changed, even though they are not used in the body of the function. If it was re-written as `load({ params, fetch })`, then it would only re-run when `params.slug` changes. The same reactivity applies to `params`, but only to the params actually used in the function. If `params.foo` changes, the example above would not re-run, because it did not access `params.foo`, only `params.slug`.
+The `load` function receives an object containing five fields — `url`, `params`, `fetch`, `session` and `stuff`. The `load` function is reactive, and will re-run when its parameters change, but only if they are used in the function. Specifically, if `url`, `session` or `stuff` are used in the function, they will be re-run whenever their value changes, and likewise for the individual properties of `params`.
+
+> Note that destructuring parameters in the function declaration is enough to count as using them.
 
 #### url
 

From 3a104faa33b74ac84e5bed668a4c06dfd05c0b8e Mon Sep 17 00:00:00 2001
From: Rich Harris <hello@rich-harris.dev>
Date: Wed, 29 Dec 2021 20:26:26 +0000
Subject: [PATCH 28/45] move url into $route

---
 .../templates/default/src/lib/header/Header.svelte   |  8 ++++----
 packages/kit/src/core/create_app/index.js            |  6 +-----
 packages/kit/src/runtime/app/stores.js               | 12 ------------
 packages/kit/src/runtime/client/renderer.js          |  6 +-----
 packages/kit/src/runtime/server/page/render.js       |  4 +---
 .../kit/test/apps/amp/src/routes/origin/index.svelte |  4 ++--
 .../apps/basics/src/routes/encoded/[slug].svelte     |  4 ++--
 .../routes/encoded/\350\213\227\346\235\241.svelte"  |  4 ++--
 .../apps/basics/src/routes/keepfocus/index.svelte    |  4 ++--
 .../test/apps/basics/src/routes/origin/index.svelte  |  4 ++--
 .../test/apps/basics/src/routes/query/echo.svelte    |  4 ++--
 .../test/apps/basics/src/routes/store/index.svelte   |  8 +++++---
 .../kit/test/apps/basics/src/routes/xss/query.svelte |  4 ++--
 .../apps/options/source/pages/origin/index.svelte    |  4 ++--
 .../apps/options/source/pages/slash/child.svelte     |  4 ++--
 .../apps/options/source/pages/slash/index.svelte     |  4 ++--
 16 files changed, 32 insertions(+), 52 deletions(-)

diff --git a/packages/create-svelte/templates/default/src/lib/header/Header.svelte b/packages/create-svelte/templates/default/src/lib/header/Header.svelte
index b4e08fde6f9f..9a80d9512801 100644
--- a/packages/create-svelte/templates/default/src/lib/header/Header.svelte
+++ b/packages/create-svelte/templates/default/src/lib/header/Header.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { url } from '$app/stores';
+	import { route } from '$app/stores';
 	import logo from './svelte-logo.svg';
 </script>
 
@@ -15,11 +15,11 @@
 			<path d="M0,0 L1,2 C1.5,3 1.5,3 2,3 L2,0 Z" />
 		</svg>
 		<ul>
-			<li class:active={$url.pathname === '/'}><a sveltekit:prefetch href="/">Home</a></li>
-			<li class:active={$url.pathname === '/about'}>
+			<li class:active={$route.url.pathname === '/'}><a sveltekit:prefetch href="/">Home</a></li>
+			<li class:active={$route.url.pathname === '/about'}>
 				<a sveltekit:prefetch href="/about">About</a>
 			</li>
-			<li class:active={$url.pathname === '/todos'}>
+			<li class:active={$route.url.pathname === '/todos'}>
 				<a sveltekit:prefetch href="/todos">Todos</a>
 			</li>
 		</ul>
diff --git a/packages/kit/src/core/create_app/index.js b/packages/kit/src/core/create_app/index.js
index 26ee1596439e..0def1a196c9e 100644
--- a/packages/kit/src/core/create_app/index.js
+++ b/packages/kit/src/core/create_app/index.js
@@ -148,7 +148,6 @@ function generate_app(manifest_data) {
 
 			// stores
 			export let stores;
-			export let url;
 			export let route;
 
 			export let components;
@@ -156,9 +155,6 @@ function generate_app(manifest_data) {
 
 			setContext('__svelte__', stores);
 
-			$: stores.url.set(url);
-			afterUpdate(stores.url.notify);
-
 			$: stores.route.set(route);
 			afterUpdate(stores.route.notify);
 
@@ -167,7 +163,7 @@ function generate_app(manifest_data) {
 			let title = null;
 
 			onMount(() => {
-				const unsubscribe = stores.url.subscribe(() => {
+				const unsubscribe = stores.route.subscribe(() => {
 					if (mounted) {
 						navigated = true;
 						title = document.title || 'untitled page';
diff --git a/packages/kit/src/runtime/app/stores.js b/packages/kit/src/runtime/app/stores.js
index cd44dacb50c0..6f257b8afe2d 100644
--- a/packages/kit/src/runtime/app/stores.js
+++ b/packages/kit/src/runtime/app/stores.js
@@ -20,9 +20,6 @@ export const getStores = () => {
 	const stores = getContext('__svelte__');
 
 	return {
-		url: {
-			subscribe: stores.url.subscribe
-		},
 		route: {
 			subscribe: stores.route.subscribe
 		},
@@ -41,15 +38,6 @@ export const getStores = () => {
 	};
 };
 
-/** @type {typeof import('$app/stores').url} */
-export const url = {
-	/** @param {(value: any) => void} fn */
-	subscribe(fn) {
-		const store = getStores().url;
-		return store.subscribe(fn);
-	}
-};
-
 /** @type {typeof import('$app/stores').route} */
 export const route = {
 	/** @param {(value: any) => void} fn */
diff --git a/packages/kit/src/runtime/client/renderer.js b/packages/kit/src/runtime/client/renderer.js
index 428d05406838..2b9a02281c97 100644
--- a/packages/kit/src/runtime/client/renderer.js
+++ b/packages/kit/src/runtime/client/renderer.js
@@ -443,11 +443,7 @@ export class Renderer {
 		}
 
 		if (!this.current.url || url.href !== this.current.url.href) {
-			result.props.url = url;
-		}
-
-		if (!this.current.params || JSON.stringify(params) !== JSON.stringify(this.current.params)) {
-			result.props.route = { params };
+			result.props.route = { url, params };
 		}
 
 		const leaf = filtered[filtered.length - 1];
diff --git a/packages/kit/src/runtime/server/page/render.js b/packages/kit/src/runtime/server/page/render.js
index cbcdef21de97..2e6a0376b236 100644
--- a/packages/kit/src/runtime/server/page/render.js
+++ b/packages/kit/src/runtime/server/page/render.js
@@ -64,13 +64,11 @@ export async function render_response({
 		/** @type {Record<string, any>} */
 		const props = {
 			stores: {
-				url: writable(null),
 				route: writable(null),
 				navigating: writable(null),
 				session
 			},
-			url,
-			route: { params },
+			route: { url, params },
 			components: branch.map(({ node }) => node.module.default)
 		};
 
diff --git a/packages/kit/test/apps/amp/src/routes/origin/index.svelte b/packages/kit/test/apps/amp/src/routes/origin/index.svelte
index 97b938069473..6679f08ad847 100644
--- a/packages/kit/test/apps/amp/src/routes/origin/index.svelte
+++ b/packages/kit/test/apps/amp/src/routes/origin/index.svelte
@@ -14,7 +14,7 @@
 </script>
 
 <script>
-	import { url } from '$app/stores';
+	import { route } from '$app/stores';
 
 	/** @type {string} */
 	export let origin;
@@ -24,5 +24,5 @@
 </script>
 
 <p data-source="load">{origin}</p>
-<p data-source="store">{$url.origin}</p>
+<p data-source="store">{$route.url.origin}</p>
 <p data-source="endpoint">{data.origin}</p>
diff --git a/packages/kit/test/apps/basics/src/routes/encoded/[slug].svelte b/packages/kit/test/apps/basics/src/routes/encoded/[slug].svelte
index 97c1200f8f77..72659ce0602d 100644
--- a/packages/kit/test/apps/basics/src/routes/encoded/[slug].svelte
+++ b/packages/kit/test/apps/basics/src/routes/encoded/[slug].svelte
@@ -11,7 +11,7 @@
 </script>
 
 <script>
-	import { url, route } from '$app/stores';
+	import { route } from '$app/stores';
 
 	/** @type {string} */
 	export let path;
@@ -22,4 +22,4 @@
 
 <h1>dynamic</h1>
 <h2>{path}: {slug}</h2>
-<h3>{$url.pathname}: {$route.params.slug}</h3>
+<h3>{$route.url.pathname}: {$route.params.slug}</h3>
diff --git "a/packages/kit/test/apps/basics/src/routes/encoded/\350\213\227\346\235\241.svelte" "b/packages/kit/test/apps/basics/src/routes/encoded/\350\213\227\346\235\241.svelte"
index d9eac0487868..e1dee70cf9e3 100644
--- "a/packages/kit/test/apps/basics/src/routes/encoded/\350\213\227\346\235\241.svelte"
+++ "b/packages/kit/test/apps/basics/src/routes/encoded/\350\213\227\346\235\241.svelte"
@@ -10,7 +10,7 @@
 </script>
 
 <script>
-	import { url } from '$app/stores';
+	import { route } from '$app/stores';
 
 	/** @type {string} */
 	export let path;
@@ -18,4 +18,4 @@
 
 <h1>static</h1>
 <h2>{path}</h2>
-<h3>{$url.pathname}</h3>
+<h3>{$route.url.pathname}</h3>
diff --git a/packages/kit/test/apps/basics/src/routes/keepfocus/index.svelte b/packages/kit/test/apps/basics/src/routes/keepfocus/index.svelte
index 2570932aba0b..1fac4ef5cee6 100644
--- a/packages/kit/test/apps/basics/src/routes/keepfocus/index.svelte
+++ b/packages/kit/test/apps/basics/src/routes/keepfocus/index.svelte
@@ -1,12 +1,12 @@
 <script>
 	import { goto } from '$app/navigation';
-	import { url } from '$app/stores';
+	import { route } from '$app/stores';
 </script>
 
 <input
 	id="input"
 	type="text"
-	value={$url.searchParams.get('foo')}
+	value={$route.url.searchParams.get('foo')}
 	on:input={(e) => {
 		goto('?foo=' + e.currentTarget?.value, { keepfocus: true });
 	}}
diff --git a/packages/kit/test/apps/basics/src/routes/origin/index.svelte b/packages/kit/test/apps/basics/src/routes/origin/index.svelte
index af6910df41f6..53f452d72267 100644
--- a/packages/kit/test/apps/basics/src/routes/origin/index.svelte
+++ b/packages/kit/test/apps/basics/src/routes/origin/index.svelte
@@ -1,5 +1,5 @@
 <script>
-	import { url } from '$app/stores';
+	import { route } from '$app/stores';
 </script>
 
-<h1>{$url.origin}</h1>
+<h1>{$route.url.origin}</h1>
diff --git a/packages/kit/test/apps/basics/src/routes/query/echo.svelte b/packages/kit/test/apps/basics/src/routes/query/echo.svelte
index 6c8481772e4a..207e19affbab 100644
--- a/packages/kit/test/apps/basics/src/routes/query/echo.svelte
+++ b/packages/kit/test/apps/basics/src/routes/query/echo.svelte
@@ -25,13 +25,13 @@
 </script>
 
 <script>
-	import { url } from '$app/stores';
+	import { route } from '$app/stores';
 
 	/** @type {Query}*/
 	export let values;
 </script>
 
 <pre id="one">{JSON.stringify(values)}</pre>
-<pre id="two">{JSON.stringify(to_pojo($url.searchParams))}</pre>
+<pre id="two">{JSON.stringify(to_pojo($route.url.searchParams))}</pre>
 
 <a href="/query/echo?bar=2">?bar=2</a>
diff --git a/packages/kit/test/apps/basics/src/routes/store/index.svelte b/packages/kit/test/apps/basics/src/routes/store/index.svelte
index c2688a1e56dd..1521f8e013d1 100644
--- a/packages/kit/test/apps/basics/src/routes/store/index.svelte
+++ b/packages/kit/test/apps/basics/src/routes/store/index.svelte
@@ -2,7 +2,7 @@
 	import { getStores } from '$app/stores';
 	import { onMount, onDestroy } from 'svelte';
 
-	const { url, session } = getStores(); // TODO note to self: getStores() appears to be masking a bug here
+	const { route, session } = getStores(); // TODO note to self: getStores() appears to be masking a bug here
 
 	let calls = 0;
 
@@ -10,7 +10,7 @@
 		session.set(calls);
 	});
 
-	const unsubscribe = url.subscribe(() => {
+	const unsubscribe = route.subscribe(() => {
 		calls++;
 		session.set(calls);
 	});
@@ -22,4 +22,6 @@
 <h2>Calls: {calls}</h2>
 <a href="/store/result">results</a>
 
-{#if $url.pathname === '/store/result'}{console.log((window.oops = 'this should not happen'))}{/if}
+{#if $route.url.pathname === '/store/result'}{console.log(
+		(window.oops = 'this should not happen')
+	)}{/if}
diff --git a/packages/kit/test/apps/basics/src/routes/xss/query.svelte b/packages/kit/test/apps/basics/src/routes/xss/query.svelte
index 9a2475a736aa..7d4d686bd3f9 100644
--- a/packages/kit/test/apps/basics/src/routes/xss/query.svelte
+++ b/packages/kit/test/apps/basics/src/routes/xss/query.svelte
@@ -25,11 +25,11 @@
 </script>
 
 <script>
-	import { url } from '$app/stores';
+	import { route } from '$app/stores';
 
 	/** @type {Query}*/
 	export let values;
 </script>
 
 <pre id="one">{JSON.stringify(values)}</pre>
-<pre id="two">{JSON.stringify(to_pojo($url.searchParams))}</pre>
+<pre id="two">{JSON.stringify(to_pojo($route.url.searchParams))}</pre>
diff --git a/packages/kit/test/apps/options/source/pages/origin/index.svelte b/packages/kit/test/apps/options/source/pages/origin/index.svelte
index 97b938069473..6679f08ad847 100644
--- a/packages/kit/test/apps/options/source/pages/origin/index.svelte
+++ b/packages/kit/test/apps/options/source/pages/origin/index.svelte
@@ -14,7 +14,7 @@
 </script>
 
 <script>
-	import { url } from '$app/stores';
+	import { route } from '$app/stores';
 
 	/** @type {string} */
 	export let origin;
@@ -24,5 +24,5 @@
 </script>
 
 <p data-source="load">{origin}</p>
-<p data-source="store">{$url.origin}</p>
+<p data-source="store">{$route.url.origin}</p>
 <p data-source="endpoint">{data.origin}</p>
diff --git a/packages/kit/test/apps/options/source/pages/slash/child.svelte b/packages/kit/test/apps/options/source/pages/slash/child.svelte
index d8bf4fadac4c..451a2bf4eb13 100644
--- a/packages/kit/test/apps/options/source/pages/slash/child.svelte
+++ b/packages/kit/test/apps/options/source/pages/slash/child.svelte
@@ -1,6 +1,6 @@
 <script>
 	import { base } from '$app/paths';
-	import { url } from '$app/stores';
+	import { route } from '$app/stores';
 </script>
 
-<h2>{$url.pathname.replace(base, '')}</h2>
+<h2>{$route.url.pathname.replace(base, '')}</h2>
diff --git a/packages/kit/test/apps/options/source/pages/slash/index.svelte b/packages/kit/test/apps/options/source/pages/slash/index.svelte
index 6ba53b5a73ed..1c221675271c 100644
--- a/packages/kit/test/apps/options/source/pages/slash/index.svelte
+++ b/packages/kit/test/apps/options/source/pages/slash/index.svelte
@@ -1,8 +1,8 @@
 <script>
 	import { base } from '$app/paths';
-	import { url } from '$app/stores';
+	import { route } from '$app/stores';
 </script>
 
-<h2>{$url.pathname.replace(base, '')}</h2>
+<h2>{$route.url.pathname.replace(base, '')}</h2>
 
 <a href="{base}/slash/child">/slash/child</a>

From 1ac14f2f5154b359a970adcfff542d489851a92e Mon Sep 17 00:00:00 2001
From: Rich Harris <hello@rich-harris.dev>
Date: Wed, 29 Dec 2021 20:31:29 +0000
Subject: [PATCH 29/45] update some docs

---
 documentation/docs/01-routing.md                  | 2 +-
 documentation/docs/05-modules.md                  | 9 ++++-----
 documentation/migrating/04-pages.md               | 4 ++--
 examples/hn.svelte.dev/src/routes/__layout.svelte | 4 ++--
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/documentation/docs/01-routing.md b/documentation/docs/01-routing.md
index d65e2f030d3c..97f374686086 100644
--- a/documentation/docs/01-routing.md
+++ b/documentation/docs/01-routing.md
@@ -39,7 +39,7 @@ A file called either `src/routes/about.svelte` or `src/routes/about/index.svelte
 <p>TODO...</p>
 ```
 
-Dynamic parameters are encoded using `[brackets]`. For example, a blog post might be defined by `src/routes/blog/[slug].svelte`. Soon, we'll see how to access that parameter in a [load function](#loading) or the [page store](#modules-$app-stores).
+Dynamic parameters are encoded using `[brackets]`. For example, a blog post might be defined by `src/routes/blog/[slug].svelte`. Soon, we'll see how to access that parameter in a [load function](#loading) or the [route store](#modules-$app-stores).
 
 A file or directory can have multiple dynamic parts, like `[id]-[category].svelte`. (Parameters are 'non-greedy'; in an ambiguous case like `x-y-z`, `id` would be `x` and `category` would be `y-z`.)
 
diff --git a/documentation/docs/05-modules.md b/documentation/docs/05-modules.md
index f001843dbc1b..382fa60cfe7a 100644
--- a/documentation/docs/05-modules.md
+++ b/documentation/docs/05-modules.md
@@ -45,20 +45,19 @@ import { base, assets } from '$app/paths';
 ### $app/stores
 
 ```js
-import { getStores, navigating, page, session } from '$app/stores';
+import { getStores, navigating, route, session } from '$app/stores';
 ```
 
-Stores are _contextual_ — they are added to the [context](https://svelte.dev/tutorial/context-api) of your root component. This means that `session` and `page` are unique to each request on the server, rather than shared between multiple requests handled by the same server simultaneously, which is what makes it safe to include user-specific data in `session`.
+Stores are _contextual_ — they are added to the [context](https://svelte.dev/tutorial/context-api) of your root component. This means that `session` and `route` are unique to each request on the server, rather than shared between multiple requests handled by the same server simultaneously, which is what makes it safe to include user-specific data in `session`.
 
 Because of that, the stores are not free-floating objects: they must be accessed during component initialisation, like anything else that would be accessed with `getContext`.
 
-- `getStores` is a convenience function around `getContext` that returns `{ navigating, url, route, session }`. This needs to be called at the top-level or synchronously during component or page initialisation.
+- `getStores` is a convenience function around `getContext` that returns `{ navigating, route, session }`. This needs to be called at the top-level or synchronously during component or page initialisation.
 
 The stores themselves attach to the correct context at the point of subscription, which means you can import and use them directly in components without boilerplate. However, it still needs to be called synchronously on component or page initialisation when the `$`-prefix isn't used. Use `getStores` to safely `.subscribe` asynchronously instead.
 
 - `navigating` is a [readable store](https://svelte.dev/tutorial/readable-stores). When navigating starts, its value is `{ from, to }`, where `from` and `to` are both [`URL`](https://developer.mozilla.org/en-US/docs/Web/API/URL) instances. When navigating finishes, its value reverts to `null`.
-- `url` is a readable store whose value contains a [`URL`](https://developer.mozilla.org/en-US/docs/Web/API/URL) object for the current page.
-- `route` contains an object with the current [`params`](#loading-input-params).
+- `route` contains an object with the current [`url`](https://developer.mozilla.org/en-US/docs/Web/API/URL) and [`params`](#loading-input-params).
 - `session` is a [writable store](https://svelte.dev/tutorial/writable-stores) whose initial value is whatever was returned from [`getSession`](#hooks-getsession). It can be written to, but this will _not_ cause changes to persist on the server — this is something you must implement yourself.
 
 ### $lib
diff --git a/documentation/migrating/04-pages.md b/documentation/migrating/04-pages.md
index 6a6dd5855ed0..ec08e8e04cec 100644
--- a/documentation/migrating/04-pages.md
+++ b/documentation/migrating/04-pages.md
@@ -33,9 +33,9 @@ import { stores } from '@sapper/app';
 const { preloading, page, session } = stores();
 ```
 
-The `page` and `session` stores still exist; `preloading` has been replaced with a `navigating` store that contains `from` and `to` properties.
+The `session` store still exists; `preloading` has been replaced with a `navigating` store that contains `from` and `to` properties. `page` is now `route`.
 
-You access them differently in SvelteKit. `stores` is now `getStores`, but in most cases it is unnecessary since you can import `navigating`, `page` and `session` directly from [`$app/stores`](/docs#modules-$app-stores).
+You access them differently in SvelteKit. `stores` is now `getStores`, but in most cases it is unnecessary since you can import `navigating`, `route` and `session` directly from [`$app/stores`](/docs#modules-$app-stores).
 
 ### Routing
 
diff --git a/examples/hn.svelte.dev/src/routes/__layout.svelte b/examples/hn.svelte.dev/src/routes/__layout.svelte
index 81d98605e36a..f4457dd97bba 100644
--- a/examples/hn.svelte.dev/src/routes/__layout.svelte
+++ b/examples/hn.svelte.dev/src/routes/__layout.svelte
@@ -1,11 +1,11 @@
 <script>
-	import { url, navigating } from '$app/stores';
+	import { route, navigating } from '$app/stores';
 	import Nav from '$lib/Nav.svelte';
 	import PreloadingIndicator from '$lib/PreloadingIndicator.svelte';
 	import ThemeToggler from '$lib/ThemeToggler.svelte';
 	import '../app.css';
 
-	$: section = $url.pathname.split('/')[1];
+	$: section = $route.url.pathname.split('/')[1];
 </script>
 
 <Nav {section} />

From 3d6a30f2d97e3b43a5214abe640812682addf28d Mon Sep 17 00:00:00 2001
From: Rich Harris <hello@rich-harris.dev>
Date: Wed, 29 Dec 2021 21:28:05 +0000
Subject: [PATCH 30/45] rename route store back to page

---
 documentation/docs/01-routing.md                       |  2 +-
 examples/hn.svelte.dev/src/routes/__layout.svelte      |  4 ++--
 .../templates/default/src/lib/header/Header.svelte     |  8 ++++----
 packages/kit/src/core/create_app/index.js              |  8 ++++----
 packages/kit/src/runtime/app/stores.js                 | 10 +++++-----
 packages/kit/src/runtime/client/renderer.js            |  4 ++--
 packages/kit/src/runtime/server/page/render.js         |  4 ++--
 .../kit/test/apps/amp/src/routes/origin/index.svelte   |  4 ++--
 .../test/apps/basics/src/routes/encoded/[slug].svelte  |  4 ++--
 .../routes/encoded/\350\213\227\346\235\241.svelte"    |  4 ++--
 .../test/apps/basics/src/routes/keepfocus/index.svelte |  4 ++--
 .../kit/test/apps/basics/src/routes/origin/_tests.js   |  2 +-
 .../test/apps/basics/src/routes/origin/index.svelte    |  4 ++--
 .../kit/test/apps/basics/src/routes/query/echo.svelte  |  4 ++--
 .../test/apps/basics/src/routes/routing/[slug].svelte  |  4 ++--
 .../src/routes/routing/rest/[...rest]/deep.svelte      |  4 ++--
 .../src/routes/routing/rest/[...rest]/index.svelte     |  4 ++--
 .../rest/non-greedy/[dynamic]-bar/[...rest].svelte     |  4 ++--
 .../routing/rest/non-greedy/foo/[...rest].svelte       |  4 ++--
 .../src/routes/routing/split-params/[a]-[b].svelte     |  6 +++---
 .../kit/test/apps/basics/src/routes/store/_tests.js    |  2 +-
 .../kit/test/apps/basics/src/routes/store/index.svelte |  6 +++---
 .../kit/test/apps/basics/src/routes/xss/[path].svelte  |  4 ++--
 .../kit/test/apps/basics/src/routes/xss/query.svelte   |  4 ++--
 .../source/pages/custom-extensions/[slug].svelte.md    |  4 ++--
 .../test/apps/options/source/pages/origin/index.svelte |  4 ++--
 .../test/apps/options/source/pages/slash/child.svelte  |  4 ++--
 .../test/apps/options/source/pages/slash/index.svelte  |  4 ++--
 packages/kit/types/ambient-modules.d.ts                |  6 +++---
 29 files changed, 65 insertions(+), 65 deletions(-)

diff --git a/documentation/docs/01-routing.md b/documentation/docs/01-routing.md
index 97f374686086..d65e2f030d3c 100644
--- a/documentation/docs/01-routing.md
+++ b/documentation/docs/01-routing.md
@@ -39,7 +39,7 @@ A file called either `src/routes/about.svelte` or `src/routes/about/index.svelte
 <p>TODO...</p>
 ```
 
-Dynamic parameters are encoded using `[brackets]`. For example, a blog post might be defined by `src/routes/blog/[slug].svelte`. Soon, we'll see how to access that parameter in a [load function](#loading) or the [route store](#modules-$app-stores).
+Dynamic parameters are encoded using `[brackets]`. For example, a blog post might be defined by `src/routes/blog/[slug].svelte`. Soon, we'll see how to access that parameter in a [load function](#loading) or the [page store](#modules-$app-stores).
 
 A file or directory can have multiple dynamic parts, like `[id]-[category].svelte`. (Parameters are 'non-greedy'; in an ambiguous case like `x-y-z`, `id` would be `x` and `category` would be `y-z`.)
 
diff --git a/examples/hn.svelte.dev/src/routes/__layout.svelte b/examples/hn.svelte.dev/src/routes/__layout.svelte
index f4457dd97bba..03047b2452cb 100644
--- a/examples/hn.svelte.dev/src/routes/__layout.svelte
+++ b/examples/hn.svelte.dev/src/routes/__layout.svelte
@@ -1,11 +1,11 @@
 <script>
-	import { route, navigating } from '$app/stores';
+	import { page, navigating } from '$app/stores';
 	import Nav from '$lib/Nav.svelte';
 	import PreloadingIndicator from '$lib/PreloadingIndicator.svelte';
 	import ThemeToggler from '$lib/ThemeToggler.svelte';
 	import '../app.css';
 
-	$: section = $route.url.pathname.split('/')[1];
+	$: section = $page.url.pathname.split('/')[1];
 </script>
 
 <Nav {section} />
diff --git a/packages/create-svelte/templates/default/src/lib/header/Header.svelte b/packages/create-svelte/templates/default/src/lib/header/Header.svelte
index 9a80d9512801..9d3120f3e6fd 100644
--- a/packages/create-svelte/templates/default/src/lib/header/Header.svelte
+++ b/packages/create-svelte/templates/default/src/lib/header/Header.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { route } from '$app/stores';
+	import { page } from '$app/stores';
 	import logo from './svelte-logo.svg';
 </script>
 
@@ -15,11 +15,11 @@
 			<path d="M0,0 L1,2 C1.5,3 1.5,3 2,3 L2,0 Z" />
 		</svg>
 		<ul>
-			<li class:active={$route.url.pathname === '/'}><a sveltekit:prefetch href="/">Home</a></li>
-			<li class:active={$route.url.pathname === '/about'}>
+			<li class:active={$page.url.pathname === '/'}><a sveltekit:prefetch href="/">Home</a></li>
+			<li class:active={$page.url.pathname === '/about'}>
 				<a sveltekit:prefetch href="/about">About</a>
 			</li>
-			<li class:active={$route.url.pathname === '/todos'}>
+			<li class:active={$page.url.pathname === '/todos'}>
 				<a sveltekit:prefetch href="/todos">Todos</a>
 			</li>
 		</ul>
diff --git a/packages/kit/src/core/create_app/index.js b/packages/kit/src/core/create_app/index.js
index 0def1a196c9e..d284220e3856 100644
--- a/packages/kit/src/core/create_app/index.js
+++ b/packages/kit/src/core/create_app/index.js
@@ -148,22 +148,22 @@ function generate_app(manifest_data) {
 
 			// stores
 			export let stores;
-			export let route;
+			export let page;
 
 			export let components;
 			${levels.map((l) => `export let props_${l} = null;`).join('\n\t\t\t')}
 
 			setContext('__svelte__', stores);
 
-			$: stores.route.set(route);
-			afterUpdate(stores.route.notify);
+			$: stores.page.set(page);
+			afterUpdate(stores.page.notify);
 
 			let mounted = false;
 			let navigated = false;
 			let title = null;
 
 			onMount(() => {
-				const unsubscribe = stores.route.subscribe(() => {
+				const unsubscribe = stores.page.subscribe(() => {
 					if (mounted) {
 						navigated = true;
 						title = document.title || 'untitled page';
diff --git a/packages/kit/src/runtime/app/stores.js b/packages/kit/src/runtime/app/stores.js
index 6f257b8afe2d..01aff2cadba2 100644
--- a/packages/kit/src/runtime/app/stores.js
+++ b/packages/kit/src/runtime/app/stores.js
@@ -20,8 +20,8 @@ export const getStores = () => {
 	const stores = getContext('__svelte__');
 
 	return {
-		route: {
-			subscribe: stores.route.subscribe
+		page: {
+			subscribe: stores.page.subscribe
 		},
 		navigating: {
 			subscribe: stores.navigating.subscribe
@@ -38,11 +38,11 @@ export const getStores = () => {
 	};
 };
 
-/** @type {typeof import('$app/stores').route} */
-export const route = {
+/** @type {typeof import('$app/stores').page} */
+export const page = {
 	/** @param {(value: any) => void} fn */
 	subscribe(fn) {
-		const store = getStores().route;
+		const store = getStores().page;
 		return store.subscribe(fn);
 	}
 };
diff --git a/packages/kit/src/runtime/client/renderer.js b/packages/kit/src/runtime/client/renderer.js
index 2b9a02281c97..9cc21bf4a534 100644
--- a/packages/kit/src/runtime/client/renderer.js
+++ b/packages/kit/src/runtime/client/renderer.js
@@ -103,7 +103,7 @@ export class Renderer {
 
 		this.stores = {
 			url: notifiable_store({}),
-			route: notifiable_store({}),
+			page: notifiable_store({}),
 			navigating: writable(/** @type {Navigating | null} */ (null)),
 			session: writable(session)
 		};
@@ -443,7 +443,7 @@ export class Renderer {
 		}
 
 		if (!this.current.url || url.href !== this.current.url.href) {
-			result.props.route = { url, params };
+			result.props.page = { url, params };
 		}
 
 		const leaf = filtered[filtered.length - 1];
diff --git a/packages/kit/src/runtime/server/page/render.js b/packages/kit/src/runtime/server/page/render.js
index 2e6a0376b236..dd5b95fb65cd 100644
--- a/packages/kit/src/runtime/server/page/render.js
+++ b/packages/kit/src/runtime/server/page/render.js
@@ -64,11 +64,11 @@ export async function render_response({
 		/** @type {Record<string, any>} */
 		const props = {
 			stores: {
-				route: writable(null),
+				page: writable(null),
 				navigating: writable(null),
 				session
 			},
-			route: { url, params },
+			page: { url, params },
 			components: branch.map(({ node }) => node.module.default)
 		};
 
diff --git a/packages/kit/test/apps/amp/src/routes/origin/index.svelte b/packages/kit/test/apps/amp/src/routes/origin/index.svelte
index 6679f08ad847..ae0b97528978 100644
--- a/packages/kit/test/apps/amp/src/routes/origin/index.svelte
+++ b/packages/kit/test/apps/amp/src/routes/origin/index.svelte
@@ -14,7 +14,7 @@
 </script>
 
 <script>
-	import { route } from '$app/stores';
+	import { page } from '$app/stores';
 
 	/** @type {string} */
 	export let origin;
@@ -24,5 +24,5 @@
 </script>
 
 <p data-source="load">{origin}</p>
-<p data-source="store">{$route.url.origin}</p>
+<p data-source="store">{$page.url.origin}</p>
 <p data-source="endpoint">{data.origin}</p>
diff --git a/packages/kit/test/apps/basics/src/routes/encoded/[slug].svelte b/packages/kit/test/apps/basics/src/routes/encoded/[slug].svelte
index 72659ce0602d..40b5a78a4a64 100644
--- a/packages/kit/test/apps/basics/src/routes/encoded/[slug].svelte
+++ b/packages/kit/test/apps/basics/src/routes/encoded/[slug].svelte
@@ -11,7 +11,7 @@
 </script>
 
 <script>
-	import { route } from '$app/stores';
+	import { page } from '$app/stores';
 
 	/** @type {string} */
 	export let path;
@@ -22,4 +22,4 @@
 
 <h1>dynamic</h1>
 <h2>{path}: {slug}</h2>
-<h3>{$route.url.pathname}: {$route.params.slug}</h3>
+<h3>{$page.url.pathname}: {$page.params.slug}</h3>
diff --git "a/packages/kit/test/apps/basics/src/routes/encoded/\350\213\227\346\235\241.svelte" "b/packages/kit/test/apps/basics/src/routes/encoded/\350\213\227\346\235\241.svelte"
index e1dee70cf9e3..6ec7813eadcf 100644
--- "a/packages/kit/test/apps/basics/src/routes/encoded/\350\213\227\346\235\241.svelte"
+++ "b/packages/kit/test/apps/basics/src/routes/encoded/\350\213\227\346\235\241.svelte"
@@ -10,7 +10,7 @@
 </script>
 
 <script>
-	import { route } from '$app/stores';
+	import { page } from '$app/stores';
 
 	/** @type {string} */
 	export let path;
@@ -18,4 +18,4 @@
 
 <h1>static</h1>
 <h2>{path}</h2>
-<h3>{$route.url.pathname}</h3>
+<h3>{$page.url.pathname}</h3>
diff --git a/packages/kit/test/apps/basics/src/routes/keepfocus/index.svelte b/packages/kit/test/apps/basics/src/routes/keepfocus/index.svelte
index 1fac4ef5cee6..8b80c50b8c56 100644
--- a/packages/kit/test/apps/basics/src/routes/keepfocus/index.svelte
+++ b/packages/kit/test/apps/basics/src/routes/keepfocus/index.svelte
@@ -1,12 +1,12 @@
 <script>
 	import { goto } from '$app/navigation';
-	import { route } from '$app/stores';
+	import { page } from '$app/stores';
 </script>
 
 <input
 	id="input"
 	type="text"
-	value={$route.url.searchParams.get('foo')}
+	value={$page.url.searchParams.get('foo')}
 	on:input={(e) => {
 		goto('?foo=' + e.currentTarget?.value, { keepfocus: true });
 	}}
diff --git a/packages/kit/test/apps/basics/src/routes/origin/_tests.js b/packages/kit/test/apps/basics/src/routes/origin/_tests.js
index 22f012a74bd1..08b2c60c24f1 100644
--- a/packages/kit/test/apps/basics/src/routes/origin/_tests.js
+++ b/packages/kit/test/apps/basics/src/routes/origin/_tests.js
@@ -2,7 +2,7 @@ import * as assert from 'uvu/assert';
 
 /** @type {import('test').TestMaker} */
 export default function (test) {
-	test('can access origin through url store', null, async ({ base, page }) => {
+	test('can access origin through page store', null, async ({ base, page }) => {
 		await page.goto(`${base}/origin`);
 		assert.equal(await page.textContent('h1'), base);
 	});
diff --git a/packages/kit/test/apps/basics/src/routes/origin/index.svelte b/packages/kit/test/apps/basics/src/routes/origin/index.svelte
index 53f452d72267..6f3a19403bae 100644
--- a/packages/kit/test/apps/basics/src/routes/origin/index.svelte
+++ b/packages/kit/test/apps/basics/src/routes/origin/index.svelte
@@ -1,5 +1,5 @@
 <script>
-	import { route } from '$app/stores';
+	import { page } from '$app/stores';
 </script>
 
-<h1>{$route.url.origin}</h1>
+<h1>{$page.url.origin}</h1>
diff --git a/packages/kit/test/apps/basics/src/routes/query/echo.svelte b/packages/kit/test/apps/basics/src/routes/query/echo.svelte
index 207e19affbab..fa96a56a43c3 100644
--- a/packages/kit/test/apps/basics/src/routes/query/echo.svelte
+++ b/packages/kit/test/apps/basics/src/routes/query/echo.svelte
@@ -25,13 +25,13 @@
 </script>
 
 <script>
-	import { route } from '$app/stores';
+	import { page } from '$app/stores';
 
 	/** @type {Query}*/
 	export let values;
 </script>
 
 <pre id="one">{JSON.stringify(values)}</pre>
-<pre id="two">{JSON.stringify(to_pojo($route.url.searchParams))}</pre>
+<pre id="two">{JSON.stringify(to_pojo($page.url.searchParams))}</pre>
 
 <a href="/query/echo?bar=2">?bar=2</a>
diff --git a/packages/kit/test/apps/basics/src/routes/routing/[slug].svelte b/packages/kit/test/apps/basics/src/routes/routing/[slug].svelte
index 798c1a96695b..9873d6864ea3 100644
--- a/packages/kit/test/apps/basics/src/routes/routing/[slug].svelte
+++ b/packages/kit/test/apps/basics/src/routes/routing/[slug].svelte
@@ -1,5 +1,5 @@
 <script>
-	import { route } from '$app/stores';
+	import { page } from '$app/stores';
 </script>
 
-<h1>{$route.params.slug}</h1>
+<h1>{$page.params.slug}</h1>
diff --git a/packages/kit/test/apps/basics/src/routes/routing/rest/[...rest]/deep.svelte b/packages/kit/test/apps/basics/src/routes/routing/rest/[...rest]/deep.svelte
index 06c42a7e5b2f..46292ff04b93 100644
--- a/packages/kit/test/apps/basics/src/routes/routing/rest/[...rest]/deep.svelte
+++ b/packages/kit/test/apps/basics/src/routes/routing/rest/[...rest]/deep.svelte
@@ -7,13 +7,13 @@
 </script>
 
 <script>
-	import { route } from '$app/stores';
+	import { page } from '$app/stores';
 
 	/** @type {string} */
 	export let rest;
 </script>
 
-<h1>{$route.params.rest}</h1>
+<h1>{$page.params.rest}</h1>
 <h2>{rest}</h2>
 
 <a href="/routing/rest/xyz/abc/qwe/deep.json" rel="external">deep</a>
diff --git a/packages/kit/test/apps/basics/src/routes/routing/rest/[...rest]/index.svelte b/packages/kit/test/apps/basics/src/routes/routing/rest/[...rest]/index.svelte
index 59e59540913d..9bbca8792006 100644
--- a/packages/kit/test/apps/basics/src/routes/routing/rest/[...rest]/index.svelte
+++ b/packages/kit/test/apps/basics/src/routes/routing/rest/[...rest]/index.svelte
@@ -7,13 +7,13 @@
 </script>
 
 <script>
-	import { route } from '$app/stores';
+	import { page } from '$app/stores';
 
 	/** @type {string} */
 	export let rest;
 </script>
 
-<h1>{$route.params.rest}</h1>
+<h1>{$page.params.rest}</h1>
 <h2>{rest}</h2>
 
 <a href="/routing/rest/xyz/abc/deep">deep</a>
diff --git a/packages/kit/test/apps/basics/src/routes/routing/rest/non-greedy/[dynamic]-bar/[...rest].svelte b/packages/kit/test/apps/basics/src/routes/routing/rest/non-greedy/[dynamic]-bar/[...rest].svelte
index 826ee6168440..ff2727d66f5d 100644
--- a/packages/kit/test/apps/basics/src/routes/routing/rest/non-greedy/[dynamic]-bar/[...rest].svelte
+++ b/packages/kit/test/apps/basics/src/routes/routing/rest/non-greedy/[dynamic]-bar/[...rest].svelte
@@ -1,5 +1,5 @@
 <script>
-	import { route } from '$app/stores';
+	import { page } from '$app/stores';
 </script>
 
-<h2>{JSON.stringify($route.params)}</h2>
+<h2>{JSON.stringify($page.params)}</h2>
diff --git a/packages/kit/test/apps/basics/src/routes/routing/rest/non-greedy/foo/[...rest].svelte b/packages/kit/test/apps/basics/src/routes/routing/rest/non-greedy/foo/[...rest].svelte
index 826ee6168440..ff2727d66f5d 100644
--- a/packages/kit/test/apps/basics/src/routes/routing/rest/non-greedy/foo/[...rest].svelte
+++ b/packages/kit/test/apps/basics/src/routes/routing/rest/non-greedy/foo/[...rest].svelte
@@ -1,5 +1,5 @@
 <script>
-	import { route } from '$app/stores';
+	import { page } from '$app/stores';
 </script>
 
-<h2>{JSON.stringify($route.params)}</h2>
+<h2>{JSON.stringify($page.params)}</h2>
diff --git a/packages/kit/test/apps/basics/src/routes/routing/split-params/[a]-[b].svelte b/packages/kit/test/apps/basics/src/routes/routing/split-params/[a]-[b].svelte
index 952246f491e8..79d7e8609222 100644
--- a/packages/kit/test/apps/basics/src/routes/routing/split-params/[a]-[b].svelte
+++ b/packages/kit/test/apps/basics/src/routes/routing/split-params/[a]-[b].svelte
@@ -1,6 +1,6 @@
 <script>
-	import { route } from '$app/stores';
+	import { page } from '$app/stores';
 </script>
 
-<h1>{$route.params.a}</h1>
-<h2>{$route.params.b}</h2>
+<h1>{$page.params.a}</h1>
+<h2>{$page.params.b}</h2>
diff --git a/packages/kit/test/apps/basics/src/routes/store/_tests.js b/packages/kit/test/apps/basics/src/routes/store/_tests.js
index 783c30cf82f4..3b796ebae798 100644
--- a/packages/kit/test/apps/basics/src/routes/store/_tests.js
+++ b/packages/kit/test/apps/basics/src/routes/store/_tests.js
@@ -2,7 +2,7 @@ import * as assert from 'uvu/assert';
 
 /** @type {import('test').TestMaker} */
 export default function (test) {
-	test('url store functions as expected', null, async ({ base, page, clicknav, js }) => {
+	test('page store functions as expected', null, async ({ base, page, clicknav, js }) => {
 		await page.goto(`${base}/store`);
 
 		assert.equal(await page.textContent('h1'), 'Test');
diff --git a/packages/kit/test/apps/basics/src/routes/store/index.svelte b/packages/kit/test/apps/basics/src/routes/store/index.svelte
index 1521f8e013d1..43eb478eb39f 100644
--- a/packages/kit/test/apps/basics/src/routes/store/index.svelte
+++ b/packages/kit/test/apps/basics/src/routes/store/index.svelte
@@ -2,7 +2,7 @@
 	import { getStores } from '$app/stores';
 	import { onMount, onDestroy } from 'svelte';
 
-	const { route, session } = getStores(); // TODO note to self: getStores() appears to be masking a bug here
+	const { page, session } = getStores(); // TODO note to self: getStores() appears to be masking a bug here
 
 	let calls = 0;
 
@@ -10,7 +10,7 @@
 		session.set(calls);
 	});
 
-	const unsubscribe = route.subscribe(() => {
+	const unsubscribe = page.subscribe(() => {
 		calls++;
 		session.set(calls);
 	});
@@ -22,6 +22,6 @@
 <h2>Calls: {calls}</h2>
 <a href="/store/result">results</a>
 
-{#if $route.url.pathname === '/store/result'}{console.log(
+{#if $page.url.pathname === '/store/result'}{console.log(
 		(window.oops = 'this should not happen')
 	)}{/if}
diff --git a/packages/kit/test/apps/basics/src/routes/xss/[path].svelte b/packages/kit/test/apps/basics/src/routes/xss/[path].svelte
index 9adb1f4e295d..d4f9139135dc 100644
--- a/packages/kit/test/apps/basics/src/routes/xss/[path].svelte
+++ b/packages/kit/test/apps/basics/src/routes/xss/[path].svelte
@@ -1,5 +1,5 @@
 <script>
-	import { route } from '$app/stores';
+	import { page } from '$app/stores';
 </script>
 
-<h1 id="one">{$route.params.slug}</h1>
+<h1 id="one">{$page.params.slug}</h1>
diff --git a/packages/kit/test/apps/basics/src/routes/xss/query.svelte b/packages/kit/test/apps/basics/src/routes/xss/query.svelte
index 7d4d686bd3f9..aecb5a2e5180 100644
--- a/packages/kit/test/apps/basics/src/routes/xss/query.svelte
+++ b/packages/kit/test/apps/basics/src/routes/xss/query.svelte
@@ -25,11 +25,11 @@
 </script>
 
 <script>
-	import { route } from '$app/stores';
+	import { page } from '$app/stores';
 
 	/** @type {Query}*/
 	export let values;
 </script>
 
 <pre id="one">{JSON.stringify(values)}</pre>
-<pre id="two">{JSON.stringify(to_pojo($route.url.searchParams))}</pre>
+<pre id="two">{JSON.stringify(to_pojo($page.url.searchParams))}</pre>
diff --git a/packages/kit/test/apps/options/source/pages/custom-extensions/[slug].svelte.md b/packages/kit/test/apps/options/source/pages/custom-extensions/[slug].svelte.md
index d7f4aa934ace..4ebc388ae09f 100644
--- a/packages/kit/test/apps/options/source/pages/custom-extensions/[slug].svelte.md
+++ b/packages/kit/test/apps/options/source/pages/custom-extensions/[slug].svelte.md
@@ -1,3 +1,3 @@
-<script>import { route } from '$app/stores';</script>
+<script>import { page } from '$app/stores';</script>
 
-<h2>{$route.params.slug.toUpperCase()}</h2>
+<h2>{$page.params.slug.toUpperCase()}</h2>
diff --git a/packages/kit/test/apps/options/source/pages/origin/index.svelte b/packages/kit/test/apps/options/source/pages/origin/index.svelte
index 6679f08ad847..ae0b97528978 100644
--- a/packages/kit/test/apps/options/source/pages/origin/index.svelte
+++ b/packages/kit/test/apps/options/source/pages/origin/index.svelte
@@ -14,7 +14,7 @@
 </script>
 
 <script>
-	import { route } from '$app/stores';
+	import { page } from '$app/stores';
 
 	/** @type {string} */
 	export let origin;
@@ -24,5 +24,5 @@
 </script>
 
 <p data-source="load">{origin}</p>
-<p data-source="store">{$route.url.origin}</p>
+<p data-source="store">{$page.url.origin}</p>
 <p data-source="endpoint">{data.origin}</p>
diff --git a/packages/kit/test/apps/options/source/pages/slash/child.svelte b/packages/kit/test/apps/options/source/pages/slash/child.svelte
index 451a2bf4eb13..ab4505e94b0e 100644
--- a/packages/kit/test/apps/options/source/pages/slash/child.svelte
+++ b/packages/kit/test/apps/options/source/pages/slash/child.svelte
@@ -1,6 +1,6 @@
 <script>
 	import { base } from '$app/paths';
-	import { route } from '$app/stores';
+	import { page } from '$app/stores';
 </script>
 
-<h2>{$route.url.pathname.replace(base, '')}</h2>
+<h2>{$page.url.pathname.replace(base, '')}</h2>
diff --git a/packages/kit/test/apps/options/source/pages/slash/index.svelte b/packages/kit/test/apps/options/source/pages/slash/index.svelte
index 1c221675271c..93a915f3661f 100644
--- a/packages/kit/test/apps/options/source/pages/slash/index.svelte
+++ b/packages/kit/test/apps/options/source/pages/slash/index.svelte
@@ -1,8 +1,8 @@
 <script>
 	import { base } from '$app/paths';
-	import { route } from '$app/stores';
+	import { page } from '$app/stores';
 </script>
 
-<h2>{$route.url.pathname.replace(base, '')}</h2>
+<h2>{$page.url.pathname.replace(base, '')}</h2>
 
 <a href="{base}/slash/child">/slash/child</a>
diff --git a/packages/kit/types/ambient-modules.d.ts b/packages/kit/types/ambient-modules.d.ts
index 15fb04bfc5a5..2da644ffe941 100644
--- a/packages/kit/types/ambient-modules.d.ts
+++ b/packages/kit/types/ambient-modules.d.ts
@@ -91,7 +91,7 @@ declare module '$app/stores' {
 	export function getStores<Session = any>(): {
 		navigating: Readable<Navigating | null>;
 		url: Readable<URL>;
-		route: Readable<{
+		page: Readable<{
 			params: Record<string, string>;
 		}>;
 		session: Writable<Session>;
@@ -101,9 +101,9 @@ declare module '$app/stores' {
 	 */
 	export const url: Readable<URL>;
 	/**
-	 * A readable store whose value contains route data.
+	 * A readable store whose value contains page data.
 	 */
-	export const route: Readable<{
+	export const page: Readable<{
 		params: Record<string, string>;
 	}>;
 	/**

From 0a53d925b7cd88703fe31e42fa5fd43bdcc35ca2 Mon Sep 17 00:00:00 2001
From: Rich Harris <hello@rich-harris.dev>
Date: Wed, 29 Dec 2021 21:35:03 +0000
Subject: [PATCH 31/45] throw errors on accessing $page.path etc

---
 packages/kit/src/runtime/client/renderer.js   | 25 ++++++++++++++-----
 .../kit/src/runtime/server/page/render.js     | 19 ++++++++++++++
 2 files changed, 38 insertions(+), 6 deletions(-)

diff --git a/packages/kit/src/runtime/client/renderer.js b/packages/kit/src/runtime/client/renderer.js
index 9cc21bf4a534..7ff391435bd8 100644
--- a/packages/kit/src/runtime/client/renderer.js
+++ b/packages/kit/src/runtime/client/renderer.js
@@ -444,6 +444,25 @@ export class Renderer {
 
 		if (!this.current.url || url.href !== this.current.url.href) {
 			result.props.page = { url, params };
+
+			if (import.meta.env.DEV) {
+				// TODO remove this for 1.0
+				/**
+				 * @param {string} property
+				 * @param {string} replacement
+				 */
+				const print_error = (property, replacement) => {
+					Object.defineProperty(result.props.page, property, {
+						get: () => {
+							throw new Error(`$page.${property} has been replaced by $page.url.${replacement}`);
+						}
+					});
+				};
+
+				print_error('origin', 'origin');
+				print_error('path', 'pathname');
+				print_error('query', 'searchParams');
+			}
 		}
 
 		const leaf = filtered[filtered.length - 1];
@@ -540,12 +559,6 @@ export class Renderer {
 					node.uses.dependencies.push(href);
 
 					return started ? fetch(resource, info) : initial_fetch(resource, info);
-				},
-
-				// TODO remove this for 1.0
-				// @ts-expect-error
-				get page() {
-					throw new Error('`page` in `load` functions has been replaced by `url` and `params`');
 				}
 			};
 
diff --git a/packages/kit/src/runtime/server/page/render.js b/packages/kit/src/runtime/server/page/render.js
index dd5b95fb65cd..466c82c3199d 100644
--- a/packages/kit/src/runtime/server/page/render.js
+++ b/packages/kit/src/runtime/server/page/render.js
@@ -72,6 +72,25 @@ export async function render_response({
 			components: branch.map(({ node }) => node.module.default)
 		};
 
+		if (options.dev) {
+			// TODO remove this for 1.0
+			/**
+			 * @param {string} property
+			 * @param {string} replacement
+			 */
+			const print_error = (property, replacement) => {
+				Object.defineProperty(props.page, property, {
+					get: () => {
+						throw new Error(`$page.${property} has been replaced by $page.url.${replacement}`);
+					}
+				});
+			};
+
+			print_error('origin', 'origin');
+			print_error('path', 'pathname');
+			print_error('query', 'searchParams');
+		}
+
 		// props_n (instead of props[n]) makes it easy to avoid
 		// unnecessary updates for layout components
 		for (let i = 0; i < branch.length; i += 1) {

From 761ab4c8abafc519380c14925791ab49d0b8d2cf Mon Sep 17 00:00:00 2001
From: Rich Harris <hello@rich-harris.dev>
Date: Wed, 29 Dec 2021 21:35:44 +0000
Subject: [PATCH 32/45] fix types

---
 packages/kit/types/ambient-modules.d.ts | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/packages/kit/types/ambient-modules.d.ts b/packages/kit/types/ambient-modules.d.ts
index 2da644ffe941..8b376f6a942a 100644
--- a/packages/kit/types/ambient-modules.d.ts
+++ b/packages/kit/types/ambient-modules.d.ts
@@ -90,20 +90,18 @@ declare module '$app/stores' {
 	 */
 	export function getStores<Session = any>(): {
 		navigating: Readable<Navigating | null>;
-		url: Readable<URL>;
 		page: Readable<{
+			url: URL;
 			params: Record<string, string>;
 		}>;
 		session: Writable<Session>;
 	};
-	/**
-	 * A readable store whose value contains the current URL.
-	 */
 	export const url: Readable<URL>;
 	/**
 	 * A readable store whose value contains page data.
 	 */
 	export const page: Readable<{
+		url: URL;
 		params: Record<string, string>;
 	}>;
 	/**

From fc4caa187d60c636f9a72995feb74ff9b031696b Mon Sep 17 00:00:00 2001
From: Rich Harris <hello@rich-harris.dev>
Date: Wed, 29 Dec 2021 21:40:15 +0000
Subject: [PATCH 33/45] fix some docs

---
 documentation/docs/05-modules.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/documentation/docs/05-modules.md b/documentation/docs/05-modules.md
index 382fa60cfe7a..ec9aed173629 100644
--- a/documentation/docs/05-modules.md
+++ b/documentation/docs/05-modules.md
@@ -45,19 +45,19 @@ import { base, assets } from '$app/paths';
 ### $app/stores
 
 ```js
-import { getStores, navigating, route, session } from '$app/stores';
+import { getStores, navigating, page, session } from '$app/stores';
 ```
 
 Stores are _contextual_ — they are added to the [context](https://svelte.dev/tutorial/context-api) of your root component. This means that `session` and `route` are unique to each request on the server, rather than shared between multiple requests handled by the same server simultaneously, which is what makes it safe to include user-specific data in `session`.
 
 Because of that, the stores are not free-floating objects: they must be accessed during component initialisation, like anything else that would be accessed with `getContext`.
 
-- `getStores` is a convenience function around `getContext` that returns `{ navigating, route, session }`. This needs to be called at the top-level or synchronously during component or page initialisation.
+- `getStores` is a convenience function around `getContext` that returns `{ navigating, page, session }`. This needs to be called at the top-level or synchronously during component or page initialisation.
 
 The stores themselves attach to the correct context at the point of subscription, which means you can import and use them directly in components without boilerplate. However, it still needs to be called synchronously on component or page initialisation when the `$`-prefix isn't used. Use `getStores` to safely `.subscribe` asynchronously instead.
 
 - `navigating` is a [readable store](https://svelte.dev/tutorial/readable-stores). When navigating starts, its value is `{ from, to }`, where `from` and `to` are both [`URL`](https://developer.mozilla.org/en-US/docs/Web/API/URL) instances. When navigating finishes, its value reverts to `null`.
-- `route` contains an object with the current [`url`](https://developer.mozilla.org/en-US/docs/Web/API/URL) and [`params`](#loading-input-params).
+- `page` contains an object with the current [`url`](https://developer.mozilla.org/en-US/docs/Web/API/URL) and [`params`](#loading-input-params).
 - `session` is a [writable store](https://svelte.dev/tutorial/writable-stores) whose initial value is whatever was returned from [`getSession`](#hooks-getsession). It can be written to, but this will _not_ cause changes to persist on the server — this is something you must implement yourself.
 
 ### $lib

From 76376f4a6ce62d28cb16a623a2854b1e13c55de3 Mon Sep 17 00:00:00 2001
From: Rich Harris <hello@rich-harris.dev>
Date: Wed, 29 Dec 2021 21:42:02 +0000
Subject: [PATCH 34/45] fix migrating docs

---
 documentation/migrating/04-pages.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/documentation/migrating/04-pages.md b/documentation/migrating/04-pages.md
index ec08e8e04cec..ef27a63afbab 100644
--- a/documentation/migrating/04-pages.md
+++ b/documentation/migrating/04-pages.md
@@ -33,7 +33,7 @@ import { stores } from '@sapper/app';
 const { preloading, page, session } = stores();
 ```
 
-The `session` store still exists; `preloading` has been replaced with a `navigating` store that contains `from` and `to` properties. `page` is now `route`.
+The `page` and `session` stores still exist; `preloading` has been replaced with a `navigating` store that contains `from` and `to` properties. `page` now has `url` and `params` properties, but no `path` or `query`.
 
 You access them differently in SvelteKit. `stores` is now `getStores`, but in most cases it is unnecessary since you can import `navigating`, `route` and `session` directly from [`$app/stores`](/docs#modules-$app-stores).
 

From 77030b3ccdb1c57056206dc7a651ae52f741ed49 Mon Sep 17 00:00:00 2001
From: Rich Harris <hello@rich-harris.dev>
Date: Wed, 29 Dec 2021 22:24:28 +0000
Subject: [PATCH 35/45] decode path, strip prefix

---
 packages/kit/src/runtime/client/renderer.js               | 8 ++++++--
 packages/kit/src/runtime/client/start.js                  | 3 ++-
 .../kit/test/apps/options/source/pages/base/[slug].svelte | 8 ++++++++
 .../kit/test/apps/options/source/pages/base/_tests.js     | 7 +++++++
 4 files changed, 23 insertions(+), 3 deletions(-)
 create mode 100644 packages/kit/test/apps/options/source/pages/base/[slug].svelte

diff --git a/packages/kit/src/runtime/client/renderer.js b/packages/kit/src/runtime/client/renderer.js
index 7ff391435bd8..a5ad5b5ec3ea 100644
--- a/packages/kit/src/runtime/client/renderer.js
+++ b/packages/kit/src/runtime/client/renderer.js
@@ -67,11 +67,13 @@ export class Renderer {
 	 *   fallback: [CSRComponent, CSRComponent];
 	 *   target: Node;
 	 *   session: any;
+	 *   base: string;
 	 * }} opts
 	 */
-	constructor({ Root, fallback, target, session }) {
+	constructor({ Root, fallback, target, session, base }) {
 		this.Root = Root;
 		this.fallback = fallback;
+		this.base = base;
 
 		/** @type {import('./router').Router | undefined} */
 		this.router;
@@ -601,10 +603,12 @@ export class Renderer {
 			if (cached) return cached;
 		}
 
+		const path = decodeURI(url.pathname).replace(this.base, '');
+
 		const [pattern, a, b, get_params] = route;
 		const params = get_params
 			? // the pattern is for the route which we've already matched to this path
-			  get_params(/** @type {RegExpExecArray}  */ (pattern.exec(url.pathname))) // TODO this needs to account for paths.base
+			  get_params(/** @type {RegExpExecArray}  */ (pattern.exec(path)))
 			: {};
 
 		const changed = this.current.url && {
diff --git a/packages/kit/src/runtime/client/start.js b/packages/kit/src/runtime/client/start.js
index 5eb941771861..560435b6707e 100644
--- a/packages/kit/src/runtime/client/start.js
+++ b/packages/kit/src/runtime/client/start.js
@@ -36,7 +36,8 @@ export async function start({ paths, target, session, route, spa, trailing_slash
 		Root,
 		fallback,
 		target,
-		session
+		session,
+		base: paths.base
 	});
 
 	const router = route
diff --git a/packages/kit/test/apps/options/source/pages/base/[slug].svelte b/packages/kit/test/apps/options/source/pages/base/[slug].svelte
new file mode 100644
index 000000000000..e968fc775802
--- /dev/null
+++ b/packages/kit/test/apps/options/source/pages/base/[slug].svelte
@@ -0,0 +1,8 @@
+<script>
+	import { base } from '$app/paths';
+	import { page } from '$app/stores';
+</script>
+
+<h2>{$page.params.slug}</h2>
+
+<a href="/path-base/base/two">/path-base/base/two</a>
diff --git a/packages/kit/test/apps/options/source/pages/base/_tests.js b/packages/kit/test/apps/options/source/pages/base/_tests.js
index fb2f12a3d2bb..60ac8cd31b4b 100644
--- a/packages/kit/test/apps/options/source/pages/base/_tests.js
+++ b/packages/kit/test/apps/options/source/pages/base/_tests.js
@@ -25,4 +25,11 @@ export default function (test) {
 			'rgb(255, 0, 0)'
 		);
 	});
+
+	test('sets params correctly', '/path-base/base/one', async ({ page, clicknav }) => {
+		assert.equal(await page.textContent('h2'), 'one');
+
+		await clicknav(`[href="/path-base/base/two"]`);
+		assert.equal(await page.textContent('h2'), 'two');
+	});
 }

From f0b6825bb9738056ddf78286f8f62eb25306e21f Mon Sep 17 00:00:00 2001
From: Rich Harris <hello@rich-harris.dev>
Date: Wed, 29 Dec 2021 22:33:03 +0000
Subject: [PATCH 36/45] tidy up

---
 packages/kit/src/runtime/client/renderer.js |  8 ++------
 packages/kit/src/runtime/client/router.js   | 16 ++++++++--------
 packages/kit/src/runtime/client/start.js    |  3 +--
 packages/kit/src/runtime/client/types.d.ts  |  2 +-
 4 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/packages/kit/src/runtime/client/renderer.js b/packages/kit/src/runtime/client/renderer.js
index a5ad5b5ec3ea..dacc5aecde92 100644
--- a/packages/kit/src/runtime/client/renderer.js
+++ b/packages/kit/src/runtime/client/renderer.js
@@ -67,13 +67,11 @@ export class Renderer {
 	 *   fallback: [CSRComponent, CSRComponent];
 	 *   target: Node;
 	 *   session: any;
-	 *   base: string;
 	 * }} opts
 	 */
-	constructor({ Root, fallback, target, session, base }) {
+	constructor({ Root, fallback, target, session }) {
 		this.Root = Root;
 		this.fallback = fallback;
-		this.base = base;
 
 		/** @type {import('./router').Router | undefined} */
 		this.router;
@@ -595,7 +593,7 @@ export class Renderer {
 	 * @param {boolean} no_cache
 	 * @returns {Promise<import('./types').NavigationResult | undefined>} undefined if fallthrough
 	 */
-	async _load({ route, info: { url } }, no_cache) {
+	async _load({ route, info: { url, path } }, no_cache) {
 		const key = url.pathname + url.search;
 
 		if (!no_cache) {
@@ -603,8 +601,6 @@ export class Renderer {
 			if (cached) return cached;
 		}
 
-		const path = decodeURI(url.pathname).replace(this.base, '');
-
 		const [pattern, a, b, get_params] = route;
 		const params = get_params
 			? // the pattern is for the route which we've already matched to this path
diff --git a/packages/kit/src/runtime/client/router.js b/packages/kit/src/runtime/client/router.js
index b57b9e8c3b8f..8c0b9e071da3 100644
--- a/packages/kit/src/runtime/client/router.js
+++ b/packages/kit/src/runtime/client/router.js
@@ -190,14 +190,14 @@ export class Router {
 	 */
 	parse(url) {
 		if (this.owns(url)) {
-			const path = url.pathname.slice(this.base.length) || '/';
-
-			const decoded_path = decodeURI(path);
-			const routes = this.routes.filter(([pattern]) => pattern.test(decoded_path));
-
-			const id = url.pathname + url.search;
-
-			return { id, routes, url };
+			const path = decodeURI(url.pathname.slice(this.base.length) || '/');
+
+			return {
+				id: url.pathname + url.search,
+				routes: this.routes.filter(([pattern]) => pattern.test(path)),
+				url,
+				path
+			};
 		}
 	}
 
diff --git a/packages/kit/src/runtime/client/start.js b/packages/kit/src/runtime/client/start.js
index 560435b6707e..5eb941771861 100644
--- a/packages/kit/src/runtime/client/start.js
+++ b/packages/kit/src/runtime/client/start.js
@@ -36,8 +36,7 @@ export async function start({ paths, target, session, route, spa, trailing_slash
 		Root,
 		fallback,
 		target,
-		session,
-		base: paths.base
+		session
 	});
 
 	const router = route
diff --git a/packages/kit/src/runtime/client/types.d.ts b/packages/kit/src/runtime/client/types.d.ts
index f4cbb70ff7c7..4d617d13a244 100644
--- a/packages/kit/src/runtime/client/types.d.ts
+++ b/packages/kit/src/runtime/client/types.d.ts
@@ -4,7 +4,7 @@ export type NavigationInfo = {
 	id: string;
 	routes: CSRRoute[];
 	url: URL;
-	// decoded_path: string; TODO do we need this?
+	path: string;
 };
 
 export type NavigationCandidate = {

From b1aa4761ca4a92fa6368c84b552c91b7a836b763 Mon Sep 17 00:00:00 2001
From: Rich Harris <hello@rich-harris.dev>
Date: Wed, 29 Dec 2021 22:34:21 +0000
Subject: [PATCH 37/45] remove comment

---
 packages/kit/src/runtime/server/utils.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/kit/src/runtime/server/utils.js b/packages/kit/src/runtime/server/utils.js
index a48f6c9d251f..ea7c26765a0d 100644
--- a/packages/kit/src/runtime/server/utils.js
+++ b/packages/kit/src/runtime/server/utils.js
@@ -15,7 +15,6 @@ export function decode_params(params) {
 	for (const key in params) {
 		// input has already been decoded by decodeURI
 		// now handle the rest that decodeURIComponent would do
-		// TODO shouldn't we just use decodeURIComponent in the first place?
 		params[key] = params[key]
 			.replace(/%23/g, '#')
 			.replace(/%3[Bb]/g, ';')

From a12cfda2dc1c1bfeffefd67f3dc7c0c1b39e7c7d Mon Sep 17 00:00:00 2001
From: Rich Harris <hello@rich-harris.dev>
Date: Wed, 29 Dec 2021 22:55:56 +0000
Subject: [PATCH 38/45] lint

---
 packages/kit/test/apps/options/source/pages/base/[slug].svelte | 1 -
 packages/kit/test/apps/options/source/pages/base/_tests.js     | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/kit/test/apps/options/source/pages/base/[slug].svelte b/packages/kit/test/apps/options/source/pages/base/[slug].svelte
index e968fc775802..29922475f922 100644
--- a/packages/kit/test/apps/options/source/pages/base/[slug].svelte
+++ b/packages/kit/test/apps/options/source/pages/base/[slug].svelte
@@ -1,5 +1,4 @@
 <script>
-	import { base } from '$app/paths';
 	import { page } from '$app/stores';
 </script>
 
diff --git a/packages/kit/test/apps/options/source/pages/base/_tests.js b/packages/kit/test/apps/options/source/pages/base/_tests.js
index 60ac8cd31b4b..baae2359903a 100644
--- a/packages/kit/test/apps/options/source/pages/base/_tests.js
+++ b/packages/kit/test/apps/options/source/pages/base/_tests.js
@@ -29,7 +29,7 @@ export default function (test) {
 	test('sets params correctly', '/path-base/base/one', async ({ page, clicknav }) => {
 		assert.equal(await page.textContent('h2'), 'one');
 
-		await clicknav(`[href="/path-base/base/two"]`);
+		await clicknav('[href="/path-base/base/two"]');
 		assert.equal(await page.textContent('h2'), 'two');
 	});
 }

From cd6c6c1f7392717b78fb91a31b5f7061a231f8f2 Mon Sep 17 00:00:00 2001
From: Rich Harris <hello@rich-harris.dev>
Date: Thu, 30 Dec 2021 10:49:02 +0000
Subject: [PATCH 39/45] update adapters

---
 .changeset/shy-oranges-sin.md                      | 5 +++++
 packages/adapter-cloudflare-workers/files/entry.js | 4 +---
 packages/adapter-cloudflare/files/worker.js        | 3 +--
 packages/adapter-netlify/src/handler.js            | 7 ++-----
 packages/adapter-node/src/handler.js               | 3 +--
 packages/adapter-vercel/files/entry.js             | 3 +--
 6 files changed, 11 insertions(+), 14 deletions(-)
 create mode 100644 .changeset/shy-oranges-sin.md

diff --git a/.changeset/shy-oranges-sin.md b/.changeset/shy-oranges-sin.md
new file mode 100644
index 000000000000..51dbd9476aad
--- /dev/null
+++ b/.changeset/shy-oranges-sin.md
@@ -0,0 +1,5 @@
+---
+'@sveltejs/kit': patch
+---
+
+Replace [request|page].[origin|path|query] with url object
diff --git a/packages/adapter-cloudflare-workers/files/entry.js b/packages/adapter-cloudflare-workers/files/entry.js
index 0422ab397828..4ec7e7bfca63 100644
--- a/packages/adapter-cloudflare-workers/files/entry.js
+++ b/packages/adapter-cloudflare-workers/files/entry.js
@@ -26,12 +26,10 @@ async function handle(event) {
 
 	// fall back to an app route
 	const request = event.request;
-	const request_url = new URL(request.url);
 
 	try {
 		const rendered = await app.render({
-			path: request_url.pathname,
-			query: request_url.searchParams,
+			url: request.url,
 			rawBody: await read(request),
 			headers: Object.fromEntries(request.headers),
 			method: request.method
diff --git a/packages/adapter-cloudflare/files/worker.js b/packages/adapter-cloudflare/files/worker.js
index 4d5296022925..aaf128a26bc5 100644
--- a/packages/adapter-cloudflare/files/worker.js
+++ b/packages/adapter-cloudflare/files/worker.js
@@ -33,8 +33,7 @@ export default {
 		// dynamically-generated pages
 		try {
 			const rendered = await app.render({
-				path: url.pathname,
-				query: url.searchParams,
+				url,
 				rawBody: new Uint8Array(await req.arrayBuffer()),
 				headers: Object.fromEntries(req.headers),
 				method: req.method
diff --git a/packages/adapter-netlify/src/handler.js b/packages/adapter-netlify/src/handler.js
index 4c8c18547810..6673a957b3c7 100644
--- a/packages/adapter-netlify/src/handler.js
+++ b/packages/adapter-netlify/src/handler.js
@@ -7,18 +7,15 @@ export function init(manifest) {
 	const app = new App(manifest);
 
 	return async (event) => {
-		const { path, httpMethod, headers, rawQuery, body, isBase64Encoded } = event;
-
-		const query = new URLSearchParams(rawQuery);
+		const { httpMethod, headers, rawUrl, body, isBase64Encoded } = event;
 
 		const encoding = isBase64Encoded ? 'base64' : headers['content-encoding'] || 'utf-8';
 		const rawBody = typeof body === 'string' ? Buffer.from(body, encoding) : body;
 
 		const rendered = await app.render({
+			url: rawUrl,
 			method: httpMethod,
 			headers,
-			path,
-			query,
 			rawBody
 		});
 
diff --git a/packages/adapter-node/src/handler.js b/packages/adapter-node/src/handler.js
index 35bbcbfcca7f..2485622f7727 100644
--- a/packages/adapter-node/src/handler.js
+++ b/packages/adapter-node/src/handler.js
@@ -57,10 +57,9 @@ const ssr = async (req, res) => {
 	}
 
 	const rendered = await app.render({
+		url: req.url,
 		method: req.method,
 		headers: req.headers, // TODO: what about repeated headers, i.e. string[]
-		path: parsed.pathname,
-		query: parsed.searchParams,
 		rawBody: body
 	});
 
diff --git a/packages/adapter-vercel/files/entry.js b/packages/adapter-vercel/files/entry.js
index 48994586526b..1c63a9798998 100644
--- a/packages/adapter-vercel/files/entry.js
+++ b/packages/adapter-vercel/files/entry.js
@@ -20,10 +20,9 @@ export default async (req, res) => {
 	}
 
 	const rendered = await app.render({
+		url: req.url,
 		method: req.method,
 		headers: req.headers,
-		path: pathname,
-		query: searchParams,
 		rawBody: body
 	});
 

From 1f936b5001c2a5561aea1b2d887c7f2d0578efb3 Mon Sep 17 00:00:00 2001
From: Rich Harris <hello@rich-harris.dev>
Date: Thu, 30 Dec 2021 10:49:39 +0000
Subject: [PATCH 40/45] changeset

---
 .changeset/honest-beers-sing.md | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 .changeset/honest-beers-sing.md

diff --git a/.changeset/honest-beers-sing.md b/.changeset/honest-beers-sing.md
new file mode 100644
index 000000000000..2dca43cc372a
--- /dev/null
+++ b/.changeset/honest-beers-sing.md
@@ -0,0 +1,9 @@
+---
+'@sveltejs/adapter-cloudflare': patch
+'@sveltejs/adapter-cloudflare-workers': patch
+'@sveltejs/adapter-netlify': patch
+'@sveltejs/adapter-node': patch
+'@sveltejs/adapter-vercel': patch
+---
+
+Update adapters to provide app.render with a url

From 863b60269286f27b563235966176ad0af52b89a3 Mon Sep 17 00:00:00 2001
From: Rich Harris <hello@rich-harris.dev>
Date: Thu, 30 Dec 2021 11:01:59 +0000
Subject: [PATCH 41/45] error if adapter provides wrong input

---
 packages/adapter-vercel/files/entry.js      | 2 --
 packages/kit/src/core/build/build_server.js | 5 +++++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/packages/adapter-vercel/files/entry.js b/packages/adapter-vercel/files/entry.js
index 1c63a9798998..a477ecc950bf 100644
--- a/packages/adapter-vercel/files/entry.js
+++ b/packages/adapter-vercel/files/entry.js
@@ -8,8 +8,6 @@ __fetch_polyfill();
 const app = new App(manifest);
 
 export default async (req, res) => {
-	const { pathname, searchParams } = new URL(req.url || '', 'http://localhost');
-
 	let body;
 
 	try {
diff --git a/packages/kit/src/core/build/build_server.js b/packages/kit/src/core/build/build_server.js
index 0411241f351c..b88da0e2c889 100644
--- a/packages/kit/src/core/build/build_server.js
+++ b/packages/kit/src/core/build/build_server.js
@@ -88,6 +88,11 @@ export class App {
 	render(request, {
 		prerender
 	} = {}) {
+		// TODO remove this for 1.0
+		if (Object.keys(request).sort().join() !== 'headers,method,rawBody,url') {
+			throw new Error('Adapters should call app.render({ url, method, headers, rawBody })');
+		}
+
 		const host = ${
 			config.kit.host
 				? s(config.kit.host)

From b675e1ce26c34c033b6148b96bb040042d344386 Mon Sep 17 00:00:00 2001
From: Rich Harris <hello@rich-harris.dev>
Date: Thu, 30 Dec 2021 11:02:23 +0000
Subject: [PATCH 42/45] changeset

---
 .changeset/rude-balloons-return.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/rude-balloons-return.md

diff --git a/.changeset/rude-balloons-return.md b/.changeset/rude-balloons-return.md
new file mode 100644
index 000000000000..7542f48c7220
--- /dev/null
+++ b/.changeset/rude-balloons-return.md
@@ -0,0 +1,5 @@
+---
+'@sveltejs/kit': patch
+---
+
+Error if adapter provides wrong input to app.render

From 3aa32c1fe39344916a8eef72bf871cf4dd12830d Mon Sep 17 00:00:00 2001
From: Rich Harris <richard.a.harris@gmail.com>
Date: Thu, 30 Dec 2021 06:05:09 -0500
Subject: [PATCH 43/45] Update documentation/docs/05-modules.md

---
 documentation/docs/05-modules.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/documentation/docs/05-modules.md b/documentation/docs/05-modules.md
index ec9aed173629..4066b59d69de 100644
--- a/documentation/docs/05-modules.md
+++ b/documentation/docs/05-modules.md
@@ -48,7 +48,7 @@ import { base, assets } from '$app/paths';
 import { getStores, navigating, page, session } from '$app/stores';
 ```
 
-Stores are _contextual_ — they are added to the [context](https://svelte.dev/tutorial/context-api) of your root component. This means that `session` and `route` are unique to each request on the server, rather than shared between multiple requests handled by the same server simultaneously, which is what makes it safe to include user-specific data in `session`.
+Stores are _contextual_ — they are added to the [context](https://svelte.dev/tutorial/context-api) of your root component. This means that `session` and `page` are unique to each request on the server, rather than shared between multiple requests handled by the same server simultaneously, which is what makes it safe to include user-specific data in `session`.
 
 Because of that, the stores are not free-floating objects: they must be accessed during component initialisation, like anything else that would be accessed with `getContext`.
 

From 18382d7ef922798ef416cbd78a5febfebae648ae Mon Sep 17 00:00:00 2001
From: Rich Harris <richard.a.harris@gmail.com>
Date: Thu, 30 Dec 2021 06:05:29 -0500
Subject: [PATCH 44/45] Update documentation/migrating/04-pages.md

---
 documentation/migrating/04-pages.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/documentation/migrating/04-pages.md b/documentation/migrating/04-pages.md
index ef27a63afbab..f06db769e0b9 100644
--- a/documentation/migrating/04-pages.md
+++ b/documentation/migrating/04-pages.md
@@ -35,7 +35,7 @@ const { preloading, page, session } = stores();
 
 The `page` and `session` stores still exist; `preloading` has been replaced with a `navigating` store that contains `from` and `to` properties. `page` now has `url` and `params` properties, but no `path` or `query`.
 
-You access them differently in SvelteKit. `stores` is now `getStores`, but in most cases it is unnecessary since you can import `navigating`, `route` and `session` directly from [`$app/stores`](/docs#modules-$app-stores).
+You access them differently in SvelteKit. `stores` is now `getStores`, but in most cases it is unnecessary since you can import `navigating`, `page` and `session` directly from [`$app/stores`](/docs#modules-$app-stores).
 
 ### Routing
 

From ea413b3798cc1ae80c6c55ee7c34bfa2a01d78ae Mon Sep 17 00:00:00 2001
From: Rich Harris <hello@rich-harris.dev>
Date: Thu, 30 Dec 2021 11:08:42 +0000
Subject: [PATCH 45/45] remove unused code

---
 packages/adapter-node/src/handler.js | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/packages/adapter-node/src/handler.js b/packages/adapter-node/src/handler.js
index 2485622f7727..1bfeecb2b3af 100644
--- a/packages/adapter-node/src/handler.js
+++ b/packages/adapter-node/src/handler.js
@@ -39,14 +39,6 @@ const serve_prerendered = sirv(path.join(__dirname, '/prerendered'), {
 
 /** @type {import('polka').Middleware} */
 const ssr = async (req, res) => {
-	let parsed;
-	try {
-		parsed = new URL(req.url || '', 'http://localhost');
-	} catch (e) {
-		res.statusCode = 400;
-		return res.end('Invalid URL');
-	}
-
 	let body;
 
 	try {