From 5191e165b75f5616bd6b4aadf9d8a6c52e75c562 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sun, 26 Mar 2023 00:50:39 -0700
Subject: [PATCH 01/74] chore(deps): update pnpm to v7.30.3 (#9498)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 38b539a61991..23c7c32b49ce 100644
--- a/package.json
+++ b/package.json
@@ -41,7 +41,7 @@
 		"tiny-glob": "^0.2.9",
 		"typescript": "^4.9.4"
 	},
-	"packageManager": "pnpm@7.30.1",
+	"packageManager": "pnpm@7.30.3",
 	"engines": {
 		"pnpm": "^7.0.0"
 	},

From ae6ddad365cd8046ed4566963a55e379f0cfc8c8 Mon Sep 17 00:00:00 2001
From: Rich Harris <richard.a.harris@gmail.com>
Date: Wed, 29 Mar 2023 07:50:31 -0400
Subject: [PATCH 02/74] fix: make `error.message` enumerable (#9440)

fixes #9010

---------

Co-authored-by: Rich Harris <git@rich-harris.dev>
Co-authored-by: Ben McCann <322311+benmccann@users.noreply.github.com>
---
 .changeset/sharp-trainers-search.md        |  5 +++++
 packages/kit/src/exports/vite/dev/index.js | 11 ++++++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 .changeset/sharp-trainers-search.md

diff --git a/.changeset/sharp-trainers-search.md b/.changeset/sharp-trainers-search.md
new file mode 100644
index 000000000000..0d143f8a4dc8
--- /dev/null
+++ b/.changeset/sharp-trainers-search.md
@@ -0,0 +1,5 @@
+---
+'@sveltejs/kit': patch
+---
+
+fix: make `error.message` enumerable when sending `ssrLoadModule` error to client
diff --git a/packages/kit/src/exports/vite/dev/index.js b/packages/kit/src/exports/vite/dev/index.js
index 1addb038e199..d279e488c5a0 100644
--- a/packages/kit/src/exports/vite/dev/index.js
+++ b/packages/kit/src/exports/vite/dev/index.js
@@ -58,7 +58,16 @@ export async function dev(vite, vite_config, svelte_config) {
 			const msg = buildErrorMessage(err, [colors.red(`Internal server error: ${err.message}`)]);
 
 			vite.config.logger.error(msg, { error: err });
-			vite.ws.send({ type: 'error', err: err });
+			vite.ws.send({
+				type: 'error',
+				err: {
+					...err,
+					// these properties are non-enumerable and will
+					// not be serialized unless we explicitly include them
+					message: err.message,
+					stack: err.stack
+				}
+			});
 
 			throw err;
 		}

From 369e7d6851f543a40c947e033bfc4a9506fdc0a8 Mon Sep 17 00:00:00 2001
From: Hofer Ivan <ivan.hofer@outlook.com>
Date: Thu, 30 Mar 2023 10:37:31 +0200
Subject: [PATCH 03/74] feat: expose stronger typed `SubmitFunction` (#9201)

partially implements #7161

---------

Co-authored-by: Simon H <5968653+dummdidumm@users.noreply.github.com>
---
 .changeset/stupid-trains-push.md              |  5 ++
 .../kit/src/core/sync/write_types/index.js    | 27 +++---
 .../src/core/sync/write_types/index.spec.js   |  1 +
 .../write_types/test/actions/+page.server.js  | 87 +++++++++++++++++++
 packages/kit/types/index.d.ts                 | 10 +--
 5 files changed, 115 insertions(+), 15 deletions(-)
 create mode 100644 .changeset/stupid-trains-push.md
 create mode 100644 packages/kit/src/core/sync/write_types/test/actions/+page.server.js

diff --git a/.changeset/stupid-trains-push.md b/.changeset/stupid-trains-push.md
new file mode 100644
index 000000000000..58f77cd1c2a3
--- /dev/null
+++ b/.changeset/stupid-trains-push.md
@@ -0,0 +1,5 @@
+---
+'@sveltejs/kit': minor
+---
+
+feat: expose stronger typed `SubmitFunction` through `./$types`
diff --git a/packages/kit/src/core/sync/write_types/index.js b/packages/kit/src/core/sync/write_types/index.js
index 0ae180492f12..c1e0c827c825 100644
--- a/packages/kit/src/core/sync/write_types/index.js
+++ b/packages/kit/src/core/sync/write_types/index.js
@@ -390,16 +390,23 @@ function process_node(node, outdir, is_page, proxies, all_pages_have_load = true
 
 		if (is_page) {
 			let type = 'unknown';
-			if (proxy) {
-				if (proxy.exports.includes('actions')) {
-					// If the file wasn't tweaked, we can use the return type of the original file.
-					// The advantage is that type updates are reflected without saving.
-					const from = proxy.modified
-						? `./proxy${replace_ext_with_js(basename)}`
-						: path_to_original(outdir, node.server);
-
-					type = `Expand<Kit.AwaitedActions<typeof import('${from}').actions>> | null`;
-				}
+			if (proxy && proxy.exports.includes('actions')) {
+				// If the file wasn't tweaked, we can use the return type of the original file.
+				// The advantage is that type updates are reflected without saving.
+				const from = proxy.modified
+					? `./proxy${replace_ext_with_js(basename)}`
+					: path_to_original(outdir, node.server);
+
+				exports.push(
+					`type ExcludeActionFailure<T> = T extends Kit.ActionFailure<any> ? never : T extends void ? never : T;`,
+					`type ActionsSuccess<T extends Record<string, (...args: any) => any>> = { [Key in keyof T]: ExcludeActionFailure<Awaited<ReturnType<T[Key]>>>; }[keyof T];`,
+					`type ExtractActionFailure<T> = T extends Kit.ActionFailure<infer X>	? X extends void ? never : X : never;`,
+					`type ActionsFailure<T extends Record<string, (...args: any) => any>> = { [Key in keyof T]: Exclude<ExtractActionFailure<Awaited<ReturnType<T[Key]>>>, void>; }[keyof T];`,
+					`type ActionsExport = typeof import('${from}').actions`,
+					`export type SubmitFunction = Kit.SubmitFunction<Expand<ActionsSuccess<ActionsExport>>, Expand<ActionsFailure<ActionsExport>>>`
+				);
+
+				type = `Expand<Kit.AwaitedActions<ActionsExport>> | null`;
 			}
 			exports.push(`export type ActionData = ${type};`);
 		}
diff --git a/packages/kit/src/core/sync/write_types/index.spec.js b/packages/kit/src/core/sync/write_types/index.spec.js
index 5abb42c6624b..1971a959f6c7 100644
--- a/packages/kit/src/core/sync/write_types/index.spec.js
+++ b/packages/kit/src/core/sync/write_types/index.spec.js
@@ -33,6 +33,7 @@ test('Creates correct $types', async () => {
 	// To safe us from creating a real SvelteKit project for each of the tests,
 	// we first run the type generation directly for each test case, and then
 	// call `tsc` to check that the generated types are valid.
+	await run_test('actions');
 	await run_test('simple-page-shared-only');
 	await run_test('simple-page-server-only');
 	await run_test('simple-page-server-and-shared');
diff --git a/packages/kit/src/core/sync/write_types/test/actions/+page.server.js b/packages/kit/src/core/sync/write_types/test/actions/+page.server.js
new file mode 100644
index 000000000000..46dd8f8f4823
--- /dev/null
+++ b/packages/kit/src/core/sync/write_types/test/actions/+page.server.js
@@ -0,0 +1,87 @@
+import { fail } from '../../../../../../types/internal.js';
+
+let condition = false;
+
+export const actions = {
+	default: () => {
+		if (condition) {
+			return fail(400, {
+				fail: 'oops'
+			});
+		}
+
+		return {
+			success: true
+		};
+	},
+	successWithPayload: () => {
+		return {
+			id: 42,
+			username: 'John Doe',
+			profession: 'Svelte specialist'
+		};
+	},
+	successWithoutPayload: () => {},
+	failWithPayload: () => {
+		return fail(400, {
+			reason: {
+				error: {
+					code: /** @type {const} */ ('VALIDATION_FAILED')
+				}
+			}
+		});
+	},
+	failWithoutPayload: () => {
+		return fail(400);
+	}
+};
+
+/** @type {import('./.svelte-kit/types/src/core/sync/write_types/test/actions/$types').SubmitFunction} */
+const submit = () => {
+	return ({ result }) => {
+		if (result.type === 'success') {
+			// @ts-expect-error does only exist on `failure` result
+			result.data?.fail;
+			// @ts-expect-error unknown property
+			result.data?.something;
+
+			if (result.data && 'success' in result.data) {
+				result.data.success === true;
+				// @ts-expect-error should be of type `boolean`
+				result.data.success === 'success';
+				// @ts-expect-error does not exist in this branch
+				result.data.id;
+			}
+
+			if (result.data && 'id' in result.data) {
+				result.data.id === 42;
+				// @ts-expect-error should be of type `number`
+				result.data.id === 'John';
+				// @ts-expect-error does not exist in this branch
+				result.data.success;
+			}
+		}
+
+		if (result.type === 'failure') {
+			result.data;
+			// @ts-expect-error does only exist on `success` result
+			result.data.success;
+			// @ts-expect-error unknown property
+			result.data.unknown;
+
+			if (result.data && 'fail' in result.data) {
+				result.data.fail === '';
+				// @ts-expect-error does not exist in this branch
+				result.data.reason;
+			}
+
+			if (result.data && 'reason' in result.data) {
+				result.data.reason.error.code === 'VALIDATION_FAILED';
+				// @ts-expect-error should be a const
+				result.data.reason.error.code === '';
+				// @ts-expect-error does not exist in this branch
+				result.data.fail;
+			}
+		}
+	};
+};
diff --git a/packages/kit/types/index.d.ts b/packages/kit/types/index.d.ts
index c2019c4e27b0..19d6c8424f38 100644
--- a/packages/kit/types/index.d.ts
+++ b/packages/kit/types/index.d.ts
@@ -1167,10 +1167,10 @@ export type Actions<
  */
 export type ActionResult<
 	Success extends Record<string, unknown> | undefined = Record<string, any>,
-	Invalid extends Record<string, unknown> | undefined = Record<string, any>
+	Failure extends Record<string, unknown> | undefined = Record<string, any>
 > =
 	| { type: 'success'; status: number; data?: Success }
-	| { type: 'failure'; status: number; data?: Invalid }
+	| { type: 'failure'; status: number; data?: Failure }
 	| { type: 'redirect'; status: number; location: string }
 	| { type: 'error'; status?: number; error: any };
 
@@ -1239,7 +1239,7 @@ export function text(body: string, init?: ResponseInit): Response;
  * @param status The [HTTP status code](https://developer.mozilla.org/en-US/docs/Web/HTTP/Status#client_error_responses). Must be in the range 400-599.
  * @param data Data associated with the failure (e.g. validation errors)
  */
-export function fail<T extends Record<string, unknown> | undefined>(
+export function fail<T extends Record<string, unknown> | undefined = undefined>(
 	status: number,
 	data?: T
 ): ActionFailure<T>;
@@ -1257,7 +1257,7 @@ export interface ActionFailure<T extends Record<string, unknown> | undefined = u
 
 export interface SubmitFunction<
 	Success extends Record<string, unknown> | undefined = Record<string, any>,
-	Invalid extends Record<string, unknown> | undefined = Record<string, any>
+	Failure extends Record<string, unknown> | undefined = Record<string, any>
 > {
 	(input: {
 		action: URL;
@@ -1271,7 +1271,7 @@ export interface SubmitFunction<
 		| ((opts: {
 				form: HTMLFormElement;
 				action: URL;
-				result: ActionResult<Success, Invalid>;
+				result: ActionResult<Success, Failure>;
 				/**
 				 * Call this to get the default behavior of a form submission response.
 				 * @param options Set `reset: false` if you don't want the `<form>` values to be reset after a successful submission.

From 5fa78207b9a5fc2a84919fabc876c0f4e015fe38 Mon Sep 17 00:00:00 2001
From: Bjorn Lu <bjornlu.dev@gmail.com>
Date: Fri, 31 Mar 2023 03:01:10 +0800
Subject: [PATCH 04/74] fix: pass publicDir in ssr (#9565)

---
 .changeset/sharp-wolves-march.md       | 5 +++++
 packages/kit/src/exports/vite/index.js | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 .changeset/sharp-wolves-march.md

diff --git a/.changeset/sharp-wolves-march.md b/.changeset/sharp-wolves-march.md
new file mode 100644
index 000000000000..64aa30be21d3
--- /dev/null
+++ b/.changeset/sharp-wolves-march.md
@@ -0,0 +1,5 @@
+---
+'@sveltejs/kit': patch
+---
+
+fix: pass `publicDir` Vite config in SSR
diff --git a/packages/kit/src/exports/vite/index.js b/packages/kit/src/exports/vite/index.js
index 028d873e3cca..c2a339693909 100644
--- a/packages/kit/src/exports/vite/index.js
+++ b/packages/kit/src/exports/vite/index.js
@@ -564,11 +564,12 @@ function kit({ svelte_config }) {
 							preserveEntrySignatures: 'strict'
 						},
 						ssrEmitAssets: true,
+						copyPublicDir: !ssr,
 						target: ssr ? 'node16.14' : undefined,
 						// don't use the default name to avoid collisions with 'static/manifest.json'
 						manifest: 'vite-manifest.json'
 					},
-					publicDir: ssr ? false : kit.files.assets,
+					publicDir: kit.files.assets,
 					worker: {
 						rollupOptions: {
 							output: {

From 8b127502f725b4ff12ef709e528a70cef7fea570 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 30 Mar 2023 15:07:56 -0400
Subject: [PATCH 05/74] chore(deps): update pnpm to v7.30.5 (#9536)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 23c7c32b49ce..83923a0ee561 100644
--- a/package.json
+++ b/package.json
@@ -41,7 +41,7 @@
 		"tiny-glob": "^0.2.9",
 		"typescript": "^4.9.4"
 	},
-	"packageManager": "pnpm@7.30.3",
+	"packageManager": "pnpm@7.30.5",
 	"engines": {
 		"pnpm": "^7.0.0"
 	},

From cc1d666ee772d07eeb07e39f4fc63185c7f85cc5 Mon Sep 17 00:00:00 2001
From: Simon H <5968653+dummdidumm@users.noreply.github.com>
Date: Thu, 30 Mar 2023 21:12:39 +0200
Subject: [PATCH 06/74] chore: bump site-kit, use new components (#9535)

* chore: bump site-kit, use new components

- removed most of search as it's now part of site-kit
- use new shell/separator components
- adjust NavItem usages

* oops

* oh

* bump, use barrel exports

* fix type usage
---
 pnpm-lock.yaml                                |  14 +-
 sites/kit.svelte.dev/package.json             |   2 +-
 sites/kit.svelte.dev/src/lib/actions/focus.js |  68 ---
 .../src/lib/search/Search.svelte              | 130 ------
 .../src/lib/search/SearchBox.svelte           | 418 ------------------
 .../src/lib/search/SearchResultList.svelte    | 161 -------
 .../src/lib/search/SearchResults.svelte       |  28 --
 sites/kit.svelte.dev/src/lib/search/search.js | 106 -----
 sites/kit.svelte.dev/src/lib/search/stores.js |  31 --
 .../kit.svelte.dev/src/lib/search/types.d.ts  |  13 -
 .../kit.svelte.dev/src/lib/workers/search.js  |  26 --
 .../kit.svelte.dev/src/routes/+layout.svelte  | 154 ++-----
 .../src/routes/content.json/+server.js        |   2 +-
 .../content.json}/content.server.js           |   8 +-
 .../src/routes/docs/+layout.svelte            |   6 +-
 .../src/routes/docs/[slug]/+page.svelte       |   2 +-
 .../src/routes/home/Deployment.svelte         |   2 +-
 .../src/routes/home/Features.svelte           |   2 +-
 .../src/routes/home/Intro.svelte              |   2 +-
 .../src/routes/home/Showcase.svelte           |   2 +-
 .../src/routes/home/Svelte.svelte             |   6 +-
 .../kit.svelte.dev/src/routes/home/Try.svelte |   2 +-
 .../src/routes/search/+page.server.js         |   2 +-
 .../src/routes/search/+page.svelte            |   4 +-
 sites/kit.svelte.dev/vite.config.js           |   7 +
 25 files changed, 80 insertions(+), 1118 deletions(-)
 delete mode 100644 sites/kit.svelte.dev/src/lib/actions/focus.js
 delete mode 100644 sites/kit.svelte.dev/src/lib/search/Search.svelte
 delete mode 100644 sites/kit.svelte.dev/src/lib/search/SearchBox.svelte
 delete mode 100644 sites/kit.svelte.dev/src/lib/search/SearchResultList.svelte
 delete mode 100644 sites/kit.svelte.dev/src/lib/search/SearchResults.svelte
 delete mode 100644 sites/kit.svelte.dev/src/lib/search/search.js
 delete mode 100644 sites/kit.svelte.dev/src/lib/search/stores.js
 delete mode 100644 sites/kit.svelte.dev/src/lib/search/types.d.ts
 delete mode 100644 sites/kit.svelte.dev/src/lib/workers/search.js
 rename sites/kit.svelte.dev/src/{lib/search => routes/content.json}/content.server.js (91%)

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 0c7b645652e2..e730ac26b10e 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -689,7 +689,7 @@ importers:
       '@sveltejs/adapter-vercel': workspace:^
       '@sveltejs/amp': workspace:^
       '@sveltejs/kit': workspace:^
-      '@sveltejs/site-kit': ^3.1.0
+      '@sveltejs/site-kit': ^3.3.6
       '@types/d3-geo': ^3.0.2
       '@types/node': ^16.18.6
       d3-geo: ^3.0.1
@@ -715,7 +715,7 @@ importers:
       '@sveltejs/adapter-vercel': link:../../packages/adapter-vercel
       '@sveltejs/amp': link:../../packages/amp
       '@sveltejs/kit': link:../../packages/kit
-      '@sveltejs/site-kit': 3.1.0
+      '@sveltejs/site-kit': 3.3.6_r4kk7euspt2csvnnykfg5n6pxi
       '@types/d3-geo': 3.0.2
       '@types/node': 16.18.6
       flexsearch: 0.7.31
@@ -1590,8 +1590,14 @@ packages:
       picomatch: 2.3.1
       rollup: 3.7.0
 
-  /@sveltejs/site-kit/3.1.0:
-    resolution: {integrity: sha512-Vv9Efzax+NMRZUfZ9TdUqQYicj2Z3kynLkUUdGPfahjlFEwQ3EGyj1vVCg5jxyqvNUgOsVVUb35nXI5CPsmCfA==}
+  /@sveltejs/site-kit/3.3.6_r4kk7euspt2csvnnykfg5n6pxi:
+    resolution: {integrity: sha512-MUqHseHHFJOT6AcJYTbUqK7hMy1OkBa231tS4TXkmbgQ8EaFVI2unjs9+WY8m3CXASc4p31givOiKVSqtorbbg==}
+    peerDependencies:
+      '@sveltejs/kit': ^1.0.0
+      svelte: ^3.54.0
+    dependencies:
+      '@sveltejs/kit': link:packages\kit
+      svelte: 3.56.0
     dev: true
 
   /@sveltejs/vite-plugin-svelte/2.0.0_svelte@3.56.0+vite@4.2.0:
diff --git a/sites/kit.svelte.dev/package.json b/sites/kit.svelte.dev/package.json
index b6afda661674..3ffcb5c260f4 100644
--- a/sites/kit.svelte.dev/package.json
+++ b/sites/kit.svelte.dev/package.json
@@ -14,7 +14,7 @@
 		"@sveltejs/adapter-vercel": "workspace:^",
 		"@sveltejs/amp": "workspace:^",
 		"@sveltejs/kit": "workspace:^",
-		"@sveltejs/site-kit": "^3.1.0",
+		"@sveltejs/site-kit": "^3.3.6",
 		"@types/d3-geo": "^3.0.2",
 		"@types/node": "^16.18.6",
 		"flexsearch": "^0.7.31",
diff --git a/sites/kit.svelte.dev/src/lib/actions/focus.js b/sites/kit.svelte.dev/src/lib/actions/focus.js
deleted file mode 100644
index b688318bf0ce..000000000000
--- a/sites/kit.svelte.dev/src/lib/actions/focus.js
+++ /dev/null
@@ -1,68 +0,0 @@
-/** @param {HTMLElement} node */
-export function focusable_children(node) {
-	const nodes = Array.from(
-		node.querySelectorAll(
-			'a[href], button, input, textarea, select, details, [tabindex]:not([tabindex="-1"])'
-		)
-	);
-
-	const index = nodes.indexOf(document.activeElement);
-
-	const update = (d) => {
-		let i = index + d;
-		i += nodes.length;
-		i %= nodes.length;
-
-		// @ts-expect-error
-		nodes[i].focus();
-	};
-
-	return {
-		/** @param {string} [selector] */
-		next: (selector) => {
-			const reordered = [...nodes.slice(index + 1), ...nodes.slice(0, index + 1)];
-
-			for (let i = 0; i < reordered.length; i += 1) {
-				if (!selector || reordered[i].matches(selector)) {
-					reordered[i].focus();
-					return;
-				}
-			}
-		},
-		/** @param {string} [selector] */
-		prev: (selector) => {
-			const reordered = [...nodes.slice(index + 1), ...nodes.slice(0, index + 1)];
-
-			for (let i = reordered.length - 2; i >= 0; i -= 1) {
-				if (!selector || reordered[i].matches(selector)) {
-					reordered[i].focus();
-					return;
-				}
-			}
-		},
-		update
-	};
-}
-
-export function trap(node) {
-	const handle_keydown = (e) => {
-		if (e.key === 'Tab') {
-			e.preventDefault();
-
-			const group = focusable_children(node);
-			if (e.shiftKey) {
-				group.prev();
-			} else {
-				group.next();
-			}
-		}
-	};
-
-	node.addEventListener('keydown', handle_keydown);
-
-	return {
-		destroy: () => {
-			node.removeEventListener('keydown', handle_keydown);
-		}
-	};
-}
diff --git a/sites/kit.svelte.dev/src/lib/search/Search.svelte b/sites/kit.svelte.dev/src/lib/search/Search.svelte
deleted file mode 100644
index c5feb5ef8f22..000000000000
--- a/sites/kit.svelte.dev/src/lib/search/Search.svelte
+++ /dev/null
@@ -1,130 +0,0 @@
-<script>
-	import { browser } from '$app/environment';
-	import { searching, query } from './stores.js';
-
-	export let q = '';
-</script>
-
-<form class="search-container" action="/search">
-	<input
-		value={q}
-		on:input={(e) => {
-			$searching = true;
-			$query = e.target.value;
-			e.target.value = '';
-		}}
-		on:mousedown|preventDefault={() => ($searching = true)}
-		on:touchend|preventDefault={() => ($searching = true)}
-		type="search"
-		name="q"
-		placeholder="Search"
-		aria-label="Search"
-		spellcheck="false"
-	/>
-
-	{#if browser}
-		<div class="shortcut">
-			<kbd>{navigator.platform === 'MacIntel' ? '⌘' : 'Ctrl'}</kbd> <kbd>K</kbd>
-		</div>
-	{/if}
-</form>
-
-<style>
-	@keyframes fade-in {
-		from {
-			opacity: 0;
-		}
-		to {
-			opacity: 1;
-		}
-	}
-
-	.search-container {
-		position: relative;
-		display: flex;
-		align-items: center;
-		width: 100%;
-		height: 100%;
-	}
-
-	input {
-		padding: 0.5em 0.5em 0.4em 2em;
-		border: 1px solid var(--sk-back-translucent);
-		font-family: inherit;
-		font-size: 1.4rem;
-		/* text-align: center; */
-		appearance: none;
-		-webkit-appearance: none;
-		width: 100%;
-		height: 3.2rem;
-		border-radius: var(--sk-border-radius);
-		background: no-repeat 1rem 50% / 1em 1em url(../icons/search.svg);
-		color: var(--sk-text-3);
-	}
-
-	input:focus + .shortcut {
-		display: none;
-	}
-
-	input::placeholder {
-		font-size: 1.2rem;
-		text-transform: uppercase;
-	}
-
-	.shortcut {
-		color: var(--sk-text-3);
-		position: absolute;
-		top: calc(50% - 0.9rem);
-		right: 0;
-		width: 100%;
-		text-align: right;
-		pointer-events: none;
-		font-size: 1.2rem;
-		text-transform: uppercase;
-		animation: fade-in 0.2s;
-	}
-
-	kbd {
-		display: none;
-		background: var(--sk-back-2);
-		border: 1px solid var(--sk-back-translucent);
-		padding: 0.2rem 0.2rem 0rem 0.2rem;
-		color: var(--sk-text-3);
-		font-size: inherit;
-		font-family: inherit;
-		border-radius: 2px;
-	}
-
-	@media (min-width: 800px) {
-		.search-container {
-			width: 11rem;
-		}
-
-		.shortcut {
-			padding: 0 1.6rem 0 0;
-		}
-
-		input {
-			border-radius: 1.6rem;
-		}
-
-		input::placeholder {
-			opacity: 0;
-		}
-
-		/* we're using media query as an imperfect proxy for mobile/desktop */
-		kbd {
-			display: inline;
-		}
-	}
-
-	@media (min-width: 960px) {
-		.search-container {
-			width: 19rem;
-		}
-
-		input::placeholder {
-			opacity: 1;
-		}
-	}
-</style>
diff --git a/sites/kit.svelte.dev/src/lib/search/SearchBox.svelte b/sites/kit.svelte.dev/src/lib/search/SearchBox.svelte
deleted file mode 100644
index 841a8be1146d..000000000000
--- a/sites/kit.svelte.dev/src/lib/search/SearchBox.svelte
+++ /dev/null
@@ -1,418 +0,0 @@
-<script>
-	import { onMount } from 'svelte';
-	import Icon from '@sveltejs/site-kit/components/Icon.svelte';
-	import { afterNavigate } from '$app/navigation';
-	import { searching, query, recent } from './stores.js';
-	import { focusable_children, trap } from '../actions/focus.js';
-	import SearchResults from './SearchResults.svelte';
-	import SearchWorker from '$lib/workers/search.js?worker';
-
-	let modal;
-
-	let search = null;
-	let recent_searches = [];
-
-	let worker;
-	let ready = false;
-
-	let uid = 1;
-	const pending = new Set();
-
-	onMount(async () => {
-		worker = new SearchWorker();
-
-		worker.addEventListener('message', (event) => {
-			const { type, payload } = event.data;
-
-			if (type === 'ready') {
-				ready = true;
-			}
-
-			if (type === 'results') {
-				search = payload;
-			}
-
-			if (type === 'recents') {
-				recent_searches = payload;
-			}
-		});
-
-		worker.postMessage({
-			type: 'init',
-			payload: {
-				origin: location.origin
-			}
-		});
-	});
-
-	afterNavigate(() => {
-		// TODO this also needs to apply when only the hash changes
-		// (should before/afterNavigate fire at that time? unclear)
-		close();
-	});
-
-	function close() {
-		if ($searching) {
-			$searching = false;
-			const scroll = -parseInt(document.body.style.top || '0');
-			document.body.style.position = '';
-			document.body.style.top = '';
-			document.body.tabIndex = -1;
-			document.body.focus();
-			document.body.removeAttribute('tabindex');
-			window.scrollTo(0, scroll);
-		}
-
-		search = null;
-	}
-
-	/** @param {string} href */
-	function navigate(href) {
-		$recent = [href, ...$recent.filter((x) => x !== href)];
-		close();
-	}
-
-	$: if (ready) {
-		const id = uid++;
-		pending.add(id);
-
-		worker.postMessage({ type: 'query', id, payload: $query });
-	}
-
-	$: if (ready) {
-		worker.postMessage({ type: 'recents', payload: $recent });
-	}
-
-	$: if ($searching) {
-		document.body.style.top = `-${window.scrollY}px`;
-		document.body.style.position = 'fixed';
-	}
-</script>
-
-<svelte:window
-	on:keydown={(e) => {
-		if (e.key === 'k' && (navigator.platform === 'MacIntel' ? e.metaKey : e.ctrlKey)) {
-			e.preventDefault();
-			$query = '';
-
-			if ($searching) {
-				close();
-			} else {
-				$searching = true;
-			}
-		}
-
-		if (e.code === 'Escape') {
-			close();
-		}
-	}}
-/>
-
-{#if $searching && ready}
-	<div class="modal-background" on:click={close} />
-
-	<div
-		bind:this={modal}
-		class="modal"
-		on:keydown={(e) => {
-			if (e.key === 'ArrowDown' || e.key === 'ArrowUp') {
-				e.preventDefault();
-				const group = focusable_children(e.currentTarget);
-
-				// when using arrow keys (as opposed to tab), don't focus buttons
-				const selector = 'a, input';
-
-				if (e.key === 'ArrowDown') {
-					group.next(selector);
-				} else {
-					group.prev(selector);
-				}
-			}
-		}}
-		use:trap
-	>
-		<div class="search-box">
-			<!-- svelte-ignore a11y-autofocus -->
-			<input
-				autofocus
-				on:keydown={(e) => {
-					if (e.key === 'Enter') {
-						modal.querySelector('a[data-has-node]')?.click();
-					}
-				}}
-				on:input={(e) => {
-					$query = e.target.value;
-				}}
-				value={$query}
-				placeholder="Search"
-				aria-describedby="search-description"
-				aria-label="Search"
-				spellcheck="false"
-			/>
-
-			<button aria-label="Close" on:click={close}>
-				<Icon name="close" />
-			</button>
-
-			<span id="search-description" class="visually-hidden">Results will update as you type</span>
-
-			<div class="results">
-				{#if search?.query}
-					<div class="results-container" on:click={() => ($searching = false)}>
-						<SearchResults
-							results={search.results}
-							query={search.query}
-							on:select={(e) => {
-								navigate(e.detail.href);
-							}}
-						/>
-					</div>
-				{:else}
-					<h2 class="info" class:empty={recent_searches.length === 0}>
-						{recent_searches.length ? 'Recent searches' : 'No recent searches'}
-					</h2>
-					{#if recent_searches.length}
-						<div class="results-container">
-							<ul>
-								{#each recent_searches as search, i}
-									<!-- svelte-ignore a11y-mouse-events-have-key-events -->
-									<li class="recent">
-										<a on:click={() => navigate(search.href)} href={search.href}>
-											<small>{search.breadcrumbs.join('/')}</small>
-											<strong>{search.breadcrumbs.at(-1)}</strong>
-										</a>
-
-										<button
-											aria-label="Delete"
-											on:click={(e) => {
-												$recent = $recent.filter((href) => href !== search.href);
-												e.stopPropagation();
-												e.preventDefault();
-											}}
-										>
-											<Icon name="delete" />
-										</button>
-									</li>
-								{/each}
-							</ul>
-						</div>
-					{/if}
-				{/if}
-			</div>
-		</div>
-	</div>
-{/if}
-
-<div aria-live="assertive" class="visually-hidden">
-	{#if $searching && search?.results.length === 0}
-		<p>No results</p>
-	{/if}
-</div>
-
-<style>
-	input {
-		font-family: inherit;
-		font-size: 1.6rem;
-		width: 100%;
-		padding: 1rem 6rem 0.5rem 1rem;
-		height: 5rem;
-		border: none;
-		border-bottom: 1px solid var(--sk-back-3);
-		font-weight: 600;
-		flex-shrink: 0;
-		background: var(--sk-back-2);
-		color: var(--sk-text-1);
-	}
-
-	input::selection {
-		background-color: var(--sk-back-translucent);
-	}
-
-	input::placeholder {
-		color: var(--sk-text-3);
-		opacity: 0.3;
-	}
-
-	input:focus-visible {
-		background: var(--sk-theme-2);
-		color: white;
-		outline: none;
-	}
-
-	input:focus-visible::placeholder {
-		color: rgba(255, 255, 255, 0.5);
-	}
-
-	button[aria-label='Close'] {
-		--size: 2rem;
-		position: absolute;
-		top: 0;
-		right: 0;
-		width: 5rem;
-		height: 5rem;
-		background: none;
-		color: var(--sk-text-2);
-	}
-
-	button[aria-label='Close']:focus-visible {
-		background: var(--sk-theme-2);
-		color: var(--sk-back-1);
-		outline: none;
-	}
-
-	input:focus-visible + button[aria-label='Close'] {
-		color: var(--sk-back-1);
-	}
-
-	ul {
-		margin: 0;
-	}
-
-	.modal-background,
-	.modal {
-		position: fixed;
-		left: 0;
-		top: 0;
-		width: 100%;
-		height: 100%;
-		z-index: 9999;
-	}
-
-	.modal-background {
-		background: var(--sk-back-1);
-		opacity: 0.7;
-	}
-
-	.modal {
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		pointer-events: none;
-	}
-
-	.search-box {
-		position: relative;
-		height: calc(100% - 2rem);
-		width: calc(100vw - 2rem);
-		max-width: 50rem;
-		max-height: 50rem;
-		filter: drop-shadow(2px 4px 16px rgba(0, 0, 0, 0.2));
-		border-radius: var(--sk-border-radius);
-		display: flex;
-		flex-direction: column;
-		overflow: hidden;
-	}
-
-	.search-box > * {
-		pointer-events: all;
-	}
-
-	.results {
-		overflow: auto;
-		overscroll-behavior-y: none;
-	}
-
-	.results-container {
-		background: var(--sk-back-2);
-		border-radius: 0 0 var(--sk-border-radius) var(--sk-border-radius);
-		pointer-events: all;
-	}
-
-	.info {
-		padding: 1rem;
-		font-size: 1.2rem;
-		font-weight: normal;
-		text-transform: uppercase;
-		background-color: var(--sk-back-2);
-		pointer-events: all;
-	}
-
-	.info.empty {
-		border-radius: 0 0 var(--sk-border-radius) var(--sk-border-radius);
-	}
-
-	a {
-		display: block;
-		text-decoration: none;
-		line-height: 1;
-		padding: 1rem;
-	}
-
-	a:hover {
-		background: rgba(0, 0, 0, 0.05);
-	}
-
-	a:focus {
-		background: var(--sk-theme-2);
-		color: var(--sk-back-1);
-		outline: none;
-	}
-
-	a small,
-	a strong {
-		display: block;
-		white-space: nowrap;
-		overflow: hidden;
-		text-overflow: ellipsis;
-		line-height: 1;
-	}
-
-	a small {
-		font-size: 1rem;
-		text-transform: uppercase;
-		font-weight: 600;
-		color: var(--sk-text-3);
-	}
-
-	a strong {
-		font-size: 1.6rem;
-		color: var(--sk-text-2);
-		margin: 0.4rem 0;
-	}
-
-	a:focus small {
-		color: white;
-		opacity: 0.6;
-	}
-
-	a:focus strong {
-		color: white;
-	}
-
-	a strong :global(mark) {
-		background: var(--sk-theme-2);
-		color: var(--sk-text-3);
-		text-decoration: none;
-		border-radius: 1px;
-	}
-
-	li {
-		position: relative;
-	}
-
-	button[aria-label='Delete'] {
-		position: absolute;
-		top: 0;
-		right: 0;
-		width: 5rem;
-		height: 100%;
-		color: var(--sk-text-2);
-		opacity: 0.1;
-	}
-
-	a:focus + [aria-label='Delete'] {
-		color: var(--sk-back-1);
-	}
-
-	button[aria-label='Delete']:hover {
-		opacity: 1;
-		outline: none;
-	}
-
-	button[aria-label='Delete']:focus-visible {
-		background: var(--sk-theme-2);
-		color: var(--sk-text-1);
-		opacity: 1;
-		outline: none;
-	}
-</style>
diff --git a/sites/kit.svelte.dev/src/lib/search/SearchResultList.svelte b/sites/kit.svelte.dev/src/lib/search/SearchResultList.svelte
deleted file mode 100644
index 2fd143429cf9..000000000000
--- a/sites/kit.svelte.dev/src/lib/search/SearchResultList.svelte
+++ /dev/null
@@ -1,161 +0,0 @@
-<script>
-	import { createEventDispatcher } from 'svelte';
-
-	/** @type {import('./types').Tree[]} */
-	export let results;
-
-	/** @type {string} */
-	export let query;
-
-	const dispatch = createEventDispatcher();
-
-	/** @param {string} text */
-	function escape(text) {
-		return text.replace(/</g, '&lt;').replace(/>/g, '&gt;');
-	}
-
-	/**
-	 * @param {string} content
-	 * @param {string} query
-	 */
-	function excerpt(content, query) {
-		const index = content.toLowerCase().indexOf(query.toLowerCase());
-		if (index === -1) {
-			return escape(content.slice(0, 100));
-		}
-
-		const prefix = index > 20 ? `…${content.slice(index - 15, index)}` : content.slice(0, index);
-		const suffix = content.slice(
-			index + query.length,
-			index + query.length + (80 - (prefix.length + query.length))
-		);
-
-		return (
-			escape(prefix) +
-			`<mark>${escape(content.slice(index, index + query.length))}</mark>` +
-			escape(suffix)
-		);
-	}
-</script>
-
-<ul>
-	{#each results as result (result.href)}
-		<li>
-			<a
-				data-sveltekit-preload-data
-				href={result.href}
-				on:click={() => dispatch('select', { href: result.href })}
-				data-has-node={result.node ? true : undefined}
-			>
-				<strong>{@html excerpt(result.breadcrumbs[result.breadcrumbs.length - 1], query)}</strong>
-
-				{#if result.node?.content}
-					<span>{@html excerpt(result.node.content, query)}</span>
-				{/if}
-			</a>
-
-			{#if result.children.length > 0}
-				<svelte:self results={result.children} {query} on:select />
-			{/if}
-		</li>
-	{/each}
-</ul>
-
-<style>
-	ul {
-		position: relative;
-		margin: 0;
-	}
-
-	ul :global(ul) {
-		margin-left: 0.8em !important;
-		padding-left: 0em;
-		border-left: 1px solid var(--sk-back-5);
-	}
-
-	li {
-		list-style: none;
-		margin-bottom: 1em;
-	}
-
-	li:last-child {
-		margin-bottom: 0;
-	}
-
-	ul ul li {
-		margin: 0;
-	}
-
-	a {
-		display: block;
-		text-decoration: none;
-		line-height: 1;
-		padding: 1rem;
-	}
-
-	a:hover {
-		background: rgba(0, 0, 0, 0.05);
-	}
-
-	a:focus {
-		background: var(--sk-theme-2);
-		color: white;
-		outline: none;
-	}
-
-	a strong,
-	a span {
-		display: block;
-		white-space: nowrap;
-		line-height: 1;
-		overflow: hidden;
-		text-overflow: ellipsis;
-	}
-
-	a strong {
-		font-size: 1.6rem;
-		color: var(--sk-text-2);
-	}
-
-	a span {
-		font-size: 1.2rem;
-		color: #737373;
-		margin: 0.4rem 0 0 0;
-	}
-
-	a :global(mark) {
-		--highlight-color: rgba(255, 255, 0, 0.2);
-	}
-
-	a span :global(mark) {
-		background: none;
-		color: var(--sk-text-1);
-		background: var(--highlight-color);
-		outline: 2px solid var(--highlight-color);
-		border-top: 2px solid var(--highlight-color);
-		/* mix-blend-mode: darken; */
-	}
-
-	a:focus span {
-		color: rgba(255, 255, 255, 0.6);
-	}
-
-	a:focus strong {
-		color: white;
-	}
-
-	a:focus span :global(mark),
-	a:focus strong :global(mark) {
-		--highlight-color: hsl(240, 8%, 54%);
-		mix-blend-mode: lighten;
-		color: white;
-	}
-
-	a strong :global(mark) {
-		color: var(--sk-text-1);
-		background: var(--highlight-color);
-		outline: 2px solid var(--highlight-color);
-		/* border-top: 2px solid var(--highlight-color); */
-		border-radius: 1px;
-	}
-</style>
diff --git a/sites/kit.svelte.dev/src/lib/search/SearchResults.svelte b/sites/kit.svelte.dev/src/lib/search/SearchResults.svelte
deleted file mode 100644
index 43b270e97e56..000000000000
--- a/sites/kit.svelte.dev/src/lib/search/SearchResults.svelte
+++ /dev/null
@@ -1,28 +0,0 @@
-<script>
-	import SearchResultList from './SearchResultList.svelte';
-
-	/** @type {import('./types').Tree[]} */
-	export let results;
-
-	/** @type {string} */
-	export let query;
-</script>
-
-{#if results.length > 0}
-	<SearchResultList {results} {query} on:select />
-{:else if query}
-	<p class="info">No results</p>
-{/if}
-
-<style>
-	.info {
-		padding: 1rem;
-		font-size: 1.2rem;
-		font-weight: normal;
-		text-transform: uppercase;
-		background-color: var(--sk-back-2);
-		border-radius: 0 0 var(--sk-border-radius) var(--sk-border-radius);
-		pointer-events: all;
-		margin: 0;
-	}
-</style>
diff --git a/sites/kit.svelte.dev/src/lib/search/search.js b/sites/kit.svelte.dev/src/lib/search/search.js
deleted file mode 100644
index d4a3f02e32af..000000000000
--- a/sites/kit.svelte.dev/src/lib/search/search.js
+++ /dev/null
@@ -1,106 +0,0 @@
-import flexsearch from 'flexsearch';
-
-// @ts-expect-error
-const Index = /** @type {import('flexsearch').Index} */ (flexsearch.Index) ?? flexsearch;
-
-export let inited = false;
-
-/** @type {import('flexsearch').Index[]} */
-let indexes;
-
-/** @type {Map<string, import('./types').Block>} */
-const map = new Map();
-
-/** @type {Map<string, string>} */
-const hrefs = new Map();
-
-/** @param {import('./types').Block[]} blocks */
-export function init(blocks) {
-	if (inited) return;
-
-	// we have multiple indexes, so we can rank sections (migration guide comes last)
-	const max_rank = Math.max(...blocks.map((block) => block.rank ?? 0));
-
-	indexes = Array.from({ length: max_rank + 1 }, () => new Index({ tokenize: 'forward' }));
-
-	for (const block of blocks) {
-		const title = block.breadcrumbs.at(-1);
-		map.set(block.href, block);
-		// NOTE: we're not using a number as the ID here, but it is recommended:
-		// https://github.com/nextapps-de/flexsearch#use-numeric-ids
-		// If we were to switch to a number we would need a second map from ID to block
-		// We need to keep the existing one to allow looking up recent searches by URL even if docs change
-		// It's unclear how much browsers do string interning and how this might affect memory
-		// We'd probably want to test both implementations across browsers if memory usage becomes an issue
-		// TODO: fix the type by updating flexsearch after
-		// https://github.com/nextapps-de/flexsearch/pull/364 is merged and released
-		indexes[block.rank ?? 0].add(block.href, `${title} ${block.content}`);
-
-		hrefs.set(block.breadcrumbs.join('::'), block.href);
-	}
-
-	inited = true;
-}
-
-/**
- * @param {string} query
- * @returns {import('./types').Block[]}
- */
-export function search(query) {
-	const escaped = query.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, '\\$&');
-	const regex = new RegExp(`(^|\\b)${escaped}`, 'i');
-
-	const blocks = indexes
-		.flatMap((index) => index.search(query))
-		.map(lookup)
-		.map((block, rank) => ({ block, rank }))
-		.sort((a, b) => {
-			const a_title_matches = regex.test(a.block.breadcrumbs.at(-1));
-			const b_title_matches = regex.test(b.block.breadcrumbs.at(-1));
-
-			// massage the order a bit, so that title matches
-			// are given higher priority
-			if (a_title_matches !== b_title_matches) {
-				return a_title_matches ? -1 : 1;
-			}
-
-			return a.block.breadcrumbs.length - b.block.breadcrumbs.length || a.rank - b.rank;
-		})
-		.map(({ block }) => block);
-
-	const results = tree([], blocks).children;
-
-	return results;
-}
-
-/** @param {string} href */
-export function lookup(href) {
-	return map.get(href);
-}
-
-/**
- * @param {string[]} breadcrumbs
- * @param {import('./types').Block[]} blocks
- */
-function tree(breadcrumbs, blocks) {
-	const depth = breadcrumbs.length;
-
-	const node = blocks.find((block) => {
-		if (block.breadcrumbs.length !== depth) return false;
-		return breadcrumbs.every((part, i) => block.breadcrumbs[i] === part);
-	});
-
-	const descendants = blocks.filter((block) => {
-		if (block.breadcrumbs.length <= depth) return false;
-		return breadcrumbs.every((part, i) => block.breadcrumbs[i] === part);
-	});
-
-	const child_parts = Array.from(new Set(descendants.map((block) => block.breadcrumbs[depth])));
-
-	return {
-		breadcrumbs,
-		href: hrefs.get(breadcrumbs.join('::')),
-		node,
-		children: child_parts.map((part) => tree([...breadcrumbs, part], descendants))
-	};
-}
diff --git a/sites/kit.svelte.dev/src/lib/search/stores.js b/sites/kit.svelte.dev/src/lib/search/stores.js
deleted file mode 100644
index cf41f6eea876..000000000000
--- a/sites/kit.svelte.dev/src/lib/search/stores.js
+++ /dev/null
@@ -1,31 +0,0 @@
-import { writable } from 'svelte/store';
-
-export const searching = writable(false);
-export const query = writable('');
-
-/**
- * @param {string} key
- * @param {any} fallback
- */
-function storable(key, fallback) {
-	try {
-		let value = key in localStorage ? JSON.parse(localStorage[key]) : fallback;
-
-		const store = writable(value);
-
-		const set = (new_value) => {
-			store.set((value = new_value));
-			localStorage[key] = JSON.stringify(value);
-		};
-
-		return {
-			subscribe: store.subscribe,
-			set,
-			update: (fn) => set(fn(value))
-		};
-	} catch {
-		return writable(fallback);
-	}
-}
-
-export const recent = storable('recent_searches', []);
diff --git a/sites/kit.svelte.dev/src/lib/search/types.d.ts b/sites/kit.svelte.dev/src/lib/search/types.d.ts
deleted file mode 100644
index fbbbdba23fc5..000000000000
--- a/sites/kit.svelte.dev/src/lib/search/types.d.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-export interface Block {
-	breadcrumbs: string[];
-	href: string;
-	content: string;
-	rank: number;
-}
-
-export interface Tree {
-	breadcrumbs: string[];
-	href: string;
-	node: Block;
-	children: Tree[];
-}
diff --git a/sites/kit.svelte.dev/src/lib/workers/search.js b/sites/kit.svelte.dev/src/lib/workers/search.js
deleted file mode 100644
index 2cb5227745f0..000000000000
--- a/sites/kit.svelte.dev/src/lib/workers/search.js
+++ /dev/null
@@ -1,26 +0,0 @@
-import { init, search, lookup } from '../search/search.js';
-
-addEventListener('message', async (event) => {
-	const { type, payload } = event.data;
-
-	if (type === 'init') {
-		const res = await fetch(`${payload.origin}/content.json`);
-		const { blocks } = await res.json();
-		init(blocks);
-
-		postMessage({ type: 'ready' });
-	}
-
-	if (type === 'query') {
-		const query = payload;
-		const results = search(query);
-
-		postMessage({ type: 'results', payload: { results, query } });
-	}
-
-	if (type === 'recents') {
-		const results = payload.map(lookup).filter(Boolean);
-
-		postMessage({ type: 'recents', payload: results });
-	}
-});
diff --git a/sites/kit.svelte.dev/src/routes/+layout.svelte b/sites/kit.svelte.dev/src/routes/+layout.svelte
index ba071448aff7..c2a4b8c3ffc7 100644
--- a/sites/kit.svelte.dev/src/routes/+layout.svelte
+++ b/sites/kit.svelte.dev/src/routes/+layout.svelte
@@ -1,70 +1,52 @@
 <script>
-	import '@sveltejs/site-kit/styles/index.css';
 	import { browser } from '$app/environment';
 	import { base } from '$app/paths';
-	import { page, navigating } from '$app/stores';
-	import Icon from '@sveltejs/site-kit/components/Icon.svelte';
-	import Icons from '@sveltejs/site-kit/components/Icons.svelte';
-	import Nav from '@sveltejs/site-kit/components/Nav.svelte';
-	import NavItem from '@sveltejs/site-kit/components/NavItem.svelte';
-	import PreloadingIndicator from '@sveltejs/site-kit/components/PreloadingIndicator.svelte';
-	import SkipLink from '@sveltejs/site-kit/components/SkipLink.svelte';
-	import Search from '$lib/search/Search.svelte';
-	import SearchBox from '$lib/search/SearchBox.svelte';
+	import { page } from '$app/stores';
+	import { Icon, Nav, NavItem, Separator, Shell } from '@sveltejs/site-kit/components';
+	import { Search, SearchBox } from '@sveltejs/site-kit/search';
+	import '@sveltejs/site-kit/styles/index.css';
 	import Logo from './home/svelte-logo.svg';
 
 	let banner_height = '48px';
 </script>
 
-<Icons />
-
-{#if $navigating}
-	<PreloadingIndicator />
-{/if}
+<Shell banner_bottom_height={banner_height}>
+	<Nav logo={Logo} slot="top-nav">
+		<svelte:fragment slot="nav-center">
+			{#if $page.url.pathname !== '/search'}
+				<li><Search /></li>
+			{/if}
+		</svelte:fragment>
+
+		<svelte:fragment slot="nav-right">
+			<NavItem
+				selected={$page.url.pathname.startsWith(`${base}/docs`) || undefined}
+				href="{base}/docs">Docs</NavItem
+			>
+			<NavItem
+				selected={$page.url.pathname.startsWith(`${base}/faq`) || undefined}
+				href="{base}/faq">FAQ</NavItem
+			>
+
+			<Separator />
+
+			<NavItem external="https://svelte.dev">Svelte</NavItem>
+
+			<NavItem external="https://svelte.dev/chat" title="Discord Chat">
+				<span slot="small">Discord</span>
+				<Icon name="message-square" />
+			</NavItem>
+
+			<NavItem external="https://github.com/sveltejs/kit" title="GitHub Repo">
+				<span slot="small">GitHub</span>
+				<Icon name="github" />
+			</NavItem>
+		</svelte:fragment>
+	</Nav>
 
-<SkipLink href="#main" />
-
-<Nav {page} logo={Logo}>
-	<svelte:fragment slot="nav-center">
-		{#if $page.url.pathname !== '/search'}
-			<!-- the <Nav> component renders this content inside a <ul>, so
-				we need to wrap it in an <li>. TODO if we adopt this design
-				on other sites, change <Nav> so we don't need to do this -->
-			<li><Search /></li>
-		{/if}
-	</svelte:fragment>
-
-	<svelte:fragment slot="nav-right">
-		<NavItem
-			selected={$page.url.pathname.startsWith(`${base}/docs`) || undefined}
-			href="{base}/docs">Docs</NavItem
-		>
-		<NavItem selected={$page.url.pathname.startsWith(`${base}/faq`) || undefined} href="{base}/faq"
-			>FAQ</NavItem
-		>
-
-		<li aria-hidden="true"><span class="separator" /></li>
-
-		<NavItem external="https://svelte.dev">Svelte</NavItem>
-
-		<NavItem external="https://svelte.dev/chat" title="Discord Chat">
-			<span class="small">Discord</span>
-			<span class="large"><Icon name="message-square" /></span>
-		</NavItem>
-
-		<NavItem external="https://github.com/sveltejs/kit" title="GitHub Repo">
-			<span class="small">GitHub</span>
-			<span class="large"><Icon name="github" /></span>
-		</NavItem>
-	</svelte:fragment>
-</Nav>
-
-<main id="main" style:--banner-footer-height={banner_height}>
 	<slot />
-</main>
 
-{#if banner_height !== '0px'}
-	<div class="banner" style:--banner-footer-height={banner_height}>
+	<div class="banner" slot="banner-bottom">
 		<a target="_blank" rel="noopener noreferrer" href="https://hack.sveltesociety.dev/">
 			<span class="small">
 				<strong>Announcing SvelteHack</strong> Participate →
@@ -75,25 +57,13 @@
 		</a>
 		<button on:click={() => (banner_height = '0px')}> ✕ </button>
 	</div>
-{/if}
+</Shell>
 
 {#if browser}
 	<SearchBox />
 {/if}
 
 <style>
-	:root {
-		--banner-footer-height: 48px;
-	}
-
-	main {
-		position: relative;
-		margin: 0 auto;
-		padding-top: var(--sk-nav-height);
-		padding-bottom: var(--banner-footer-height);
-		overflow: hidden;
-	}
-
 	.small {
 		display: inline;
 	}
@@ -102,15 +72,6 @@
 		display: none;
 	}
 
-	/* duplicating content from <Nav> — bit hacky but will do for now */
-	.separator {
-		display: block;
-		position: relative;
-		height: 1px;
-		margin: 0.5rem 0;
-		background: radial-gradient(circle at center, rgba(0, 0, 0, 0.1), rgba(0, 0, 0, 0.05));
-	}
-
 	@media (min-width: 800px) {
 		.small {
 			display: none;
@@ -119,35 +80,6 @@
 		.large {
 			display: inline;
 		}
-
-		.separator {
-			display: flex;
-			align-items: center;
-			justify-content: center;
-			background: none;
-			height: 100%;
-			margin: 0;
-			border: none;
-			text-align: center;
-		}
-
-		.separator::before {
-			content: '•';
-			margin: 0 0.3rem;
-			color: #ccc;
-		}
-	}
-
-	@media (min-width: 960px) {
-		/* this is an unfortunate hack, but necessary to temporarily avoid
-		breaking changes to site-kit */
-		:global(ul.external) {
-			width: 30rem !important;
-		}
-	}
-
-	:global(body) {
-		font-size: 1.6rem !important;
 	}
 
 	li {
@@ -163,12 +95,6 @@
 		bottom: 0 !important;
 	}
 
-	@media (max-width: 830px) {
-		:global(aside) {
-			z-index: 9999 !important;
-		}
-	}
-
 	.banner {
 		--banner-bg: #ff4700;
 		--banner-color: white;
@@ -182,7 +108,7 @@
 		justify-content: center;
 		bottom: 0;
 		width: 100vw;
-		height: var(--banner-footer-height);
+		height: var(--sk-banner-bottom-height);
 		z-index: 999;
 	}
 
diff --git a/sites/kit.svelte.dev/src/routes/content.json/+server.js b/sites/kit.svelte.dev/src/routes/content.json/+server.js
index a757fd60764a..8807d9481965 100644
--- a/sites/kit.svelte.dev/src/routes/content.json/+server.js
+++ b/sites/kit.svelte.dev/src/routes/content.json/+server.js
@@ -1,4 +1,4 @@
-import { content } from '$lib/search/content.server.js';
+import { content } from './content.server.js';
 import { json } from '@sveltejs/kit';
 
 export const prerender = true;
diff --git a/sites/kit.svelte.dev/src/lib/search/content.server.js b/sites/kit.svelte.dev/src/routes/content.json/content.server.js
similarity index 91%
rename from sites/kit.svelte.dev/src/lib/search/content.server.js
rename to sites/kit.svelte.dev/src/routes/content.json/content.server.js
index 9f51d898163b..281b23038ee9 100644
--- a/sites/kit.svelte.dev/src/lib/search/content.server.js
+++ b/sites/kit.svelte.dev/src/routes/content.json/content.server.js
@@ -1,9 +1,9 @@
 import fs from 'node:fs';
 import path from 'node:path';
 import glob from 'tiny-glob/sync.js';
-import { slugify } from '../docs/server';
-import { extract_frontmatter, transform } from '../docs/server/markdown.js';
-import { replace_placeholders } from '../docs/server/render.js';
+import { slugify } from '$lib/docs/server';
+import { extract_frontmatter, transform } from '$lib/docs/server/markdown.js';
+import { replace_placeholders } from '$lib/docs/server/render.js';
 
 const categories = [
 	{
@@ -20,7 +20,7 @@ const categories = [
 ];
 
 export function content() {
-	/** @type {import('$lib/search/types').Block[]} */
+	/** @type {import('@sveltejs/site-kit/search').Block[]} */
 	const blocks = [];
 
 	for (const category of categories) {
diff --git a/sites/kit.svelte.dev/src/routes/docs/+layout.svelte b/sites/kit.svelte.dev/src/routes/docs/+layout.svelte
index cff5b63c7e52..39d4f8714331 100644
--- a/sites/kit.svelte.dev/src/routes/docs/+layout.svelte
+++ b/sites/kit.svelte.dev/src/routes/docs/+layout.svelte
@@ -45,7 +45,9 @@
 	@media (min-width: 832px) {
 		.toc-container {
 			width: var(--sidebar-width);
-			height: calc(100vh - var(--sk-nav-height) - var(--ts-toggle-height) - var(--banner-footer-height));
+			height: calc(
+				100vh - var(--sk-nav-height) - var(--ts-toggle-height) - var(--sk-banner-bottom-height)
+			);
 			position: fixed;
 			left: 0;
 			top: var(--sk-nav-height);
@@ -70,7 +72,7 @@
 		.ts-toggle {
 			position: fixed;
 			width: var(--sidebar-width);
-			bottom: var(--banner-footer-height);
+			bottom: var(--sk-banner-bottom-height);
 			z-index: 1;
 			margin-right: 0;
 			border-right: 1px solid var(--sk-back-5);
diff --git a/sites/kit.svelte.dev/src/routes/docs/[slug]/+page.svelte b/sites/kit.svelte.dev/src/routes/docs/[slug]/+page.svelte
index 696541b8aa4a..0a0720893626 100644
--- a/sites/kit.svelte.dev/src/routes/docs/[slug]/+page.svelte
+++ b/sites/kit.svelte.dev/src/routes/docs/[slug]/+page.svelte
@@ -1,6 +1,6 @@
 <script>
 	import { page } from '$app/stores';
-	import Icon from '@sveltejs/site-kit/components/Icon.svelte';
+	import { Icon } from '@sveltejs/site-kit/components';
 	import * as hovers from '$lib/docs/client/hovers.js';
 	import OnThisPage from './OnThisPage.svelte';
 
diff --git a/sites/kit.svelte.dev/src/routes/home/Deployment.svelte b/sites/kit.svelte.dev/src/routes/home/Deployment.svelte
index ff6b326ee7be..b7370b30abc5 100644
--- a/sites/kit.svelte.dev/src/routes/home/Deployment.svelte
+++ b/sites/kit.svelte.dev/src/routes/home/Deployment.svelte
@@ -1,5 +1,5 @@
 <script>
-	import Section from '@sveltejs/site-kit/components/Section.svelte';
+	import { Section } from '@sveltejs/site-kit/components';
 	import html5 from './logos/html5.svg';
 	import node from './logos/node.svg';
 	import vercel from './logos/vercel.svg';
diff --git a/sites/kit.svelte.dev/src/routes/home/Features.svelte b/sites/kit.svelte.dev/src/routes/home/Features.svelte
index 151abca905d1..0854a8bb0b11 100644
--- a/sites/kit.svelte.dev/src/routes/home/Features.svelte
+++ b/sites/kit.svelte.dev/src/routes/home/Features.svelte
@@ -1,5 +1,5 @@
 <script>
-	import Section from '@sveltejs/site-kit/components/Section.svelte';
+	import { Section } from '@sveltejs/site-kit/components';
 </script>
 
 <Section --background="var(--sk-back-1)">
diff --git a/sites/kit.svelte.dev/src/routes/home/Intro.svelte b/sites/kit.svelte.dev/src/routes/home/Intro.svelte
index e259c9e4d682..c8b816394d62 100644
--- a/sites/kit.svelte.dev/src/routes/home/Intro.svelte
+++ b/sites/kit.svelte.dev/src/routes/home/Intro.svelte
@@ -1,5 +1,5 @@
 <script>
-	import Section from '@sveltejs/site-kit/components/Section.svelte';
+	import { Section } from '@sveltejs/site-kit/components';
 </script>
 
 <Section --background="var(--sk-back-1)">
diff --git a/sites/kit.svelte.dev/src/routes/home/Showcase.svelte b/sites/kit.svelte.dev/src/routes/home/Showcase.svelte
index 50a60a49132a..d6584461ba5a 100644
--- a/sites/kit.svelte.dev/src/routes/home/Showcase.svelte
+++ b/sites/kit.svelte.dev/src/routes/home/Showcase.svelte
@@ -1,6 +1,6 @@
 <script>
 	import Image from '$lib/Image.svelte';
-	import Section from '@sveltejs/site-kit/components/Section.svelte';
+	import { Section } from '@sveltejs/site-kit/components';
 	import pudding from './showcase/pudding.png';
 	import pocketbase from './showcase/pocketbase.png';
 	import pronauns from './showcase/pronauns.png';
diff --git a/sites/kit.svelte.dev/src/routes/home/Svelte.svelte b/sites/kit.svelte.dev/src/routes/home/Svelte.svelte
index 7f0b44d4cf7c..e896bfbd22ee 100644
--- a/sites/kit.svelte.dev/src/routes/home/Svelte.svelte
+++ b/sites/kit.svelte.dev/src/routes/home/Svelte.svelte
@@ -1,5 +1,5 @@
 <script>
-	import Section from '@sveltejs/site-kit/components/Section.svelte';
+	import { Section } from '@sveltejs/site-kit/components';
 	import Video from './Video.svelte';
 </script>
 
@@ -28,7 +28,9 @@
 			<p>
 				SvelteKit is built on Svelte, a UI framework that uses a compiler to let you write
 				breathtakingly concise components that do minimal work in the browser, using languages you
-				already know — HTML, CSS and JavaScript. <strong>It's a love letter to web development.</strong>
+				already know — HTML, CSS and JavaScript. <strong
+					>It's a love letter to web development.</strong
+				>
 			</p>
 
 			<p>
diff --git a/sites/kit.svelte.dev/src/routes/home/Try.svelte b/sites/kit.svelte.dev/src/routes/home/Try.svelte
index 600d3d15cb0a..cea9e31e0969 100644
--- a/sites/kit.svelte.dev/src/routes/home/Try.svelte
+++ b/sites/kit.svelte.dev/src/routes/home/Try.svelte
@@ -1,5 +1,5 @@
 <script>
-	import Section from '@sveltejs/site-kit/components/Section.svelte';
+	import { Section } from '@sveltejs/site-kit/components';
 </script>
 
 <Section --background="var(--background-2)">
diff --git a/sites/kit.svelte.dev/src/routes/search/+page.server.js b/sites/kit.svelte.dev/src/routes/search/+page.server.js
index 8c703deeca3b..c7cd83244f20 100644
--- a/sites/kit.svelte.dev/src/routes/search/+page.server.js
+++ b/sites/kit.svelte.dev/src/routes/search/+page.server.js
@@ -1,4 +1,4 @@
-import { init, inited, search } from '$lib/search/search.js';
+import { init, inited, search } from '@sveltejs/site-kit/search';
 
 /** @type {import('./$types').PageServerLoad} */
 export async function load({ url, fetch }) {
diff --git a/sites/kit.svelte.dev/src/routes/search/+page.svelte b/sites/kit.svelte.dev/src/routes/search/+page.svelte
index f494432c9261..bad2c3c75eae 100644
--- a/sites/kit.svelte.dev/src/routes/search/+page.svelte
+++ b/sites/kit.svelte.dev/src/routes/search/+page.svelte
@@ -1,7 +1,7 @@
 <script>
-	import SearchResults from '$lib/search/SearchResults.svelte';
+	import { SearchResults } from '@sveltejs/site-kit/search';
 
-	/** @type {import('./$types').Data} */
+	/** @type {import('./$types').PageData} */
 	export let data;
 </script>
 
diff --git a/sites/kit.svelte.dev/vite.config.js b/sites/kit.svelte.dev/vite.config.js
index 174e60bd845c..681a07a035a1 100644
--- a/sites/kit.svelte.dev/vite.config.js
+++ b/sites/kit.svelte.dev/vite.config.js
@@ -26,6 +26,13 @@ const config = {
 		sveltekit()
 	],
 
+	ssr: {
+		noExternal: ['@sveltejs/site-kit']
+	},
+	optimizeDeps: {
+		exclude: ['@sveltejs/site-kit']
+	},
+
 	server: {
 		fs: {
 			strict: false

From 80e95e2600266782689699dc9cc4e1781a45b1d6 Mon Sep 17 00:00:00 2001
From: Daniel Diekmeier <fax@danieldiekmeier.de>
Date: Thu, 30 Mar 2023 21:14:48 +0200
Subject: [PATCH 07/74] fix: balance parentheses in error about wrong content
 type for action (#9513)

* Balance parantheses

* Add changeset

* Update .changeset/unlucky-garlics-yell.md

Co-authored-by: Ben McCann <322311+benmccann@users.noreply.github.com>

---------

Co-authored-by: Ben McCann <322311+benmccann@users.noreply.github.com>
---
 .changeset/unlucky-garlics-yell.md              | 5 +++++
 packages/kit/src/runtime/server/page/actions.js | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 .changeset/unlucky-garlics-yell.md

diff --git a/.changeset/unlucky-garlics-yell.md b/.changeset/unlucky-garlics-yell.md
new file mode 100644
index 000000000000..6bbb023e9972
--- /dev/null
+++ b/.changeset/unlucky-garlics-yell.md
@@ -0,0 +1,5 @@
+---
+'@sveltejs/kit': patch
+---
+
+fix: balance parentheses in error about wrong content type for action
diff --git a/packages/kit/src/runtime/server/page/actions.js b/packages/kit/src/runtime/server/page/actions.js
index ed8b3273fbb9..33dd11170267 100644
--- a/packages/kit/src/runtime/server/page/actions.js
+++ b/packages/kit/src/runtime/server/page/actions.js
@@ -214,7 +214,7 @@ async function call_action(event, actions) {
 
 	if (!is_form_content_type(event.request)) {
 		throw new Error(
-			`Actions expect form-encoded data (received ${event.request.headers.get('content-type')}`
+			`Actions expect form-encoded data (received ${event.request.headers.get('content-type')})`
 		);
 	}
 

From 1d174778fbb9820820adb271847f87c31585bb96 Mon Sep 17 00:00:00 2001
From: Simon H <5968653+dummdidumm@users.noreply.github.com>
Date: Thu, 30 Mar 2023 21:22:43 +0200
Subject: [PATCH 08/74] fix: throw error when file can't be found in Vite
 manifest (#9558)

Prevents an infinite loop which makes debugging such errors harder
---
 .changeset/great-ways-begin.md               | 5 +++++
 packages/kit/src/exports/vite/build/utils.js | 4 +++-
 2 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100644 .changeset/great-ways-begin.md

diff --git a/.changeset/great-ways-begin.md b/.changeset/great-ways-begin.md
new file mode 100644
index 000000000000..4ac14e0bb6a1
--- /dev/null
+++ b/.changeset/great-ways-begin.md
@@ -0,0 +1,5 @@
+---
+'@sveltejs/kit': patch
+---
+
+fix: throw error when file can't be found in Vite manifest
diff --git a/packages/kit/src/exports/vite/build/utils.js b/packages/kit/src/exports/vite/build/utils.js
index 3c1499316212..5a9854a0a88e 100644
--- a/packages/kit/src/exports/vite/build/utils.js
+++ b/packages/kit/src/exports/vite/build/utils.js
@@ -72,7 +72,9 @@ export function find_deps(manifest, entry, add_dynamic_css) {
  */
 export function resolve_symlinks(manifest, file) {
 	while (!manifest[file]) {
-		file = path.relative('.', fs.realpathSync(file));
+		const next = path.relative('.', fs.realpathSync(file));
+		if (next === file) throw new Error(`Could not find file "${file}" in Vite manifest`);
+		file = next;
 	}
 
 	const chunk = manifest[file];

From 6b6f4565c9f1486cb43e921113f145e001078090 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 30 Mar 2023 15:41:47 -0400
Subject: [PATCH 09/74] Version Packages (#9554)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 .changeset/great-ways-begin.md      |  5 -----
 .changeset/sharp-trainers-search.md |  5 -----
 .changeset/sharp-wolves-march.md    |  5 -----
 .changeset/stupid-trains-push.md    |  5 -----
 .changeset/unlucky-garlics-yell.md  |  5 -----
 packages/kit/CHANGELOG.md           | 16 ++++++++++++++++
 packages/kit/package.json           |  2 +-
 7 files changed, 17 insertions(+), 26 deletions(-)
 delete mode 100644 .changeset/great-ways-begin.md
 delete mode 100644 .changeset/sharp-trainers-search.md
 delete mode 100644 .changeset/sharp-wolves-march.md
 delete mode 100644 .changeset/stupid-trains-push.md
 delete mode 100644 .changeset/unlucky-garlics-yell.md

diff --git a/.changeset/great-ways-begin.md b/.changeset/great-ways-begin.md
deleted file mode 100644
index 4ac14e0bb6a1..000000000000
--- a/.changeset/great-ways-begin.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@sveltejs/kit': patch
----
-
-fix: throw error when file can't be found in Vite manifest
diff --git a/.changeset/sharp-trainers-search.md b/.changeset/sharp-trainers-search.md
deleted file mode 100644
index 0d143f8a4dc8..000000000000
--- a/.changeset/sharp-trainers-search.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@sveltejs/kit': patch
----
-
-fix: make `error.message` enumerable when sending `ssrLoadModule` error to client
diff --git a/.changeset/sharp-wolves-march.md b/.changeset/sharp-wolves-march.md
deleted file mode 100644
index 64aa30be21d3..000000000000
--- a/.changeset/sharp-wolves-march.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@sveltejs/kit': patch
----
-
-fix: pass `publicDir` Vite config in SSR
diff --git a/.changeset/stupid-trains-push.md b/.changeset/stupid-trains-push.md
deleted file mode 100644
index 58f77cd1c2a3..000000000000
--- a/.changeset/stupid-trains-push.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@sveltejs/kit': minor
----
-
-feat: expose stronger typed `SubmitFunction` through `./$types`
diff --git a/.changeset/unlucky-garlics-yell.md b/.changeset/unlucky-garlics-yell.md
deleted file mode 100644
index 6bbb023e9972..000000000000
--- a/.changeset/unlucky-garlics-yell.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@sveltejs/kit': patch
----
-
-fix: balance parentheses in error about wrong content type for action
diff --git a/packages/kit/CHANGELOG.md b/packages/kit/CHANGELOG.md
index 5755c1920092..ab93666d5f61 100644
--- a/packages/kit/CHANGELOG.md
+++ b/packages/kit/CHANGELOG.md
@@ -1,5 +1,21 @@
 # @sveltejs/kit
 
+## 1.15.0
+
+### Minor Changes
+
+- feat: expose stronger typed `SubmitFunction` through `./$types` ([#9201](https://github.com/sveltejs/kit/pull/9201))
+
+### Patch Changes
+
+- fix: throw error when file can't be found in Vite manifest ([#9558](https://github.com/sveltejs/kit/pull/9558))
+
+- fix: make `error.message` enumerable when sending `ssrLoadModule` error to client ([#9440](https://github.com/sveltejs/kit/pull/9440))
+
+- fix: pass `publicDir` Vite config in SSR ([#9565](https://github.com/sveltejs/kit/pull/9565))
+
+- fix: balance parentheses in error about wrong content type for action ([#9513](https://github.com/sveltejs/kit/pull/9513))
+
 ## 1.14.0
 
 ### Minor Changes
diff --git a/packages/kit/package.json b/packages/kit/package.json
index c2ba2d410553..a25338248a55 100644
--- a/packages/kit/package.json
+++ b/packages/kit/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@sveltejs/kit",
-	"version": "1.14.0",
+	"version": "1.15.0",
 	"repository": {
 		"type": "git",
 		"url": "https://github.com/sveltejs/kit",

From f818dabfb50744f01b96d1494d8c92f6085bba12 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 3 Apr 2023 21:14:03 -0700
Subject: [PATCH 10/74] chore(deps): update pnpm to v7.31.0 (#9597)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 83923a0ee561..c949c5b93b0b 100644
--- a/package.json
+++ b/package.json
@@ -41,7 +41,7 @@
 		"tiny-glob": "^0.2.9",
 		"typescript": "^4.9.4"
 	},
-	"packageManager": "pnpm@7.30.5",
+	"packageManager": "pnpm@7.31.0",
 	"engines": {
 		"pnpm": "^7.0.0"
 	},

From 0e4b9b1ca85f389e7e74c6d7f41d482fee31a21f Mon Sep 17 00:00:00 2001
From: Bjorn Lu <bjornlu.dev@gmail.com>
Date: Tue, 4 Apr 2023 22:02:32 +0800
Subject: [PATCH 11/74] fix: pin undici to 5.20.0 (#9591)

---
 .changeset/breezy-ravens-think.md |  5 +++++
 packages/kit/package.json         |  2 +-
 pnpm-lock.yaml                    | 10 +++++-----
 renovate.json                     |  3 ++-
 4 files changed, 13 insertions(+), 7 deletions(-)
 create mode 100644 .changeset/breezy-ravens-think.md

diff --git a/.changeset/breezy-ravens-think.md b/.changeset/breezy-ravens-think.md
new file mode 100644
index 000000000000..08e7c76d9dd8
--- /dev/null
+++ b/.changeset/breezy-ravens-think.md
@@ -0,0 +1,5 @@
+---
+'@sveltejs/kit': patch
+---
+
+fix: pin undici to 5.20.0
diff --git a/packages/kit/package.json b/packages/kit/package.json
index a25338248a55..f34377ea8b65 100644
--- a/packages/kit/package.json
+++ b/packages/kit/package.json
@@ -22,7 +22,7 @@
 		"set-cookie-parser": "^2.5.1",
 		"sirv": "^2.0.2",
 		"tiny-glob": "^0.2.9",
-		"undici": "5.21.0"
+		"undici": "5.20.0"
 	},
 	"devDependencies": {
 		"@playwright/test": "^1.29.2",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index e730ac26b10e..6e75250252b6 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -287,7 +287,7 @@ importers:
       svelte-preprocess: ^5.0.0
       tiny-glob: ^0.2.9
       typescript: ^4.9.4
-      undici: 5.21.0
+      undici: 5.20.0
       uvu: ^0.5.6
       vite: ^4.2.0
     dependencies:
@@ -303,7 +303,7 @@ importers:
       set-cookie-parser: 2.5.1
       sirv: 2.0.2
       tiny-glob: 0.2.9
-      undici: 5.21.0
+      undici: 5.20.0
     devDependencies:
       '@playwright/test': 1.29.2
       '@types/connect': 3.4.35
@@ -1596,7 +1596,7 @@ packages:
       '@sveltejs/kit': ^1.0.0
       svelte: ^3.54.0
     dependencies:
-      '@sveltejs/kit': link:packages\kit
+      '@sveltejs/kit': link:packages/kit
       svelte: 3.56.0
     dev: true
 
@@ -5247,8 +5247,8 @@ packages:
       which-boxed-primitive: 1.0.2
     dev: true
 
-  /undici/5.21.0:
-    resolution: {integrity: sha512-HOjK8l6a57b2ZGXOcUsI5NLfoTrfmbOl90ixJDl0AEFG4wgHNDQxtZy15/ZQp7HhjkpaGlp/eneMgtsu1dIlUA==}
+  /undici/5.20.0:
+    resolution: {integrity: sha512-J3j60dYzuo6Eevbawwp1sdg16k5Tf768bxYK4TUJRH7cBM4kFCbf3mOnM/0E3vQYXvpxITbbWmBafaDbxLDz3g==}
     engines: {node: '>=12.18'}
     dependencies:
       busboy: 1.6.0
diff --git a/renovate.json b/renovate.json
index 92b4007e75b4..8247f8fae8cc 100644
--- a/renovate.json
+++ b/renovate.json
@@ -12,7 +12,8 @@
 	"ignoreDeps": [
 		"esbuild",
 		"rollup",
-		"typescript"
+		"typescript",
+		"undici"
 	],
 	"ignorePaths": [
 		"**/create-svelte/shared/**",

From bb2253d51d00aba2e4353952d4fb0dcde6c77123 Mon Sep 17 00:00:00 2001
From: Ben McCann <322311+benmccann@users.noreply.github.com>
Date: Tue, 4 Apr 2023 10:42:00 -0700
Subject: [PATCH 12/74] Merge pull request from GHSA-5p75-vc5g-8rv2

* fix: address security advisory CVE-2023-29003 by enabling CSRF protection for plain/text requests

* Protect PUT/PATCH/DELETE. Add comment explicitly mentioning CSRF

* update docs

* update changeset

* Update packages/kit/types/index.d.ts

Co-authored-by: Conduitry <git@chor.date>

* Update packages/kit/types/index.d.ts

* Update cool-lies-fly.md

* Update packages/kit/src/utils/http.js

Co-authored-by: Dominik G. <dominik.goepel@gmx.de>

* Update packages/kit/types/index.d.ts

Co-authored-by: Dominik G. <dominik.goepel@gmx.de>

* test(csrf): include additional methods and content-types

---------

Co-authored-by: Conduitry <git@chor.date>
Co-authored-by: Dominik G. <dominik.goepel@gmx.de>
---
 .changeset/cool-lies-fly.md                   |  5 ++++
 packages/kit/src/runtime/server/respond.js    |  9 ++++--
 packages/kit/src/utils/http.js                |  9 +++++-
 .../kit/test/apps/basics/test/server.test.js  | 28 +++++++++++++------
 packages/kit/types/index.d.ts                 |  6 ++--
 5 files changed, 42 insertions(+), 15 deletions(-)
 create mode 100644 .changeset/cool-lies-fly.md

diff --git a/.changeset/cool-lies-fly.md b/.changeset/cool-lies-fly.md
new file mode 100644
index 000000000000..028deaf1579e
--- /dev/null
+++ b/.changeset/cool-lies-fly.md
@@ -0,0 +1,5 @@
+---
+'@sveltejs/kit': patch
+---
+
+fix: address security advisory CVE-2023-29003 by including `text/plain` and `PUT`/`PATCH`/`DELETE` requests in set of blocked cross-origin requests for CSRF protection
diff --git a/packages/kit/src/runtime/server/respond.js b/packages/kit/src/runtime/server/respond.js
index 13d89588adca..f48bffefe849 100644
--- a/packages/kit/src/runtime/server/respond.js
+++ b/packages/kit/src/runtime/server/respond.js
@@ -51,9 +51,12 @@ export async function respond(request, options, manifest, state) {
 
 	if (options.csrf_check_origin) {
 		const forbidden =
-			request.method === 'POST' &&
-			request.headers.get('origin') !== url.origin &&
-			is_form_content_type(request);
+			is_form_content_type(request) &&
+			(request.method === 'POST' ||
+				request.method === 'PUT' ||
+				request.method === 'PATCH' ||
+				request.method === 'DELETE') &&
+			request.headers.get('origin') !== url.origin;
 
 		if (forbidden) {
 			const csrf_error = error(403, `Cross-site ${request.method} form submissions are forbidden`);
diff --git a/packages/kit/src/utils/http.js b/packages/kit/src/utils/http.js
index 31721d10cc4a..f5bdf2ccff7c 100644
--- a/packages/kit/src/utils/http.js
+++ b/packages/kit/src/utils/http.js
@@ -68,5 +68,12 @@ export function is_content_type(request, ...types) {
  * @param {Request} request
  */
 export function is_form_content_type(request) {
-	return is_content_type(request, 'application/x-www-form-urlencoded', 'multipart/form-data');
+	// These content types must be protected against CSRF
+	// https://developer.mozilla.org/en-US/docs/Web/API/HTMLFormElement/enctype
+	return is_content_type(
+		request,
+		'application/x-www-form-urlencoded',
+		'multipart/form-data',
+		'text/plain'
+	);
 }
diff --git a/packages/kit/test/apps/basics/test/server.test.js b/packages/kit/test/apps/basics/test/server.test.js
index f466878de0ba..ce31f520f98c 100644
--- a/packages/kit/test/apps/basics/test/server.test.js
+++ b/packages/kit/test/apps/basics/test/server.test.js
@@ -58,15 +58,27 @@ test.describe('Cookies', () => {
 
 test.describe('CSRF', () => {
 	test('Blocks requests with incorrect origin', async ({ baseURL }) => {
-		const res = await fetch(`${baseURL}/csrf`, {
-			method: 'POST',
-			headers: {
-				'content-type': 'application/x-www-form-urlencoded'
+		const content_types = [
+			'application/x-www-form-urlencoded',
+			'multipart/form-data',
+			'text/plain'
+		];
+		const methods = ['POST', 'PUT', 'PATCH', 'DELETE'];
+		for (const method of methods) {
+			for (const content_type of content_types) {
+				const res = await fetch(`${baseURL}/csrf`, {
+					method,
+					headers: {
+						'content-type': content_type
+					}
+				});
+				const message = `request method: ${method}, content-type: ${content_type}`;
+				expect(res.status, message).toBe(403);
+				expect(await res.text(), message).toBe(
+					`Cross-site ${method} form submissions are forbidden`
+				);
 			}
-		});
-
-		expect(res.status).toBe(403);
-		expect(await res.text()).toBe('Cross-site POST form submissions are forbidden');
+		}
 	});
 });
 
diff --git a/packages/kit/types/index.d.ts b/packages/kit/types/index.d.ts
index 19d6c8424f38..e3af084e6261 100644
--- a/packages/kit/types/index.d.ts
+++ b/packages/kit/types/index.d.ts
@@ -328,13 +328,13 @@ export interface KitConfig {
 		reportOnly?: CspDirectives;
 	};
 	/**
-	 * Protection against [cross-site request forgery](https://owasp.org/www-community/attacks/csrf) attacks.
+	 * Protection against [cross-site request forgery (CSRF)](https://owasp.org/www-community/attacks/csrf) attacks.
 	 */
 	csrf?: {
 		/**
-		 * Whether to check the incoming `origin` header for `POST` form submissions and verify that it matches the server's origin.
+		 * Whether to check the incoming `origin` header for `POST`, `PUT`, `PATCH`, or `DELETE` form submissions and verify that it matches the server's origin.
 		 *
-		 * To allow people to make `POST` form submissions to your app from other origins, you will need to disable this option. Be careful!
+		 * To allow people to make `POST`, `PUT`, `PATCH`, or `DELETE` requests with a `Content-Type` of `application/x-www-form-urlencoded`, `multipart/form-data`, or `text/plain` to your app from other origins, you will need to disable this option. Be careful!
 		 * @default true
 		 */
 		checkOrigin?: boolean;

From c226f4f36cb5770b090f08ac2469595525b58784 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 4 Apr 2023 11:00:26 -0700
Subject: [PATCH 13/74] Version Packages (#9599)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 .changeset/breezy-ravens-think.md | 5 -----
 .changeset/cool-lies-fly.md       | 5 -----
 packages/kit/CHANGELOG.md         | 8 ++++++++
 packages/kit/package.json         | 2 +-
 4 files changed, 9 insertions(+), 11 deletions(-)
 delete mode 100644 .changeset/breezy-ravens-think.md
 delete mode 100644 .changeset/cool-lies-fly.md

diff --git a/.changeset/breezy-ravens-think.md b/.changeset/breezy-ravens-think.md
deleted file mode 100644
index 08e7c76d9dd8..000000000000
--- a/.changeset/breezy-ravens-think.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@sveltejs/kit': patch
----
-
-fix: pin undici to 5.20.0
diff --git a/.changeset/cool-lies-fly.md b/.changeset/cool-lies-fly.md
deleted file mode 100644
index 028deaf1579e..000000000000
--- a/.changeset/cool-lies-fly.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@sveltejs/kit': patch
----
-
-fix: address security advisory CVE-2023-29003 by including `text/plain` and `PUT`/`PATCH`/`DELETE` requests in set of blocked cross-origin requests for CSRF protection
diff --git a/packages/kit/CHANGELOG.md b/packages/kit/CHANGELOG.md
index ab93666d5f61..d63a6f4f8fd7 100644
--- a/packages/kit/CHANGELOG.md
+++ b/packages/kit/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @sveltejs/kit
 
+## 1.15.1
+
+### Patch Changes
+
+- fix: pin undici to 5.20.0 ([#9591](https://github.com/sveltejs/kit/pull/9591))
+
+- fix: address security advisory CVE-2023-29003 by including `text/plain` and `PUT`/`PATCH`/`DELETE` requests in set of blocked cross-origin requests for CSRF protection ([`bb2253d5`](https://github.com/sveltejs/kit/commit/bb2253d51d00aba2e4353952d4fb0dcde6c77123))
+
 ## 1.15.0
 
 ### Minor Changes
diff --git a/packages/kit/package.json b/packages/kit/package.json
index f34377ea8b65..5d091a475afd 100644
--- a/packages/kit/package.json
+++ b/packages/kit/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@sveltejs/kit",
-	"version": "1.15.0",
+	"version": "1.15.1",
 	"repository": {
 		"type": "git",
 		"url": "https://github.com/sveltejs/kit",

From a3fc44faca0277ac832f781e60c715e35de2b864 Mon Sep 17 00:00:00 2001
From: Ben McCann <322311+benmccann@users.noreply.github.com>
Date: Tue, 4 Apr 2023 11:09:46 -0700
Subject: [PATCH 14/74] chore: update changelog with published CVE

---
 packages/kit/CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/kit/CHANGELOG.md b/packages/kit/CHANGELOG.md
index d63a6f4f8fd7..75dd6aec8556 100644
--- a/packages/kit/CHANGELOG.md
+++ b/packages/kit/CHANGELOG.md
@@ -6,7 +6,7 @@
 
 - fix: pin undici to 5.20.0 ([#9591](https://github.com/sveltejs/kit/pull/9591))
 
-- fix: address security advisory CVE-2023-29003 by including `text/plain` and `PUT`/`PATCH`/`DELETE` requests in set of blocked cross-origin requests for CSRF protection ([`bb2253d5`](https://github.com/sveltejs/kit/commit/bb2253d51d00aba2e4353952d4fb0dcde6c77123))
+- fix: address security advisory [CVE-2023-29003](https://github.com/sveltejs/kit/security/advisories/GHSA-5p75-vc5g-8rv2) by including `text/plain` and `PUT`/`PATCH`/`DELETE` requests in set of blocked cross-origin requests for CSRF protection ([`bb2253d5`](https://github.com/sveltejs/kit/commit/bb2253d51d00aba2e4353952d4fb0dcde6c77123))
 
 ## 1.15.0
 

From 23d8327e2559cd43f996ee61e10e99bd62f1002b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jacob=20St=C3=B8rdahl?= <jacob@stordahl.dev>
Date: Wed, 5 Apr 2023 03:53:35 -0500
Subject: [PATCH 15/74] fix(create): exclude tests in package.template.json
 (#9584)

* fix(create): exclude tests in package.template.json

* fix: tweak package.template.json

* chore: add changeset

* chore: fix changeset

* Update .changeset/large-pandas-swim.md

---------

Co-authored-by: Simon H <5968653+dummdidumm@users.noreply.github.com>
---
 .changeset/large-pandas-swim.md                              | 5 +++++
 .../templates/skeletonlib/package.template.json              | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 .changeset/large-pandas-swim.md

diff --git a/.changeset/large-pandas-swim.md b/.changeset/large-pandas-swim.md
new file mode 100644
index 000000000000..ab740b707ceb
--- /dev/null
+++ b/.changeset/large-pandas-swim.md
@@ -0,0 +1,5 @@
+---
+'create-svelte': minor
+---
+
+feat: ignore test files in library skeleton package.json
diff --git a/packages/create-svelte/templates/skeletonlib/package.template.json b/packages/create-svelte/templates/skeletonlib/package.template.json
index c65e7f73151c..80bb91ee6b29 100644
--- a/packages/create-svelte/templates/skeletonlib/package.template.json
+++ b/packages/create-svelte/templates/skeletonlib/package.template.json
@@ -14,7 +14,7 @@
 			"svelte": "./dist/index.js"
 		}
 	},
-	"files": ["dist"],
+	"files": ["dist", "!dist/**/*.test.*", "!dist/**/*.spec.*"],
 	"peerDependencies": {
 		"svelte": "^3.54.0"
 	},

From ba436c6685e751d968a960fbda65f24cf7a82e9f Mon Sep 17 00:00:00 2001
From: Ben McCann <322311+benmccann@users.noreply.github.com>
Date: Thu, 6 Apr 2023 08:45:55 -0700
Subject: [PATCH 16/74] Merge pull request from GHSA-gv7g-x59x-wf8f

* fix: do a case-insensitive comparison when checking header value

* changeset

* remove export

* Update .changeset/happy-pots-move.md
---
 .changeset/happy-pots-move.md                     | 5 +++++
 packages/kit/src/utils/http.js                    | 4 ++--
 packages/kit/test/apps/basics/test/server.test.js | 3 ++-
 3 files changed, 9 insertions(+), 3 deletions(-)
 create mode 100644 .changeset/happy-pots-move.md

diff --git a/.changeset/happy-pots-move.md b/.changeset/happy-pots-move.md
new file mode 100644
index 000000000000..506c34b1c97a
--- /dev/null
+++ b/.changeset/happy-pots-move.md
@@ -0,0 +1,5 @@
+---
+'@sveltejs/kit': patch
+---
+
+fix: address security advisory CVE-2023-29008 by doing a case-insensitive comparison when checking header value
diff --git a/packages/kit/src/utils/http.js b/packages/kit/src/utils/http.js
index f5bdf2ccff7c..739993449579 100644
--- a/packages/kit/src/utils/http.js
+++ b/packages/kit/src/utils/http.js
@@ -59,9 +59,9 @@ export function negotiate(accept, types) {
  * @param {Request} request
  * @param  {...string} types
  */
-export function is_content_type(request, ...types) {
+function is_content_type(request, ...types) {
 	const type = request.headers.get('content-type')?.split(';', 1)[0].trim() ?? '';
-	return types.includes(type);
+	return types.includes(type.toLowerCase());
 }
 
 /**
diff --git a/packages/kit/test/apps/basics/test/server.test.js b/packages/kit/test/apps/basics/test/server.test.js
index ce31f520f98c..d6fc639abbbd 100644
--- a/packages/kit/test/apps/basics/test/server.test.js
+++ b/packages/kit/test/apps/basics/test/server.test.js
@@ -61,7 +61,8 @@ test.describe('CSRF', () => {
 		const content_types = [
 			'application/x-www-form-urlencoded',
 			'multipart/form-data',
-			'text/plain'
+			'text/plain',
+			'text/plaiN'
 		];
 		const methods = ['POST', 'PUT', 'PATCH', 'DELETE'];
 		for (const method of methods) {

From ffd918f406ecd5a73d28cbadff7f344ea97dfed6 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 6 Apr 2023 09:21:57 -0700
Subject: [PATCH 17/74] Version Packages (#9601)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 .changeset/happy-pots-move.md       | 5 -----
 .changeset/large-pandas-swim.md     | 5 -----
 packages/create-svelte/CHANGELOG.md | 6 ++++++
 packages/create-svelte/package.json | 2 +-
 packages/kit/CHANGELOG.md           | 6 ++++++
 packages/kit/package.json           | 2 +-
 6 files changed, 14 insertions(+), 12 deletions(-)
 delete mode 100644 .changeset/happy-pots-move.md
 delete mode 100644 .changeset/large-pandas-swim.md

diff --git a/.changeset/happy-pots-move.md b/.changeset/happy-pots-move.md
deleted file mode 100644
index 506c34b1c97a..000000000000
--- a/.changeset/happy-pots-move.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@sveltejs/kit': patch
----
-
-fix: address security advisory CVE-2023-29008 by doing a case-insensitive comparison when checking header value
diff --git a/.changeset/large-pandas-swim.md b/.changeset/large-pandas-swim.md
deleted file mode 100644
index ab740b707ceb..000000000000
--- a/.changeset/large-pandas-swim.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'create-svelte': minor
----
-
-feat: ignore test files in library skeleton package.json
diff --git a/packages/create-svelte/CHANGELOG.md b/packages/create-svelte/CHANGELOG.md
index 3acf1bfb6746..a36cbac672f9 100644
--- a/packages/create-svelte/CHANGELOG.md
+++ b/packages/create-svelte/CHANGELOG.md
@@ -1,5 +1,11 @@
 # create-svelte
 
+## 3.3.0
+
+### Minor Changes
+
+- feat: ignore test files in library skeleton package.json ([#9584](https://github.com/sveltejs/kit/pull/9584))
+
 ## 3.2.0
 
 ### Minor Changes
diff --git a/packages/create-svelte/package.json b/packages/create-svelte/package.json
index 1c0139f4ba68..78b7d4e7781d 100644
--- a/packages/create-svelte/package.json
+++ b/packages/create-svelte/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "create-svelte",
-	"version": "3.2.0",
+	"version": "3.3.0",
 	"repository": {
 		"type": "git",
 		"url": "https://github.com/sveltejs/kit",
diff --git a/packages/kit/CHANGELOG.md b/packages/kit/CHANGELOG.md
index 75dd6aec8556..6b17cbac212c 100644
--- a/packages/kit/CHANGELOG.md
+++ b/packages/kit/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @sveltejs/kit
 
+## 1.15.2
+
+### Patch Changes
+
+- fix: address security advisory CVE-2023-29008 by doing a case-insensitive comparison when checking header value ([`ba436c66`](https://github.com/sveltejs/kit/commit/ba436c6685e751d968a960fbda65f24cf7a82e9f))
+
 ## 1.15.1
 
 ### Patch Changes
diff --git a/packages/kit/package.json b/packages/kit/package.json
index 5d091a475afd..54596a596224 100644
--- a/packages/kit/package.json
+++ b/packages/kit/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@sveltejs/kit",
-	"version": "1.15.1",
+	"version": "1.15.2",
 	"repository": {
 		"type": "git",
 		"url": "https://github.com/sveltejs/kit",

From 04837c02645cfccb95a107772f56610649783722 Mon Sep 17 00:00:00 2001
From: Ben McCann <322311+benmccann@users.noreply.github.com>
Date: Thu, 6 Apr 2023 13:25:43 -0700
Subject: [PATCH 18/74] docs: update changelog with link to security advisory

---
 packages/kit/CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/kit/CHANGELOG.md b/packages/kit/CHANGELOG.md
index 6b17cbac212c..53d4f1934601 100644
--- a/packages/kit/CHANGELOG.md
+++ b/packages/kit/CHANGELOG.md
@@ -4,7 +4,7 @@
 
 ### Patch Changes
 
-- fix: address security advisory CVE-2023-29008 by doing a case-insensitive comparison when checking header value ([`ba436c66`](https://github.com/sveltejs/kit/commit/ba436c6685e751d968a960fbda65f24cf7a82e9f))
+- fix: address security advisory [CVE-2023-29008](https://github.com/sveltejs/kit/security/advisories/GHSA-gv7g-x59x-wf8f) by doing a case-insensitive comparison when checking header value ([`ba436c66`](https://github.com/sveltejs/kit/commit/ba436c6685e751d968a960fbda65f24cf7a82e9f))
 
 ## 1.15.1
 

From 118ce5a07a3a984353c3fc858b34c67e9e560fa0 Mon Sep 17 00:00:00 2001
From: Ben McCann <322311+benmccann@users.noreply.github.com>
Date: Sat, 8 Apr 2023 20:18:36 -0700
Subject: [PATCH 19/74] fix: update broken link in error message

---
 .changeset/loud-drinks-sort.md   | 5 +++++
 packages/adapter-static/index.js | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 .changeset/loud-drinks-sort.md

diff --git a/.changeset/loud-drinks-sort.md b/.changeset/loud-drinks-sort.md
new file mode 100644
index 000000000000..74ea89ece6cc
--- /dev/null
+++ b/.changeset/loud-drinks-sort.md
@@ -0,0 +1,5 @@
+---
+'@sveltejs/adapter-static': patch
+---
+
+fix: update broken link in error message
diff --git a/packages/adapter-static/index.js b/packages/adapter-static/index.js
index c151afc2c921..f2db6ae30449 100644
--- a/packages/adapter-static/index.js
+++ b/packages/adapter-static/index.js
@@ -25,7 +25,7 @@ export default function (options) {
 ${builder.routes.map((route) => `  - ${path.posix.join(prefix, route.id)}`).join('\n')}
 
 You have the following options:
-  - set the \`fallback\` option — see https://github.com/sveltejs/kit/tree/master/packages/adapter-static#spa-mode for more info.
+  - set the \`fallback\` option — see https://kit.svelte.dev/docs/single-page-apps#usage for more info.
   - add \`export const prerender = true\` to your root \`+layout.js/.ts\` or \`+layout.server.js/.ts\` file. This will try to prerender all pages.
   - add \`export const prerender = true\` to any \`+server.js/ts\` files that are not fetched by page \`load\` functions.
 ${config_option}

From 748a8720fea8ea938576041207b81e19bb8f7dff Mon Sep 17 00:00:00 2001
From: Tee Ming <chewteeming01@gmail.com>
Date: Sun, 9 Apr 2023 12:02:46 +0800
Subject: [PATCH 20/74] fix: prevent duplicate CSS files after build (#9382)

Co-authored-by: Bjorn Lu <bjornlu.dev@gmail.com>
Co-authored-by: Ben McCann <322311+benmccann@users.noreply.github.com>
---
 .changeset/swift-camels-explain.md     | 5 +++++
 packages/kit/src/exports/vite/index.js | 9 +++++----
 2 files changed, 10 insertions(+), 4 deletions(-)
 create mode 100644 .changeset/swift-camels-explain.md

diff --git a/.changeset/swift-camels-explain.md b/.changeset/swift-camels-explain.md
new file mode 100644
index 000000000000..f7e4f7abcb64
--- /dev/null
+++ b/.changeset/swift-camels-explain.md
@@ -0,0 +1,5 @@
+---
+"@sveltejs/kit": patch
+---
+
+fix: prevent building duplicate CSS files
diff --git a/packages/kit/src/exports/vite/index.js b/packages/kit/src/exports/vite/index.js
index c2a339693909..d991db412fc7 100644
--- a/packages/kit/src/exports/vite/index.js
+++ b/packages/kit/src/exports/vite/index.js
@@ -550,7 +550,11 @@ function kit({ svelte_config }) {
 				new_config = {
 					base: ssr ? assets_base(kit) : './',
 					build: {
+						copyPublicDir: !ssr,
 						cssCodeSplit: true,
+						cssMinify: initial_config.build?.minify == null ? true : !!initial_config.build.minify,
+						// don't use the default name to avoid collisions with 'static/manifest.json'
+						manifest: 'vite-manifest.json',
 						outDir: `${out}/${ssr ? 'server' : 'client'}`,
 						rollupOptions: {
 							input,
@@ -564,10 +568,7 @@ function kit({ svelte_config }) {
 							preserveEntrySignatures: 'strict'
 						},
 						ssrEmitAssets: true,
-						copyPublicDir: !ssr,
-						target: ssr ? 'node16.14' : undefined,
-						// don't use the default name to avoid collisions with 'static/manifest.json'
-						manifest: 'vite-manifest.json'
+						target: ssr ? 'node16.14' : undefined
 					},
 					publicDir: kit.files.assets,
 					worker: {

From 6554cce7c02e61e1b97a9379f7108f765ac170b0 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 10 Apr 2023 11:15:09 -0700
Subject: [PATCH 21/74] chore(deps): update pnpm to v7.32.0 (#9626)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index c949c5b93b0b..4376af29ba0a 100644
--- a/package.json
+++ b/package.json
@@ -41,7 +41,7 @@
 		"tiny-glob": "^0.2.9",
 		"typescript": "^4.9.4"
 	},
-	"packageManager": "pnpm@7.31.0",
+	"packageManager": "pnpm@7.32.0",
 	"engines": {
 		"pnpm": "^7.0.0"
 	},

From 4c04590dd700f4af4012dc6d9ab0d2f1ae658fb3 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 10 Apr 2023 11:15:28 -0700
Subject: [PATCH 22/74] chore(deps): update dependency rimraf to v5 (#9627)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 packages/adapter-netlify/package.json      |  2 +-
 packages/adapter-node/package.json         |  2 +-
 packages/kit/test/apps/basics/package.json |  2 +-
 packages/kit/test/apps/writes/package.json |  2 +-
 pnpm-lock.yaml                             | 57 ++++++++++++++++++----
 5 files changed, 51 insertions(+), 14 deletions(-)

diff --git a/packages/adapter-netlify/package.json b/packages/adapter-netlify/package.json
index 9708d4c44221..04955f1d286c 100644
--- a/packages/adapter-netlify/package.json
+++ b/packages/adapter-netlify/package.json
@@ -44,7 +44,7 @@
 		"@sveltejs/kit": "workspace:^",
 		"@types/node": "^16.18.6",
 		"@types/set-cookie-parser": "^2.4.2",
-		"rimraf": "^4.0.0",
+		"rimraf": "^5.0.0",
 		"rollup": "^3.7.0",
 		"typescript": "^4.9.4",
 		"uvu": "^0.5.6"
diff --git a/packages/adapter-node/package.json b/packages/adapter-node/package.json
index 74b13b0ab978..0a37881d817c 100644
--- a/packages/adapter-node/package.json
+++ b/packages/adapter-node/package.json
@@ -37,7 +37,7 @@
 		"@types/node": "^16.18.6",
 		"c8": "^7.12.0",
 		"polka": "^1.0.0-next.22",
-		"rimraf": "^4.0.0",
+		"rimraf": "^5.0.0",
 		"sirv": "^2.0.2",
 		"typescript": "^4.9.4",
 		"uvu": "^0.5.6"
diff --git a/packages/kit/test/apps/basics/package.json b/packages/kit/test/apps/basics/package.json
index cf6beb03aeec..038408b260c0 100644
--- a/packages/kit/test/apps/basics/package.json
+++ b/packages/kit/test/apps/basics/package.json
@@ -16,7 +16,7 @@
 	"devDependencies": {
 		"@sveltejs/kit": "workspace:^",
 		"cross-env": "^7.0.3",
-		"rimraf": "^4.0.0",
+		"rimraf": "^5.0.0",
 		"svelte": "^3.56.0",
 		"svelte-check": "^3.0.2",
 		"typescript": "^4.9.4",
diff --git a/packages/kit/test/apps/writes/package.json b/packages/kit/test/apps/writes/package.json
index c5aa9413680c..52ef77937077 100644
--- a/packages/kit/test/apps/writes/package.json
+++ b/packages/kit/test/apps/writes/package.json
@@ -14,7 +14,7 @@
 	"devDependencies": {
 		"@sveltejs/kit": "workspace:^",
 		"cross-env": "^7.0.3",
-		"rimraf": "^4.0.0",
+		"rimraf": "^5.0.0",
 		"svelte": "^3.56.0",
 		"svelte-check": "^3.0.2",
 		"typescript": "^4.9.4",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 6e75250252b6..9b250ed2006e 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -92,7 +92,7 @@ importers:
       '@types/node': ^16.18.6
       '@types/set-cookie-parser': ^2.4.2
       esbuild: ^0.16.3
-      rimraf: ^4.0.0
+      rimraf: ^5.0.0
       rollup: ^3.7.0
       set-cookie-parser: ^2.5.1
       typescript: ^4.9.4
@@ -109,7 +109,7 @@ importers:
       '@sveltejs/kit': link:../kit
       '@types/node': 16.18.6
       '@types/set-cookie-parser': 2.4.2
-      rimraf: 4.0.1
+      rimraf: 5.0.0
       rollup: 3.7.0
       typescript: 4.9.4
       uvu: 0.5.6
@@ -124,7 +124,7 @@ importers:
       '@types/node': ^16.18.6
       c8: ^7.12.0
       polka: ^1.0.0-next.22
-      rimraf: ^4.0.0
+      rimraf: ^5.0.0
       rollup: ^3.7.0
       sirv: ^2.0.2
       typescript: ^4.9.4
@@ -140,7 +140,7 @@ importers:
       '@types/node': 16.18.6
       c8: 7.12.0
       polka: 1.0.0-next.22
-      rimraf: 4.0.1
+      rimraf: 5.0.0
       sirv: 2.0.2
       typescript: 4.9.4
       uvu: 0.5.6
@@ -344,7 +344,7 @@ importers:
     specifiers:
       '@sveltejs/kit': workspace:^
       cross-env: ^7.0.3
-      rimraf: ^4.0.0
+      rimraf: ^5.0.0
       svelte: ^3.56.0
       svelte-check: ^3.0.2
       typescript: ^4.9.4
@@ -352,7 +352,7 @@ importers:
     devDependencies:
       '@sveltejs/kit': link:../../..
       cross-env: 7.0.3
-      rimraf: 4.0.1
+      rimraf: 5.0.0
       svelte: 3.56.0
       svelte-check: 3.0.2_svelte@3.56.0
       typescript: 4.9.4
@@ -412,7 +412,7 @@ importers:
     specifiers:
       '@sveltejs/kit': workspace:^
       cross-env: ^7.0.3
-      rimraf: ^4.0.0
+      rimraf: ^5.0.0
       svelte: ^3.56.0
       svelte-check: ^3.0.2
       typescript: ^4.9.4
@@ -420,7 +420,7 @@ importers:
     devDependencies:
       '@sveltejs/kit': link:../../..
       cross-env: 7.0.3
-      rimraf: 4.0.1
+      rimraf: 5.0.0
       svelte: 3.56.0
       svelte-check: 3.0.2_svelte@3.56.0
       typescript: 4.9.4
@@ -3117,6 +3117,16 @@ packages:
       is-glob: 4.0.3
     dev: true
 
+  /glob/10.0.0:
+    resolution: {integrity: sha512-zmp9ZDC6NpDNLujV2W2n+3lH+BafIVZ4/ct+Yj3BMZTH/+bgm/eVjHzeFLwxJrrIGgjjS2eiQLlpurHsNlEAtQ==}
+    engines: {node: '>=16 || 14 >=14.17'}
+    dependencies:
+      fs.realpath: 1.0.0
+      minimatch: 9.0.0
+      minipass: 5.0.0
+      path-scurry: 1.6.4
+    dev: true
+
   /glob/7.1.6:
     resolution: {integrity: sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==}
     dependencies:
@@ -3692,6 +3702,11 @@ packages:
     dependencies:
       yallist: 4.0.0
 
+  /lru-cache/9.0.0:
+    resolution: {integrity: sha512-9AEKXzvOZc4BMacFnYiTOlDH/197LNnQIK9wZ6iMB5NXPzuv4bWR/Msv7iUMplkiMQ1qQL+KSv/JF1mZAB5Lrg==}
+    engines: {node: '>=16.14'}
+    dev: true
+
   /lz-string/1.4.4:
     resolution: {integrity: sha512-0ckx7ZHRPqb0oUm8zNr+90mtf9DQB60H1wMCjBtfi62Kl3a7JbHob6gA2bC+xRvZoOL+1hzUK8jeuEIQE8svEQ==}
     hasBin: true
@@ -3798,6 +3813,13 @@ packages:
     dependencies:
       brace-expansion: 2.0.1
 
+  /minimatch/9.0.0:
+    resolution: {integrity: sha512-0jJj8AvgKqWN05mrwuqi8QYKx1WmYSUoKSxu5Qhs9prezTz10sxAHGNZe9J9cqIJzta8DWsleh2KaVaLl6Ru2w==}
+    engines: {node: '>=16 || 14 >=14.17'}
+    dependencies:
+      brace-expansion: 2.0.1
+    dev: true
+
   /minimist-options/4.1.0:
     resolution: {integrity: sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==}
     engines: {node: '>= 6'}
@@ -3818,6 +3840,11 @@ packages:
       yallist: 4.0.0
     dev: false
 
+  /minipass/5.0.0:
+    resolution: {integrity: sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==}
+    engines: {node: '>=8'}
+    dev: true
+
   /minizlib/2.1.2:
     resolution: {integrity: sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==}
     engines: {node: '>= 8'}
@@ -4145,6 +4172,14 @@ packages:
   /path-parse/1.0.7:
     resolution: {integrity: sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==}
 
+  /path-scurry/1.6.4:
+    resolution: {integrity: sha512-Qp/9IHkdNiXJ3/Kon++At2nVpnhRiPq/aSvQN+H3U1WZbvNRK0RIQK/o4HMqPoXjpuGJUEWpHSs6Mnjxqh3TQg==}
+    engines: {node: '>=16 || 14 >=14.17'}
+    dependencies:
+      lru-cache: 9.0.0
+      minipass: 5.0.0
+    dev: true
+
   /path-type/2.0.0:
     resolution: {integrity: sha512-dUnb5dXUf+kzhC/W/F4e5/SkluXIFf5VUHolW1Eg1irn1hGWjPGdsRcvYJ1nD6lhk8Ir7VM0bHJKsYTx8Jx9OQ==}
     engines: {node: '>=4'}
@@ -4503,10 +4538,12 @@ packages:
     dependencies:
       glob: 7.2.3
 
-  /rimraf/4.0.1:
-    resolution: {integrity: sha512-qwvb/Wzf8XJxdv8InnDtmijfbIk6gk576swPeogHbUh7AT4ezF42lvhXUdbIzMYrO4HbaXi1rYGhKTDyPF1AJw==}
+  /rimraf/5.0.0:
+    resolution: {integrity: sha512-Jf9llaP+RvaEVS5nPShYFhtXIrb3LRKP281ib3So0KkeZKo2wIKyq0Re7TOSwanasA423PSr6CCIL4bP6T040g==}
     engines: {node: '>=14'}
     hasBin: true
+    dependencies:
+      glob: 10.0.0
     dev: true
 
   /rollup-pluginutils/2.8.2:

From 168547325c0044bc97c9c60aba1b70942dde22fe Mon Sep 17 00:00:00 2001
From: Hyunbin <47051820+hyunbinseo@users.noreply.github.com>
Date: Tue, 11 Apr 2023 07:58:06 +0900
Subject: [PATCH 23/74] chore: add description in package.json (#9387)

Co-authored-by: Simon H <5968653+dummdidumm@users.noreply.github.com>
Co-authored-by: Ben McCann <322311+benmccann@users.noreply.github.com>
---
 packages/adapter-auto/package.json               | 1 +
 packages/adapter-cloudflare-workers/package.json | 1 +
 packages/adapter-cloudflare/package.json         | 1 +
 packages/adapter-netlify/package.json            | 1 +
 packages/adapter-node/package.json               | 1 +
 packages/adapter-static/package.json             | 1 +
 packages/adapter-vercel/package.json             | 1 +
 packages/amp/package.json                        | 1 +
 packages/create-svelte/package.json              | 1 +
 packages/kit/package.json                        | 1 +
 packages/migrate/package.json                    | 1 +
 packages/package/package.json                    | 1 +
 12 files changed, 12 insertions(+)

diff --git a/packages/adapter-auto/package.json b/packages/adapter-auto/package.json
index 5f71889d129b..5922f88ce67e 100644
--- a/packages/adapter-auto/package.json
+++ b/packages/adapter-auto/package.json
@@ -1,6 +1,7 @@
 {
 	"name": "@sveltejs/adapter-auto",
 	"version": "2.0.0",
+	"description": "Automatically chooses the SvelteKit adapter for your current environment, if possible.",
 	"repository": {
 		"type": "git",
 		"url": "https://github.com/sveltejs/kit",
diff --git a/packages/adapter-cloudflare-workers/package.json b/packages/adapter-cloudflare-workers/package.json
index 864e14a77e0a..9ba6153e1cf2 100644
--- a/packages/adapter-cloudflare-workers/package.json
+++ b/packages/adapter-cloudflare-workers/package.json
@@ -1,6 +1,7 @@
 {
 	"name": "@sveltejs/adapter-cloudflare-workers",
 	"version": "1.1.0",
+	"description": "SvelteKit adapter that creates a Cloudflare Workers site using a function for dynamic server rendering",
 	"repository": {
 		"type": "git",
 		"url": "https://github.com/sveltejs/kit",
diff --git a/packages/adapter-cloudflare/package.json b/packages/adapter-cloudflare/package.json
index 20094afb77f2..77a30bddd103 100644
--- a/packages/adapter-cloudflare/package.json
+++ b/packages/adapter-cloudflare/package.json
@@ -1,6 +1,7 @@
 {
 	"name": "@sveltejs/adapter-cloudflare",
 	"version": "2.2.0",
+	"description": "Adapter for building SvelteKit applications on Cloudflare Pages with Workers integration",
 	"repository": {
 		"type": "git",
 		"url": "https://github.com/sveltejs/kit",
diff --git a/packages/adapter-netlify/package.json b/packages/adapter-netlify/package.json
index 04955f1d286c..a7009d3c2350 100644
--- a/packages/adapter-netlify/package.json
+++ b/packages/adapter-netlify/package.json
@@ -1,6 +1,7 @@
 {
 	"name": "@sveltejs/adapter-netlify",
 	"version": "2.0.6",
+	"description": "A SvelteKit adapter that creates a Netlify app",
 	"repository": {
 		"type": "git",
 		"url": "https://github.com/sveltejs/kit",
diff --git a/packages/adapter-node/package.json b/packages/adapter-node/package.json
index 0a37881d817c..f17fd9e679ea 100644
--- a/packages/adapter-node/package.json
+++ b/packages/adapter-node/package.json
@@ -1,6 +1,7 @@
 {
 	"name": "@sveltejs/adapter-node",
 	"version": "1.2.3",
+	"description": "Adapter for SvelteKit apps that generates a standalone Node server",
 	"repository": {
 		"type": "git",
 		"url": "https://github.com/sveltejs/kit",
diff --git a/packages/adapter-static/package.json b/packages/adapter-static/package.json
index 0c64fa1ac0f8..909547e18f3c 100644
--- a/packages/adapter-static/package.json
+++ b/packages/adapter-static/package.json
@@ -1,6 +1,7 @@
 {
 	"name": "@sveltejs/adapter-static",
 	"version": "2.0.1",
+	"description": "Adapter for SvelteKit apps that prerenders your entire site as a collection of static files",
 	"repository": {
 		"type": "git",
 		"url": "https://github.com/sveltejs/kit",
diff --git a/packages/adapter-vercel/package.json b/packages/adapter-vercel/package.json
index de9d0fd23a5a..075380f038fc 100644
--- a/packages/adapter-vercel/package.json
+++ b/packages/adapter-vercel/package.json
@@ -1,6 +1,7 @@
 {
 	"name": "@sveltejs/adapter-vercel",
 	"version": "2.4.1",
+	"description": "A SvelteKit adapter that creates a Vercel app",
 	"repository": {
 		"type": "git",
 		"url": "https://github.com/sveltejs/kit",
diff --git a/packages/amp/package.json b/packages/amp/package.json
index 171463ec593c..c204ba87f343 100644
--- a/packages/amp/package.json
+++ b/packages/amp/package.json
@@ -1,6 +1,7 @@
 {
 	"name": "@sveltejs/amp",
 	"version": "1.0.2",
+	"description": "AMP integration for SvelteKit",
 	"repository": {
 		"type": "git",
 		"url": "https://github.com/sveltejs/kit",
diff --git a/packages/create-svelte/package.json b/packages/create-svelte/package.json
index 78b7d4e7781d..49cff77728e0 100644
--- a/packages/create-svelte/package.json
+++ b/packages/create-svelte/package.json
@@ -1,6 +1,7 @@
 {
 	"name": "create-svelte",
 	"version": "3.3.0",
+	"description": "A CLI for creating new SvelteKit projects",
 	"repository": {
 		"type": "git",
 		"url": "https://github.com/sveltejs/kit",
diff --git a/packages/kit/package.json b/packages/kit/package.json
index 54596a596224..6526ac90544b 100644
--- a/packages/kit/package.json
+++ b/packages/kit/package.json
@@ -1,6 +1,7 @@
 {
 	"name": "@sveltejs/kit",
 	"version": "1.15.2",
+	"description": "The fastest way to build Svelte apps",
 	"repository": {
 		"type": "git",
 		"url": "https://github.com/sveltejs/kit",
diff --git a/packages/migrate/package.json b/packages/migrate/package.json
index a57a4915224b..39e238638ed6 100644
--- a/packages/migrate/package.json
+++ b/packages/migrate/package.json
@@ -1,6 +1,7 @@
 {
 	"name": "svelte-migrate",
 	"version": "1.1.3",
+	"description": "A CLI for migrating Svelte(Kit) codebases",
 	"repository": {
 		"type": "git",
 		"url": "https://github.com/sveltejs/kit",
diff --git a/packages/package/package.json b/packages/package/package.json
index a54bd8c7bdcb..48f01e8d40d1 100644
--- a/packages/package/package.json
+++ b/packages/package/package.json
@@ -1,6 +1,7 @@
 {
 	"name": "@sveltejs/package",
 	"version": "2.0.2",
+	"description": "The fastest way to build Svelte packages",
 	"repository": {
 		"type": "git",
 		"url": "https://github.com/sveltejs/kit",

From 88f9b1df852693eaf5ded02243dde16690ef8a5e Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 11 Apr 2023 09:15:34 -0400
Subject: [PATCH 24/74] Version Packages (#9623)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 .changeset/loud-drinks-sort.md       | 5 -----
 .changeset/swift-camels-explain.md   | 5 -----
 packages/adapter-static/CHANGELOG.md | 9 +++++++++
 packages/adapter-static/package.json | 2 +-
 packages/kit/CHANGELOG.md            | 6 ++++++
 packages/kit/package.json            | 2 +-
 6 files changed, 17 insertions(+), 12 deletions(-)
 delete mode 100644 .changeset/loud-drinks-sort.md
 delete mode 100644 .changeset/swift-camels-explain.md

diff --git a/.changeset/loud-drinks-sort.md b/.changeset/loud-drinks-sort.md
deleted file mode 100644
index 74ea89ece6cc..000000000000
--- a/.changeset/loud-drinks-sort.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@sveltejs/adapter-static': patch
----
-
-fix: update broken link in error message
diff --git a/.changeset/swift-camels-explain.md b/.changeset/swift-camels-explain.md
deleted file mode 100644
index f7e4f7abcb64..000000000000
--- a/.changeset/swift-camels-explain.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@sveltejs/kit": patch
----
-
-fix: prevent building duplicate CSS files
diff --git a/packages/adapter-static/CHANGELOG.md b/packages/adapter-static/CHANGELOG.md
index dcda7b9caa1c..e9c52593a421 100644
--- a/packages/adapter-static/CHANGELOG.md
+++ b/packages/adapter-static/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @sveltejs/adapter-static
 
+## 2.0.2
+
+### Patch Changes
+
+- fix: update broken link in error message ([`118ce5a0`](https://github.com/sveltejs/kit/commit/118ce5a07a3a984353c3fc858b34c67e9e560fa0))
+
+- Updated dependencies [[`748a8720`](https://github.com/sveltejs/kit/commit/748a8720fea8ea938576041207b81e19bb8f7dff)]:
+  - @sveltejs/kit@1.15.3
+
 ## 2.0.1
 
 ### Patch Changes
diff --git a/packages/adapter-static/package.json b/packages/adapter-static/package.json
index 909547e18f3c..b5af4d083274 100644
--- a/packages/adapter-static/package.json
+++ b/packages/adapter-static/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@sveltejs/adapter-static",
-	"version": "2.0.1",
+	"version": "2.0.2",
 	"description": "Adapter for SvelteKit apps that prerenders your entire site as a collection of static files",
 	"repository": {
 		"type": "git",
diff --git a/packages/kit/CHANGELOG.md b/packages/kit/CHANGELOG.md
index 53d4f1934601..06b55acc5469 100644
--- a/packages/kit/CHANGELOG.md
+++ b/packages/kit/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @sveltejs/kit
 
+## 1.15.3
+
+### Patch Changes
+
+- fix: prevent building duplicate CSS files ([#9382](https://github.com/sveltejs/kit/pull/9382))
+
 ## 1.15.2
 
 ### Patch Changes
diff --git a/packages/kit/package.json b/packages/kit/package.json
index 6526ac90544b..9c6a8af37998 100644
--- a/packages/kit/package.json
+++ b/packages/kit/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@sveltejs/kit",
-	"version": "1.15.2",
+	"version": "1.15.3",
 	"description": "The fastest way to build Svelte apps",
 	"repository": {
 		"type": "git",

From 9aded818a33b42ce7f10fac48db00950d3e02928 Mon Sep 17 00:00:00 2001
From: Ben McCann <322311+benmccann@users.noreply.github.com>
Date: Tue, 11 Apr 2023 06:16:50 -0700
Subject: [PATCH 25/74] feat: set sourcemapIgnoreList to filter out non-source
 directories (#9619)

---
 .changeset/grumpy-years-know.md        |  5 +++++
 packages/kit/src/exports/vite/index.js | 11 ++++++++---
 2 files changed, 13 insertions(+), 3 deletions(-)
 create mode 100644 .changeset/grumpy-years-know.md

diff --git a/.changeset/grumpy-years-know.md b/.changeset/grumpy-years-know.md
new file mode 100644
index 000000000000..b8d93f7d230b
--- /dev/null
+++ b/.changeset/grumpy-years-know.md
@@ -0,0 +1,5 @@
+---
+'@sveltejs/kit': patch
+---
+
+feat: set sourcemapIgnoreList to filter out non-source directories
diff --git a/packages/kit/src/exports/vite/index.js b/packages/kit/src/exports/vite/index.js
index d991db412fc7..ec3b42b56088 100644
--- a/packages/kit/src/exports/vite/index.js
+++ b/packages/kit/src/exports/vite/index.js
@@ -188,6 +188,9 @@ function kit({ svelte_config }) {
 
 	const service_worker_entry_file = resolve_entry(kit.files.serviceWorker);
 
+	const sourcemapIgnoreList = /** @param {string} relative_path */ (relative_path) =>
+		relative_path.includes('node_modules') || relative_path.includes(kit.outDir);
+
 	/** @type {import('vite').Plugin} */
 	const plugin_setup = {
 		name: 'vite-plugin-sveltekit-setup',
@@ -231,16 +234,17 @@ function kit({ svelte_config }) {
 				},
 				root: cwd,
 				server: {
+					cors: { preflightContinue: true },
 					fs: {
 						allow: [...allow]
 					},
+					sourcemapIgnoreList,
 					watch: {
 						ignored: [
 							// Ignore all siblings of config.kit.outDir/generated
 							`${posixify(kit.outDir)}/!(generated)`
 						]
-					},
-					cors: { preflightContinue: true }
+					}
 				},
 				preview: {
 					cors: { preflightContinue: true }
@@ -563,7 +567,8 @@ function kit({ svelte_config }) {
 								entryFileNames: ssr ? '[name].js' : `${prefix}/[name].[hash].${ext}`,
 								chunkFileNames: ssr ? 'chunks/[name].js' : `${prefix}/chunks/[name].[hash].${ext}`,
 								assetFileNames: `${prefix}/assets/[name].[hash][extname]`,
-								hoistTransitiveImports: false
+								hoistTransitiveImports: false,
+								sourcemapIgnoreList
 							},
 							preserveEntrySignatures: 'strict'
 						},

From 93d248ef38a14e1f539c59488921c0012d6b6c5c Mon Sep 17 00:00:00 2001
From: Rich Harris <richard.a.harris@gmail.com>
Date: Tue, 11 Apr 2023 10:24:32 -0400
Subject: [PATCH 26/74] gracefully handle failure to load hooks.server.js
 (#9641)

* gracefully handle failure to load hooks.server.js

* format

---------

Co-authored-by: Rich Harris <git@rich-harris.dev>
---
 .changeset/forty-pandas-mate.md          |  5 ++++
 packages/kit/src/runtime/server/index.js | 30 ++++++++++++++++++------
 2 files changed, 28 insertions(+), 7 deletions(-)
 create mode 100644 .changeset/forty-pandas-mate.md

diff --git a/.changeset/forty-pandas-mate.md b/.changeset/forty-pandas-mate.md
new file mode 100644
index 000000000000..d2c765691610
--- /dev/null
+++ b/.changeset/forty-pandas-mate.md
@@ -0,0 +1,5 @@
+---
+'@sveltejs/kit': patch
+---
+
+fix: gracefully handle failure to load hooks.server.js
diff --git a/packages/kit/src/runtime/server/index.js b/packages/kit/src/runtime/server/index.js
index b9d218f9cbd8..70d3dc1239dd 100644
--- a/packages/kit/src/runtime/server/index.js
+++ b/packages/kit/src/runtime/server/index.js
@@ -1,6 +1,7 @@
 import { respond } from './respond.js';
 import { set_private_env, set_public_env } from '../shared-server.js';
 import { options, get_hooks } from '__SERVER__/internal.js';
+import { DEV } from 'esm-env';
 
 export class Server {
 	/** @type {import('types').SSROptions} */
@@ -35,14 +36,29 @@ export class Server {
 		set_public_env(pub);
 
 		if (!this.#options.hooks) {
-			const module = await get_hooks();
+			try {
+				const module = await get_hooks();
 
-			this.#options.hooks = {
-				handle: module.handle || (({ event, resolve }) => resolve(event)),
-				// @ts-expect-error
-				handleError: module.handleError || (({ error }) => console.error(error?.stack)),
-				handleFetch: module.handleFetch || (({ request, fetch }) => fetch(request))
-			};
+				this.#options.hooks = {
+					handle: module.handle || (({ event, resolve }) => resolve(event)),
+					// @ts-expect-error
+					handleError: module.handleError || (({ error }) => console.error(error?.stack)),
+					handleFetch: module.handleFetch || (({ request, fetch }) => fetch(request))
+				};
+			} catch (error) {
+				if (DEV) {
+					this.#options.hooks = {
+						handle: () => {
+							throw error;
+						},
+						// @ts-expect-error
+						handleError: ({ error }) => console.error(error?.stack),
+						handleFetch: ({ request, fetch }) => fetch(request)
+					};
+				} else {
+					throw error;
+				}
+			}
 		}
 	}
 

From 9909d2814a3014dbbdb0778162f9d6c32cb535b4 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 11 Apr 2023 10:27:10 -0400
Subject: [PATCH 27/74] Version Packages (#9640)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 .changeset/forty-pandas-mate.md | 5 -----
 .changeset/grumpy-years-know.md | 5 -----
 packages/kit/CHANGELOG.md       | 8 ++++++++
 packages/kit/package.json       | 2 +-
 4 files changed, 9 insertions(+), 11 deletions(-)
 delete mode 100644 .changeset/forty-pandas-mate.md
 delete mode 100644 .changeset/grumpy-years-know.md

diff --git a/.changeset/forty-pandas-mate.md b/.changeset/forty-pandas-mate.md
deleted file mode 100644
index d2c765691610..000000000000
--- a/.changeset/forty-pandas-mate.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@sveltejs/kit': patch
----
-
-fix: gracefully handle failure to load hooks.server.js
diff --git a/.changeset/grumpy-years-know.md b/.changeset/grumpy-years-know.md
deleted file mode 100644
index b8d93f7d230b..000000000000
--- a/.changeset/grumpy-years-know.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@sveltejs/kit': patch
----
-
-feat: set sourcemapIgnoreList to filter out non-source directories
diff --git a/packages/kit/CHANGELOG.md b/packages/kit/CHANGELOG.md
index 06b55acc5469..1f64b5b44559 100644
--- a/packages/kit/CHANGELOG.md
+++ b/packages/kit/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @sveltejs/kit
 
+## 1.15.4
+
+### Patch Changes
+
+- fix: gracefully handle failure to load hooks.server.js ([#9641](https://github.com/sveltejs/kit/pull/9641))
+
+- feat: set sourcemapIgnoreList to filter out non-source directories ([#9619](https://github.com/sveltejs/kit/pull/9619))
+
 ## 1.15.3
 
 ### Patch Changes
diff --git a/packages/kit/package.json b/packages/kit/package.json
index 9c6a8af37998..165d65f6437d 100644
--- a/packages/kit/package.json
+++ b/packages/kit/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@sveltejs/kit",
-	"version": "1.15.3",
+	"version": "1.15.4",
 	"description": "The fastest way to build Svelte apps",
 	"repository": {
 		"type": "git",

From ae999176e74c2d9dc46e11a630857f4066adb97e Mon Sep 17 00:00:00 2001
From: Puru Vijay <47742487+PuruVJ@users.noreply.github.com>
Date: Tue, 11 Apr 2023 20:19:40 +0530
Subject: [PATCH 28/74] feat(site): Add dark mode toggle (#9607)

* Push

* Add sveltekit logotype to navbar

* Bump site-kit to next

* Try to avoid flicker

* Fix logic a bit

* Add JS-less dark mode

* Fix styles

* Bump site-kit

* minor

* Adapt to new logo style

* Fix Hero logotype for dark mode

* site kit v4

* site-kit 4.0.1
---
 pnpm-lock.yaml                                | 18 ++++--
 sites/kit.svelte.dev/package.json             |  2 +-
 sites/kit.svelte.dev/src/app.html             |  9 +++
 .../kit.svelte.dev/src/routes/+layout.svelte  |  7 ++-
 .../src/routes/edge.svg/+server.js            | 31 +++++-----
 .../src/routes/home/Deployment.svelte         | 15 ++++-
 .../src/routes/home/Hero.svelte               | 58 +++++++++++++------
 .../kit.svelte.dev/src/routes/home/common.css | 14 ++++-
 .../src/routes/home/svelte-kit-logotype.svg   | 23 --------
 .../home/svelte-kit-logotype.svg.svelte       | 46 +++++++++++++++
 .../src/routes/home/svelte-logo.svg           | 10 ----
 .../src/routes/home/sveltekit-logo.svg        |  1 +
 12 files changed, 159 insertions(+), 75 deletions(-)
 delete mode 100644 sites/kit.svelte.dev/src/routes/home/svelte-kit-logotype.svg
 create mode 100644 sites/kit.svelte.dev/src/routes/home/svelte-kit-logotype.svg.svelte
 delete mode 100644 sites/kit.svelte.dev/src/routes/home/svelte-logo.svg
 create mode 100644 sites/kit.svelte.dev/src/routes/home/sveltekit-logo.svg

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 9b250ed2006e..ab0a5e4324d5 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -689,7 +689,7 @@ importers:
       '@sveltejs/adapter-vercel': workspace:^
       '@sveltejs/amp': workspace:^
       '@sveltejs/kit': workspace:^
-      '@sveltejs/site-kit': ^3.3.6
+      '@sveltejs/site-kit': 4.0.1
       '@types/d3-geo': ^3.0.2
       '@types/node': ^16.18.6
       d3-geo: ^3.0.1
@@ -715,7 +715,7 @@ importers:
       '@sveltejs/adapter-vercel': link:../../packages/adapter-vercel
       '@sveltejs/amp': link:../../packages/amp
       '@sveltejs/kit': link:../../packages/kit
-      '@sveltejs/site-kit': 3.3.6_r4kk7euspt2csvnnykfg5n6pxi
+      '@sveltejs/site-kit': 4.0.1_r4kk7euspt2csvnnykfg5n6pxi
       '@types/d3-geo': 3.0.2
       '@types/node': 16.18.6
       flexsearch: 0.7.31
@@ -1590,14 +1590,15 @@ packages:
       picomatch: 2.3.1
       rollup: 3.7.0
 
-  /@sveltejs/site-kit/3.3.6_r4kk7euspt2csvnnykfg5n6pxi:
-    resolution: {integrity: sha512-MUqHseHHFJOT6AcJYTbUqK7hMy1OkBa231tS4TXkmbgQ8EaFVI2unjs9+WY8m3CXASc4p31givOiKVSqtorbbg==}
+  /@sveltejs/site-kit/4.0.1_r4kk7euspt2csvnnykfg5n6pxi:
+    resolution: {integrity: sha512-4uMN2quyP+us87690TFMmmt5QtbapZrpbeqVoc9uvgBQqIs+2L0W5y033YnoKKxk/G40AnODYJ0Rqbwuome7jA==}
     peerDependencies:
       '@sveltejs/kit': ^1.0.0
       svelte: ^3.54.0
     dependencies:
       '@sveltejs/kit': link:packages/kit
       svelte: 3.56.0
+      svelte-local-storage-store: 0.4.0_svelte@3.56.0
     dev: true
 
   /@sveltejs/vite-plugin-svelte/2.0.0_svelte@3.56.0+vite@4.2.0:
@@ -5012,6 +5013,15 @@ packages:
       svelte: 3.56.0
     dev: false
 
+  /svelte-local-storage-store/0.4.0_svelte@3.56.0:
+    resolution: {integrity: sha512-ctPykTt4S3BE5bF0mfV0jKiUR1qlmqLvnAkQvYHLeb9wRyO1MdIFDVI23X+TZEFleATHkTaOpYZswIvf3b2tWA==}
+    engines: {node: '>=0.14'}
+    peerDependencies:
+      svelte: ^3.48.0
+    dependencies:
+      svelte: 3.56.0
+    dev: true
+
   /svelte-preprocess/5.0.0_llpdtttxqmim2s7ymcc5fxs7oi:
     resolution: {integrity: sha512-q7lpa7i2FBu8Pa+G0MmuQQWETBwCKgsGmuq1Sf6n8q4uaG9ZLcLP0Y+etC6bF4sE6EbLxfiI38zV6RfPe3RSfg==}
     engines: {node: '>= 14.10.0'}
diff --git a/sites/kit.svelte.dev/package.json b/sites/kit.svelte.dev/package.json
index 3ffcb5c260f4..d34ea6760191 100644
--- a/sites/kit.svelte.dev/package.json
+++ b/sites/kit.svelte.dev/package.json
@@ -14,7 +14,7 @@
 		"@sveltejs/adapter-vercel": "workspace:^",
 		"@sveltejs/amp": "workspace:^",
 		"@sveltejs/kit": "workspace:^",
-		"@sveltejs/site-kit": "^3.3.6",
+		"@sveltejs/site-kit": "4.0.1",
 		"@types/d3-geo": "^3.0.2",
 		"@types/node": "^16.18.6",
 		"flexsearch": "^0.7.31",
diff --git a/sites/kit.svelte.dev/src/app.html b/sites/kit.svelte.dev/src/app.html
index 37e2243c556a..5cf0b47ebce0 100644
--- a/sites/kit.svelte.dev/src/app.html
+++ b/sites/kit.svelte.dev/src/app.html
@@ -39,6 +39,15 @@
 		%sveltekit.head%
 	</head>
 	<body>
+		<script>
+			const themeValue = JSON.parse(localStorage.getItem('sveltekit:theme'))?.current;
+			const systemPreferredTheme = window.matchMedia('(prefers-color-scheme: dark)').matches
+				? 'dark'
+				: 'light';
+
+			document.body.classList.remove('light', 'dark');
+			document.body.classList.add(themeValue ?? systemPreferredTheme);
+		</script>
 		<div>%sveltekit.body%</div>
 	</body>
 </html>
diff --git a/sites/kit.svelte.dev/src/routes/+layout.svelte b/sites/kit.svelte.dev/src/routes/+layout.svelte
index c2a4b8c3ffc7..c38be5db402b 100644
--- a/sites/kit.svelte.dev/src/routes/+layout.svelte
+++ b/sites/kit.svelte.dev/src/routes/+layout.svelte
@@ -5,13 +5,16 @@
 	import { Icon, Nav, NavItem, Separator, Shell } from '@sveltejs/site-kit/components';
 	import { Search, SearchBox } from '@sveltejs/site-kit/search';
 	import '@sveltejs/site-kit/styles/index.css';
-	import Logo from './home/svelte-logo.svg';
 
 	let banner_height = '48px';
 </script>
 
 <Shell banner_bottom_height={banner_height}>
-	<Nav logo={Logo} slot="top-nav">
+	<Nav slot="top-nav">
+		<svelte:fragment slot="home">
+			<span><strong>kit</strong><span>.svelte.dev</span></span>
+		</svelte:fragment>
+
 		<svelte:fragment slot="nav-center">
 			{#if $page.url.pathname !== '/search'}
 				<li><Search /></li>
diff --git a/sites/kit.svelte.dev/src/routes/edge.svg/+server.js b/sites/kit.svelte.dev/src/routes/edge.svg/+server.js
index 5bff2f15e286..7cb4a3640d9c 100644
--- a/sites/kit.svelte.dev/src/routes/edge.svg/+server.js
+++ b/sites/kit.svelte.dev/src/routes/edge.svg/+server.js
@@ -26,6 +26,8 @@ const projection = geoSatellite()
 	.scale(450)
 	.precision(0.5);
 
+let isDark = false;
+
 const path = geoPath(projection);
 
 /**
@@ -76,19 +78,21 @@ function render(lat, lon, city, country) {
 					stroke-width: 5;
 				}
 
-				@media (prefers-color-scheme: dark) {
-					.ocean {
-						fill: rgb(120,120,120);
-					}
-
-					.land {
-						fill: #222;
-					}
+				${
+					isDark
+						? `.ocean {
+					fill: rgb(120,120,120);
+				}
 
-					.dot {
-						stroke: #222;
-					}
+				.land {
+					fill: #222;
 				}
+
+				.dot {
+					stroke: #222;
+				}`
+						: ''
+				} 
 			</style>
 
 			<path d="${path({ type: 'Sphere' })}" class="ocean"/>
@@ -116,10 +120,11 @@ function render(lat, lon, city, country) {
 	`;
 }
 
-/** @type {import('./$types').RequestHandler} */
-export function GET({ request }) {
+export function GET({ request, url }) {
 	const h = request.headers;
 
+	isDark = !!url.searchParams.has('dark');
+
 	const latitude = h.get('x-vercel-ip-latitude') ?? '';
 	const longitude = h.get('x-vercel-ip-longitude') ?? '';
 	const city = h.get('x-vercel-ip-city') ?? '';
diff --git a/sites/kit.svelte.dev/src/routes/home/Deployment.svelte b/sites/kit.svelte.dev/src/routes/home/Deployment.svelte
index b7370b30abc5..ed2e703a2a43 100644
--- a/sites/kit.svelte.dev/src/routes/home/Deployment.svelte
+++ b/sites/kit.svelte.dev/src/routes/home/Deployment.svelte
@@ -10,6 +10,7 @@
 	import lambda from './logos/lambda.svg';
 	import azure from './logos/azure.svg';
 	import plus from '$lib/icons/plus.svg';
+	import { theme } from '@sveltejs/site-kit/theme';
 </script>
 
 <Section --background="var(--background-1)">
@@ -111,7 +112,7 @@
 
 		<div class="globe">
 			<img
-				src="/edge.svg"
+				src="/edge.svg?{$theme.current}"
 				width="100%"
 				height="100%"
 				alt="Dynamically rendered map of the world, centered on the user's location"
@@ -275,12 +276,20 @@
 	}
 
 	@media (prefers-color-scheme: dark) {
-		.invert img {
+		.platforms .invert img {
 			--invert: 1;
 		}
 
-		.invert-hover img {
+		.platforms .invert-hover img {
 			--invert-hover: 1;
 		}
 	}
+
+	:global(body.dark) .platforms .invert img {
+		--invert: 1;
+	}
+
+	:global(body.dark) .platforms .invert-hover img {
+		--invert-hover: 1;
+	}
 </style>
diff --git a/sites/kit.svelte.dev/src/routes/home/Hero.svelte b/sites/kit.svelte.dev/src/routes/home/Hero.svelte
index 80426060cb1a..dc796b78d966 100644
--- a/sites/kit.svelte.dev/src/routes/home/Hero.svelte
+++ b/sites/kit.svelte.dev/src/routes/home/Hero.svelte
@@ -1,13 +1,16 @@
 <script>
 	import { base } from '$app/paths';
-	import logotype from './svelte-kit-logotype.svg';
+	import Logotype from './svelte-kit-logotype.svg.svelte';
 	import background from './svelte-kit-machine.webp?w=1440;960&format=avif;webp;png&picture';
 </script>
 
 <section class="hero">
 	<div class="hero-contents">
 		<div class="hero-text">
-			<img alt="SvelteKit logotype" width="400" height="50" class="logotype" src={logotype} />
+			<div class="logotype" role="img">
+				<Logotype />
+			</div>
+
 			<div class="tagline">web development, streamlined</div>
 			<a class="cta" href="{base}/docs/introduction">read the docs</a>
 		</div>
@@ -23,9 +26,7 @@
 
 <style>
 	.hero {
-		max-width: 100vw;
-		background: hsl(210, 7%, 84%);
-		background: radial-gradient(
+		--gradient: radial-gradient(
 				34.14% 72.25% at 47.58% 31.75%,
 				hsla(209, 100%, 95%, 0.52) 0%,
 				hsla(0, 0%, 100%, 0) 100%
@@ -37,6 +38,21 @@
 				hsla(207, 22%, 84%, 0.62) 92.49%
 			),
 			linear-gradient(0deg, hsl(204, 38%, 90%), hsl(204, 38%, 90%));
+		--dark-gradient: radial-gradient(
+				64.14% 72.25% at 47.58% 31.75%,
+				hsl(209deg 6% 47% / 52%) 0%,
+				hsla(0, 0%, 100%, 0) 100%
+			),
+			linear-gradient(
+				92.4deg,
+				hsl(210, 7%, 16%) 14.67%,
+				hsl(0deg 0% 0% / 48%) 54.37%,
+				hsla(207, 22%, 13%, 0.62) 92.49%
+			),
+			linear-gradient(0deg, hsl(204, 38%, 20%), hsl(204, 10%, 90%));
+		max-width: 100vw;
+		background: hsl(210, 7%, 84%);
+		background: var(--gradient);
 		position: relative;
 		padding: 8rem var(--sk-page-padding-side);
 	}
@@ -123,22 +139,28 @@
 	@media (prefers-color-scheme: dark) {
 		.hero {
 			background: hsl(210, 7%, 20%);
-			background: radial-gradient(
-					64.14% 72.25% at 47.58% 31.75%,
-					hsl(209deg 6% 47% / 52%) 0%,
-					hsla(0, 0%, 100%, 0) 100%
-				),
-				linear-gradient(
-					92.4deg,
-					hsl(210, 7%, 16%) 14.67%,
-					hsl(0deg 0% 0% / 48%) 54.37%,
-					hsla(207, 22%, 13%, 0.62) 92.49%
-				),
-				linear-gradient(0deg, hsl(204, 38%, 20%), hsl(204, 10%, 90%));
+			background: var(--dark-gradient);
 		}
 
-		.hero-text img {
+		.hero-text :global(svg) {
 			mix-blend-mode: screen;
 		}
+
+		:global(body.light) .hero {
+			background: var(--gradient);
+		}
+
+		:global(body.light) .hero-text :global(svg) {
+			mix-blend-mode: initial;
+		}
+	}
+
+	:global(body.dark) .hero {
+		background: hsl(210, 7%, 20%);
+		background: var(--dark-gradient);
+	}
+
+	:global(body.dark) .hero-text :global(svg) {
+		mix-blend-mode: screen;
 	}
 </style>
diff --git a/sites/kit.svelte.dev/src/routes/home/common.css b/sites/kit.svelte.dev/src/routes/home/common.css
index 85bdb612b513..a059dd3df689 100644
--- a/sites/kit.svelte.dev/src/routes/home/common.css
+++ b/sites/kit.svelte.dev/src/routes/home/common.css
@@ -33,10 +33,22 @@
 	}
 }
 
-@media (prefers-color-scheme: dark) {
+/* In case JS disabled */
+@media screen and (prefers-color-scheme: dark) {
 	.home {
 		/* --background-1: radial-gradient(circle at top right, rgb(49, 49, 49), rgb(77, 77, 77)); */
 		--background-1: #222;
 		--background-2: #444;
 	}
+
+	body.light .home {
+		--background-1: radial-gradient(circle at top right, rgb(230, 233, 236), rgb(244, 245, 247));
+		--background-2: var(--sk-theme-2);
+	}
+}
+
+body.dark .home {
+	/* --background-1: radial-gradient(circle at top right, rgb(49, 49, 49), rgb(77, 77, 77)); */
+	--background-1: #222;
+	--background-2: #444;
 }
diff --git a/sites/kit.svelte.dev/src/routes/home/svelte-kit-logotype.svg b/sites/kit.svelte.dev/src/routes/home/svelte-kit-logotype.svg
deleted file mode 100644
index bdb4ade10aaa..000000000000
--- a/sites/kit.svelte.dev/src/routes/home/svelte-kit-logotype.svg
+++ /dev/null
@@ -1,23 +0,0 @@
-<svg viewBox="30 31 400 50" xmlns="http://www.w3.org/2000/svg">
-	<style>
-		.svelte {
-			fill: hsl(0, 0%, 27%);
-		}
-
-		.kit {
-			fill: #8D8D93;
-		}
-
-		@media (prefers-color-scheme: dark) {
-			.svelte {
-				fill: hsl(0, 0%, 80%);
-			}
-
-			.kit {
-				fill: #8D8D93;
-			}
-		}
-	</style>
-<path class="svelte" d="M48.3359 80.876C44.4451 80.9736 40.6159 79.8942 37.3519 77.78C34.3023 75.7742 32.0378 72.7827 30.9387 69.3081L37.6241 66.8581C38.5518 68.991 40.066 70.8183 41.9916 72.1286C43.9468 73.4367 46.2574 74.1149 48.6113 74.0715C50.8732 74.1893 53.1053 73.5154 54.9219 72.1661C55.7123 71.5043 56.3367 70.6675 56.7454 69.7223C57.1541 68.7772 57.3357 67.7499 57.2758 66.7223C57.2852 65.7649 57.063 64.8193 56.6281 63.9657C56.2495 63.2023 55.7547 62.5019 55.1613 61.8894C54.4103 61.2078 53.5586 60.6454 52.6361 60.222C51.4981 59.6561 50.5542 59.2252 49.8042 58.9292C49.0543 58.6332 47.9513 58.2363 46.4952 57.7385C44.6761 57.1034 43.3118 56.6046 42.4023 56.242C41.1703 55.719 39.9737 55.1164 38.8202 54.4381C37.579 53.7813 36.4506 52.9313 35.4776 51.9202C34.6349 50.9339 33.9554 49.8197 33.4647 48.6198C32.5217 46.3326 32.3235 43.8075 32.8983 41.4018C33.473 38.9961 34.7915 36.8316 36.6673 35.2143C39.3991 32.8106 43.1066 31.6085 47.7898 31.608C51.7018 31.608 54.9201 32.4699 57.4448 34.1937C59.8955 35.819 61.695 38.2524 62.528 41.0678L55.9772 43.2446C55.3192 41.7704 54.2079 40.5431 52.8042 39.7406C51.1067 38.8008 49.184 38.3416 47.2438 38.4125C45.3411 38.3039 43.4564 38.8307 41.8875 39.9098C41.247 40.4053 40.7359 41.0476 40.3976 41.7822C40.0593 42.5168 39.9038 43.322 39.9443 44.1294C39.95 44.7485 40.0866 45.3594 40.3452 45.9222C40.6037 46.485 40.9784 46.987 41.4447 47.3956C42.3512 48.2863 43.4153 49.0016 44.5833 49.5054C45.6753 49.9589 47.3356 50.5712 49.5641 51.342C50.9278 51.8419 51.9396 52.2162 52.5993 52.4648C53.259 52.7134 54.2249 53.1332 55.4968 53.7242C56.5174 54.1744 57.4987 54.7086 58.4304 55.3213C59.2647 55.9196 60.0622 56.5673 60.8187 57.261C61.6416 57.9722 62.3444 58.8107 62.9003 59.7445C63.4302 60.7128 63.8425 61.7406 64.1285 62.8062C64.4763 64.0584 64.6485 65.3527 64.6401 66.6521C64.6401 71.0984 63.1162 74.5802 60.0685 77.0972C57.0207 79.6143 53.1098 80.8739 48.3359 80.876ZM92.0693 80.0599L75.6946 32.4241H83.3367L94.1846 65.6331C94.784 67.4193 95.2852 69.2369 95.6858 71.0777C96.085 69.2366 96.5861 67.4189 97.187 65.6331L107.899 32.4241H115.472L99.1646 80.0599H92.0693ZM129.935 80.0599V32.4241H159.546V39.0937H137.031V52.159H151.563V58.8286H137.031V73.3903H161.05V80.0599H129.935ZM179.126 80.0599V32.4241H186.223V73.2546H209.556V80.0599H179.126ZM236.301 39.2295V80.0599H229.204V39.2295H215.696V32.4241H249.813V39.2295H236.301ZM264.478 80.0599V32.4241H294.088V39.0937H271.574V52.159H286.106V58.8286H271.574V73.3903H295.593V80.0599H264.478Z" />
-<path class="kit" d="M348.645 80.0599L335.205 55.1536L326.745 65.3616V80.0599H319.648V32.4241H326.745V55.4938L345.169 32.4241H353.356L339.986 49.1652L356.974 80.0599H348.645ZM372.319 80.0599V32.4241H379.416V80.0599H372.319ZM416.394 39.2295V80.0599H409.3V39.2295H395.789V32.4241H429.902V39.2295H416.394Z"/>
-</svg>
diff --git a/sites/kit.svelte.dev/src/routes/home/svelte-kit-logotype.svg.svelte b/sites/kit.svelte.dev/src/routes/home/svelte-kit-logotype.svg.svelte
new file mode 100644
index 000000000000..759357aaa3bf
--- /dev/null
+++ b/sites/kit.svelte.dev/src/routes/home/svelte-kit-logotype.svg.svelte
@@ -0,0 +1,46 @@
+<svg viewBox="30 31 400 50" width="400" height="50" xmlns="http://www.w3.org/2000/svg">
+	<path
+		class="svelte"
+		d="M48.3359 80.876C44.4451 80.9736 40.6159 79.8942 37.3519 77.78C34.3023 75.7742 32.0378 72.7827 30.9387 69.3081L37.6241 66.8581C38.5518 68.991 40.066 70.8183 41.9916 72.1286C43.9468 73.4367 46.2574 74.1149 48.6113 74.0715C50.8732 74.1893 53.1053 73.5154 54.9219 72.1661C55.7123 71.5043 56.3367 70.6675 56.7454 69.7223C57.1541 68.7772 57.3357 67.7499 57.2758 66.7223C57.2852 65.7649 57.063 64.8193 56.6281 63.9657C56.2495 63.2023 55.7547 62.5019 55.1613 61.8894C54.4103 61.2078 53.5586 60.6454 52.6361 60.222C51.4981 59.6561 50.5542 59.2252 49.8042 58.9292C49.0543 58.6332 47.9513 58.2363 46.4952 57.7385C44.6761 57.1034 43.3118 56.6046 42.4023 56.242C41.1703 55.719 39.9737 55.1164 38.8202 54.4381C37.579 53.7813 36.4506 52.9313 35.4776 51.9202C34.6349 50.9339 33.9554 49.8197 33.4647 48.6198C32.5217 46.3326 32.3235 43.8075 32.8983 41.4018C33.473 38.9961 34.7915 36.8316 36.6673 35.2143C39.3991 32.8106 43.1066 31.6085 47.7898 31.608C51.7018 31.608 54.9201 32.4699 57.4448 34.1937C59.8955 35.819 61.695 38.2524 62.528 41.0678L55.9772 43.2446C55.3192 41.7704 54.2079 40.5431 52.8042 39.7406C51.1067 38.8008 49.184 38.3416 47.2438 38.4125C45.3411 38.3039 43.4564 38.8307 41.8875 39.9098C41.247 40.4053 40.7359 41.0476 40.3976 41.7822C40.0593 42.5168 39.9038 43.322 39.9443 44.1294C39.95 44.7485 40.0866 45.3594 40.3452 45.9222C40.6037 46.485 40.9784 46.987 41.4447 47.3956C42.3512 48.2863 43.4153 49.0016 44.5833 49.5054C45.6753 49.9589 47.3356 50.5712 49.5641 51.342C50.9278 51.8419 51.9396 52.2162 52.5993 52.4648C53.259 52.7134 54.2249 53.1332 55.4968 53.7242C56.5174 54.1744 57.4987 54.7086 58.4304 55.3213C59.2647 55.9196 60.0622 56.5673 60.8187 57.261C61.6416 57.9722 62.3444 58.8107 62.9003 59.7445C63.4302 60.7128 63.8425 61.7406 64.1285 62.8062C64.4763 64.0584 64.6485 65.3527 64.6401 66.6521C64.6401 71.0984 63.1162 74.5802 60.0685 77.0972C57.0207 79.6143 53.1098 80.8739 48.3359 80.876ZM92.0693 80.0599L75.6946 32.4241H83.3367L94.1846 65.6331C94.784 67.4193 95.2852 69.2369 95.6858 71.0777C96.085 69.2366 96.5861 67.4189 97.187 65.6331L107.899 32.4241H115.472L99.1646 80.0599H92.0693ZM129.935 80.0599V32.4241H159.546V39.0937H137.031V52.159H151.563V58.8286H137.031V73.3903H161.05V80.0599H129.935ZM179.126 80.0599V32.4241H186.223V73.2546H209.556V80.0599H179.126ZM236.301 39.2295V80.0599H229.204V39.2295H215.696V32.4241H249.813V39.2295H236.301ZM264.478 80.0599V32.4241H294.088V39.0937H271.574V52.159H286.106V58.8286H271.574V73.3903H295.593V80.0599H264.478Z"
+	/>
+	<path
+		class="kit"
+		d="M348.645 80.0599L335.205 55.1536L326.745 65.3616V80.0599H319.648V32.4241H326.745V55.4938L345.169 32.4241H353.356L339.986 49.1652L356.974 80.0599H348.645ZM372.319 80.0599V32.4241H379.416V80.0599H372.319ZM416.394 39.2295V80.0599H409.3V39.2295H395.789V32.4241H429.902V39.2295H416.394Z"
+	/>
+</svg>
+
+<style>
+	.svelte {
+		fill: hsl(0, 0%, 27%);
+	}
+
+	.kit {
+		fill: #8d8d93;
+	}
+
+	@media (prefers-color-scheme: dark) {
+		.svelte {
+			fill: hsl(0, 0%, 80%);
+		}
+
+		.kit {
+			fill: #8d8d93;
+		}
+
+		:global(body.light) .svelte {
+			fill: hsl(0, 0%, 27%);
+		}
+
+		:global(body.light) .kit {
+			fill: #8d8d93;
+		}
+	}
+
+	:global(body.dark) .svelte {
+		fill: hsl(0, 0%, 80%);
+	}
+
+	:global(body.dark) .kit {
+		fill: #8d8d93;
+	}
+</style>
diff --git a/sites/kit.svelte.dev/src/routes/home/svelte-logo.svg b/sites/kit.svelte.dev/src/routes/home/svelte-logo.svg
deleted file mode 100644
index 1bd561c1f1f9..000000000000
--- a/sites/kit.svelte.dev/src/routes/home/svelte-logo.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 358.464 235.952">
-	<defs>
-		<style>.a{fill:#ff3e00;}.b{fill:#fff;}.c{fill:#1273ff;}.d{fill:#ffd815;}</style>
-		<symbol id="a" viewBox="0 0 93.224 112">
-			<path class="a" d="M87.269,14.819C76.869-.066,56.328-4.478,41.477,4.984L15.4,21.608A29.921,29.921,0,0,0,1.876,41.651,31.514,31.514,0,0,0,4.984,61.882,30.006,30.006,0,0,0,.507,73.065,31.892,31.892,0,0,0,5.955,97.181c10.4,14.887,30.942,19.3,45.791,9.835L77.829,90.392A29.915,29.915,0,0,0,91.347,70.349a31.522,31.522,0,0,0-3.1-20.232,30.019,30.019,0,0,0,4.474-11.182,31.878,31.878,0,0,0-5.447-24.116"/>
-			<path class="b" d="M38.929,98.582a20.72,20.72,0,0,1-22.237-8.243,19.176,19.176,0,0,1-3.276-14.5,18.143,18.143,0,0,1,.623-2.435l.491-1.5,1.337.981a33.633,33.633,0,0,0,10.2,5.1l.969.294-.089.968A5.844,5.844,0,0,0,28,83.122a6.24,6.24,0,0,0,6.7,2.485,5.748,5.748,0,0,0,1.6-.7L62.382,68.281a5.43,5.43,0,0,0,2.451-3.631,5.794,5.794,0,0,0-.988-4.371,6.244,6.244,0,0,0-6.7-2.487,5.755,5.755,0,0,0-1.6.7l-9.953,6.345a19.06,19.06,0,0,1-5.3,2.326,20.719,20.719,0,0,1-22.237-8.243,19.171,19.171,0,0,1-3.277-14.5A17.992,17.992,0,0,1,22.915,32.37L49,15.747a19.03,19.03,0,0,1,5.3-2.329,20.72,20.72,0,0,1,22.237,8.243,19.176,19.176,0,0,1,3.277,14.5,18.453,18.453,0,0,1-.624,2.435l-.491,1.5-1.336-.979a33.616,33.616,0,0,0-10.2-5.1l-.97-.294.09-.968a5.859,5.859,0,0,0-1.052-3.878,6.241,6.241,0,0,0-6.7-2.485,5.748,5.748,0,0,0-1.6.7L30.842,43.719a5.421,5.421,0,0,0-2.449,3.63,5.79,5.79,0,0,0,.986,4.372,6.245,6.245,0,0,0,6.7,2.487,5.773,5.773,0,0,0,1.6-.7l9.952-6.342a18.978,18.978,0,0,1,5.3-2.328,20.718,20.718,0,0,1,22.236,8.243,19.171,19.171,0,0,1,3.277,14.5,18,18,0,0,1-8.13,12.054L44.229,96.253a19.017,19.017,0,0,1-5.3,2.329"/>
-		</symbol>
-	</defs>
-	<use width="93.224" height="112" transform="translate(34.228 29.267) scale(1.584)" xlink:href="#a"/>
-</svg>
diff --git a/sites/kit.svelte.dev/src/routes/home/sveltekit-logo.svg b/sites/kit.svelte.dev/src/routes/home/sveltekit-logo.svg
new file mode 100644
index 000000000000..0f798fc18f27
--- /dev/null
+++ b/sites/kit.svelte.dev/src/routes/home/sveltekit-logo.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 426 178"><g clip-path="url(#a)"><path fill="#FF3E00" d="M138.462 23.7403C121.988.16245 89.4515-6.82615 65.9276 8.16165L24.6216 34.4941a47.39385 47.39385 0 0 0-14.0607 13.6138 47.3943 47.3943 0 0 0-7.36133 18.1343c-1.97028 10.9322-.23783 22.2092 4.92308 32.0459a47.53387 47.53387 0 0 0-7.09157 17.7139c-1.17659 6.621-1.01934 13.411.46252 19.97 1.48186 6.56 4.2585 12.757 8.16711 18.23C26.1343 177.783 58.6728 184.773 82.1937 169.78l41.3153-26.332a47.38073 47.38073 0 0 0 14.056-13.615c3.687-5.467 6.193-11.643 7.357-18.133 1.973-10.931.245-22.2088-4.911-32.0477 3.535-5.3647 5.946-11.39 7.087-17.7123 1.178-6.621 1.022-13.4106-.46-19.9703a50.50827 50.50827 0 0 0-8.168-18.2294"/><path fill="#fff" d="M61.8915 156.421c-6.5017 1.69-13.3655 1.344-19.6644-.991-6.299-2.335-11.7298-6.546-15.559-12.066-2.3501-3.29-4.0197-7.017-4.9107-10.961a30.37297 30.37297 0 0 1-.2785-12.007c.2394-1.307.5692-2.596.9869-3.857l.7777-2.376 2.1178 1.554a53.2602 53.2602 0 0 0 16.1568 8.078l1.5349.466-.141 1.533a9.25738 9.25738 0 0 0 1.668 6.138c1.153 1.664 2.7891 2.934 4.6871 3.638 1.8981.704 3.9665.808 5.9257.298.8963-.238 1.751-.612 2.5344-1.108l41.3139-26.336c1.0109-.636 1.8789-1.476 2.5469-2.467.668-.99 1.123-2.109 1.335-3.284.212-1.201.183-2.431-.086-3.6197-.268-1.1887-.771-2.312-1.479-3.3044a9.88857 9.88857 0 0 0-4.6866-3.6382 9.89032 9.89032 0 0 0-5.9257-.3012 9.11356 9.11356 0 0 0-2.5344 1.1088L72.4457 102.969c-2.5945 1.648-5.4255 2.891-8.3952 3.684-6.5017 1.69-13.3656 1.345-19.6646-.99-6.299-2.335-11.7297-6.5469-15.5588-12.0667a30.36589 30.36589 0 0 1-4.9122-10.9604 30.36668 30.36668 0 0 1-.2786-12.0076 28.499 28.499 0 0 1 12.8891-19.0872L77.844 25.2102a30.14575 30.14575 0 0 1 8.3952-3.6891c6.5017-1.69 13.3655-1.3442 19.6648.9907 6.299 2.335 11.729 6.5466 15.559 12.0662 2.35 3.2902 4.02 7.0165 4.911 10.9606.892 3.944.986 8.0262.279 12.0074a29.12756 29.12756 0 0 1-.988 3.8571l-.778 2.376-2.116-1.5508a53.24063 53.24063 0 0 0-16.157-8.0784l-1.536-.4657.142-1.5333c.186-2.18-.404-4.3556-1.666-6.1427a9.88297 9.88297 0 0 0-4.6874-3.6374 9.88557 9.88557 0 0 0-5.9255-.2989 9.10642 9.10642 0 0 0-2.5344 1.1088l-41.325 26.3372a8.58762 8.58762 0 0 0-2.546 2.4658 8.58826 8.58826 0 0 0-1.3332 3.2841 9.17192 9.17192 0 0 0 1.5618 6.9253 9.8923 9.8923 0 0 0 4.6872 3.6378 9.89235 9.89235 0 0 0 5.9256.3016 9.14813 9.14813 0 0 0 2.5344-1.1088l15.764-10.0458a30.06152 30.06152 0 0 1 8.3952-3.6875c6.5015-1.6902 13.3651-1.3444 19.6643.9906 6.298 2.3349 11.729 6.5467 15.558 12.0663 2.35 3.29 4.02 7.0163 4.912 10.9604.891 3.9441.986 8.0263.278 12.0073-.7 3.903-2.208 7.618-4.425 10.905a28.49697 28.49697 0 0 1-8.453 8.189l-41.3183 26.323a30.11834 30.11834 0 0 1-8.3952 3.689Z"/></g><path fill="#8D8D93" d="m271.785 134-25.393-47.0564-15.983 19.2864V134H217V44h13.409v43.5864L265.218 44h15.468l-25.261 31.6296L287.521 134h-15.736Zm44.728 0V44h13.409v90h-13.409Zm83.273-77.1423V134h-13.403V56.8577h-25.527V44h64.451v12.8577h-25.521Z"/><defs><clipPath id="a"><path fill="#fff" d="M.228.267h147.667v177.408H.228z"/></clipPath></defs></svg>
\ No newline at end of file

From 61d654b07d1d6d6aef3c0a22702ddd79658e6ae5 Mon Sep 17 00:00:00 2001
From: Puru Vijay <47742487+PuruVJ@users.noreply.github.com>
Date: Tue, 11 Apr 2023 21:45:15 +0530
Subject: [PATCH 29/74] Fix (#9643)

---
 sites/kit.svelte.dev/src/routes/home/Hero.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sites/kit.svelte.dev/src/routes/home/Hero.svelte b/sites/kit.svelte.dev/src/routes/home/Hero.svelte
index dc796b78d966..1a6c556692aa 100644
--- a/sites/kit.svelte.dev/src/routes/home/Hero.svelte
+++ b/sites/kit.svelte.dev/src/routes/home/Hero.svelte
@@ -78,7 +78,7 @@
 		margin: 0 auto;
 	}
 
-	.logotype {
+	.logotype :global(svg) {
 		position: relative;
 		width: 100%;
 		max-width: 400px;

From d56246b6b37220ac36175a1eae014cd8a2dc818d Mon Sep 17 00:00:00 2001
From: Rich Harris <richard.a.harris@gmail.com>
Date: Tue, 11 Apr 2023 13:51:54 -0400
Subject: [PATCH 30/74] make full hostname appear in nav (#9645)

* make full hostname appear in nav

* bump site-kit

---------

Co-authored-by: Rich Harris <git@rich-harris.dev>
---
 pnpm-lock.yaml                                 | 8 ++++----
 sites/kit.svelte.dev/package.json              | 2 +-
 sites/kit.svelte.dev/src/routes/+layout.svelte | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index ab0a5e4324d5..ad337f181724 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -689,7 +689,7 @@ importers:
       '@sveltejs/adapter-vercel': workspace:^
       '@sveltejs/amp': workspace:^
       '@sveltejs/kit': workspace:^
-      '@sveltejs/site-kit': 4.0.1
+      '@sveltejs/site-kit': 4.0.2
       '@types/d3-geo': ^3.0.2
       '@types/node': ^16.18.6
       d3-geo: ^3.0.1
@@ -715,7 +715,7 @@ importers:
       '@sveltejs/adapter-vercel': link:../../packages/adapter-vercel
       '@sveltejs/amp': link:../../packages/amp
       '@sveltejs/kit': link:../../packages/kit
-      '@sveltejs/site-kit': 4.0.1_r4kk7euspt2csvnnykfg5n6pxi
+      '@sveltejs/site-kit': 4.0.2_r4kk7euspt2csvnnykfg5n6pxi
       '@types/d3-geo': 3.0.2
       '@types/node': 16.18.6
       flexsearch: 0.7.31
@@ -1590,8 +1590,8 @@ packages:
       picomatch: 2.3.1
       rollup: 3.7.0
 
-  /@sveltejs/site-kit/4.0.1_r4kk7euspt2csvnnykfg5n6pxi:
-    resolution: {integrity: sha512-4uMN2quyP+us87690TFMmmt5QtbapZrpbeqVoc9uvgBQqIs+2L0W5y033YnoKKxk/G40AnODYJ0Rqbwuome7jA==}
+  /@sveltejs/site-kit/4.0.2_r4kk7euspt2csvnnykfg5n6pxi:
+    resolution: {integrity: sha512-gqxBMZW5ZiO61m7Bn4x0fMUJC1M27ku1u7u0KJrg0zRSN3Zu30VdwE1SwWO4ueKxOxLXD2gzfUMdvoez7ZoBuQ==}
     peerDependencies:
       '@sveltejs/kit': ^1.0.0
       svelte: ^3.54.0
diff --git a/sites/kit.svelte.dev/package.json b/sites/kit.svelte.dev/package.json
index d34ea6760191..bfb90ab149da 100644
--- a/sites/kit.svelte.dev/package.json
+++ b/sites/kit.svelte.dev/package.json
@@ -14,7 +14,7 @@
 		"@sveltejs/adapter-vercel": "workspace:^",
 		"@sveltejs/amp": "workspace:^",
 		"@sveltejs/kit": "workspace:^",
-		"@sveltejs/site-kit": "4.0.1",
+		"@sveltejs/site-kit": "4.0.2",
 		"@types/d3-geo": "^3.0.2",
 		"@types/node": "^16.18.6",
 		"flexsearch": "^0.7.31",
diff --git a/sites/kit.svelte.dev/src/routes/+layout.svelte b/sites/kit.svelte.dev/src/routes/+layout.svelte
index c38be5db402b..37a3f295f2dc 100644
--- a/sites/kit.svelte.dev/src/routes/+layout.svelte
+++ b/sites/kit.svelte.dev/src/routes/+layout.svelte
@@ -12,7 +12,7 @@
 <Shell banner_bottom_height={banner_height}>
 	<Nav slot="top-nav">
 		<svelte:fragment slot="home">
-			<span><strong>kit</strong><span>.svelte.dev</span></span>
+			<span><strong>kit</strong>.svelte.dev</span>
 		</svelte:fragment>
 
 		<svelte:fragment slot="nav-center">

From 9b7330f3f2f20af1aee6aa8b890530825680dedc Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 12 Apr 2023 08:17:24 -0700
Subject: [PATCH 31/74] chore(deps): update pnpm to v8 (#9545)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 package.json   |    4 +-
 pnpm-lock.yaml | 3038 ++++++++++++++++++++++++++----------------------
 2 files changed, 1655 insertions(+), 1387 deletions(-)

diff --git a/package.json b/package.json
index 4376af29ba0a..e160e3c341cf 100644
--- a/package.json
+++ b/package.json
@@ -41,9 +41,9 @@
 		"tiny-glob": "^0.2.9",
 		"typescript": "^4.9.4"
 	},
-	"packageManager": "pnpm@7.32.0",
+	"packageManager": "pnpm@8.2.0",
 	"engines": {
-		"pnpm": "^7.0.0"
+		"pnpm": "^8.0.0"
 	},
 	"type": "module"
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index ad337f181724..057d0e7cdf39 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1,751 +1,1003 @@
-lockfileVersion: 5.4
+lockfileVersion: '6.0'
 
 importers:
 
   .:
-    specifiers:
-      '@changesets/cli': ^2.26.0
-      '@rollup/plugin-commonjs': ^24.0.0
-      '@rollup/plugin-json': ^6.0.0
-      '@rollup/plugin-node-resolve': ^15.0.1
-      '@svitejs/changesets-changelog-github-compact': ^1.1.0
-      '@typescript-eslint/eslint-plugin': ^5.53.0
-      eslint: ^8.33.0
-      eslint-plugin-unicorn: ^46.0.0
-      playwright: ^1.29.2
-      prettier: ^2.8.0
-      rollup: ^3.7.0
-      svelte: ^3.56.0
-      tiny-glob: ^0.2.9
-      typescript: ^4.9.4
     devDependencies:
-      '@changesets/cli': 2.26.0
-      '@rollup/plugin-commonjs': 24.0.0_rollup@3.7.0
-      '@rollup/plugin-json': 6.0.0_rollup@3.7.0
-      '@rollup/plugin-node-resolve': 15.0.1_rollup@3.7.0
-      '@svitejs/changesets-changelog-github-compact': 1.1.0
-      '@typescript-eslint/eslint-plugin': 5.53.0_zkdaqh7it7uc4cvz2haft7rc6u
-      eslint: 8.33.0
-      eslint-plugin-unicorn: 46.0.0_eslint@8.33.0
-      playwright: 1.29.2
-      prettier: 2.8.0
-      rollup: 3.7.0
-      svelte: 3.56.0
-      tiny-glob: 0.2.9
-      typescript: 4.9.4
+      '@changesets/cli':
+        specifier: ^2.26.0
+        version: 2.26.0
+      '@rollup/plugin-commonjs':
+        specifier: ^24.0.0
+        version: 24.0.0(rollup@3.7.0)
+      '@rollup/plugin-json':
+        specifier: ^6.0.0
+        version: 6.0.0(rollup@3.7.0)
+      '@rollup/plugin-node-resolve':
+        specifier: ^15.0.1
+        version: 15.0.1(rollup@3.7.0)
+      '@svitejs/changesets-changelog-github-compact':
+        specifier: ^1.1.0
+        version: 1.1.0
+      '@typescript-eslint/eslint-plugin':
+        specifier: ^5.53.0
+        version: 5.53.0(@typescript-eslint/parser@5.58.0)(eslint@8.33.0)(typescript@4.9.4)
+      eslint:
+        specifier: ^8.33.0
+        version: 8.33.0
+      eslint-plugin-unicorn:
+        specifier: ^46.0.0
+        version: 46.0.0(eslint@8.33.0)
+      playwright:
+        specifier: ^1.29.2
+        version: 1.29.2
+      prettier:
+        specifier: ^2.8.0
+        version: 2.8.0
+      rollup:
+        specifier: ^3.7.0
+        version: 3.7.0
+      svelte:
+        specifier: ^3.56.0
+        version: 3.56.0
+      tiny-glob:
+        specifier: ^0.2.9
+        version: 0.2.9
+      typescript:
+        specifier: ^4.9.4
+        version: 4.9.4
 
   packages/adapter-auto:
-    specifiers:
-      '@sveltejs/kit': workspace:^
-      '@types/node': ^16.18.6
-      import-meta-resolve: ^2.2.0
-      typescript: ^4.9.4
     dependencies:
-      import-meta-resolve: 2.2.0
+      import-meta-resolve:
+        specifier: ^2.2.0
+        version: 2.2.0
     devDependencies:
-      '@sveltejs/kit': link:../kit
-      '@types/node': 16.18.6
-      typescript: 4.9.4
+      '@sveltejs/kit':
+        specifier: workspace:^
+        version: link:../kit
+      '@types/node':
+        specifier: ^16.18.6
+        version: 16.18.6
+      typescript:
+        specifier: ^4.9.4
+        version: 4.9.4
 
   packages/adapter-cloudflare:
-    specifiers:
-      '@cloudflare/workers-types': ^4.20221111.1
-      '@types/node': ^16.18.6
-      '@types/ws': ^8.5.3
-      esbuild: ^0.16.3
-      typescript: ^4.9.4
-      worktop: 0.8.0-next.14
     dependencies:
-      '@cloudflare/workers-types': 4.20221111.1
-      esbuild: 0.16.3
-      worktop: 0.8.0-next.14
+      '@cloudflare/workers-types':
+        specifier: ^4.20221111.1
+        version: 4.20221111.1
+      '@sveltejs/kit':
+        specifier: ^1.0.0
+        version: link:../kit
+      esbuild:
+        specifier: ^0.16.3
+        version: 0.16.3
+      worktop:
+        specifier: 0.8.0-next.14
+        version: 0.8.0-next.14
     devDependencies:
-      '@types/node': 16.18.6
-      '@types/ws': 8.5.3
-      typescript: 4.9.4
+      '@types/node':
+        specifier: ^16.18.6
+        version: 16.18.6
+      '@types/ws':
+        specifier: ^8.5.3
+        version: 8.5.3
+      typescript:
+        specifier: ^4.9.4
+        version: 4.9.4
 
   packages/adapter-cloudflare-workers:
-    specifiers:
-      '@cloudflare/kv-asset-handler': ^0.3.0
-      '@cloudflare/workers-types': ^4.20221111.1
-      '@iarna/toml': ^2.2.5
-      '@types/node': ^16.18.6
-      esbuild: ^0.16.3
-      typescript: ^4.9.4
     dependencies:
-      '@cloudflare/workers-types': 4.20221111.1
-      '@iarna/toml': 2.2.5
-      esbuild: 0.16.3
+      '@cloudflare/workers-types':
+        specifier: ^4.20221111.1
+        version: 4.20221111.1
+      '@iarna/toml':
+        specifier: ^2.2.5
+        version: 2.2.5
+      '@sveltejs/kit':
+        specifier: ^1.0.0
+        version: link:../kit
+      esbuild:
+        specifier: ^0.16.3
+        version: 0.16.3
     devDependencies:
-      '@cloudflare/kv-asset-handler': 0.3.0
-      '@types/node': 16.18.6
-      typescript: 4.9.4
+      '@cloudflare/kv-asset-handler':
+        specifier: ^0.3.0
+        version: 0.3.0
+      '@types/node':
+        specifier: ^16.18.6
+        version: 16.18.6
+      typescript:
+        specifier: ^4.9.4
+        version: 4.9.4
 
   packages/adapter-netlify:
-    specifiers:
-      '@iarna/toml': ^2.2.5
-      '@netlify/functions': ^1.3.0
-      '@rollup/plugin-commonjs': ^24.0.0
-      '@rollup/plugin-json': ^6.0.0
-      '@rollup/plugin-node-resolve': ^15.0.1
-      '@sveltejs/kit': workspace:^
-      '@types/node': ^16.18.6
-      '@types/set-cookie-parser': ^2.4.2
-      esbuild: ^0.16.3
-      rimraf: ^5.0.0
-      rollup: ^3.7.0
-      set-cookie-parser: ^2.5.1
-      typescript: ^4.9.4
-      uvu: ^0.5.6
     dependencies:
-      '@iarna/toml': 2.2.5
-      esbuild: 0.16.3
-      set-cookie-parser: 2.5.1
+      '@iarna/toml':
+        specifier: ^2.2.5
+        version: 2.2.5
+      esbuild:
+        specifier: ^0.16.3
+        version: 0.16.3
+      set-cookie-parser:
+        specifier: ^2.5.1
+        version: 2.5.1
     devDependencies:
-      '@netlify/functions': 1.3.0
-      '@rollup/plugin-commonjs': 24.0.0_rollup@3.7.0
-      '@rollup/plugin-json': 6.0.0_rollup@3.7.0
-      '@rollup/plugin-node-resolve': 15.0.1_rollup@3.7.0
-      '@sveltejs/kit': link:../kit
-      '@types/node': 16.18.6
-      '@types/set-cookie-parser': 2.4.2
-      rimraf: 5.0.0
-      rollup: 3.7.0
-      typescript: 4.9.4
-      uvu: 0.5.6
+      '@netlify/functions':
+        specifier: ^1.3.0
+        version: 1.3.0
+      '@rollup/plugin-commonjs':
+        specifier: ^24.0.0
+        version: 24.0.0(rollup@3.7.0)
+      '@rollup/plugin-json':
+        specifier: ^6.0.0
+        version: 6.0.0(rollup@3.7.0)
+      '@rollup/plugin-node-resolve':
+        specifier: ^15.0.1
+        version: 15.0.1(rollup@3.7.0)
+      '@sveltejs/kit':
+        specifier: workspace:^
+        version: link:../kit
+      '@types/node':
+        specifier: ^16.18.6
+        version: 16.18.6
+      '@types/set-cookie-parser':
+        specifier: ^2.4.2
+        version: 2.4.2
+      rimraf:
+        specifier: ^5.0.0
+        version: 5.0.0
+      rollup:
+        specifier: ^3.7.0
+        version: 3.7.0
+      typescript:
+        specifier: ^4.9.4
+        version: 4.9.4
+      uvu:
+        specifier: ^0.5.6
+        version: 0.5.6
 
   packages/adapter-node:
-    specifiers:
-      '@polka/url': ^1.0.0-next.21
-      '@rollup/plugin-commonjs': ^24.0.0
-      '@rollup/plugin-json': ^6.0.0
-      '@rollup/plugin-node-resolve': ^15.0.1
-      '@sveltejs/kit': workspace:^
-      '@types/node': ^16.18.6
-      c8: ^7.12.0
-      polka: ^1.0.0-next.22
-      rimraf: ^5.0.0
-      rollup: ^3.7.0
-      sirv: ^2.0.2
-      typescript: ^4.9.4
-      uvu: ^0.5.6
     dependencies:
-      '@rollup/plugin-commonjs': 24.0.0_rollup@3.7.0
-      '@rollup/plugin-json': 6.0.0_rollup@3.7.0
-      '@rollup/plugin-node-resolve': 15.0.1_rollup@3.7.0
-      rollup: 3.7.0
+      '@rollup/plugin-commonjs':
+        specifier: ^24.0.0
+        version: 24.0.0(rollup@3.7.0)
+      '@rollup/plugin-json':
+        specifier: ^6.0.0
+        version: 6.0.0(rollup@3.7.0)
+      '@rollup/plugin-node-resolve':
+        specifier: ^15.0.1
+        version: 15.0.1(rollup@3.7.0)
+      rollup:
+        specifier: ^3.7.0
+        version: 3.7.0
     devDependencies:
-      '@polka/url': 1.0.0-next.21
-      '@sveltejs/kit': link:../kit
-      '@types/node': 16.18.6
-      c8: 7.12.0
-      polka: 1.0.0-next.22
-      rimraf: 5.0.0
-      sirv: 2.0.2
-      typescript: 4.9.4
-      uvu: 0.5.6
+      '@polka/url':
+        specifier: ^1.0.0-next.21
+        version: 1.0.0-next.21
+      '@sveltejs/kit':
+        specifier: workspace:^
+        version: link:../kit
+      '@types/node':
+        specifier: ^16.18.6
+        version: 16.18.6
+      c8:
+        specifier: ^7.12.0
+        version: 7.12.0
+      polka:
+        specifier: ^1.0.0-next.22
+        version: 1.0.0-next.22
+      rimraf:
+        specifier: ^5.0.0
+        version: 5.0.0
+      sirv:
+        specifier: ^2.0.2
+        version: 2.0.2
+      typescript:
+        specifier: ^4.9.4
+        version: 4.9.4
+      uvu:
+        specifier: ^0.5.6
+        version: 0.5.6
 
   packages/adapter-static:
-    specifiers:
-      '@sveltejs/kit': workspace:^
-      '@types/node': ^16.18.6
-      sirv: ^2.0.2
-      svelte: ^3.56.0
-      typescript: ^4.9.4
-      uvu: ^0.5.6
-      vite: ^4.2.0
     devDependencies:
-      '@sveltejs/kit': link:../kit
-      '@types/node': 16.18.6
-      sirv: 2.0.2
-      svelte: 3.56.0
-      typescript: 4.9.4
-      uvu: 0.5.6
-      vite: 4.2.0_@types+node@16.18.6
+      '@sveltejs/kit':
+        specifier: workspace:^
+        version: link:../kit
+      '@types/node':
+        specifier: ^16.18.6
+        version: 16.18.6
+      sirv:
+        specifier: ^2.0.2
+        version: 2.0.2
+      svelte:
+        specifier: ^3.56.0
+        version: 3.56.0
+      typescript:
+        specifier: ^4.9.4
+        version: 4.9.4
+      uvu:
+        specifier: ^0.5.6
+        version: 0.5.6
+      vite:
+        specifier: ^4.2.0
+        version: 4.2.0(@types/node@16.18.6)
 
   packages/adapter-static/test/apps/prerendered:
-    specifiers:
-      '@sveltejs/kit': workspace:^
-      svelte: ^3.56.0
-      vite: ^4.2.0
     devDependencies:
-      '@sveltejs/kit': link:../../../../kit
-      svelte: 3.56.0
-      vite: 4.2.0
+      '@sveltejs/kit':
+        specifier: workspace:^
+        version: link:../../../../kit
+      svelte:
+        specifier: ^3.56.0
+        version: 3.56.0
+      vite:
+        specifier: ^4.2.0
+        version: 4.2.0(@types/node@16.18.6)
 
   packages/adapter-static/test/apps/spa:
-    specifiers:
-      '@sveltejs/adapter-node': workspace:^
-      '@sveltejs/kit': workspace:^
-      sirv-cli: ^2.0.2
-      svelte: ^3.56.0
-      vite: ^4.2.0
     devDependencies:
-      '@sveltejs/adapter-node': link:../../../../adapter-node
-      '@sveltejs/kit': link:../../../../kit
-      sirv-cli: 2.0.2
-      svelte: 3.56.0
-      vite: 4.2.0
+      '@sveltejs/adapter-node':
+        specifier: workspace:^
+        version: link:../../../../adapter-node
+      '@sveltejs/kit':
+        specifier: workspace:^
+        version: link:../../../../kit
+      sirv-cli:
+        specifier: ^2.0.2
+        version: 2.0.2
+      svelte:
+        specifier: ^3.56.0
+        version: 3.56.0
+      vite:
+        specifier: ^4.2.0
+        version: 4.2.0(@types/node@16.18.6)
 
   packages/adapter-vercel:
-    specifiers:
-      '@sveltejs/kit': workspace:^
-      '@types/node': ^16.18.6
-      '@vercel/nft': ^0.22.1
-      esbuild: ^0.16.3
-      typescript: ^4.9.4
     dependencies:
-      '@vercel/nft': 0.22.1
-      esbuild: 0.16.3
+      '@vercel/nft':
+        specifier: ^0.22.1
+        version: 0.22.1
+      esbuild:
+        specifier: ^0.16.3
+        version: 0.16.3
     devDependencies:
-      '@sveltejs/kit': link:../kit
-      '@types/node': 16.18.6
-      typescript: 4.9.4
+      '@sveltejs/kit':
+        specifier: workspace:^
+        version: link:../kit
+      '@types/node':
+        specifier: ^16.18.6
+        version: 16.18.6
+      typescript:
+        specifier: ^4.9.4
+        version: 4.9.4
 
   packages/amp:
-    specifiers: {}
+    dependencies:
+      '@sveltejs/kit':
+        specifier: ^1.0.0
+        version: link:../kit
 
   packages/create-svelte:
-    specifiers:
-      '@clack/prompts': ^0.6.3
-      '@playwright/test': ^1.28.1
-      '@types/gitignore-parser': ^0.0.0
-      '@types/prettier': ^2.7.1
-      '@types/prompts': ^2.4.1
-      gitignore-parser: ^0.0.2
-      kleur: ^4.1.5
-      prettier: ^2.8.0
-      prettier-plugin-svelte: ^2.8.1
-      sucrase: ^3.29.0
-      svelte: ^3.56.0
-      tiny-glob: ^0.2.9
-      uvu: ^0.5.6
-    dependencies:
-      '@clack/prompts': 0.6.3
-      kleur: 4.1.5
+    dependencies:
+      '@clack/prompts':
+        specifier: ^0.6.3
+        version: 0.6.3
+      kleur:
+        specifier: ^4.1.5
+        version: 4.1.5
     devDependencies:
-      '@playwright/test': 1.29.2
-      '@types/gitignore-parser': 0.0.0
-      '@types/prettier': 2.7.1
-      '@types/prompts': 2.4.1
-      gitignore-parser: 0.0.2
-      prettier: 2.8.0
-      prettier-plugin-svelte: 2.8.1_ut7qioamojvh7i5msfgqwwrnie
-      sucrase: 3.29.0
-      svelte: 3.56.0
-      tiny-glob: 0.2.9
-      uvu: 0.5.6
+      '@playwright/test':
+        specifier: ^1.28.1
+        version: 1.29.2
+      '@types/gitignore-parser':
+        specifier: ^0.0.0
+        version: 0.0.0
+      '@types/prettier':
+        specifier: ^2.7.1
+        version: 2.7.1
+      '@types/prompts':
+        specifier: ^2.4.1
+        version: 2.4.1
+      gitignore-parser:
+        specifier: ^0.0.2
+        version: 0.0.2
+      prettier:
+        specifier: ^2.8.0
+        version: 2.8.0
+      prettier-plugin-svelte:
+        specifier: ^2.8.1
+        version: 2.8.1(prettier@2.8.0)(svelte@3.56.0)
+      sucrase:
+        specifier: ^3.29.0
+        version: 3.29.0
+      svelte:
+        specifier: ^3.56.0
+        version: 3.56.0
+      tiny-glob:
+        specifier: ^0.2.9
+        version: 0.2.9
+      uvu:
+        specifier: ^0.5.6
+        version: 0.5.6
 
   packages/create-svelte/templates/default:
-    specifiers:
-      '@fontsource/fira-mono': ^4.5.10
-      '@neoconfetti/svelte': ^1.0.0
-      '@sveltejs/adapter-auto': workspace:*
-      '@sveltejs/kit': workspace:*
-      svelte: ^3.56.0
-      typescript: ^5.0.0
-      vite: ^4.2.0
-    dependencies:
-      '@fontsource/fira-mono': 4.5.10
+    dependencies:
+      '@fontsource/fira-mono':
+        specifier: ^4.5.10
+        version: 4.5.10
     devDependencies:
-      '@neoconfetti/svelte': 1.0.0
-      '@sveltejs/adapter-auto': link:../../../adapter-auto
-      '@sveltejs/kit': link:../../../kit
-      svelte: 3.56.0
-      typescript: 5.0.2
-      vite: 4.2.0
+      '@neoconfetti/svelte':
+        specifier: ^1.0.0
+        version: 1.0.0
+      '@sveltejs/adapter-auto':
+        specifier: workspace:*
+        version: link:../../../adapter-auto
+      '@sveltejs/kit':
+        specifier: workspace:*
+        version: link:../../../kit
+      svelte:
+        specifier: ^3.56.0
+        version: 3.56.0
+      typescript:
+        specifier: ^5.0.0
+        version: 5.0.2
+      vite:
+        specifier: ^4.2.0
+        version: 4.2.0(@types/node@16.18.6)
 
   packages/create-svelte/templates/skeleton:
-    specifiers:
-      '@sveltejs/adapter-auto': workspace:*
     devDependencies:
-      '@sveltejs/adapter-auto': link:../../../adapter-auto
+      '@sveltejs/adapter-auto':
+        specifier: workspace:*
+        version: link:../../../adapter-auto
 
   packages/kit:
-    specifiers:
-      '@playwright/test': ^1.29.2
-      '@sveltejs/vite-plugin-svelte': ^2.0.0
-      '@types/connect': ^3.4.35
-      '@types/cookie': ^0.5.1
-      '@types/marked': ^4.0.7
-      '@types/mime': ^3.0.1
-      '@types/node': ^16.18.6
-      '@types/sade': ^1.7.4
-      '@types/set-cookie-parser': ^2.4.2
-      cookie: ^0.5.0
-      devalue: ^4.3.0
-      esm-env: ^1.0.0
-      kleur: ^4.1.5
-      magic-string: ^0.30.0
-      marked: ^4.2.3
-      mime: ^3.0.0
-      rollup: ^3.7.0
-      sade: ^1.8.1
-      set-cookie-parser: ^2.5.1
-      sirv: ^2.0.2
-      svelte: ^3.56.0
-      svelte-preprocess: ^5.0.0
-      tiny-glob: ^0.2.9
-      typescript: ^4.9.4
-      undici: 5.20.0
-      uvu: ^0.5.6
-      vite: ^4.2.0
-    dependencies:
-      '@sveltejs/vite-plugin-svelte': 2.0.0_svelte@3.56.0+vite@4.2.0
-      '@types/cookie': 0.5.1
-      cookie: 0.5.0
-      devalue: 4.3.0
-      esm-env: 1.0.0
-      kleur: 4.1.5
-      magic-string: 0.30.0
-      mime: 3.0.0
-      sade: 1.8.1
-      set-cookie-parser: 2.5.1
-      sirv: 2.0.2
-      tiny-glob: 0.2.9
-      undici: 5.20.0
+    dependencies:
+      '@sveltejs/vite-plugin-svelte':
+        specifier: ^2.0.0
+        version: 2.0.0(svelte@3.56.0)(vite@4.2.0)
+      '@types/cookie':
+        specifier: ^0.5.1
+        version: 0.5.1
+      cookie:
+        specifier: ^0.5.0
+        version: 0.5.0
+      devalue:
+        specifier: ^4.3.0
+        version: 4.3.0
+      esm-env:
+        specifier: ^1.0.0
+        version: 1.0.0
+      kleur:
+        specifier: ^4.1.5
+        version: 4.1.5
+      magic-string:
+        specifier: ^0.30.0
+        version: 0.30.0
+      mime:
+        specifier: ^3.0.0
+        version: 3.0.0
+      sade:
+        specifier: ^1.8.1
+        version: 1.8.1
+      set-cookie-parser:
+        specifier: ^2.5.1
+        version: 2.5.1
+      sirv:
+        specifier: ^2.0.2
+        version: 2.0.2
+      tiny-glob:
+        specifier: ^0.2.9
+        version: 0.2.9
+      undici:
+        specifier: 5.20.0
+        version: 5.20.0
     devDependencies:
-      '@playwright/test': 1.29.2
-      '@types/connect': 3.4.35
-      '@types/marked': 4.0.7
-      '@types/mime': 3.0.1
-      '@types/node': 16.18.6
-      '@types/sade': 1.7.4
-      '@types/set-cookie-parser': 2.4.2
-      marked: 4.2.3
-      rollup: 3.7.0
-      svelte: 3.56.0
-      svelte-preprocess: 5.0.0_llpdtttxqmim2s7ymcc5fxs7oi
-      typescript: 4.9.4
-      uvu: 0.5.6
-      vite: 4.2.0_@types+node@16.18.6
+      '@playwright/test':
+        specifier: ^1.29.2
+        version: 1.29.2
+      '@types/connect':
+        specifier: ^3.4.35
+        version: 3.4.35
+      '@types/marked':
+        specifier: ^4.0.7
+        version: 4.0.7
+      '@types/mime':
+        specifier: ^3.0.1
+        version: 3.0.1
+      '@types/node':
+        specifier: ^16.18.6
+        version: 16.18.6
+      '@types/sade':
+        specifier: ^1.7.4
+        version: 1.7.4
+      '@types/set-cookie-parser':
+        specifier: ^2.4.2
+        version: 2.4.2
+      marked:
+        specifier: ^4.2.3
+        version: 4.2.3
+      rollup:
+        specifier: ^3.7.0
+        version: 3.7.0
+      svelte:
+        specifier: ^3.56.0
+        version: 3.56.0
+      svelte-preprocess:
+        specifier: ^5.0.0
+        version: 5.0.0(svelte@3.56.0)(typescript@4.9.4)
+      typescript:
+        specifier: ^4.9.4
+        version: 4.9.4
+      uvu:
+        specifier: ^0.5.6
+        version: 0.5.6
+      vite:
+        specifier: ^4.2.0
+        version: 4.2.0(@types/node@16.18.6)
 
   packages/kit/test/apps/amp:
-    specifiers:
-      '@sveltejs/amp': workspace:^
-      '@sveltejs/kit': workspace:^
-      cross-env: ^7.0.3
-      purify-css: ^1.2.5
-      svelte: ^3.56.0
-      svelte-check: ^3.0.2
-      typescript: ^4.9.4
-      vite: ^4.2.0
     devDependencies:
-      '@sveltejs/amp': link:../../../../amp
-      '@sveltejs/kit': link:../../..
-      cross-env: 7.0.3
-      purify-css: 1.2.5
-      svelte: 3.56.0
-      svelte-check: 3.0.2_svelte@3.56.0
-      typescript: 4.9.4
-      vite: 4.2.0
+      '@sveltejs/amp':
+        specifier: workspace:^
+        version: link:../../../../amp
+      '@sveltejs/kit':
+        specifier: workspace:^
+        version: link:../../..
+      cross-env:
+        specifier: ^7.0.3
+        version: 7.0.3
+      purify-css:
+        specifier: ^1.2.5
+        version: 1.2.5
+      svelte:
+        specifier: ^3.56.0
+        version: 3.56.0
+      svelte-check:
+        specifier: ^3.0.2
+        version: 3.0.2(svelte@3.56.0)
+      typescript:
+        specifier: ^4.9.4
+        version: 4.9.4
+      vite:
+        specifier: ^4.2.0
+        version: 4.2.0(@types/node@16.18.6)
 
   packages/kit/test/apps/basics:
-    specifiers:
-      '@sveltejs/kit': workspace:^
-      cross-env: ^7.0.3
-      rimraf: ^5.0.0
-      svelte: ^3.56.0
-      svelte-check: ^3.0.2
-      typescript: ^4.9.4
-      vite: ^4.2.0
     devDependencies:
-      '@sveltejs/kit': link:../../..
-      cross-env: 7.0.3
-      rimraf: 5.0.0
-      svelte: 3.56.0
-      svelte-check: 3.0.2_svelte@3.56.0
-      typescript: 4.9.4
-      vite: 4.2.0
+      '@sveltejs/kit':
+        specifier: workspace:^
+        version: link:../../..
+      cross-env:
+        specifier: ^7.0.3
+        version: 7.0.3
+      rimraf:
+        specifier: ^5.0.0
+        version: 5.0.0
+      svelte:
+        specifier: ^3.56.0
+        version: 3.56.0
+      svelte-check:
+        specifier: ^3.0.2
+        version: 3.0.2(svelte@3.56.0)
+      typescript:
+        specifier: ^4.9.4
+        version: 4.9.4
+      vite:
+        specifier: ^4.2.0
+        version: 4.2.0(@types/node@16.18.6)
 
   packages/kit/test/apps/dev-only:
-    specifiers:
-      '@sveltejs/kit': workspace:^
-      cross-env: ^7.0.3
-      svelte: ^3.56.0
-      svelte-check: ^3.0.2
-      typescript: ^4.9.4
-      vite: ^4.2.0
     devDependencies:
-      '@sveltejs/kit': link:../../..
-      cross-env: 7.0.3
-      svelte: 3.56.0
-      svelte-check: 3.0.2_svelte@3.56.0
-      typescript: 4.9.4
-      vite: 4.2.0
+      '@sveltejs/kit':
+        specifier: workspace:^
+        version: link:../../..
+      cross-env:
+        specifier: ^7.0.3
+        version: 7.0.3
+      svelte:
+        specifier: ^3.56.0
+        version: 3.56.0
+      svelte-check:
+        specifier: ^3.0.2
+        version: 3.0.2(svelte@3.56.0)
+      typescript:
+        specifier: ^4.9.4
+        version: 4.9.4
+      vite:
+        specifier: ^4.2.0
+        version: 4.2.0(@types/node@16.18.6)
 
   packages/kit/test/apps/options:
-    specifiers:
-      '@sveltejs/kit': workspace:^
-      cross-env: ^7.0.3
-      svelte: ^3.56.0
-      svelte-check: ^3.0.2
-      typescript: ^4.9.4
-      vite: ^4.2.0
     devDependencies:
-      '@sveltejs/kit': link:../../..
-      cross-env: 7.0.3
-      svelte: 3.56.0
-      svelte-check: 3.0.2_svelte@3.56.0
-      typescript: 4.9.4
-      vite: 4.2.0
+      '@sveltejs/kit':
+        specifier: workspace:^
+        version: link:../../..
+      cross-env:
+        specifier: ^7.0.3
+        version: 7.0.3
+      svelte:
+        specifier: ^3.56.0
+        version: 3.56.0
+      svelte-check:
+        specifier: ^3.0.2
+        version: 3.0.2(svelte@3.56.0)
+      typescript:
+        specifier: ^4.9.4
+        version: 4.9.4
+      vite:
+        specifier: ^4.2.0
+        version: 4.2.0(@types/node@16.18.6)
 
   packages/kit/test/apps/options-2:
-    specifiers:
-      '@sveltejs/adapter-node': workspace:^
-      '@sveltejs/kit': workspace:^
-      cross-env: ^7.0.3
-      svelte: ^3.56.0
-      svelte-check: ^3.0.2
-      typescript: ^4.9.4
-      vite: ^4.2.0
     devDependencies:
-      '@sveltejs/adapter-node': link:../../../../adapter-node
-      '@sveltejs/kit': link:../../..
-      cross-env: 7.0.3
-      svelte: 3.56.0
-      svelte-check: 3.0.2_svelte@3.56.0
-      typescript: 4.9.4
-      vite: 4.2.0
+      '@sveltejs/adapter-node':
+        specifier: workspace:^
+        version: link:../../../../adapter-node
+      '@sveltejs/kit':
+        specifier: workspace:^
+        version: link:../../..
+      cross-env:
+        specifier: ^7.0.3
+        version: 7.0.3
+      svelte:
+        specifier: ^3.56.0
+        version: 3.56.0
+      svelte-check:
+        specifier: ^3.0.2
+        version: 3.0.2(svelte@3.56.0)
+      typescript:
+        specifier: ^4.9.4
+        version: 4.9.4
+      vite:
+        specifier: ^4.2.0
+        version: 4.2.0(@types/node@16.18.6)
 
   packages/kit/test/apps/writes:
-    specifiers:
-      '@sveltejs/kit': workspace:^
-      cross-env: ^7.0.3
-      rimraf: ^5.0.0
-      svelte: ^3.56.0
-      svelte-check: ^3.0.2
-      typescript: ^4.9.4
-      vite: ^4.2.0
     devDependencies:
-      '@sveltejs/kit': link:../../..
-      cross-env: 7.0.3
-      rimraf: 5.0.0
-      svelte: 3.56.0
-      svelte-check: 3.0.2_svelte@3.56.0
-      typescript: 4.9.4
-      vite: 4.2.0
+      '@sveltejs/kit':
+        specifier: workspace:^
+        version: link:../../..
+      cross-env:
+        specifier: ^7.0.3
+        version: 7.0.3
+      rimraf:
+        specifier: ^5.0.0
+        version: 5.0.0
+      svelte:
+        specifier: ^3.56.0
+        version: 3.56.0
+      svelte-check:
+        specifier: ^3.0.2
+        version: 3.0.2(svelte@3.56.0)
+      typescript:
+        specifier: ^4.9.4
+        version: 4.9.4
+      vite:
+        specifier: ^4.2.0
+        version: 4.2.0(@types/node@16.18.6)
 
   packages/kit/test/build-errors:
-    specifiers:
-      uvu: ^0.5.6
     devDependencies:
-      uvu: 0.5.6
+      uvu:
+        specifier: ^0.5.6
+        version: 0.5.6
 
   packages/kit/test/build-errors/apps/prerenderable-incorrect-fragment:
-    specifiers:
-      '@sveltejs/adapter-auto': workspace:^
-      '@sveltejs/kit': workspace:^
-      svelte: ^3.56.0
-      svelte-check: ^3.0.2
-      typescript: ^4.9.4
-      vite: ^4.2.0
     devDependencies:
-      '@sveltejs/adapter-auto': link:../../../../../adapter-auto
-      '@sveltejs/kit': link:../../../..
-      svelte: 3.56.0
-      svelte-check: 3.0.2_svelte@3.56.0
-      typescript: 4.9.4
-      vite: 4.2.0
+      '@sveltejs/adapter-auto':
+        specifier: workspace:^
+        version: link:../../../../../adapter-auto
+      '@sveltejs/kit':
+        specifier: workspace:^
+        version: link:../../../..
+      svelte:
+        specifier: ^3.56.0
+        version: 3.56.0
+      svelte-check:
+        specifier: ^3.0.2
+        version: 3.0.2(svelte@3.56.0)
+      typescript:
+        specifier: ^4.9.4
+        version: 4.9.4
+      vite:
+        specifier: ^4.2.0
+        version: 4.2.0(@types/node@16.18.6)
 
   packages/kit/test/build-errors/apps/prerenderable-not-prerendered:
-    specifiers:
-      '@sveltejs/adapter-auto': workspace:^
-      '@sveltejs/kit': workspace:^
-      svelte: ^3.56.0
-      svelte-check: ^3.0.2
-      typescript: ^4.9.4
-      vite: ^4.2.0
     devDependencies:
-      '@sveltejs/adapter-auto': link:../../../../../adapter-auto
-      '@sveltejs/kit': link:../../../..
-      svelte: 3.56.0
-      svelte-check: 3.0.2_svelte@3.56.0
-      typescript: 4.9.4
-      vite: 4.2.0
+      '@sveltejs/adapter-auto':
+        specifier: workspace:^
+        version: link:../../../../../adapter-auto
+      '@sveltejs/kit':
+        specifier: workspace:^
+        version: link:../../../..
+      svelte:
+        specifier: ^3.56.0
+        version: 3.56.0
+      svelte-check:
+        specifier: ^3.0.2
+        version: 3.0.2(svelte@3.56.0)
+      typescript:
+        specifier: ^4.9.4
+        version: 4.9.4
+      vite:
+        specifier: ^4.2.0
+        version: 4.2.0(@types/node@16.18.6)
 
   packages/kit/test/build-errors/apps/private-dynamic-env:
-    specifiers:
-      '@sveltejs/kit': workspace:^
-      svelte: ^3.56.0
-      svelte-check: ^3.0.2
-      typescript: ^4.9.4
-      vite: ^4.2.0
     devDependencies:
-      '@sveltejs/kit': link:../../../..
-      svelte: 3.56.0
-      svelte-check: 3.0.2_svelte@3.56.0
-      typescript: 4.9.4
-      vite: 4.2.0
+      '@sveltejs/kit':
+        specifier: workspace:^
+        version: link:../../../..
+      svelte:
+        specifier: ^3.56.0
+        version: 3.56.0
+      svelte-check:
+        specifier: ^3.0.2
+        version: 3.0.2(svelte@3.56.0)
+      typescript:
+        specifier: ^4.9.4
+        version: 4.9.4
+      vite:
+        specifier: ^4.2.0
+        version: 4.2.0(@types/node@16.18.6)
 
   packages/kit/test/build-errors/apps/private-dynamic-env-dynamic-import:
-    specifiers:
-      '@sveltejs/kit': workspace:^
-      svelte: ^3.56.0
-      svelte-check: ^3.0.2
-      typescript: ^4.9.4
-      vite: ^4.2.0
     devDependencies:
-      '@sveltejs/kit': link:../../../..
-      svelte: 3.56.0
-      svelte-check: 3.0.2_svelte@3.56.0
-      typescript: 4.9.4
-      vite: 4.2.0
+      '@sveltejs/kit':
+        specifier: workspace:^
+        version: link:../../../..
+      svelte:
+        specifier: ^3.56.0
+        version: 3.56.0
+      svelte-check:
+        specifier: ^3.0.2
+        version: 3.0.2(svelte@3.56.0)
+      typescript:
+        specifier: ^4.9.4
+        version: 4.9.4
+      vite:
+        specifier: ^4.2.0
+        version: 4.2.0(@types/node@16.18.6)
 
   packages/kit/test/build-errors/apps/private-static-env:
-    specifiers:
-      '@sveltejs/kit': workspace:^
-      cross-env: ^7.0.3
-      svelte: ^3.56.0
-      svelte-check: ^3.0.2
-      typescript: ^4.9.4
-      vite: ^4.2.0
     devDependencies:
-      '@sveltejs/kit': link:../../../..
-      cross-env: 7.0.3
-      svelte: 3.56.0
-      svelte-check: 3.0.2_svelte@3.56.0
-      typescript: 4.9.4
-      vite: 4.2.0
+      '@sveltejs/kit':
+        specifier: workspace:^
+        version: link:../../../..
+      cross-env:
+        specifier: ^7.0.3
+        version: 7.0.3
+      svelte:
+        specifier: ^3.56.0
+        version: 3.56.0
+      svelte-check:
+        specifier: ^3.0.2
+        version: 3.0.2(svelte@3.56.0)
+      typescript:
+        specifier: ^4.9.4
+        version: 4.9.4
+      vite:
+        specifier: ^4.2.0
+        version: 4.2.0(@types/node@16.18.6)
 
   packages/kit/test/build-errors/apps/private-static-env-dynamic-import:
-    specifiers:
-      '@sveltejs/kit': workspace:^
-      svelte: ^3.56.0
-      svelte-check: ^3.0.2
-      typescript: ^4.9.4
-      vite: ^4.2.0
     devDependencies:
-      '@sveltejs/kit': link:../../../..
-      svelte: 3.56.0
-      svelte-check: 3.0.2_svelte@3.56.0
-      typescript: 4.9.4
-      vite: 4.2.0
+      '@sveltejs/kit':
+        specifier: workspace:^
+        version: link:../../../..
+      svelte:
+        specifier: ^3.56.0
+        version: 3.56.0
+      svelte-check:
+        specifier: ^3.0.2
+        version: 3.0.2(svelte@3.56.0)
+      typescript:
+        specifier: ^4.9.4
+        version: 4.9.4
+      vite:
+        specifier: ^4.2.0
+        version: 4.2.0(@types/node@16.18.6)
 
   packages/kit/test/build-errors/apps/server-only-folder:
-    specifiers:
-      '@sveltejs/kit': workspace:^
-      svelte: ^3.56.0
-      svelte-check: ^3.0.2
-      typescript: ^4.9.4
-      vite: ^4.2.0
     devDependencies:
-      '@sveltejs/kit': link:../../../..
-      svelte: 3.56.0
-      svelte-check: 3.0.2_svelte@3.56.0
-      typescript: 4.9.4
-      vite: 4.2.0
+      '@sveltejs/kit':
+        specifier: workspace:^
+        version: link:../../../..
+      svelte:
+        specifier: ^3.56.0
+        version: 3.56.0
+      svelte-check:
+        specifier: ^3.0.2
+        version: 3.0.2(svelte@3.56.0)
+      typescript:
+        specifier: ^4.9.4
+        version: 4.9.4
+      vite:
+        specifier: ^4.2.0
+        version: 4.2.0(@types/node@16.18.6)
 
   packages/kit/test/build-errors/apps/server-only-folder-dynamic-import:
-    specifiers:
-      '@sveltejs/kit': workspace:^
-      svelte: ^3.56.0
-      svelte-check: ^3.0.2
-      typescript: ^4.9.4
-      vite: ^4.2.0
     devDependencies:
-      '@sveltejs/kit': link:../../../..
-      svelte: 3.56.0
-      svelte-check: 3.0.2_svelte@3.56.0
-      typescript: 4.9.4
-      vite: 4.2.0
+      '@sveltejs/kit':
+        specifier: workspace:^
+        version: link:../../../..
+      svelte:
+        specifier: ^3.56.0
+        version: 3.56.0
+      svelte-check:
+        specifier: ^3.0.2
+        version: 3.0.2(svelte@3.56.0)
+      typescript:
+        specifier: ^4.9.4
+        version: 4.9.4
+      vite:
+        specifier: ^4.2.0
+        version: 4.2.0(@types/node@16.18.6)
 
   packages/kit/test/build-errors/apps/server-only-module:
-    specifiers:
-      '@sveltejs/kit': workspace:^
-      svelte: ^3.56.0
-      svelte-check: ^3.0.2
-      typescript: ^4.9.4
-      vite: ^4.2.0
     devDependencies:
-      '@sveltejs/kit': link:../../../..
-      svelte: 3.56.0
-      svelte-check: 3.0.2_svelte@3.56.0
-      typescript: 4.9.4
-      vite: 4.2.0
+      '@sveltejs/kit':
+        specifier: workspace:^
+        version: link:../../../..
+      svelte:
+        specifier: ^3.56.0
+        version: 3.56.0
+      svelte-check:
+        specifier: ^3.0.2
+        version: 3.0.2(svelte@3.56.0)
+      typescript:
+        specifier: ^4.9.4
+        version: 4.9.4
+      vite:
+        specifier: ^4.2.0
+        version: 4.2.0(@types/node@16.18.6)
 
   packages/kit/test/build-errors/apps/server-only-module-dynamic-import:
-    specifiers:
-      '@sveltejs/kit': workspace:^
-      svelte: ^3.56.0
-      svelte-check: ^3.0.2
-      typescript: ^4.9.4
-      vite: ^4.2.0
     devDependencies:
-      '@sveltejs/kit': link:../../../..
-      svelte: 3.56.0
-      svelte-check: 3.0.2_svelte@3.56.0
-      typescript: 4.9.4
-      vite: 4.2.0
+      '@sveltejs/kit':
+        specifier: workspace:^
+        version: link:../../../..
+      svelte:
+        specifier: ^3.56.0
+        version: 3.56.0
+      svelte-check:
+        specifier: ^3.0.2
+        version: 3.0.2(svelte@3.56.0)
+      typescript:
+        specifier: ^4.9.4
+        version: 4.9.4
+      vite:
+        specifier: ^4.2.0
+        version: 4.2.0(@types/node@16.18.6)
 
   packages/kit/test/build-errors/apps/syntax-error:
-    specifiers:
-      '@sveltejs/kit': workspace:^
-      svelte: ^3.56.0
-      svelte-check: ^3.0.2
-      typescript: ^4.9.4
-      vite: ^4.2.0
     devDependencies:
-      '@sveltejs/kit': link:../../../..
-      svelte: 3.56.0
-      svelte-check: 3.0.2_svelte@3.56.0
-      typescript: 4.9.4
-      vite: 4.2.0
+      '@sveltejs/kit':
+        specifier: workspace:^
+        version: link:../../../..
+      svelte:
+        specifier: ^3.56.0
+        version: 3.56.0
+      svelte-check:
+        specifier: ^3.0.2
+        version: 3.0.2(svelte@3.56.0)
+      typescript:
+        specifier: ^4.9.4
+        version: 4.9.4
+      vite:
+        specifier: ^4.2.0
+        version: 4.2.0(@types/node@16.18.6)
 
   packages/kit/test/prerendering/basics:
-    specifiers:
-      '@sveltejs/kit': workspace:^
-      svelte: ^3.56.0
-      svelte-check: ^3.0.2
-      typescript: ^4.9.4
-      uvu: ^0.5.6
-      vite: ^4.2.0
     devDependencies:
-      '@sveltejs/kit': link:../../..
-      svelte: 3.56.0
-      svelte-check: 3.0.2_svelte@3.56.0
-      typescript: 4.9.4
-      uvu: 0.5.6
-      vite: 4.2.0
+      '@sveltejs/kit':
+        specifier: workspace:^
+        version: link:../../..
+      svelte:
+        specifier: ^3.56.0
+        version: 3.56.0
+      svelte-check:
+        specifier: ^3.0.2
+        version: 3.0.2(svelte@3.56.0)
+      typescript:
+        specifier: ^4.9.4
+        version: 4.9.4
+      uvu:
+        specifier: ^0.5.6
+        version: 0.5.6
+      vite:
+        specifier: ^4.2.0
+        version: 4.2.0(@types/node@16.18.6)
 
   packages/kit/test/prerendering/options:
-    specifiers:
-      '@sveltejs/kit': workspace:^
-      svelte: ^3.56.0
-      svelte-check: ^3.0.2
-      typescript: ^4.9.4
-      uvu: ^0.5.6
-      vite: ^4.2.0
     devDependencies:
-      '@sveltejs/kit': link:../../..
-      svelte: 3.56.0
-      svelte-check: 3.0.2_svelte@3.56.0
-      typescript: 4.9.4
-      uvu: 0.5.6
-      vite: 4.2.0
+      '@sveltejs/kit':
+        specifier: workspace:^
+        version: link:../../..
+      svelte:
+        specifier: ^3.56.0
+        version: 3.56.0
+      svelte-check:
+        specifier: ^3.0.2
+        version: 3.0.2(svelte@3.56.0)
+      typescript:
+        specifier: ^4.9.4
+        version: 4.9.4
+      uvu:
+        specifier: ^0.5.6
+        version: 0.5.6
+      vite:
+        specifier: ^4.2.0
+        version: 4.2.0(@types/node@16.18.6)
 
   packages/kit/test/prerendering/paths-base:
-    specifiers:
-      '@sveltejs/kit': workspace:^
-      svelte: ^3.56.0
-      svelte-check: ^3.0.2
-      typescript: ^4.9.4
-      uvu: ^0.5.6
-      vite: ^4.2.0
     devDependencies:
-      '@sveltejs/kit': link:../../..
-      svelte: 3.56.0
-      svelte-check: 3.0.2_svelte@3.56.0
-      typescript: 4.9.4
-      uvu: 0.5.6
-      vite: 4.2.0
+      '@sveltejs/kit':
+        specifier: workspace:^
+        version: link:../../..
+      svelte:
+        specifier: ^3.56.0
+        version: 3.56.0
+      svelte-check:
+        specifier: ^3.0.2
+        version: 3.0.2(svelte@3.56.0)
+      typescript:
+        specifier: ^4.9.4
+        version: 4.9.4
+      uvu:
+        specifier: ^0.5.6
+        version: 0.5.6
+      vite:
+        specifier: ^4.2.0
+        version: 4.2.0(@types/node@16.18.6)
 
   packages/migrate:
-    specifiers:
-      '@types/prompts': ^2.4.1
-      kleur: ^4.1.5
-      magic-string: ^0.30.0
-      prettier: ^2.8.0
-      prompts: ^2.4.2
-      tiny-glob: ^0.2.9
-      typescript: ^4.9.4
-      uvu: ^0.5.6
     dependencies:
-      kleur: 4.1.5
-      magic-string: 0.30.0
-      prompts: 2.4.2
-      tiny-glob: 0.2.9
-      typescript: 4.9.4
+      kleur:
+        specifier: ^4.1.5
+        version: 4.1.5
+      magic-string:
+        specifier: ^0.30.0
+        version: 0.30.0
+      prompts:
+        specifier: ^2.4.2
+        version: 2.4.2
+      tiny-glob:
+        specifier: ^0.2.9
+        version: 0.2.9
+      typescript:
+        specifier: ^4.9.4
+        version: 4.9.4
     devDependencies:
-      '@types/prompts': 2.4.1
-      prettier: 2.8.0
-      uvu: 0.5.6
+      '@types/prompts':
+        specifier: ^2.4.1
+        version: 2.4.1
+      prettier:
+        specifier: ^2.8.0
+        version: 2.8.0
+      uvu:
+        specifier: ^0.5.6
+        version: 0.5.6
 
   packages/package:
-    specifiers:
-      '@types/node': ^16.18.6
-      chokidar: ^3.5.3
-      kleur: ^4.1.5
-      sade: ^1.8.1
-      svelte: ^3.56.0
-      svelte-preprocess: ^5.0.0
-      svelte2tsx: ~0.6.0
-      typescript: ^4.9.4
-      uvu: ^0.5.6
     dependencies:
-      chokidar: 3.5.3
-      kleur: 4.1.5
-      sade: 1.8.1
-      svelte2tsx: 0.6.0_llpdtttxqmim2s7ymcc5fxs7oi
+      chokidar:
+        specifier: ^3.5.3
+        version: 3.5.3
+      kleur:
+        specifier: ^4.1.5
+        version: 4.1.5
+      sade:
+        specifier: ^1.8.1
+        version: 1.8.1
+      svelte2tsx:
+        specifier: ~0.6.0
+        version: 0.6.0(svelte@3.56.0)(typescript@4.9.4)
     devDependencies:
-      '@types/node': 16.18.6
-      svelte: 3.56.0
-      svelte-preprocess: 5.0.0_llpdtttxqmim2s7ymcc5fxs7oi
-      typescript: 4.9.4
-      uvu: 0.5.6
+      '@types/node':
+        specifier: ^16.18.6
+        version: 16.18.6
+      svelte:
+        specifier: ^3.56.0
+        version: 3.56.0
+      svelte-preprocess:
+        specifier: ^5.0.0
+        version: 5.0.0(svelte@3.56.0)(typescript@4.9.4)
+      typescript:
+        specifier: ^4.9.4
+        version: 4.9.4
+      uvu:
+        specifier: ^0.5.6
+        version: 0.5.6
 
   sites/kit.svelte.dev:
-    specifiers:
-      '@sveltejs/adapter-vercel': workspace:^
-      '@sveltejs/amp': workspace:^
-      '@sveltejs/kit': workspace:^
-      '@sveltejs/site-kit': 4.0.2
-      '@types/d3-geo': ^3.0.2
-      '@types/node': ^16.18.6
-      d3-geo: ^3.0.1
-      d3-geo-projection: ^4.0.0
-      flexsearch: ^0.7.31
-      magic-string: ^0.30.0
-      marked: ^4.2.3
-      prism-svelte: ^0.5.0
-      prismjs: ^1.29.0
-      shiki-twoslash: ^3.1.0
-      svelte: ^3.56.0
-      tiny-glob: ^0.2.9
-      topojson-client: ^3.1.0
-      typescript: ^4.9.4
-      uvu: ^0.5.6
-      vite: ^4.2.0
-      vite-imagetools: ^4.0.16
     dependencies:
-      d3-geo: 3.0.1
-      d3-geo-projection: 4.0.0
-      topojson-client: 3.1.0
+      d3-geo:
+        specifier: ^3.0.1
+        version: 3.0.1
+      d3-geo-projection:
+        specifier: ^4.0.0
+        version: 4.0.0
+      topojson-client:
+        specifier: ^3.1.0
+        version: 3.1.0
     devDependencies:
-      '@sveltejs/adapter-vercel': link:../../packages/adapter-vercel
-      '@sveltejs/amp': link:../../packages/amp
-      '@sveltejs/kit': link:../../packages/kit
-      '@sveltejs/site-kit': 4.0.2_r4kk7euspt2csvnnykfg5n6pxi
-      '@types/d3-geo': 3.0.2
-      '@types/node': 16.18.6
-      flexsearch: 0.7.31
-      magic-string: 0.30.0
-      marked: 4.2.3
-      prism-svelte: 0.5.0
-      prismjs: 1.29.0
-      shiki-twoslash: 3.1.0
-      svelte: 3.56.0
-      tiny-glob: 0.2.9
-      typescript: 4.9.4
-      uvu: 0.5.6
-      vite: 4.2.0_@types+node@16.18.6
-      vite-imagetools: 4.0.16
+      '@sveltejs/adapter-vercel':
+        specifier: workspace:^
+        version: link:../../packages/adapter-vercel
+      '@sveltejs/amp':
+        specifier: workspace:^
+        version: link:../../packages/amp
+      '@sveltejs/kit':
+        specifier: workspace:^
+        version: link:../../packages/kit
+      '@sveltejs/site-kit':
+        specifier: 4.0.2
+        version: 4.0.2(@sveltejs/kit@packages+kit)(svelte@3.56.0)
+      '@types/d3-geo':
+        specifier: ^3.0.2
+        version: 3.0.2
+      '@types/node':
+        specifier: ^16.18.6
+        version: 16.18.6
+      flexsearch:
+        specifier: ^0.7.31
+        version: 0.7.31
+      magic-string:
+        specifier: ^0.30.0
+        version: 0.30.0
+      marked:
+        specifier: ^4.2.3
+        version: 4.2.3
+      prism-svelte:
+        specifier: ^0.5.0
+        version: 0.5.0
+      prismjs:
+        specifier: ^1.29.0
+        version: 1.29.0
+      shiki-twoslash:
+        specifier: ^3.1.0
+        version: 3.1.0
+      svelte:
+        specifier: ^3.56.0
+        version: 3.56.0
+      tiny-glob:
+        specifier: ^0.2.9
+        version: 0.2.9
+      typescript:
+        specifier: ^4.9.4
+        version: 4.9.4
+      uvu:
+        specifier: ^0.5.6
+        version: 0.5.6
+      vite:
+        specifier: ^4.2.0
+        version: 4.2.0(@types/node@16.18.6)
+      vite-imagetools:
+        specifier: ^4.0.16
+        version: 4.0.16(rollup@3.7.0)
 
 packages:
 
-  /@babel/code-frame/7.18.6:
+  /@babel/code-frame@7.18.6:
     resolution: {integrity: sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==}
     engines: {node: '>=6.9.0'}
     dependencies:
       '@babel/highlight': 7.18.6
     dev: true
 
-  /@babel/helper-validator-identifier/7.19.1:
+  /@babel/helper-validator-identifier@7.19.1:
     resolution: {integrity: sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==}
     engines: {node: '>=6.9.0'}
     dev: true
 
-  /@babel/highlight/7.18.6:
+  /@babel/highlight@7.18.6:
     resolution: {integrity: sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==}
     engines: {node: '>=6.9.0'}
     dependencies:
@@ -754,18 +1006,18 @@ packages:
       js-tokens: 4.0.0
     dev: true
 
-  /@babel/runtime/7.20.1:
+  /@babel/runtime@7.20.1:
     resolution: {integrity: sha512-mrzLkl6U9YLF8qpqI7TB82PESyEGjm/0Ly91jG575eVxMMlb8fYfOXFZIJ8XfLrJZQbm7dlKry2bJmXBUEkdFg==}
     engines: {node: '>=6.9.0'}
     dependencies:
       regenerator-runtime: 0.13.10
     dev: true
 
-  /@bcoe/v8-coverage/0.2.3:
+  /@bcoe/v8-coverage@0.2.3:
     resolution: {integrity: sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==}
     dev: true
 
-  /@changesets/apply-release-plan/6.1.3:
+  /@changesets/apply-release-plan@6.1.3:
     resolution: {integrity: sha512-ECDNeoc3nfeAe1jqJb5aFQX7CqzQhD2klXRez2JDb/aVpGUbX673HgKrnrgJRuQR/9f2TtLoYIzrGB9qwD77mg==}
     dependencies:
       '@babel/runtime': 7.20.1
@@ -783,7 +1035,7 @@ packages:
       semver: 5.7.1
     dev: true
 
-  /@changesets/assemble-release-plan/5.2.3:
+  /@changesets/assemble-release-plan@5.2.3:
     resolution: {integrity: sha512-g7EVZCmnWz3zMBAdrcKhid4hkHT+Ft1n0mLussFMcB1dE2zCuwcvGoy9ec3yOgPGF4hoMtgHaMIk3T3TBdvU9g==}
     dependencies:
       '@babel/runtime': 7.20.1
@@ -794,13 +1046,13 @@ packages:
       semver: 5.7.1
     dev: true
 
-  /@changesets/changelog-git/0.1.14:
+  /@changesets/changelog-git@0.1.14:
     resolution: {integrity: sha512-+vRfnKtXVWsDDxGctOfzJsPhaCdXRYoe+KyWYoq5X/GqoISREiat0l3L8B0a453B2B4dfHGcZaGyowHbp9BSaA==}
     dependencies:
       '@changesets/types': 5.2.1
     dev: true
 
-  /@changesets/cli/2.26.0:
+  /@changesets/cli@2.26.0:
     resolution: {integrity: sha512-0cbTiDms+ICTVtEwAFLNW0jBNex9f5+fFv3I771nBvdnV/mOjd1QJ4+f8KtVSOrwD9SJkk9xbDkWFb0oXd8d1Q==}
     hasBin: true
     dependencies:
@@ -839,7 +1091,7 @@ packages:
       tty-table: 4.1.6
     dev: true
 
-  /@changesets/config/2.3.0:
+  /@changesets/config@2.3.0:
     resolution: {integrity: sha512-EgP/px6mhCx8QeaMAvWtRrgyxW08k/Bx2tpGT+M84jEdX37v3VKfh4Cz1BkwrYKuMV2HZKeHOh8sHvja/HcXfQ==}
     dependencies:
       '@changesets/errors': 0.1.4
@@ -851,13 +1103,13 @@ packages:
       micromatch: 4.0.5
     dev: true
 
-  /@changesets/errors/0.1.4:
+  /@changesets/errors@0.1.4:
     resolution: {integrity: sha512-HAcqPF7snsUJ/QzkWoKfRfXushHTu+K5KZLJWPb34s4eCZShIf8BFO3fwq6KU8+G7L5KdtN2BzQAXOSXEyiY9Q==}
     dependencies:
       extendable-error: 0.1.7
     dev: true
 
-  /@changesets/get-dependents-graph/1.3.5:
+  /@changesets/get-dependents-graph@1.3.5:
     resolution: {integrity: sha512-w1eEvnWlbVDIY8mWXqWuYE9oKhvIaBhzqzo4ITSJY9hgoqQ3RoBqwlcAzg11qHxv/b8ReDWnMrpjpKrW6m1ZTA==}
     dependencies:
       '@changesets/types': 5.2.1
@@ -867,7 +1119,7 @@ packages:
       semver: 5.7.1
     dev: true
 
-  /@changesets/get-github-info/0.5.2:
+  /@changesets/get-github-info@0.5.2:
     resolution: {integrity: sha512-JppheLu7S114aEs157fOZDjFqUDpm7eHdq5E8SSR0gUBTEK0cNSHsrSR5a66xs0z3RWuo46QvA3vawp8BxDHvg==}
     dependencies:
       dataloader: 1.4.0
@@ -876,7 +1128,7 @@ packages:
       - encoding
     dev: true
 
-  /@changesets/get-release-plan/3.0.16:
+  /@changesets/get-release-plan@3.0.16:
     resolution: {integrity: sha512-OpP9QILpBp1bY2YNIKFzwigKh7Qe9KizRsZomzLe6pK8IUo8onkAAVUD8+JRKSr8R7d4+JRuQrfSSNlEwKyPYg==}
     dependencies:
       '@babel/runtime': 7.20.1
@@ -888,11 +1140,11 @@ packages:
       '@manypkg/get-packages': 1.1.3
     dev: true
 
-  /@changesets/get-version-range-type/0.3.2:
+  /@changesets/get-version-range-type@0.3.2:
     resolution: {integrity: sha512-SVqwYs5pULYjYT4op21F2pVbcrca4qA/bAA3FmFXKMN7Y+HcO8sbZUTx3TAy2VXulP2FACd1aC7f2nTuqSPbqg==}
     dev: true
 
-  /@changesets/git/2.0.0:
+  /@changesets/git@2.0.0:
     resolution: {integrity: sha512-enUVEWbiqUTxqSnmesyJGWfzd51PY4H7mH9yUw0hPVpZBJ6tQZFMU3F3mT/t9OJ/GjyiM4770i+sehAn6ymx6A==}
     dependencies:
       '@babel/runtime': 7.20.1
@@ -904,20 +1156,20 @@ packages:
       spawndamnit: 2.0.0
     dev: true
 
-  /@changesets/logger/0.0.5:
+  /@changesets/logger@0.0.5:
     resolution: {integrity: sha512-gJyZHomu8nASHpaANzc6bkQMO9gU/ib20lqew1rVx753FOxffnCrJlGIeQVxNWCqM+o6OOleCo/ivL8UAO5iFw==}
     dependencies:
       chalk: 2.4.2
     dev: true
 
-  /@changesets/parse/0.3.16:
+  /@changesets/parse@0.3.16:
     resolution: {integrity: sha512-127JKNd167ayAuBjUggZBkmDS5fIKsthnr9jr6bdnuUljroiERW7FBTDNnNVyJ4l69PzR57pk6mXQdtJyBCJKg==}
     dependencies:
       '@changesets/types': 5.2.1
       js-yaml: 3.14.1
     dev: true
 
-  /@changesets/pre/1.0.14:
+  /@changesets/pre@1.0.14:
     resolution: {integrity: sha512-dTsHmxQWEQekHYHbg+M1mDVYFvegDh9j/kySNuDKdylwfMEevTeDouR7IfHNyVodxZXu17sXoJuf2D0vi55FHQ==}
     dependencies:
       '@babel/runtime': 7.20.1
@@ -927,7 +1179,7 @@ packages:
       fs-extra: 7.0.1
     dev: true
 
-  /@changesets/read/0.5.9:
+  /@changesets/read@0.5.9:
     resolution: {integrity: sha512-T8BJ6JS6j1gfO1HFq50kU3qawYxa4NTbI/ASNVVCBTsKquy2HYwM9r7ZnzkiMe8IEObAJtUVGSrePCOxAK2haQ==}
     dependencies:
       '@babel/runtime': 7.20.1
@@ -940,15 +1192,15 @@ packages:
       p-filter: 2.1.0
     dev: true
 
-  /@changesets/types/4.1.0:
+  /@changesets/types@4.1.0:
     resolution: {integrity: sha512-LDQvVDv5Kb50ny2s25Fhm3d9QSZimsoUGBsUioj6MC3qbMUCuC8GPIvk/M6IvXx3lYhAs0lwWUQLb+VIEUCECw==}
     dev: true
 
-  /@changesets/types/5.2.1:
+  /@changesets/types@5.2.1:
     resolution: {integrity: sha512-myLfHbVOqaq9UtUKqR/nZA/OY7xFjQMdfgfqeZIBK4d0hA6pgxArvdv8M+6NUzzBsjWLOtvApv8YHr4qM+Kpfg==}
     dev: true
 
-  /@changesets/write/0.2.3:
+  /@changesets/write@0.2.3:
     resolution: {integrity: sha512-Dbamr7AIMvslKnNYsLFafaVORx4H0pvCA2MHqgtNCySMe1blImEyAEOzDmcgKAkgz4+uwoLz7demIrX+JBr/Xw==}
     dependencies:
       '@babel/runtime': 7.20.1
@@ -958,14 +1210,14 @@ packages:
       prettier: 2.8.0
     dev: true
 
-  /@clack/core/0.3.2:
+  /@clack/core@0.3.2:
     resolution: {integrity: sha512-FZnsNynwGDIDktx6PEZK1EuCkFpY4ldEX6VYvfl0dqeoLPb9Jpw1xoUXaVcGR8ExmYNm1w2vdGdJkEUYD/2pqg==}
     dependencies:
       picocolors: 1.0.0
       sisteransi: 1.0.5
     dev: false
 
-  /@clack/prompts/0.6.3:
+  /@clack/prompts@0.6.3:
     resolution: {integrity: sha512-AM+kFmAHawpUQv2q9+mcB6jLKxXGjgu/r2EQjEwujgpCdzrST6BJqYw00GRn56/L/Izw5U7ImoLmy00X/r80Pw==}
     dependencies:
       '@clack/core': 0.3.2
@@ -975,51 +1227,51 @@ packages:
     bundledDependencies:
       - is-unicode-supported
 
-  /@cloudflare/kv-asset-handler/0.3.0:
+  /@cloudflare/kv-asset-handler@0.3.0:
     resolution: {integrity: sha512-9CB/MKf/wdvbfkUdfrj+OkEwZ5b7rws0eogJ4293h+7b6KX5toPwym+VQKmILafNB9YiehqY0DlNrDcDhdWHSQ==}
     dependencies:
       mime: 3.0.0
     dev: true
 
-  /@cloudflare/workers-types/4.20221111.1:
+  /@cloudflare/workers-types@4.20221111.1:
     resolution: {integrity: sha512-BNV2wN8V6Zduvo7UzxcdjBbLQ906D2KhS804PDufLgx/sanGJCHVJMOIaLvS/b61JKtot1U7P/l1fjrjZ7/E3A==}
     dev: false
 
-  /@esbuild/android-arm/0.16.3:
-    resolution: {integrity: sha512-mueuEoh+s1eRbSJqq9KNBQwI4QhQV6sRXIfTyLXSHGMpyew61rOK4qY21uKbXl1iBoMb0AdL1deWFCQVlN2qHA==}
+  /@esbuild/android-arm64@0.16.3:
+    resolution: {integrity: sha512-RolFVeinkeraDvN/OoRf1F/lP0KUfGNb5jxy/vkIMeRRChkrX/HTYN6TYZosRJs3a1+8wqpxAo5PI5hFmxyPRg==}
     engines: {node: '>=12'}
-    cpu: [arm]
+    cpu: [arm64]
     os: [android]
     requiresBuild: true
     dev: false
     optional: true
 
-  /@esbuild/android-arm/0.17.12:
-    resolution: {integrity: sha512-E/sgkvwoIfj4aMAPL2e35VnUJspzVYl7+M1B2cqeubdBhADV4uPon0KCc8p2G+LqSJ6i8ocYPCqY3A4GGq0zkQ==}
+  /@esbuild/android-arm64@0.17.12:
+    resolution: {integrity: sha512-WQ9p5oiXXYJ33F2EkE3r0FRDFVpEdcDiwNX3u7Xaibxfx6vQE0Sb8ytrfQsA5WO6kDn6mDfKLh6KrPBjvkk7xA==}
     engines: {node: '>=12'}
-    cpu: [arm]
+    cpu: [arm64]
     os: [android]
     requiresBuild: true
     optional: true
 
-  /@esbuild/android-arm64/0.16.3:
-    resolution: {integrity: sha512-RolFVeinkeraDvN/OoRf1F/lP0KUfGNb5jxy/vkIMeRRChkrX/HTYN6TYZosRJs3a1+8wqpxAo5PI5hFmxyPRg==}
+  /@esbuild/android-arm@0.16.3:
+    resolution: {integrity: sha512-mueuEoh+s1eRbSJqq9KNBQwI4QhQV6sRXIfTyLXSHGMpyew61rOK4qY21uKbXl1iBoMb0AdL1deWFCQVlN2qHA==}
     engines: {node: '>=12'}
-    cpu: [arm64]
+    cpu: [arm]
     os: [android]
     requiresBuild: true
     dev: false
     optional: true
 
-  /@esbuild/android-arm64/0.17.12:
-    resolution: {integrity: sha512-WQ9p5oiXXYJ33F2EkE3r0FRDFVpEdcDiwNX3u7Xaibxfx6vQE0Sb8ytrfQsA5WO6kDn6mDfKLh6KrPBjvkk7xA==}
+  /@esbuild/android-arm@0.17.12:
+    resolution: {integrity: sha512-E/sgkvwoIfj4aMAPL2e35VnUJspzVYl7+M1B2cqeubdBhADV4uPon0KCc8p2G+LqSJ6i8ocYPCqY3A4GGq0zkQ==}
     engines: {node: '>=12'}
-    cpu: [arm64]
+    cpu: [arm]
     os: [android]
     requiresBuild: true
     optional: true
 
-  /@esbuild/android-x64/0.16.3:
+  /@esbuild/android-x64@0.16.3:
     resolution: {integrity: sha512-SFpTUcIT1bIJuCCBMCQWq1bL2gPTjWoLZdjmIhjdcQHaUfV41OQfho6Ici5uvvkMmZRXIUGpM3GxysP/EU7ifQ==}
     engines: {node: '>=12'}
     cpu: [x64]
@@ -1028,7 +1280,7 @@ packages:
     dev: false
     optional: true
 
-  /@esbuild/android-x64/0.17.12:
+  /@esbuild/android-x64@0.17.12:
     resolution: {integrity: sha512-m4OsaCr5gT+se25rFPHKQXARMyAehHTQAz4XX1Vk3d27VtqiX0ALMBPoXZsGaB6JYryCLfgGwUslMqTfqeLU0w==}
     engines: {node: '>=12'}
     cpu: [x64]
@@ -1036,7 +1288,7 @@ packages:
     requiresBuild: true
     optional: true
 
-  /@esbuild/darwin-arm64/0.16.3:
+  /@esbuild/darwin-arm64@0.16.3:
     resolution: {integrity: sha512-DO8WykMyB+N9mIDfI/Hug70Dk1KipavlGAecxS3jDUwAbTpDXj0Lcwzw9svkhxfpCagDmpaTMgxWK8/C/XcXvw==}
     engines: {node: '>=12'}
     cpu: [arm64]
@@ -1045,7 +1297,7 @@ packages:
     dev: false
     optional: true
 
-  /@esbuild/darwin-arm64/0.17.12:
+  /@esbuild/darwin-arm64@0.17.12:
     resolution: {integrity: sha512-O3GCZghRIx+RAN0NDPhyyhRgwa19MoKlzGonIb5hgTj78krqp9XZbYCvFr9N1eUxg0ZQEpiiZ4QvsOQwBpP+lg==}
     engines: {node: '>=12'}
     cpu: [arm64]
@@ -1053,7 +1305,7 @@ packages:
     requiresBuild: true
     optional: true
 
-  /@esbuild/darwin-x64/0.16.3:
+  /@esbuild/darwin-x64@0.16.3:
     resolution: {integrity: sha512-uEqZQ2omc6BvWqdCiyZ5+XmxuHEi1SPzpVxXCSSV2+Sh7sbXbpeNhHIeFrIpRjAs0lI1FmA1iIOxFozKBhKgRQ==}
     engines: {node: '>=12'}
     cpu: [x64]
@@ -1062,7 +1314,7 @@ packages:
     dev: false
     optional: true
 
-  /@esbuild/darwin-x64/0.17.12:
+  /@esbuild/darwin-x64@0.17.12:
     resolution: {integrity: sha512-5D48jM3tW27h1qjaD9UNRuN+4v0zvksqZSPZqeSWggfMlsVdAhH3pwSfQIFJwcs9QJ9BRibPS4ViZgs3d2wsCA==}
     engines: {node: '>=12'}
     cpu: [x64]
@@ -1070,7 +1322,7 @@ packages:
     requiresBuild: true
     optional: true
 
-  /@esbuild/freebsd-arm64/0.16.3:
+  /@esbuild/freebsd-arm64@0.16.3:
     resolution: {integrity: sha512-nJansp3sSXakNkOD5i5mIz2Is/HjzIhFs49b1tjrPrpCmwgBmH9SSzhC/Z1UqlkivqMYkhfPwMw1dGFUuwmXhw==}
     engines: {node: '>=12'}
     cpu: [arm64]
@@ -1079,7 +1331,7 @@ packages:
     dev: false
     optional: true
 
-  /@esbuild/freebsd-arm64/0.17.12:
+  /@esbuild/freebsd-arm64@0.17.12:
     resolution: {integrity: sha512-OWvHzmLNTdF1erSvrfoEBGlN94IE6vCEaGEkEH29uo/VoONqPnoDFfShi41Ew+yKimx4vrmmAJEGNoyyP+OgOQ==}
     engines: {node: '>=12'}
     cpu: [arm64]
@@ -1087,7 +1339,7 @@ packages:
     requiresBuild: true
     optional: true
 
-  /@esbuild/freebsd-x64/0.16.3:
+  /@esbuild/freebsd-x64@0.16.3:
     resolution: {integrity: sha512-TfoDzLw+QHfc4a8aKtGSQ96Wa+6eimljjkq9HKR0rHlU83vw8aldMOUSJTUDxbcUdcgnJzPaX8/vGWm7vyV7ug==}
     engines: {node: '>=12'}
     cpu: [x64]
@@ -1096,7 +1348,7 @@ packages:
     dev: false
     optional: true
 
-  /@esbuild/freebsd-x64/0.17.12:
+  /@esbuild/freebsd-x64@0.17.12:
     resolution: {integrity: sha512-A0Xg5CZv8MU9xh4a+7NUpi5VHBKh1RaGJKqjxe4KG87X+mTjDE6ZvlJqpWoeJxgfXHT7IMP9tDFu7IZ03OtJAw==}
     engines: {node: '>=12'}
     cpu: [x64]
@@ -1104,41 +1356,41 @@ packages:
     requiresBuild: true
     optional: true
 
-  /@esbuild/linux-arm/0.16.3:
-    resolution: {integrity: sha512-VwswmSYwVAAq6LysV59Fyqk3UIjbhuc6wb3vEcJ7HEJUtFuLK9uXWuFoH1lulEbE4+5GjtHi3MHX+w1gNHdOWQ==}
+  /@esbuild/linux-arm64@0.16.3:
+    resolution: {integrity: sha512-7I3RlsnxEFCHVZNBLb2w7unamgZ5sVwO0/ikE2GaYvYuUQs9Qte/w7TqWcXHtCwxvZx/2+F97ndiUQAWs47ZfQ==}
     engines: {node: '>=12'}
-    cpu: [arm]
+    cpu: [arm64]
     os: [linux]
     requiresBuild: true
     dev: false
     optional: true
 
-  /@esbuild/linux-arm/0.17.12:
-    resolution: {integrity: sha512-WsHyJ7b7vzHdJ1fv67Yf++2dz3D726oO3QCu8iNYik4fb5YuuReOI9OtA+n7Mk0xyQivNTPbl181s+5oZ38gyA==}
+  /@esbuild/linux-arm64@0.17.12:
+    resolution: {integrity: sha512-cK3AjkEc+8v8YG02hYLQIQlOznW+v9N+OI9BAFuyqkfQFR+DnDLhEM5N8QRxAUz99cJTo1rLNXqRrvY15gbQUg==}
     engines: {node: '>=12'}
-    cpu: [arm]
+    cpu: [arm64]
     os: [linux]
     requiresBuild: true
     optional: true
 
-  /@esbuild/linux-arm64/0.16.3:
-    resolution: {integrity: sha512-7I3RlsnxEFCHVZNBLb2w7unamgZ5sVwO0/ikE2GaYvYuUQs9Qte/w7TqWcXHtCwxvZx/2+F97ndiUQAWs47ZfQ==}
+  /@esbuild/linux-arm@0.16.3:
+    resolution: {integrity: sha512-VwswmSYwVAAq6LysV59Fyqk3UIjbhuc6wb3vEcJ7HEJUtFuLK9uXWuFoH1lulEbE4+5GjtHi3MHX+w1gNHdOWQ==}
     engines: {node: '>=12'}
-    cpu: [arm64]
+    cpu: [arm]
     os: [linux]
     requiresBuild: true
     dev: false
     optional: true
 
-  /@esbuild/linux-arm64/0.17.12:
-    resolution: {integrity: sha512-cK3AjkEc+8v8YG02hYLQIQlOznW+v9N+OI9BAFuyqkfQFR+DnDLhEM5N8QRxAUz99cJTo1rLNXqRrvY15gbQUg==}
+  /@esbuild/linux-arm@0.17.12:
+    resolution: {integrity: sha512-WsHyJ7b7vzHdJ1fv67Yf++2dz3D726oO3QCu8iNYik4fb5YuuReOI9OtA+n7Mk0xyQivNTPbl181s+5oZ38gyA==}
     engines: {node: '>=12'}
-    cpu: [arm64]
+    cpu: [arm]
     os: [linux]
     requiresBuild: true
     optional: true
 
-  /@esbuild/linux-ia32/0.16.3:
+  /@esbuild/linux-ia32@0.16.3:
     resolution: {integrity: sha512-X8FDDxM9cqda2rJE+iblQhIMYY49LfvW4kaEjoFbTTQ4Go8G96Smj2w3BRTwA8IHGoi9dPOPGAX63dhuv19UqA==}
     engines: {node: '>=12'}
     cpu: [ia32]
@@ -1147,7 +1399,7 @@ packages:
     dev: false
     optional: true
 
-  /@esbuild/linux-ia32/0.17.12:
+  /@esbuild/linux-ia32@0.17.12:
     resolution: {integrity: sha512-jdOBXJqcgHlah/nYHnj3Hrnl9l63RjtQ4vn9+bohjQPI2QafASB5MtHAoEv0JQHVb/xYQTFOeuHnNYE1zF7tYw==}
     engines: {node: '>=12'}
     cpu: [ia32]
@@ -1155,7 +1407,7 @@ packages:
     requiresBuild: true
     optional: true
 
-  /@esbuild/linux-loong64/0.16.3:
+  /@esbuild/linux-loong64@0.16.3:
     resolution: {integrity: sha512-hIbeejCOyO0X9ujfIIOKjBjNAs9XD/YdJ9JXAy1lHA+8UXuOqbFe4ErMCqMr8dhlMGBuvcQYGF7+kO7waj2KHw==}
     engines: {node: '>=12'}
     cpu: [loong64]
@@ -1164,7 +1416,7 @@ packages:
     dev: false
     optional: true
 
-  /@esbuild/linux-loong64/0.17.12:
+  /@esbuild/linux-loong64@0.17.12:
     resolution: {integrity: sha512-GTOEtj8h9qPKXCyiBBnHconSCV9LwFyx/gv3Phw0pa25qPYjVuuGZ4Dk14bGCfGX3qKF0+ceeQvwmtI+aYBbVA==}
     engines: {node: '>=12'}
     cpu: [loong64]
@@ -1172,7 +1424,7 @@ packages:
     requiresBuild: true
     optional: true
 
-  /@esbuild/linux-mips64el/0.16.3:
+  /@esbuild/linux-mips64el@0.16.3:
     resolution: {integrity: sha512-znFRzICT/V8VZQMt6rjb21MtAVJv/3dmKRMlohlShrbVXdBuOdDrGb+C2cZGQAR8RFyRe7HS6klmHq103WpmVw==}
     engines: {node: '>=12'}
     cpu: [mips64el]
@@ -1181,7 +1433,7 @@ packages:
     dev: false
     optional: true
 
-  /@esbuild/linux-mips64el/0.17.12:
+  /@esbuild/linux-mips64el@0.17.12:
     resolution: {integrity: sha512-o8CIhfBwKcxmEENOH9RwmUejs5jFiNoDw7YgS0EJTF6kgPgcqLFjgoc5kDey5cMHRVCIWc6kK2ShUePOcc7RbA==}
     engines: {node: '>=12'}
     cpu: [mips64el]
@@ -1189,7 +1441,7 @@ packages:
     requiresBuild: true
     optional: true
 
-  /@esbuild/linux-ppc64/0.16.3:
+  /@esbuild/linux-ppc64@0.16.3:
     resolution: {integrity: sha512-EV7LuEybxhXrVTDpbqWF2yehYRNz5e5p+u3oQUS2+ZFpknyi1NXxr8URk4ykR8Efm7iu04//4sBg249yNOwy5Q==}
     engines: {node: '>=12'}
     cpu: [ppc64]
@@ -1198,7 +1450,7 @@ packages:
     dev: false
     optional: true
 
-  /@esbuild/linux-ppc64/0.17.12:
+  /@esbuild/linux-ppc64@0.17.12:
     resolution: {integrity: sha512-biMLH6NR/GR4z+ap0oJYb877LdBpGac8KfZoEnDiBKd7MD/xt8eaw1SFfYRUeMVx519kVkAOL2GExdFmYnZx3A==}
     engines: {node: '>=12'}
     cpu: [ppc64]
@@ -1206,7 +1458,7 @@ packages:
     requiresBuild: true
     optional: true
 
-  /@esbuild/linux-riscv64/0.16.3:
+  /@esbuild/linux-riscv64@0.16.3:
     resolution: {integrity: sha512-uDxqFOcLzFIJ+r/pkTTSE9lsCEaV/Y6rMlQjUI9BkzASEChYL/aSQjZjchtEmdnVxDKETnUAmsaZ4pqK1eE5BQ==}
     engines: {node: '>=12'}
     cpu: [riscv64]
@@ -1215,7 +1467,7 @@ packages:
     dev: false
     optional: true
 
-  /@esbuild/linux-riscv64/0.17.12:
+  /@esbuild/linux-riscv64@0.17.12:
     resolution: {integrity: sha512-jkphYUiO38wZGeWlfIBMB72auOllNA2sLfiZPGDtOBb1ELN8lmqBrlMiucgL8awBw1zBXN69PmZM6g4yTX84TA==}
     engines: {node: '>=12'}
     cpu: [riscv64]
@@ -1223,7 +1475,7 @@ packages:
     requiresBuild: true
     optional: true
 
-  /@esbuild/linux-s390x/0.16.3:
+  /@esbuild/linux-s390x@0.16.3:
     resolution: {integrity: sha512-NbeREhzSxYwFhnCAQOQZmajsPYtX71Ufej3IQ8W2Gxskfz9DK58ENEju4SbpIj48VenktRASC52N5Fhyf/aliQ==}
     engines: {node: '>=12'}
     cpu: [s390x]
@@ -1232,7 +1484,7 @@ packages:
     dev: false
     optional: true
 
-  /@esbuild/linux-s390x/0.17.12:
+  /@esbuild/linux-s390x@0.17.12:
     resolution: {integrity: sha512-j3ucLdeY9HBcvODhCY4b+Ds3hWGO8t+SAidtmWu/ukfLLG/oYDMaA+dnugTVAg5fnUOGNbIYL9TOjhWgQB8W5g==}
     engines: {node: '>=12'}
     cpu: [s390x]
@@ -1240,7 +1492,7 @@ packages:
     requiresBuild: true
     optional: true
 
-  /@esbuild/linux-x64/0.16.3:
+  /@esbuild/linux-x64@0.16.3:
     resolution: {integrity: sha512-SDiG0nCixYO9JgpehoKgScwic7vXXndfasjnD5DLbp1xltANzqZ425l7LSdHynt19UWOcDjG9wJJzSElsPvk0w==}
     engines: {node: '>=12'}
     cpu: [x64]
@@ -1249,7 +1501,7 @@ packages:
     dev: false
     optional: true
 
-  /@esbuild/linux-x64/0.17.12:
+  /@esbuild/linux-x64@0.17.12:
     resolution: {integrity: sha512-uo5JL3cgaEGotaqSaJdRfFNSCUJOIliKLnDGWaVCgIKkHxwhYMm95pfMbWZ9l7GeW9kDg0tSxcy9NYdEtjwwmA==}
     engines: {node: '>=12'}
     cpu: [x64]
@@ -1257,7 +1509,7 @@ packages:
     requiresBuild: true
     optional: true
 
-  /@esbuild/netbsd-x64/0.16.3:
+  /@esbuild/netbsd-x64@0.16.3:
     resolution: {integrity: sha512-AzbsJqiHEq1I/tUvOfAzCY15h4/7Ivp3ff/o1GpP16n48JMNAtbW0qui2WCgoIZArEHD0SUQ95gvR0oSO7ZbdA==}
     engines: {node: '>=12'}
     cpu: [x64]
@@ -1266,7 +1518,7 @@ packages:
     dev: false
     optional: true
 
-  /@esbuild/netbsd-x64/0.17.12:
+  /@esbuild/netbsd-x64@0.17.12:
     resolution: {integrity: sha512-DNdoRg8JX+gGsbqt2gPgkgb00mqOgOO27KnrWZtdABl6yWTST30aibGJ6geBq3WM2TIeW6COs5AScnC7GwtGPg==}
     engines: {node: '>=12'}
     cpu: [x64]
@@ -1274,7 +1526,7 @@ packages:
     requiresBuild: true
     optional: true
 
-  /@esbuild/openbsd-x64/0.16.3:
+  /@esbuild/openbsd-x64@0.16.3:
     resolution: {integrity: sha512-gSABi8qHl8k3Cbi/4toAzHiykuBuWLZs43JomTcXkjMZVkp0gj3gg9mO+9HJW/8GB5H89RX/V0QP4JGL7YEEVg==}
     engines: {node: '>=12'}
     cpu: [x64]
@@ -1283,7 +1535,7 @@ packages:
     dev: false
     optional: true
 
-  /@esbuild/openbsd-x64/0.17.12:
+  /@esbuild/openbsd-x64@0.17.12:
     resolution: {integrity: sha512-aVsENlr7B64w8I1lhHShND5o8cW6sB9n9MUtLumFlPhG3elhNWtE7M1TFpj3m7lT3sKQUMkGFjTQBrvDDO1YWA==}
     engines: {node: '>=12'}
     cpu: [x64]
@@ -1291,7 +1543,7 @@ packages:
     requiresBuild: true
     optional: true
 
-  /@esbuild/sunos-x64/0.16.3:
+  /@esbuild/sunos-x64@0.16.3:
     resolution: {integrity: sha512-SF9Kch5Ete4reovvRO6yNjMxrvlfT0F0Flm+NPoUw5Z4Q3r1d23LFTgaLwm3Cp0iGbrU/MoUI+ZqwCv5XJijCw==}
     engines: {node: '>=12'}
     cpu: [x64]
@@ -1300,7 +1552,7 @@ packages:
     dev: false
     optional: true
 
-  /@esbuild/sunos-x64/0.17.12:
+  /@esbuild/sunos-x64@0.17.12:
     resolution: {integrity: sha512-qbHGVQdKSwi0JQJuZznS4SyY27tYXYF0mrgthbxXrZI3AHKuRvU+Eqbg/F0rmLDpW/jkIZBlCO1XfHUBMNJ1pg==}
     engines: {node: '>=12'}
     cpu: [x64]
@@ -1308,7 +1560,7 @@ packages:
     requiresBuild: true
     optional: true
 
-  /@esbuild/win32-arm64/0.16.3:
+  /@esbuild/win32-arm64@0.16.3:
     resolution: {integrity: sha512-u5aBonZIyGopAZyOnoPAA6fGsDeHByZ9CnEzyML9NqntK6D/xl5jteZUKm/p6nD09+v3pTM6TuUIqSPcChk5gg==}
     engines: {node: '>=12'}
     cpu: [arm64]
@@ -1317,7 +1569,7 @@ packages:
     dev: false
     optional: true
 
-  /@esbuild/win32-arm64/0.17.12:
+  /@esbuild/win32-arm64@0.17.12:
     resolution: {integrity: sha512-zsCp8Ql+96xXTVTmm6ffvoTSZSV2B/LzzkUXAY33F/76EajNw1m+jZ9zPfNJlJ3Rh4EzOszNDHsmG/fZOhtqDg==}
     engines: {node: '>=12'}
     cpu: [arm64]
@@ -1325,7 +1577,7 @@ packages:
     requiresBuild: true
     optional: true
 
-  /@esbuild/win32-ia32/0.16.3:
+  /@esbuild/win32-ia32@0.16.3:
     resolution: {integrity: sha512-GlgVq1WpvOEhNioh74TKelwla9KDuAaLZrdxuuUgsP2vayxeLgVc+rbpIv0IYF4+tlIzq2vRhofV+KGLD+37EQ==}
     engines: {node: '>=12'}
     cpu: [ia32]
@@ -1334,7 +1586,7 @@ packages:
     dev: false
     optional: true
 
-  /@esbuild/win32-ia32/0.17.12:
+  /@esbuild/win32-ia32@0.17.12:
     resolution: {integrity: sha512-FfrFjR4id7wcFYOdqbDfDET3tjxCozUgbqdkOABsSFzoZGFC92UK7mg4JKRc/B3NNEf1s2WHxJ7VfTdVDPN3ng==}
     engines: {node: '>=12'}
     cpu: [ia32]
@@ -1342,7 +1594,7 @@ packages:
     requiresBuild: true
     optional: true
 
-  /@esbuild/win32-x64/0.16.3:
+  /@esbuild/win32-x64@0.16.3:
     resolution: {integrity: sha512-5/JuTd8OWW8UzEtyf19fbrtMJENza+C9JoPIkvItgTBQ1FO2ZLvjbPO6Xs54vk0s5JB5QsfieUEshRQfu7ZHow==}
     engines: {node: '>=12'}
     cpu: [x64]
@@ -1351,7 +1603,7 @@ packages:
     dev: false
     optional: true
 
-  /@esbuild/win32-x64/0.17.12:
+  /@esbuild/win32-x64@0.17.12:
     resolution: {integrity: sha512-JOOxw49BVZx2/5tW3FqkdjSD/5gXYeVGPDcB0lvap0gLQshkh1Nyel1QazC+wNxus3xPlsYAgqU1BUmrmCvWtw==}
     engines: {node: '>=12'}
     cpu: [x64]
@@ -1359,7 +1611,7 @@ packages:
     requiresBuild: true
     optional: true
 
-  /@eslint-community/eslint-utils/4.1.2_eslint@8.33.0:
+  /@eslint-community/eslint-utils@4.1.2(eslint@8.33.0):
     resolution: {integrity: sha512-7qELuQWWjVDdVsFQ5+beUl+KPczrEDA7S3zM4QUd/bJl7oXgsmpXaEVqrRTnOBqenOV4rWf2kVZk2Ot085zPWA==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
@@ -1369,7 +1621,7 @@ packages:
       eslint-visitor-keys: 3.3.0
     dev: true
 
-  /@eslint/eslintrc/1.4.1:
+  /@eslint/eslintrc@1.4.1:
     resolution: {integrity: sha512-XXrH9Uarn0stsyldqDYq8r++mROmWRI1xKMXa640Bb//SY1+ECYX6VzT6Lcx5frD0V30XieqJ0oX9I2Xj5aoMA==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dependencies:
@@ -1386,11 +1638,11 @@ packages:
       - supports-color
     dev: true
 
-  /@fontsource/fira-mono/4.5.10:
+  /@fontsource/fira-mono@4.5.10:
     resolution: {integrity: sha512-bxUnRP8xptGRo8YXeY073DSpfK74XpSb0ZyRNpHV9WvLnJ7TwPOjZll8hTMin7zLC6iOp59pDZ8EQDj1gzgAQQ==}
     dev: false
 
-  /@humanwhocodes/config-array/0.11.8:
+  /@humanwhocodes/config-array@0.11.8:
     resolution: {integrity: sha512-UybHIJzJnR5Qc/MsD9Kr+RpO2h+/P1GhOwdiLPXK5TWk5sgTdu88bTD9UP+CKbPPh5Rni1u0GjAdYQLemG8g+g==}
     engines: {node: '>=10.10.0'}
     dependencies:
@@ -1401,40 +1653,40 @@ packages:
       - supports-color
     dev: true
 
-  /@humanwhocodes/module-importer/1.0.1:
+  /@humanwhocodes/module-importer@1.0.1:
     resolution: {integrity: sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==}
     engines: {node: '>=12.22'}
     dev: true
 
-  /@humanwhocodes/object-schema/1.2.1:
+  /@humanwhocodes/object-schema@1.2.1:
     resolution: {integrity: sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==}
     dev: true
 
-  /@iarna/toml/2.2.5:
+  /@iarna/toml@2.2.5:
     resolution: {integrity: sha512-trnsAYxU3xnS1gPHPyU961coFyLkh4gAD/0zQ5mymY4yOZ+CYvsPqUbOFSw0aDM4y0tV7tiFxL/1XfXPNC6IPg==}
     dev: false
 
-  /@istanbuljs/schema/0.1.3:
+  /@istanbuljs/schema@0.1.3:
     resolution: {integrity: sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==}
     engines: {node: '>=8'}
     dev: true
 
-  /@jridgewell/resolve-uri/3.1.0:
+  /@jridgewell/resolve-uri@3.1.0:
     resolution: {integrity: sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==}
     engines: {node: '>=6.0.0'}
     dev: true
 
-  /@jridgewell/sourcemap-codec/1.4.14:
+  /@jridgewell/sourcemap-codec@1.4.14:
     resolution: {integrity: sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==}
 
-  /@jridgewell/trace-mapping/0.3.17:
+  /@jridgewell/trace-mapping@0.3.17:
     resolution: {integrity: sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g==}
     dependencies:
       '@jridgewell/resolve-uri': 3.1.0
       '@jridgewell/sourcemap-codec': 1.4.14
     dev: true
 
-  /@manypkg/find-root/1.1.0:
+  /@manypkg/find-root@1.1.0:
     resolution: {integrity: sha512-mki5uBvhHzO8kYYix/WRy2WX8S3B5wdVSc9D6KcU5lQNglP2yt58/VfLuAK49glRXChosY8ap2oJ1qgma3GUVA==}
     dependencies:
       '@babel/runtime': 7.20.1
@@ -1443,7 +1695,7 @@ packages:
       fs-extra: 8.1.0
     dev: true
 
-  /@manypkg/get-packages/1.1.3:
+  /@manypkg/get-packages@1.1.3:
     resolution: {integrity: sha512-fo+QhuU3qE/2TQMQmbVMqaQ6EWbMhi4ABWP+O4AM1NqPBuy0OrApV5LO6BrrgnhtAHS2NH6RrVk9OL181tTi8A==}
     dependencies:
       '@babel/runtime': 7.20.1
@@ -1454,7 +1706,7 @@ packages:
       read-yaml-file: 1.1.0
     dev: true
 
-  /@mapbox/node-pre-gyp/1.0.10:
+  /@mapbox/node-pre-gyp@1.0.10:
     resolution: {integrity: sha512-4ySo4CjzStuprMwk35H5pPbkymjv1SF3jGLj6rAHp/xT/RF7TL7bd9CTm1xDY49K2qF7jmR/g7k+SkLETP6opA==}
     hasBin: true
     dependencies:
@@ -1472,18 +1724,18 @@ packages:
       - supports-color
     dev: false
 
-  /@neoconfetti/svelte/1.0.0:
+  /@neoconfetti/svelte@1.0.0:
     resolution: {integrity: sha512-SmksyaJAdSlMa9cTidVSIqYo1qti+WTsviNDwgjNVm+KQ3DRP2Df9umDIzC4vCcpEYY+chQe0i2IKnLw03AT8Q==}
     dev: true
 
-  /@netlify/functions/1.3.0:
+  /@netlify/functions@1.3.0:
     resolution: {integrity: sha512-hN/Fgpz8XIOBfsBPLYUMxVKBlCopgeqGB0popayicnmkFLnvKByTTMYgF01wcF9DBtBQdV0H2h1kPFpMl34I8w==}
     engines: {node: '>=8.3.0'}
     dependencies:
       is-promise: 4.0.0
     dev: true
 
-  /@nodelib/fs.scandir/2.1.5:
+  /@nodelib/fs.scandir@2.1.5:
     resolution: {integrity: sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==}
     engines: {node: '>= 8'}
     dependencies:
@@ -1491,12 +1743,12 @@ packages:
       run-parallel: 1.2.0
     dev: true
 
-  /@nodelib/fs.stat/2.0.5:
+  /@nodelib/fs.stat@2.0.5:
     resolution: {integrity: sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==}
     engines: {node: '>= 8'}
     dev: true
 
-  /@nodelib/fs.walk/1.2.8:
+  /@nodelib/fs.walk@1.2.8:
     resolution: {integrity: sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==}
     engines: {node: '>= 8'}
     dependencies:
@@ -1504,7 +1756,7 @@ packages:
       fastq: 1.15.0
     dev: true
 
-  /@playwright/test/1.29.2:
+  /@playwright/test@1.29.2:
     resolution: {integrity: sha512-+3/GPwOgcoF0xLz/opTnahel1/y42PdcgZ4hs+BZGIUjtmEFSXGg+nFoaH3NSmuc7a6GSFwXDJ5L7VXpqzigNg==}
     engines: {node: '>=14'}
     hasBin: true
@@ -1513,10 +1765,10 @@ packages:
       playwright-core: 1.29.2
     dev: true
 
-  /@polka/url/1.0.0-next.21:
+  /@polka/url@1.0.0-next.21:
     resolution: {integrity: sha512-a5Sab1C4/icpTZVzZc5Ghpz88yQtGOyNqYXcZgOssB2uuAr+wF/MvN6bgtW32q7HHrvBki+BsZ0OuNv6EV3K9g==}
 
-  /@rollup/plugin-commonjs/24.0.0_rollup@3.7.0:
+  /@rollup/plugin-commonjs@24.0.0(rollup@3.7.0):
     resolution: {integrity: sha512-0w0wyykzdyRRPHOb0cQt14mIBLujfAv6GgP6g8nvg/iBxEm112t3YPPq+Buqe2+imvElTka+bjNlJ/gB56TD8g==}
     engines: {node: '>=14.0.0'}
     peerDependencies:
@@ -1525,7 +1777,7 @@ packages:
       rollup:
         optional: true
     dependencies:
-      '@rollup/pluginutils': 5.0.2_rollup@3.7.0
+      '@rollup/pluginutils': 5.0.2(rollup@3.7.0)
       commondir: 1.0.1
       estree-walker: 2.0.2
       glob: 8.0.3
@@ -1533,7 +1785,7 @@ packages:
       magic-string: 0.27.0
       rollup: 3.7.0
 
-  /@rollup/plugin-json/6.0.0_rollup@3.7.0:
+  /@rollup/plugin-json@6.0.0(rollup@3.7.0):
     resolution: {integrity: sha512-i/4C5Jrdr1XUarRhVu27EEwjt4GObltD7c+MkCIpO2QIbojw8MUs+CCTqOphQi3Qtg1FLmYt+l+6YeoIf51J7w==}
     engines: {node: '>=14.0.0'}
     peerDependencies:
@@ -1542,10 +1794,10 @@ packages:
       rollup:
         optional: true
     dependencies:
-      '@rollup/pluginutils': 5.0.2_rollup@3.7.0
+      '@rollup/pluginutils': 5.0.2(rollup@3.7.0)
       rollup: 3.7.0
 
-  /@rollup/plugin-node-resolve/15.0.1_rollup@3.7.0:
+  /@rollup/plugin-node-resolve@15.0.1(rollup@3.7.0):
     resolution: {integrity: sha512-ReY88T7JhJjeRVbfCyNj+NXAG3IIsVMsX9b5/9jC98dRP8/yxlZdz7mHZbHk5zHr24wZZICS5AcXsFZAXYUQEg==}
     engines: {node: '>=14.0.0'}
     peerDependencies:
@@ -1554,7 +1806,7 @@ packages:
       rollup:
         optional: true
     dependencies:
-      '@rollup/pluginutils': 5.0.2_rollup@3.7.0
+      '@rollup/pluginutils': 5.0.2(rollup@3.7.0)
       '@types/resolve': 1.20.2
       deepmerge: 4.2.2
       is-builtin-module: 3.2.0
@@ -1562,21 +1814,7 @@ packages:
       resolve: 1.22.1
       rollup: 3.7.0
 
-  /@rollup/pluginutils/5.0.2:
-    resolution: {integrity: sha512-pTd9rIsP92h+B6wWwFbW8RkZv4hiR/xKsqre4SIuAOaOEQRxi0lqLke9k2/7WegC85GgUs9pjmOjCUi3In4vwA==}
-    engines: {node: '>=14.0.0'}
-    peerDependencies:
-      rollup: ^1.20.0||^2.0.0||^3.0.0
-    peerDependenciesMeta:
-      rollup:
-        optional: true
-    dependencies:
-      '@types/estree': 1.0.0
-      estree-walker: 2.0.2
-      picomatch: 2.3.1
-    dev: true
-
-  /@rollup/pluginutils/5.0.2_rollup@3.7.0:
+  /@rollup/pluginutils@5.0.2(rollup@3.7.0):
     resolution: {integrity: sha512-pTd9rIsP92h+B6wWwFbW8RkZv4hiR/xKsqre4SIuAOaOEQRxi0lqLke9k2/7WegC85GgUs9pjmOjCUi3In4vwA==}
     engines: {node: '>=14.0.0'}
     peerDependencies:
@@ -1590,7 +1828,7 @@ packages:
       picomatch: 2.3.1
       rollup: 3.7.0
 
-  /@sveltejs/site-kit/4.0.2_r4kk7euspt2csvnnykfg5n6pxi:
+  /@sveltejs/site-kit@4.0.2(@sveltejs/kit@packages+kit)(svelte@3.56.0):
     resolution: {integrity: sha512-gqxBMZW5ZiO61m7Bn4x0fMUJC1M27ku1u7u0KJrg0zRSN3Zu30VdwE1SwWO4ueKxOxLXD2gzfUMdvoez7ZoBuQ==}
     peerDependencies:
       '@sveltejs/kit': ^1.0.0
@@ -1598,10 +1836,10 @@ packages:
     dependencies:
       '@sveltejs/kit': link:packages/kit
       svelte: 3.56.0
-      svelte-local-storage-store: 0.4.0_svelte@3.56.0
+      svelte-local-storage-store: 0.4.0(svelte@3.56.0)
     dev: true
 
-  /@sveltejs/vite-plugin-svelte/2.0.0_svelte@3.56.0+vite@4.2.0:
+  /@sveltejs/vite-plugin-svelte@2.0.0(svelte@3.56.0)(vite@4.2.0):
     resolution: {integrity: sha512-oUFrYQarRv4fppmxdrv00qw3wX8Ycdj0uv33MfpRZyR8K67dyxiOcHnqkB0zSy5sDJA8RC/2aNtYhXJ8NINVHQ==}
     engines: {node: ^14.18.0 || >= 16}
     peerDependencies:
@@ -1613,14 +1851,14 @@ packages:
       kleur: 4.1.5
       magic-string: 0.27.0
       svelte: 3.56.0
-      svelte-hmr: 0.15.1_svelte@3.56.0
-      vite: 4.2.0_@types+node@16.18.6
-      vitefu: 0.2.3_vite@4.2.0
+      svelte-hmr: 0.15.1(svelte@3.56.0)
+      vite: 4.2.0(@types/node@16.18.6)
+      vitefu: 0.2.3(vite@4.2.0)
     transitivePeerDependencies:
       - supports-color
     dev: false
 
-  /@svitejs/changesets-changelog-github-compact/1.1.0:
+  /@svitejs/changesets-changelog-github-compact@1.1.0:
     resolution: {integrity: sha512-qhUGGDHcpbY2zpjW3SwqchuW8J/5EzlPFud7xNntHKA7f3a/mx5+g+ruJKFHSAiVZYo30PALt+AyhmPUNKH/Og==}
     engines: {node: ^14.13.1 || ^16.0.0 || >=18}
     dependencies:
@@ -1630,128 +1868,128 @@ packages:
       - encoding
     dev: true
 
-  /@types/connect/3.4.35:
+  /@types/connect@3.4.35:
     resolution: {integrity: sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ==}
     dependencies:
       '@types/node': 18.11.11
     dev: true
 
-  /@types/cookie/0.5.1:
+  /@types/cookie@0.5.1:
     resolution: {integrity: sha512-COUnqfB2+ckwXXSFInsFdOAWQzCCx+a5hq2ruyj+Vjund94RJQd4LG2u9hnvJrTgunKAaax7ancBYlDrNYxA0g==}
     dev: false
 
-  /@types/d3-geo/3.0.2:
+  /@types/d3-geo@3.0.2:
     resolution: {integrity: sha512-DbqK7MLYA8LpyHQfv6Klz0426bQEf7bRTvhMy44sNGVyZoWn//B0c+Qbeg8Osi2Obdc9BLLXYAKpyWege2/7LQ==}
     dependencies:
       '@types/geojson': 7946.0.10
     dev: true
 
-  /@types/estree/1.0.0:
+  /@types/estree@1.0.0:
     resolution: {integrity: sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ==}
 
-  /@types/geojson/7946.0.10:
+  /@types/geojson@7946.0.10:
     resolution: {integrity: sha512-Nmh0K3iWQJzniTuPRcJn5hxXkfB1T1pgB89SBig5PlJQU5yocazeu4jATJlaA0GYFKWMqDdvYemoSnF2pXgLVA==}
     dev: true
 
-  /@types/gitignore-parser/0.0.0:
+  /@types/gitignore-parser@0.0.0:
     resolution: {integrity: sha512-qxOKILdhl4e639fWdkMySS4tBkRYHkrU2ZNScsMu84EPicliFRr+gAXCLPrs7kTFWdDpgAIlxtUr+YCRtVjsKw==}
     dev: true
 
-  /@types/is-ci/3.0.0:
+  /@types/is-ci@3.0.0:
     resolution: {integrity: sha512-Q0Op0hdWbYd1iahB+IFNQcWXFq4O0Q5MwQP7uN0souuQ4rPg1vEYcnIOfr1gY+M+6rc8FGoRaBO1mOOvL29sEQ==}
     dependencies:
       ci-info: 3.6.1
     dev: true
 
-  /@types/istanbul-lib-coverage/2.0.4:
+  /@types/istanbul-lib-coverage@2.0.4:
     resolution: {integrity: sha512-z/QT1XN4K4KYuslS23k62yDIDLwLFkzxOuMplDtObz0+y7VqJCaO2o+SPwHCvLFZh7xazvvoor2tA/hPz9ee7g==}
     dev: true
 
-  /@types/json-schema/7.0.11:
+  /@types/json-schema@7.0.11:
     resolution: {integrity: sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==}
     dev: true
 
-  /@types/marked/4.0.7:
+  /@types/marked@4.0.7:
     resolution: {integrity: sha512-eEAhnz21CwvKVW+YvRvcTuFKNU9CV1qH+opcgVK3pIMI6YZzDm6gc8o2vHjldFk6MGKt5pueSB7IOpvpx5Qekw==}
     dev: true
 
-  /@types/mime/3.0.1:
+  /@types/mime@3.0.1:
     resolution: {integrity: sha512-Y4XFY5VJAuw0FgAqPNd6NNoV44jbq9Bz2L7Rh/J6jLTiHBSBJa9fxqQIvkIld4GsoDOcCbvzOUAbLPsSKKg+uA==}
     dev: true
 
-  /@types/minimist/1.2.2:
+  /@types/minimist@1.2.2:
     resolution: {integrity: sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==}
     dev: true
 
-  /@types/mri/1.1.1:
+  /@types/mri@1.1.1:
     resolution: {integrity: sha512-nJOuiTlsvmClSr3+a/trTSx4DTuY/VURsWGKSf/eeavh0LRMqdsK60ti0TlwM5iHiGOK3/Ibkxsbr7i9rzGreA==}
     dev: true
 
-  /@types/node/12.20.55:
+  /@types/node@12.20.55:
     resolution: {integrity: sha512-J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ==}
     dev: true
 
-  /@types/node/16.18.6:
+  /@types/node@16.18.6:
     resolution: {integrity: sha512-vmYJF0REqDyyU0gviezF/KHq/fYaUbFhkcNbQCuPGFQj6VTbXuHZoxs/Y7mutWe73C8AC6l9fFu8mSYiBAqkGA==}
 
-  /@types/node/18.11.11:
+  /@types/node@18.11.11:
     resolution: {integrity: sha512-KJ021B1nlQUBLopzZmPBVuGU9un7WJd/W4ya7Ih02B4Uwky5Nja0yGYav2EfYIk0RR2Q9oVhf60S2XR1BCWJ2g==}
     dev: true
 
-  /@types/normalize-package-data/2.4.1:
+  /@types/normalize-package-data@2.4.1:
     resolution: {integrity: sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==}
     dev: true
 
-  /@types/prettier/2.7.1:
+  /@types/prettier@2.7.1:
     resolution: {integrity: sha512-ri0UmynRRvZiiUJdiz38MmIblKK+oH30MztdBVR95dv/Ubw6neWSb8u1XpRb72L4qsZOhz+L+z9JD40SJmfWow==}
     dev: true
 
-  /@types/prompts/2.4.1:
+  /@types/prompts@2.4.1:
     resolution: {integrity: sha512-1Mqzhzi9W5KlooNE4o0JwSXGUDeQXKldbGn9NO4tpxwZbHXYd+WcKpCksG2lbhH7U9I9LigfsdVsP2QAY0lNPA==}
     dependencies:
       '@types/node': 18.11.11
     dev: true
 
-  /@types/pug/2.0.6:
+  /@types/pug@2.0.6:
     resolution: {integrity: sha512-SnHmG9wN1UVmagJOnyo/qkk0Z7gejYxOYYmaAwr5u2yFYfsupN3sg10kyzN8Hep/2zbHxCnsumxOoRIRMBwKCg==}
     dev: true
 
-  /@types/resolve/1.20.2:
+  /@types/resolve@1.20.2:
     resolution: {integrity: sha512-60BCwRFOZCQhDncwQdxxeOEEkbc5dIMccYLwbxsS4TUNeVECQ/pBJ0j09mrHOl/JJvpRPGwO9SvE4nR2Nb/a4Q==}
 
-  /@types/sade/1.7.4:
+  /@types/sade@1.7.4:
     resolution: {integrity: sha512-6ys13kmtlY0aIOz4KtMdeBD9BHs6vSE3aRcj4vAZqXjypT2el8WZt6799CMjElVgh1cbOH/t3vrpQ4IpwytcPA==}
     dependencies:
       '@types/mri': 1.1.1
     dev: true
 
-  /@types/sass/1.43.1:
+  /@types/sass@1.43.1:
     resolution: {integrity: sha512-BPdoIt1lfJ6B7rw35ncdwBZrAssjcwzI5LByIrYs+tpXlj/CAkuVdRsgZDdP4lq5EjyWzwxZCqAoFyHKFwp32g==}
     dependencies:
       '@types/node': 18.11.11
     dev: true
 
-  /@types/semver/6.2.3:
+  /@types/semver@6.2.3:
     resolution: {integrity: sha512-KQf+QAMWKMrtBMsB8/24w53tEsxllMj6TuA80TT/5igJalLI/zm0L3oXRbIAl4Ohfc85gyHX/jhMwsVkmhLU4A==}
     dev: true
 
-  /@types/semver/7.3.13:
+  /@types/semver@7.3.13:
     resolution: {integrity: sha512-21cFJr9z3g5dW8B0CVI9g2O9beqaThGQ6ZFBqHfwhzLDKUxaqTIy3vnfah/UPkfOiF2pLq+tGz+W8RyCskuslw==}
     dev: true
 
-  /@types/set-cookie-parser/2.4.2:
+  /@types/set-cookie-parser@2.4.2:
     resolution: {integrity: sha512-fBZgytwhYAUkj/jC/FAV4RQ5EerRup1YQsXQCh8rZfiHkc4UahC192oH0smGwsXol3cL3A5oETuAHeQHmhXM4w==}
     dependencies:
       '@types/node': 18.11.11
     dev: true
 
-  /@types/ws/8.5.3:
+  /@types/ws@8.5.3:
     resolution: {integrity: sha512-6YOoWjruKj1uLf3INHH7D3qTXwFfEsg1kf3c0uDdSBJwfa/llkwIjrAGV7j7mVgGNbzTQ3HiHKKDXl6bJPD97w==}
     dependencies:
       '@types/node': 16.18.6
     dev: true
 
-  /@typescript-eslint/eslint-plugin/5.53.0_zkdaqh7it7uc4cvz2haft7rc6u:
+  /@typescript-eslint/eslint-plugin@5.53.0(@typescript-eslint/parser@5.58.0)(eslint@8.33.0)(typescript@4.9.4):
     resolution: {integrity: sha512-alFpFWNucPLdUOySmXCJpzr6HKC3bu7XooShWM+3w/EL6J2HIoB2PFxpLnq4JauWVk6DiVeNKzQlFEaE+X9sGw==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
@@ -1762,9 +2000,10 @@ packages:
       typescript:
         optional: true
     dependencies:
+      '@typescript-eslint/parser': 5.58.0(eslint@8.33.0)(typescript@4.9.4)
       '@typescript-eslint/scope-manager': 5.53.0
-      '@typescript-eslint/type-utils': 5.53.0_zkdaqh7it7uc4cvz2haft7rc6u
-      '@typescript-eslint/utils': 5.53.0_zkdaqh7it7uc4cvz2haft7rc6u
+      '@typescript-eslint/type-utils': 5.53.0(eslint@8.33.0)(typescript@4.9.4)
+      '@typescript-eslint/utils': 5.53.0(eslint@8.33.0)(typescript@4.9.4)
       debug: 4.3.4
       eslint: 8.33.0
       grapheme-splitter: 1.0.4
@@ -1772,13 +2011,33 @@ packages:
       natural-compare-lite: 1.4.0
       regexpp: 3.2.0
       semver: 7.3.8
-      tsutils: 3.21.0_typescript@4.9.4
+      tsutils: 3.21.0(typescript@4.9.4)
       typescript: 4.9.4
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /@typescript-eslint/scope-manager/5.53.0:
+  /@typescript-eslint/parser@5.58.0(eslint@8.33.0)(typescript@4.9.4):
+    resolution: {integrity: sha512-ixaM3gRtlfrKzP8N6lRhBbjTow1t6ztfBvQNGuRM8qH1bjFFXIJ35XY+FC0RRBKn3C6cT+7VW1y8tNm7DwPHDQ==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    peerDependencies:
+      eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
+      typescript: '*'
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+    dependencies:
+      '@typescript-eslint/scope-manager': 5.58.0
+      '@typescript-eslint/types': 5.58.0
+      '@typescript-eslint/typescript-estree': 5.58.0(typescript@4.9.4)
+      debug: 4.3.4
+      eslint: 8.33.0
+      typescript: 4.9.4
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /@typescript-eslint/scope-manager@5.53.0:
     resolution: {integrity: sha512-Opy3dqNsp/9kBBeCPhkCNR7fmdSQqA+47r21hr9a14Bx0xnkElEQmhoHga+VoaoQ6uDHjDKmQPIYcUcKJifS7w==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dependencies:
@@ -1786,7 +2045,15 @@ packages:
       '@typescript-eslint/visitor-keys': 5.53.0
     dev: true
 
-  /@typescript-eslint/type-utils/5.53.0_zkdaqh7it7uc4cvz2haft7rc6u:
+  /@typescript-eslint/scope-manager@5.58.0:
+    resolution: {integrity: sha512-b+w8ypN5CFvrXWQb9Ow9T4/6LC2MikNf1viLkYTiTbkQl46CnR69w7lajz1icW0TBsYmlpg+mRzFJ4LEJ8X9NA==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    dependencies:
+      '@typescript-eslint/types': 5.58.0
+      '@typescript-eslint/visitor-keys': 5.58.0
+    dev: true
+
+  /@typescript-eslint/type-utils@5.53.0(eslint@8.33.0)(typescript@4.9.4):
     resolution: {integrity: sha512-HO2hh0fmtqNLzTAme/KnND5uFNwbsdYhCZghK2SoxGp3Ifn2emv+hi0PBUjzzSh0dstUIFqOj3bp0AwQlK4OWw==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
@@ -1796,22 +2063,27 @@ packages:
       typescript:
         optional: true
     dependencies:
-      '@typescript-eslint/typescript-estree': 5.53.0_typescript@4.9.4
-      '@typescript-eslint/utils': 5.53.0_zkdaqh7it7uc4cvz2haft7rc6u
+      '@typescript-eslint/typescript-estree': 5.53.0(typescript@4.9.4)
+      '@typescript-eslint/utils': 5.53.0(eslint@8.33.0)(typescript@4.9.4)
       debug: 4.3.4
       eslint: 8.33.0
-      tsutils: 3.21.0_typescript@4.9.4
+      tsutils: 3.21.0(typescript@4.9.4)
       typescript: 4.9.4
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /@typescript-eslint/types/5.53.0:
+  /@typescript-eslint/types@5.53.0:
     resolution: {integrity: sha512-5kcDL9ZUIP756K6+QOAfPkigJmCPHcLN7Zjdz76lQWWDdzfOhZDTj1irs6gPBKiXx5/6O3L0+AvupAut3z7D2A==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dev: true
 
-  /@typescript-eslint/typescript-estree/5.53.0_typescript@4.9.4:
+  /@typescript-eslint/types@5.58.0:
+    resolution: {integrity: sha512-JYV4eITHPzVQMnHZcYJXl2ZloC7thuUHrcUmxtzvItyKPvQ50kb9QXBkgNAt90OYMqwaodQh2kHutWZl1fc+1g==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    dev: true
+
+  /@typescript-eslint/typescript-estree@5.53.0(typescript@4.9.4):
     resolution: {integrity: sha512-eKmipH7QyScpHSkhbptBBYh9v8FxtngLquq292YTEQ1pxVs39yFBlLC1xeIZcPPz1RWGqb7YgERJRGkjw8ZV7w==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
@@ -1826,13 +2098,34 @@ packages:
       globby: 11.1.0
       is-glob: 4.0.3
       semver: 7.3.8
-      tsutils: 3.21.0_typescript@4.9.4
+      tsutils: 3.21.0(typescript@4.9.4)
+      typescript: 4.9.4
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /@typescript-eslint/typescript-estree@5.58.0(typescript@4.9.4):
+    resolution: {integrity: sha512-cRACvGTodA+UxnYM2uwA2KCwRL7VAzo45syNysqlMyNyjw0Z35Icc9ihPJZjIYuA5bXJYiJ2YGUB59BqlOZT1Q==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    peerDependencies:
+      typescript: '*'
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+    dependencies:
+      '@typescript-eslint/types': 5.58.0
+      '@typescript-eslint/visitor-keys': 5.58.0
+      debug: 4.3.4
+      globby: 11.1.0
+      is-glob: 4.0.3
+      semver: 7.3.8
+      tsutils: 3.21.0(typescript@4.9.4)
       typescript: 4.9.4
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /@typescript-eslint/utils/5.53.0_zkdaqh7it7uc4cvz2haft7rc6u:
+  /@typescript-eslint/utils@5.53.0(eslint@8.33.0)(typescript@4.9.4):
     resolution: {integrity: sha512-VUOOtPv27UNWLxFwQK/8+7kvxVC+hPHNsJjzlJyotlaHjLSIgOCKj9I0DBUjwOOA64qjBwx5afAPjksqOxMO0g==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
@@ -1842,17 +2135,17 @@ packages:
       '@types/semver': 7.3.13
       '@typescript-eslint/scope-manager': 5.53.0
       '@typescript-eslint/types': 5.53.0
-      '@typescript-eslint/typescript-estree': 5.53.0_typescript@4.9.4
+      '@typescript-eslint/typescript-estree': 5.53.0(typescript@4.9.4)
       eslint: 8.33.0
       eslint-scope: 5.1.1
-      eslint-utils: 3.0.0_eslint@8.33.0
+      eslint-utils: 3.0.0(eslint@8.33.0)
       semver: 7.3.8
     transitivePeerDependencies:
       - supports-color
       - typescript
     dev: true
 
-  /@typescript-eslint/visitor-keys/5.53.0:
+  /@typescript-eslint/visitor-keys@5.53.0:
     resolution: {integrity: sha512-JqNLnX3leaHFZEN0gCh81sIvgrp/2GOACZNgO4+Tkf64u51kTpAyWFOY8XHx8XuXr3N2C9zgPPHtcpMg6z1g0w==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dependencies:
@@ -1860,7 +2153,15 @@ packages:
       eslint-visitor-keys: 3.3.0
     dev: true
 
-  /@typescript/twoslash/3.1.0:
+  /@typescript-eslint/visitor-keys@5.58.0:
+    resolution: {integrity: sha512-/fBraTlPj0jwdyTwLyrRTxv/3lnU2H96pNTVM6z3esTWLtA5MZ9ghSMJ7Rb+TtUAdtEw9EyJzJ0EydIMKxQ9gA==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    dependencies:
+      '@typescript-eslint/types': 5.58.0
+      eslint-visitor-keys: 3.3.0
+    dev: true
+
+  /@typescript/twoslash@3.1.0:
     resolution: {integrity: sha512-kTwMUQ8xtAZaC4wb2XuLkPqFVBj2dNBueMQ89NWEuw87k2nLBbuafeG5cob/QEr6YduxIdTVUjix0MtC7mPlmg==}
     dependencies:
       '@typescript/vfs': 1.3.5
@@ -1870,7 +2171,7 @@ packages:
       - supports-color
     dev: true
 
-  /@typescript/vfs/1.3.4:
+  /@typescript/vfs@1.3.4:
     resolution: {integrity: sha512-RbyJiaAGQPIcAGWFa3jAXSuAexU4BFiDRF1g3hy7LmRqfNpYlTQWGXjcrOaVZjJ8YkkpuwG0FcsYvtWQpd9igQ==}
     dependencies:
       debug: 4.3.4
@@ -1878,7 +2179,7 @@ packages:
       - supports-color
     dev: true
 
-  /@typescript/vfs/1.3.5:
+  /@typescript/vfs@1.3.5:
     resolution: {integrity: sha512-pI8Saqjupf9MfLw7w2+og+fmb0fZS0J6vsKXXrp4/PDXEFvntgzXmChCXC/KefZZS0YGS6AT8e0hGAJcTsdJlg==}
     dependencies:
       debug: 4.3.4
@@ -1886,7 +2187,7 @@ packages:
       - supports-color
     dev: true
 
-  /@vercel/nft/0.22.1:
+  /@vercel/nft@0.22.1:
     resolution: {integrity: sha512-lYYZIoxRurqDOSoVIdBicGnpUIpfyaS5qVjdPq+EfI285WqtZK3NK/dyCkiyBul+X2U2OEhRyeMdXPCHGJbohw==}
     hasBin: true
     dependencies:
@@ -1906,11 +2207,11 @@ packages:
       - supports-color
     dev: false
 
-  /abbrev/1.1.1:
+  /abbrev@1.1.1:
     resolution: {integrity: sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==}
     dev: false
 
-  /acorn-jsx/5.3.2_acorn@8.8.1:
+  /acorn-jsx@5.3.2(acorn@8.8.1):
     resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
     peerDependencies:
       acorn: ^6.0.0 || ^7.0.0 || ^8.0.0
@@ -1918,12 +2219,12 @@ packages:
       acorn: 8.8.1
     dev: true
 
-  /acorn/8.8.1:
+  /acorn@8.8.1:
     resolution: {integrity: sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==}
     engines: {node: '>=0.4.0'}
     hasBin: true
 
-  /agent-base/6.0.2:
+  /agent-base@6.0.2:
     resolution: {integrity: sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==}
     engines: {node: '>= 6.0.0'}
     dependencies:
@@ -1932,7 +2233,7 @@ packages:
       - supports-color
     dev: false
 
-  /ajv/6.12.6:
+  /ajv@6.12.6:
     resolution: {integrity: sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==}
     dependencies:
       fast-deep-equal: 3.1.3
@@ -1941,55 +2242,55 @@ packages:
       uri-js: 4.4.1
     dev: true
 
-  /ansi-colors/4.1.3:
+  /ansi-colors@4.1.3:
     resolution: {integrity: sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==}
     engines: {node: '>=6'}
     dev: true
 
-  /ansi-regex/2.1.1:
+  /ansi-regex@2.1.1:
     resolution: {integrity: sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==}
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /ansi-regex/3.0.1:
+  /ansi-regex@3.0.1:
     resolution: {integrity: sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==}
     engines: {node: '>=4'}
     dev: true
 
-  /ansi-regex/5.0.1:
+  /ansi-regex@5.0.1:
     resolution: {integrity: sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==}
     engines: {node: '>=8'}
 
-  /ansi-styles/3.2.1:
+  /ansi-styles@3.2.1:
     resolution: {integrity: sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==}
     engines: {node: '>=4'}
     dependencies:
       color-convert: 1.9.3
     dev: true
 
-  /ansi-styles/4.3.0:
+  /ansi-styles@4.3.0:
     resolution: {integrity: sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==}
     engines: {node: '>=8'}
     dependencies:
       color-convert: 2.0.1
     dev: true
 
-  /any-promise/1.3.0:
+  /any-promise@1.3.0:
     resolution: {integrity: sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A==}
     dev: true
 
-  /anymatch/3.1.2:
+  /anymatch@3.1.2:
     resolution: {integrity: sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==}
     engines: {node: '>= 8'}
     dependencies:
       normalize-path: 3.0.0
       picomatch: 2.3.1
 
-  /aproba/2.0.0:
+  /aproba@2.0.0:
     resolution: {integrity: sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==}
     dev: false
 
-  /are-we-there-yet/2.0.0:
+  /are-we-there-yet@2.0.0:
     resolution: {integrity: sha512-Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw==}
     engines: {node: '>=10'}
     dependencies:
@@ -1997,22 +2298,22 @@ packages:
       readable-stream: 3.6.0
     dev: false
 
-  /argparse/1.0.10:
+  /argparse@1.0.10:
     resolution: {integrity: sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==}
     dependencies:
       sprintf-js: 1.0.3
     dev: true
 
-  /argparse/2.0.1:
+  /argparse@2.0.1:
     resolution: {integrity: sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==}
     dev: true
 
-  /array-union/2.1.0:
+  /array-union@2.1.0:
     resolution: {integrity: sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==}
     engines: {node: '>=8'}
     dev: true
 
-  /array.prototype.flat/1.3.1:
+  /array.prototype.flat@1.3.1:
     resolution: {integrity: sha512-roTU0KWIOmJ4DRLmwKd19Otg0/mT3qPNt0Qb3GWW8iObuZXxrjB/pzn0R3hqpRSWg4HCwqx+0vwOnWnvlOyeIA==}
     engines: {node: '>= 0.4'}
     dependencies:
@@ -2022,46 +2323,46 @@ packages:
       es-shim-unscopables: 1.0.0
     dev: true
 
-  /arrify/1.0.1:
+  /arrify@1.0.1:
     resolution: {integrity: sha512-3CYzex9M9FGQjCGMGyi6/31c8GJbgb0qGyrx5HWxPd0aCwh4cB2YjMb2Xf9UuoogrMrlO9cTqnB5rI5GHZTcUA==}
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /async-sema/3.1.1:
+  /async-sema@3.1.1:
     resolution: {integrity: sha512-tLRNUXati5MFePdAk8dw7Qt7DpxPB60ofAgn8WRhW6a2rcimZnYBP9oxHiv0OHy+Wz7kPMG+t4LGdt31+4EmGg==}
     dev: false
 
-  /atob/2.1.2:
+  /atob@2.1.2:
     resolution: {integrity: sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==}
     engines: {node: '>= 4.5.0'}
     hasBin: true
     dev: true
 
-  /balanced-match/1.0.2:
+  /balanced-match@1.0.2:
     resolution: {integrity: sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==}
 
-  /base64-js/1.5.1:
+  /base64-js@1.5.1:
     resolution: {integrity: sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==}
     dev: true
 
-  /better-path-resolve/1.0.0:
+  /better-path-resolve@1.0.0:
     resolution: {integrity: sha512-pbnl5XzGBdrFU/wT4jqmJVPn2B6UHPBOhzMQkY/SPUPB6QtUXtmBHBIwCbXJol93mOpGMnQyP/+BB19q04xj7g==}
     engines: {node: '>=4'}
     dependencies:
       is-windows: 1.0.2
     dev: true
 
-  /binary-extensions/2.2.0:
+  /binary-extensions@2.2.0:
     resolution: {integrity: sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==}
     engines: {node: '>=8'}
 
-  /bindings/1.5.0:
+  /bindings@1.5.0:
     resolution: {integrity: sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==}
     dependencies:
       file-uri-to-path: 1.0.0
     dev: false
 
-  /bl/4.1.0:
+  /bl@4.1.0:
     resolution: {integrity: sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==}
     dependencies:
       buffer: 5.7.1
@@ -2069,52 +2370,52 @@ packages:
       readable-stream: 3.6.0
     dev: true
 
-  /brace-expansion/1.1.11:
+  /brace-expansion@1.1.11:
     resolution: {integrity: sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==}
     dependencies:
       balanced-match: 1.0.2
       concat-map: 0.0.1
 
-  /brace-expansion/2.0.1:
+  /brace-expansion@2.0.1:
     resolution: {integrity: sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==}
     dependencies:
       balanced-match: 1.0.2
 
-  /braces/3.0.2:
+  /braces@3.0.2:
     resolution: {integrity: sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==}
     engines: {node: '>=8'}
     dependencies:
       fill-range: 7.0.1
 
-  /breakword/1.0.5:
+  /breakword@1.0.5:
     resolution: {integrity: sha512-ex5W9DoOQ/LUEU3PMdLs9ua/CYZl1678NUkKOdUSi8Aw5F1idieaiRURCBFJCwVcrD1J8Iy3vfWSloaMwO2qFg==}
     dependencies:
       wcwidth: 1.0.1
     dev: true
 
-  /buffer-crc32/0.2.13:
+  /buffer-crc32@0.2.13:
     resolution: {integrity: sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==}
     dev: true
 
-  /buffer/5.7.1:
+  /buffer@5.7.1:
     resolution: {integrity: sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==}
     dependencies:
       base64-js: 1.5.1
       ieee754: 1.2.1
     dev: true
 
-  /builtin-modules/3.3.0:
+  /builtin-modules@3.3.0:
     resolution: {integrity: sha512-zhaCDicdLuWN5UbN5IMnFqNMhNfo919sH85y2/ea+5Yg9TsTkeZxpL+JLbp6cgYFS4sRLp3YV4S6yDuqVWHYOw==}
     engines: {node: '>=6'}
 
-  /busboy/1.6.0:
+  /busboy@1.6.0:
     resolution: {integrity: sha512-8SFQbg/0hQ9xy3UNTB0YEnsNBbWfhf7RtnzpL7TkBiTBRfrQ9Fxcnz7VJsleJpyp6rVLvXiuORqjlHi5q+PYuA==}
     engines: {node: '>=10.16.0'}
     dependencies:
       streamsearch: 1.1.0
     dev: false
 
-  /c8/7.12.0:
+  /c8@7.12.0:
     resolution: {integrity: sha512-CtgQrHOkyxr5koX1wEUmN/5cfDa2ckbHRA4Gy5LAL0zaCFtVWJS5++n+w4/sr2GWGerBxgTjpKeDclk/Qk6W/A==}
     engines: {node: '>=10.12.0'}
     hasBin: true
@@ -2133,19 +2434,19 @@ packages:
       yargs-parser: 20.2.9
     dev: true
 
-  /call-bind/1.0.2:
+  /call-bind@1.0.2:
     resolution: {integrity: sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==}
     dependencies:
       function-bind: 1.1.1
       get-intrinsic: 1.1.3
     dev: true
 
-  /callsites/3.1.0:
+  /callsites@3.1.0:
     resolution: {integrity: sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==}
     engines: {node: '>=6'}
     dev: true
 
-  /camelcase-keys/6.2.2:
+  /camelcase-keys@6.2.2:
     resolution: {integrity: sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==}
     engines: {node: '>=8'}
     dependencies:
@@ -2154,17 +2455,17 @@ packages:
       quick-lru: 4.0.1
     dev: true
 
-  /camelcase/4.1.0:
+  /camelcase@4.1.0:
     resolution: {integrity: sha512-FxAv7HpHrXbh3aPo4o2qxHay2lkLY3x5Mw3KeE4KQE8ysVfziWeRZDwcjauvwBSGEC/nXUPzZy8zeh4HokqOnw==}
     engines: {node: '>=4'}
     dev: true
 
-  /camelcase/5.3.1:
+  /camelcase@5.3.1:
     resolution: {integrity: sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==}
     engines: {node: '>=6'}
     dev: true
 
-  /chalk/2.4.2:
+  /chalk@2.4.2:
     resolution: {integrity: sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==}
     engines: {node: '>=4'}
     dependencies:
@@ -2173,7 +2474,7 @@ packages:
       supports-color: 5.5.0
     dev: true
 
-  /chalk/4.1.2:
+  /chalk@4.1.2:
     resolution: {integrity: sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==}
     engines: {node: '>=10'}
     dependencies:
@@ -2181,11 +2482,11 @@ packages:
       supports-color: 7.2.0
     dev: true
 
-  /chardet/0.7.0:
+  /chardet@0.7.0:
     resolution: {integrity: sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==}
     dev: true
 
-  /chokidar/3.5.3:
+  /chokidar@3.5.3:
     resolution: {integrity: sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==}
     engines: {node: '>= 8.10.0'}
     dependencies:
@@ -2199,35 +2500,35 @@ packages:
     optionalDependencies:
       fsevents: 2.3.2
 
-  /chownr/1.1.4:
+  /chownr@1.1.4:
     resolution: {integrity: sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==}
     dev: true
 
-  /chownr/2.0.0:
+  /chownr@2.0.0:
     resolution: {integrity: sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==}
     engines: {node: '>=10'}
     dev: false
 
-  /ci-info/3.6.1:
+  /ci-info@3.6.1:
     resolution: {integrity: sha512-up5ggbaDqOqJ4UqLKZ2naVkyqSJQgJi5lwD6b6mM748ysrghDBX0bx/qJTUHzw7zu6Mq4gycviSF5hJnwceD8w==}
     engines: {node: '>=8'}
     dev: true
 
-  /clean-css/4.2.4:
+  /clean-css@4.2.4:
     resolution: {integrity: sha512-EJUDT7nDVFDvaQgAo2G/PJvxmp1o/c6iXLbswsBbUFXi1Nr+AjA2cKmfbKDMjMvzEe75g3P6JkaDDAKk96A85A==}
     engines: {node: '>= 4.0'}
     dependencies:
       source-map: 0.6.1
     dev: true
 
-  /clean-regexp/1.0.0:
+  /clean-regexp@1.0.0:
     resolution: {integrity: sha512-GfisEZEJvzKrmGWkvfhgzcz/BllN1USeqD2V6tg14OAOgaCD2Z/PUEuxnAZ/nPvmaHRG7a8y77p1T/IRQ4D1Hw==}
     engines: {node: '>=4'}
     dependencies:
       escape-string-regexp: 1.0.5
     dev: true
 
-  /cliui/3.2.0:
+  /cliui@3.2.0:
     resolution: {integrity: sha512-0yayqDxWQbqk3ojkYqUKqaAQ6AfNKeKWRNA8kR0WXzAsdHpP4BIaOmMAG87JGuO6qcobyW4GjxHd9PmhEd+T9w==}
     dependencies:
       string-width: 1.0.2
@@ -2235,7 +2536,7 @@ packages:
       wrap-ansi: 2.1.0
     dev: true
 
-  /cliui/6.0.0:
+  /cliui@6.0.0:
     resolution: {integrity: sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==}
     dependencies:
       string-width: 4.2.3
@@ -2243,7 +2544,7 @@ packages:
       wrap-ansi: 6.2.0
     dev: true
 
-  /cliui/7.0.4:
+  /cliui@7.0.4:
     resolution: {integrity: sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==}
     dependencies:
       string-width: 4.2.3
@@ -2251,7 +2552,7 @@ packages:
       wrap-ansi: 7.0.0
     dev: true
 
-  /cliui/8.0.1:
+  /cliui@8.0.1:
     resolution: {integrity: sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==}
     engines: {node: '>=12'}
     dependencies:
@@ -2260,50 +2561,50 @@ packages:
       wrap-ansi: 7.0.0
     dev: true
 
-  /clone/1.0.4:
+  /clone@1.0.4:
     resolution: {integrity: sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==}
     engines: {node: '>=0.8'}
     dev: true
 
-  /code-point-at/1.1.0:
+  /code-point-at@1.1.0:
     resolution: {integrity: sha512-RpAVKQA5T63xEj6/giIbUEtZwJ4UFIc3ZtvEkiaUERylqe8xb5IvqcgOurZLahv93CLKfxcw5YI+DZcUBRyLXA==}
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /color-convert/1.9.3:
+  /color-convert@1.9.3:
     resolution: {integrity: sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==}
     dependencies:
       color-name: 1.1.3
     dev: true
 
-  /color-convert/2.0.1:
+  /color-convert@2.0.1:
     resolution: {integrity: sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==}
     engines: {node: '>=7.0.0'}
     dependencies:
       color-name: 1.1.4
     dev: true
 
-  /color-name/1.1.3:
+  /color-name@1.1.3:
     resolution: {integrity: sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==}
     dev: true
 
-  /color-name/1.1.4:
+  /color-name@1.1.4:
     resolution: {integrity: sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==}
     dev: true
 
-  /color-string/1.9.1:
+  /color-string@1.9.1:
     resolution: {integrity: sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg==}
     dependencies:
       color-name: 1.1.4
       simple-swizzle: 0.2.2
     dev: true
 
-  /color-support/1.1.3:
+  /color-support@1.1.3:
     resolution: {integrity: sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==}
     hasBin: true
     dev: false
 
-  /color/4.2.3:
+  /color@4.2.3:
     resolution: {integrity: sha512-1rXeuUUiGGrykh+CeBdu5Ie7OJwinCgQY0bc7GCRxy5xVHy+moaqkpL/jqQq0MtQOeYcrqEz4abc5f0KtU7W4A==}
     engines: {node: '>=12.5.0'}
     dependencies:
@@ -2311,49 +2612,49 @@ packages:
       color-string: 1.9.1
     dev: true
 
-  /commander/2.20.3:
+  /commander@2.20.3:
     resolution: {integrity: sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==}
     dev: false
 
-  /commander/4.1.1:
+  /commander@4.1.1:
     resolution: {integrity: sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==}
     engines: {node: '>= 6'}
     dev: true
 
-  /commander/7.2.0:
+  /commander@7.2.0:
     resolution: {integrity: sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==}
     engines: {node: '>= 10'}
     dev: false
 
-  /commondir/1.0.1:
+  /commondir@1.0.1:
     resolution: {integrity: sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==}
 
-  /concat-map/0.0.1:
+  /concat-map@0.0.1:
     resolution: {integrity: sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=}
 
-  /console-clear/1.1.1:
+  /console-clear@1.1.1:
     resolution: {integrity: sha512-pMD+MVR538ipqkG5JXeOEbKWS5um1H4LUUccUQG68qpeqBYbzYy79Gh55jkd2TtPdRfUaLWdv6LPP//5Zt0aPQ==}
     engines: {node: '>=4'}
     dev: true
 
-  /console-control-strings/1.1.0:
+  /console-control-strings@1.1.0:
     resolution: {integrity: sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==}
     dev: false
 
-  /convert-source-map/0.3.5:
+  /convert-source-map@0.3.5:
     resolution: {integrity: sha512-+4nRk0k3oEpwUB7/CalD7xE2z4VmtEnnq0GO2IPTkrooTrAhEsWvuLF5iWP1dXrwluki/azwXV1ve7gtYuPldg==}
     dev: true
 
-  /convert-source-map/1.9.0:
+  /convert-source-map@1.9.0:
     resolution: {integrity: sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==}
     dev: true
 
-  /cookie/0.5.0:
+  /cookie@0.5.0:
     resolution: {integrity: sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==}
     engines: {node: '>= 0.6'}
     dev: false
 
-  /cross-env/7.0.3:
+  /cross-env@7.0.3:
     resolution: {integrity: sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw==}
     engines: {node: '>=10.14', npm: '>=6', yarn: '>=1'}
     hasBin: true
@@ -2361,7 +2662,7 @@ packages:
       cross-spawn: 7.0.3
     dev: true
 
-  /cross-spawn/5.1.0:
+  /cross-spawn@5.1.0:
     resolution: {integrity: sha512-pTgQJ5KC0d2hcY8eyL1IzlBPYjTkyH72XRZPnLyKus2mBfNjQs3klqbJU2VILqZryAZUt9JOb3h/mWMy23/f5A==}
     dependencies:
       lru-cache: 4.1.5
@@ -2369,7 +2670,7 @@ packages:
       which: 1.3.1
     dev: true
 
-  /cross-spawn/7.0.3:
+  /cross-spawn@7.0.3:
     resolution: {integrity: sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==}
     engines: {node: '>= 8'}
     dependencies:
@@ -2378,7 +2679,7 @@ packages:
       which: 2.0.2
     dev: true
 
-  /css/2.2.4:
+  /css@2.2.4:
     resolution: {integrity: sha512-oUnjmWpy0niI3x/mPL8dVEI1l7MnG3+HHyRPHf+YFSbK+svOhXpmSOcDURUh2aOCgl2grzrOPt1nHLuCVFULLw==}
     dependencies:
       inherits: 2.0.4
@@ -2387,19 +2688,19 @@ packages:
       urix: 0.1.0
     dev: true
 
-  /csv-generate/3.4.3:
+  /csv-generate@3.4.3:
     resolution: {integrity: sha512-w/T+rqR0vwvHqWs/1ZyMDWtHHSJaN06klRqJXBEpDJaM/+dZkso0OKh1VcuuYvK3XM53KysVNq8Ko/epCK8wOw==}
     dev: true
 
-  /csv-parse/4.16.3:
+  /csv-parse@4.16.3:
     resolution: {integrity: sha512-cO1I/zmz4w2dcKHVvpCr7JVRu8/FymG5OEpmvsZYlccYolPBLoVGKUHgNoc4ZGkFeFlWGEDmMyBM+TTqRdW/wg==}
     dev: true
 
-  /csv-stringify/5.6.5:
+  /csv-stringify@5.6.5:
     resolution: {integrity: sha512-PjiQ659aQ+fUTQqSrd1XEDnOr52jh30RBurfzkscaE2tPaFsDH5wOAHJiw8XAHphRknCwMUE9KRayc4K/NbO8A==}
     dev: true
 
-  /csv/5.5.3:
+  /csv@5.5.3:
     resolution: {integrity: sha512-QTaY0XjjhTQOdguARF0lGKm5/mEq9PD9/VhZZegHDIBq2tQwgNpHc3dneD4mGo2iJs+fTKv5Bp0fZ+BRuY3Z0g==}
     engines: {node: '>= 0.1.90'}
     dependencies:
@@ -2409,14 +2710,14 @@ packages:
       stream-transform: 2.1.3
     dev: true
 
-  /d3-array/3.2.0:
+  /d3-array@3.2.0:
     resolution: {integrity: sha512-3yXFQo0oG3QCxbF06rMPFyGRMGJNS7NvsV1+2joOjbBE+9xvWQ8+GcMJAjRCzw06zQ3/arXeJgbPYcjUCuC+3g==}
     engines: {node: '>=12'}
     dependencies:
       internmap: 2.0.3
     dev: false
 
-  /d3-geo-projection/4.0.0:
+  /d3-geo-projection@4.0.0:
     resolution: {integrity: sha512-p0bK60CEzph1iqmnxut7d/1kyTmm3UWtPlwdkM31AU+LW+BXazd5zJdoCn7VFxNCHXRngPHRnsNn5uGjLRGndg==}
     engines: {node: '>=12'}
     hasBin: true
@@ -2426,18 +2727,18 @@ packages:
       d3-geo: 3.0.1
     dev: false
 
-  /d3-geo/3.0.1:
+  /d3-geo@3.0.1:
     resolution: {integrity: sha512-Wt23xBych5tSy9IYAM1FR2rWIBFWa52B/oF/GYe5zbdHrg08FU8+BuI6X4PvTwPDdqdAdq04fuWJpELtsaEjeA==}
     engines: {node: '>=12'}
     dependencies:
       d3-array: 3.2.0
     dev: false
 
-  /dataloader/1.4.0:
+  /dataloader@1.4.0:
     resolution: {integrity: sha512-68s5jYdlvasItOJnCuI2Q9s4q98g0pCyL3HrcKJu8KNugUl8ahgmZYg38ysLTgQjjXX3H8CJLkAvWrclWfcalw==}
     dev: true
 
-  /debug/4.3.4:
+  /debug@4.3.4:
     resolution: {integrity: sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==}
     engines: {node: '>=6.0'}
     peerDependencies:
@@ -2448,7 +2749,7 @@ packages:
     dependencies:
       ms: 2.1.2
 
-  /decamelize-keys/1.1.1:
+  /decamelize-keys@1.1.1:
     resolution: {integrity: sha512-WiPxgEirIV0/eIOMcnFBA3/IJZAZqKnwAwWyvvdi4lsr1WCN22nhdf/3db3DoZcUjTV2SqfzIwNyp6y2xs3nmg==}
     engines: {node: '>=0.10.0'}
     dependencies:
@@ -2456,47 +2757,47 @@ packages:
       map-obj: 1.0.1
     dev: true
 
-  /decamelize/1.2.0:
+  /decamelize@1.2.0:
     resolution: {integrity: sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==}
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /decode-uri-component/0.2.0:
+  /decode-uri-component@0.2.0:
     resolution: {integrity: sha512-hjf+xovcEn31w/EUYdTXQh/8smFL/dzYjohQGEIgjyNavaJfBY2p5F527Bo1VPATxv0VYTUC2bOcXvqFwk78Og==}
     engines: {node: '>=0.10'}
     dev: true
 
-  /decompress-response/6.0.0:
+  /decompress-response@6.0.0:
     resolution: {integrity: sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==}
     engines: {node: '>=10'}
     dependencies:
       mimic-response: 3.1.0
     dev: true
 
-  /dedent-js/1.0.1:
+  /dedent-js@1.0.1:
     resolution: {integrity: sha512-OUepMozQULMLUmhxS95Vudo0jb0UchLimi3+pQ2plj61Fcy8axbP9hbiD4Sz6DPqn6XG3kfmziVfQ1rSys5AJQ==}
     dev: false
 
-  /deep-extend/0.6.0:
+  /deep-extend@0.6.0:
     resolution: {integrity: sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==}
     engines: {node: '>=4.0.0'}
     dev: true
 
-  /deep-is/0.1.4:
+  /deep-is@0.1.4:
     resolution: {integrity: sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==}
     dev: true
 
-  /deepmerge/4.2.2:
+  /deepmerge@4.2.2:
     resolution: {integrity: sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==}
     engines: {node: '>=0.10.0'}
 
-  /defaults/1.0.4:
+  /defaults@1.0.4:
     resolution: {integrity: sha512-eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A==}
     dependencies:
       clone: 1.0.4
     dev: true
 
-  /define-properties/1.1.4:
+  /define-properties@1.1.4:
     resolution: {integrity: sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==}
     engines: {node: '>= 0.4'}
     dependencies:
@@ -2504,75 +2805,75 @@ packages:
       object-keys: 1.1.1
     dev: true
 
-  /delegates/1.0.0:
+  /delegates@1.0.0:
     resolution: {integrity: sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==}
     dev: false
 
-  /dequal/2.0.3:
+  /dequal@2.0.3:
     resolution: {integrity: sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==}
     engines: {node: '>=6'}
     dev: true
 
-  /detect-indent/6.1.0:
+  /detect-indent@6.1.0:
     resolution: {integrity: sha512-reYkTUJAZb9gUuZ2RvVCNhVHdg62RHnJ7WJl8ftMi4diZ6NWlciOzQN88pUhSELEwflJht4oQDv0F0BMlwaYtA==}
     engines: {node: '>=8'}
     dev: true
 
-  /detect-libc/2.0.1:
+  /detect-libc@2.0.1:
     resolution: {integrity: sha512-463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w==}
     engines: {node: '>=8'}
 
-  /devalue/4.3.0:
+  /devalue@4.3.0:
     resolution: {integrity: sha512-n94yQo4LI3w7erwf84mhRUkUJfhLoCZiLyoOZ/QFsDbcWNZePrLwbQpvZBUG2TNxwV3VjCKPxkiiQA6pe3TrTA==}
     dev: false
 
-  /diff/5.1.0:
+  /diff@5.1.0:
     resolution: {integrity: sha512-D+mk+qE8VC/PAUrlAU34N+VfXev0ghe5ywmpqrawphmVZc1bEfn56uo9qpyGp1p4xpzOHkSW4ztBd6L7Xx4ACw==}
     engines: {node: '>=0.3.1'}
     dev: true
 
-  /dir-glob/3.0.1:
+  /dir-glob@3.0.1:
     resolution: {integrity: sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==}
     engines: {node: '>=8'}
     dependencies:
       path-type: 4.0.0
     dev: true
 
-  /doctrine/3.0.0:
+  /doctrine@3.0.0:
     resolution: {integrity: sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==}
     engines: {node: '>=6.0.0'}
     dependencies:
       esutils: 2.0.3
     dev: true
 
-  /dotenv/16.0.3:
+  /dotenv@16.0.3:
     resolution: {integrity: sha512-7GO6HghkA5fYG9TYnNxi14/7K9f5occMlp3zXAuSxn7CKCxt9xbNWG7yF8hTCSUchlfWSe3uLmlPfigevRItzQ==}
     engines: {node: '>=12'}
     dev: true
 
-  /emoji-regex/8.0.0:
+  /emoji-regex@8.0.0:
     resolution: {integrity: sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==}
 
-  /end-of-stream/1.4.4:
+  /end-of-stream@1.4.4:
     resolution: {integrity: sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==}
     dependencies:
       once: 1.4.0
     dev: true
 
-  /enquirer/2.3.6:
+  /enquirer@2.3.6:
     resolution: {integrity: sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==}
     engines: {node: '>=8.6'}
     dependencies:
       ansi-colors: 4.1.3
     dev: true
 
-  /error-ex/1.3.2:
+  /error-ex@1.3.2:
     resolution: {integrity: sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==}
     dependencies:
       is-arrayish: 0.2.1
     dev: true
 
-  /es-abstract/1.20.4:
+  /es-abstract@1.20.4:
     resolution: {integrity: sha512-0UtvRN79eMe2L+UNEF1BwRe364sj/DXhQ/k5FmivgoSdpM90b8Jc0mDzKMGo7QS0BVbOP/bTwBKNnDc9rNzaPA==}
     engines: {node: '>= 0.4'}
     dependencies:
@@ -2602,13 +2903,13 @@ packages:
       unbox-primitive: 1.0.2
     dev: true
 
-  /es-shim-unscopables/1.0.0:
+  /es-shim-unscopables@1.0.0:
     resolution: {integrity: sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==}
     dependencies:
       has: 1.0.3
     dev: true
 
-  /es-to-primitive/1.2.1:
+  /es-to-primitive@1.2.1:
     resolution: {integrity: sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==}
     engines: {node: '>= 0.4'}
     dependencies:
@@ -2617,11 +2918,11 @@ packages:
       is-symbol: 1.0.4
     dev: true
 
-  /es6-promise/3.3.1:
+  /es6-promise@3.3.1:
     resolution: {integrity: sha512-SOp9Phqvqn7jtEUxPWdWfWoLmyt2VaJ6MpvP9Comy1MceMXqE6bxvaTu4iaxpYYPzhny28Lc+M87/c2cPK6lDg==}
     dev: true
 
-  /esbuild/0.16.3:
+  /esbuild@0.16.3:
     resolution: {integrity: sha512-71f7EjPWTiSguen8X/kxEpkAS7BFHwtQKisCDDV3Y4GLGWBaoSCyD5uXkaUew6JDzA9FEN1W23mdnSwW9kqCeg==}
     engines: {node: '>=12'}
     hasBin: true
@@ -2651,7 +2952,7 @@ packages:
       '@esbuild/win32-x64': 0.16.3
     dev: false
 
-  /esbuild/0.17.12:
+  /esbuild@0.17.12:
     resolution: {integrity: sha512-bX/zHl7Gn2CpQwcMtRogTTBf9l1nl+H6R8nUbjk+RuKqAE3+8FDulLA+pHvX7aA7Xe07Iwa+CWvy9I8Y2qqPKQ==}
     engines: {node: '>=12'}
     hasBin: true
@@ -2680,29 +2981,29 @@ packages:
       '@esbuild/win32-ia32': 0.17.12
       '@esbuild/win32-x64': 0.17.12
 
-  /escalade/3.1.1:
+  /escalade@3.1.1:
     resolution: {integrity: sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==}
     engines: {node: '>=6'}
     dev: true
 
-  /escape-string-regexp/1.0.5:
+  /escape-string-regexp@1.0.5:
     resolution: {integrity: sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==}
     engines: {node: '>=0.8.0'}
     dev: true
 
-  /escape-string-regexp/4.0.0:
+  /escape-string-regexp@4.0.0:
     resolution: {integrity: sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==}
     engines: {node: '>=10'}
     dev: true
 
-  /eslint-plugin-unicorn/46.0.0_eslint@8.33.0:
+  /eslint-plugin-unicorn@46.0.0(eslint@8.33.0):
     resolution: {integrity: sha512-j07WkC+PFZwk8J33LYp6JMoHa1lXc1u6R45pbSAipjpfpb7KIGr17VE2D685zCxR5VL4cjrl65kTJflziQWMDA==}
     engines: {node: '>=14.18'}
     peerDependencies:
       eslint: '>=8.28.0'
     dependencies:
       '@babel/helper-validator-identifier': 7.19.1
-      '@eslint-community/eslint-utils': 4.1.2_eslint@8.33.0
+      '@eslint-community/eslint-utils': 4.1.2(eslint@8.33.0)
       ci-info: 3.6.1
       clean-regexp: 1.0.0
       eslint: 8.33.0
@@ -2720,7 +3021,7 @@ packages:
       strip-indent: 3.0.0
     dev: true
 
-  /eslint-scope/5.1.1:
+  /eslint-scope@5.1.1:
     resolution: {integrity: sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==}
     engines: {node: '>=8.0.0'}
     dependencies:
@@ -2728,7 +3029,7 @@ packages:
       estraverse: 4.3.0
     dev: true
 
-  /eslint-scope/7.1.1:
+  /eslint-scope@7.1.1:
     resolution: {integrity: sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dependencies:
@@ -2736,7 +3037,7 @@ packages:
       estraverse: 5.3.0
     dev: true
 
-  /eslint-utils/3.0.0_eslint@8.33.0:
+  /eslint-utils@3.0.0(eslint@8.33.0):
     resolution: {integrity: sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==}
     engines: {node: ^10.0.0 || ^12.0.0 || >= 14.0.0}
     peerDependencies:
@@ -2746,17 +3047,17 @@ packages:
       eslint-visitor-keys: 2.1.0
     dev: true
 
-  /eslint-visitor-keys/2.1.0:
+  /eslint-visitor-keys@2.1.0:
     resolution: {integrity: sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==}
     engines: {node: '>=10'}
     dev: true
 
-  /eslint-visitor-keys/3.3.0:
+  /eslint-visitor-keys@3.3.0:
     resolution: {integrity: sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dev: true
 
-  /eslint/8.33.0:
+  /eslint@8.33.0:
     resolution: {integrity: sha512-WjOpFQgKK8VrCnAtl8We0SUOy/oVZ5NHykyMiagV1M9r8IFpIJX7DduK6n1mpfhlG7T1NLWm2SuD8QB7KFySaA==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     hasBin: true
@@ -2772,7 +3073,7 @@ packages:
       doctrine: 3.0.0
       escape-string-regexp: 4.0.0
       eslint-scope: 7.1.1
-      eslint-utils: 3.0.0_eslint@8.33.0
+      eslint-utils: 3.0.0(eslint@8.33.0)
       eslint-visitor-keys: 3.3.0
       espree: 9.4.1
       esquery: 1.4.0
@@ -2804,62 +3105,62 @@ packages:
       - supports-color
     dev: true
 
-  /esm-env/1.0.0:
+  /esm-env@1.0.0:
     resolution: {integrity: sha512-Cf6VksWPsTuW01vU9Mk/3vRue91Zevka5SjyNf3nEpokFRuqt/KjUQoGAwq9qMmhpLTHmXzSIrFRw8zxWzmFBA==}
     dev: false
 
-  /espree/9.4.1:
+  /espree@9.4.1:
     resolution: {integrity: sha512-XwctdmTO6SIvCzd9810yyNzIrOrqNYV9Koizx4C/mRhf9uq0o4yHoCEU/670pOxOL/MSraektvSAji79kX90Vg==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dependencies:
       acorn: 8.8.1
-      acorn-jsx: 5.3.2_acorn@8.8.1
+      acorn-jsx: 5.3.2(acorn@8.8.1)
       eslint-visitor-keys: 3.3.0
     dev: true
 
-  /esprima/4.0.1:
+  /esprima@4.0.1:
     resolution: {integrity: sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==}
     engines: {node: '>=4'}
     hasBin: true
     dev: true
 
-  /esquery/1.4.0:
+  /esquery@1.4.0:
     resolution: {integrity: sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==}
     engines: {node: '>=0.10'}
     dependencies:
       estraverse: 5.3.0
     dev: true
 
-  /esrecurse/4.3.0:
+  /esrecurse@4.3.0:
     resolution: {integrity: sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==}
     engines: {node: '>=4.0'}
     dependencies:
       estraverse: 5.3.0
     dev: true
 
-  /estraverse/4.3.0:
+  /estraverse@4.3.0:
     resolution: {integrity: sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==}
     engines: {node: '>=4.0'}
     dev: true
 
-  /estraverse/5.3.0:
+  /estraverse@5.3.0:
     resolution: {integrity: sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==}
     engines: {node: '>=4.0'}
     dev: true
 
-  /estree-walker/0.6.1:
+  /estree-walker@0.6.1:
     resolution: {integrity: sha512-SqmZANLWS0mnatqbSfRP5g8OXZC12Fgg1IwNtLsyHDzJizORW4khDfjPqJZsemPWBB2uqykUah5YpQ6epsqC/w==}
     dev: false
 
-  /estree-walker/2.0.2:
+  /estree-walker@2.0.2:
     resolution: {integrity: sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==}
 
-  /esutils/2.0.3:
+  /esutils@2.0.3:
     resolution: {integrity: sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==}
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /execa/0.7.0:
+  /execa@0.7.0:
     resolution: {integrity: sha512-RztN09XglpYI7aBBrJCPW95jEH7YF1UEPOoX9yDhUTPdp7mK+CQvnLTuD10BNXZ3byLTu2uehZ8EcKT/4CGiFw==}
     engines: {node: '>=4'}
     dependencies:
@@ -2872,16 +3173,16 @@ packages:
       strip-eof: 1.0.0
     dev: true
 
-  /expand-template/2.0.3:
+  /expand-template@2.0.3:
     resolution: {integrity: sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==}
     engines: {node: '>=6'}
     dev: true
 
-  /extendable-error/0.1.7:
+  /extendable-error@0.1.7:
     resolution: {integrity: sha512-UOiS2in6/Q0FK0R0q6UY9vYpQ21mr/Qn1KOnte7vsACuNJf514WvCCUHSRCPcgjPT2bAhNIJdlE6bVap1GKmeg==}
     dev: true
 
-  /external-editor/3.1.0:
+  /external-editor@3.1.0:
     resolution: {integrity: sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==}
     engines: {node: '>=4'}
     dependencies:
@@ -2890,11 +3191,11 @@ packages:
       tmp: 0.0.33
     dev: true
 
-  /fast-deep-equal/3.1.3:
+  /fast-deep-equal@3.1.3:
     resolution: {integrity: sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==}
     dev: true
 
-  /fast-glob/3.2.12:
+  /fast-glob@3.2.12:
     resolution: {integrity: sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==}
     engines: {node: '>=8.6.0'}
     dependencies:
@@ -2905,45 +3206,45 @@ packages:
       micromatch: 4.0.5
     dev: true
 
-  /fast-json-stable-stringify/2.1.0:
+  /fast-json-stable-stringify@2.1.0:
     resolution: {integrity: sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==}
     dev: true
 
-  /fast-levenshtein/2.0.6:
+  /fast-levenshtein@2.0.6:
     resolution: {integrity: sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==}
     dev: true
 
-  /fastq/1.15.0:
+  /fastq@1.15.0:
     resolution: {integrity: sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==}
     dependencies:
       reusify: 1.0.4
     dev: true
 
-  /file-entry-cache/6.0.1:
+  /file-entry-cache@6.0.1:
     resolution: {integrity: sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==}
     engines: {node: ^10.12.0 || >=12.0.0}
     dependencies:
       flat-cache: 3.0.4
     dev: true
 
-  /file-uri-to-path/1.0.0:
+  /file-uri-to-path@1.0.0:
     resolution: {integrity: sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==}
     dev: false
 
-  /fill-range/7.0.1:
+  /fill-range@7.0.1:
     resolution: {integrity: sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==}
     engines: {node: '>=8'}
     dependencies:
       to-regex-range: 5.0.1
 
-  /find-up/2.1.0:
+  /find-up@2.1.0:
     resolution: {integrity: sha512-NWzkk0jSJtTt08+FBFMvXoeZnOJD+jTtsRmBYbAIzJdX6l7dLgR7CTubCM5/eDdPUBvLCeVasP1brfVR/9/EZQ==}
     engines: {node: '>=4'}
     dependencies:
       locate-path: 2.0.0
     dev: true
 
-  /find-up/4.1.0:
+  /find-up@4.1.0:
     resolution: {integrity: sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==}
     engines: {node: '>=8'}
     dependencies:
@@ -2951,7 +3252,7 @@ packages:
       path-exists: 4.0.0
     dev: true
 
-  /find-up/5.0.0:
+  /find-up@5.0.0:
     resolution: {integrity: sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==}
     engines: {node: '>=10'}
     dependencies:
@@ -2959,14 +3260,14 @@ packages:
       path-exists: 4.0.0
     dev: true
 
-  /find-yarn-workspace-root2/1.2.16:
+  /find-yarn-workspace-root2@1.2.16:
     resolution: {integrity: sha512-hr6hb1w8ePMpPVUK39S4RlwJzi+xPLuVuG8XlwXU3KD5Yn3qgBWVfy3AzNlDhWvE1EORCE65/Qm26rFQt3VLVA==}
     dependencies:
       micromatch: 4.0.5
       pkg-dir: 4.2.0
     dev: true
 
-  /flat-cache/3.0.4:
+  /flat-cache@3.0.4:
     resolution: {integrity: sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==}
     engines: {node: ^10.12.0 || >=12.0.0}
     dependencies:
@@ -2974,15 +3275,15 @@ packages:
       rimraf: 3.0.2
     dev: true
 
-  /flatted/3.2.7:
+  /flatted@3.2.7:
     resolution: {integrity: sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==}
     dev: true
 
-  /flexsearch/0.7.31:
+  /flexsearch@0.7.31:
     resolution: {integrity: sha512-XGozTsMPYkm+6b5QL3Z9wQcJjNYxp0CYn3U1gO7dwD6PAqU1SVWZxI9CCg3z+ml3YfqdPnrBehaBrnH2AGKbNA==}
     dev: true
 
-  /foreground-child/2.0.0:
+  /foreground-child@2.0.0:
     resolution: {integrity: sha512-dCIq9FpEcyQyXKCkyzmlPTFNgrCzPudOe+mhvJU5zAtlBnGVy2yKxtfsxK2tQBThwq225jcvBjpw1Gr40uzZCA==}
     engines: {node: '>=8.0.0'}
     dependencies:
@@ -2990,11 +3291,11 @@ packages:
       signal-exit: 3.0.7
     dev: true
 
-  /fs-constants/1.0.0:
+  /fs-constants@1.0.0:
     resolution: {integrity: sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==}
     dev: true
 
-  /fs-extra/7.0.1:
+  /fs-extra@7.0.1:
     resolution: {integrity: sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==}
     engines: {node: '>=6 <7 || >=8'}
     dependencies:
@@ -3003,7 +3304,7 @@ packages:
       universalify: 0.1.2
     dev: true
 
-  /fs-extra/8.1.0:
+  /fs-extra@8.1.0:
     resolution: {integrity: sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==}
     engines: {node: '>=6 <7 || >=8'}
     dependencies:
@@ -3012,27 +3313,27 @@ packages:
       universalify: 0.1.2
     dev: true
 
-  /fs-minipass/2.1.0:
+  /fs-minipass@2.1.0:
     resolution: {integrity: sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==}
     engines: {node: '>= 8'}
     dependencies:
       minipass: 3.3.4
     dev: false
 
-  /fs.realpath/1.0.0:
+  /fs.realpath@1.0.0:
     resolution: {integrity: sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==}
 
-  /fsevents/2.3.2:
+  /fsevents@2.3.2:
     resolution: {integrity: sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==}
     engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0}
     os: [darwin]
     requiresBuild: true
     optional: true
 
-  /function-bind/1.1.1:
+  /function-bind@1.1.1:
     resolution: {integrity: sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==}
 
-  /function.prototype.name/1.1.5:
+  /function.prototype.name@1.1.5:
     resolution: {integrity: sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==}
     engines: {node: '>= 0.4'}
     dependencies:
@@ -3042,11 +3343,11 @@ packages:
       functions-have-names: 1.2.3
     dev: true
 
-  /functions-have-names/1.2.3:
+  /functions-have-names@1.2.3:
     resolution: {integrity: sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==}
     dev: true
 
-  /gauge/3.0.2:
+  /gauge@3.0.2:
     resolution: {integrity: sha512-+5J6MS/5XksCuXq++uFRsnUd7Ovu1XenbeuIuNRJxYWjgQbPuFhT14lAvsWfqfAmnwluf1OwMjz39HjfLPci0Q==}
     engines: {node: '>=10'}
     dependencies:
@@ -3061,16 +3362,16 @@ packages:
       wide-align: 1.1.5
     dev: false
 
-  /get-caller-file/1.0.3:
+  /get-caller-file@1.0.3:
     resolution: {integrity: sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==}
     dev: true
 
-  /get-caller-file/2.0.5:
+  /get-caller-file@2.0.5:
     resolution: {integrity: sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==}
     engines: {node: 6.* || 8.* || >= 10.*}
     dev: true
 
-  /get-intrinsic/1.1.3:
+  /get-intrinsic@1.1.3:
     resolution: {integrity: sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==}
     dependencies:
       function-bind: 1.1.1
@@ -3078,17 +3379,17 @@ packages:
       has-symbols: 1.0.3
     dev: true
 
-  /get-port/3.2.0:
+  /get-port@3.2.0:
     resolution: {integrity: sha512-x5UJKlgeUiNT8nyo/AcnwLnZuZNcSjSw0kogRB+Whd1fjjFq4B1hySFxSFWWSn4mIBzg3sRNUDFYc4g5gjPoLg==}
     engines: {node: '>=4'}
     dev: true
 
-  /get-stream/3.0.0:
+  /get-stream@3.0.0:
     resolution: {integrity: sha512-GlhdIUuVakc8SJ6kK0zAFbiGzRFzNnY4jUuEbV9UROo4Y+0Ny4fjvcZFVTeDA4odpFyOQzaw6hXukJSq/f28sQ==}
     engines: {node: '>=4'}
     dev: true
 
-  /get-symbol-description/1.0.0:
+  /get-symbol-description@1.0.0:
     resolution: {integrity: sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==}
     engines: {node: '>= 0.4'}
     dependencies:
@@ -3096,29 +3397,29 @@ packages:
       get-intrinsic: 1.1.3
     dev: true
 
-  /github-from-package/0.0.0:
+  /github-from-package@0.0.0:
     resolution: {integrity: sha1-l/tdlr/eiXMxPyDoKI75oWf6ZM4=}
     dev: true
 
-  /gitignore-parser/0.0.2:
+  /gitignore-parser@0.0.2:
     resolution: {integrity: sha512-X6mpqUv59uWLGD4n3hZ8Cu8KbF2PMWPSFYmxZjdkpm3yOU7hSUYnzTkZI1mcWqchphvqyuz3/BhgBR4E/JtkCg==}
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /glob-parent/5.1.2:
+  /glob-parent@5.1.2:
     resolution: {integrity: sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==}
     engines: {node: '>= 6'}
     dependencies:
       is-glob: 4.0.3
 
-  /glob-parent/6.0.2:
+  /glob-parent@6.0.2:
     resolution: {integrity: sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==}
     engines: {node: '>=10.13.0'}
     dependencies:
       is-glob: 4.0.3
     dev: true
 
-  /glob/10.0.0:
+  /glob@10.0.0:
     resolution: {integrity: sha512-zmp9ZDC6NpDNLujV2W2n+3lH+BafIVZ4/ct+Yj3BMZTH/+bgm/eVjHzeFLwxJrrIGgjjS2eiQLlpurHsNlEAtQ==}
     engines: {node: '>=16 || 14 >=14.17'}
     dependencies:
@@ -3128,7 +3429,7 @@ packages:
       path-scurry: 1.6.4
     dev: true
 
-  /glob/7.1.6:
+  /glob@7.1.6:
     resolution: {integrity: sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==}
     dependencies:
       fs.realpath: 1.0.0
@@ -3139,7 +3440,7 @@ packages:
       path-is-absolute: 1.0.1
     dev: true
 
-  /glob/7.2.3:
+  /glob@7.2.3:
     resolution: {integrity: sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==}
     dependencies:
       fs.realpath: 1.0.0
@@ -3149,7 +3450,7 @@ packages:
       once: 1.4.0
       path-is-absolute: 1.0.1
 
-  /glob/8.0.3:
+  /glob@8.0.3:
     resolution: {integrity: sha512-ull455NHSHI/Y1FqGaaYFaLGkNMMJbavMrEGFXG/PGrg6y7sutWHUHrz6gy6WEBH6akM1M414dWKCNs+IhKdiQ==}
     engines: {node: '>=12'}
     dependencies:
@@ -3159,17 +3460,17 @@ packages:
       minimatch: 5.1.0
       once: 1.4.0
 
-  /globals/13.20.0:
+  /globals@13.20.0:
     resolution: {integrity: sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==}
     engines: {node: '>=8'}
     dependencies:
       type-fest: 0.20.2
     dev: true
 
-  /globalyzer/0.1.0:
+  /globalyzer@0.1.0:
     resolution: {integrity: sha512-40oNTM9UfG6aBmuKxk/giHn5nQ8RVz/SS4Ir6zgzOv9/qC3kKZ9v4etGTcJbEl/NyVQH7FGU7d+X1egr57Md2Q==}
 
-  /globby/11.1.0:
+  /globby@11.1.0:
     resolution: {integrity: sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==}
     engines: {node: '>=10'}
     dependencies:
@@ -3181,72 +3482,72 @@ packages:
       slash: 3.0.0
     dev: true
 
-  /globrex/0.1.2:
+  /globrex@0.1.2:
     resolution: {integrity: sha512-uHJgbwAMwNFf5mLst7IWLNg14x1CkeqglJb/K3doi4dw6q2IvAAmM/Y81kevy83wP+Sst+nutFTYOGg3d1lsxg==}
 
-  /graceful-fs/4.2.10:
+  /graceful-fs@4.2.10:
     resolution: {integrity: sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==}
 
-  /grapheme-splitter/1.0.4:
+  /grapheme-splitter@1.0.4:
     resolution: {integrity: sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==}
     dev: true
 
-  /hard-rejection/2.1.0:
+  /hard-rejection@2.1.0:
     resolution: {integrity: sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==}
     engines: {node: '>=6'}
     dev: true
 
-  /has-bigints/1.0.2:
+  /has-bigints@1.0.2:
     resolution: {integrity: sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==}
     dev: true
 
-  /has-flag/3.0.0:
+  /has-flag@3.0.0:
     resolution: {integrity: sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==}
     engines: {node: '>=4'}
     dev: true
 
-  /has-flag/4.0.0:
+  /has-flag@4.0.0:
     resolution: {integrity: sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==}
     engines: {node: '>=8'}
     dev: true
 
-  /has-property-descriptors/1.0.0:
+  /has-property-descriptors@1.0.0:
     resolution: {integrity: sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==}
     dependencies:
       get-intrinsic: 1.1.3
     dev: true
 
-  /has-symbols/1.0.3:
+  /has-symbols@1.0.3:
     resolution: {integrity: sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==}
     engines: {node: '>= 0.4'}
     dev: true
 
-  /has-tostringtag/1.0.0:
+  /has-tostringtag@1.0.0:
     resolution: {integrity: sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==}
     engines: {node: '>= 0.4'}
     dependencies:
       has-symbols: 1.0.3
     dev: true
 
-  /has-unicode/2.0.1:
+  /has-unicode@2.0.1:
     resolution: {integrity: sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==}
     dev: false
 
-  /has/1.0.3:
+  /has@1.0.3:
     resolution: {integrity: sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==}
     engines: {node: '>= 0.4.0'}
     dependencies:
       function-bind: 1.1.1
 
-  /hosted-git-info/2.8.9:
+  /hosted-git-info@2.8.9:
     resolution: {integrity: sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==}
     dev: true
 
-  /html-escaper/2.0.2:
+  /html-escaper@2.0.2:
     resolution: {integrity: sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==}
     dev: true
 
-  /https-proxy-agent/5.0.1:
+  /https-proxy-agent@5.0.1:
     resolution: {integrity: sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==}
     engines: {node: '>= 6'}
     dependencies:
@@ -3256,34 +3557,34 @@ packages:
       - supports-color
     dev: false
 
-  /human-id/1.0.2:
+  /human-id@1.0.2:
     resolution: {integrity: sha512-UNopramDEhHJD+VR+ehk8rOslwSfByxPIZyJRfV739NDhN5LF1fa1MqnzKm2lGTQRjNrjK19Q5fhkgIfjlVUKw==}
     dev: true
 
-  /iconv-lite/0.4.24:
+  /iconv-lite@0.4.24:
     resolution: {integrity: sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==}
     engines: {node: '>=0.10.0'}
     dependencies:
       safer-buffer: 2.1.2
     dev: true
 
-  /ieee754/1.2.1:
+  /ieee754@1.2.1:
     resolution: {integrity: sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==}
     dev: true
 
-  /ignore/5.2.0:
+  /ignore@5.2.0:
     resolution: {integrity: sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==}
     engines: {node: '>= 4'}
     dev: true
 
-  /imagetools-core/3.3.1:
+  /imagetools-core@3.3.1:
     resolution: {integrity: sha512-xllF2GDRg0SXCQQRxBAtE6N9dPAttc+ro+QDLnRmVSE5lH5clQxD2Al4XluirXj0T7lIH5VbetFmBLowW6ps+w==}
     engines: {node: '>=12.0.0'}
     dependencies:
       sharp: 0.31.3
     dev: true
 
-  /import-fresh/3.3.0:
+  /import-fresh@3.3.0:
     resolution: {integrity: sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==}
     engines: {node: '>=6'}
     dependencies:
@@ -3291,34 +3592,34 @@ packages:
       resolve-from: 4.0.0
     dev: true
 
-  /import-meta-resolve/2.2.0:
+  /import-meta-resolve@2.2.0:
     resolution: {integrity: sha512-CpPOtiCHxP9HdtDM5F45tNiAe66Cqlv3f5uHoJjt+KlaLrUh9/Wz9vepADZ78SlqEo62aDWZtj9ydMGXV+CPnw==}
     dev: false
 
-  /imurmurhash/0.1.4:
+  /imurmurhash@0.1.4:
     resolution: {integrity: sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==}
     engines: {node: '>=0.8.19'}
     dev: true
 
-  /indent-string/4.0.0:
+  /indent-string@4.0.0:
     resolution: {integrity: sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==}
     engines: {node: '>=8'}
     dev: true
 
-  /inflight/1.0.6:
+  /inflight@1.0.6:
     resolution: {integrity: sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==}
     dependencies:
       once: 1.4.0
       wrappy: 1.0.2
 
-  /inherits/2.0.4:
+  /inherits@2.0.4:
     resolution: {integrity: sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==}
 
-  /ini/1.3.8:
+  /ini@1.3.8:
     resolution: {integrity: sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==}
     dev: true
 
-  /internal-slot/1.0.3:
+  /internal-slot@1.0.3:
     resolution: {integrity: sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==}
     engines: {node: '>= 0.4'}
     dependencies:
@@ -3327,37 +3628,37 @@ packages:
       side-channel: 1.0.4
     dev: true
 
-  /internmap/2.0.3:
+  /internmap@2.0.3:
     resolution: {integrity: sha512-5Hh7Y1wQbvY5ooGgPbDaL5iYLAPzMTUrjMulskHLH6wnv/A+1q5rgEaiuqEjB+oxGXIVZs1FF+R/KPN3ZSQYYg==}
     engines: {node: '>=12'}
     dev: false
 
-  /invert-kv/1.0.0:
+  /invert-kv@1.0.0:
     resolution: {integrity: sha512-xgs2NH9AE66ucSq4cNG1nhSFghr5l6tdL15Pk+jl46bmmBapgoaY/AacXyaDznAqmGL99TiLSQgO/XazFSKYeQ==}
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /is-arrayish/0.2.1:
+  /is-arrayish@0.2.1:
     resolution: {integrity: sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==}
     dev: true
 
-  /is-arrayish/0.3.2:
+  /is-arrayish@0.3.2:
     resolution: {integrity: sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==}
     dev: true
 
-  /is-bigint/1.0.4:
+  /is-bigint@1.0.4:
     resolution: {integrity: sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==}
     dependencies:
       has-bigints: 1.0.2
     dev: true
 
-  /is-binary-path/2.1.0:
+  /is-binary-path@2.1.0:
     resolution: {integrity: sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==}
     engines: {node: '>=8'}
     dependencies:
       binary-extensions: 2.2.0
 
-  /is-boolean-object/1.1.2:
+  /is-boolean-object@1.1.2:
     resolution: {integrity: sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==}
     engines: {node: '>= 0.4'}
     dependencies:
@@ -3365,101 +3666,101 @@ packages:
       has-tostringtag: 1.0.0
     dev: true
 
-  /is-builtin-module/3.2.0:
+  /is-builtin-module@3.2.0:
     resolution: {integrity: sha512-phDA4oSGt7vl1n5tJvTWooWWAsXLY+2xCnxNqvKhGEzujg+A43wPlPOyDg3C8XQHN+6k/JTQWJ/j0dQh/qr+Hw==}
     engines: {node: '>=6'}
     dependencies:
       builtin-modules: 3.3.0
 
-  /is-callable/1.2.7:
+  /is-callable@1.2.7:
     resolution: {integrity: sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==}
     engines: {node: '>= 0.4'}
     dev: true
 
-  /is-ci/3.0.1:
+  /is-ci@3.0.1:
     resolution: {integrity: sha512-ZYvCgrefwqoQ6yTyYUbQu64HsITZ3NfKX1lzaEYdkTDcfKzzCI/wthRRYKkdjHKFVgNiXKAKm65Zo1pk2as/QQ==}
     hasBin: true
     dependencies:
       ci-info: 3.6.1
     dev: true
 
-  /is-core-module/2.11.0:
+  /is-core-module@2.11.0:
     resolution: {integrity: sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==}
     dependencies:
       has: 1.0.3
 
-  /is-date-object/1.0.5:
+  /is-date-object@1.0.5:
     resolution: {integrity: sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==}
     engines: {node: '>= 0.4'}
     dependencies:
       has-tostringtag: 1.0.0
     dev: true
 
-  /is-extglob/2.1.1:
+  /is-extglob@2.1.1:
     resolution: {integrity: sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==}
     engines: {node: '>=0.10.0'}
 
-  /is-fullwidth-code-point/1.0.0:
+  /is-fullwidth-code-point@1.0.0:
     resolution: {integrity: sha512-1pqUqRjkhPJ9miNq9SwMfdvi6lBJcd6eFxvfaivQhaH3SgisfiuudvFntdKOmxuee/77l+FPjKrQjWvmPjWrRw==}
     engines: {node: '>=0.10.0'}
     dependencies:
       number-is-nan: 1.0.1
     dev: true
 
-  /is-fullwidth-code-point/2.0.0:
+  /is-fullwidth-code-point@2.0.0:
     resolution: {integrity: sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==}
     engines: {node: '>=4'}
     dev: true
 
-  /is-fullwidth-code-point/3.0.0:
+  /is-fullwidth-code-point@3.0.0:
     resolution: {integrity: sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==}
     engines: {node: '>=8'}
 
-  /is-glob/4.0.3:
+  /is-glob@4.0.3:
     resolution: {integrity: sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==}
     engines: {node: '>=0.10.0'}
     dependencies:
       is-extglob: 2.1.1
 
-  /is-module/1.0.0:
+  /is-module@1.0.0:
     resolution: {integrity: sha512-51ypPSPCoTEIN9dy5Oy+h4pShgJmPCygKfyRCISBI+JoWT/2oJvK8QPxmwv7b/p239jXrm9M1mlQbyKJ5A152g==}
 
-  /is-negative-zero/2.0.2:
+  /is-negative-zero@2.0.2:
     resolution: {integrity: sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==}
     engines: {node: '>= 0.4'}
     dev: true
 
-  /is-number-object/1.0.7:
+  /is-number-object@1.0.7:
     resolution: {integrity: sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==}
     engines: {node: '>= 0.4'}
     dependencies:
       has-tostringtag: 1.0.0
     dev: true
 
-  /is-number/7.0.0:
+  /is-number@7.0.0:
     resolution: {integrity: sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==}
     engines: {node: '>=0.12.0'}
 
-  /is-path-inside/3.0.3:
+  /is-path-inside@3.0.3:
     resolution: {integrity: sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==}
     engines: {node: '>=8'}
     dev: true
 
-  /is-plain-obj/1.1.0:
+  /is-plain-obj@1.1.0:
     resolution: {integrity: sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg==}
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /is-promise/4.0.0:
+  /is-promise@4.0.0:
     resolution: {integrity: sha512-hvpoI6korhJMnej285dSg6nu1+e6uxs7zG3BYAm5byqDsgJNWwxzM6z6iZiAgQR4TJ30JmBTOwqZUw3WlyH3AQ==}
     dev: true
 
-  /is-reference/1.2.1:
+  /is-reference@1.2.1:
     resolution: {integrity: sha512-U82MsXXiFIrjCK4otLT+o2NA2Cd2g5MLoOVXUZjIOhLurrRxpEXzI8O0KZHr3IjLvlAH1kTPYSuqer5T9ZVBKQ==}
     dependencies:
       '@types/estree': 1.0.0
 
-  /is-regex/1.1.4:
+  /is-regex@1.1.4:
     resolution: {integrity: sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==}
     engines: {node: '>= 0.4'}
     dependencies:
@@ -3467,59 +3768,59 @@ packages:
       has-tostringtag: 1.0.0
     dev: true
 
-  /is-shared-array-buffer/1.0.2:
+  /is-shared-array-buffer@1.0.2:
     resolution: {integrity: sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==}
     dependencies:
       call-bind: 1.0.2
     dev: true
 
-  /is-stream/1.1.0:
+  /is-stream@1.1.0:
     resolution: {integrity: sha512-uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ==}
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /is-string/1.0.7:
+  /is-string@1.0.7:
     resolution: {integrity: sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==}
     engines: {node: '>= 0.4'}
     dependencies:
       has-tostringtag: 1.0.0
     dev: true
 
-  /is-subdir/1.2.0:
+  /is-subdir@1.2.0:
     resolution: {integrity: sha512-2AT6j+gXe/1ueqbW6fLZJiIw3F8iXGJtt0yDrZaBhAZEG1raiTxKWU+IPqMCzQAXOUCKdA4UDMgacKH25XG2Cw==}
     engines: {node: '>=4'}
     dependencies:
       better-path-resolve: 1.0.0
     dev: true
 
-  /is-symbol/1.0.4:
+  /is-symbol@1.0.4:
     resolution: {integrity: sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==}
     engines: {node: '>= 0.4'}
     dependencies:
       has-symbols: 1.0.3
     dev: true
 
-  /is-weakref/1.0.2:
+  /is-weakref@1.0.2:
     resolution: {integrity: sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==}
     dependencies:
       call-bind: 1.0.2
     dev: true
 
-  /is-windows/1.0.2:
+  /is-windows@1.0.2:
     resolution: {integrity: sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==}
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /isexe/2.0.0:
+  /isexe@2.0.0:
     resolution: {integrity: sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==}
     dev: true
 
-  /istanbul-lib-coverage/3.2.0:
+  /istanbul-lib-coverage@3.2.0:
     resolution: {integrity: sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw==}
     engines: {node: '>=8'}
     dev: true
 
-  /istanbul-lib-report/3.0.0:
+  /istanbul-lib-report@3.0.0:
     resolution: {integrity: sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==}
     engines: {node: '>=8'}
     dependencies:
@@ -3528,7 +3829,7 @@ packages:
       supports-color: 7.2.0
     dev: true
 
-  /istanbul-reports/3.1.5:
+  /istanbul-reports@3.1.5:
     resolution: {integrity: sha512-nUsEMa9pBt/NOHqbcbeJEgqIlY/K7rVWUX6Lql2orY5e9roQOthbR3vtY4zzf2orPELg80fnxxk9zUyPlgwD1w==}
     engines: {node: '>=8'}
     dependencies:
@@ -3536,15 +3837,15 @@ packages:
       istanbul-lib-report: 3.0.0
     dev: true
 
-  /js-sdsl/4.3.0:
+  /js-sdsl@4.3.0:
     resolution: {integrity: sha512-mifzlm2+5nZ+lEcLJMoBK0/IH/bDg8XnJfd/Wq6IP+xoCjLZsTOnV2QpxlVbX9bMnkl5PdEjNtBJ9Cj1NjifhQ==}
     dev: true
 
-  /js-tokens/4.0.0:
+  /js-tokens@4.0.0:
     resolution: {integrity: sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==}
     dev: true
 
-  /js-yaml/3.14.1:
+  /js-yaml@3.14.1:
     resolution: {integrity: sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==}
     hasBin: true
     dependencies:
@@ -3552,68 +3853,68 @@ packages:
       esprima: 4.0.1
     dev: true
 
-  /js-yaml/4.1.0:
+  /js-yaml@4.1.0:
     resolution: {integrity: sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==}
     hasBin: true
     dependencies:
       argparse: 2.0.1
     dev: true
 
-  /jsesc/0.5.0:
+  /jsesc@0.5.0:
     resolution: {integrity: sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA==}
     hasBin: true
     dev: true
 
-  /jsesc/3.0.2:
+  /jsesc@3.0.2:
     resolution: {integrity: sha512-xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g==}
     engines: {node: '>=6'}
     hasBin: true
     dev: true
 
-  /json-parse-even-better-errors/2.3.1:
+  /json-parse-even-better-errors@2.3.1:
     resolution: {integrity: sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==}
     dev: true
 
-  /json-schema-traverse/0.4.1:
+  /json-schema-traverse@0.4.1:
     resolution: {integrity: sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==}
     dev: true
 
-  /json-stable-stringify-without-jsonify/1.0.1:
+  /json-stable-stringify-without-jsonify@1.0.1:
     resolution: {integrity: sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==}
     dev: true
 
-  /jsonc-parser/3.2.0:
+  /jsonc-parser@3.2.0:
     resolution: {integrity: sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==}
     dev: true
 
-  /jsonfile/4.0.0:
+  /jsonfile@4.0.0:
     resolution: {integrity: sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==}
     optionalDependencies:
       graceful-fs: 4.2.10
     dev: true
 
-  /kind-of/6.0.3:
+  /kind-of@6.0.3:
     resolution: {integrity: sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==}
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /kleur/3.0.3:
+  /kleur@3.0.3:
     resolution: {integrity: sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==}
     engines: {node: '>=6'}
     dev: false
 
-  /kleur/4.1.5:
+  /kleur@4.1.5:
     resolution: {integrity: sha512-o+NO+8WrRiQEE4/7nwRJhN1HWpVmJm511pBHUxPLtp0BUISzlBplORYSmTclCnJvQq2tKu/sgl3xVpkc7ZWuQQ==}
     engines: {node: '>=6'}
 
-  /lcid/1.0.0:
+  /lcid@1.0.0:
     resolution: {integrity: sha512-YiGkH6EnGrDGqLMITnGjXtGmNtjoXw9SVUzcaos8RBi7Ps0VBylkq+vOcY9QE5poLasPCR849ucFUkl0UzUyOw==}
     engines: {node: '>=0.10.0'}
     dependencies:
       invert-kv: 1.0.0
     dev: true
 
-  /levn/0.4.1:
+  /levn@0.4.1:
     resolution: {integrity: sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==}
     engines: {node: '>= 0.8.0'}
     dependencies:
@@ -3621,11 +3922,11 @@ packages:
       type-check: 0.4.0
     dev: true
 
-  /lines-and-columns/1.2.4:
+  /lines-and-columns@1.2.4:
     resolution: {integrity: sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==}
     dev: true
 
-  /load-json-file/2.0.0:
+  /load-json-file@2.0.0:
     resolution: {integrity: sha512-3p6ZOGNbiX4CdvEd1VcE6yi78UrGNpjHO33noGwHCnT/o2fyllJDepsm8+mFFv/DvtwFHht5HIHSyOy5a+ChVQ==}
     engines: {node: '>=4'}
     dependencies:
@@ -3635,7 +3936,7 @@ packages:
       strip-bom: 3.0.0
     dev: true
 
-  /load-yaml-file/0.2.0:
+  /load-yaml-file@0.2.0:
     resolution: {integrity: sha512-OfCBkGEw4nN6JLtgRidPX6QxjBQGQf72q3si2uvqyFEMbycSFFHwAZeXx6cJgFM9wmLrf9zBwCP3Ivqa+LLZPw==}
     engines: {node: '>=6'}
     dependencies:
@@ -3645,12 +3946,12 @@ packages:
       strip-bom: 3.0.0
     dev: true
 
-  /local-access/1.1.0:
+  /local-access@1.1.0:
     resolution: {integrity: sha512-XfegD5pyTAfb+GY6chk283Ox5z8WexG56OvM06RWLpAc/UHozO8X6xAxEkIitZOtsSMM1Yr3DkHgW5W+onLhCw==}
     engines: {node: '>=6'}
     dev: true
 
-  /locate-path/2.0.0:
+  /locate-path@2.0.0:
     resolution: {integrity: sha512-NCI2kiDkyR7VeEKm27Kda/iQHyKJe1Bu0FlTbYp3CqJu+9IFe9bLyAjMxf5ZDDbEg+iMPzB5zYyUTSm8wVTKmA==}
     engines: {node: '>=4'}
     dependencies:
@@ -3658,103 +3959,103 @@ packages:
       path-exists: 3.0.0
     dev: true
 
-  /locate-path/5.0.0:
+  /locate-path@5.0.0:
     resolution: {integrity: sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==}
     engines: {node: '>=8'}
     dependencies:
       p-locate: 4.1.0
     dev: true
 
-  /locate-path/6.0.0:
+  /locate-path@6.0.0:
     resolution: {integrity: sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==}
     engines: {node: '>=10'}
     dependencies:
       p-locate: 5.0.0
     dev: true
 
-  /lodash.merge/4.6.2:
+  /lodash.merge@4.6.2:
     resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==}
     dev: true
 
-  /lodash.startcase/4.4.0:
+  /lodash.startcase@4.4.0:
     resolution: {integrity: sha512-+WKqsK294HMSc2jEbNgpHpd0JfIBhp7rEV4aqXWqFr6AlXov+SlcgB1Fv01y2kGe3Gc8nMW7VA0SrGuSkRfIEg==}
     dev: true
 
-  /lodash/4.17.21:
+  /lodash@4.17.21:
     resolution: {integrity: sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==}
     dev: true
 
-  /lower-case/2.0.2:
+  /lower-case@2.0.2:
     resolution: {integrity: sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==}
     dependencies:
       tslib: 2.4.1
     dev: false
 
-  /lru-cache/4.1.5:
+  /lru-cache@4.1.5:
     resolution: {integrity: sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==}
     dependencies:
       pseudomap: 1.0.2
       yallist: 2.1.2
     dev: true
 
-  /lru-cache/6.0.0:
+  /lru-cache@6.0.0:
     resolution: {integrity: sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==}
     engines: {node: '>=10'}
     dependencies:
       yallist: 4.0.0
 
-  /lru-cache/9.0.0:
+  /lru-cache@9.0.0:
     resolution: {integrity: sha512-9AEKXzvOZc4BMacFnYiTOlDH/197LNnQIK9wZ6iMB5NXPzuv4bWR/Msv7iUMplkiMQ1qQL+KSv/JF1mZAB5Lrg==}
     engines: {node: '>=16.14'}
     dev: true
 
-  /lz-string/1.4.4:
+  /lz-string@1.4.4:
     resolution: {integrity: sha512-0ckx7ZHRPqb0oUm8zNr+90mtf9DQB60H1wMCjBtfi62Kl3a7JbHob6gA2bC+xRvZoOL+1hzUK8jeuEIQE8svEQ==}
     hasBin: true
     dev: true
 
-  /magic-string/0.27.0:
+  /magic-string@0.27.0:
     resolution: {integrity: sha512-8UnnX2PeRAPZuN12svgR9j7M1uWMovg/CEnIwIG0LFkXSJJe4PdfUGiTGl8V9bsBHFUtfVINcSyYxd7q+kx9fA==}
     engines: {node: '>=12'}
     dependencies:
       '@jridgewell/sourcemap-codec': 1.4.14
 
-  /magic-string/0.30.0:
+  /magic-string@0.30.0:
     resolution: {integrity: sha512-LA+31JYDJLs82r2ScLrlz1GjSgu66ZV518eyWT+S8VhyQn/JL0u9MeBOvQMGYiPk1DBiSN9DDMOcXvigJZaViQ==}
     engines: {node: '>=12'}
     dependencies:
       '@jridgewell/sourcemap-codec': 1.4.14
 
-  /make-dir/3.1.0:
+  /make-dir@3.1.0:
     resolution: {integrity: sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==}
     engines: {node: '>=8'}
     dependencies:
       semver: 6.3.0
 
-  /map-obj/1.0.1:
+  /map-obj@1.0.1:
     resolution: {integrity: sha512-7N/q3lyZ+LVCp7PzuxrJr4KMbBE2hW7BT7YNia330OFxIf4d3r5zVpicP2650l7CPN6RM9zOJRl3NGpqSiw3Eg==}
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /map-obj/4.3.0:
+  /map-obj@4.3.0:
     resolution: {integrity: sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ==}
     engines: {node: '>=8'}
     dev: true
 
-  /marked/4.2.3:
+  /marked@4.2.3:
     resolution: {integrity: sha512-slWRdJkbTZ+PjkyJnE30Uid64eHwbwa1Q25INCAYfZlK4o6ylagBy/Le9eWntqJFoFT93ikUKMv47GZ4gTwHkw==}
     engines: {node: '>= 12'}
     hasBin: true
     dev: true
 
-  /mem/1.1.0:
+  /mem@1.1.0:
     resolution: {integrity: sha512-nOBDrc/wgpkd3X/JOhMqYR+/eLqlfLP4oQfoBA6QExIxEl+GU01oyEkwWyueyO8110pUKijtiHGhEmYoOn88oQ==}
     engines: {node: '>=4'}
     dependencies:
       mimic-fn: 1.2.0
     dev: true
 
-  /meow/6.1.1:
+  /meow@6.1.1:
     resolution: {integrity: sha512-3YffViIt2QWgTy6Pale5QpopX/IvU3LPL03jOTqp6pGj3VjesdO/U8CuHMKpnQr4shCNCM5fd5XFFvIIl6JBHg==}
     engines: {node: '>=8'}
     dependencies:
@@ -3771,57 +4072,57 @@ packages:
       yargs-parser: 18.1.3
     dev: true
 
-  /merge2/1.4.1:
+  /merge2@1.4.1:
     resolution: {integrity: sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==}
     engines: {node: '>= 8'}
     dev: true
 
-  /micromatch/4.0.5:
+  /micromatch@4.0.5:
     resolution: {integrity: sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==}
     engines: {node: '>=8.6'}
     dependencies:
       braces: 3.0.2
       picomatch: 2.3.1
 
-  /mime/3.0.0:
+  /mime@3.0.0:
     resolution: {integrity: sha512-jSCU7/VB1loIWBZe14aEYHU/+1UMEHoaO7qxCOVJOw9GgH72VAWppxNcjU+x9a2k3GSIBXNKxXQFqRvvZ7vr3A==}
     engines: {node: '>=10.0.0'}
     hasBin: true
 
-  /mimic-fn/1.2.0:
+  /mimic-fn@1.2.0:
     resolution: {integrity: sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==}
     engines: {node: '>=4'}
     dev: true
 
-  /mimic-response/3.1.0:
+  /mimic-response@3.1.0:
     resolution: {integrity: sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==}
     engines: {node: '>=10'}
     dev: true
 
-  /min-indent/1.0.1:
+  /min-indent@1.0.1:
     resolution: {integrity: sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==}
     engines: {node: '>=4'}
     dev: true
 
-  /minimatch/3.1.2:
+  /minimatch@3.1.2:
     resolution: {integrity: sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==}
     dependencies:
       brace-expansion: 1.1.11
 
-  /minimatch/5.1.0:
+  /minimatch@5.1.0:
     resolution: {integrity: sha512-9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg==}
     engines: {node: '>=10'}
     dependencies:
       brace-expansion: 2.0.1
 
-  /minimatch/9.0.0:
+  /minimatch@9.0.0:
     resolution: {integrity: sha512-0jJj8AvgKqWN05mrwuqi8QYKx1WmYSUoKSxu5Qhs9prezTz10sxAHGNZe9J9cqIJzta8DWsleh2KaVaLl6Ru2w==}
     engines: {node: '>=16 || 14 >=14.17'}
     dependencies:
       brace-expansion: 2.0.1
     dev: true
 
-  /minimist-options/4.1.0:
+  /minimist-options@4.1.0:
     resolution: {integrity: sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==}
     engines: {node: '>= 6'}
     dependencies:
@@ -3830,23 +4131,23 @@ packages:
       kind-of: 6.0.3
     dev: true
 
-  /minimist/1.2.7:
+  /minimist@1.2.7:
     resolution: {integrity: sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==}
     dev: true
 
-  /minipass/3.3.4:
+  /minipass@3.3.4:
     resolution: {integrity: sha512-I9WPbWHCGu8W+6k1ZiGpPu0GkoKBeorkfKNuAFBNS1HNFJvke82sxvI5bzcCNpWPorkOO5QQ+zomzzwRxejXiw==}
     engines: {node: '>=8'}
     dependencies:
       yallist: 4.0.0
     dev: false
 
-  /minipass/5.0.0:
+  /minipass@5.0.0:
     resolution: {integrity: sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==}
     engines: {node: '>=8'}
     dev: true
 
-  /minizlib/2.1.2:
+  /minizlib@2.1.2:
     resolution: {integrity: sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==}
     engines: {node: '>= 8'}
     dependencies:
@@ -3854,40 +4155,40 @@ packages:
       yallist: 4.0.0
     dev: false
 
-  /mixme/0.5.4:
+  /mixme@0.5.4:
     resolution: {integrity: sha512-3KYa4m4Vlqx98GPdOHghxSdNtTvcP8E0kkaJ5Dlh+h2DRzF7zpuVVcA8B0QpKd11YJeP9QQ7ASkKzOeu195Wzw==}
     engines: {node: '>= 8.0.0'}
     dev: true
 
-  /mkdirp-classic/0.5.3:
+  /mkdirp-classic@0.5.3:
     resolution: {integrity: sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==}
     dev: true
 
-  /mkdirp/0.5.6:
+  /mkdirp@0.5.6:
     resolution: {integrity: sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==}
     hasBin: true
     dependencies:
       minimist: 1.2.7
     dev: true
 
-  /mkdirp/1.0.4:
+  /mkdirp@1.0.4:
     resolution: {integrity: sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==}
     engines: {node: '>=10'}
     hasBin: true
     dev: false
 
-  /mri/1.2.0:
+  /mri@1.2.0:
     resolution: {integrity: sha512-tzzskb3bG8LvYGFF/mDTpq3jpI6Q9wc3LEmBaghu+DdCssd1FakN7Bc0hVNmEyGq1bq3RgfkCb3cmQLpNPOroA==}
     engines: {node: '>=4'}
 
-  /mrmime/1.0.1:
+  /mrmime@1.0.1:
     resolution: {integrity: sha512-hzzEagAgDyoU1Q6yg5uI+AorQgdvMCur3FcKf7NhMKWsaYg+RnbTyHRa/9IlLF9rf455MOCtcqqrQQ83pPP7Uw==}
     engines: {node: '>=10'}
 
-  /ms/2.1.2:
+  /ms@2.1.2:
     resolution: {integrity: sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==}
 
-  /mz/2.7.0:
+  /mz@2.7.0:
     resolution: {integrity: sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==}
     dependencies:
       any-promise: 1.3.0
@@ -3895,42 +4196,42 @@ packages:
       thenify-all: 1.6.0
     dev: true
 
-  /nanoid/3.3.4:
+  /nanoid@3.3.4:
     resolution: {integrity: sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==}
     engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
     hasBin: true
 
-  /napi-build-utils/1.0.2:
+  /napi-build-utils@1.0.2:
     resolution: {integrity: sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg==}
     dev: true
 
-  /natural-compare-lite/1.4.0:
+  /natural-compare-lite@1.4.0:
     resolution: {integrity: sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==}
     dev: true
 
-  /natural-compare/1.4.0:
+  /natural-compare@1.4.0:
     resolution: {integrity: sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==}
     dev: true
 
-  /no-case/3.0.4:
+  /no-case@3.0.4:
     resolution: {integrity: sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==}
     dependencies:
       lower-case: 2.0.2
       tslib: 2.4.1
     dev: false
 
-  /node-abi/3.30.0:
+  /node-abi@3.30.0:
     resolution: {integrity: sha512-qWO5l3SCqbwQavymOmtTVuCWZE23++S+rxyoHjXqUmPyzRcaoI4lA2gO55/drddGnedAyjA7sk76SfQ5lfUMnw==}
     engines: {node: '>=10'}
     dependencies:
       semver: 7.3.8
     dev: true
 
-  /node-addon-api/5.0.0:
+  /node-addon-api@5.0.0:
     resolution: {integrity: sha512-CvkDw2OEnme7ybCykJpVcKH+uAOLV2qLqiyla128dN9TkEWfrYmxG6C2boDe5KcNQqZF3orkqzGgOMvZ/JNekA==}
     dev: true
 
-  /node-fetch/2.6.7:
+  /node-fetch@2.6.7:
     resolution: {integrity: sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==}
     engines: {node: 4.x || >=6.0.0}
     peerDependencies:
@@ -3941,12 +4242,12 @@ packages:
     dependencies:
       whatwg-url: 5.0.0
 
-  /node-gyp-build/4.5.0:
+  /node-gyp-build@4.5.0:
     resolution: {integrity: sha512-2iGbaQBV+ITgCz76ZEjmhUKAKVf7xfY1sRl4UiKQspfZMH2h06SyhNsnSVy50cwkFQDGLyif6m/6uFXHkOZ6rg==}
     hasBin: true
     dev: false
 
-  /nopt/5.0.0:
+  /nopt@5.0.0:
     resolution: {integrity: sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==}
     engines: {node: '>=6'}
     hasBin: true
@@ -3954,7 +4255,7 @@ packages:
       abbrev: 1.1.1
     dev: false
 
-  /normalize-package-data/2.5.0:
+  /normalize-package-data@2.5.0:
     resolution: {integrity: sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==}
     dependencies:
       hosted-git-info: 2.8.9
@@ -3963,18 +4264,18 @@ packages:
       validate-npm-package-license: 3.0.4
     dev: true
 
-  /normalize-path/3.0.0:
+  /normalize-path@3.0.0:
     resolution: {integrity: sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==}
     engines: {node: '>=0.10.0'}
 
-  /npm-run-path/2.0.2:
+  /npm-run-path@2.0.2:
     resolution: {integrity: sha512-lJxZYlT4DW/bRUtFh1MQIWqmLwQfAxnqWG4HhEdjMlkrJYnJn0Jrr2u3mgxqaWsdiBc76TYkTG/mhrnYTuzfHw==}
     engines: {node: '>=4'}
     dependencies:
       path-key: 2.0.1
     dev: true
 
-  /npmlog/5.0.1:
+  /npmlog@5.0.1:
     resolution: {integrity: sha512-AqZtDUWOMKs1G/8lwylVjrdYgqA4d9nu8hc+0gzRxlDb1I10+FHBGMXs6aiQHFdCUUlqH99MUMuLfzWDNDtfxw==}
     dependencies:
       are-we-there-yet: 2.0.0
@@ -3983,25 +4284,25 @@ packages:
       set-blocking: 2.0.0
     dev: false
 
-  /number-is-nan/1.0.1:
+  /number-is-nan@1.0.1:
     resolution: {integrity: sha512-4jbtZXNAsfZbAHiiqjLPBiCl16dES1zI4Hpzzxw61Tk+loF+sBDBKx1ICKKKwIqQ7M0mFn1TmkN7euSncWgHiQ==}
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /object-assign/4.1.1:
+  /object-assign@4.1.1:
     resolution: {integrity: sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==}
     engines: {node: '>=0.10.0'}
 
-  /object-inspect/1.12.2:
+  /object-inspect@1.12.2:
     resolution: {integrity: sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==}
     dev: true
 
-  /object-keys/1.1.1:
+  /object-keys@1.1.1:
     resolution: {integrity: sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==}
     engines: {node: '>= 0.4'}
     dev: true
 
-  /object.assign/4.1.4:
+  /object.assign@4.1.4:
     resolution: {integrity: sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==}
     engines: {node: '>= 0.4'}
     dependencies:
@@ -4011,12 +4312,12 @@ packages:
       object-keys: 1.1.1
     dev: true
 
-  /once/1.4.0:
+  /once@1.4.0:
     resolution: {integrity: sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==}
     dependencies:
       wrappy: 1.0.2
 
-  /optionator/0.9.1:
+  /optionator@0.9.1:
     resolution: {integrity: sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==}
     engines: {node: '>= 0.8.0'}
     dependencies:
@@ -4028,7 +4329,7 @@ packages:
       word-wrap: 1.2.3
     dev: true
 
-  /os-locale/2.1.0:
+  /os-locale@2.1.0:
     resolution: {integrity: sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==}
     engines: {node: '>=4'}
     dependencies:
@@ -4037,99 +4338,99 @@ packages:
       mem: 1.1.0
     dev: true
 
-  /os-tmpdir/1.0.2:
+  /os-tmpdir@1.0.2:
     resolution: {integrity: sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==}
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /outdent/0.5.0:
+  /outdent@0.5.0:
     resolution: {integrity: sha512-/jHxFIzoMXdqPzTaCpFzAAWhpkSjZPF4Vsn6jAfNpmbH/ymsmd7Qc6VE9BGn0L6YMj6uwpQLxCECpus4ukKS9Q==}
     dev: true
 
-  /p-filter/2.1.0:
+  /p-filter@2.1.0:
     resolution: {integrity: sha512-ZBxxZ5sL2HghephhpGAQdoskxplTwr7ICaehZwLIlfL6acuVgZPm8yBNuRAFBGEqtD/hmUeq9eqLg2ys9Xr/yw==}
     engines: {node: '>=8'}
     dependencies:
       p-map: 2.1.0
     dev: true
 
-  /p-finally/1.0.0:
+  /p-finally@1.0.0:
     resolution: {integrity: sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow==}
     engines: {node: '>=4'}
     dev: true
 
-  /p-limit/1.3.0:
+  /p-limit@1.3.0:
     resolution: {integrity: sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==}
     engines: {node: '>=4'}
     dependencies:
       p-try: 1.0.0
     dev: true
 
-  /p-limit/2.3.0:
+  /p-limit@2.3.0:
     resolution: {integrity: sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==}
     engines: {node: '>=6'}
     dependencies:
       p-try: 2.2.0
     dev: true
 
-  /p-limit/3.1.0:
+  /p-limit@3.1.0:
     resolution: {integrity: sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==}
     engines: {node: '>=10'}
     dependencies:
       yocto-queue: 0.1.0
     dev: true
 
-  /p-locate/2.0.0:
+  /p-locate@2.0.0:
     resolution: {integrity: sha512-nQja7m7gSKuewoVRen45CtVfODR3crN3goVQ0DDZ9N3yHxgpkuBhZqsaiotSQRrADUrne346peY7kT3TSACykg==}
     engines: {node: '>=4'}
     dependencies:
       p-limit: 1.3.0
     dev: true
 
-  /p-locate/4.1.0:
+  /p-locate@4.1.0:
     resolution: {integrity: sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==}
     engines: {node: '>=8'}
     dependencies:
       p-limit: 2.3.0
     dev: true
 
-  /p-locate/5.0.0:
+  /p-locate@5.0.0:
     resolution: {integrity: sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==}
     engines: {node: '>=10'}
     dependencies:
       p-limit: 3.1.0
     dev: true
 
-  /p-map/2.1.0:
+  /p-map@2.1.0:
     resolution: {integrity: sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==}
     engines: {node: '>=6'}
     dev: true
 
-  /p-try/1.0.0:
+  /p-try@1.0.0:
     resolution: {integrity: sha512-U1etNYuMJoIz3ZXSrrySFjsXQTWOx2/jdi86L+2pRvph/qMKL6sbcCYdH23fqsbm8TH2Gn0OybpT4eSFlCVHww==}
     engines: {node: '>=4'}
     dev: true
 
-  /p-try/2.2.0:
+  /p-try@2.2.0:
     resolution: {integrity: sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==}
     engines: {node: '>=6'}
     dev: true
 
-  /parent-module/1.0.1:
+  /parent-module@1.0.1:
     resolution: {integrity: sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==}
     engines: {node: '>=6'}
     dependencies:
       callsites: 3.1.0
     dev: true
 
-  /parse-json/2.2.0:
+  /parse-json@2.2.0:
     resolution: {integrity: sha512-QR/GGaKCkhwk1ePQNYDRKYZ3mwU9ypsKhB0XyFnLQdomyEqk3e8wpW3V5Jp88zbxK4n5ST1nqo+g9juTpownhQ==}
     engines: {node: '>=0.10.0'}
     dependencies:
       error-ex: 1.3.2
     dev: true
 
-  /parse-json/5.2.0:
+  /parse-json@5.2.0:
     resolution: {integrity: sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==}
     engines: {node: '>=8'}
     dependencies:
@@ -4139,41 +4440,41 @@ packages:
       lines-and-columns: 1.2.4
     dev: true
 
-  /pascal-case/3.1.2:
+  /pascal-case@3.1.2:
     resolution: {integrity: sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==}
     dependencies:
       no-case: 3.0.4
       tslib: 2.4.1
     dev: false
 
-  /path-exists/3.0.0:
+  /path-exists@3.0.0:
     resolution: {integrity: sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==}
     engines: {node: '>=4'}
     dev: true
 
-  /path-exists/4.0.0:
+  /path-exists@4.0.0:
     resolution: {integrity: sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==}
     engines: {node: '>=8'}
     dev: true
 
-  /path-is-absolute/1.0.1:
+  /path-is-absolute@1.0.1:
     resolution: {integrity: sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==}
     engines: {node: '>=0.10.0'}
 
-  /path-key/2.0.1:
+  /path-key@2.0.1:
     resolution: {integrity: sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==}
     engines: {node: '>=4'}
     dev: true
 
-  /path-key/3.1.1:
+  /path-key@3.1.1:
     resolution: {integrity: sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==}
     engines: {node: '>=8'}
     dev: true
 
-  /path-parse/1.0.7:
+  /path-parse@1.0.7:
     resolution: {integrity: sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==}
 
-  /path-scurry/1.6.4:
+  /path-scurry@1.6.4:
     resolution: {integrity: sha512-Qp/9IHkdNiXJ3/Kon++At2nVpnhRiPq/aSvQN+H3U1WZbvNRK0RIQK/o4HMqPoXjpuGJUEWpHSs6Mnjxqh3TQg==}
     engines: {node: '>=16 || 14 >=14.17'}
     dependencies:
@@ -4181,54 +4482,54 @@ packages:
       minipass: 5.0.0
     dev: true
 
-  /path-type/2.0.0:
+  /path-type@2.0.0:
     resolution: {integrity: sha512-dUnb5dXUf+kzhC/W/F4e5/SkluXIFf5VUHolW1Eg1irn1hGWjPGdsRcvYJ1nD6lhk8Ir7VM0bHJKsYTx8Jx9OQ==}
     engines: {node: '>=4'}
     dependencies:
       pify: 2.3.0
     dev: true
 
-  /path-type/4.0.0:
+  /path-type@4.0.0:
     resolution: {integrity: sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==}
     engines: {node: '>=8'}
     dev: true
 
-  /picocolors/1.0.0:
+  /picocolors@1.0.0:
     resolution: {integrity: sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==}
 
-  /picomatch/2.3.1:
+  /picomatch@2.3.1:
     resolution: {integrity: sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==}
     engines: {node: '>=8.6'}
 
-  /pify/2.3.0:
+  /pify@2.3.0:
     resolution: {integrity: sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==}
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /pify/4.0.1:
+  /pify@4.0.1:
     resolution: {integrity: sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==}
     engines: {node: '>=6'}
     dev: true
 
-  /pirates/4.0.5:
+  /pirates@4.0.5:
     resolution: {integrity: sha512-8V9+HQPupnaXMA23c5hvl69zXvTwTzyAYasnkb0Tts4XvO4CliqONMOnvlq26rkhLC3nWDFBJf73LU1e1VZLaQ==}
     engines: {node: '>= 6'}
     dev: true
 
-  /pkg-dir/4.2.0:
+  /pkg-dir@4.2.0:
     resolution: {integrity: sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==}
     engines: {node: '>=8'}
     dependencies:
       find-up: 4.1.0
     dev: true
 
-  /playwright-core/1.29.2:
+  /playwright-core@1.29.2:
     resolution: {integrity: sha512-94QXm4PMgFoHAhlCuoWyaBYKb92yOcGVHdQLoxQ7Wjlc7Flg4aC/jbFW7xMR52OfXMVkWicue4WXE7QEegbIRA==}
     engines: {node: '>=14'}
     hasBin: true
     dev: true
 
-  /playwright/1.29.2:
+  /playwright@1.29.2:
     resolution: {integrity: sha512-hKBYJUtdmYzcjdhYDkP9WGtORwwZBBKAW8+Lz7sr0ZMxtJr04ASXVzH5eBWtDkdb0c3LLFsehfPBTRfvlfKJOA==}
     engines: {node: '>=14'}
     hasBin: true
@@ -4237,12 +4538,12 @@ packages:
       playwright-core: 1.29.2
     dev: true
 
-  /pluralize/8.0.0:
+  /pluralize@8.0.0:
     resolution: {integrity: sha512-Nc3IT5yHzflTfbjgqWcCPpo7DaKy4FnpB0l/zCAW0Tc7jxAiuqSxHasntB3D7887LSrA93kDJ9IXovxJYxyLCA==}
     engines: {node: '>=4'}
     dev: true
 
-  /polka/1.0.0-next.22:
+  /polka@1.0.0-next.22:
     resolution: {integrity: sha512-a7tsZy5gFbJr0aUltZS97xCkbPglXuD67AMvTyZX7BTDBH384FWf0ZQF6rPvdutSxnO1vUlXM2zSLf5tCKk5RA==}
     engines: {node: '>=8'}
     dependencies:
@@ -4250,7 +4551,7 @@ packages:
       trouter: 3.2.0
     dev: true
 
-  /postcss/8.4.21:
+  /postcss@8.4.21:
     resolution: {integrity: sha512-tP7u/Sn/dVxK2NnruI4H9BG+x+Wxz6oeZ1cJ8P6G/PZY0IKk4k/63TDsQf2kQq3+qoJeLm2kIBUNlZe3zgb4Zg==}
     engines: {node: ^10 || ^12 || >=14}
     dependencies:
@@ -4258,7 +4559,7 @@ packages:
       picocolors: 1.0.0
       source-map-js: 1.0.2
 
-  /prebuild-install/7.1.1:
+  /prebuild-install@7.1.1:
     resolution: {integrity: sha512-jAXscXWMcCK8GgCoHOfIr0ODh5ai8mj63L2nWrjuAgXE6tDyYGnx4/8o/rCgU+B4JSyZBKbeZqzhtwtC3ovxjw==}
     engines: {node: '>=10'}
     hasBin: true
@@ -4277,7 +4578,7 @@ packages:
       tunnel-agent: 0.6.0
     dev: true
 
-  /preferred-pm/3.0.3:
+  /preferred-pm@3.0.3:
     resolution: {integrity: sha512-+wZgbxNES/KlJs9q40F/1sfOd/j7f1O9JaHcW5Dsn3aUUOZg3L2bjpVUcKV2jvtElYfoTuQiNeMfQJ4kwUAhCQ==}
     engines: {node: '>=10'}
     dependencies:
@@ -4287,12 +4588,12 @@ packages:
       which-pm: 2.0.0
     dev: true
 
-  /prelude-ls/1.2.1:
+  /prelude-ls@1.2.1:
     resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}
     engines: {node: '>= 0.8.0'}
     dev: true
 
-  /prettier-plugin-svelte/2.8.1_ut7qioamojvh7i5msfgqwwrnie:
+  /prettier-plugin-svelte@2.8.1(prettier@2.8.0)(svelte@3.56.0):
     resolution: {integrity: sha512-KA3K1J3/wKDnCxW7ZDRA/QL2Q67N7Xs3gOERqJ5X1qFjq1DdnN3K1R29scSKwh+kA8FF67pXbYytUpvN/i3iQw==}
     peerDependencies:
       prettier: ^1.16.4 || ^2.0.0
@@ -4302,22 +4603,22 @@ packages:
       svelte: 3.56.0
     dev: true
 
-  /prettier/2.8.0:
+  /prettier@2.8.0:
     resolution: {integrity: sha512-9Lmg8hTFZKG0Asr/kW9Bp8tJjRVluO8EJQVfY2T7FMw9T5jy4I/Uvx0Rca/XWf50QQ1/SS48+6IJWnrb+2yemA==}
     engines: {node: '>=10.13.0'}
     hasBin: true
     dev: true
 
-  /prism-svelte/0.5.0:
+  /prism-svelte@0.5.0:
     resolution: {integrity: sha512-db91Bf3pRGKDPz1lAqLFSJXeW13mulUJxhycysFpfXV5MIK7RgWWK2E5aPAa71s8TCzQUXxF5JOV42/iOs6QkA==}
     dev: true
 
-  /prismjs/1.29.0:
+  /prismjs@1.29.0:
     resolution: {integrity: sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q==}
     engines: {node: '>=6'}
     dev: true
 
-  /prompts/2.4.2:
+  /prompts@2.4.2:
     resolution: {integrity: sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==}
     engines: {node: '>= 6'}
     dependencies:
@@ -4325,23 +4626,23 @@ packages:
       sisteransi: 1.0.5
     dev: false
 
-  /pseudomap/1.0.2:
+  /pseudomap@1.0.2:
     resolution: {integrity: sha512-b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ==}
     dev: true
 
-  /pump/3.0.0:
+  /pump@3.0.0:
     resolution: {integrity: sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==}
     dependencies:
       end-of-stream: 1.4.4
       once: 1.4.0
     dev: true
 
-  /punycode/2.3.0:
+  /punycode@2.3.0:
     resolution: {integrity: sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==}
     engines: {node: '>=6'}
     dev: true
 
-  /purify-css/1.2.5:
+  /purify-css@1.2.5:
     resolution: {integrity: sha512-Vy4jRnV2w/kUjTyxzQOKbFkqwUe6RNLuZgIWR/IRQ8nCqRwiFgwC9XiO9+8poq5KL053uWAQnCSbsfihq77zPg==}
     hasBin: true
     dependencies:
@@ -4352,16 +4653,16 @@ packages:
       yargs: 8.0.2
     dev: true
 
-  /queue-microtask/1.2.3:
+  /queue-microtask@1.2.3:
     resolution: {integrity: sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==}
     dev: true
 
-  /quick-lru/4.0.1:
+  /quick-lru@4.0.1:
     resolution: {integrity: sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==}
     engines: {node: '>=8'}
     dev: true
 
-  /rc/1.2.8:
+  /rc@1.2.8:
     resolution: {integrity: sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==}
     hasBin: true
     dependencies:
@@ -4371,7 +4672,7 @@ packages:
       strip-json-comments: 2.0.1
     dev: true
 
-  /read-pkg-up/2.0.0:
+  /read-pkg-up@2.0.0:
     resolution: {integrity: sha512-1orxQfbWGUiTn9XsPlChs6rLie/AV9jwZTGmu2NZw/CUDJQchXJFYE0Fq5j7+n558T1JhDWLdhyd1Zj+wLY//w==}
     engines: {node: '>=4'}
     dependencies:
@@ -4379,7 +4680,7 @@ packages:
       read-pkg: 2.0.0
     dev: true
 
-  /read-pkg-up/7.0.1:
+  /read-pkg-up@7.0.1:
     resolution: {integrity: sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==}
     engines: {node: '>=8'}
     dependencies:
@@ -4388,7 +4689,7 @@ packages:
       type-fest: 0.8.1
     dev: true
 
-  /read-pkg/2.0.0:
+  /read-pkg@2.0.0:
     resolution: {integrity: sha512-eFIBOPW7FGjzBuk3hdXEuNSiTZS/xEMlH49HxMyzb0hyPfu4EhVjT2DH32K1hSSmVq4sebAWnZuuY5auISUTGA==}
     engines: {node: '>=4'}
     dependencies:
@@ -4397,7 +4698,7 @@ packages:
       path-type: 2.0.0
     dev: true
 
-  /read-pkg/5.2.0:
+  /read-pkg@5.2.0:
     resolution: {integrity: sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==}
     engines: {node: '>=8'}
     dependencies:
@@ -4407,7 +4708,7 @@ packages:
       type-fest: 0.6.0
     dev: true
 
-  /read-yaml-file/1.1.0:
+  /read-yaml-file@1.1.0:
     resolution: {integrity: sha512-VIMnQi/Z4HT2Fxuwg5KrY174U1VdUIASQVWXXyqtNRtxSr9IYkn1rsI6Tb6HsrHCmB7gVpNwX6JxPTHcH6IoTA==}
     engines: {node: '>=6'}
     dependencies:
@@ -4417,7 +4718,7 @@ packages:
       strip-bom: 3.0.0
     dev: true
 
-  /readable-stream/3.6.0:
+  /readable-stream@3.6.0:
     resolution: {integrity: sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==}
     engines: {node: '>= 6'}
     dependencies:
@@ -4425,13 +4726,13 @@ packages:
       string_decoder: 1.3.0
       util-deprecate: 1.0.2
 
-  /readdirp/3.6.0:
+  /readdirp@3.6.0:
     resolution: {integrity: sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==}
     engines: {node: '>=8.10.0'}
     dependencies:
       picomatch: 2.3.1
 
-  /redent/3.0.0:
+  /redent@3.0.0:
     resolution: {integrity: sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==}
     engines: {node: '>=8'}
     dependencies:
@@ -4439,16 +4740,16 @@ packages:
       strip-indent: 3.0.0
     dev: true
 
-  /regenerator-runtime/0.13.10:
+  /regenerator-runtime@0.13.10:
     resolution: {integrity: sha512-KepLsg4dU12hryUO7bp/axHAKvwGOCV0sGloQtpagJ12ai+ojVDqkeGSiRX1zlq+kjIMZ1t7gpze+26QqtdGqw==}
     dev: true
 
-  /regexp-tree/0.1.24:
+  /regexp-tree@0.1.24:
     resolution: {integrity: sha512-s2aEVuLhvnVJW6s/iPgEGK6R+/xngd2jNQ+xy4bXNDKxZKJH6jpPHY6kVeVv1IeLCHgswRj+Kl3ELaDjG6V1iw==}
     hasBin: true
     dev: true
 
-  /regexp.prototype.flags/1.4.3:
+  /regexp.prototype.flags@1.4.3:
     resolution: {integrity: sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==}
     engines: {node: '>= 0.4'}
     dependencies:
@@ -4457,56 +4758,56 @@ packages:
       functions-have-names: 1.2.3
     dev: true
 
-  /regexparam/1.3.0:
+  /regexparam@1.3.0:
     resolution: {integrity: sha512-6IQpFBv6e5vz1QAqI+V4k8P2e/3gRrqfCJ9FI+O1FLQTO+Uz6RXZEZOPmTJ6hlGj7gkERzY5BRCv09whKP96/g==}
     engines: {node: '>=6'}
     dev: true
 
-  /regexparam/2.0.1:
+  /regexparam@2.0.1:
     resolution: {integrity: sha512-zRgSaYemnNYxUv+/5SeoHI0eJIgTL/A2pUtXUPLHQxUldagouJ9p+K6IbIZ/JiQuCEv2E2B1O11SjVQy3aMCkw==}
     engines: {node: '>=8'}
     dev: false
 
-  /regexpp/3.2.0:
+  /regexpp@3.2.0:
     resolution: {integrity: sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==}
     engines: {node: '>=8'}
     dev: true
 
-  /regjsparser/0.9.1:
+  /regjsparser@0.9.1:
     resolution: {integrity: sha512-dQUtn90WanSNl+7mQKcXAgZxvUe7Z0SqXlgzv0za4LwiUhyzBC58yQO3liFoUgu8GiJVInAhJjkj1N0EtQ5nkQ==}
     hasBin: true
     dependencies:
       jsesc: 0.5.0
     dev: true
 
-  /require-directory/2.1.1:
+  /require-directory@2.1.1:
     resolution: {integrity: sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==}
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /require-main-filename/1.0.1:
+  /require-main-filename@1.0.1:
     resolution: {integrity: sha512-IqSUtOVP4ksd1C/ej5zeEh/BIP2ajqpn8c5x+q99gvcIG/Qf0cud5raVnE/Dwd0ua9TXYDoDc0RE5hBSdz22Ug==}
     dev: true
 
-  /require-main-filename/2.0.0:
+  /require-main-filename@2.0.0:
     resolution: {integrity: sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==}
     dev: true
 
-  /resolve-from/4.0.0:
+  /resolve-from@4.0.0:
     resolution: {integrity: sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==}
     engines: {node: '>=4'}
     dev: true
 
-  /resolve-from/5.0.0:
+  /resolve-from@5.0.0:
     resolution: {integrity: sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==}
     engines: {node: '>=8'}
 
-  /resolve-url/0.2.1:
+  /resolve-url@0.2.1:
     resolution: {integrity: sha512-ZuF55hVUQaaczgOIwqWzkEcEidmlD/xl44x1UZnhOXcYuFN2S6+rcxpG+C1N3So0wvNI3DmJICUFfu2SxhBmvg==}
     deprecated: https://github.com/lydell/resolve-url#deprecated
     dev: true
 
-  /resolve/1.22.1:
+  /resolve@1.22.1:
     resolution: {integrity: sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==}
     hasBin: true
     dependencies:
@@ -4514,32 +4815,32 @@ packages:
       path-parse: 1.0.7
       supports-preserve-symlinks-flag: 1.0.0
 
-  /reusify/1.0.4:
+  /reusify@1.0.4:
     resolution: {integrity: sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==}
     engines: {iojs: '>=1.0.0', node: '>=0.10.0'}
     dev: true
 
-  /rework/1.0.1:
+  /rework@1.0.1:
     resolution: {integrity: sha512-eEjL8FdkdsxApd0yWVZgBGzfCQiT8yqSc2H1p4jpZpQdtz7ohETiDMoje5PlM8I9WgkqkreVxFUKYOiJdVWDXw==}
     dependencies:
       convert-source-map: 0.3.5
       css: 2.2.4
     dev: true
 
-  /rimraf/2.7.1:
+  /rimraf@2.7.1:
     resolution: {integrity: sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==}
     hasBin: true
     dependencies:
       glob: 7.2.3
     dev: true
 
-  /rimraf/3.0.2:
+  /rimraf@3.0.2:
     resolution: {integrity: sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==}
     hasBin: true
     dependencies:
       glob: 7.2.3
 
-  /rimraf/5.0.0:
+  /rimraf@5.0.0:
     resolution: {integrity: sha512-Jf9llaP+RvaEVS5nPShYFhtXIrb3LRKP281ib3So0KkeZKo2wIKyq0Re7TOSwanasA423PSr6CCIL4bP6T040g==}
     engines: {node: '>=14'}
     hasBin: true
@@ -4547,42 +4848,42 @@ packages:
       glob: 10.0.0
     dev: true
 
-  /rollup-pluginutils/2.8.2:
+  /rollup-pluginutils@2.8.2:
     resolution: {integrity: sha512-EEp9NhnUkwY8aif6bxgovPHMoMoNr2FulJziTndpt5H9RdwC47GSGuII9XxpSdzVGM0GWrNPHV6ie1LTNJPaLQ==}
     dependencies:
       estree-walker: 0.6.1
     dev: false
 
-  /rollup/3.19.1:
+  /rollup@3.19.1:
     resolution: {integrity: sha512-lAbrdN7neYCg/8WaoWn/ckzCtz+jr70GFfYdlf50OF7387HTg+wiuiqJRFYawwSPpqfqDNYqK7smY/ks2iAudg==}
     engines: {node: '>=14.18.0', npm: '>=8.0.0'}
     hasBin: true
     optionalDependencies:
       fsevents: 2.3.2
 
-  /rollup/3.7.0:
+  /rollup@3.7.0:
     resolution: {integrity: sha512-FIJe0msW9P7L9BTfvaJyvn1U1BVCNTL3w8O+PKIrCyiMLg+rIUGb4MbcgVZ10Lnm1uWXOTOWRNARjfXC1+M12Q==}
     engines: {node: '>=14.18.0', npm: '>=8.0.0'}
     hasBin: true
     optionalDependencies:
       fsevents: 2.3.2
 
-  /run-parallel/1.2.0:
+  /run-parallel@1.2.0:
     resolution: {integrity: sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==}
     dependencies:
       queue-microtask: 1.2.3
     dev: true
 
-  /sade/1.8.1:
+  /sade@1.8.1:
     resolution: {integrity: sha512-xal3CZX1Xlo/k4ApwCFrHVACi9fBqJ7V+mwhBsuf/1IOKbBy098Fex+Wa/5QMubw09pSZ/u8EY8PWgevJsXp1A==}
     engines: {node: '>=6'}
     dependencies:
       mri: 1.2.0
 
-  /safe-buffer/5.2.1:
+  /safe-buffer@5.2.1:
     resolution: {integrity: sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==}
 
-  /safe-regex-test/1.0.0:
+  /safe-regex-test@1.0.0:
     resolution: {integrity: sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==}
     dependencies:
       call-bind: 1.0.2
@@ -4590,17 +4891,17 @@ packages:
       is-regex: 1.1.4
     dev: true
 
-  /safe-regex/2.1.1:
+  /safe-regex@2.1.1:
     resolution: {integrity: sha512-rx+x8AMzKb5Q5lQ95Zoi6ZbJqwCLkqi3XuJXp5P3rT8OEc6sZCJG5AE5dU3lsgRr/F4Bs31jSlVN+j5KrsGu9A==}
     dependencies:
       regexp-tree: 0.1.24
     dev: true
 
-  /safer-buffer/2.1.2:
+  /safer-buffer@2.1.2:
     resolution: {integrity: sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==}
     dev: true
 
-  /sander/0.5.1:
+  /sander@0.5.1:
     resolution: {integrity: sha512-3lVqBir7WuKDHGrKRDn/1Ye3kwpXaDOMsiRP1wd6wpZW56gJhsbp5RqQpA6JG/P+pkXizygnr1dKR8vzWaVsfA==}
     dependencies:
       es6-promise: 3.3.1
@@ -4609,35 +4910,35 @@ packages:
       rimraf: 2.7.1
     dev: true
 
-  /semiver/1.1.0:
+  /semiver@1.1.0:
     resolution: {integrity: sha512-QNI2ChmuioGC1/xjyYwyZYADILWyW6AmS1UH6gDj/SFUUUS4MBAWs/7mxnkRPc/F4iHezDP+O8t0dO8WHiEOdg==}
     engines: {node: '>=6'}
     dev: true
 
-  /semver/5.7.1:
+  /semver@5.7.1:
     resolution: {integrity: sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==}
     hasBin: true
     dev: true
 
-  /semver/6.3.0:
+  /semver@6.3.0:
     resolution: {integrity: sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==}
     hasBin: true
 
-  /semver/7.3.8:
+  /semver@7.3.8:
     resolution: {integrity: sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==}
     engines: {node: '>=10'}
     hasBin: true
     dependencies:
       lru-cache: 6.0.0
 
-  /set-blocking/2.0.0:
+  /set-blocking@2.0.0:
     resolution: {integrity: sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==}
 
-  /set-cookie-parser/2.5.1:
+  /set-cookie-parser@2.5.1:
     resolution: {integrity: sha512-1jeBGaKNGdEq4FgIrORu/N570dwoPYio8lSoYLWmX7sQ//0JY08Xh9o5pBcgmHQ/MbsYp/aZnOe1s1lIsbLprQ==}
     dev: false
 
-  /sharp/0.31.3:
+  /sharp@0.31.3:
     resolution: {integrity: sha512-XcR4+FCLBFKw1bdB+GEhnUNXNXvnt0tDo4WsBsraKymuo/IAuPuCBVAL2wIkUw2r/dwFW5Q5+g66Kwl2dgDFVg==}
     engines: {node: '>=14.15.0'}
     requiresBuild: true
@@ -4652,31 +4953,31 @@ packages:
       tunnel-agent: 0.6.0
     dev: true
 
-  /shebang-command/1.2.0:
+  /shebang-command@1.2.0:
     resolution: {integrity: sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==}
     engines: {node: '>=0.10.0'}
     dependencies:
       shebang-regex: 1.0.0
     dev: true
 
-  /shebang-command/2.0.0:
+  /shebang-command@2.0.0:
     resolution: {integrity: sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==}
     engines: {node: '>=8'}
     dependencies:
       shebang-regex: 3.0.0
     dev: true
 
-  /shebang-regex/1.0.0:
+  /shebang-regex@1.0.0:
     resolution: {integrity: sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ==}
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /shebang-regex/3.0.0:
+  /shebang-regex@3.0.0:
     resolution: {integrity: sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==}
     engines: {node: '>=8'}
     dev: true
 
-  /shiki-twoslash/3.1.0:
+  /shiki-twoslash@3.1.0:
     resolution: {integrity: sha512-uDqrTutOIZzyHbo103GsK7Vvc10saK1XCCivnOQ1NHJzgp3FBilEpftGeVzVSMOJs+JyhI7whkvhXV7kXQ5zCg==}
     dependencies:
       '@typescript/twoslash': 3.1.0
@@ -4687,7 +4988,7 @@ packages:
       - supports-color
     dev: true
 
-  /shiki/0.10.1:
+  /shiki@0.10.1:
     resolution: {integrity: sha512-VsY7QJVzU51j5o1+DguUd+6vmCmZ5v/6gYu4vyYAhzjuNQU6P/vmSy4uQaOhvje031qQMiW0d2BwgMH52vqMng==}
     dependencies:
       jsonc-parser: 3.2.0
@@ -4695,7 +4996,7 @@ packages:
       vscode-textmate: 5.2.0
     dev: true
 
-  /side-channel/1.0.4:
+  /side-channel@1.0.4:
     resolution: {integrity: sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==}
     dependencies:
       call-bind: 1.0.2
@@ -4703,14 +5004,14 @@ packages:
       object-inspect: 1.12.2
     dev: true
 
-  /signal-exit/3.0.7:
+  /signal-exit@3.0.7:
     resolution: {integrity: sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==}
 
-  /simple-concat/1.0.1:
+  /simple-concat@1.0.1:
     resolution: {integrity: sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==}
     dev: true
 
-  /simple-get/4.0.1:
+  /simple-get@4.0.1:
     resolution: {integrity: sha512-brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA==}
     dependencies:
       decompress-response: 6.0.0
@@ -4718,13 +5019,13 @@ packages:
       simple-concat: 1.0.1
     dev: true
 
-  /simple-swizzle/0.2.2:
+  /simple-swizzle@0.2.2:
     resolution: {integrity: sha512-JA//kQgZtbuY83m+xT+tXJkmJncGMTFT+C+g2h2R9uxkYIrE2yy9sgmcLhCnw57/WSD+Eh3J97FPEDFnbXnDUg==}
     dependencies:
       is-arrayish: 0.3.2
     dev: true
 
-  /sirv-cli/2.0.2:
+  /sirv-cli@2.0.2:
     resolution: {integrity: sha512-OtSJDwxsF1NWHc7ps3Sa0s+dPtP15iQNJzfKVz+MxkEo3z72mCD+yu30ct79rPr0CaV1HXSOBp+MIY5uIhHZ1A==}
     engines: {node: '>= 10'}
     hasBin: true
@@ -4739,7 +5040,7 @@ packages:
       tinydate: 1.3.0
     dev: true
 
-  /sirv/2.0.2:
+  /sirv@2.0.2:
     resolution: {integrity: sha512-4Qog6aE29nIjAOKe/wowFTxOdmbEZKb+3tsLljaBRzJwtqto0BChD2zzH0LhgCSXiI+V7X+Y45v14wBZQ1TK3w==}
     engines: {node: '>= 10'}
     dependencies:
@@ -4747,16 +5048,16 @@ packages:
       mrmime: 1.0.1
       totalist: 3.0.0
 
-  /sisteransi/1.0.5:
+  /sisteransi@1.0.5:
     resolution: {integrity: sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==}
     dev: false
 
-  /slash/3.0.0:
+  /slash@3.0.0:
     resolution: {integrity: sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==}
     engines: {node: '>=8'}
     dev: true
 
-  /smartwrap/2.0.2:
+  /smartwrap@2.0.2:
     resolution: {integrity: sha512-vCsKNQxb7PnCNd2wY1WClWifAc2lwqsG8OaswpJkVJsvMGcnEntdTCDajZCkk93Ay1U3t/9puJmb525Rg5MZBA==}
     engines: {node: '>=6'}
     hasBin: true
@@ -4769,7 +5070,7 @@ packages:
       yargs: 15.4.1
     dev: true
 
-  /sorcery/0.10.0:
+  /sorcery@0.10.0:
     resolution: {integrity: sha512-R5ocFmKZQFfSTstfOtHjJuAwbpGyf9qjQa1egyhvXSbM7emjrtLXtGdZsDJDABC85YBfVvrOiGWKSYXPKdvP1g==}
     hasBin: true
     dependencies:
@@ -4779,11 +5080,11 @@ packages:
       sourcemap-codec: 1.4.8
     dev: true
 
-  /source-map-js/1.0.2:
+  /source-map-js@1.0.2:
     resolution: {integrity: sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==}
     engines: {node: '>=0.10.0'}
 
-  /source-map-resolve/0.5.3:
+  /source-map-resolve@0.5.3:
     resolution: {integrity: sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==}
     deprecated: See https://github.com/lydell/source-map-resolve#deprecated
     dependencies:
@@ -4794,66 +5095,66 @@ packages:
       urix: 0.1.0
     dev: true
 
-  /source-map-url/0.4.1:
+  /source-map-url@0.4.1:
     resolution: {integrity: sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==}
     deprecated: See https://github.com/lydell/source-map-url#deprecated
     dev: true
 
-  /source-map/0.6.1:
+  /source-map@0.6.1:
     resolution: {integrity: sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==}
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /sourcemap-codec/1.4.8:
+  /sourcemap-codec@1.4.8:
     resolution: {integrity: sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==}
     deprecated: Please use @jridgewell/sourcemap-codec instead
     dev: true
 
-  /spawndamnit/2.0.0:
+  /spawndamnit@2.0.0:
     resolution: {integrity: sha512-j4JKEcncSjFlqIwU5L/rp2N5SIPsdxaRsIv678+TZxZ0SRDJTm8JrxJMjE/XuiEZNEir3S8l0Fa3Ke339WI4qA==}
     dependencies:
       cross-spawn: 5.1.0
       signal-exit: 3.0.7
     dev: true
 
-  /spdx-correct/3.1.1:
+  /spdx-correct@3.1.1:
     resolution: {integrity: sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==}
     dependencies:
       spdx-expression-parse: 3.0.1
       spdx-license-ids: 3.0.12
     dev: true
 
-  /spdx-exceptions/2.3.0:
+  /spdx-exceptions@2.3.0:
     resolution: {integrity: sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==}
     dev: true
 
-  /spdx-expression-parse/3.0.1:
+  /spdx-expression-parse@3.0.1:
     resolution: {integrity: sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==}
     dependencies:
       spdx-exceptions: 2.3.0
       spdx-license-ids: 3.0.12
     dev: true
 
-  /spdx-license-ids/3.0.12:
+  /spdx-license-ids@3.0.12:
     resolution: {integrity: sha512-rr+VVSXtRhO4OHbXUiAF7xW3Bo9DuuF6C5jH+q/x15j2jniycgKbxU09Hr0WqlSLUs4i4ltHGXqTe7VHclYWyA==}
     dev: true
 
-  /sprintf-js/1.0.3:
+  /sprintf-js@1.0.3:
     resolution: {integrity: sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==}
     dev: true
 
-  /stream-transform/2.1.3:
+  /stream-transform@2.1.3:
     resolution: {integrity: sha512-9GHUiM5hMiCi6Y03jD2ARC1ettBXkQBoQAe7nJsPknnI0ow10aXjTnew8QtYQmLjzn974BnmWEAJgCY6ZP1DeQ==}
     dependencies:
       mixme: 0.5.4
     dev: true
 
-  /streamsearch/1.1.0:
+  /streamsearch@1.1.0:
     resolution: {integrity: sha512-Mcc5wHehp9aXz1ax6bZUyY5afg9u2rv5cqQI3mRrYkGC8rW2hM02jWuwjtL++LS5qinSyhj2QfLyNsuc+VsExg==}
     engines: {node: '>=10.0.0'}
     dev: false
 
-  /string-width/1.0.2:
+  /string-width@1.0.2:
     resolution: {integrity: sha512-0XsVpQLnVCXHJfyEs8tC0zpTVIr5PKKsQtkT29IwupnPTjtPmQ3xT/4yCREF9hYkV/3M3kzcUTSAZT6a6h81tw==}
     engines: {node: '>=0.10.0'}
     dependencies:
@@ -4862,7 +5163,7 @@ packages:
       strip-ansi: 3.0.1
     dev: true
 
-  /string-width/2.1.1:
+  /string-width@2.1.1:
     resolution: {integrity: sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==}
     engines: {node: '>=4'}
     dependencies:
@@ -4870,7 +5171,7 @@ packages:
       strip-ansi: 4.0.0
     dev: true
 
-  /string-width/4.2.3:
+  /string-width@4.2.3:
     resolution: {integrity: sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==}
     engines: {node: '>=8'}
     dependencies:
@@ -4878,7 +5179,7 @@ packages:
       is-fullwidth-code-point: 3.0.0
       strip-ansi: 6.0.1
 
-  /string.prototype.trimend/1.0.6:
+  /string.prototype.trimend@1.0.6:
     resolution: {integrity: sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ==}
     dependencies:
       call-bind: 1.0.2
@@ -4886,7 +5187,7 @@ packages:
       es-abstract: 1.20.4
     dev: true
 
-  /string.prototype.trimstart/1.0.6:
+  /string.prototype.trimstart@1.0.6:
     resolution: {integrity: sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA==}
     dependencies:
       call-bind: 1.0.2
@@ -4894,59 +5195,59 @@ packages:
       es-abstract: 1.20.4
     dev: true
 
-  /string_decoder/1.3.0:
+  /string_decoder@1.3.0:
     resolution: {integrity: sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==}
     dependencies:
       safe-buffer: 5.2.1
 
-  /strip-ansi/3.0.1:
+  /strip-ansi@3.0.1:
     resolution: {integrity: sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==}
     engines: {node: '>=0.10.0'}
     dependencies:
       ansi-regex: 2.1.1
     dev: true
 
-  /strip-ansi/4.0.0:
+  /strip-ansi@4.0.0:
     resolution: {integrity: sha512-4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow==}
     engines: {node: '>=4'}
     dependencies:
       ansi-regex: 3.0.1
     dev: true
 
-  /strip-ansi/6.0.1:
+  /strip-ansi@6.0.1:
     resolution: {integrity: sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==}
     engines: {node: '>=8'}
     dependencies:
       ansi-regex: 5.0.1
 
-  /strip-bom/3.0.0:
+  /strip-bom@3.0.0:
     resolution: {integrity: sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==}
     engines: {node: '>=4'}
     dev: true
 
-  /strip-eof/1.0.0:
+  /strip-eof@1.0.0:
     resolution: {integrity: sha512-7FCwGGmx8mD5xQd3RPUvnSpUXHM3BWuzjtpD4TXsfcZ9EL4azvVVUscFYwD9nx8Kh+uCBC00XBtAykoMHwTh8Q==}
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /strip-indent/3.0.0:
+  /strip-indent@3.0.0:
     resolution: {integrity: sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==}
     engines: {node: '>=8'}
     dependencies:
       min-indent: 1.0.1
     dev: true
 
-  /strip-json-comments/2.0.1:
+  /strip-json-comments@2.0.1:
     resolution: {integrity: sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==}
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /strip-json-comments/3.1.1:
+  /strip-json-comments@3.1.1:
     resolution: {integrity: sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==}
     engines: {node: '>=8'}
     dev: true
 
-  /sucrase/3.29.0:
+  /sucrase@3.29.0:
     resolution: {integrity: sha512-bZPAuGA5SdFHuzqIhTAqt9fvNEo9rESqXIG3oiKdF8K4UmkQxC4KlNL3lVyAErXp+mPvUqZ5l13qx6TrDIGf3A==}
     engines: {node: '>=8'}
     hasBin: true
@@ -4959,25 +5260,25 @@ packages:
       ts-interface-checker: 0.1.13
     dev: true
 
-  /supports-color/5.5.0:
+  /supports-color@5.5.0:
     resolution: {integrity: sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==}
     engines: {node: '>=4'}
     dependencies:
       has-flag: 3.0.0
     dev: true
 
-  /supports-color/7.2.0:
+  /supports-color@7.2.0:
     resolution: {integrity: sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==}
     engines: {node: '>=8'}
     dependencies:
       has-flag: 4.0.0
     dev: true
 
-  /supports-preserve-symlinks-flag/1.0.0:
+  /supports-preserve-symlinks-flag@1.0.0:
     resolution: {integrity: sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==}
     engines: {node: '>= 0.4'}
 
-  /svelte-check/3.0.2_svelte@3.56.0:
+  /svelte-check@3.0.2(svelte@3.56.0):
     resolution: {integrity: sha512-DkhKhV0Jt0gh7q9DBB26+J2Vfb9y4/4JWxnbkXBZha7542LOhwvj3edJFjyJ+xjdaXyInZ+YRRYc3V6wytP2ew==}
     hasBin: true
     peerDependencies:
@@ -4990,7 +5291,7 @@ packages:
       picocolors: 1.0.0
       sade: 1.8.1
       svelte: 3.56.0
-      svelte-preprocess: 5.0.0_llpdtttxqmim2s7ymcc5fxs7oi
+      svelte-preprocess: 5.0.0(svelte@3.56.0)(typescript@4.9.4)
       typescript: 4.9.4
     transitivePeerDependencies:
       - '@babel/core'
@@ -5004,7 +5305,7 @@ packages:
       - sugarss
     dev: true
 
-  /svelte-hmr/0.15.1_svelte@3.56.0:
+  /svelte-hmr@0.15.1(svelte@3.56.0):
     resolution: {integrity: sha512-BiKB4RZ8YSwRKCNVdNxK/GfY+r4Kjgp9jCLEy0DuqAKfmQtpL38cQK3afdpjw4sqSs4PLi3jIPJIFp259NkZtA==}
     engines: {node: ^12.20 || ^14.13.1 || >= 16}
     peerDependencies:
@@ -5013,7 +5314,7 @@ packages:
       svelte: 3.56.0
     dev: false
 
-  /svelte-local-storage-store/0.4.0_svelte@3.56.0:
+  /svelte-local-storage-store@0.4.0(svelte@3.56.0):
     resolution: {integrity: sha512-ctPykTt4S3BE5bF0mfV0jKiUR1qlmqLvnAkQvYHLeb9wRyO1MdIFDVI23X+TZEFleATHkTaOpYZswIvf3b2tWA==}
     engines: {node: '>=0.14'}
     peerDependencies:
@@ -5022,7 +5323,7 @@ packages:
       svelte: 3.56.0
     dev: true
 
-  /svelte-preprocess/5.0.0_llpdtttxqmim2s7ymcc5fxs7oi:
+  /svelte-preprocess@5.0.0(svelte@3.56.0)(typescript@4.9.4):
     resolution: {integrity: sha512-q7lpa7i2FBu8Pa+G0MmuQQWETBwCKgsGmuq1Sf6n8q4uaG9ZLcLP0Y+etC6bF4sE6EbLxfiI38zV6RfPe3RSfg==}
     engines: {node: '>= 14.10.0'}
     requiresBuild: true
@@ -5070,11 +5371,7 @@ packages:
       typescript: 4.9.4
     dev: true
 
-  /svelte/3.56.0:
-    resolution: {integrity: sha512-LvXiJbjdvJKwB/0CQyYpDX0q+hFqCyWmybzC2G6eK1tJJA/RSRCytTfNmjHv+RHlLuA70vWG7nXp6gbeErYvRA==}
-    engines: {node: '>= 8'}
-
-  /svelte2tsx/0.6.0_llpdtttxqmim2s7ymcc5fxs7oi:
+  /svelte2tsx@0.6.0(svelte@3.56.0)(typescript@4.9.4):
     resolution: {integrity: sha512-TrxfQkO7CKi8Pu2eC/FyteDCdk3OOeQV5u6z7OjYAsOhsd0ClzAKqxJdvp6xxNQLrbFzf/XvCi9Fy8MQ1MleFA==}
     peerDependencies:
       svelte: ^3.55
@@ -5086,7 +5383,11 @@ packages:
       typescript: 4.9.4
     dev: false
 
-  /tar-fs/2.1.1:
+  /svelte@3.56.0:
+    resolution: {integrity: sha512-LvXiJbjdvJKwB/0CQyYpDX0q+hFqCyWmybzC2G6eK1tJJA/RSRCytTfNmjHv+RHlLuA70vWG7nXp6gbeErYvRA==}
+    engines: {node: '>= 8'}
+
+  /tar-fs@2.1.1:
     resolution: {integrity: sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==}
     dependencies:
       chownr: 1.1.4
@@ -5095,7 +5396,7 @@ packages:
       tar-stream: 2.2.0
     dev: true
 
-  /tar-stream/2.2.0:
+  /tar-stream@2.2.0:
     resolution: {integrity: sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==}
     engines: {node: '>=6'}
     dependencies:
@@ -5106,7 +5407,7 @@ packages:
       readable-stream: 3.6.0
     dev: true
 
-  /tar/6.1.12:
+  /tar@6.1.12:
     resolution: {integrity: sha512-jU4TdemS31uABHd+Lt5WEYJuzn+TJTCBLljvIAHZOz6M9Os5pJ4dD+vRFLxPa/n3T0iEFzpi+0x1UfuDZYbRMw==}
     engines: {node: '>=10'}
     dependencies:
@@ -5118,12 +5419,12 @@ packages:
       yallist: 4.0.0
     dev: false
 
-  /term-size/2.2.1:
+  /term-size@2.2.1:
     resolution: {integrity: sha512-wK0Ri4fOGjv/XPy8SBHZChl8CM7uMc5VML7SqiQ0zG7+J5Vr+RMQDoHa2CNT6KHUnTGIXH34UDMkPzAUyapBZg==}
     engines: {node: '>=8'}
     dev: true
 
-  /test-exclude/6.0.0:
+  /test-exclude@6.0.0:
     resolution: {integrity: sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==}
     engines: {node: '>=8'}
     dependencies:
@@ -5132,86 +5433,86 @@ packages:
       minimatch: 3.1.2
     dev: true
 
-  /text-table/0.2.0:
+  /text-table@0.2.0:
     resolution: {integrity: sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==}
     dev: true
 
-  /thenify-all/1.6.0:
+  /thenify-all@1.6.0:
     resolution: {integrity: sha512-RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA==}
     engines: {node: '>=0.8'}
     dependencies:
       thenify: 3.3.1
     dev: true
 
-  /thenify/3.3.1:
+  /thenify@3.3.1:
     resolution: {integrity: sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==}
     dependencies:
       any-promise: 1.3.0
     dev: true
 
-  /tiny-glob/0.2.9:
+  /tiny-glob@0.2.9:
     resolution: {integrity: sha512-g/55ssRPUjShh+xkfx9UPDXqhckHEsHr4Vd9zX55oSdGZc/MD0m3sferOkwWtp98bv+kcVfEHtRJgBVJzelrzg==}
     dependencies:
       globalyzer: 0.1.0
       globrex: 0.1.2
 
-  /tinydate/1.3.0:
+  /tinydate@1.3.0:
     resolution: {integrity: sha512-7cR8rLy2QhYHpsBDBVYnnWXm8uRTr38RoZakFSW7Bs7PzfMPNZthuMLkwqZv7MTu8lhQ91cOFYS5a7iFj2oR3w==}
     engines: {node: '>=4'}
     dev: true
 
-  /tmp/0.0.33:
+  /tmp@0.0.33:
     resolution: {integrity: sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==}
     engines: {node: '>=0.6.0'}
     dependencies:
       os-tmpdir: 1.0.2
     dev: true
 
-  /to-regex-range/5.0.1:
+  /to-regex-range@5.0.1:
     resolution: {integrity: sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==}
     engines: {node: '>=8.0'}
     dependencies:
       is-number: 7.0.0
 
-  /topojson-client/3.1.0:
+  /topojson-client@3.1.0:
     resolution: {integrity: sha512-605uxS6bcYxGXw9qi62XyrV6Q3xwbndjachmNxu8HWTtVPxZfEJN9fd/SZS1Q54Sn2y0TMyMxFj/cJINqGHrKw==}
     hasBin: true
     dependencies:
       commander: 2.20.3
     dev: false
 
-  /totalist/3.0.0:
+  /totalist@3.0.0:
     resolution: {integrity: sha512-eM+pCBxXO/njtF7vdFsHuqb+ElbxqtI4r5EAvk6grfAFyJ6IvWlSkfZ5T9ozC6xWw3Fj1fGoSmrl0gUs46JVIw==}
     engines: {node: '>=6'}
 
-  /tr46/0.0.3:
+  /tr46@0.0.3:
     resolution: {integrity: sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==}
 
-  /trim-newlines/3.0.1:
+  /trim-newlines@3.0.1:
     resolution: {integrity: sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==}
     engines: {node: '>=8'}
     dev: true
 
-  /trouter/3.2.0:
+  /trouter@3.2.0:
     resolution: {integrity: sha512-rLLXbhTObLy2MBVjLC+jTnoIKw99n0GuJs9ov10J870vDw5qhTurPzsDrudNtBf5w/CZ9ctZy2p2IMmhGcel2w==}
     engines: {node: '>=6'}
     dependencies:
       regexparam: 1.3.0
     dev: true
 
-  /ts-interface-checker/0.1.13:
+  /ts-interface-checker@0.1.13:
     resolution: {integrity: sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==}
     dev: true
 
-  /tslib/1.14.1:
+  /tslib@1.14.1:
     resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==}
     dev: true
 
-  /tslib/2.4.1:
+  /tslib@2.4.1:
     resolution: {integrity: sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA==}
     dev: false
 
-  /tsutils/3.21.0_typescript@4.9.4:
+  /tsutils@3.21.0(typescript@4.9.4):
     resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==}
     engines: {node: '>= 6'}
     peerDependencies:
@@ -5221,7 +5522,7 @@ packages:
       typescript: 4.9.4
     dev: true
 
-  /tty-table/4.1.6:
+  /tty-table@4.1.6:
     resolution: {integrity: sha512-kRj5CBzOrakV4VRRY5kUWbNYvo/FpOsz65DzI5op9P+cHov3+IqPbo1JE1ZnQGkHdZgNFDsrEjrfqqy/Ply9fw==}
     engines: {node: '>=8.0.0'}
     hasBin: true
@@ -5235,57 +5536,57 @@ packages:
       yargs: 17.6.2
     dev: true
 
-  /tunnel-agent/0.6.0:
+  /tunnel-agent@0.6.0:
     resolution: {integrity: sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==}
     dependencies:
       safe-buffer: 5.2.1
     dev: true
 
-  /type-check/0.4.0:
+  /type-check@0.4.0:
     resolution: {integrity: sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==}
     engines: {node: '>= 0.8.0'}
     dependencies:
       prelude-ls: 1.2.1
     dev: true
 
-  /type-fest/0.13.1:
+  /type-fest@0.13.1:
     resolution: {integrity: sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg==}
     engines: {node: '>=10'}
     dev: true
 
-  /type-fest/0.20.2:
+  /type-fest@0.20.2:
     resolution: {integrity: sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==}
     engines: {node: '>=10'}
     dev: true
 
-  /type-fest/0.6.0:
+  /type-fest@0.6.0:
     resolution: {integrity: sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==}
     engines: {node: '>=8'}
     dev: true
 
-  /type-fest/0.8.1:
+  /type-fest@0.8.1:
     resolution: {integrity: sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==}
     engines: {node: '>=8'}
     dev: true
 
-  /typescript/4.9.4:
+  /typescript@4.9.4:
     resolution: {integrity: sha512-Uz+dTXYzxXXbsFpM86Wh3dKCxrQqUcVMxwU54orwlJjOpO3ao8L7j5lH+dWfTwgCwIuM9GQ2kvVotzYJMXTBZg==}
     engines: {node: '>=4.2.0'}
     hasBin: true
 
-  /typescript/5.0.2:
+  /typescript@5.0.2:
     resolution: {integrity: sha512-wVORMBGO/FAs/++blGNeAVdbNKtIh1rbBL2EyQ1+J9lClJ93KiiKe8PmFIVdXhHcyv44SL9oglmfeSsndo0jRw==}
     engines: {node: '>=12.20'}
     hasBin: true
     dev: true
 
-  /uglify-js/3.17.4:
+  /uglify-js@3.17.4:
     resolution: {integrity: sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==}
     engines: {node: '>=0.8.0'}
     hasBin: true
     dev: true
 
-  /unbox-primitive/1.0.2:
+  /unbox-primitive@1.0.2:
     resolution: {integrity: sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==}
     dependencies:
       call-bind: 1.0.2
@@ -5294,33 +5595,33 @@ packages:
       which-boxed-primitive: 1.0.2
     dev: true
 
-  /undici/5.20.0:
+  /undici@5.20.0:
     resolution: {integrity: sha512-J3j60dYzuo6Eevbawwp1sdg16k5Tf768bxYK4TUJRH7cBM4kFCbf3mOnM/0E3vQYXvpxITbbWmBafaDbxLDz3g==}
     engines: {node: '>=12.18'}
     dependencies:
       busboy: 1.6.0
     dev: false
 
-  /universalify/0.1.2:
+  /universalify@0.1.2:
     resolution: {integrity: sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==}
     engines: {node: '>= 4.0.0'}
     dev: true
 
-  /uri-js/4.4.1:
+  /uri-js@4.4.1:
     resolution: {integrity: sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==}
     dependencies:
       punycode: 2.3.0
     dev: true
 
-  /urix/0.1.0:
+  /urix@0.1.0:
     resolution: {integrity: sha512-Am1ousAhSLBeB9cG/7k7r2R0zj50uDRlZHPGbazid5s9rlF1F/QKYObEKSIunSjIOkJZqwRRLpvewjEkM7pSqg==}
     deprecated: Please see https://github.com/lydell/urix#deprecated
     dev: true
 
-  /util-deprecate/1.0.2:
+  /util-deprecate@1.0.2:
     resolution: {integrity: sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==}
 
-  /uvu/0.5.6:
+  /uvu@0.5.6:
     resolution: {integrity: sha512-+g8ENReyr8YsOc6fv/NVJs2vFdHBnBNdfE49rshrTzDWOlUx4Gq7KOS2GD8eqhy2j+Ejq29+SbKH8yjkAqXqoA==}
     engines: {node: '>=8'}
     hasBin: true
@@ -5331,7 +5632,7 @@ packages:
       sade: 1.8.1
     dev: true
 
-  /v8-to-istanbul/9.0.1:
+  /v8-to-istanbul@9.0.1:
     resolution: {integrity: sha512-74Y4LqY74kLE6IFyIjPtkSTWzUZmj8tdHT9Ii/26dvQ6K9Dl2NbEfj0XgU2sHCtKgt5VupqhlO/5aWuqS+IY1w==}
     engines: {node: '>=10.12.0'}
     dependencies:
@@ -5340,57 +5641,24 @@ packages:
       convert-source-map: 1.9.0
     dev: true
 
-  /validate-npm-package-license/3.0.4:
+  /validate-npm-package-license@3.0.4:
     resolution: {integrity: sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==}
     dependencies:
       spdx-correct: 3.1.1
       spdx-expression-parse: 3.0.1
     dev: true
 
-  /vite-imagetools/4.0.16:
+  /vite-imagetools@4.0.16(rollup@3.7.0):
     resolution: {integrity: sha512-kjTIcscDYEXLxTeCRVZVArygEOgFBoG6pno6H6wBpq6R07Lov/zRDG7UX/yw3DgMFzeVPWJW8YuItT7M0puSDw==}
     engines: {node: '>=12.0.0'}
     dependencies:
-      '@rollup/pluginutils': 5.0.2
+      '@rollup/pluginutils': 5.0.2(rollup@3.7.0)
       imagetools-core: 3.3.1
     transitivePeerDependencies:
       - rollup
     dev: true
 
-  /vite/4.2.0:
-    resolution: {integrity: sha512-AbDTyzzwuKoRtMIRLGNxhLRuv1FpRgdIw+1y6AQG73Q5+vtecmvzKo/yk8X/vrHDpETRTx01ABijqUHIzBXi0g==}
-    engines: {node: ^14.18.0 || >=16.0.0}
-    hasBin: true
-    peerDependencies:
-      '@types/node': '>= 14'
-      less: '*'
-      sass: '*'
-      stylus: '*'
-      sugarss: '*'
-      terser: ^5.4.0
-    peerDependenciesMeta:
-      '@types/node':
-        optional: true
-      less:
-        optional: true
-      sass:
-        optional: true
-      stylus:
-        optional: true
-      sugarss:
-        optional: true
-      terser:
-        optional: true
-    dependencies:
-      esbuild: 0.17.12
-      postcss: 8.4.21
-      resolve: 1.22.1
-      rollup: 3.19.1
-    optionalDependencies:
-      fsevents: 2.3.2
-    dev: true
-
-  /vite/4.2.0_@types+node@16.18.6:
+  /vite@4.2.0(@types/node@16.18.6):
     resolution: {integrity: sha512-AbDTyzzwuKoRtMIRLGNxhLRuv1FpRgdIw+1y6AQG73Q5+vtecmvzKo/yk8X/vrHDpETRTx01ABijqUHIzBXi0g==}
     engines: {node: ^14.18.0 || >=16.0.0}
     hasBin: true
@@ -5423,7 +5691,7 @@ packages:
     optionalDependencies:
       fsevents: 2.3.2
 
-  /vitefu/0.2.3_vite@4.2.0:
+  /vitefu@0.2.3(vite@4.2.0):
     resolution: {integrity: sha512-75l7TTuU8isAhz1QFtNKjDkqjxvndfMC1AfIMjJ0ZQ59ZD0Ow9QOIsJJX16Wv9PS8f+zMzp6fHy5cCbKG/yVUQ==}
     peerDependencies:
       vite: ^3.0.0 || ^4.0.0
@@ -5431,33 +5699,33 @@ packages:
       vite:
         optional: true
     dependencies:
-      vite: 4.2.0_@types+node@16.18.6
+      vite: 4.2.0(@types/node@16.18.6)
     dev: false
 
-  /vscode-oniguruma/1.6.2:
+  /vscode-oniguruma@1.6.2:
     resolution: {integrity: sha512-KH8+KKov5eS/9WhofZR8M8dMHWN2gTxjMsG4jd04YhpbPR91fUj7rYQ2/XjeHCJWbg7X++ApRIU9NUwM2vTvLA==}
     dev: true
 
-  /vscode-textmate/5.2.0:
+  /vscode-textmate@5.2.0:
     resolution: {integrity: sha512-Uw5ooOQxRASHgu6C7GVvUxisKXfSgW4oFlO+aa+PAkgmH89O3CXxEEzNRNtHSqtXFTl0nAC1uYj0GMSH27uwtQ==}
     dev: true
 
-  /wcwidth/1.0.1:
+  /wcwidth@1.0.1:
     resolution: {integrity: sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==}
     dependencies:
       defaults: 1.0.4
     dev: true
 
-  /webidl-conversions/3.0.1:
+  /webidl-conversions@3.0.1:
     resolution: {integrity: sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==}
 
-  /whatwg-url/5.0.0:
+  /whatwg-url@5.0.0:
     resolution: {integrity: sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==}
     dependencies:
       tr46: 0.0.3
       webidl-conversions: 3.0.1
 
-  /which-boxed-primitive/1.0.2:
+  /which-boxed-primitive@1.0.2:
     resolution: {integrity: sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==}
     dependencies:
       is-bigint: 1.0.4
@@ -5467,11 +5735,11 @@ packages:
       is-symbol: 1.0.4
     dev: true
 
-  /which-module/2.0.0:
+  /which-module@2.0.0:
     resolution: {integrity: sha512-B+enWhmw6cjfVC7kS8Pj9pCrKSc5txArRyaYGe088shv/FGWH+0Rjx/xPgtsWfsUtS27FkP697E4DDhgrgoc0Q==}
     dev: true
 
-  /which-pm/2.0.0:
+  /which-pm@2.0.0:
     resolution: {integrity: sha512-Lhs9Pmyph0p5n5Z3mVnN0yWcbQYUAD7rbQUiMsQxOJ3T57k7RFe35SUwWMf7dsbDZks1uOmw4AecB/JMDj3v/w==}
     engines: {node: '>=8.15'}
     dependencies:
@@ -5479,14 +5747,14 @@ packages:
       path-exists: 4.0.0
     dev: true
 
-  /which/1.3.1:
+  /which@1.3.1:
     resolution: {integrity: sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==}
     hasBin: true
     dependencies:
       isexe: 2.0.0
     dev: true
 
-  /which/2.0.2:
+  /which@2.0.2:
     resolution: {integrity: sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==}
     engines: {node: '>= 8'}
     hasBin: true
@@ -5494,18 +5762,18 @@ packages:
       isexe: 2.0.0
     dev: true
 
-  /wide-align/1.1.5:
+  /wide-align@1.1.5:
     resolution: {integrity: sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==}
     dependencies:
       string-width: 4.2.3
     dev: false
 
-  /word-wrap/1.2.3:
+  /word-wrap@1.2.3:
     resolution: {integrity: sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==}
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /worktop/0.8.0-next.14:
+  /worktop@0.8.0-next.14:
     resolution: {integrity: sha512-RZgqHu1w/JcUdWOE/BUEAzarrUUHh39eWkLdX8XpA6MfgLJF6X5Vl26CV7/wcm4O/UpZvHMGJUtB9eYTqDjc9g==}
     engines: {node: '>=12'}
     dependencies:
@@ -5513,7 +5781,7 @@ packages:
       regexparam: 2.0.1
     dev: false
 
-  /wrap-ansi/2.1.0:
+  /wrap-ansi@2.1.0:
     resolution: {integrity: sha512-vAaEaDM946gbNpH5pLVNR+vX2ht6n0Bt3GXwVB1AuAqZosOvHNF3P7wDnh8KLkSqgUh0uh77le7Owgoz+Z9XBw==}
     engines: {node: '>=0.10.0'}
     dependencies:
@@ -5521,7 +5789,7 @@ packages:
       strip-ansi: 3.0.1
     dev: true
 
-  /wrap-ansi/6.2.0:
+  /wrap-ansi@6.2.0:
     resolution: {integrity: sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==}
     engines: {node: '>=8'}
     dependencies:
@@ -5530,7 +5798,7 @@ packages:
       strip-ansi: 6.0.1
     dev: true
 
-  /wrap-ansi/7.0.0:
+  /wrap-ansi@7.0.0:
     resolution: {integrity: sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==}
     engines: {node: '>=10'}
     dependencies:
@@ -5539,30 +5807,30 @@ packages:
       strip-ansi: 6.0.1
     dev: true
 
-  /wrappy/1.0.2:
+  /wrappy@1.0.2:
     resolution: {integrity: sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==}
 
-  /y18n/3.2.2:
+  /y18n@3.2.2:
     resolution: {integrity: sha512-uGZHXkHnhF0XeeAPgnKfPv1bgKAYyVvmNL1xlKsPYZPaIHxGti2hHqvOCQv71XMsLxu1QjergkqogUnms5D3YQ==}
     dev: true
 
-  /y18n/4.0.3:
+  /y18n@4.0.3:
     resolution: {integrity: sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==}
     dev: true
 
-  /y18n/5.0.8:
+  /y18n@5.0.8:
     resolution: {integrity: sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==}
     engines: {node: '>=10'}
     dev: true
 
-  /yallist/2.1.2:
+  /yallist@2.1.2:
     resolution: {integrity: sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A==}
     dev: true
 
-  /yallist/4.0.0:
+  /yallist@4.0.0:
     resolution: {integrity: sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==}
 
-  /yargs-parser/18.1.3:
+  /yargs-parser@18.1.3:
     resolution: {integrity: sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==}
     engines: {node: '>=6'}
     dependencies:
@@ -5570,23 +5838,23 @@ packages:
       decamelize: 1.2.0
     dev: true
 
-  /yargs-parser/20.2.9:
+  /yargs-parser@20.2.9:
     resolution: {integrity: sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==}
     engines: {node: '>=10'}
     dev: true
 
-  /yargs-parser/21.1.1:
+  /yargs-parser@21.1.1:
     resolution: {integrity: sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==}
     engines: {node: '>=12'}
     dev: true
 
-  /yargs-parser/7.0.0:
+  /yargs-parser@7.0.0:
     resolution: {integrity: sha512-WhzC+xgstid9MbVUktco/bf+KJG+Uu6vMX0LN1sLJvwmbCQVxb4D8LzogobonKycNasCZLdOzTAk1SK7+K7swg==}
     dependencies:
       camelcase: 4.1.0
     dev: true
 
-  /yargs/15.4.1:
+  /yargs@15.4.1:
     resolution: {integrity: sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==}
     engines: {node: '>=8'}
     dependencies:
@@ -5603,7 +5871,7 @@ packages:
       yargs-parser: 18.1.3
     dev: true
 
-  /yargs/16.2.0:
+  /yargs@16.2.0:
     resolution: {integrity: sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==}
     engines: {node: '>=10'}
     dependencies:
@@ -5616,7 +5884,7 @@ packages:
       yargs-parser: 20.2.9
     dev: true
 
-  /yargs/17.6.2:
+  /yargs@17.6.2:
     resolution: {integrity: sha512-1/9UrdHjDZc0eOU0HxOHoS78C69UD3JRMvzlJ7S79S2nTaWRA/whGCTV8o9e/N/1Va9YIV7Q4sOxD8VV4pCWOw==}
     engines: {node: '>=12'}
     dependencies:
@@ -5629,7 +5897,7 @@ packages:
       yargs-parser: 21.1.1
     dev: true
 
-  /yargs/8.0.2:
+  /yargs@8.0.2:
     resolution: {integrity: sha512-3RiZrpLpjrzIAKgGdPktBcMP/eG5bDFlkI+PHle1qwzyVXyDQL+pD/eZaMoOOO0Y7LLBfjpucObuUm/icvbpKQ==}
     dependencies:
       camelcase: 4.1.0
@@ -5647,7 +5915,7 @@ packages:
       yargs-parser: 7.0.0
     dev: true
 
-  /yocto-queue/0.1.0:
+  /yocto-queue@0.1.0:
     resolution: {integrity: sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==}
     engines: {node: '>=10'}
     dev: true

From 5bbcbadb9b992f4d427d2649f3e34ea73f551a4d Mon Sep 17 00:00:00 2001
From: Tee Ming <chewteeming01@gmail.com>
Date: Thu, 13 Apr 2023 01:20:36 +0800
Subject: [PATCH 32/74] add trailingSlash redirects to site (#9644)

---
 sites/kit.svelte.dev/vercel.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sites/kit.svelte.dev/vercel.json b/sites/kit.svelte.dev/vercel.json
index 564eeeb2c771..49625e6e2501 100644
--- a/sites/kit.svelte.dev/vercel.json
+++ b/sites/kit.svelte.dev/vercel.json
@@ -1,5 +1,6 @@
 {
 	"github": {
 		"silent": true
-	}
+	},
+	"trailingSlash": false
 }

From ec240ae1083334bf6aa3c47e6378f48d14668b94 Mon Sep 17 00:00:00 2001
From: Simon H <5968653+dummdidumm@users.noreply.github.com>
Date: Wed, 12 Apr 2023 20:07:22 +0200
Subject: [PATCH 33/74] docs: clarify wording for $app/stores (#9650)

---
 packages/kit/types/ambient.d.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/kit/types/ambient.d.ts b/packages/kit/types/ambient.d.ts
index de0198bacf24..dddd7313c02d 100644
--- a/packages/kit/types/ambient.d.ts
+++ b/packages/kit/types/ambient.d.ts
@@ -281,11 +281,13 @@ declare module '$app/paths' {
 }
 
 /**
- * Stores on the server are _contextual_ — they are added to the [context](https://svelte.dev/tutorial/context-api) of your root component. This means that `page` is unique to each request, rather than shared between multiple requests handled by the same server simultaneously.
+ * These stores are _contextual_ on the server — they are added to the [context](https://svelte.dev/tutorial/context-api) of your root component. This means that `page` is unique to each request, rather than shared between multiple requests handled by the same server simultaneously.
  *
  * Because of that, you must subscribe to the stores during component initialization (which happens automatically if you reference the store value, e.g. as `$page`, in a component) before you can use them.
  *
  * In the browser, we don't need to worry about this, and stores can be accessed from anywhere. Code that will only ever run on the browser can refer to (or subscribe to) any of these stores at any time.
+ *
+ * You can read more about client/server differences in the [state management](https://kit.svelte.dev/docs/state-management#using-stores-with-context) documentation.
  */
 declare module '$app/stores' {
 	import { Readable } from 'svelte/store';

From 3d19b3a3aabb781795ba0e1a2dc617cb0a7dcde4 Mon Sep 17 00:00:00 2001
From: Puru Vijay <47742487+PuruVJ@users.noreply.github.com>
Date: Thu, 13 Apr 2023 14:26:15 +0530
Subject: [PATCH 34/74] chore: use site-kit's TS Toggle (#9651)

---
 pnpm-lock.yaml                                | 25 +++++--
 sites/kit.svelte.dev/package.json             |  2 +-
 sites/kit.svelte.dev/src/app.html             |  4 +-
 .../src/lib/docs/TSToggle.svelte              | 50 --------------
 .../src/lib/docs/ToggleButton.svelte          | 66 -------------------
 .../src/routes/docs/+layout.svelte            |  3 +-
 6 files changed, 23 insertions(+), 127 deletions(-)
 delete mode 100644 sites/kit.svelte.dev/src/lib/docs/TSToggle.svelte
 delete mode 100644 sites/kit.svelte.dev/src/lib/docs/ToggleButton.svelte

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 057d0e7cdf39..34838c432a27 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -938,8 +938,8 @@ importers:
         specifier: workspace:^
         version: link:../../packages/kit
       '@sveltejs/site-kit':
-        specifier: 4.0.2
-        version: 4.0.2(@sveltejs/kit@packages+kit)(svelte@3.56.0)
+        specifier: 4.1.0
+        version: 4.1.0(@sveltejs/kit@packages+kit)(svelte@3.56.0)
       '@types/d3-geo':
         specifier: ^3.0.2
         version: 3.0.2
@@ -1828,8 +1828,8 @@ packages:
       picomatch: 2.3.1
       rollup: 3.7.0
 
-  /@sveltejs/site-kit@4.0.2(@sveltejs/kit@packages+kit)(svelte@3.56.0):
-    resolution: {integrity: sha512-gqxBMZW5ZiO61m7Bn4x0fMUJC1M27ku1u7u0KJrg0zRSN3Zu30VdwE1SwWO4ueKxOxLXD2gzfUMdvoez7ZoBuQ==}
+  /@sveltejs/site-kit@4.1.0(@sveltejs/kit@packages+kit)(svelte@3.56.0):
+    resolution: {integrity: sha512-DRX3BSyuDvTWcqP5KucomcU90uHKgOcXgTF5mlPcZvoJ4Ekyt9+SbOMR+FU1CBNv1UzYkEtvMuGuQwc1+DCaTQ==}
     peerDependencies:
       '@sveltejs/kit': ^1.0.0
       svelte: ^3.54.0
@@ -2118,7 +2118,7 @@ packages:
       debug: 4.3.4
       globby: 11.1.0
       is-glob: 4.0.3
-      semver: 7.3.8
+      semver: 7.4.0
       tsutils: 3.21.0(typescript@4.9.4)
       typescript: 4.9.4
     transitivePeerDependencies:
@@ -2158,7 +2158,7 @@ packages:
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dependencies:
       '@typescript-eslint/types': 5.58.0
-      eslint-visitor-keys: 3.3.0
+      eslint-visitor-keys: 3.4.0
     dev: true
 
   /@typescript/twoslash@3.1.0:
@@ -3057,6 +3057,11 @@ packages:
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dev: true
 
+  /eslint-visitor-keys@3.4.0:
+    resolution: {integrity: sha512-HPpKPUBQcAsZOsHAFwTtIKcYlCje62XB7SEAcxjtmW6TD1WVpkS6i6/hOVtTZIl4zGj/mBqpFVGvaDneik+VoQ==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    dev: true
+
   /eslint@8.33.0:
     resolution: {integrity: sha512-WjOpFQgKK8VrCnAtl8We0SUOy/oVZ5NHykyMiagV1M9r8IFpIJX7DduK6n1mpfhlG7T1NLWm2SuD8QB7KFySaA==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
@@ -4931,6 +4936,14 @@ packages:
     dependencies:
       lru-cache: 6.0.0
 
+  /semver@7.4.0:
+    resolution: {integrity: sha512-RgOxM8Mw+7Zus0+zcLEUn8+JfoLpj/huFTItQy2hsM4khuC1HYRDp0cU482Ewn/Fcy6bCjufD8vAj7voC66KQw==}
+    engines: {node: '>=10'}
+    hasBin: true
+    dependencies:
+      lru-cache: 6.0.0
+    dev: true
+
   /set-blocking@2.0.0:
     resolution: {integrity: sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==}
 
diff --git a/sites/kit.svelte.dev/package.json b/sites/kit.svelte.dev/package.json
index bfb90ab149da..80d8e28ec9eb 100644
--- a/sites/kit.svelte.dev/package.json
+++ b/sites/kit.svelte.dev/package.json
@@ -14,7 +14,7 @@
 		"@sveltejs/adapter-vercel": "workspace:^",
 		"@sveltejs/amp": "workspace:^",
 		"@sveltejs/kit": "workspace:^",
-		"@sveltejs/site-kit": "4.0.2",
+		"@sveltejs/site-kit": "4.1.0",
 		"@types/d3-geo": "^3.0.2",
 		"@types/node": "^16.18.6",
 		"flexsearch": "^0.7.31",
diff --git a/sites/kit.svelte.dev/src/app.html b/sites/kit.svelte.dev/src/app.html
index 5cf0b47ebce0..737ddc0507e2 100644
--- a/sites/kit.svelte.dev/src/app.html
+++ b/sites/kit.svelte.dev/src/app.html
@@ -32,7 +32,7 @@
 		</style>
 		<script>
 			document.getElementsByTagName('html')[0].classList.remove('no-js');
-			localStorage.getItem('prefers-ts') === 'true' &&
+			localStorage.getItem('svelte:prefers-ts') === 'true' &&
 				document.documentElement.classList.add('prefers-ts');
 		</script>
 
@@ -40,7 +40,7 @@
 	</head>
 	<body>
 		<script>
-			const themeValue = JSON.parse(localStorage.getItem('sveltekit:theme'))?.current;
+			const themeValue = JSON.parse(localStorage.getItem('svelte:theme'))?.current;
 			const systemPreferredTheme = window.matchMedia('(prefers-color-scheme: dark)').matches
 				? 'dark'
 				: 'light';
diff --git a/sites/kit.svelte.dev/src/lib/docs/TSToggle.svelte b/sites/kit.svelte.dev/src/lib/docs/TSToggle.svelte
deleted file mode 100644
index 6d8f28bdf25b..000000000000
--- a/sites/kit.svelte.dev/src/lib/docs/TSToggle.svelte
+++ /dev/null
@@ -1,50 +0,0 @@
-<script>
-	import ToggleButton from './ToggleButton.svelte';
-
-	let checked = prefers_ts();
-	$: toggle(checked);
-
-	function toggle(checked) {
-		try {
-			document.documentElement.classList.toggle('prefers-ts', checked);
-			localStorage.setItem('prefers-ts', checked);
-		} catch (e) {
-			// localStorage not available or we are on the server
-		}
-	}
-
-	function prefers_ts() {
-		try {
-			return localStorage.getItem('prefers-ts') === 'true' ? true : false;
-		} catch (e) {
-			return false;
-		}
-	}
-</script>
-
-<div class="input-output-toggle">
-	<span aria-hidden="true">JavaScript</span> <ToggleButton bind:pressed={checked} label="TypeScript code examples" /> <span aria-hidden="true">TypeScript</span>
-</div>
-
-<style>
-	.input-output-toggle {
-		position: relative;
-		display: flex;
-		gap: 0.5em;
-		user-select: none;
-		align-items: center;
-		width: 100%;
-		height: var(--ts-toggle-height);
-		z-index: 2;
-		padding: 0 var(--sk-page-padding-side);
-		margin: 0 auto;
-	}
-
-	@media (min-width: 832px) {
-		.input-output-toggle {
-			padding-left: 3.2rem;
-			width: var(--sidebar-menu-width);
-			margin: 0 0 0 auto;
-		}
-	}
-</style>
diff --git a/sites/kit.svelte.dev/src/lib/docs/ToggleButton.svelte b/sites/kit.svelte.dev/src/lib/docs/ToggleButton.svelte
deleted file mode 100644
index 2dfd1a78a2ee..000000000000
--- a/sites/kit.svelte.dev/src/lib/docs/ToggleButton.svelte
+++ /dev/null
@@ -1,66 +0,0 @@
-<script>
-	export let pressed;
-	export let label;
-</script>
-
-<button aria-pressed={pressed ? "true" : "false" } on:click={ () => pressed = !pressed}>
-	<span class="visually-hidden">{label}</span>
-</button>
-
-<style>
-	button {
-		--size: 1em;
-		--bg: var(--sk-theme-2);
-		--fg: white;
-		--bg-active: var(--bg);
-		--fg-active: var(--fg);
-		position: relative;
-		height: var(--size);
-		width: calc(100% - 0.6em);
-		max-width: calc(2 * var(--size));
-		top: -2px;
-		border-radius: 0.5em;
-		-webkit-appearance: none;
-		appearance: none;
-		outline-offset: 2px;
-		border: transparent;
-	}
-
-	button::before {
-		content: '';
-		position: absolute;
-		display: block;
-		height: 100%;
-		width: 100%;
-		padding: 2px;
-		border-radius: var(--size);
-		top: 0;
-		left: 0;
-		background: var(--bg);
-		box-sizing: border-box;
-	}
-
-	button[aria-pressed="true"]::before {
-		background: var(--bg-active);
-	}
-
-	button::after {
-		content: '';
-		position: absolute;
-		display: block;
-		width: calc(var(--size) - 4px);
-		height: calc(var(--size) - 4px);
-		aspect-ratio: 1;
-		top: 2px;
-		left: 2px;
-		border-radius: 50%;
-		background: var(--fg);
-		box-shadow: 0 0px 1px rgba(0, 0, 0, 0.4), 0 4px 2px rgba(0, 0, 0, 0.1);
-		transition: background 0.2s ease-out, left 0.2s ease-out;
-	}
-
-	button[aria-pressed="true"]::after {
-		background: var(--fg-active);
-		left: calc(100% - var(--size) + 2px);
-	}
-</style>
diff --git a/sites/kit.svelte.dev/src/routes/docs/+layout.svelte b/sites/kit.svelte.dev/src/routes/docs/+layout.svelte
index 39d4f8714331..d5a7108e7df5 100644
--- a/sites/kit.svelte.dev/src/routes/docs/+layout.svelte
+++ b/sites/kit.svelte.dev/src/routes/docs/+layout.svelte
@@ -1,8 +1,7 @@
 <script>
 	import Contents from '$lib/docs/Contents.svelte';
-	import TSToggle from '$lib/docs/TSToggle.svelte';
+	import { TSToggle } from '@sveltejs/site-kit/components';
 
-	/** @type {import('./$types').LayoutData} */
 	export let data;
 </script>
 

From a20d713dac18def5a6fc469cadd5ca40f84eb470 Mon Sep 17 00:00:00 2001
From: gtmnayan <50981692+gtm-nayan@users.noreply.github.com>
Date: Thu, 13 Apr 2023 14:42:13 +0545
Subject: [PATCH 35/74] fix: prevent unhandled exception crashes for invalid
 header values (#9638)

fixes #9628
---
 .changeset/swift-ads-itch.md                  |  5 ++++
 packages/kit/src/exports/node/index.js        | 29 ++++++++++++-------
 .../head-write-error/+server.js               | 10 +++++++
 .../kit/test/apps/basics/test/server.test.js  | 22 ++++++++++----
 4 files changed, 49 insertions(+), 17 deletions(-)
 create mode 100644 .changeset/swift-ads-itch.md
 create mode 100644 packages/kit/test/apps/basics/src/routes/endpoint-output/head-write-error/+server.js

diff --git a/.changeset/swift-ads-itch.md b/.changeset/swift-ads-itch.md
new file mode 100644
index 000000000000..92e930b903c5
--- /dev/null
+++ b/.changeset/swift-ads-itch.md
@@ -0,0 +1,5 @@
+---
+'@sveltejs/kit': patch
+---
+
+fix: prevent unhandled exceptions for invalid header values
diff --git a/packages/kit/src/exports/node/index.js b/packages/kit/src/exports/node/index.js
index 2d7414d43f32..76233e074a58 100644
--- a/packages/kit/src/exports/node/index.js
+++ b/packages/kit/src/exports/node/index.js
@@ -105,17 +105,25 @@ export async function getRequest({ request, base, bodySizeLimit }) {
 
 /** @type {import('@sveltejs/kit/node').setResponse} */
 export async function setResponse(res, response) {
-	const headers = Object.fromEntries(response.headers);
-
-	if (response.headers.has('set-cookie')) {
-		const header = /** @type {string} */ (response.headers.get('set-cookie'));
-		const split = set_cookie_parser.splitCookiesString(header);
-
-		// @ts-expect-error
-		headers['set-cookie'] = split;
+	for (const [key, value] of response.headers) {
+		try {
+			res.setHeader(
+				key,
+				key === 'set-cookie'
+					? set_cookie_parser.splitCookiesString(
+							// This is absurd but necessary, TODO: investigate why
+							/** @type {string}*/ (response.headers.get(key))
+					  )
+					: value
+			);
+		} catch (error) {
+			res.getHeaderNames().forEach((name) => res.removeHeader(name));
+			res.writeHead(500).end(String(error));
+			return;
+		}
 	}
 
-	res.writeHead(response.status, headers);
+	res.writeHead(response.status);
 
 	if (!response.body) {
 		res.end();
@@ -123,11 +131,10 @@ export async function setResponse(res, response) {
 	}
 
 	if (response.body.locked) {
-		res.write(
+		res.end(
 			'Fatal error: Response body is locked. ' +
 				`This can happen when the response was already read (for example through 'response.json()' or 'response.text()').`
 		);
-		res.end();
 		return;
 	}
 
diff --git a/packages/kit/test/apps/basics/src/routes/endpoint-output/head-write-error/+server.js b/packages/kit/test/apps/basics/src/routes/endpoint-output/head-write-error/+server.js
new file mode 100644
index 000000000000..72664eee7dcc
--- /dev/null
+++ b/packages/kit/test/apps/basics/src/routes/endpoint-output/head-write-error/+server.js
@@ -0,0 +1,10 @@
+import { json } from '@sveltejs/kit';
+
+/** @type {import('@sveltejs/kit').RequestHandler} */
+export function GET({ setHeaders }) {
+	setHeaders({
+		'x-test': '\u001f'
+	});
+
+	return json({});
+}
diff --git a/packages/kit/test/apps/basics/test/server.test.js b/packages/kit/test/apps/basics/test/server.test.js
index d6fc639abbbd..8fcdef16cdbd 100644
--- a/packages/kit/test/apps/basics/test/server.test.js
+++ b/packages/kit/test/apps/basics/test/server.test.js
@@ -177,6 +177,15 @@ test.describe('Endpoints', () => {
 		expect(await response.text()).toEqual(digest);
 	});
 
+	// TODO see above
+	test('invalid headers return a 500', async ({ request }) => {
+		const response = await request.get('/endpoint-output/head-write-error');
+		expect(response.status()).toBe(500);
+		expect(await response.text()).toMatch(
+			'TypeError [ERR_INVALID_CHAR]: Invalid character in header content ["x-test"]'
+		);
+	});
+
 	test('OPTIONS handler', async ({ request }) => {
 		const url = '/endpoint-output/options';
 
@@ -485,7 +494,9 @@ test.describe('setHeaders', () => {
 	test('allows multiple set-cookie headers with different values', async ({ page }) => {
 		const response = await page.goto('/headers/set-cookie/sub');
 		const cookies = (await response?.allHeaders())['set-cookie'];
-		expect(cookies.includes('cookie1=value1') && cookies.includes('cookie2=value2')).toBe(true);
+
+		expect(cookies).toMatch('cookie1=value1');
+		expect(cookies).toMatch('cookie2=value2');
 	});
 });
 
@@ -493,11 +504,10 @@ test.describe('cookies', () => {
 	test('cookie.serialize created correct cookie header string', async ({ page }) => {
 		const response = await page.goto('/cookies/serialize');
 		const cookies = await response.headerValue('set-cookie');
-		expect(
-			cookies.includes('before=before') &&
-				cookies.includes('after=after') &&
-				cookies.includes('endpoint=endpoint')
-		).toBe(true);
+
+		expect(cookies).toMatch('before=before');
+		expect(cookies).toMatch('after=after');
+		expect(cookies).toMatch('endpoint=endpoint');
 	});
 });
 

From 5a1ac46448f36eacddb901ed6b6a5abe3d6a45d5 Mon Sep 17 00:00:00 2001
From: gtmnayan <50981692+gtm-nayan@users.noreply.github.com>
Date: Thu, 13 Apr 2023 14:49:52 +0545
Subject: [PATCH 36/74] fix: prevent routes/layouts from having conflicting
 files through resets or different extensions (#9590)

closes #9380
closes #9501

---------

Co-authored-by: George Daskalakis <george.dask97@gmail.com>
---
 .changeset/spotty-parents-run.md              |  5 ++
 .../core/sync/create_manifest_data/index.js   | 50 +++++++++++++++++--
 .../sync/create_manifest_data/index.spec.js   | 31 ++++++++++++
 .../+layout.server.js                         |  0
 .../+layout.server.ts                         |  0
 .../conflicting-ts-js-handlers-page/+page.js  |  0
 .../conflicting-ts-js-handlers-page/+page.ts  |  0
 .../+server.js                                |  0
 .../+server.ts                                |  0
 .../samples/multiple-layouts/+layout.svelte   |  0
 .../samples/multiple-layouts/+layout@.svelte  |  0
 .../test/samples/multiple-pages/+page.svelte  |  0
 .../test/samples/multiple-pages/+page@.svelte |  0
 13 files changed, 82 insertions(+), 4 deletions(-)
 create mode 100644 .changeset/spotty-parents-run.md
 create mode 100644 packages/kit/src/core/sync/create_manifest_data/test/samples/conflicting-ts-js-handlers-layout/+layout.server.js
 create mode 100644 packages/kit/src/core/sync/create_manifest_data/test/samples/conflicting-ts-js-handlers-layout/+layout.server.ts
 create mode 100644 packages/kit/src/core/sync/create_manifest_data/test/samples/conflicting-ts-js-handlers-page/+page.js
 create mode 100644 packages/kit/src/core/sync/create_manifest_data/test/samples/conflicting-ts-js-handlers-page/+page.ts
 create mode 100644 packages/kit/src/core/sync/create_manifest_data/test/samples/conflicting-ts-js-handlers-server/+server.js
 create mode 100644 packages/kit/src/core/sync/create_manifest_data/test/samples/conflicting-ts-js-handlers-server/+server.ts
 create mode 100644 packages/kit/src/core/sync/create_manifest_data/test/samples/multiple-layouts/+layout.svelte
 create mode 100644 packages/kit/src/core/sync/create_manifest_data/test/samples/multiple-layouts/+layout@.svelte
 create mode 100644 packages/kit/src/core/sync/create_manifest_data/test/samples/multiple-pages/+page.svelte
 create mode 100644 packages/kit/src/core/sync/create_manifest_data/test/samples/multiple-pages/+page@.svelte

diff --git a/.changeset/spotty-parents-run.md b/.changeset/spotty-parents-run.md
new file mode 100644
index 000000000000..9fce43dfbc7f
--- /dev/null
+++ b/.changeset/spotty-parents-run.md
@@ -0,0 +1,5 @@
+---
+'@sveltejs/kit': patch
+---
+
+fix: prevent routes/layouts from having conflicting files through resets or different extensions
diff --git a/packages/kit/src/core/sync/create_manifest_data/index.js b/packages/kit/src/core/sync/create_manifest_data/index.js
index 79304e790c10..ee1348cef13f 100644
--- a/packages/kit/src/core/sync/create_manifest_data/index.js
+++ b/packages/kit/src/core/sync/create_manifest_data/index.js
@@ -227,6 +227,18 @@ function create_routes_and_nodes(cwd, config, fallback) {
 					config.kit.moduleExtensions
 				);
 
+				/**
+				 * @param {string} type
+				 * @param {string} existing_file
+				 */
+				function duplicate_files_error(type, existing_file) {
+					return new Error(
+						`Multiple ${type} files found in ${routes_base}${route.id} : ${path.basename(
+							existing_file
+						)} and ${file.name}`
+					);
+				}
+
 				if (item.kind === 'component') {
 					if (item.is_error) {
 						route.error = {
@@ -234,21 +246,51 @@ function create_routes_and_nodes(cwd, config, fallback) {
 							component: project_relative
 						};
 					} else if (item.is_layout) {
-						if (!route.layout) route.layout = { depth, child_pages: [] };
+						if (!route.layout) {
+							route.layout = { depth, child_pages: [] };
+						} else if (route.layout.component) {
+							throw duplicate_files_error('layout component', route.layout.component);
+						}
+
 						route.layout.component = project_relative;
 						if (item.uses_layout !== undefined) route.layout.parent_id = item.uses_layout;
 					} else {
-						if (!route.leaf) route.leaf = { depth };
+						if (!route.leaf) {
+							route.leaf = { depth };
+						} else if (route.leaf.component) {
+							throw duplicate_files_error('page component', route.leaf.component);
+						}
+
 						route.leaf.component = project_relative;
 						if (item.uses_layout !== undefined) route.leaf.parent_id = item.uses_layout;
 					}
 				} else if (item.is_layout) {
-					if (!route.layout) route.layout = { depth, child_pages: [] };
+					if (!route.layout) {
+						route.layout = { depth, child_pages: [] };
+					} else if (route.layout[item.kind]) {
+						throw duplicate_files_error(
+							item.kind + ' layout module',
+							/** @type {string} */ (route.layout[item.kind])
+						);
+					}
+
 					route.layout[item.kind] = project_relative;
 				} else if (item.is_page) {
-					if (!route.leaf) route.leaf = { depth };
+					if (!route.leaf) {
+						route.leaf = { depth };
+					} else if (route.leaf[item.kind]) {
+						throw duplicate_files_error(
+							item.kind + ' page module',
+							/** @type {string} */ (route.leaf[item.kind])
+						);
+					}
+
 					route.leaf[item.kind] = project_relative;
 				} else {
+					if (route.endpoint) {
+						throw duplicate_files_error('endpoint', route.endpoint.file);
+					}
+
 					route.endpoint = {
 						file: project_relative
 					};
diff --git a/packages/kit/src/core/sync/create_manifest_data/index.spec.js b/packages/kit/src/core/sync/create_manifest_data/index.spec.js
index e8c13621f180..c1aca3b967bf 100644
--- a/packages/kit/src/core/sync/create_manifest_data/index.spec.js
+++ b/packages/kit/src/core/sync/create_manifest_data/index.spec.js
@@ -751,4 +751,35 @@ test('prevents route conflicts between groups', () => {
 	);
 });
 
+test('errors with multiple layouts on same directory', () => {
+	assert.throws(
+		() => create('samples/multiple-layouts'),
+		/^Multiple layout component files found in samples\/multiple-layouts\/ : \+layout\.svelte and \+layout@\.svelte/
+	);
+});
+
+test('errors with multiple pages on same directory', () => {
+	assert.throws(
+		() => create('samples/multiple-pages'),
+		/^Multiple page component files found in samples\/multiple-pages\/ : \+page\.svelte and \+page@\.svelte/
+	);
+});
+
+test('errors with both ts and js handlers for the same route', () => {
+	assert.throws(
+		() => create('samples/conflicting-ts-js-handlers-page'),
+		/^Multiple universal page module files found in samples\/conflicting-ts-js-handlers-page\/ : \+page\.js and \+page\.ts/
+	);
+
+	assert.throws(
+		() => create('samples/conflicting-ts-js-handlers-layout'),
+		/^Multiple server layout module files found in samples\/conflicting-ts-js-handlers-layout\/ : \+layout\.server\.js and \+layout\.server\.ts/
+	);
+
+	assert.throws(
+		() => create('samples/conflicting-ts-js-handlers-server'),
+		/^Multiple endpoint files found in samples\/conflicting-ts-js-handlers-server\/ : \+server\.js and \+server\.ts/
+	);
+});
+
 test.run();
diff --git a/packages/kit/src/core/sync/create_manifest_data/test/samples/conflicting-ts-js-handlers-layout/+layout.server.js b/packages/kit/src/core/sync/create_manifest_data/test/samples/conflicting-ts-js-handlers-layout/+layout.server.js
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/packages/kit/src/core/sync/create_manifest_data/test/samples/conflicting-ts-js-handlers-layout/+layout.server.ts b/packages/kit/src/core/sync/create_manifest_data/test/samples/conflicting-ts-js-handlers-layout/+layout.server.ts
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/packages/kit/src/core/sync/create_manifest_data/test/samples/conflicting-ts-js-handlers-page/+page.js b/packages/kit/src/core/sync/create_manifest_data/test/samples/conflicting-ts-js-handlers-page/+page.js
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/packages/kit/src/core/sync/create_manifest_data/test/samples/conflicting-ts-js-handlers-page/+page.ts b/packages/kit/src/core/sync/create_manifest_data/test/samples/conflicting-ts-js-handlers-page/+page.ts
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/packages/kit/src/core/sync/create_manifest_data/test/samples/conflicting-ts-js-handlers-server/+server.js b/packages/kit/src/core/sync/create_manifest_data/test/samples/conflicting-ts-js-handlers-server/+server.js
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/packages/kit/src/core/sync/create_manifest_data/test/samples/conflicting-ts-js-handlers-server/+server.ts b/packages/kit/src/core/sync/create_manifest_data/test/samples/conflicting-ts-js-handlers-server/+server.ts
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/packages/kit/src/core/sync/create_manifest_data/test/samples/multiple-layouts/+layout.svelte b/packages/kit/src/core/sync/create_manifest_data/test/samples/multiple-layouts/+layout.svelte
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/packages/kit/src/core/sync/create_manifest_data/test/samples/multiple-layouts/+layout@.svelte b/packages/kit/src/core/sync/create_manifest_data/test/samples/multiple-layouts/+layout@.svelte
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/packages/kit/src/core/sync/create_manifest_data/test/samples/multiple-pages/+page.svelte b/packages/kit/src/core/sync/create_manifest_data/test/samples/multiple-pages/+page.svelte
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/packages/kit/src/core/sync/create_manifest_data/test/samples/multiple-pages/+page@.svelte b/packages/kit/src/core/sync/create_manifest_data/test/samples/multiple-pages/+page@.svelte
new file mode 100644
index 000000000000..e69de29bb2d1

From 208877d854c8ebcd06f253f90d2a34e3e31e930f Mon Sep 17 00:00:00 2001
From: gtmnayan <50981692+gtm-nayan@users.noreply.github.com>
Date: Thu, 13 Apr 2023 14:52:38 +0545
Subject: [PATCH 37/74] fix: allow header methods list for 405s (#9655)

see #8967 for explanation

regressed in #8731, probably because that PR started from an older branch
---
 .changeset/shy-avocados-sip.md                    |  5 +++++
 packages/kit/src/runtime/server/utils.js          | 10 ++++------
 packages/kit/test/apps/basics/test/server.test.js |  5 ++++-
 3 files changed, 13 insertions(+), 7 deletions(-)
 create mode 100644 .changeset/shy-avocados-sip.md

diff --git a/.changeset/shy-avocados-sip.md b/.changeset/shy-avocados-sip.md
new file mode 100644
index 000000000000..20b3566767e7
--- /dev/null
+++ b/.changeset/shy-avocados-sip.md
@@ -0,0 +1,5 @@
+---
+'@sveltejs/kit': patch
+---
+
+fix: correct allow header methods list for 405s
diff --git a/packages/kit/src/runtime/server/utils.js b/packages/kit/src/runtime/server/utils.js
index 5fb1c6b4a86e..e9c9e3354e1d 100644
--- a/packages/kit/src/runtime/server/utils.js
+++ b/packages/kit/src/runtime/server/utils.js
@@ -34,13 +34,11 @@ export function method_not_allowed(mod, method) {
 
 /** @param {Partial<Record<import('types').HttpMethod, any>>} mod */
 export function allowed_methods(mod) {
-	const allowed = [];
+	const allowed = ['GET', 'POST', 'PUT', 'PATCH', 'DELETE', 'OPTIONS'].filter(
+		(method) => method in mod
+	);
 
-	for (const method in ['GET', 'POST', 'PUT', 'PATCH', 'DELETE', 'OPTIONS']) {
-		if (method in mod) allowed.push(method);
-	}
-
-	if (mod.GET || mod.HEAD) allowed.push('HEAD');
+	if ('GET' in mod || 'HEAD' in mod) allowed.push('HEAD');
 
 	return allowed;
 }
diff --git a/packages/kit/test/apps/basics/test/server.test.js b/packages/kit/test/apps/basics/test/server.test.js
index 8fcdef16cdbd..1c7e83f744f6 100644
--- a/packages/kit/test/apps/basics/test/server.test.js
+++ b/packages/kit/test/apps/basics/test/server.test.js
@@ -125,7 +125,10 @@ test.describe('Endpoints', () => {
 		const response = await request.post('/endpoint-output/body');
 
 		expect(response.status()).toBe(405);
-		expect(response.headers()['allow'].includes('GET'));
+
+		const allow_header = response.headers()['allow'];
+		expect(allow_header).toMatch(/\bGET\b/);
+		expect(allow_header).toMatch(/\bHEAD\b/);
 	});
 
 	// TODO all the remaining tests in this section are really only testing

From d6eca910d204d3f28309ad0c8d2568cea8c0d05d Mon Sep 17 00:00:00 2001
From: Adam Tuttle <adam@alumniq.com>
Date: Thu, 13 Apr 2023 05:09:39 -0400
Subject: [PATCH 38/74] docs: add async to hook snippets to indicate they may
 return promises (#9426)

---
 documentation/docs/30-advanced/20-hooks.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/documentation/docs/30-advanced/20-hooks.md b/documentation/docs/30-advanced/20-hooks.md
index 9f36559b6c18..9a6230d00784 100644
--- a/documentation/docs/30-advanced/20-hooks.md
+++ b/documentation/docs/30-advanced/20-hooks.md
@@ -99,7 +99,7 @@ For example, your `load` function might make a request to a public URL like `htt
 ```js
 /// file: src/hooks.server.js
 /** @type {import('@sveltejs/kit').HandleFetch} */
-export function handleFetch({ request, fetch }) {
+export async function handleFetch({ request, fetch }) {
 	if (request.url.startsWith('https://api.yourapp.com/')) {
 		// clone the original request, but change the URL
 		request = new Request(
@@ -124,7 +124,7 @@ If your app and your API are on sibling subdomains — `www.my-domain.com` and `
 /// file: src/hooks.server.js
 // @errors: 2345
 /** @type {import('@sveltejs/kit').HandleFetch} */
-export function handleFetch({ event, request, fetch }) {
+export async function handleFetch({ event, request, fetch }) {
 	if (request.url.startsWith('https://api.my-domain.com/')) {
 		request.headers.set('cookie', event.request.headers.get('cookie'));
 	}
@@ -177,7 +177,7 @@ import crypto from 'crypto';
 Sentry.init({/*...*/})
 
 /** @type {import('@sveltejs/kit').HandleServerError} */
-export function handleError({ error, event }) {
+export async function handleError({ error, event }) {
 	const errorId = crypto.randomUUID();
 	// example integration with https://sentry.io/
 	Sentry.captureException(error, { event, errorId });
@@ -205,7 +205,7 @@ import * as Sentry from '@sentry/svelte';
 Sentry.init({/*...*/})
 
 /** @type {import('@sveltejs/kit').HandleClientError} */
-export function handleError({ error, event }) {
+export async function handleError({ error, event }) {
 	const errorId = crypto.randomUUID();
 	// example integration with https://sentry.io/
 	Sentry.captureException(error, { event, errorId });

From c79eff0e17d405e46c6e6d0e1e4fac8747578d54 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 13 Apr 2023 11:53:22 +0200
Subject: [PATCH 39/74] Version Packages (#9657)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 .changeset/shy-avocados-sip.md   |  5 -----
 .changeset/spotty-parents-run.md |  5 -----
 .changeset/swift-ads-itch.md     |  5 -----
 packages/kit/CHANGELOG.md        | 10 ++++++++++
 packages/kit/package.json        |  2 +-
 5 files changed, 11 insertions(+), 16 deletions(-)
 delete mode 100644 .changeset/shy-avocados-sip.md
 delete mode 100644 .changeset/spotty-parents-run.md
 delete mode 100644 .changeset/swift-ads-itch.md

diff --git a/.changeset/shy-avocados-sip.md b/.changeset/shy-avocados-sip.md
deleted file mode 100644
index 20b3566767e7..000000000000
--- a/.changeset/shy-avocados-sip.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@sveltejs/kit': patch
----
-
-fix: correct allow header methods list for 405s
diff --git a/.changeset/spotty-parents-run.md b/.changeset/spotty-parents-run.md
deleted file mode 100644
index 9fce43dfbc7f..000000000000
--- a/.changeset/spotty-parents-run.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@sveltejs/kit': patch
----
-
-fix: prevent routes/layouts from having conflicting files through resets or different extensions
diff --git a/.changeset/swift-ads-itch.md b/.changeset/swift-ads-itch.md
deleted file mode 100644
index 92e930b903c5..000000000000
--- a/.changeset/swift-ads-itch.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@sveltejs/kit': patch
----
-
-fix: prevent unhandled exceptions for invalid header values
diff --git a/packages/kit/CHANGELOG.md b/packages/kit/CHANGELOG.md
index 1f64b5b44559..a806a4c2f575 100644
--- a/packages/kit/CHANGELOG.md
+++ b/packages/kit/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @sveltejs/kit
 
+## 1.15.5
+
+### Patch Changes
+
+- fix: correct allow header methods list for 405s ([#9655](https://github.com/sveltejs/kit/pull/9655))
+
+- fix: prevent routes/layouts from having conflicting files through resets or different extensions ([#9590](https://github.com/sveltejs/kit/pull/9590))
+
+- fix: prevent unhandled exceptions for invalid header values ([#9638](https://github.com/sveltejs/kit/pull/9638))
+
 ## 1.15.4
 
 ### Patch Changes
diff --git a/packages/kit/package.json b/packages/kit/package.json
index 165d65f6437d..00007b5691d9 100644
--- a/packages/kit/package.json
+++ b/packages/kit/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@sveltejs/kit",
-	"version": "1.15.4",
+	"version": "1.15.5",
 	"description": "The fastest way to build Svelte apps",
 	"repository": {
 		"type": "git",

From 2b3e68a9bf7ddb5b7b0d24c33d62e0b86e2b5ea0 Mon Sep 17 00:00:00 2001
From: Chris Carson <chris@nowzoo.com>
Date: Thu, 13 Apr 2023 11:39:01 -0500
Subject: [PATCH 40/74] docs: write `tsconfig`/`jsconfig.json` so it doesn't
 read like a file path (#9654)

---
 documentation/docs/30-advanced/70-packaging.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/documentation/docs/30-advanced/70-packaging.md b/documentation/docs/30-advanced/70-packaging.md
index 12a3666bc18b..5ba6c2208056 100644
--- a/documentation/docs/30-advanced/70-packaging.md
+++ b/documentation/docs/30-advanced/70-packaging.md
@@ -132,7 +132,7 @@ You should ship type definitions for your library even if you don't use TypeScri
 
 If you have something else than a root export however — for example providing a `your-library/foo` import — you need to take additional care for providing type definitions. Unfortunately, TypeScript by default will _not_ resolve the `types` condition for an export like `{ "./foo": { "types": "./dist/foo.d.ts", ... }}`. Instead, it will search for a `foo.d.ts` relative to the root of your library (i.e. `your-library/foo.d.ts` instead of `your-library/dist/foo.d.ts`). To fix this, you have two options:
 
-The first option is to require people using your library to set the `moduleResolution` option in their `tsconfig/jsconfig.json` to `bundler` (available since TypeScript 5, the best and recommended option in the future), `node16` or `nodenext`. This opts TypeScript into actually looking at the exports map and resolving the types correctly.
+The first option is to require people using your library to set the `moduleResolution` option in their `tsconfig.json` (or `jsconfig.json`) to `bundler` (available since TypeScript 5, the best and recommended option in the future), `node16` or `nodenext`. This opts TypeScript into actually looking at the exports map and resolving the types correctly.
 
 The second option is to (ab)use the `typesVersions` feature from TypeScript to wire up the types. This is a field inside `package.json` TypeScript uses to check for different type definitions depending on the TypeScript version, and also contains a path mapping feature for that. We leverage that path mapping feature to get what we want. For the mentioned `foo` export above, the corresponding `typesVersions` looks like this:
 

From ee48ce5f951750a817d7021e823f47c48b9926c0 Mon Sep 17 00:00:00 2001
From: Puru Vijay <47742487+PuruVJ@users.noreply.github.com>
Date: Sun, 16 Apr 2023 09:56:41 +0530
Subject: [PATCH 41/74] chore(site): update site-kit to 4.1.1

---
 pnpm-lock.yaml                    | 8 ++++----
 sites/kit.svelte.dev/package.json | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 34838c432a27..66ca6b0eb568 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -938,8 +938,8 @@ importers:
         specifier: workspace:^
         version: link:../../packages/kit
       '@sveltejs/site-kit':
-        specifier: 4.1.0
-        version: 4.1.0(@sveltejs/kit@packages+kit)(svelte@3.56.0)
+        specifier: 4.1.1
+        version: 4.1.1(@sveltejs/kit@packages+kit)(svelte@3.56.0)
       '@types/d3-geo':
         specifier: ^3.0.2
         version: 3.0.2
@@ -1828,8 +1828,8 @@ packages:
       picomatch: 2.3.1
       rollup: 3.7.0
 
-  /@sveltejs/site-kit@4.1.0(@sveltejs/kit@packages+kit)(svelte@3.56.0):
-    resolution: {integrity: sha512-DRX3BSyuDvTWcqP5KucomcU90uHKgOcXgTF5mlPcZvoJ4Ekyt9+SbOMR+FU1CBNv1UzYkEtvMuGuQwc1+DCaTQ==}
+  /@sveltejs/site-kit@4.1.1(@sveltejs/kit@packages+kit)(svelte@3.56.0):
+    resolution: {integrity: sha512-UJqFI++1R4LJ1ULcA0b19qJmFuw87EcpPfjGZ8H02EnVQHgPjJWwzOlyjPesc0+z4vuyTKlDuW1sR2mdUSPBPw==}
     peerDependencies:
       '@sveltejs/kit': ^1.0.0
       svelte: ^3.54.0
diff --git a/sites/kit.svelte.dev/package.json b/sites/kit.svelte.dev/package.json
index 80d8e28ec9eb..525b23db4a65 100644
--- a/sites/kit.svelte.dev/package.json
+++ b/sites/kit.svelte.dev/package.json
@@ -14,7 +14,7 @@
 		"@sveltejs/adapter-vercel": "workspace:^",
 		"@sveltejs/amp": "workspace:^",
 		"@sveltejs/kit": "workspace:^",
-		"@sveltejs/site-kit": "4.1.0",
+		"@sveltejs/site-kit": "4.1.1",
 		"@types/d3-geo": "^3.0.2",
 		"@types/node": "^16.18.6",
 		"flexsearch": "^0.7.31",
@@ -36,4 +36,4 @@
 		"d3-geo-projection": "^4.0.0",
 		"topojson-client": "^3.1.0"
 	}
-}
+}
\ No newline at end of file

From e2465cd426e9f5e9ea95005b3050379e30fbc445 Mon Sep 17 00:00:00 2001
From: gtmnayan <50981692+gtm-nayan@users.noreply.github.com>
Date: Mon, 17 Apr 2023 20:46:15 +0545
Subject: [PATCH 42/74] docs: add example action for deploying to github pages
 (#9669)

* add docs for github pages action

* add temporary styling patch

* inline pnpm instructions

* use shiki to highlight, remove patch, fix newlines

* remove yaml stuff for prism
---
 .../25-build-and-deploy/50-adapter-static.md  | 67 ++++++++++++++++++-
 .../src/lib/docs/server/index.js              | 28 ++++++--
 .../src/lib/docs/server/markdown.js           |  4 +-
 3 files changed, 88 insertions(+), 11 deletions(-)

diff --git a/documentation/docs/25-build-and-deploy/50-adapter-static.md b/documentation/docs/25-build-and-deploy/50-adapter-static.md
index b417397e0064..0ee374ad67ea 100644
--- a/documentation/docs/25-build-and-deploy/50-adapter-static.md
+++ b/documentation/docs/25-build-and-deploy/50-adapter-static.md
@@ -89,7 +89,7 @@ You will have to prevent GitHub's provided Jekyll from managing your site by put
 A config for GitHub Pages might look like the following:
 
 ```js
-// @errors: 2307
+// @errors: 2307 2322
 /// file: svelte.config.js
 import adapter from '@sveltejs/adapter-static';
 
@@ -100,8 +100,71 @@ const config = {
 	kit: {
 		adapter: adapter(),
 		paths: {
-			base: dev ? '' : '/your-repo-name',
+			base: dev ? '' : process.env.BASE_PATH,
 		}
 	}
 };
 ```
+
+You can use GitHub actions to automatically deploy your site to GitHub Pages when you make a change. Here's an example workflow:
+
+```yaml
+/// file: .github/workflows/deploy.yml
+name: Deploy to GitHub Pages
+
+on:
+  push:
+    branches: 'main'
+
+jobs:
+  build_site:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      # If you're using pnpm, add this step then change the commands and cache key below to use `pnpm`
+      # - name: Install pnpm
+      #   uses: pnpm/action-setup@v2
+      #   with:
+      #     version: 8
+
+      - name: Install Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: 18
+          cache: npm
+
+      - name: Install dependencies
+        run: npm install
+
+      - name: build
+        env:
+          BASE_PATH: '/your-repo-name'
+        run: |
+          npm run build
+          touch build/.nojekyll
+
+      - name: Upload Artifacts
+        uses: actions/upload-pages-artifact@v1
+        with:
+          # this should match the `pages` option in your adapter-static options
+          path: 'build/'
+
+  deploy:
+    needs: build_site
+    runs-on: ubuntu-latest
+
+    permissions:
+      pages: write
+      id-token: write
+
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+    
+    steps:
+      - name: Deploy
+        id: deployment
+        uses: actions/deploy-pages@v1
+```
diff --git a/sites/kit.svelte.dev/src/lib/docs/server/index.js b/sites/kit.svelte.dev/src/lib/docs/server/index.js
index 20b4dff568f3..d9b059d83b24 100644
--- a/sites/kit.svelte.dev/src/lib/docs/server/index.js
+++ b/sites/kit.svelte.dev/src/lib/docs/server/index.js
@@ -56,6 +56,11 @@ modules.forEach((module) => {
 		type_links.set(type.name, link);
 	});
 });
+/** @param {string} html */
+function replace_blank_lines(html) {
+	// preserve blank lines in output (maybe there's a more correct way to do this?)
+	return html.replaceAll(/<div class='line'>(&nbsp;)?<\/div>/g, '<div class="line">\n</div>');
+}
 
 /**
  * @param {string} file
@@ -75,6 +80,7 @@ export async function read_file(file) {
 		body: generate_ts_from_js(body),
 		code: (source, language, current) => {
 			const hash = createHash('sha256');
+
 			hash.update(source + language + current);
 			const digest = hash.digest().toString('base64').replace(/\//g, '-');
 
@@ -98,8 +104,9 @@ export async function read_file(file) {
 					// for no good reason at all, marked replaces tabs with spaces
 					let tabs = '';
 					for (let i = 0; i < spaces.length; i += 4) {
-						tabs += '  ';
+						tabs += '    ';
 					}
+
 					return prefix + tabs;
 				})
 				.replace(/\*\\\//g, '*/');
@@ -113,8 +120,15 @@ export async function read_file(file) {
 				version_class = 'js-version';
 			}
 
-			if (language === 'dts') {
-				html = renderCodeToHTML(source, 'ts', { twoslash: false }, {}, highlighter);
+			if (language === 'dts' || language === 'yaml') {
+				html = renderCodeToHTML(
+					source,
+					language === 'dts' ? 'ts' : language,
+					{ twoslash: false },
+					{ themeName: 'css-variables' },
+					highlighter
+				);
+				html = replace_blank_lines(html);
 			} else if (language === 'js' || language === 'ts') {
 				try {
 					const injected = [];
@@ -189,7 +203,7 @@ export async function read_file(file) {
 						defaultCompilerOptions: {
 							allowJs: true,
 							checkJs: true,
-							target: 'es2021'
+							target: ts.ScriptTarget.ES2021
 						}
 					});
 
@@ -197,7 +211,7 @@ export async function read_file(file) {
 						twoslash.code,
 						'ts',
 						{ twoslash: true },
-						{},
+						{ themeName: 'css-variables' },
 						highlighter,
 						twoslash
 					);
@@ -217,8 +231,7 @@ export async function read_file(file) {
 					}
 				);
 
-				// preserve blank lines in output (maybe there's a more correct way to do this?)
-				html = html.replace(/<div class='line'><\/div>/g, '<div class="line"> </div>');
+				html = replace_blank_lines(html);
 			} else if (language === 'diff') {
 				const lines = source.split('\n').map((content) => {
 					let type = null;
@@ -241,6 +254,7 @@ export async function read_file(file) {
 					.join('')}</code></pre>`;
 			} else {
 				const plang = languages[language];
+
 				const highlighted = plang
 					? PrismJS.highlight(source, PrismJS.languages[plang], language)
 					: source.replace(/[&<>]/g, (c) => ({ '&': '&amp;', '<': '&lt;', '>': '&gt;' }[c]));
diff --git a/sites/kit.svelte.dev/src/lib/docs/server/markdown.js b/sites/kit.svelte.dev/src/lib/docs/server/markdown.js
index bbb81938d492..9482233c3663 100644
--- a/sites/kit.svelte.dev/src/lib/docs/server/markdown.js
+++ b/sites/kit.svelte.dev/src/lib/docs/server/markdown.js
@@ -15,9 +15,9 @@ const getEscapeReplacement = (ch) => escapeReplacements[ch];
 
 /**
  * @param {string} html
- * @param {boolean} encode
+ * @param {boolean} [encode]
  */
-export function escape(html, encode) {
+export function escape(html, encode = false) {
 	if (encode) {
 		if (escapeTest.test(html)) {
 			return html.replace(escapeReplace, getEscapeReplacement);

From fe70ca58fbe17dae31627a681ec80486ab2c8301 Mon Sep 17 00:00:00 2001
From: Ben McCann <322311+benmccann@users.noreply.github.com>
Date: Mon, 17 Apr 2023 08:01:36 -0700
Subject: [PATCH 43/74] chore: fix TODO by removing unused variable (#9675)

* chore: fix TODO by removing unused variable

* remove other usages
---
 packages/kit/src/exports/vite/build/build_server.js | 3 +--
 packages/kit/src/exports/vite/dev/index.js          | 3 +--
 packages/kit/types/internal.d.ts                    | 2 --
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/packages/kit/src/exports/vite/build/build_server.js b/packages/kit/src/exports/vite/build/build_server.js
index 795fca4d2cf5..b5f552090e95 100644
--- a/packages/kit/src/exports/vite/build/build_server.js
+++ b/packages/kit/src/exports/vite/build/build_server.js
@@ -57,8 +57,7 @@ export function build_server_nodes(out, kit, manifest_data, server_manifest, cli
 			exports.push(
 				`export const component = async () => (await import('../${
 					resolve_symlinks(server_manifest, node.component).chunk.file
-				}')).default;`,
-				`export const file = '${entry.file}';` // TODO what is this?
+				}')).default;`
 			);
 		}
 
diff --git a/packages/kit/src/exports/vite/dev/index.js b/packages/kit/src/exports/vite/dev/index.js
index d279e488c5a0..3a5d0d51e749 100644
--- a/packages/kit/src/exports/vite/dev/index.js
+++ b/packages/kit/src/exports/vite/dev/index.js
@@ -145,12 +145,11 @@ export async function dev(vite, vite_config, svelte_config) {
 
 						if (node.component) {
 							result.component = async () => {
-								const { module_node, module, url } = await resolve(
+								const { module_node, module } = await resolve(
 									/** @type {string} */ (node.component)
 								);
 
 								module_nodes.push(module_node);
-								result.file = url.endsWith('.svelte') ? url : url + '?import'; // TODO what is this for?
 
 								return module.default;
 							};
diff --git a/packages/kit/types/internal.d.ts b/packages/kit/types/internal.d.ts
index 363be1f45397..9a7c57594193 100644
--- a/packages/kit/types/internal.d.ts
+++ b/packages/kit/types/internal.d.ts
@@ -290,8 +290,6 @@ export interface SSRNode {
 	component: SSRComponentLoader;
 	/** index into the `components` array in client/manifest.js */
 	index: number;
-	/** client-side module URL for this component */
-	file: string;
 	/** external JS files */
 	imports: string[];
 	/** external CSS files */

From 439a185b8ca4af76015a47ae473482b55d317808 Mon Sep 17 00:00:00 2001
From: "S. Elliott Johnson" <sejohnson@torchcloudconsulting.com>
Date: Mon, 17 Apr 2023 09:12:39 -0600
Subject: [PATCH 44/74] chore: Better error handling for network-related
 failures in version checks (#9622)

---
 packages/kit/src/runtime/client/utils.js | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/packages/kit/src/runtime/client/utils.js b/packages/kit/src/runtime/client/utils.js
index 50e9f34c60e0..838abd6d590a 100644
--- a/packages/kit/src/runtime/client/utils.js
+++ b/packages/kit/src/runtime/client/utils.js
@@ -231,14 +231,18 @@ export function create_updated_store() {
 
 		if (interval) timeout = setTimeout(check, interval);
 
-		const res = await fetch(`${assets}/${__SVELTEKIT_APP_VERSION_FILE__}`, {
-			headers: {
-				pragma: 'no-cache',
-				'cache-control': 'no-cache'
+		try {
+			const res = await fetch(`${assets}/${__SVELTEKIT_APP_VERSION_FILE__}`, {
+				headers: {
+					pragma: 'no-cache',
+					'cache-control': 'no-cache'
+				}
+			});
+
+			if (!res.ok) {
+				return false;
 			}
-		});
 
-		if (res.ok) {
 			const data = await res.json();
 			const updated = data.version !== version;
 
@@ -248,8 +252,8 @@ export function create_updated_store() {
 			}
 
 			return updated;
-		} else {
-			throw new Error(`Version check failed: ${res.status}`);
+		} catch {
+			return false;
 		}
 	}
 

From 4315e0ba63dfa541f472aa1ff2fd9fd1a1303ea3 Mon Sep 17 00:00:00 2001
From: Tee Ming <chewteeming01@gmail.com>
Date: Mon, 17 Apr 2023 23:53:42 +0800
Subject: [PATCH 45/74] fix: prevent `beforeNavigate()` for download links
 (#9660)

* do not call before navigate for downloads

* changeset

* add test

* remove # from test download link
---
 .changeset/shiny-eels-greet.md                       |  5 +++++
 packages/kit/src/runtime/client/client.js            | 12 +++++++-----
 packages/kit/src/runtime/client/utils.js             |  7 ++++---
 .../before-navigate/prevent-navigation/+page.svelte  |  1 +
 .../apps/basics/test/cross-platform/client.test.js   | 12 ++++++++++++
 5 files changed, 29 insertions(+), 8 deletions(-)
 create mode 100644 .changeset/shiny-eels-greet.md

diff --git a/.changeset/shiny-eels-greet.md b/.changeset/shiny-eels-greet.md
new file mode 100644
index 000000000000..ca72487e0a32
--- /dev/null
+++ b/.changeset/shiny-eels-greet.md
@@ -0,0 +1,5 @@
+---
+'@sveltejs/kit': minor
+---
+
+fix: do not call beforeNavigate for download links
diff --git a/packages/kit/src/runtime/client/client.js b/packages/kit/src/runtime/client/client.js
index a049d2d3eeaf..164ce5ec01ff 100644
--- a/packages/kit/src/runtime/client/client.js
+++ b/packages/kit/src/runtime/client/client.js
@@ -1266,8 +1266,8 @@ export function create_client(app, target) {
 			const a = find_anchor(element, container);
 			if (!a) return;
 
-			const { url, external } = get_link_info(a, base);
-			if (external) return;
+			const { url, external, download } = get_link_info(a, base);
+			if (external || download) return;
 
 			const options = get_router_options(a);
 
@@ -1300,8 +1300,8 @@ export function create_client(app, target) {
 			observer.disconnect();
 
 			for (const a of container.querySelectorAll('a')) {
-				const { url, external } = get_link_info(a, base);
-				if (external) continue;
+				const { url, external, download } = get_link_info(a, base);
+				if (external || download) continue;
 
 				const options = get_router_options(a);
 				if (options.reload) continue;
@@ -1517,7 +1517,7 @@ export function create_client(app, target) {
 				const a = find_anchor(/** @type {Element} */ (event.composedPath()[0]), container);
 				if (!a) return;
 
-				const { url, external, target } = get_link_info(a, base);
+				const { url, external, target, download } = get_link_info(a, base);
 				if (!url) return;
 
 				// bail out before `beforeNavigate` if link opens in a different tab
@@ -1545,6 +1545,8 @@ export function create_client(app, target) {
 				)
 					return;
 
+				if (download) return;
+
 				// Ignore the following but fire beforeNavigate
 				if (external || options.reload) {
 					if (before_navigate({ url, type: 'link' })) {
diff --git a/packages/kit/src/runtime/client/utils.js b/packages/kit/src/runtime/client/utils.js
index 838abd6d590a..7818d6ac91ed 100644
--- a/packages/kit/src/runtime/client/utils.js
+++ b/packages/kit/src/runtime/client/utils.js
@@ -133,10 +133,11 @@ export function get_link_info(a, base) {
 		!url ||
 		!!target ||
 		is_external_url(url, base) ||
-		(a.getAttribute('rel') || '').split(/\s+/).includes('external') ||
-		a.hasAttribute('download');
+		(a.getAttribute('rel') || '').split(/\s+/).includes('external');
 
-	return { url, external, target };
+	const download = url?.origin === location.origin && a.hasAttribute('download');
+
+	return { url, external, target, download };
 }
 
 /**
diff --git a/packages/kit/test/apps/basics/src/routes/before-navigate/prevent-navigation/+page.svelte b/packages/kit/test/apps/basics/src/routes/before-navigate/prevent-navigation/+page.svelte
index 1e30b09f63c2..8a3884c54c53 100644
--- a/packages/kit/test/apps/basics/src/routes/before-navigate/prevent-navigation/+page.svelte
+++ b/packages/kit/test/apps/basics/src/routes/before-navigate/prevent-navigation/+page.svelte
@@ -20,4 +20,5 @@
 <a href="/before-navigate/prevent-navigation?x=1">self</a>
 <a href="https://google.com" target="_blank" rel="noreferrer">_blank</a>
 <a href="https://google.de">external</a>
+<a download href="">external</a>
 <pre>{times_triggered} {unload} {navigation_type}</pre>
diff --git a/packages/kit/test/apps/basics/test/cross-platform/client.test.js b/packages/kit/test/apps/basics/test/cross-platform/client.test.js
index e4d86df02f00..4fbf66f32949 100644
--- a/packages/kit/test/apps/basics/test/cross-platform/client.test.js
+++ b/packages/kit/test/apps/basics/test/cross-platform/client.test.js
@@ -213,6 +213,18 @@ test.describe('beforeNavigate', () => {
 
 		expect(await page.innerHTML('pre')).toBe('2 false goto');
 	});
+
+	test('is triggered after clicking a download link', async ({ page, baseURL }) => {
+		await page.goto('/before-navigate/prevent-navigation');
+
+		await page.click('a[download]');
+		expect(await page.innerHTML('pre')).toBe('0 false undefined');
+
+		await page.click('a[href="/before-navigate/a"]');
+
+		expect(page.url()).toBe(baseURL + '/before-navigate/prevent-navigation');
+		expect(await page.innerHTML('pre')).toBe('1 false link');
+	});
 });
 
 test.describe('Scrolling', () => {

From 1cc2243b153f300e7bc77a208ce8857bfad2078a Mon Sep 17 00:00:00 2001
From: Simon H <5968653+dummdidumm@users.noreply.github.com>
Date: Mon, 17 Apr 2023 19:39:43 +0200
Subject: [PATCH 46/74] fix: handle redirect thrown in handle hook in response
 to form action (#9658)

* fix: handle redirect thrown in handle hook in response to form action

fixes #9555

* oops
---
 .changeset/modern-years-tell.md               |  5 ++++
 .../kit/src/runtime/server/page/actions.js    | 17 ++++++++++----
 packages/kit/src/runtime/server/respond.js    |  3 +++
 .../kit/test/apps/basics/src/hooks.server.js  |  7 ++++++
 .../redirect-in-handle/+page.server.js        |  6 +++++
 .../actions/redirect-in-handle/+page.svelte   |  7 ++++++
 packages/kit/test/apps/basics/test/test.js    | 23 +++++++++++++++++++
 7 files changed, 63 insertions(+), 5 deletions(-)
 create mode 100644 .changeset/modern-years-tell.md
 create mode 100644 packages/kit/test/apps/basics/src/routes/actions/redirect-in-handle/+page.server.js
 create mode 100644 packages/kit/test/apps/basics/src/routes/actions/redirect-in-handle/+page.svelte

diff --git a/.changeset/modern-years-tell.md b/.changeset/modern-years-tell.md
new file mode 100644
index 000000000000..f2d59635cf55
--- /dev/null
+++ b/.changeset/modern-years-tell.md
@@ -0,0 +1,5 @@
+---
+'@sveltejs/kit': patch
+---
+
+fix: handle redirect thrown in handle hook in response to form action
diff --git a/packages/kit/src/runtime/server/page/actions.js b/packages/kit/src/runtime/server/page/actions.js
index 33dd11170267..75d9bf039724 100644
--- a/packages/kit/src/runtime/server/page/actions.js
+++ b/packages/kit/src/runtime/server/page/actions.js
@@ -72,11 +72,7 @@ export async function handle_action_json_request(event, options, server) {
 		const err = normalize_error(e);
 
 		if (err instanceof Redirect) {
-			return action_json({
-				type: 'redirect',
-				status: err.status,
-				location: err.location
-			});
+			return action_json_redirect(err);
 		}
 
 		return action_json(
@@ -100,6 +96,17 @@ function check_incorrect_fail_use(error) {
 		: error;
 }
 
+/**
+ * @param {import('types').Redirect} redirect
+ */
+export function action_json_redirect(redirect) {
+	return action_json({
+		type: 'redirect',
+		status: redirect.status,
+		location: redirect.location
+	});
+}
+
 /**
  * @param {import('types').ActionResult} data
  * @param {ResponseInit} [init]
diff --git a/packages/kit/src/runtime/server/respond.js b/packages/kit/src/runtime/server/respond.js
index f48bffefe849..6d94cde57fc0 100644
--- a/packages/kit/src/runtime/server/respond.js
+++ b/packages/kit/src/runtime/server/respond.js
@@ -26,6 +26,7 @@ import {
 } from '../../utils/exports.js';
 import { get_option } from '../../utils/options.js';
 import { error, json, text } from '../../exports/index.js';
+import { action_json_redirect, is_action_json_request } from './page/actions.js';
 
 /* global __SVELTEKIT_ADAPTER_NAME__ */
 
@@ -309,6 +310,8 @@ export async function respond(request, options, manifest, state) {
 		if (e instanceof Redirect) {
 			const response = is_data_request
 				? redirect_json_response(e)
+				: route?.page && is_action_json_request(event)
+				? action_json_redirect(e)
 				: redirect_response(e.status, e.location);
 			add_cookies_to_headers(response.headers, Object.values(cookies_to_add));
 			return response;
diff --git a/packages/kit/test/apps/basics/src/hooks.server.js b/packages/kit/test/apps/basics/src/hooks.server.js
index 7a6bc7affec5..3dc9017fd287 100644
--- a/packages/kit/test/apps/basics/src/hooks.server.js
+++ b/packages/kit/test/apps/basics/src/hooks.server.js
@@ -112,6 +112,13 @@ export const handle = sequence(
 			return event.fetch('/prerendering/prerendered-endpoint/api');
 		}
 
+		return resolve(event);
+	},
+	async ({ event, resolve }) => {
+		if (event.url.pathname === '/actions/redirect-in-handle' && event.request.method === 'POST') {
+			throw redirect(303, '/actions/enhance');
+		}
+
 		return resolve(event);
 	}
 );
diff --git a/packages/kit/test/apps/basics/src/routes/actions/redirect-in-handle/+page.server.js b/packages/kit/test/apps/basics/src/routes/actions/redirect-in-handle/+page.server.js
new file mode 100644
index 000000000000..86a0bb6c6242
--- /dev/null
+++ b/packages/kit/test/apps/basics/src/routes/actions/redirect-in-handle/+page.server.js
@@ -0,0 +1,6 @@
+/** @type {import('./$types').Actions} */
+export const actions = {
+	default: async () => {
+		throw new Error('should never get here');
+	}
+};
diff --git a/packages/kit/test/apps/basics/src/routes/actions/redirect-in-handle/+page.svelte b/packages/kit/test/apps/basics/src/routes/actions/redirect-in-handle/+page.svelte
new file mode 100644
index 000000000000..7bcb55f72822
--- /dev/null
+++ b/packages/kit/test/apps/basics/src/routes/actions/redirect-in-handle/+page.svelte
@@ -0,0 +1,7 @@
+<script>
+	import { enhance } from '$app/forms';
+</script>
+
+<form method="post" use:enhance>
+	<button>Submit</button>
+</form>
diff --git a/packages/kit/test/apps/basics/test/test.js b/packages/kit/test/apps/basics/test/test.js
index 3e242b9e73d9..6fb1d89ce00c 100644
--- a/packages/kit/test/apps/basics/test/test.js
+++ b/packages/kit/test/apps/basics/test/test.js
@@ -1042,6 +1042,29 @@ test.describe('Actions', () => {
 		expect(page.url()).toContain('/actions/enhance');
 	});
 
+	test('redirect in handle', async ({ page, javaScriptEnabled }) => {
+		await page.goto('/actions/redirect-in-handle');
+
+		page.click('button');
+
+		const [redirect] = await Promise.all([
+			page.waitForResponse('/actions/redirect-in-handle'),
+			page.waitForNavigation()
+		]);
+		if (javaScriptEnabled) {
+			expect(await redirect.json()).toEqual({
+				type: 'redirect',
+				location: '/actions/enhance',
+				status: 303
+			});
+		} else {
+			expect(redirect.status()).toBe(303);
+			expect(redirect.headers()['location']).toBe('/actions/enhance');
+		}
+
+		expect(page.url()).toContain('/actions/enhance');
+	});
+
 	test('$page.status reflects error status', async ({ page, app }) => {
 		await page.goto('/actions/enhance');
 

From 7225d2086f92b9f25c00365024ed1e41e3fe3377 Mon Sep 17 00:00:00 2001
From: Rich Harris <richard.a.harris@gmail.com>
Date: Mon, 17 Apr 2023 13:40:57 -0400
Subject: [PATCH 47/74] change `minor` to `patch`

---
 .changeset/shiny-eels-greet.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.changeset/shiny-eels-greet.md b/.changeset/shiny-eels-greet.md
index ca72487e0a32..e8e767d832aa 100644
--- a/.changeset/shiny-eels-greet.md
+++ b/.changeset/shiny-eels-greet.md
@@ -1,5 +1,5 @@
 ---
-'@sveltejs/kit': minor
+'@sveltejs/kit': patch
 ---
 
 fix: do not call beforeNavigate for download links

From 68852116d0131a7a0fbe2149124d8a1ee1f1df0f Mon Sep 17 00:00:00 2001
From: Rich Harris <richard.a.harris@gmail.com>
Date: Mon, 17 Apr 2023 13:42:59 -0400
Subject: [PATCH 48/74] always add trailing slash to base path (#9343)

* always add trailing slash to base path - fixes #9341

* tidy up

* Update packages/kit/src/runtime/server/respond.js
---
 .changeset/great-stingrays-flash.md           |  5 +++++
 .../kit/src/runtime/server/page/render.js     | 19 ++++---------------
 packages/kit/src/runtime/server/respond.js    |  6 +++++-
 packages/kit/test/apps/options-2/test/test.js |  2 +-
 4 files changed, 15 insertions(+), 17 deletions(-)
 create mode 100644 .changeset/great-stingrays-flash.md

diff --git a/.changeset/great-stingrays-flash.md b/.changeset/great-stingrays-flash.md
new file mode 100644
index 000000000000..19b89c84c35a
--- /dev/null
+++ b/.changeset/great-stingrays-flash.md
@@ -0,0 +1,5 @@
+---
+'@sveltejs/kit': patch
+---
+
+fix: use correct relative paths when rendering base path
diff --git a/packages/kit/src/runtime/server/page/render.js b/packages/kit/src/runtime/server/page/render.js
index 22be19737272..d330001c47a1 100644
--- a/packages/kit/src/runtime/server/page/render.js
+++ b/packages/kit/src/runtime/server/page/render.js
@@ -95,23 +95,12 @@ export async function render_response({
 
 	// if appropriate, use relative paths for greater portability
 	if (paths.relative !== false && !state.prerendering?.fallback) {
-		const segments = event.url.pathname.slice(paths.base.length).split('/');
+		const segments = event.url.pathname.slice(paths.base.length).split('/').slice(2);
 
-		if (segments.length === 1 && paths.base !== '') {
-			// if we're on `/my-base-path`, relative links need to start `./my-base-path` rather than `.`
-			base = `./${paths.base.split('/').at(-1)}`;
+		base = segments.map(() => '..').join('/') || '.';
 
-			base_expression = `new URL(${s(base)}, location).pathname`;
-		} else {
-			base =
-				segments
-					.slice(2)
-					.map(() => '..')
-					.join('/') || '.';
-
-			// resolve e.g. '../..' against current location, then remove trailing slash
-			base_expression = `new URL(${s(base)}, location).pathname.slice(0, -1)`;
-		}
+		// resolve e.g. '../..' against current location, then remove trailing slash
+		base_expression = `new URL(${s(base)}, location).pathname.slice(0, -1)`;
 
 		if (!paths.assets || (paths.assets[0] === '/' && paths.assets !== SVELTE_KIT_ASSETS)) {
 			assets = base;
diff --git a/packages/kit/src/runtime/server/respond.js b/packages/kit/src/runtime/server/respond.js
index 6d94cde57fc0..ada5b05cf85e 100644
--- a/packages/kit/src/runtime/server/respond.js
+++ b/packages/kit/src/runtime/server/respond.js
@@ -176,7 +176,11 @@ export async function respond(request, options, manifest, state) {
 	try {
 		// determine whether we need to redirect to add/remove a trailing slash
 		if (route && !is_data_request) {
-			if (route.page) {
+			// if `paths.base === '/a/b/c`, then the root route is `/a/b/c/`,
+			// regardless of the `trailingSlash` route option
+			if (url.pathname === base || url.pathname === base + '/') {
+				trailing_slash = 'always';
+			} else if (route.page) {
 				const nodes = await Promise.all([
 					// we use == here rather than === because [undefined] serializes as "[null]"
 					...route.page.layouts.map((n) => (n == undefined ? n : manifest._.nodes[n]())),
diff --git a/packages/kit/test/apps/options-2/test/test.js b/packages/kit/test/apps/options-2/test/test.js
index cbd51d45e1cd..9c6269e2d50f 100644
--- a/packages/kit/test/apps/options-2/test/test.js
+++ b/packages/kit/test/apps/options-2/test/test.js
@@ -27,7 +27,7 @@ test.describe('paths', () => {
 	test('uses relative paths during SSR', async ({ page, javaScriptEnabled }) => {
 		await page.goto('/basepath');
 
-		let base = javaScriptEnabled ? '/basepath' : './basepath';
+		let base = javaScriptEnabled ? '/basepath' : '.';
 		expect(await page.textContent('[data-testid="base"]')).toBe(`base: ${base}`);
 		expect(await page.textContent('[data-testid="assets"]')).toBe(`assets: ${base}`);
 

From 5e27d67d94ce85df98304c423079d7ec37c8332f Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 17 Apr 2023 13:46:42 -0400
Subject: [PATCH 49/74] Version Packages (#9685)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 .changeset/great-stingrays-flash.md |  5 -----
 .changeset/modern-years-tell.md     |  5 -----
 .changeset/shiny-eels-greet.md      |  5 -----
 packages/kit/CHANGELOG.md           | 10 ++++++++++
 packages/kit/package.json           |  2 +-
 5 files changed, 11 insertions(+), 16 deletions(-)
 delete mode 100644 .changeset/great-stingrays-flash.md
 delete mode 100644 .changeset/modern-years-tell.md
 delete mode 100644 .changeset/shiny-eels-greet.md

diff --git a/.changeset/great-stingrays-flash.md b/.changeset/great-stingrays-flash.md
deleted file mode 100644
index 19b89c84c35a..000000000000
--- a/.changeset/great-stingrays-flash.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@sveltejs/kit': patch
----
-
-fix: use correct relative paths when rendering base path
diff --git a/.changeset/modern-years-tell.md b/.changeset/modern-years-tell.md
deleted file mode 100644
index f2d59635cf55..000000000000
--- a/.changeset/modern-years-tell.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@sveltejs/kit': patch
----
-
-fix: handle redirect thrown in handle hook in response to form action
diff --git a/.changeset/shiny-eels-greet.md b/.changeset/shiny-eels-greet.md
deleted file mode 100644
index e8e767d832aa..000000000000
--- a/.changeset/shiny-eels-greet.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@sveltejs/kit': patch
----
-
-fix: do not call beforeNavigate for download links
diff --git a/packages/kit/CHANGELOG.md b/packages/kit/CHANGELOG.md
index a806a4c2f575..993983f7b963 100644
--- a/packages/kit/CHANGELOG.md
+++ b/packages/kit/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @sveltejs/kit
 
+## 1.15.6
+
+### Patch Changes
+
+- fix: use correct relative paths when rendering base path ([#9343](https://github.com/sveltejs/kit/pull/9343))
+
+- fix: handle redirect thrown in handle hook in response to form action ([#9658](https://github.com/sveltejs/kit/pull/9658))
+
+- fix: do not call beforeNavigate for download links ([#9660](https://github.com/sveltejs/kit/pull/9660))
+
 ## 1.15.5
 
 ### Patch Changes
diff --git a/packages/kit/package.json b/packages/kit/package.json
index 00007b5691d9..b1104982b87c 100644
--- a/packages/kit/package.json
+++ b/packages/kit/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@sveltejs/kit",
-	"version": "1.15.5",
+	"version": "1.15.6",
 	"description": "The fastest way to build Svelte apps",
 	"repository": {
 		"type": "git",

From ae2f4a8caacfb671db159f3cdce0894beb485b4f Mon Sep 17 00:00:00 2001
From: "S. Elliott Johnson" <sejohnson@torchcloudconsulting.com>
Date: Mon, 17 Apr 2023 11:47:25 -0600
Subject: [PATCH 50/74] feat: improve error message for `handleHttpError` and
 `handleMissingId` (#9621)

* patch: Improve error message for `handleHttpError` and `handleMissingId`

* chore: changest

* Update .changeset/tall-bags-sparkle.md

* put the message in the fallback handler

* oops

---------

Co-authored-by: Simon H <5968653+dummdidumm@users.noreply.github.com>
Co-authored-by: Rich Harris <git@rich-harris.dev>
---
 .changeset/tall-bags-sparkle.md            |  5 +++
 packages/kit/src/core/config/index.spec.js |  2 --
 packages/kit/src/core/config/options.js    | 36 ++++++++++++++++------
 3 files changed, 31 insertions(+), 12 deletions(-)
 create mode 100644 .changeset/tall-bags-sparkle.md

diff --git a/.changeset/tall-bags-sparkle.md b/.changeset/tall-bags-sparkle.md
new file mode 100644
index 000000000000..1b66de3f7e35
--- /dev/null
+++ b/.changeset/tall-bags-sparkle.md
@@ -0,0 +1,5 @@
+---
+'@sveltejs/kit': patch
+---
+
+fix: better error messages for handleable prerender failures
diff --git a/packages/kit/src/core/config/index.spec.js b/packages/kit/src/core/config/index.spec.js
index 78142e7623b0..56e42a55ab4b 100644
--- a/packages/kit/src/core/config/index.spec.js
+++ b/packages/kit/src/core/config/index.spec.js
@@ -105,8 +105,6 @@ const get_defaults = (prefix = '') => ({
 			concurrency: 1,
 			crawl: true,
 			entries: ['*'],
-			handleHttpError: 'fail',
-			handleMissingId: 'fail',
 			origin: 'http://sveltekit-prerender'
 		},
 		version: {
diff --git a/packages/kit/src/core/config/options.js b/packages/kit/src/core/config/options.js
index cdaf2d3be02c..b1b63d3a3154 100644
--- a/packages/kit/src/core/config/options.js
+++ b/packages/kit/src/core/config/options.js
@@ -201,17 +201,33 @@ const options = object(
 					return input;
 				}),
 
-				handleHttpError: validate('fail', (input, keypath) => {
-					if (typeof input === 'function') return input;
-					if (['fail', 'warn', 'ignore'].includes(input)) return input;
-					throw new Error(`${keypath} should be "fail", "warn", "ignore" or a custom function`);
-				}),
+				handleHttpError: validate(
+					(/** @type {any} */ { message }) => {
+						throw new Error(
+							message +
+								`\nTo suppress or handle this error, implement \`handleHttpError\` in https://kit.svelte.dev/docs/configuration#prerender`
+						);
+					},
+					(input, keypath) => {
+						if (typeof input === 'function') return input;
+						if (['fail', 'warn', 'ignore'].includes(input)) return input;
+						throw new Error(`${keypath} should be "fail", "warn", "ignore" or a custom function`);
+					}
+				),
 
-				handleMissingId: validate('fail', (input, keypath) => {
-					if (typeof input === 'function') return input;
-					if (['fail', 'warn', 'ignore'].includes(input)) return input;
-					throw new Error(`${keypath} should be "fail", "warn", "ignore" or a custom function`);
-				}),
+				handleMissingId: validate(
+					(/** @type {any} */ { message }) => {
+						throw new Error(
+							message +
+								`\nTo suppress or handle this error, implement \`handleMissingId\` in https://kit.svelte.dev/docs/configuration#prerender`
+						);
+					},
+					(input, keypath) => {
+						if (typeof input === 'function') return input;
+						if (['fail', 'warn', 'ignore'].includes(input)) return input;
+						throw new Error(`${keypath} should be "fail", "warn", "ignore" or a custom function`);
+					}
+				),
 
 				origin: validate('http://sveltekit-prerender', (input, keypath) => {
 					assert_string(input, keypath);

From 563e3e3d7416c08865377bf3e712a7482dd5eed3 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 17 Apr 2023 14:57:34 -0400
Subject: [PATCH 51/74] chore(deps): update dependency @sveltejs/site-kit to
 v4.1.1 (#9652)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

From 95e95828f444a35ca3f71eb1350c6630895c02c9 Mon Sep 17 00:00:00 2001
From: Tee Ming <chewteeming01@gmail.com>
Date: Tue, 18 Apr 2023 03:09:46 +0800
Subject: [PATCH 52/74] fix: prevent false positive warnings for `fetch` in
 Firefox and Safari (#9680)

* change fetch warning stack trace cutoff

* changeset

* add test
---
 .changeset/flat-trainers-fold.md              |  5 +++++
 packages/kit/src/runtime/client/fetcher.js    | 12 +++++------
 .../window-fetch/outside-load/+page.svelte    | 13 ++++++++++++
 .../basics/test/cross-platform/client.test.js | 21 +++++++++++++++++++
 4 files changed, 44 insertions(+), 7 deletions(-)
 create mode 100644 .changeset/flat-trainers-fold.md
 create mode 100644 packages/kit/test/apps/basics/src/routes/load/window-fetch/outside-load/+page.svelte

diff --git a/.changeset/flat-trainers-fold.md b/.changeset/flat-trainers-fold.md
new file mode 100644
index 000000000000..ce979520e626
--- /dev/null
+++ b/.changeset/flat-trainers-fold.md
@@ -0,0 +1,5 @@
+---
+'@sveltejs/kit': patch
+---
+
+fix: prevent false positive warnings for fetch in Firefox and Safari
diff --git a/packages/kit/src/runtime/client/fetcher.js b/packages/kit/src/runtime/client/fetcher.js
index e73da8f2ca51..df709d1f3968 100644
--- a/packages/kit/src/runtime/client/fetcher.js
+++ b/packages/kit/src/runtime/client/fetcher.js
@@ -29,14 +29,12 @@ if (DEV) {
 		// We use just the filename as the method name sometimes does not appear on the CI.
 		const url = input instanceof Request ? input.url : input.toString();
 		const stack_array = /** @type {string} */ (new Error().stack).split('\n');
-		// We need to do some Firefox-specific cutoff because it (impressively) maintains the stack
-		// across events and for example traces a `fetch` call triggered from a button back
-		// to the creation of the event listener and the element creation itself,
+		// We need to do a cutoff because Safari and Firefox maintain the stack
+		// across events and for example traces a `fetch` call triggered from a button
+		// back to the creation of the event listener and the element creation itself,
 		// where at some point client.js will show up, leading to false positives.
-		const firefox_cutoff = stack_array.findIndex((a) => a.includes('*listen@'));
-		const stack = stack_array
-			.slice(0, firefox_cutoff !== -1 ? firefox_cutoff : undefined)
-			.join('\n');
+		const cutoff = stack_array.findIndex((a) => a.includes('load@') || a.includes('at load'));
+		const stack = stack_array.slice(0, cutoff + 2).join('\n');
 
 		const heuristic = can_inspect_stack_trace
 			? stack.includes('src/runtime/client/client.js')
diff --git a/packages/kit/test/apps/basics/src/routes/load/window-fetch/outside-load/+page.svelte b/packages/kit/test/apps/basics/src/routes/load/window-fetch/outside-load/+page.svelte
new file mode 100644
index 000000000000..dda0ecac5d6e
--- /dev/null
+++ b/packages/kit/test/apps/basics/src/routes/load/window-fetch/outside-load/+page.svelte
@@ -0,0 +1,13 @@
+<script>
+	import { page } from '$app/stores';
+	import { onMount } from 'svelte';
+
+	let answer = 0;
+
+	onMount(async () => {
+		const res = await fetch(`${$page.url.origin}/load/window-fetch/data.json`);
+		({ answer } = await res.json());
+	});
+</script>
+
+<h1>{answer}</h1>
diff --git a/packages/kit/test/apps/basics/test/cross-platform/client.test.js b/packages/kit/test/apps/basics/test/cross-platform/client.test.js
index 4fbf66f32949..34de866b9c2d 100644
--- a/packages/kit/test/apps/basics/test/cross-platform/client.test.js
+++ b/packages/kit/test/apps/basics/test/cross-platform/client.test.js
@@ -754,3 +754,24 @@ test.describe('Interactivity', () => {
 		expect(errored).toBe(false);
 	});
 });
+
+test.describe('Load', () => {
+	if (process.env.DEV) {
+		test('using window.fetch does not cause false-positive warning', async ({ page, baseURL }) => {
+			/** @type {string[]} */
+			const warnings = [];
+			page.on('console', (msg) => {
+				if (msg.type() === 'warning') {
+					warnings.push(msg.text());
+				}
+			});
+
+			await page.goto('/load/window-fetch/outside-load');
+			expect(await page.textContent('h1')).toBe('42');
+
+			expect(warnings).not.toContain(
+				`Loading ${baseURL}/load/window-fetch/data.json using \`window.fetch\`. For best results, use the \`fetch\` that is passed to your \`load\` function: https://kit.svelte.dev/docs/load#making-fetch-requests`
+			);
+		});
+	}
+});

From 3b0154e32de9226bdc516beb5165efd12bd5d5d5 Mon Sep 17 00:00:00 2001
From: Rich Harris <richard.a.harris@gmail.com>
Date: Mon, 17 Apr 2023 15:16:56 -0400
Subject: [PATCH 53/74] remove outdated text (#9691)

---
 documentation/docs/20-core-concepts/40-page-options.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/documentation/docs/20-core-concepts/40-page-options.md b/documentation/docs/20-core-concepts/40-page-options.md
index 434f8eaa179e..d0444baab408 100644
--- a/documentation/docs/20-core-concepts/40-page-options.md
+++ b/documentation/docs/20-core-concepts/40-page-options.md
@@ -78,8 +78,6 @@ For that reason among others, it's recommended that you always include a file ex
 
 For _pages_, we skirt around this problem by writing `foo/index.html` instead of `foo`.
 
-Note that this will disable client-side routing for any navigation from this page, regardless of whether the router is already active.
-
 ### Troubleshooting
 
 If you encounter an error like 'The following routes were marked as prerenderable, but were not prerendered' it's because the route in question (or a parent layout, if it's a page) has `export const prerender = true` but the page wasn't actually prerendered, because it wasn't reached by the prerendering crawler.

From 5e4820fa50ea4d979e53b101739fb3b3474aae11 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 17 Apr 2023 15:39:08 -0400
Subject: [PATCH 54/74] chore(deps): update dependency worktop to
 v0.8.0-next.15 (#9690)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 packages/adapter-cloudflare/package.json | 2 +-
 pnpm-lock.yaml                           | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/adapter-cloudflare/package.json b/packages/adapter-cloudflare/package.json
index 77a30bddd103..b022250431ec 100644
--- a/packages/adapter-cloudflare/package.json
+++ b/packages/adapter-cloudflare/package.json
@@ -34,7 +34,7 @@
 	"dependencies": {
 		"@cloudflare/workers-types": "^4.20221111.1",
 		"esbuild": "^0.16.3",
-		"worktop": "0.8.0-next.14"
+		"worktop": "0.8.0-next.15"
 	},
 	"devDependencies": {
 		"@types/node": "^16.18.6",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 66ca6b0eb568..d95f1d4a65a1 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -75,8 +75,8 @@ importers:
         specifier: ^0.16.3
         version: 0.16.3
       worktop:
-        specifier: 0.8.0-next.14
-        version: 0.8.0-next.14
+        specifier: 0.8.0-next.15
+        version: 0.8.0-next.15
     devDependencies:
       '@types/node':
         specifier: ^16.18.6
@@ -5786,8 +5786,8 @@ packages:
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /worktop@0.8.0-next.14:
-    resolution: {integrity: sha512-RZgqHu1w/JcUdWOE/BUEAzarrUUHh39eWkLdX8XpA6MfgLJF6X5Vl26CV7/wcm4O/UpZvHMGJUtB9eYTqDjc9g==}
+  /worktop@0.8.0-next.15:
+    resolution: {integrity: sha512-0ycNO52P6nVwsjr1y20zuf0nqJatAb8L7MODBfQIxbxndHV5O4s50oZZMHWhJG1RLpHwbK0Epq8aaQK4E2GlgQ==}
     engines: {node: '>=12'}
     dependencies:
       mrmime: 1.0.1

From 84a5250d5fe80a87eb7df5569e76a1dde857aa82 Mon Sep 17 00:00:00 2001
From: Rich Harris <richard.a.harris@gmail.com>
Date: Mon, 17 Apr 2023 15:52:38 -0400
Subject: [PATCH 55/74] prvide better error when prerendered routes conflict
 with each other - closes #9560 (#9692)

Co-authored-by: Rich Harris <git@rich-harris.dev>
---
 .changeset/curly-items-speak.md              |  5 +++++
 packages/kit/src/core/postbuild/prerender.js | 19 +++++++++++++++++--
 2 files changed, 22 insertions(+), 2 deletions(-)
 create mode 100644 .changeset/curly-items-speak.md

diff --git a/.changeset/curly-items-speak.md b/.changeset/curly-items-speak.md
new file mode 100644
index 000000000000..e1702e4ef210
--- /dev/null
+++ b/.changeset/curly-items-speak.md
@@ -0,0 +1,5 @@
+---
+'@sveltejs/kit': patch
+---
+
+fix: provide better error when prerendered routes conflict with each other
diff --git a/packages/kit/src/core/postbuild/prerender.js b/packages/kit/src/core/postbuild/prerender.js
index f37373be44fa..379ba3da2895 100644
--- a/packages/kit/src/core/postbuild/prerender.js
+++ b/packages/kit/src/core/postbuild/prerender.js
@@ -1,4 +1,4 @@
-import { existsSync, readFileSync, writeFileSync } from 'node:fs';
+import { existsSync, readFileSync, statSync, writeFileSync } from 'node:fs';
 import { dirname, join } from 'node:path';
 import { pathToFileURL } from 'node:url';
 import { installPolyfills } from '../../exports/node/polyfills.js';
@@ -338,7 +338,22 @@ async function prerender({ out, manifest_path, metadata, verbose, env }) {
 		}
 
 		if (response.status === 200) {
-			mkdirp(dirname(dest));
+			if (existsSync(dest) && statSync(dest).isDirectory()) {
+				throw new Error(
+					`Cannot save ${decoded} as it is already a directory. See https://kit.svelte.dev/docs/page-options#prerender-route-conflicts for more information`
+				);
+			}
+
+			const dir = dirname(dest);
+
+			if (existsSync(dir) && !statSync(dir).isDirectory()) {
+				const parent = decoded.split('/').slice(0, -1).join('/');
+				throw new Error(
+					`Cannot save ${decoded} as ${parent} is already a file. See https://kit.svelte.dev/docs/page-options#prerender-route-conflicts for more information`
+				);
+			}
+
+			mkdirp(dir);
 
 			log.info(`${response.status} ${decoded}`);
 			writeFileSync(dest, body);

From 367067f547bb78c61f511e88b9361632862cb4ee Mon Sep 17 00:00:00 2001
From: Eli Murray <eli.murray@nytimes.com>
Date: Mon, 17 Apr 2023 17:25:27 -0400
Subject: [PATCH 56/74] fix: allow embedding two pages generated into the same
 page in "embedded" mode (#9610)

* added route leaf hash to global init namespace

* changeset

* update changelog message

* revert leaf hash commit

* updated with latest suggestions

* workong on test case

* added int test for two embedded pages inlined into the same page

* Update .changeset/late-toes-cry.md

Co-authored-by: Ben McCann <322311+benmccann@users.noreply.github.com>

* lint

* delete test html pages

* updated test case

* update lockfile

* simplify embed tests

* remove some unused files

* fix tsconfig

* alphabetize

* prettier

* think i fixed it

---------

Co-authored-by: Ben McCann <322311+benmccann@users.noreply.github.com>
Co-authored-by: Rich Harris <git@rich-harris.dev>
---
 .changeset/late-toes-cry.md                   |  5 ++++
 .../kit/src/runtime/server/page/render.js     |  7 +++---
 packages/kit/test/apps/embed/.gitignore       |  2 ++
 packages/kit/test/apps/embed/package.json     | 23 +++++++++++++++++++
 .../kit/test/apps/embed/playwright.config.js  |  1 +
 packages/kit/test/apps/embed/src/app.html     |  2 ++
 .../test/apps/embed/src/routes/+layout.svelte |  7 ++++++
 .../test/apps/embed/src/routes/embed/+page.js |  7 ++++++
 .../apps/embed/src/routes/embed/+page.svelte  |  6 +++++
 .../embed/src/routes/embed/a/+page.svelte     |  5 ++++
 .../embed/src/routes/embed/b/+page.svelte     |  5 ++++
 packages/kit/test/apps/embed/svelte.config.js |  8 +++++++
 packages/kit/test/apps/embed/test/test.js     | 20 ++++++++++++++++
 packages/kit/test/apps/embed/tsconfig.json    | 16 +++++++++++++
 packages/kit/test/apps/embed/vite.config.js   | 18 +++++++++++++++
 pnpm-lock.yaml                                | 23 ++++++++++++++++++-
 16 files changed, 151 insertions(+), 4 deletions(-)
 create mode 100644 .changeset/late-toes-cry.md
 create mode 100644 packages/kit/test/apps/embed/.gitignore
 create mode 100644 packages/kit/test/apps/embed/package.json
 create mode 100644 packages/kit/test/apps/embed/playwright.config.js
 create mode 100644 packages/kit/test/apps/embed/src/app.html
 create mode 100644 packages/kit/test/apps/embed/src/routes/+layout.svelte
 create mode 100644 packages/kit/test/apps/embed/src/routes/embed/+page.js
 create mode 100644 packages/kit/test/apps/embed/src/routes/embed/+page.svelte
 create mode 100644 packages/kit/test/apps/embed/src/routes/embed/a/+page.svelte
 create mode 100644 packages/kit/test/apps/embed/src/routes/embed/b/+page.svelte
 create mode 100644 packages/kit/test/apps/embed/svelte.config.js
 create mode 100644 packages/kit/test/apps/embed/test/test.js
 create mode 100644 packages/kit/test/apps/embed/tsconfig.json
 create mode 100644 packages/kit/test/apps/embed/vite.config.js

diff --git a/.changeset/late-toes-cry.md b/.changeset/late-toes-cry.md
new file mode 100644
index 000000000000..8df9c490a341
--- /dev/null
+++ b/.changeset/late-toes-cry.md
@@ -0,0 +1,5 @@
+---
+'@sveltejs/kit': patch
+---
+
+fix: allow embedding two pages generated into the same page in "embedded" mode
diff --git a/packages/kit/src/runtime/server/page/render.js b/packages/kit/src/runtime/server/page/render.js
index d330001c47a1..66d9449f1a24 100644
--- a/packages/kit/src/runtime/server/page/render.js
+++ b/packages/kit/src/runtime/server/page/render.js
@@ -292,10 +292,9 @@ export async function render_response({
 		const blocks = [];
 
 		const properties = [
-			`env: ${s(public_env)}`,
 			paths.assets && `assets: ${s(paths.assets)}`,
 			`base: ${base_expression}`,
-			`element: document.currentScript.parentElement`
+			`env: ${s(public_env)}`
 		].filter(Boolean);
 
 		if (chunks) {
@@ -318,7 +317,9 @@ export async function render_response({
 						${properties.join(',\n\t\t\t\t\t\t')}
 					};`);
 
-		const args = [`app`, `${global}.element`];
+		const args = [`app`, `element`];
+
+		blocks.push(`const element = document.currentScript.parentElement;`);
 
 		if (page_config.ssr) {
 			const serialized = { form: 'null', error: 'null' };
diff --git a/packages/kit/test/apps/embed/.gitignore b/packages/kit/test/apps/embed/.gitignore
new file mode 100644
index 000000000000..216b07aa0731
--- /dev/null
+++ b/packages/kit/test/apps/embed/.gitignore
@@ -0,0 +1,2 @@
+.custom-out-dir
+!.env
\ No newline at end of file
diff --git a/packages/kit/test/apps/embed/package.json b/packages/kit/test/apps/embed/package.json
new file mode 100644
index 000000000000..914e0f83dedc
--- /dev/null
+++ b/packages/kit/test/apps/embed/package.json
@@ -0,0 +1,23 @@
+{
+	"name": "test-options",
+	"private": true,
+	"version": "0.0.1",
+	"scripts": {
+		"dev": "vite dev",
+		"build": "vite build",
+		"preview": "vite preview",
+		"check": "svelte-kit sync && tsc && svelte-check",
+		"test": "pnpm test:dev && pnpm test:build",
+		"test:dev": "cross-env DEV=true playwright test",
+		"test:build": "playwright test"
+	},
+	"devDependencies": {
+		"@sveltejs/kit": "workspace:^",
+		"cross-env": "^7.0.3",
+		"svelte": "^3.56.0",
+		"svelte-check": "^3.0.2",
+		"typescript": "^4.9.4",
+		"vite": "^4.2.0"
+	},
+	"type": "module"
+}
diff --git a/packages/kit/test/apps/embed/playwright.config.js b/packages/kit/test/apps/embed/playwright.config.js
new file mode 100644
index 000000000000..33d36b651014
--- /dev/null
+++ b/packages/kit/test/apps/embed/playwright.config.js
@@ -0,0 +1 @@
+export { config as default } from '../../utils.js';
diff --git a/packages/kit/test/apps/embed/src/app.html b/packages/kit/test/apps/embed/src/app.html
new file mode 100644
index 000000000000..5029518c3ff0
--- /dev/null
+++ b/packages/kit/test/apps/embed/src/app.html
@@ -0,0 +1,2 @@
+%sveltekit.head%
+<div>%sveltekit.body%</div>
diff --git a/packages/kit/test/apps/embed/src/routes/+layout.svelte b/packages/kit/test/apps/embed/src/routes/+layout.svelte
new file mode 100644
index 000000000000..5e1f1fed86c2
--- /dev/null
+++ b/packages/kit/test/apps/embed/src/routes/+layout.svelte
@@ -0,0 +1,7 @@
+<script>
+	import { setup } from '../../../../setup.js';
+
+	setup();
+</script>
+
+<slot />
diff --git a/packages/kit/test/apps/embed/src/routes/embed/+page.js b/packages/kit/test/apps/embed/src/routes/embed/+page.js
new file mode 100644
index 000000000000..4d321641c6d4
--- /dev/null
+++ b/packages/kit/test/apps/embed/src/routes/embed/+page.js
@@ -0,0 +1,7 @@
+/** @type {import('@sveltejs/kit').Load} */
+export async function load({ fetch }) {
+	return {
+		a: fetch('/embed/a').then((x) => x.text()),
+		b: fetch('/embed/b').then((x) => x.text())
+	};
+}
diff --git a/packages/kit/test/apps/embed/src/routes/embed/+page.svelte b/packages/kit/test/apps/embed/src/routes/embed/+page.svelte
new file mode 100644
index 000000000000..a9942193af37
--- /dev/null
+++ b/packages/kit/test/apps/embed/src/routes/embed/+page.svelte
@@ -0,0 +1,6 @@
+<script>
+	export let data;
+</script>
+
+{@html data.a}
+{@html data.b}
diff --git a/packages/kit/test/apps/embed/src/routes/embed/a/+page.svelte b/packages/kit/test/apps/embed/src/routes/embed/a/+page.svelte
new file mode 100644
index 000000000000..dfc5534ebd73
--- /dev/null
+++ b/packages/kit/test/apps/embed/src/routes/embed/a/+page.svelte
@@ -0,0 +1,5 @@
+<script>
+	import { browser } from '$app/environment';
+</script>
+
+<h2 data-testid="a">a ({browser ? 'browser' : 'server'})</h2>
diff --git a/packages/kit/test/apps/embed/src/routes/embed/b/+page.svelte b/packages/kit/test/apps/embed/src/routes/embed/b/+page.svelte
new file mode 100644
index 000000000000..c9be9fcb86c4
--- /dev/null
+++ b/packages/kit/test/apps/embed/src/routes/embed/b/+page.svelte
@@ -0,0 +1,5 @@
+<script>
+	import { browser } from '$app/environment';
+</script>
+
+<h2 data-testid="b">b ({browser ? 'browser' : 'server'})</h2>
diff --git a/packages/kit/test/apps/embed/svelte.config.js b/packages/kit/test/apps/embed/svelte.config.js
new file mode 100644
index 000000000000..6df6938653d1
--- /dev/null
+++ b/packages/kit/test/apps/embed/svelte.config.js
@@ -0,0 +1,8 @@
+/** @type {import('@sveltejs/kit').Config} */
+const config = {
+	kit: {
+		embedded: true
+	}
+};
+
+export default config;
diff --git a/packages/kit/test/apps/embed/test/test.js b/packages/kit/test/apps/embed/test/test.js
new file mode 100644
index 000000000000..04efbbc66525
--- /dev/null
+++ b/packages/kit/test/apps/embed/test/test.js
@@ -0,0 +1,20 @@
+import { expect } from '@playwright/test';
+import { test } from '../../../utils.js';
+
+/** @typedef {import('@playwright/test').Response} Response */
+
+test.describe.configure({ mode: 'parallel' });
+
+test.describe('embed', () => {
+	test('serves embedded components in page', async ({ page, javaScriptEnabled }) => {
+		await page.goto('/embed');
+
+		if (javaScriptEnabled) {
+			expect(await page.textContent('[data-testid="a"]')).toBe('a (browser)');
+			expect(await page.textContent('[data-testid="b"]')).toBe('b (browser)');
+		} else {
+			expect(await page.textContent('[data-testid="a"]')).toBe('a (server)');
+			expect(await page.textContent('[data-testid="b"]')).toBe('b (server)');
+		}
+	});
+});
diff --git a/packages/kit/test/apps/embed/tsconfig.json b/packages/kit/test/apps/embed/tsconfig.json
new file mode 100644
index 000000000000..a1e1e2da2142
--- /dev/null
+++ b/packages/kit/test/apps/embed/tsconfig.json
@@ -0,0 +1,16 @@
+{
+	"compilerOptions": {
+		"allowJs": true,
+		"checkJs": true,
+		"esModuleInterop": true,
+		"noEmit": true,
+		"paths": {
+			"@sveltejs/kit": ["../../../types"],
+			"$lib": ["./src/lib"],
+			"$lib/*": ["./src/lib/*"],
+			"types": ["../../../types/internal"]
+		},
+		"resolveJsonModule": true
+	},
+	"extends": "./.svelte-kit/tsconfig.json"
+}
diff --git a/packages/kit/test/apps/embed/vite.config.js b/packages/kit/test/apps/embed/vite.config.js
new file mode 100644
index 000000000000..69200cdb7cd8
--- /dev/null
+++ b/packages/kit/test/apps/embed/vite.config.js
@@ -0,0 +1,18 @@
+import * as path from 'node:path';
+import { sveltekit } from '@sveltejs/kit/vite';
+
+/** @type {import('vite').UserConfig} */
+const config = {
+	build: {
+		minify: false
+	},
+	clearScreen: false,
+	plugins: [sveltekit()],
+	server: {
+		fs: {
+			allow: [path.resolve('../../../src')]
+		}
+	}
+};
+
+export default config;
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index d95f1d4a65a1..86bbb1fff966 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -512,6 +512,27 @@ importers:
         specifier: ^4.2.0
         version: 4.2.0(@types/node@16.18.6)
 
+  packages/kit/test/apps/embed:
+    devDependencies:
+      '@sveltejs/kit':
+        specifier: workspace:^
+        version: link:../../..
+      cross-env:
+        specifier: ^7.0.3
+        version: 7.0.3
+      svelte:
+        specifier: ^3.56.0
+        version: 3.56.0
+      svelte-check:
+        specifier: ^3.0.2
+        version: 3.0.2(svelte@3.56.0)
+      typescript:
+        specifier: ^4.9.4
+        version: 4.9.4
+      vite:
+        specifier: ^4.2.0
+        version: 4.2.0(@types/node@16.18.6)
+
   packages/kit/test/apps/options:
     devDependencies:
       '@sveltejs/kit':
@@ -4996,7 +5017,7 @@ packages:
       '@typescript/twoslash': 3.1.0
       '@typescript/vfs': 1.3.4
       shiki: 0.10.1
-      typescript: 4.9.4
+      typescript: 5.0.2
     transitivePeerDependencies:
       - supports-color
     dev: true

From e9dd2559445958c2fdcb4faa2d94bccac2f1f950 Mon Sep 17 00:00:00 2001
From: Simon H <5968653+dummdidumm@users.noreply.github.com>
Date: Mon, 17 Apr 2023 23:27:16 +0200
Subject: [PATCH 57/74] fix: don't include prerendered routes in default
 generateManifest (#9471)

fixes #9463
bug was introduced in #8740
---
 .changeset/old-teachers-shout.md       | 5 +++++
 packages/kit/src/core/adapt/builder.js | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 .changeset/old-teachers-shout.md

diff --git a/.changeset/old-teachers-shout.md b/.changeset/old-teachers-shout.md
new file mode 100644
index 000000000000..e7055bd5ce30
--- /dev/null
+++ b/.changeset/old-teachers-shout.md
@@ -0,0 +1,5 @@
+---
+'@sveltejs/kit': patch
+---
+
+fix: don't include prerendered routes in default generateManifest
diff --git a/packages/kit/src/core/adapt/builder.js b/packages/kit/src/core/adapt/builder.js
index 6176475b5b20..91ecf525f447 100644
--- a/packages/kit/src/core/adapt/builder.js
+++ b/packages/kit/src/core/adapt/builder.js
@@ -162,7 +162,7 @@ export function create_builder({
 				relative_path: relativePath,
 				routes: subset
 					? subset.map((route) => /** @type {import('types').RouteData} */ (lookup.get(route)))
-					: route_data
+					: route_data.filter((route) => prerender_map.get(route.id) !== true)
 			});
 		},
 

From a243aa664bbe4e469b389be8481965521e0ab825 Mon Sep 17 00:00:00 2001
From: Vicente Matus <38754555+vicentematus@users.noreply.github.com>
Date: Mon, 17 Apr 2023 17:30:41 -0400
Subject: [PATCH 58/74] docs: fix js and ts extension when TSToggle is active
 (#9486)

* docs: fix js and ts extension when TSToggle is active

* remove inline-flex

* simplify

* simplify

* exclude certain files/patterns

* deduplicate

* exclude .d.ts files

* simplify

---------

Co-authored-by: Rich Harris <git@rich-harris.dev>
---
 .../10-getting-started/30-project-structure.md   |  4 ++--
 .../docs/20-core-concepts/10-routing.md          |  4 ++--
 documentation/docs/20-core-concepts/20-load.md   |  2 +-
 sites/kit.svelte.dev/src/app.html                |  2 +-
 .../kit.svelte.dev/src/lib/docs/server/index.js  | 16 ++++++++++++++--
 5 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/documentation/docs/10-getting-started/30-project-structure.md b/documentation/docs/10-getting-started/30-project-structure.md
index 3252ac943d67..59b730b2296f 100644
--- a/documentation/docs/10-getting-started/30-project-structure.md
+++ b/documentation/docs/10-getting-started/30-project-structure.md
@@ -54,9 +54,9 @@ The `src` directory contains the meat of your project. Everything except `src/ro
 - `hooks.server.js` contains your server [hooks](/docs/hooks)
 - `service-worker.js` contains your [service worker](/docs/service-workers)
 
-You can use `.ts` files instead of `.js` files, if using TypeScript.
+(Whether the project contains `.js` or `.ts` files depends on whether you opt to use TypeScript when you create your project. You can switch between JavaScript and TypeScript in the documentation using the toggle at the bottom of this page.)
 
-If you added [Vitest](https://vitest.dev) when you set up your project, your unit tests will live in the `src` directory with a `.test.js` (or `.test.ts`) extension.
+If you added [Vitest](https://vitest.dev) when you set up your project, your unit tests will live in the `src` directory with a `.test.js` extension.
 
 ### static
 
diff --git a/documentation/docs/20-core-concepts/10-routing.md b/documentation/docs/20-core-concepts/10-routing.md
index d18496b3c9df..4f10d26c36f0 100644
--- a/documentation/docs/20-core-concepts/10-routing.md
+++ b/documentation/docs/20-core-concepts/10-routing.md
@@ -46,7 +46,7 @@ A `+page.svelte` component defines a page of your app. By default, pages are ren
 
 ### +page.js
 
-Often, a page will need to load some data before it can be rendered. For this, we add a `+page.js` (or `+page.ts`, if you're TypeScript-inclined) module that exports a `load` function:
+Often, a page will need to load some data before it can be rendered. For this, we add a `+page.js` module that exports a `load` function:
 
 ```js
 /// file: src/routes/blog/[slug]/+page.js
@@ -248,7 +248,7 @@ Like `+layout.js`, `+layout.server.js` can export [page options](page-options) 
 
 ## +server
 
-As well as pages, you can define routes with a `+server.js` file (sometimes referred to as an 'API route' or an 'endpoint'), which gives you full control over the response. Your `+server.js` file (or `+server.ts`) exports functions corresponding to HTTP verbs like `GET`, `POST`, `PATCH`, `PUT`, `DELETE`, and `OPTIONS` that take a `RequestEvent` argument and return a [`Response`](https://developer.mozilla.org/en-US/docs/Web/API/Response) object.
+As well as pages, you can define routes with a `+server.js` file (sometimes referred to as an 'API route' or an 'endpoint'), which gives you full control over the response. Your `+server.js` file exports functions corresponding to HTTP verbs like `GET`, `POST`, `PATCH`, `PUT`, `DELETE`, and `OPTIONS` that take a `RequestEvent` argument and return a [`Response`](https://developer.mozilla.org/en-US/docs/Web/API/Response) object.
 
 For example we could create an `/api/random-number` route with a `GET` handler:
 
diff --git a/documentation/docs/20-core-concepts/20-load.md b/documentation/docs/20-core-concepts/20-load.md
index f8937247e465..3e134438ebd7 100644
--- a/documentation/docs/20-core-concepts/20-load.md
+++ b/documentation/docs/20-core-concepts/20-load.md
@@ -6,7 +6,7 @@ Before a [`+page.svelte`](routing#page-page-svelte) component (and its containin
 
 ## Page data
 
-A `+page.svelte` file can have a sibling `+page.js` (or `+page.ts`) that exports a `load` function, the return value of which is available to the page via the `data` prop:
+A `+page.svelte` file can have a sibling `+page.js` that exports a `load` function, the return value of which is available to the page via the `data` prop:
 
 ```js
 /// file: src/routes/blog/[slug]/+page.js
diff --git a/sites/kit.svelte.dev/src/app.html b/sites/kit.svelte.dev/src/app.html
index 737ddc0507e2..4914bbafe2a0 100644
--- a/sites/kit.svelte.dev/src/app.html
+++ b/sites/kit.svelte.dev/src/app.html
@@ -24,7 +24,7 @@
 				display: none;
 			}
 			.prefers-ts .ts-version {
-				display: block;
+				display: inline;
 			}
 			.no-js .ts-toggle {
 				display: none;
diff --git a/sites/kit.svelte.dev/src/lib/docs/server/index.js b/sites/kit.svelte.dev/src/lib/docs/server/index.js
index d9b059d83b24..a3f69404a173 100644
--- a/sites/kit.svelte.dev/src/lib/docs/server/index.js
+++ b/sites/kit.svelte.dev/src/lib/docs/server/index.js
@@ -56,12 +56,23 @@ modules.forEach((module) => {
 		type_links.set(type.name, link);
 	});
 });
+
 /** @param {string} html */
 function replace_blank_lines(html) {
 	// preserve blank lines in output (maybe there's a more correct way to do this?)
 	return html.replaceAll(/<div class='line'>(&nbsp;)?<\/div>/g, '<div class="line">\n</div>');
 }
 
+function dynamic_extensions(text) {
+	if (text === 'svelte.config.js') return text;
+
+	return text.replace(/^(\S+)\.(js|ts)$/, (match, $1) => {
+		if (match.endsWith('.d.ts')) return match;
+		if ($1 === 'svelte.config') return match;
+		return `${$1}<span class="js-version">.js</span><span class="ts-version">.ts</span>`;
+	});
+}
+
 /**
  * @param {string} file
  */
@@ -307,7 +318,7 @@ export async function read_file(file) {
 		codespan: (text) => {
 			return (
 				'<code>' +
-				text.replace(type_regex, (match, prefix, name) => {
+				dynamic_extensions(text).replace(type_regex, (match, prefix, name) => {
 					const link = `<a href="${type_links.get(name)}">${name}</a>`;
 					return `${prefix || ''}${link}`;
 				}) +
@@ -385,7 +396,8 @@ function parse({ file, body, code, codespan }) {
 				throw new Error(`Unexpected <h${level}> in ${file}`);
 			}
 
-			return `<h${level} id="${slug}">${html}<a href="#${slug}" class="permalink"><span class="visually-hidden">permalink</span></a></h${level}>`;
+			return `<h${level} id="${slug}">${dynamic_extensions(html)}
+				<a href="#${slug}" class="permalink"><span class="visually-hidden">permalink</span></a></h${level}>`;
 		},
 		code: (source, language) => code(source, language, current),
 		codespan

From f427d473b3848b4c17ca6392ab8298d804cf6723 Mon Sep 17 00:00:00 2001
From: Simon H <5968653+dummdidumm@users.noreply.github.com>
Date: Tue, 18 Apr 2023 00:44:57 +0200
Subject: [PATCH 59/74] fix: construct correct pathname for isr from route with
 nested params (#9470)

* fix: constructor correct pathname for isr from route with nested params

fixes #9459

* remove extraneous slashes

* typo

* remove logging

---------

Co-authored-by: Rich Harris <git@rich-harris.dev>
---
 .changeset/heavy-news-argue.md              |  5 +++
 packages/adapter-vercel/files/serverless.js |  4 ++-
 packages/adapter-vercel/index.js            |  9 ++---
 packages/adapter-vercel/package.json        |  7 ++--
 packages/adapter-vercel/test/utils.spec.js  | 38 +++++++++++++++++++++
 packages/adapter-vercel/utils.js            | 23 +++++++++++++
 pnpm-lock.yaml                              |  3 ++
 7 files changed, 79 insertions(+), 10 deletions(-)
 create mode 100644 .changeset/heavy-news-argue.md
 create mode 100644 packages/adapter-vercel/test/utils.spec.js
 create mode 100644 packages/adapter-vercel/utils.js

diff --git a/.changeset/heavy-news-argue.md b/.changeset/heavy-news-argue.md
new file mode 100644
index 000000000000..31dc77f73d81
--- /dev/null
+++ b/.changeset/heavy-news-argue.md
@@ -0,0 +1,5 @@
+---
+'@sveltejs/adapter-vercel': patch
+---
+
+fix: construct correct pathname for isr from route with nested params
diff --git a/packages/adapter-vercel/files/serverless.js b/packages/adapter-vercel/files/serverless.js
index e2f506c22859..5a6c2f64e2fd 100644
--- a/packages/adapter-vercel/files/serverless.js
+++ b/packages/adapter-vercel/files/serverless.js
@@ -22,10 +22,12 @@ export default async (req, res) => {
 		const [path, search] = req.url.split('?');
 
 		const params = new URLSearchParams(search);
-		const pathname = params.get('__pathname');
+		let pathname = params.get('__pathname');
 
 		if (pathname) {
 			params.delete('__pathname');
+			// Optional routes' pathname replacements look like `/foo/$1/bar` which means we could end up with an url like /foo//bar
+			pathname = pathname.replace(/\/+/g, '/');
 			req.url = `${pathname}${path.endsWith(DATA_SUFFIX) ? DATA_SUFFIX : ''}?${params}`;
 		}
 	}
diff --git a/packages/adapter-vercel/index.js b/packages/adapter-vercel/index.js
index 60851cc6bd47..c947d80bab12 100644
--- a/packages/adapter-vercel/index.js
+++ b/packages/adapter-vercel/index.js
@@ -3,6 +3,7 @@ import path from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { nodeFileTrace } from '@vercel/nft';
 import esbuild from 'esbuild';
+import { get_pathname } from './utils.js';
 
 const VALID_RUNTIMES = ['edge', 'nodejs16.x', 'nodejs18.x'];
 
@@ -292,13 +293,7 @@ const plugin = function (defaults = {}) {
 					fs.symlinkSync(relative, `${base}.func`);
 					fs.symlinkSync(`../${relative}`, `${base}/__data.json.func`);
 
-					let i = 1;
-					const pathname = route.segments
-						.map((segment) => {
-							return segment.dynamic ? `$${i++}` : segment.content;
-						})
-						.join('/');
-
+					const pathname = get_pathname(route);
 					const json = JSON.stringify(isr, null, '\t');
 
 					write(`${base}.prerender-config.json`, json);
diff --git a/packages/adapter-vercel/package.json b/packages/adapter-vercel/package.json
index 075380f038fc..b631b947771b 100644
--- a/packages/adapter-vercel/package.json
+++ b/packages/adapter-vercel/package.json
@@ -21,12 +21,14 @@
 	"files": [
 		"files",
 		"index.js",
+		"utils.js",
 		"index.d.ts"
 	],
 	"scripts": {
 		"lint": "prettier --check . --config ../../.prettierrc --ignore-path .gitignore",
 		"format": "pnpm lint --write",
-		"check": "tsc"
+		"check": "tsc",
+		"test": "uvu test .spec.js"
 	},
 	"dependencies": {
 		"@vercel/nft": "^0.22.1",
@@ -35,7 +37,8 @@
 	"devDependencies": {
 		"@sveltejs/kit": "workspace:^",
 		"@types/node": "^16.18.6",
-		"typescript": "^4.9.4"
+		"typescript": "^4.9.4",
+		"uvu": "^0.5.6"
 	},
 	"peerDependencies": {
 		"@sveltejs/kit": "^1.5.0"
diff --git a/packages/adapter-vercel/test/utils.spec.js b/packages/adapter-vercel/test/utils.spec.js
new file mode 100644
index 000000000000..980d2687d47b
--- /dev/null
+++ b/packages/adapter-vercel/test/utils.spec.js
@@ -0,0 +1,38 @@
+import { test } from 'uvu';
+import * as assert from 'uvu/assert';
+import { get_pathname } from '../utils.js';
+
+/**
+ * @param {import('@sveltejs/kit').RouteDefinition<any>['segments']} segments
+ * @param {string} expected
+ */
+function run_get_pathname_test(segments, expected) {
+	const route = /** @type {import('@sveltejs/kit').RouteDefinition<any>} */ ({ segments });
+	assert.equal(get_pathname(route), expected);
+}
+
+test('get_pathname for simple route', () => {
+	run_get_pathname_test([{ content: 'foo', dynamic: false, rest: false }], 'foo');
+});
+
+test('get_pathname for route with parameters', () => {
+	run_get_pathname_test(
+		[
+			{ content: 'foo', dynamic: false, rest: false },
+			{ content: '[bar]', dynamic: true, rest: false }
+		],
+		'foo/$1'
+	);
+});
+
+test('get_pathname for route with parameters within segment', () => {
+	run_get_pathname_test(
+		[
+			{ content: 'foo-[bar]', dynamic: true, rest: false },
+			{ content: '[baz]-buz', dynamic: true, rest: false }
+		],
+		'foo-$1/$2-buz'
+	);
+});
+
+test.run();
diff --git a/packages/adapter-vercel/utils.js b/packages/adapter-vercel/utils.js
new file mode 100644
index 000000000000..de10073e8846
--- /dev/null
+++ b/packages/adapter-vercel/utils.js
@@ -0,0 +1,23 @@
+/** @param {import("@sveltejs/kit").RouteDefinition<any>} route */
+export function get_pathname(route) {
+	let i = 1;
+
+	return route.segments
+		.map((segment) => {
+			if (!segment.dynamic) {
+				return segment.content;
+			}
+
+			const parts = segment.content.split(/\[(.+?)\](?!\])/);
+			return parts
+				.map((content, j) => {
+					if (j % 2) {
+						return `$${i++}`;
+					} else {
+						return content;
+					}
+				})
+				.join('');
+		})
+		.join('/');
+}
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 86bbb1fff966..d5c0d788705b 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -274,6 +274,9 @@ importers:
       typescript:
         specifier: ^4.9.4
         version: 4.9.4
+      uvu:
+        specifier: ^0.5.6
+        version: 0.5.6
 
   packages/amp:
     dependencies:

From 0311c4e6b3f80c4453a1ddf0253a1be4a80023da Mon Sep 17 00:00:00 2001
From: Puru Vijay <47742487+PuruVJ@users.noreply.github.com>
Date: Tue, 18 Apr 2023 04:24:32 +0530
Subject: [PATCH 60/74] feat: Bump site-kit to 5.0 (#9695)

* push

* Use tryTerminal

* Update site-kit, fix legacy issue
---
 pnpm-lock.yaml                                | 58 +++++------
 sites/kit.svelte.dev/package.json             |  2 +-
 .../src/routes/home/Deployment.svelte         |  3 +-
 .../src/routes/home/Hero.svelte               |  2 +-
 .../kit.svelte.dev/src/routes/home/Try.svelte | 97 +------------------
 sites/kit.svelte.dev/tsconfig.json            |  3 +-
 6 files changed, 36 insertions(+), 129 deletions(-)

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index d5c0d788705b..3a3d1b62cf4b 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -21,7 +21,7 @@ importers:
         version: 1.1.0
       '@typescript-eslint/eslint-plugin':
         specifier: ^5.53.0
-        version: 5.53.0(@typescript-eslint/parser@5.58.0)(eslint@8.33.0)(typescript@4.9.4)
+        version: 5.53.0(@typescript-eslint/parser@5.59.0)(eslint@8.33.0)(typescript@4.9.4)
       eslint:
         specifier: ^8.33.0
         version: 8.33.0
@@ -962,8 +962,8 @@ importers:
         specifier: workspace:^
         version: link:../../packages/kit
       '@sveltejs/site-kit':
-        specifier: 4.1.1
-        version: 4.1.1(@sveltejs/kit@packages+kit)(svelte@3.56.0)
+        specifier: 5.0.3
+        version: 5.0.3(@sveltejs/kit@packages+kit)(svelte@3.56.0)
       '@types/d3-geo':
         specifier: ^3.0.2
         version: 3.0.2
@@ -1852,13 +1852,14 @@ packages:
       picomatch: 2.3.1
       rollup: 3.7.0
 
-  /@sveltejs/site-kit@4.1.1(@sveltejs/kit@packages+kit)(svelte@3.56.0):
-    resolution: {integrity: sha512-UJqFI++1R4LJ1ULcA0b19qJmFuw87EcpPfjGZ8H02EnVQHgPjJWwzOlyjPesc0+z4vuyTKlDuW1sR2mdUSPBPw==}
+  /@sveltejs/site-kit@5.0.3(@sveltejs/kit@packages+kit)(svelte@3.56.0):
+    resolution: {integrity: sha512-HA/L3lnsKmLVPdipaxS+MRgcExaF0WxFoHWS/TDhS7kwFcY6ds8Fp10A4Jd7lt2cv+CsyQviWFD2hA0lwE8NOA==}
     peerDependencies:
       '@sveltejs/kit': ^1.0.0
       svelte: ^3.54.0
     dependencies:
       '@sveltejs/kit': link:packages/kit
+      esm-env: 1.0.0
       svelte: 3.56.0
       svelte-local-storage-store: 0.4.0(svelte@3.56.0)
     dev: true
@@ -2013,7 +2014,7 @@ packages:
       '@types/node': 16.18.6
     dev: true
 
-  /@typescript-eslint/eslint-plugin@5.53.0(@typescript-eslint/parser@5.58.0)(eslint@8.33.0)(typescript@4.9.4):
+  /@typescript-eslint/eslint-plugin@5.53.0(@typescript-eslint/parser@5.59.0)(eslint@8.33.0)(typescript@4.9.4):
     resolution: {integrity: sha512-alFpFWNucPLdUOySmXCJpzr6HKC3bu7XooShWM+3w/EL6J2HIoB2PFxpLnq4JauWVk6DiVeNKzQlFEaE+X9sGw==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
@@ -2024,7 +2025,7 @@ packages:
       typescript:
         optional: true
     dependencies:
-      '@typescript-eslint/parser': 5.58.0(eslint@8.33.0)(typescript@4.9.4)
+      '@typescript-eslint/parser': 5.59.0(eslint@8.33.0)(typescript@4.9.4)
       '@typescript-eslint/scope-manager': 5.53.0
       '@typescript-eslint/type-utils': 5.53.0(eslint@8.33.0)(typescript@4.9.4)
       '@typescript-eslint/utils': 5.53.0(eslint@8.33.0)(typescript@4.9.4)
@@ -2041,8 +2042,8 @@ packages:
       - supports-color
     dev: true
 
-  /@typescript-eslint/parser@5.58.0(eslint@8.33.0)(typescript@4.9.4):
-    resolution: {integrity: sha512-ixaM3gRtlfrKzP8N6lRhBbjTow1t6ztfBvQNGuRM8qH1bjFFXIJ35XY+FC0RRBKn3C6cT+7VW1y8tNm7DwPHDQ==}
+  /@typescript-eslint/parser@5.59.0(eslint@8.33.0)(typescript@4.9.4):
+    resolution: {integrity: sha512-qK9TZ70eJtjojSUMrrEwA9ZDQ4N0e/AuoOIgXuNBorXYcBDk397D2r5MIe1B3cok/oCtdNC5j+lUUpVB+Dpb+w==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
       eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
@@ -2051,9 +2052,9 @@ packages:
       typescript:
         optional: true
     dependencies:
-      '@typescript-eslint/scope-manager': 5.58.0
-      '@typescript-eslint/types': 5.58.0
-      '@typescript-eslint/typescript-estree': 5.58.0(typescript@4.9.4)
+      '@typescript-eslint/scope-manager': 5.59.0
+      '@typescript-eslint/types': 5.59.0
+      '@typescript-eslint/typescript-estree': 5.59.0(typescript@4.9.4)
       debug: 4.3.4
       eslint: 8.33.0
       typescript: 4.9.4
@@ -2069,12 +2070,12 @@ packages:
       '@typescript-eslint/visitor-keys': 5.53.0
     dev: true
 
-  /@typescript-eslint/scope-manager@5.58.0:
-    resolution: {integrity: sha512-b+w8ypN5CFvrXWQb9Ow9T4/6LC2MikNf1viLkYTiTbkQl46CnR69w7lajz1icW0TBsYmlpg+mRzFJ4LEJ8X9NA==}
+  /@typescript-eslint/scope-manager@5.59.0:
+    resolution: {integrity: sha512-tsoldKaMh7izN6BvkK6zRMINj4Z2d6gGhO2UsI8zGZY3XhLq1DndP3Ycjhi1JwdwPRwtLMW4EFPgpuKhbCGOvQ==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dependencies:
-      '@typescript-eslint/types': 5.58.0
-      '@typescript-eslint/visitor-keys': 5.58.0
+      '@typescript-eslint/types': 5.59.0
+      '@typescript-eslint/visitor-keys': 5.59.0
     dev: true
 
   /@typescript-eslint/type-utils@5.53.0(eslint@8.33.0)(typescript@4.9.4):
@@ -2102,8 +2103,8 @@ packages:
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dev: true
 
-  /@typescript-eslint/types@5.58.0:
-    resolution: {integrity: sha512-JYV4eITHPzVQMnHZcYJXl2ZloC7thuUHrcUmxtzvItyKPvQ50kb9QXBkgNAt90OYMqwaodQh2kHutWZl1fc+1g==}
+  /@typescript-eslint/types@5.59.0:
+    resolution: {integrity: sha512-yR2h1NotF23xFFYKHZs17QJnB51J/s+ud4PYU4MqdZbzeNxpgUr05+dNeCN/bb6raslHvGdd6BFCkVhpPk/ZeA==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dev: true
 
@@ -2128,8 +2129,8 @@ packages:
       - supports-color
     dev: true
 
-  /@typescript-eslint/typescript-estree@5.58.0(typescript@4.9.4):
-    resolution: {integrity: sha512-cRACvGTodA+UxnYM2uwA2KCwRL7VAzo45syNysqlMyNyjw0Z35Icc9ihPJZjIYuA5bXJYiJ2YGUB59BqlOZT1Q==}
+  /@typescript-eslint/typescript-estree@5.59.0(typescript@4.9.4):
+    resolution: {integrity: sha512-sUNnktjmI8DyGzPdZ8dRwW741zopGxltGs/SAPgGL/AAgDpiLsCFLcMNSpbfXfmnNeHmK9h3wGmCkGRGAoUZAg==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
       typescript: '*'
@@ -2137,12 +2138,12 @@ packages:
       typescript:
         optional: true
     dependencies:
-      '@typescript-eslint/types': 5.58.0
-      '@typescript-eslint/visitor-keys': 5.58.0
+      '@typescript-eslint/types': 5.59.0
+      '@typescript-eslint/visitor-keys': 5.59.0
       debug: 4.3.4
       globby: 11.1.0
       is-glob: 4.0.3
-      semver: 7.4.0
+      semver: 7.5.0
       tsutils: 3.21.0(typescript@4.9.4)
       typescript: 4.9.4
     transitivePeerDependencies:
@@ -2177,11 +2178,11 @@ packages:
       eslint-visitor-keys: 3.3.0
     dev: true
 
-  /@typescript-eslint/visitor-keys@5.58.0:
-    resolution: {integrity: sha512-/fBraTlPj0jwdyTwLyrRTxv/3lnU2H96pNTVM6z3esTWLtA5MZ9ghSMJ7Rb+TtUAdtEw9EyJzJ0EydIMKxQ9gA==}
+  /@typescript-eslint/visitor-keys@5.59.0:
+    resolution: {integrity: sha512-qZ3iXxQhanchCeaExlKPV3gDQFxMUmU35xfd5eCXB6+kUw1TUAbIy2n7QIrwz9s98DQLzNWyHp61fY0da4ZcbA==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dependencies:
-      '@typescript-eslint/types': 5.58.0
+      '@typescript-eslint/types': 5.59.0
       eslint-visitor-keys: 3.4.0
     dev: true
 
@@ -3136,7 +3137,6 @@ packages:
 
   /esm-env@1.0.0:
     resolution: {integrity: sha512-Cf6VksWPsTuW01vU9Mk/3vRue91Zevka5SjyNf3nEpokFRuqt/KjUQoGAwq9qMmhpLTHmXzSIrFRw8zxWzmFBA==}
-    dev: false
 
   /espree@9.4.1:
     resolution: {integrity: sha512-XwctdmTO6SIvCzd9810yyNzIrOrqNYV9Koizx4C/mRhf9uq0o4yHoCEU/670pOxOL/MSraektvSAji79kX90Vg==}
@@ -4960,8 +4960,8 @@ packages:
     dependencies:
       lru-cache: 6.0.0
 
-  /semver@7.4.0:
-    resolution: {integrity: sha512-RgOxM8Mw+7Zus0+zcLEUn8+JfoLpj/huFTItQy2hsM4khuC1HYRDp0cU482Ewn/Fcy6bCjufD8vAj7voC66KQw==}
+  /semver@7.5.0:
+    resolution: {integrity: sha512-+XC0AD/R7Q2mPSRuy2Id0+CGTZ98+8f+KvwirxOKIEyid+XSx6HbC63p+O4IndTHuX5Z+JxQ0TghCkO5Cg/2HA==}
     engines: {node: '>=10'}
     hasBin: true
     dependencies:
diff --git a/sites/kit.svelte.dev/package.json b/sites/kit.svelte.dev/package.json
index 525b23db4a65..fc526c05c3ea 100644
--- a/sites/kit.svelte.dev/package.json
+++ b/sites/kit.svelte.dev/package.json
@@ -14,7 +14,7 @@
 		"@sveltejs/adapter-vercel": "workspace:^",
 		"@sveltejs/amp": "workspace:^",
 		"@sveltejs/kit": "workspace:^",
-		"@sveltejs/site-kit": "4.1.1",
+		"@sveltejs/site-kit": "5.0.3",
 		"@types/d3-geo": "^3.0.2",
 		"@types/node": "^16.18.6",
 		"flexsearch": "^0.7.31",
diff --git a/sites/kit.svelte.dev/src/routes/home/Deployment.svelte b/sites/kit.svelte.dev/src/routes/home/Deployment.svelte
index ed2e703a2a43..c4100f3ac03b 100644
--- a/sites/kit.svelte.dev/src/routes/home/Deployment.svelte
+++ b/sites/kit.svelte.dev/src/routes/home/Deployment.svelte
@@ -1,5 +1,5 @@
 <script>
-	import { Section } from '@sveltejs/site-kit/components';
+	import { Section, theme } from '@sveltejs/site-kit/components';
 	import html5 from './logos/html5.svg';
 	import node from './logos/node.svg';
 	import vercel from './logos/vercel.svg';
@@ -10,7 +10,6 @@
 	import lambda from './logos/lambda.svg';
 	import azure from './logos/azure.svg';
 	import plus from '$lib/icons/plus.svg';
-	import { theme } from '@sveltejs/site-kit/theme';
 </script>
 
 <Section --background="var(--background-1)">
diff --git a/sites/kit.svelte.dev/src/routes/home/Hero.svelte b/sites/kit.svelte.dev/src/routes/home/Hero.svelte
index 1a6c556692aa..d91aa2fa2f42 100644
--- a/sites/kit.svelte.dev/src/routes/home/Hero.svelte
+++ b/sites/kit.svelte.dev/src/routes/home/Hero.svelte
@@ -120,7 +120,7 @@
 			padding: calc(10rem + var(--sk-nav-height)) var(--sk-page-padding-side) 16rem;
 		}
 		.hero-contents {
-			max-width: calc(120rem - 2 * var(--side-nav));
+			max-width: calc(120rem - 2 * var(--sk-page-padding-side));
 			padding-bottom: 0rem;
 		}
 
diff --git a/sites/kit.svelte.dev/src/routes/home/Try.svelte b/sites/kit.svelte.dev/src/routes/home/Try.svelte
index cea9e31e0969..63720bb8d7a8 100644
--- a/sites/kit.svelte.dev/src/routes/home/Try.svelte
+++ b/sites/kit.svelte.dev/src/routes/home/Try.svelte
@@ -1,5 +1,5 @@
 <script>
-	import { Section } from '@sveltejs/site-kit/components';
+	import { Section, TryTerminal } from '@sveltejs/site-kit/components';
 </script>
 
 <Section --background="var(--background-2)">
@@ -27,22 +27,7 @@
 			see for yourself
 		</h2>
 		<div class="try">
-			<div class="terminal">
-				<div class="chrome">
-					<span class="red dot" />
-					<span class="yellow dot" />
-					<span class="green dot" />
-					<span class="title">terminal</span>
-				</div>
-				<pre><code
-						><span class="line"
-							>npm create <span class="orange-highlight">svelte</span>@latest my-app</span
-						>
-<span class="line">cd my-app</span>
-<span class="line">npm install</span>
-<span class="line">npm run dev -- --open</span></code
-					></pre>
-			</div>
+			<TryTerminal />
 		</div>
 	</div>
 	<p class="create-an-app">
@@ -65,63 +50,6 @@
 		color: white;
 	}
 
-	.terminal {
-		background: rgba(0, 0, 0, 0.7);
-		margin: 0;
-		border-radius: var(--sk-border-radius);
-		overflow: hidden;
-	}
-
-	.terminal .chrome {
-		position: relative;
-		background: var(--sk-back-3);
-		color: var(--sk-text-3);
-		display: flex;
-		align-items: center;
-		font-size: var(--sk-text-s);
-		padding: 1rem;
-		gap: 1rem;
-	}
-
-	.terminal .dot {
-		width: 1rem;
-		height: 1rem;
-		border-radius: 50%;
-	}
-
-	.red {
-		background-color: hsl(15, 100%, 65%);
-	}
-
-	.yellow {
-		background-color: hsl(48, 100%, 67%);
-	}
-
-	.green {
-		background-color: hsl(141, 53%, 53%);
-	}
-
-	.title {
-		position: absolute;
-		display: flex;
-		left: 0;
-		top: 0;
-		width: 100%;
-		height: 100%;
-		align-items: center;
-		justify-content: center;
-	}
-
-	.terminal pre {
-		padding: 1em;
-		font-size: var(--sk-text-xs);
-	}
-
-	.line::before {
-		content: '$ ';
-		opacity: 0.3;
-	}
-
 	h2 {
 		color: white;
 		font-size: var(--sk-text-xl);
@@ -133,15 +61,6 @@
 		display: none;
 	}
 
-	pre code {
-		color: white;
-		font-size: 1em;
-	}
-
-	.orange-highlight {
-		color: hsl(15, 100%, 65%);
-	}
-
 	.create-an-app {
 		color: white;
 	}
@@ -151,18 +70,6 @@
 		text-decoration: underline;
 	}
 
-	@media (min-width: 440px) {
-		.terminal pre {
-			font-size: var(--sk-text-s);
-		}
-	}
-
-	@media (min-width: 1080px) {
-		.terminal pre {
-			font-size: var(--sk-text-m);
-		}
-	}
-
 	@media (min-width: 900px) {
 		svg {
 			display: initial;
diff --git a/sites/kit.svelte.dev/tsconfig.json b/sites/kit.svelte.dev/tsconfig.json
index 50bed1153090..aec59b8b3396 100644
--- a/sites/kit.svelte.dev/tsconfig.json
+++ b/sites/kit.svelte.dev/tsconfig.json
@@ -2,7 +2,8 @@
 	"compilerOptions": {
 		"allowJs": true,
 		"checkJs": true,
-		"allowSyntheticDefaultImports": true
+		"allowSyntheticDefaultImports": true,
+		"moduleResolution": "bundler"
 	},
 	"extends": "./.svelte-kit/tsconfig.json"
 }

From c3f2cb1e62699360c4856d2901ad0e44cced8a61 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 17 Apr 2023 18:55:17 -0400
Subject: [PATCH 61/74] Version Packages (#9689)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 .changeset/curly-items-speak.md      |  5 -----
 .changeset/flat-trainers-fold.md     |  5 -----
 .changeset/heavy-news-argue.md       |  5 -----
 .changeset/late-toes-cry.md          |  5 -----
 .changeset/old-teachers-shout.md     |  5 -----
 .changeset/tall-bags-sparkle.md      |  5 -----
 packages/adapter-vercel/CHANGELOG.md |  9 +++++++++
 packages/adapter-vercel/package.json |  2 +-
 packages/kit/CHANGELOG.md            | 14 ++++++++++++++
 packages/kit/package.json            |  2 +-
 10 files changed, 25 insertions(+), 32 deletions(-)
 delete mode 100644 .changeset/curly-items-speak.md
 delete mode 100644 .changeset/flat-trainers-fold.md
 delete mode 100644 .changeset/heavy-news-argue.md
 delete mode 100644 .changeset/late-toes-cry.md
 delete mode 100644 .changeset/old-teachers-shout.md
 delete mode 100644 .changeset/tall-bags-sparkle.md

diff --git a/.changeset/curly-items-speak.md b/.changeset/curly-items-speak.md
deleted file mode 100644
index e1702e4ef210..000000000000
--- a/.changeset/curly-items-speak.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@sveltejs/kit': patch
----
-
-fix: provide better error when prerendered routes conflict with each other
diff --git a/.changeset/flat-trainers-fold.md b/.changeset/flat-trainers-fold.md
deleted file mode 100644
index ce979520e626..000000000000
--- a/.changeset/flat-trainers-fold.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@sveltejs/kit': patch
----
-
-fix: prevent false positive warnings for fetch in Firefox and Safari
diff --git a/.changeset/heavy-news-argue.md b/.changeset/heavy-news-argue.md
deleted file mode 100644
index 31dc77f73d81..000000000000
--- a/.changeset/heavy-news-argue.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@sveltejs/adapter-vercel': patch
----
-
-fix: construct correct pathname for isr from route with nested params
diff --git a/.changeset/late-toes-cry.md b/.changeset/late-toes-cry.md
deleted file mode 100644
index 8df9c490a341..000000000000
--- a/.changeset/late-toes-cry.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@sveltejs/kit': patch
----
-
-fix: allow embedding two pages generated into the same page in "embedded" mode
diff --git a/.changeset/old-teachers-shout.md b/.changeset/old-teachers-shout.md
deleted file mode 100644
index e7055bd5ce30..000000000000
--- a/.changeset/old-teachers-shout.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@sveltejs/kit': patch
----
-
-fix: don't include prerendered routes in default generateManifest
diff --git a/.changeset/tall-bags-sparkle.md b/.changeset/tall-bags-sparkle.md
deleted file mode 100644
index 1b66de3f7e35..000000000000
--- a/.changeset/tall-bags-sparkle.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@sveltejs/kit': patch
----
-
-fix: better error messages for handleable prerender failures
diff --git a/packages/adapter-vercel/CHANGELOG.md b/packages/adapter-vercel/CHANGELOG.md
index 7c6c239da650..4aaeca189477 100644
--- a/packages/adapter-vercel/CHANGELOG.md
+++ b/packages/adapter-vercel/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @sveltejs/adapter-vercel
 
+## 2.4.2
+
+### Patch Changes
+
+- fix: construct correct pathname for isr from route with nested params ([#9470](https://github.com/sveltejs/kit/pull/9470))
+
+- Updated dependencies [[`84a5250d`](https://github.com/sveltejs/kit/commit/84a5250d5fe80a87eb7df5569e76a1dde857aa82), [`95e95828`](https://github.com/sveltejs/kit/commit/95e95828f444a35ca3f71eb1350c6630895c02c9), [`367067f5`](https://github.com/sveltejs/kit/commit/367067f547bb78c61f511e88b9361632862cb4ee), [`e9dd2559`](https://github.com/sveltejs/kit/commit/e9dd2559445958c2fdcb4faa2d94bccac2f1f950), [`ae2f4a8c`](https://github.com/sveltejs/kit/commit/ae2f4a8caacfb671db159f3cdce0894beb485b4f)]:
+  - @sveltejs/kit@1.15.7
+
 ## 2.4.1
 
 ### Patch Changes
diff --git a/packages/adapter-vercel/package.json b/packages/adapter-vercel/package.json
index b631b947771b..ceccde2de687 100644
--- a/packages/adapter-vercel/package.json
+++ b/packages/adapter-vercel/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@sveltejs/adapter-vercel",
-	"version": "2.4.1",
+	"version": "2.4.2",
 	"description": "A SvelteKit adapter that creates a Vercel app",
 	"repository": {
 		"type": "git",
diff --git a/packages/kit/CHANGELOG.md b/packages/kit/CHANGELOG.md
index 993983f7b963..992a23181097 100644
--- a/packages/kit/CHANGELOG.md
+++ b/packages/kit/CHANGELOG.md
@@ -1,5 +1,19 @@
 # @sveltejs/kit
 
+## 1.15.7
+
+### Patch Changes
+
+- fix: provide better error when prerendered routes conflict with each other ([#9692](https://github.com/sveltejs/kit/pull/9692))
+
+- fix: prevent false positive warnings for fetch in Firefox and Safari ([#9680](https://github.com/sveltejs/kit/pull/9680))
+
+- fix: allow embedding two pages generated into the same page in "embedded" mode ([#9610](https://github.com/sveltejs/kit/pull/9610))
+
+- fix: don't include prerendered routes in default generateManifest ([#9471](https://github.com/sveltejs/kit/pull/9471))
+
+- fix: better error messages for handleable prerender failures ([#9621](https://github.com/sveltejs/kit/pull/9621))
+
 ## 1.15.6
 
 ### Patch Changes
diff --git a/packages/kit/package.json b/packages/kit/package.json
index b1104982b87c..569d36129304 100644
--- a/packages/kit/package.json
+++ b/packages/kit/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@sveltejs/kit",
-	"version": "1.15.6",
+	"version": "1.15.7",
 	"description": "The fastest way to build Svelte apps",
 	"repository": {
 		"type": "git",

From 0ff6dcdcd1849286987ebd489f65dc6ac81f3e45 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 17 Apr 2023 19:38:23 -0700
Subject: [PATCH 62/74] chore(deps): update pnpm to v8.3.0 (#9697)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index e160e3c341cf..478e47429f59 100644
--- a/package.json
+++ b/package.json
@@ -41,7 +41,7 @@
 		"tiny-glob": "^0.2.9",
 		"typescript": "^4.9.4"
 	},
-	"packageManager": "pnpm@8.2.0",
+	"packageManager": "pnpm@8.3.0",
 	"engines": {
 		"pnpm": "^8.0.0"
 	},

From c2b3df7bf1a08dfa147e284e22257a09add2e9e1 Mon Sep 17 00:00:00 2001
From: Ben McCann <322311+benmccann@users.noreply.github.com>
Date: Tue, 18 Apr 2023 04:36:51 -0700
Subject: [PATCH 63/74] chore: refactor client build data (#9699)

---
 packages/kit/src/exports/vite/dev/index.js    | 17 +++++-----------
 packages/kit/src/exports/vite/index.js        | 20 +++++++++----------
 .../kit/src/runtime/server/page/render.js     | 10 +++++-----
 packages/kit/types/index.d.ts                 |  7 ++-----
 packages/kit/types/internal.d.ts              |  8 +++++---
 5 files changed, 27 insertions(+), 35 deletions(-)

diff --git a/packages/kit/src/exports/vite/dev/index.js b/packages/kit/src/exports/vite/dev/index.js
index 3a5d0d51e749..e130e77a01b3 100644
--- a/packages/kit/src/exports/vite/dev/index.js
+++ b/packages/kit/src/exports/vite/dev/index.js
@@ -115,18 +115,11 @@ export async function dev(vite, vite_config, svelte_config) {
 			mimeTypes: get_mime_lookup(manifest_data),
 			_: {
 				client: {
-					start: {
-						file: `${runtime_base}/client/start.js`,
-						imports: [],
-						stylesheets: [],
-						fonts: []
-					},
-					app: {
-						file: `${svelte_config.kit.outDir}/generated/client/app.js`,
-						imports: [],
-						stylesheets: [],
-						fonts: []
-					}
+					start: `${runtime_base}/client/start.js`,
+					app: `${svelte_config.kit.outDir}/generated/client/app.js`,
+					imports: [],
+					stylesheets: [],
+					fonts: []
 				},
 				nodes: manifest_data.nodes.map((node, index) => {
 					return async () => {
diff --git a/packages/kit/src/exports/vite/index.js b/packages/kit/src/exports/vite/index.js
index ec3b42b56088..57d794fa2efc 100644
--- a/packages/kit/src/exports/vite/index.js
+++ b/packages/kit/src/exports/vite/index.js
@@ -726,17 +726,17 @@ function kit({ svelte_config }) {
 				/** @type {import('vite').Manifest} */
 				const client_manifest = JSON.parse(read(`${out}/client/${vite_config.build.manifest}`));
 
+				const deps_of = /** @param {string} f */ (f) =>
+					find_deps(client_manifest, posixify(path.relative('.', f)), false);
+				const start = deps_of(`${runtime_directory}/client/start.js`);
+				const app = deps_of(`${kit.outDir}/generated/client-optimized/app.js`);
+
 				build_data.client = {
-					start: find_deps(
-						client_manifest,
-						posixify(path.relative('.', `${runtime_directory}/client/start.js`)),
-						false
-					),
-					app: find_deps(
-						client_manifest,
-						posixify(path.relative('.', `${kit.outDir}/generated/client-optimized/app.js`)),
-						false
-					)
+					start: start.file,
+					app: app.file,
+					imports: [...start.imports, ...app.imports],
+					stylesheets: [...start.stylesheets, ...app.stylesheets],
+					fonts: [...start.fonts, ...app.fonts]
 				};
 
 				const css = output.filter(
diff --git a/packages/kit/src/runtime/server/page/render.js b/packages/kit/src/runtime/server/page/render.js
index 66d9449f1a24..33fc2f8f268a 100644
--- a/packages/kit/src/runtime/server/page/render.js
+++ b/packages/kit/src/runtime/server/page/render.js
@@ -63,9 +63,9 @@ export async function render_response({
 
 	const { client } = manifest._;
 
-	const modulepreloads = new Set([...client.start.imports, ...client.app.imports]);
-	const stylesheets = new Set(client.app.stylesheets);
-	const fonts = new Set(client.app.fonts);
+	const modulepreloads = new Set(client.imports);
+	const stylesheets = new Set(client.stylesheets);
+	const fonts = new Set(client.fonts);
 
 	/** @type {Set<string>} */
 	const link_header_preloads = new Set();
@@ -356,8 +356,8 @@ export async function render_response({
 		}
 
 		blocks.push(`Promise.all([
-						import(${s(prefixed(client.start.file))}),
-						import(${s(prefixed(client.app.file))})
+						import(${s(prefixed(client.start))}),
+						import(${s(prefixed(client.app))})
 					]).then(([kit, app]) => {
 						kit.start(${args.join(', ')});
 					});`);
diff --git a/packages/kit/types/index.d.ts b/packages/kit/types/index.d.ts
index e3af084e6261..c24174f45862 100644
--- a/packages/kit/types/index.d.ts
+++ b/packages/kit/types/index.d.ts
@@ -18,7 +18,7 @@ import {
 	RouteSegment,
 	UniqueInterface
 } from './private.js';
-import { AssetDependencies, SSRNodeLoader, SSRRoute, ValidatedConfig } from './internal.js';
+import { BuildData, SSRNodeLoader, SSRRoute, ValidatedConfig } from './internal.js';
 
 export { PrerenderOption } from './private.js';
 
@@ -1059,10 +1059,7 @@ export interface SSRManifest {
 
 	/** private fields */
 	_: {
-		client: {
-			start: AssetDependencies;
-			app: AssetDependencies;
-		};
+		client: NonNullable<BuildData['client']>;
 		nodes: SSRNodeLoader[];
 		routes: SSRRoute[];
 		matchers(): Promise<Record<string, ParamMatcher>>;
diff --git a/packages/kit/types/internal.d.ts b/packages/kit/types/internal.d.ts
index 9a7c57594193..d85545cb58f0 100644
--- a/packages/kit/types/internal.d.ts
+++ b/packages/kit/types/internal.d.ts
@@ -10,7 +10,6 @@ import {
 	ResolveOptions,
 	Server,
 	ServerInitOptions,
-	SSRManifest,
 	HandleFetch,
 	Actions,
 	HandleClientError
@@ -55,8 +54,11 @@ export interface BuildData {
 	manifest_data: ManifestData;
 	service_worker: string | null;
 	client: {
-		start: AssetDependencies;
-		app: AssetDependencies;
+		start: string;
+		app: string;
+		imports: string[];
+		stylesheets: string[];
+		fonts: string[];
 	} | null;
 	server_manifest: import('vite').Manifest;
 }

From 58fca9138d7f16c9b754c47053b3d20ee8239a73 Mon Sep 17 00:00:00 2001
From: Rich Harris <richard.a.harris@gmail.com>
Date: Tue, 18 Apr 2023 08:57:29 -0400
Subject: [PATCH 64/74] Refactor `navigate` (#9698)

* update props directly inside invalidate

* make arguments non-optional

* remove update function

---------

Co-authored-by: Rich Harris <git@rich-harris.dev>
---
 packages/kit/src/runtime/client/client.js | 355 ++++++++++------------
 1 file changed, 160 insertions(+), 195 deletions(-)

diff --git a/packages/kit/src/runtime/client/client.js b/packages/kit/src/runtime/client/client.js
index 164ce5ec01ff..0e05ded0a3a0 100644
--- a/packages/kit/src/runtime/client/client.js
+++ b/packages/kit/src/runtime/client/client.js
@@ -162,7 +162,18 @@ export function create_client(app, target) {
 		// was then triggered and is still running while the invalidation kicks in,
 		// at which point the invalidation should take over and "win".
 		load_cache = null;
-		await update(intent, url, []);
+
+		const nav_token = (token = {});
+		const navigation_result = intent && (await load_route(intent));
+		if (nav_token !== token) return;
+
+		if (navigation_result) {
+			if (navigation_result.type === 'redirect') {
+				return goto(new URL(navigation_result.location, url).href, {}, [url.pathname], nav_token);
+			} else {
+				root.$set(navigation_result.props);
+			}
+		}
 	}
 
 	/** @param {number} index */
@@ -256,183 +267,6 @@ export function create_client(app, target) {
 		await Promise.all(promises);
 	}
 
-	/**
-	 * Returns `true` if update completes, `false` if it is aborted
-	 * @param {import('./types').NavigationIntent | undefined} intent
-	 * @param {URL} url
-	 * @param {string[]} redirect_chain
-	 * @param {number} [previous_history_index]
-	 * @param {{hash?: string, scroll: { x: number, y: number } | null, keepfocus: boolean, details: { replaceState: boolean, state: any } | null}} [opts]
-	 * @param {{}} [nav_token] To distinguish between different navigation events and determine the latest. Needed for example for redirects to keep the original token
-	 * @param {() => void} [callback]
-	 */
-	async function update(
-		intent,
-		url,
-		redirect_chain,
-		previous_history_index,
-		opts,
-		nav_token = {},
-		callback
-	) {
-		token = nav_token;
-		let navigation_result = intent && (await load_route(intent));
-
-		if (!navigation_result) {
-			if (is_external_url(url, base)) {
-				return await native_navigation(url);
-			}
-			navigation_result = await server_fallback(
-				url,
-				{ id: null },
-				await handle_error(new Error(`Not found: ${url.pathname}`), {
-					url,
-					params: {},
-					route: { id: null }
-				}),
-				404
-			);
-		}
-
-		// if this is an internal navigation intent, use the normalized
-		// URL for the rest of the function
-		url = intent?.url || url;
-
-		// abort if user navigated during update
-		if (token !== nav_token) return false;
-
-		if (navigation_result.type === 'redirect') {
-			if (redirect_chain.length > 10 || redirect_chain.includes(url.pathname)) {
-				navigation_result = await load_root_error_page({
-					status: 500,
-					error: await handle_error(new Error('Redirect loop'), {
-						url,
-						params: {},
-						route: { id: null }
-					}),
-					url,
-					route: { id: null }
-				});
-			} else {
-				goto(
-					new URL(navigation_result.location, url).href,
-					{},
-					[...redirect_chain, url.pathname],
-					nav_token
-				);
-				return false;
-			}
-		} else if (/** @type {number} */ (navigation_result.props.page?.status) >= 400) {
-			const updated = await stores.updated.check();
-			if (updated) {
-				await native_navigation(url);
-			}
-		}
-
-		// reset invalidation only after a finished navigation. If there are redirects or
-		// additional invalidations, they should get the same invalidation treatment
-		invalidated.length = 0;
-		force_invalidation = false;
-
-		updating = true;
-
-		// `previous_history_index` will be undefined for invalidation
-		if (previous_history_index) {
-			update_scroll_positions(previous_history_index);
-			capture_snapshot(previous_history_index);
-		}
-
-		// ensure the url pathname matches the page's trailing slash option
-		if (
-			navigation_result.props.page?.url &&
-			navigation_result.props.page.url.pathname !== url.pathname
-		) {
-			url.pathname = navigation_result.props.page?.url.pathname;
-		}
-
-		if (opts && opts.details) {
-			const { details } = opts;
-			const change = details.replaceState ? 0 : 1;
-			details.state[INDEX_KEY] = current_history_index += change;
-			history[details.replaceState ? 'replaceState' : 'pushState'](details.state, '', url);
-
-			if (!details.replaceState) {
-				// if we navigated back, then pushed a new state, we can
-				// release memory by pruning the scroll/snapshot lookup
-				let i = current_history_index + 1;
-				while (snapshots[i] || scroll_positions[i]) {
-					delete snapshots[i];
-					delete scroll_positions[i];
-					i += 1;
-				}
-			}
-		}
-
-		// reset preload synchronously after the history state has been set to avoid race conditions
-		load_cache = null;
-
-		if (started) {
-			current = navigation_result.state;
-
-			// reset url before updating page store
-			if (navigation_result.props.page) {
-				navigation_result.props.page.url = url;
-			}
-
-			root.$set(navigation_result.props);
-		} else {
-			initialize(navigation_result);
-		}
-
-		// opts must be passed if we're navigating
-		if (opts) {
-			const { scroll, keepfocus } = opts;
-			const { activeElement } = document;
-
-			// need to render the DOM before we can scroll to the rendered elements and do focus management
-			await tick();
-
-			// we reset scroll before dealing with focus, to avoid a flash of unscrolled content
-			if (autoscroll) {
-				const deep_linked =
-					url.hash && document.getElementById(decodeURIComponent(url.hash.slice(1)));
-				if (scroll) {
-					scrollTo(scroll.x, scroll.y);
-				} else if (deep_linked) {
-					// Here we use `scrollIntoView` on the element instead of `scrollTo`
-					// because it natively supports the `scroll-margin` and `scroll-behavior`
-					// CSS properties.
-					deep_linked.scrollIntoView();
-				} else {
-					scrollTo(0, 0);
-				}
-			}
-
-			const changed_focus =
-				// reset focus only if any manual focus management didn't override it
-				document.activeElement !== activeElement &&
-				// also refocus when activeElement is body already because the
-				// focus event might not have been fired on it yet
-				document.activeElement !== document.body;
-
-			if (!keepfocus && !changed_focus) {
-				await reset_focus();
-			}
-		} else {
-			await tick();
-		}
-
-		autoscroll = true;
-
-		if (navigation_result.props.page) {
-			page = navigation_result.props.page;
-		}
-
-		if (callback) callback();
-
-		updating = false;
-	}
-
 	/** @param {import('./types').NavigationFinished} result */
 	function initialize(result) {
 		if (DEV && document.querySelector('vite-error-overlay')) return;
@@ -1131,7 +965,7 @@ export function create_client(app, target) {
 		details,
 		type,
 		delta,
-		nav_token,
+		nav_token = {},
 		accepted,
 		blocked
 	}) {
@@ -1154,25 +988,156 @@ export function create_client(app, target) {
 			stores.navigating.set(navigation);
 		}
 
-		await update(
-			intent,
-			url,
-			redirect_chain,
-			previous_history_index,
-			{
-				scroll,
-				keepfocus,
-				details
-			},
-			nav_token,
-			() => {
-				navigating = false;
-				callbacks.after_navigate.forEach((fn) =>
-					fn(/** @type {import('types').AfterNavigate} */ (navigation))
+		token = nav_token;
+		let navigation_result = intent && (await load_route(intent));
+
+		if (!navigation_result) {
+			if (is_external_url(url, base)) {
+				return await native_navigation(url);
+			}
+			navigation_result = await server_fallback(
+				url,
+				{ id: null },
+				await handle_error(new Error(`Not found: ${url.pathname}`), {
+					url,
+					params: {},
+					route: { id: null }
+				}),
+				404
+			);
+		}
+
+		// if this is an internal navigation intent, use the normalized
+		// URL for the rest of the function
+		url = intent?.url || url;
+
+		// abort if user navigated during update
+		if (token !== nav_token) return false;
+
+		if (navigation_result.type === 'redirect') {
+			if (redirect_chain.length > 10 || redirect_chain.includes(url.pathname)) {
+				navigation_result = await load_root_error_page({
+					status: 500,
+					error: await handle_error(new Error('Redirect loop'), {
+						url,
+						params: {},
+						route: { id: null }
+					}),
+					url,
+					route: { id: null }
+				});
+			} else {
+				goto(
+					new URL(navigation_result.location, url).href,
+					{},
+					[...redirect_chain, url.pathname],
+					nav_token
 				);
-				stores.navigating.set(null);
+				return false;
+			}
+		} else if (/** @type {number} */ (navigation_result.props.page?.status) >= 400) {
+			const updated = await stores.updated.check();
+			if (updated) {
+				await native_navigation(url);
 			}
+		}
+
+		// reset invalidation only after a finished navigation. If there are redirects or
+		// additional invalidations, they should get the same invalidation treatment
+		invalidated.length = 0;
+		force_invalidation = false;
+
+		updating = true;
+
+		update_scroll_positions(previous_history_index);
+		capture_snapshot(previous_history_index);
+
+		// ensure the url pathname matches the page's trailing slash option
+		if (
+			navigation_result.props.page?.url &&
+			navigation_result.props.page.url.pathname !== url.pathname
+		) {
+			url.pathname = navigation_result.props.page?.url.pathname;
+		}
+
+		if (details) {
+			const change = details.replaceState ? 0 : 1;
+			details.state[INDEX_KEY] = current_history_index += change;
+			history[details.replaceState ? 'replaceState' : 'pushState'](details.state, '', url);
+
+			if (!details.replaceState) {
+				// if we navigated back, then pushed a new state, we can
+				// release memory by pruning the scroll/snapshot lookup
+				let i = current_history_index + 1;
+				while (snapshots[i] || scroll_positions[i]) {
+					delete snapshots[i];
+					delete scroll_positions[i];
+					i += 1;
+				}
+			}
+		}
+
+		// reset preload synchronously after the history state has been set to avoid race conditions
+		load_cache = null;
+
+		if (started) {
+			current = navigation_result.state;
+
+			// reset url before updating page store
+			if (navigation_result.props.page) {
+				navigation_result.props.page.url = url;
+			}
+
+			root.$set(navigation_result.props);
+		} else {
+			initialize(navigation_result);
+		}
+
+		const { activeElement } = document;
+
+		// need to render the DOM before we can scroll to the rendered elements and do focus management
+		await tick();
+
+		// we reset scroll before dealing with focus, to avoid a flash of unscrolled content
+		if (autoscroll) {
+			const deep_linked =
+				url.hash && document.getElementById(decodeURIComponent(url.hash.slice(1)));
+			if (scroll) {
+				scrollTo(scroll.x, scroll.y);
+			} else if (deep_linked) {
+				// Here we use `scrollIntoView` on the element instead of `scrollTo`
+				// because it natively supports the `scroll-margin` and `scroll-behavior`
+				// CSS properties.
+				deep_linked.scrollIntoView();
+			} else {
+				scrollTo(0, 0);
+			}
+		}
+
+		const changed_focus =
+			// reset focus only if any manual focus management didn't override it
+			document.activeElement !== activeElement &&
+			// also refocus when activeElement is body already because the
+			// focus event might not have been fired on it yet
+			document.activeElement !== document.body;
+
+		if (!keepfocus && !changed_focus) {
+			await reset_focus();
+		}
+
+		autoscroll = true;
+
+		if (navigation_result.props.page) {
+			page = navigation_result.props.page;
+		}
+
+		navigating = false;
+		callbacks.after_navigate.forEach((fn) =>
+			fn(/** @type {import('types').AfterNavigate} */ (navigation))
 		);
+		stores.navigating.set(null);
+
+		updating = false;
 	}
 
 	/**

From d6a3a4b5fa3e31a486ac886ab2b10a41601bddba Mon Sep 17 00:00:00 2001
From: Loris Sigrist <43482866+LorisSigrist@users.noreply.github.com>
Date: Wed, 19 Apr 2023 15:25:36 +0200
Subject: [PATCH 65/74] docs: update SW docs to use paths as cache-keys (#9718)

For some Reason Chrome and other Chromium based browsers do not match a cached response when using a request as the cache-key if the cache was initialized from a path and not a request object. The example uses an array of pathnames to populate the cache, so you also need to use paths to retrieve responses from the cache. This weird behaviour causes cache-misses on resources that are very clearly in the cache.

Using the pathname itself as the cache key fixes the issue.

(this was a pain to figure out)
---
 documentation/docs/30-advanced/40-service-workers.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/documentation/docs/30-advanced/40-service-workers.md b/documentation/docs/30-advanced/40-service-workers.md
index 6fb57ca5b6a8..81c21e2394c4 100644
--- a/documentation/docs/30-advanced/40-service-workers.md
+++ b/documentation/docs/30-advanced/40-service-workers.md
@@ -66,7 +66,7 @@ self.addEventListener('fetch', (event) => {
 
 		// `build`/`files` can always be served from the cache
 		if (ASSETS.includes(url.pathname)) {
-			return cache.match(event.request);
+			return cache.match(url.pathname);
 		}
 
 		// for everything else, try the network first, but

From 738b4960d0047366177fe5304e0f60e151b79c1c Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 19 Apr 2023 13:23:24 -0700
Subject: [PATCH 66/74] chore(deps): update all non-major dependencies (#9714)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 package.json                      | 2 +-
 pnpm-lock.yaml                    | 8 ++++----
 sites/kit.svelte.dev/package.json | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index 478e47429f59..426cd5cacd48 100644
--- a/package.json
+++ b/package.json
@@ -41,7 +41,7 @@
 		"tiny-glob": "^0.2.9",
 		"typescript": "^4.9.4"
 	},
-	"packageManager": "pnpm@8.3.0",
+	"packageManager": "pnpm@8.3.1",
 	"engines": {
 		"pnpm": "^8.0.0"
 	},
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3a3d1b62cf4b..e3c2b9f2e094 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -962,8 +962,8 @@ importers:
         specifier: workspace:^
         version: link:../../packages/kit
       '@sveltejs/site-kit':
-        specifier: 5.0.3
-        version: 5.0.3(@sveltejs/kit@packages+kit)(svelte@3.56.0)
+        specifier: 5.0.4
+        version: 5.0.4(@sveltejs/kit@packages+kit)(svelte@3.56.0)
       '@types/d3-geo':
         specifier: ^3.0.2
         version: 3.0.2
@@ -1852,8 +1852,8 @@ packages:
       picomatch: 2.3.1
       rollup: 3.7.0
 
-  /@sveltejs/site-kit@5.0.3(@sveltejs/kit@packages+kit)(svelte@3.56.0):
-    resolution: {integrity: sha512-HA/L3lnsKmLVPdipaxS+MRgcExaF0WxFoHWS/TDhS7kwFcY6ds8Fp10A4Jd7lt2cv+CsyQviWFD2hA0lwE8NOA==}
+  /@sveltejs/site-kit@5.0.4(@sveltejs/kit@packages+kit)(svelte@3.56.0):
+    resolution: {integrity: sha512-bn0Lk3hmIz/pDTMvVjiVX/US4OPoc1CzfceI0Y0ljxHs2fdxRTZz881xvItZRF7istLIueoFR1x3HAZPdI2F6g==}
     peerDependencies:
       '@sveltejs/kit': ^1.0.0
       svelte: ^3.54.0
diff --git a/sites/kit.svelte.dev/package.json b/sites/kit.svelte.dev/package.json
index fc526c05c3ea..61dd3ae2df66 100644
--- a/sites/kit.svelte.dev/package.json
+++ b/sites/kit.svelte.dev/package.json
@@ -14,7 +14,7 @@
 		"@sveltejs/adapter-vercel": "workspace:^",
 		"@sveltejs/amp": "workspace:^",
 		"@sveltejs/kit": "workspace:^",
-		"@sveltejs/site-kit": "5.0.3",
+		"@sveltejs/site-kit": "5.0.4",
 		"@types/d3-geo": "^3.0.2",
 		"@types/node": "^16.18.6",
 		"flexsearch": "^0.7.31",

From fccd659125e296db0b5f8f2b0df72f64d3b91a8a Mon Sep 17 00:00:00 2001
From: Geoff Rich <4992896+geoffrich@users.noreply.github.com>
Date: Wed, 19 Apr 2023 13:24:31 -0700
Subject: [PATCH 67/74] fix(site): give logo image a label and bump site-kit
 (#9707)

---
 sites/kit.svelte.dev/src/routes/home/Hero.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sites/kit.svelte.dev/src/routes/home/Hero.svelte b/sites/kit.svelte.dev/src/routes/home/Hero.svelte
index d91aa2fa2f42..643cabed095b 100644
--- a/sites/kit.svelte.dev/src/routes/home/Hero.svelte
+++ b/sites/kit.svelte.dev/src/routes/home/Hero.svelte
@@ -7,7 +7,7 @@
 <section class="hero">
 	<div class="hero-contents">
 		<div class="hero-text">
-			<div class="logotype" role="img">
+			<div class="logotype" role="img" aria-label="SvelteKit">
 				<Logotype />
 			</div>
 

From edfdb43fa0adfd10d38df683a5e5ddb86c29c7cf Mon Sep 17 00:00:00 2001
From: Simon H <5968653+dummdidumm@users.noreply.github.com>
Date: Wed, 19 Apr 2023 22:33:41 +0200
Subject: [PATCH 68/74] fix: generate tsconfig/jsconfig correctly for library
 option (#9712)

---
 .changeset/strong-bikes-join.md                              | 5 +++++
 packages/create-svelte/bin.js                                | 3 +--
 .../jsconfig.json                                            | 0
 .../tsconfig.json                                            | 0
 .../jsconfig.json                                            | 0
 packages/create-svelte/tsconfig.json                         | 5 +++--
 packages/create-svelte/utils.js                              | 2 +-
 7 files changed, 10 insertions(+), 5 deletions(-)
 create mode 100644 .changeset/strong-bikes-join.md
 rename packages/create-svelte/shared/{+libskeleton+checkjs => +skeletonlib+checkjs}/jsconfig.json (100%)
 rename packages/create-svelte/shared/{+libskeleton+typescript => +skeletonlib+typescript}/tsconfig.json (100%)
 rename packages/create-svelte/shared/{+libskeleton-typescript => +skeletonlib-typescript}/jsconfig.json (100%)

diff --git a/.changeset/strong-bikes-join.md b/.changeset/strong-bikes-join.md
new file mode 100644
index 000000000000..9123faefac07
--- /dev/null
+++ b/.changeset/strong-bikes-join.md
@@ -0,0 +1,5 @@
+---
+'create-svelte': patch
+---
+
+fix: generate tsconfig/jsconfig correctly for library option
diff --git a/packages/create-svelte/bin.js b/packages/create-svelte/bin.js
index ce5251d6932e..274cfddca510 100755
--- a/packages/create-svelte/bin.js
+++ b/packages/create-svelte/bin.js
@@ -63,15 +63,14 @@ const options = await p.group(
 		types: () =>
 			p.select({
 				message: 'Add type checking with TypeScript?',
+				initialValue: /** @type {'checkjs' | 'typescript' | null} */ ('checkjs'),
 				options: [
 					{
 						label: 'Yes, using JavaScript with JSDoc comments',
-						// @ts-expect-error :shrug:
 						value: 'checkjs'
 					},
 					{
 						label: 'Yes, using TypeScript syntax',
-						// @ts-expect-error :shrug:
 						value: 'typescript'
 					},
 					{ label: 'No', value: null }
diff --git a/packages/create-svelte/shared/+libskeleton+checkjs/jsconfig.json b/packages/create-svelte/shared/+skeletonlib+checkjs/jsconfig.json
similarity index 100%
rename from packages/create-svelte/shared/+libskeleton+checkjs/jsconfig.json
rename to packages/create-svelte/shared/+skeletonlib+checkjs/jsconfig.json
diff --git a/packages/create-svelte/shared/+libskeleton+typescript/tsconfig.json b/packages/create-svelte/shared/+skeletonlib+typescript/tsconfig.json
similarity index 100%
rename from packages/create-svelte/shared/+libskeleton+typescript/tsconfig.json
rename to packages/create-svelte/shared/+skeletonlib+typescript/tsconfig.json
diff --git a/packages/create-svelte/shared/+libskeleton-typescript/jsconfig.json b/packages/create-svelte/shared/+skeletonlib-typescript/jsconfig.json
similarity index 100%
rename from packages/create-svelte/shared/+libskeleton-typescript/jsconfig.json
rename to packages/create-svelte/shared/+skeletonlib-typescript/jsconfig.json
diff --git a/packages/create-svelte/tsconfig.json b/packages/create-svelte/tsconfig.json
index 83b0d9ea9f79..8b8e546b7866 100644
--- a/packages/create-svelte/tsconfig.json
+++ b/packages/create-svelte/tsconfig.json
@@ -3,11 +3,12 @@
 		"allowJs": true,
 		"checkJs": true,
 		"noEmit": true,
-		"noImplicitAny": true,
 		"target": "esnext",
 		"module": "esnext",
 		"moduleResolution": "node",
-		"allowSyntheticDefaultImports": true
+		"allowSyntheticDefaultImports": true,
+		"strict": true,
+		"skipLibCheck": true
 	},
 	"include": ["./scripts/**/*", "./index.js", "./bin.js", "./utils.js"]
 }
diff --git a/packages/create-svelte/utils.js b/packages/create-svelte/utils.js
index 2f97cddb5d14..82a9120017b6 100644
--- a/packages/create-svelte/utils.js
+++ b/packages/create-svelte/utils.js
@@ -7,7 +7,7 @@ export function mkdirp(dir) {
 	try {
 		fs.mkdirSync(dir, { recursive: true });
 	} catch (e) {
-		if (e.code === 'EEXIST') return;
+		if (/** @type {any} */ (e).code === 'EEXIST') return;
 		throw e;
 	}
 }

From 69c1368c01409cc60c7abda7932aa037c21f9ed4 Mon Sep 17 00:00:00 2001
From: Ben McCann <322311+benmccann@users.noreply.github.com>
Date: Fri, 21 Apr 2023 02:26:23 -0700
Subject: [PATCH 69/74] feat: upgrade to Vite 4.3 for faster build times
 (#9737)

* feat: upgrade to Vite 4.3 for faster build times

* update template json files

---------

Co-authored-by: gtmnayan <gtmnayan@gmail.com>
---
 .changeset/smart-terms-tie.md                 |   5 +
 packages/adapter-static/package.json          |   2 +-
 .../test/apps/prerendered/package.json        |   2 +-
 .../adapter-static/test/apps/spa/package.json |   2 +-
 .../templates/default/package.json            |   2 +-
 .../templates/default/package.template.json   |   2 +-
 .../templates/skeleton/package.template.json  |   2 +-
 .../skeletonlib/package.template.json         |   2 +-
 packages/kit/package.json                     |   2 +-
 packages/kit/test/apps/amp/package.json       |   2 +-
 packages/kit/test/apps/basics/package.json    |   2 +-
 packages/kit/test/apps/dev-only/package.json  |   2 +-
 packages/kit/test/apps/embed/package.json     |   2 +-
 packages/kit/test/apps/options-2/package.json |   2 +-
 packages/kit/test/apps/options/package.json   |   2 +-
 packages/kit/test/apps/writes/package.json    |   2 +-
 .../package.json                              |   2 +-
 .../package.json                              |   2 +-
 .../package.json                              |   2 +-
 .../apps/private-dynamic-env/package.json     |   2 +-
 .../package.json                              |   2 +-
 .../apps/private-static-env/package.json      |   2 +-
 .../package.json                              |   2 +-
 .../apps/server-only-folder/package.json      |   2 +-
 .../package.json                              |   2 +-
 .../apps/server-only-module/package.json      |   2 +-
 .../apps/syntax-error/package.json            |   2 +-
 .../kit/test/prerendering/basics/package.json |   2 +-
 .../test/prerendering/options/package.json    |   2 +-
 .../test/prerendering/paths-base/package.json |   2 +-
 pnpm-lock.yaml                                | 131 +++++++++---------
 sites/kit.svelte.dev/package.json             |   2 +-
 32 files changed, 100 insertions(+), 96 deletions(-)
 create mode 100644 .changeset/smart-terms-tie.md

diff --git a/.changeset/smart-terms-tie.md b/.changeset/smart-terms-tie.md
new file mode 100644
index 000000000000..bff333e17f7c
--- /dev/null
+++ b/.changeset/smart-terms-tie.md
@@ -0,0 +1,5 @@
+---
+'create-svelte': patch
+---
+
+feat: upgrade to Vite 4.3 for faster build times
diff --git a/packages/adapter-static/package.json b/packages/adapter-static/package.json
index b5af4d083274..358a7209393a 100644
--- a/packages/adapter-static/package.json
+++ b/packages/adapter-static/package.json
@@ -36,7 +36,7 @@
 		"svelte": "^3.56.0",
 		"typescript": "^4.9.4",
 		"uvu": "^0.5.6",
-		"vite": "^4.2.0"
+		"vite": "^4.3.0"
 	},
 	"peerDependencies": {
 		"@sveltejs/kit": "^1.5.0"
diff --git a/packages/adapter-static/test/apps/prerendered/package.json b/packages/adapter-static/test/apps/prerendered/package.json
index fb4c1dd9279a..1ea9e105038b 100644
--- a/packages/adapter-static/test/apps/prerendered/package.json
+++ b/packages/adapter-static/test/apps/prerendered/package.json
@@ -10,7 +10,7 @@
 	"devDependencies": {
 		"@sveltejs/kit": "workspace:^",
 		"svelte": "^3.56.0",
-		"vite": "^4.2.0"
+		"vite": "^4.3.0"
 	},
 	"type": "module"
 }
diff --git a/packages/adapter-static/test/apps/spa/package.json b/packages/adapter-static/test/apps/spa/package.json
index dedc52e87c49..ea1fd604c5ad 100644
--- a/packages/adapter-static/test/apps/spa/package.json
+++ b/packages/adapter-static/test/apps/spa/package.json
@@ -12,7 +12,7 @@
 		"@sveltejs/kit": "workspace:^",
 		"sirv-cli": "^2.0.2",
 		"svelte": "^3.56.0",
-		"vite": "^4.2.0"
+		"vite": "^4.3.0"
 	},
 	"type": "module"
 }
diff --git a/packages/create-svelte/templates/default/package.json b/packages/create-svelte/templates/default/package.json
index b71d8cf15a61..945fe7a4ffce 100644
--- a/packages/create-svelte/templates/default/package.json
+++ b/packages/create-svelte/templates/default/package.json
@@ -13,7 +13,7 @@
 		"@sveltejs/kit": "workspace:*",
 		"svelte": "^3.56.0",
 		"typescript": "^5.0.0",
-		"vite": "^4.2.0"
+		"vite": "^4.3.0"
 	},
 	"type": "module",
 	"dependencies": {
diff --git a/packages/create-svelte/templates/default/package.template.json b/packages/create-svelte/templates/default/package.template.json
index a5c6da443972..e7532950073b 100644
--- a/packages/create-svelte/templates/default/package.template.json
+++ b/packages/create-svelte/templates/default/package.template.json
@@ -12,7 +12,7 @@
 		"@sveltejs/adapter-auto": "^2.0.0",
 		"@sveltejs/kit": "^1.5.0",
 		"svelte": "^3.54.0",
-		"vite": "^4.2.0"
+		"vite": "^4.3.0"
 	},
 	"type": "module"
 }
diff --git a/packages/create-svelte/templates/skeleton/package.template.json b/packages/create-svelte/templates/skeleton/package.template.json
index 53056f1d7635..09fe6d4e46aa 100644
--- a/packages/create-svelte/templates/skeleton/package.template.json
+++ b/packages/create-svelte/templates/skeleton/package.template.json
@@ -11,7 +11,7 @@
 		"@sveltejs/adapter-auto": "^2.0.0",
 		"@sveltejs/kit": "^1.5.0",
 		"svelte": "^3.54.0",
-		"vite": "^4.2.0"
+		"vite": "^4.3.0"
 	},
 	"type": "module"
 }
diff --git a/packages/create-svelte/templates/skeletonlib/package.template.json b/packages/create-svelte/templates/skeletonlib/package.template.json
index 80bb91ee6b29..47d09a05fcb2 100644
--- a/packages/create-svelte/templates/skeletonlib/package.template.json
+++ b/packages/create-svelte/templates/skeletonlib/package.template.json
@@ -26,7 +26,7 @@
 		"svelte": "^3.54.0",
 		"tslib": "^2.4.1",
 		"typescript": "^5.0.0",
-		"vite": "^4.2.0"
+		"vite": "^4.3.0"
 	},
 	"svelte": "./dist/index.js",
 	"types": "./dist/index.d.ts",
diff --git a/packages/kit/package.json b/packages/kit/package.json
index 569d36129304..5d272d74cddb 100644
--- a/packages/kit/package.json
+++ b/packages/kit/package.json
@@ -39,7 +39,7 @@
 		"svelte-preprocess": "^5.0.0",
 		"typescript": "^4.9.4",
 		"uvu": "^0.5.6",
-		"vite": "^4.2.0"
+		"vite": "^4.3.0"
 	},
 	"peerDependencies": {
 		"svelte": "^3.54.0",
diff --git a/packages/kit/test/apps/amp/package.json b/packages/kit/test/apps/amp/package.json
index a56fb901c8bd..f6c2aa4c1974 100644
--- a/packages/kit/test/apps/amp/package.json
+++ b/packages/kit/test/apps/amp/package.json
@@ -19,7 +19,7 @@
 		"svelte": "^3.56.0",
 		"svelte-check": "^3.0.2",
 		"typescript": "^4.9.4",
-		"vite": "^4.2.0"
+		"vite": "^4.3.0"
 	},
 	"type": "module"
 }
diff --git a/packages/kit/test/apps/basics/package.json b/packages/kit/test/apps/basics/package.json
index 038408b260c0..26df84a7d627 100644
--- a/packages/kit/test/apps/basics/package.json
+++ b/packages/kit/test/apps/basics/package.json
@@ -20,7 +20,7 @@
 		"svelte": "^3.56.0",
 		"svelte-check": "^3.0.2",
 		"typescript": "^4.9.4",
-		"vite": "^4.2.0"
+		"vite": "^4.3.0"
 	},
 	"type": "module"
 }
diff --git a/packages/kit/test/apps/dev-only/package.json b/packages/kit/test/apps/dev-only/package.json
index 5e4f0f0b02da..37ee1ab3a73d 100644
--- a/packages/kit/test/apps/dev-only/package.json
+++ b/packages/kit/test/apps/dev-only/package.json
@@ -15,7 +15,7 @@
 		"svelte": "^3.56.0",
 		"svelte-check": "^3.0.2",
 		"typescript": "^4.9.4",
-		"vite": "^4.2.0"
+		"vite": "^4.3.0"
 	},
 	"type": "module"
 }
diff --git a/packages/kit/test/apps/embed/package.json b/packages/kit/test/apps/embed/package.json
index 914e0f83dedc..c9b35e553f46 100644
--- a/packages/kit/test/apps/embed/package.json
+++ b/packages/kit/test/apps/embed/package.json
@@ -17,7 +17,7 @@
 		"svelte": "^3.56.0",
 		"svelte-check": "^3.0.2",
 		"typescript": "^4.9.4",
-		"vite": "^4.2.0"
+		"vite": "^4.3.0"
 	},
 	"type": "module"
 }
diff --git a/packages/kit/test/apps/options-2/package.json b/packages/kit/test/apps/options-2/package.json
index 1f776cd91e3b..11c0d0d24937 100644
--- a/packages/kit/test/apps/options-2/package.json
+++ b/packages/kit/test/apps/options-2/package.json
@@ -18,7 +18,7 @@
 		"svelte": "^3.56.0",
 		"svelte-check": "^3.0.2",
 		"typescript": "^4.9.4",
-		"vite": "^4.2.0"
+		"vite": "^4.3.0"
 	},
 	"type": "module"
 }
diff --git a/packages/kit/test/apps/options/package.json b/packages/kit/test/apps/options/package.json
index 28537d89f089..5602453072f1 100644
--- a/packages/kit/test/apps/options/package.json
+++ b/packages/kit/test/apps/options/package.json
@@ -17,7 +17,7 @@
 		"svelte": "^3.56.0",
 		"svelte-check": "^3.0.2",
 		"typescript": "^4.9.4",
-		"vite": "^4.2.0"
+		"vite": "^4.3.0"
 	},
 	"type": "module"
 }
diff --git a/packages/kit/test/apps/writes/package.json b/packages/kit/test/apps/writes/package.json
index 52ef77937077..d9afd1f316d9 100644
--- a/packages/kit/test/apps/writes/package.json
+++ b/packages/kit/test/apps/writes/package.json
@@ -18,7 +18,7 @@
 		"svelte": "^3.56.0",
 		"svelte-check": "^3.0.2",
 		"typescript": "^4.9.4",
-		"vite": "^4.2.0"
+		"vite": "^4.3.0"
 	},
 	"type": "module"
 }
diff --git a/packages/kit/test/build-errors/apps/prerenderable-incorrect-fragment/package.json b/packages/kit/test/build-errors/apps/prerenderable-incorrect-fragment/package.json
index a1176e486f96..ce33f478c912 100644
--- a/packages/kit/test/build-errors/apps/prerenderable-incorrect-fragment/package.json
+++ b/packages/kit/test/build-errors/apps/prerenderable-incorrect-fragment/package.json
@@ -14,7 +14,7 @@
 		"svelte": "^3.56.0",
 		"svelte-check": "^3.0.2",
 		"typescript": "^4.9.4",
-		"vite": "^4.2.0"
+		"vite": "^4.3.0"
 	},
 	"type": "module"
 }
diff --git a/packages/kit/test/build-errors/apps/prerenderable-not-prerendered/package.json b/packages/kit/test/build-errors/apps/prerenderable-not-prerendered/package.json
index 1f93f6d8d0a1..3faef7a592b3 100644
--- a/packages/kit/test/build-errors/apps/prerenderable-not-prerendered/package.json
+++ b/packages/kit/test/build-errors/apps/prerenderable-not-prerendered/package.json
@@ -14,7 +14,7 @@
 		"svelte": "^3.56.0",
 		"svelte-check": "^3.0.2",
 		"typescript": "^4.9.4",
-		"vite": "^4.2.0"
+		"vite": "^4.3.0"
 	},
 	"type": "module"
 }
diff --git a/packages/kit/test/build-errors/apps/private-dynamic-env-dynamic-import/package.json b/packages/kit/test/build-errors/apps/private-dynamic-env-dynamic-import/package.json
index 42527c4e55c7..172a09e8cb97 100644
--- a/packages/kit/test/build-errors/apps/private-dynamic-env-dynamic-import/package.json
+++ b/packages/kit/test/build-errors/apps/private-dynamic-env-dynamic-import/package.json
@@ -14,7 +14,7 @@
 		"svelte": "^3.56.0",
 		"svelte-check": "^3.0.2",
 		"typescript": "^4.9.4",
-		"vite": "^4.2.0"
+		"vite": "^4.3.0"
 	},
 	"type": "module"
 }
diff --git a/packages/kit/test/build-errors/apps/private-dynamic-env/package.json b/packages/kit/test/build-errors/apps/private-dynamic-env/package.json
index 6499b6879c42..c0aeac64395b 100644
--- a/packages/kit/test/build-errors/apps/private-dynamic-env/package.json
+++ b/packages/kit/test/build-errors/apps/private-dynamic-env/package.json
@@ -14,7 +14,7 @@
 		"svelte": "^3.56.0",
 		"svelte-check": "^3.0.2",
 		"typescript": "^4.9.4",
-		"vite": "^4.2.0"
+		"vite": "^4.3.0"
 	},
 	"type": "module"
 }
diff --git a/packages/kit/test/build-errors/apps/private-static-env-dynamic-import/package.json b/packages/kit/test/build-errors/apps/private-static-env-dynamic-import/package.json
index 6637f2459448..53780bdad895 100644
--- a/packages/kit/test/build-errors/apps/private-static-env-dynamic-import/package.json
+++ b/packages/kit/test/build-errors/apps/private-static-env-dynamic-import/package.json
@@ -14,7 +14,7 @@
 		"svelte": "^3.56.0",
 		"svelte-check": "^3.0.2",
 		"typescript": "^4.9.4",
-		"vite": "^4.2.0"
+		"vite": "^4.3.0"
 	},
 	"type": "module"
 }
diff --git a/packages/kit/test/build-errors/apps/private-static-env/package.json b/packages/kit/test/build-errors/apps/private-static-env/package.json
index 2e2267a2ac48..c6316ac9e409 100644
--- a/packages/kit/test/build-errors/apps/private-static-env/package.json
+++ b/packages/kit/test/build-errors/apps/private-static-env/package.json
@@ -15,7 +15,7 @@
 		"svelte": "^3.56.0",
 		"svelte-check": "^3.0.2",
 		"typescript": "^4.9.4",
-		"vite": "^4.2.0"
+		"vite": "^4.3.0"
 	},
 	"type": "module"
 }
diff --git a/packages/kit/test/build-errors/apps/server-only-folder-dynamic-import/package.json b/packages/kit/test/build-errors/apps/server-only-folder-dynamic-import/package.json
index 675090f005b5..ce6abb703f7f 100644
--- a/packages/kit/test/build-errors/apps/server-only-folder-dynamic-import/package.json
+++ b/packages/kit/test/build-errors/apps/server-only-folder-dynamic-import/package.json
@@ -14,7 +14,7 @@
 		"svelte": "^3.56.0",
 		"svelte-check": "^3.0.2",
 		"typescript": "^4.9.4",
-		"vite": "^4.2.0"
+		"vite": "^4.3.0"
 	},
 	"type": "module"
 }
diff --git a/packages/kit/test/build-errors/apps/server-only-folder/package.json b/packages/kit/test/build-errors/apps/server-only-folder/package.json
index a8e27ad2c410..89bc86aed195 100644
--- a/packages/kit/test/build-errors/apps/server-only-folder/package.json
+++ b/packages/kit/test/build-errors/apps/server-only-folder/package.json
@@ -14,7 +14,7 @@
 		"svelte": "^3.56.0",
 		"svelte-check": "^3.0.2",
 		"typescript": "^4.9.4",
-		"vite": "^4.2.0"
+		"vite": "^4.3.0"
 	},
 	"type": "module"
 }
diff --git a/packages/kit/test/build-errors/apps/server-only-module-dynamic-import/package.json b/packages/kit/test/build-errors/apps/server-only-module-dynamic-import/package.json
index 6a4fd6be97fe..0cd4b8e80638 100644
--- a/packages/kit/test/build-errors/apps/server-only-module-dynamic-import/package.json
+++ b/packages/kit/test/build-errors/apps/server-only-module-dynamic-import/package.json
@@ -14,7 +14,7 @@
 		"svelte": "^3.56.0",
 		"svelte-check": "^3.0.2",
 		"typescript": "^4.9.4",
-		"vite": "^4.2.0"
+		"vite": "^4.3.0"
 	},
 	"type": "module"
 }
diff --git a/packages/kit/test/build-errors/apps/server-only-module/package.json b/packages/kit/test/build-errors/apps/server-only-module/package.json
index fbecf3fd3ed4..04d383b975a4 100644
--- a/packages/kit/test/build-errors/apps/server-only-module/package.json
+++ b/packages/kit/test/build-errors/apps/server-only-module/package.json
@@ -14,7 +14,7 @@
 		"svelte": "^3.56.0",
 		"svelte-check": "^3.0.2",
 		"typescript": "^4.9.4",
-		"vite": "^4.2.0"
+		"vite": "^4.3.0"
 	},
 	"type": "module"
 }
diff --git a/packages/kit/test/build-errors/apps/syntax-error/package.json b/packages/kit/test/build-errors/apps/syntax-error/package.json
index c80a8f6d09db..75a65431ede4 100644
--- a/packages/kit/test/build-errors/apps/syntax-error/package.json
+++ b/packages/kit/test/build-errors/apps/syntax-error/package.json
@@ -12,7 +12,7 @@
 		"svelte": "^3.56.0",
 		"svelte-check": "^3.0.2",
 		"typescript": "^4.9.4",
-		"vite": "^4.2.0"
+		"vite": "^4.3.0"
 	},
 	"type": "module"
 }
diff --git a/packages/kit/test/prerendering/basics/package.json b/packages/kit/test/prerendering/basics/package.json
index c182f96d2212..06387e933c3c 100644
--- a/packages/kit/test/prerendering/basics/package.json
+++ b/packages/kit/test/prerendering/basics/package.json
@@ -16,7 +16,7 @@
 		"svelte-check": "^3.0.2",
 		"typescript": "^4.9.4",
 		"uvu": "^0.5.6",
-		"vite": "^4.2.0"
+		"vite": "^4.3.0"
 	},
 	"type": "module"
 }
diff --git a/packages/kit/test/prerendering/options/package.json b/packages/kit/test/prerendering/options/package.json
index a8883af78919..b46d853c474b 100644
--- a/packages/kit/test/prerendering/options/package.json
+++ b/packages/kit/test/prerendering/options/package.json
@@ -15,7 +15,7 @@
 		"svelte-check": "^3.0.2",
 		"typescript": "^4.9.4",
 		"uvu": "^0.5.6",
-		"vite": "^4.2.0"
+		"vite": "^4.3.0"
 	},
 	"type": "module"
 }
diff --git a/packages/kit/test/prerendering/paths-base/package.json b/packages/kit/test/prerendering/paths-base/package.json
index 44fdcefb0530..cf3b67bd937e 100644
--- a/packages/kit/test/prerendering/paths-base/package.json
+++ b/packages/kit/test/prerendering/paths-base/package.json
@@ -15,7 +15,7 @@
 		"svelte-check": "^3.0.2",
 		"typescript": "^4.9.4",
 		"uvu": "^0.5.6",
-		"vite": "^4.2.0"
+		"vite": "^4.3.0"
 	},
 	"type": "module"
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index e3c2b9f2e094..a9b366ad5098 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -223,8 +223,8 @@ importers:
         specifier: ^0.5.6
         version: 0.5.6
       vite:
-        specifier: ^4.2.0
-        version: 4.2.0(@types/node@16.18.6)
+        specifier: ^4.3.0
+        version: 4.3.0(@types/node@16.18.6)
 
   packages/adapter-static/test/apps/prerendered:
     devDependencies:
@@ -235,8 +235,8 @@ importers:
         specifier: ^3.56.0
         version: 3.56.0
       vite:
-        specifier: ^4.2.0
-        version: 4.2.0(@types/node@16.18.6)
+        specifier: ^4.3.0
+        version: 4.3.0(@types/node@16.18.6)
 
   packages/adapter-static/test/apps/spa:
     devDependencies:
@@ -253,8 +253,8 @@ importers:
         specifier: ^3.56.0
         version: 3.56.0
       vite:
-        specifier: ^4.2.0
-        version: 4.2.0(@types/node@16.18.6)
+        specifier: ^4.3.0
+        version: 4.3.0(@types/node@16.18.6)
 
   packages/adapter-vercel:
     dependencies:
@@ -349,8 +349,8 @@ importers:
         specifier: ^5.0.0
         version: 5.0.2
       vite:
-        specifier: ^4.2.0
-        version: 4.2.0(@types/node@16.18.6)
+        specifier: ^4.3.0
+        version: 4.3.0(@types/node@16.18.6)
 
   packages/create-svelte/templates/skeleton:
     devDependencies:
@@ -362,7 +362,7 @@ importers:
     dependencies:
       '@sveltejs/vite-plugin-svelte':
         specifier: ^2.0.0
-        version: 2.0.0(svelte@3.56.0)(vite@4.2.0)
+        version: 2.0.0(svelte@3.56.0)(vite@4.3.0)
       '@types/cookie':
         specifier: ^0.5.1
         version: 0.5.1
@@ -440,8 +440,8 @@ importers:
         specifier: ^0.5.6
         version: 0.5.6
       vite:
-        specifier: ^4.2.0
-        version: 4.2.0(@types/node@16.18.6)
+        specifier: ^4.3.0
+        version: 4.3.0(@types/node@16.18.6)
 
   packages/kit/test/apps/amp:
     devDependencies:
@@ -467,8 +467,8 @@ importers:
         specifier: ^4.9.4
         version: 4.9.4
       vite:
-        specifier: ^4.2.0
-        version: 4.2.0(@types/node@16.18.6)
+        specifier: ^4.3.0
+        version: 4.3.0(@types/node@16.18.6)
 
   packages/kit/test/apps/basics:
     devDependencies:
@@ -491,8 +491,8 @@ importers:
         specifier: ^4.9.4
         version: 4.9.4
       vite:
-        specifier: ^4.2.0
-        version: 4.2.0(@types/node@16.18.6)
+        specifier: ^4.3.0
+        version: 4.3.0(@types/node@16.18.6)
 
   packages/kit/test/apps/dev-only:
     devDependencies:
@@ -512,8 +512,8 @@ importers:
         specifier: ^4.9.4
         version: 4.9.4
       vite:
-        specifier: ^4.2.0
-        version: 4.2.0(@types/node@16.18.6)
+        specifier: ^4.3.0
+        version: 4.3.0(@types/node@16.18.6)
 
   packages/kit/test/apps/embed:
     devDependencies:
@@ -533,8 +533,8 @@ importers:
         specifier: ^4.9.4
         version: 4.9.4
       vite:
-        specifier: ^4.2.0
-        version: 4.2.0(@types/node@16.18.6)
+        specifier: ^4.3.0
+        version: 4.3.0(@types/node@16.18.6)
 
   packages/kit/test/apps/options:
     devDependencies:
@@ -554,8 +554,8 @@ importers:
         specifier: ^4.9.4
         version: 4.9.4
       vite:
-        specifier: ^4.2.0
-        version: 4.2.0(@types/node@16.18.6)
+        specifier: ^4.3.0
+        version: 4.3.0(@types/node@16.18.6)
 
   packages/kit/test/apps/options-2:
     devDependencies:
@@ -578,8 +578,8 @@ importers:
         specifier: ^4.9.4
         version: 4.9.4
       vite:
-        specifier: ^4.2.0
-        version: 4.2.0(@types/node@16.18.6)
+        specifier: ^4.3.0
+        version: 4.3.0(@types/node@16.18.6)
 
   packages/kit/test/apps/writes:
     devDependencies:
@@ -602,8 +602,8 @@ importers:
         specifier: ^4.9.4
         version: 4.9.4
       vite:
-        specifier: ^4.2.0
-        version: 4.2.0(@types/node@16.18.6)
+        specifier: ^4.3.0
+        version: 4.3.0(@types/node@16.18.6)
 
   packages/kit/test/build-errors:
     devDependencies:
@@ -629,8 +629,8 @@ importers:
         specifier: ^4.9.4
         version: 4.9.4
       vite:
-        specifier: ^4.2.0
-        version: 4.2.0(@types/node@16.18.6)
+        specifier: ^4.3.0
+        version: 4.3.0(@types/node@16.18.6)
 
   packages/kit/test/build-errors/apps/prerenderable-not-prerendered:
     devDependencies:
@@ -650,8 +650,8 @@ importers:
         specifier: ^4.9.4
         version: 4.9.4
       vite:
-        specifier: ^4.2.0
-        version: 4.2.0(@types/node@16.18.6)
+        specifier: ^4.3.0
+        version: 4.3.0(@types/node@16.18.6)
 
   packages/kit/test/build-errors/apps/private-dynamic-env:
     devDependencies:
@@ -668,8 +668,8 @@ importers:
         specifier: ^4.9.4
         version: 4.9.4
       vite:
-        specifier: ^4.2.0
-        version: 4.2.0(@types/node@16.18.6)
+        specifier: ^4.3.0
+        version: 4.3.0(@types/node@16.18.6)
 
   packages/kit/test/build-errors/apps/private-dynamic-env-dynamic-import:
     devDependencies:
@@ -686,8 +686,8 @@ importers:
         specifier: ^4.9.4
         version: 4.9.4
       vite:
-        specifier: ^4.2.0
-        version: 4.2.0(@types/node@16.18.6)
+        specifier: ^4.3.0
+        version: 4.3.0(@types/node@16.18.6)
 
   packages/kit/test/build-errors/apps/private-static-env:
     devDependencies:
@@ -707,8 +707,8 @@ importers:
         specifier: ^4.9.4
         version: 4.9.4
       vite:
-        specifier: ^4.2.0
-        version: 4.2.0(@types/node@16.18.6)
+        specifier: ^4.3.0
+        version: 4.3.0(@types/node@16.18.6)
 
   packages/kit/test/build-errors/apps/private-static-env-dynamic-import:
     devDependencies:
@@ -725,8 +725,8 @@ importers:
         specifier: ^4.9.4
         version: 4.9.4
       vite:
-        specifier: ^4.2.0
-        version: 4.2.0(@types/node@16.18.6)
+        specifier: ^4.3.0
+        version: 4.3.0(@types/node@16.18.6)
 
   packages/kit/test/build-errors/apps/server-only-folder:
     devDependencies:
@@ -743,8 +743,8 @@ importers:
         specifier: ^4.9.4
         version: 4.9.4
       vite:
-        specifier: ^4.2.0
-        version: 4.2.0(@types/node@16.18.6)
+        specifier: ^4.3.0
+        version: 4.3.0(@types/node@16.18.6)
 
   packages/kit/test/build-errors/apps/server-only-folder-dynamic-import:
     devDependencies:
@@ -761,8 +761,8 @@ importers:
         specifier: ^4.9.4
         version: 4.9.4
       vite:
-        specifier: ^4.2.0
-        version: 4.2.0(@types/node@16.18.6)
+        specifier: ^4.3.0
+        version: 4.3.0(@types/node@16.18.6)
 
   packages/kit/test/build-errors/apps/server-only-module:
     devDependencies:
@@ -779,8 +779,8 @@ importers:
         specifier: ^4.9.4
         version: 4.9.4
       vite:
-        specifier: ^4.2.0
-        version: 4.2.0(@types/node@16.18.6)
+        specifier: ^4.3.0
+        version: 4.3.0(@types/node@16.18.6)
 
   packages/kit/test/build-errors/apps/server-only-module-dynamic-import:
     devDependencies:
@@ -797,8 +797,8 @@ importers:
         specifier: ^4.9.4
         version: 4.9.4
       vite:
-        specifier: ^4.2.0
-        version: 4.2.0(@types/node@16.18.6)
+        specifier: ^4.3.0
+        version: 4.3.0(@types/node@16.18.6)
 
   packages/kit/test/build-errors/apps/syntax-error:
     devDependencies:
@@ -815,8 +815,8 @@ importers:
         specifier: ^4.9.4
         version: 4.9.4
       vite:
-        specifier: ^4.2.0
-        version: 4.2.0(@types/node@16.18.6)
+        specifier: ^4.3.0
+        version: 4.3.0(@types/node@16.18.6)
 
   packages/kit/test/prerendering/basics:
     devDependencies:
@@ -836,8 +836,8 @@ importers:
         specifier: ^0.5.6
         version: 0.5.6
       vite:
-        specifier: ^4.2.0
-        version: 4.2.0(@types/node@16.18.6)
+        specifier: ^4.3.0
+        version: 4.3.0(@types/node@16.18.6)
 
   packages/kit/test/prerendering/options:
     devDependencies:
@@ -857,8 +857,8 @@ importers:
         specifier: ^0.5.6
         version: 0.5.6
       vite:
-        specifier: ^4.2.0
-        version: 4.2.0(@types/node@16.18.6)
+        specifier: ^4.3.0
+        version: 4.3.0(@types/node@16.18.6)
 
   packages/kit/test/prerendering/paths-base:
     devDependencies:
@@ -878,8 +878,8 @@ importers:
         specifier: ^0.5.6
         version: 0.5.6
       vite:
-        specifier: ^4.2.0
-        version: 4.2.0(@types/node@16.18.6)
+        specifier: ^4.3.0
+        version: 4.3.0(@types/node@16.18.6)
 
   packages/migrate:
     dependencies:
@@ -1001,8 +1001,8 @@ importers:
         specifier: ^0.5.6
         version: 0.5.6
       vite:
-        specifier: ^4.2.0
-        version: 4.2.0(@types/node@16.18.6)
+        specifier: ^4.3.0
+        version: 4.3.0(@types/node@16.18.6)
       vite-imagetools:
         specifier: ^4.0.16
         version: 4.0.16(rollup@3.7.0)
@@ -1864,7 +1864,7 @@ packages:
       svelte-local-storage-store: 0.4.0(svelte@3.56.0)
     dev: true
 
-  /@sveltejs/vite-plugin-svelte@2.0.0(svelte@3.56.0)(vite@4.2.0):
+  /@sveltejs/vite-plugin-svelte@2.0.0(svelte@3.56.0)(vite@4.3.0):
     resolution: {integrity: sha512-oUFrYQarRv4fppmxdrv00qw3wX8Ycdj0uv33MfpRZyR8K67dyxiOcHnqkB0zSy5sDJA8RC/2aNtYhXJ8NINVHQ==}
     engines: {node: ^14.18.0 || >= 16}
     peerDependencies:
@@ -1877,8 +1877,8 @@ packages:
       magic-string: 0.27.0
       svelte: 3.56.0
       svelte-hmr: 0.15.1(svelte@3.56.0)
-      vite: 4.2.0(@types/node@16.18.6)
-      vitefu: 0.2.3(vite@4.2.0)
+      vite: 4.3.0(@types/node@16.18.6)
+      vitefu: 0.2.3(vite@4.3.0)
     transitivePeerDependencies:
       - supports-color
     dev: false
@@ -4883,8 +4883,8 @@ packages:
       estree-walker: 0.6.1
     dev: false
 
-  /rollup@3.19.1:
-    resolution: {integrity: sha512-lAbrdN7neYCg/8WaoWn/ckzCtz+jr70GFfYdlf50OF7387HTg+wiuiqJRFYawwSPpqfqDNYqK7smY/ks2iAudg==}
+  /rollup@3.20.6:
+    resolution: {integrity: sha512-2yEB3nQXp/tBQDN0hJScJQheXdvU2wFhh6ld7K/aiZ1vYcak6N/BKjY1QrU6BvO2JWYS8bEs14FRaxXosxy2zw==}
     engines: {node: '>=14.18.0', npm: '>=8.0.0'}
     hasBin: true
     optionalDependencies:
@@ -5695,8 +5695,8 @@ packages:
       - rollup
     dev: true
 
-  /vite@4.2.0(@types/node@16.18.6):
-    resolution: {integrity: sha512-AbDTyzzwuKoRtMIRLGNxhLRuv1FpRgdIw+1y6AQG73Q5+vtecmvzKo/yk8X/vrHDpETRTx01ABijqUHIzBXi0g==}
+  /vite@4.3.0(@types/node@16.18.6):
+    resolution: {integrity: sha512-JTGFgDh3dVxeGBpuQX04Up+JZmuG6wu9414Ei36vQzaEruY/M4K0AgwtuB2b4HaBgB7R8l+LHxjB0jcgz4d2qQ==}
     engines: {node: ^14.18.0 || >=16.0.0}
     hasBin: true
     peerDependencies:
@@ -5723,12 +5723,11 @@ packages:
       '@types/node': 16.18.6
       esbuild: 0.17.12
       postcss: 8.4.21
-      resolve: 1.22.1
-      rollup: 3.19.1
+      rollup: 3.20.6
     optionalDependencies:
       fsevents: 2.3.2
 
-  /vitefu@0.2.3(vite@4.2.0):
+  /vitefu@0.2.3(vite@4.3.0):
     resolution: {integrity: sha512-75l7TTuU8isAhz1QFtNKjDkqjxvndfMC1AfIMjJ0ZQ59ZD0Ow9QOIsJJX16Wv9PS8f+zMzp6fHy5cCbKG/yVUQ==}
     peerDependencies:
       vite: ^3.0.0 || ^4.0.0
@@ -5736,7 +5735,7 @@ packages:
       vite:
         optional: true
     dependencies:
-      vite: 4.2.0(@types/node@16.18.6)
+      vite: 4.3.0(@types/node@16.18.6)
     dev: false
 
   /vscode-oniguruma@1.6.2:
diff --git a/sites/kit.svelte.dev/package.json b/sites/kit.svelte.dev/package.json
index 61dd3ae2df66..d15f27c3ed47 100644
--- a/sites/kit.svelte.dev/package.json
+++ b/sites/kit.svelte.dev/package.json
@@ -27,7 +27,7 @@
 		"tiny-glob": "^0.2.9",
 		"typescript": "^4.9.4",
 		"uvu": "^0.5.6",
-		"vite": "^4.2.0",
+		"vite": "^4.3.0",
 		"vite-imagetools": "^4.0.16"
 	},
 	"type": "module",

From aae5992e4568d93b477befe02b4018a59a298262 Mon Sep 17 00:00:00 2001
From: gtmnayan <50981692+gtm-nayan@users.noreply.github.com>
Date: Fri, 21 Apr 2023 15:15:01 +0545
Subject: [PATCH 70/74] chore: revert undici pin and upgrade (#9740)

aria-query

---------

Co-authored-by: Simon H <5968653+dummdidumm@users.noreply.github.com>
---
 .changeset/fuzzy-coats-pay.md |  5 +++++
 packages/kit/package.json     |  2 +-
 pnpm-lock.yaml                | 10 +++++-----
 renovate.json                 |  3 +--
 4 files changed, 12 insertions(+), 8 deletions(-)
 create mode 100644 .changeset/fuzzy-coats-pay.md

diff --git a/.changeset/fuzzy-coats-pay.md b/.changeset/fuzzy-coats-pay.md
new file mode 100644
index 000000000000..8428b0470db1
--- /dev/null
+++ b/.changeset/fuzzy-coats-pay.md
@@ -0,0 +1,5 @@
+---
+'@sveltejs/kit': patch
+---
+
+chore: revert undici pin and upgrade version
diff --git a/packages/kit/package.json b/packages/kit/package.json
index 5d272d74cddb..a0a1f604813c 100644
--- a/packages/kit/package.json
+++ b/packages/kit/package.json
@@ -23,7 +23,7 @@
 		"set-cookie-parser": "^2.5.1",
 		"sirv": "^2.0.2",
 		"tiny-glob": "^0.2.9",
-		"undici": "5.20.0"
+		"undici": "~5.22.0"
 	},
 	"devDependencies": {
 		"@playwright/test": "^1.29.2",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index a9b366ad5098..65a324149d7c 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -397,8 +397,8 @@ importers:
         specifier: ^0.2.9
         version: 0.2.9
       undici:
-        specifier: 5.20.0
-        version: 5.20.0
+        specifier: ~5.22.0
+        version: 5.22.0
     devDependencies:
       '@playwright/test':
         specifier: ^1.29.2
@@ -5632,9 +5632,9 @@ packages:
       which-boxed-primitive: 1.0.2
     dev: true
 
-  /undici@5.20.0:
-    resolution: {integrity: sha512-J3j60dYzuo6Eevbawwp1sdg16k5Tf768bxYK4TUJRH7cBM4kFCbf3mOnM/0E3vQYXvpxITbbWmBafaDbxLDz3g==}
-    engines: {node: '>=12.18'}
+  /undici@5.22.0:
+    resolution: {integrity: sha512-fR9RXCc+6Dxav4P9VV/sp5w3eFiSdOjJYsbtWfd4s5L5C4ogyuVpdKIVHeW0vV1MloM65/f7W45nR9ZxwVdyiA==}
+    engines: {node: '>=14.0'}
     dependencies:
       busboy: 1.6.0
     dev: false
diff --git a/renovate.json b/renovate.json
index 8247f8fae8cc..92b4007e75b4 100644
--- a/renovate.json
+++ b/renovate.json
@@ -12,8 +12,7 @@
 	"ignoreDeps": [
 		"esbuild",
 		"rollup",
-		"typescript",
-		"undici"
+		"typescript"
 	],
 	"ignorePaths": [
 		"**/create-svelte/shared/**",

From fd4812c21273cce87fc9c306f95e77c53aed5c72 Mon Sep 17 00:00:00 2001
From: gtmnayan <50981692+gtm-nayan@users.noreply.github.com>
Date: Fri, 21 Apr 2023 15:22:00 +0545
Subject: [PATCH 71/74] chore: fix off by one in sequence handler (#9739)

---
 packages/adapter-node/src/handler.js | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/packages/adapter-node/src/handler.js b/packages/adapter-node/src/handler.js
index b14a842dc96a..8a1390a78f25 100644
--- a/packages/adapter-node/src/handler.js
+++ b/packages/adapter-node/src/handler.js
@@ -144,15 +144,19 @@ const ssr = async (req, res) => {
 function sequence(handlers) {
 	/** @type {import('polka').Middleware} */
 	return (req, res, next) => {
-		/** @param {number} i */
+		/**
+		 * @param {number} i
+		 * @returns {ReturnType<import('polka').Middleware>}
+		 */
 		function handle(i) {
-			handlers[i](req, res, () => {
-				if (i < handlers.length) handle(i + 1);
-				else next();
-			});
+			if (i < handlers.length) {
+				return handlers[i](req, res, () => handle(i + 1));
+			} else {
+				return next();
+			}
 		}
 
-		handle(0);
+		return handle(0);
 	};
 }
 

From b29444033789a930c7216436a6bc575e831e0108 Mon Sep 17 00:00:00 2001
From: gtmnayan <50981692+gtm-nayan@users.noreply.github.com>
Date: Fri, 21 Apr 2023 18:56:30 +0545
Subject: [PATCH 72/74] chore: improve error reporting for tests (#9730)

- replace inverted assert.oks with assert.not to make failure messages less confusing
- replace assert.ok(string.includes
- add helper for getComputedStyle that fails with selector not found instead of just: expected some string got null
---
 packages/adapter-static/test/test.js          |  2 +-
 .../kit/src/runtime/server/cookie.spec.js     |  2 +-
 packages/kit/src/utils/url.spec.js            |  2 +-
 packages/kit/test/apps/amp/test/test.js       | 17 +-----
 .../kit/test/apps/basics/test/client.test.js  | 16 ++----
 .../basics/test/cross-platform/client.test.js | 17 +++---
 .../apps/basics/test/cross-platform/test.js   | 57 +++++--------------
 packages/kit/test/apps/basics/test/test.js    | 35 +++++-------
 packages/kit/test/apps/options/test/test.js   | 25 +++-----
 .../kit/test/prerendering/basics/test/test.js | 51 ++++++++---------
 .../test/prerendering/options/test/test.js    | 17 +++---
 packages/kit/test/utils.d.ts                  |  1 +
 packages/kit/test/utils.js                    | 17 ++++++
 13 files changed, 104 insertions(+), 155 deletions(-)

diff --git a/packages/adapter-static/test/test.js b/packages/adapter-static/test/test.js
index c4144c1bd532..05079f9209b4 100644
--- a/packages/adapter-static/test/test.js
+++ b/packages/adapter-static/test/test.js
@@ -36,7 +36,7 @@ run('spa', (test) => {
 	});
 
 	test('does not prerender pages without prerender=true', ({ cwd }) => {
-		assert.ok(!fs.existsSync(`${cwd}/build/index.html`));
+		assert.not(fs.existsSync(`${cwd}/build/index.html`));
 	});
 
 	test('prerenders page with prerender=true', ({ cwd }) => {
diff --git a/packages/kit/src/runtime/server/cookie.spec.js b/packages/kit/src/runtime/server/cookie.spec.js
index d8a4eab18abd..e0dfdc362784 100644
--- a/packages/kit/src/runtime/server/cookie.spec.js
+++ b/packages/kit/src/runtime/server/cookie.spec.js
@@ -41,7 +41,7 @@ paths.positive.forEach(([path, constraint]) => {
 
 paths.negative.forEach(([path, constraint]) => {
 	test(`! ${path} / ${constraint}`, () => {
-		assert.ok(!path_matches(path, constraint));
+		assert.not(path_matches(path, constraint));
 	});
 });
 
diff --git a/packages/kit/src/utils/url.spec.js b/packages/kit/src/utils/url.spec.js
index 906a48046e10..79a924e8bbff 100644
--- a/packages/kit/src/utils/url.spec.js
+++ b/packages/kit/src/utils/url.spec.js
@@ -100,7 +100,7 @@ describe('make_trackable', (test) => {
 		});
 
 		url.origin;
-		assert.ok(!tracked);
+		assert.not(tracked);
 
 		url.pathname;
 		assert.ok(tracked);
diff --git a/packages/kit/test/apps/amp/test/test.js b/packages/kit/test/apps/amp/test/test.js
index 55fa4f50ec88..743662cedcfe 100644
--- a/packages/kit/test/apps/amp/test/test.js
+++ b/packages/kit/test/apps/amp/test/test.js
@@ -16,22 +16,11 @@ test('renders an AMP page', async ({ page, baseURL }) => {
 	expect(await page.$('script[sveltekit\\:data-type="data"]')).toBeNull();
 });
 
-test('styles are applied', async ({ page, baseURL }) => {
+test('styles are applied', async ({ page, baseURL, get_computed_style }) => {
 	await page.goto(`${baseURL}/valid`);
 
-	expect(
-		await page.evaluate(() => {
-			const el = document.querySelector('p');
-			return el && getComputedStyle(el).color;
-		})
-	).toEqual('rgb(255, 0, 0)');
-
-	expect(
-		await page.evaluate(() => {
-			const el = document.querySelector('footer');
-			return el && getComputedStyle(el).color;
-		})
-	).toEqual('rgb(128, 0, 128)');
+	expect(await get_computed_style('p', 'color')).toEqual('rgb(255, 0, 0)');
+	expect(await get_computed_style('footer', 'color')).toEqual('rgb(128, 0, 128)');
 });
 
 test('sets origin', async ({ baseURL, page }) => {
diff --git a/packages/kit/test/apps/basics/test/client.test.js b/packages/kit/test/apps/basics/test/client.test.js
index 127f85dbed5b..d217136ec0ca 100644
--- a/packages/kit/test/apps/basics/test/client.test.js
+++ b/packages/kit/test/apps/basics/test/client.test.js
@@ -280,17 +280,13 @@ test.describe('Load', () => {
 test.describe('Page options', () => {
 	test('applies generated component styles with ssr=false (hides announcer)', async ({
 		page,
-		clicknav
+		clicknav,
+		get_computed_style
 	}) => {
 		await page.goto('/no-ssr');
 		await clicknav('[href="/no-ssr/other"]');
 
-		expect(
-			await page.evaluate(() => {
-				const el = document.querySelector('#svelte-announcer');
-				return el && getComputedStyle(el).position;
-			})
-		).toBe('absolute');
+		expect(await get_computed_style('#svelte-announcer', 'position')).toBe('absolute');
 	});
 });
 
@@ -635,12 +631,10 @@ test.describe('Content negotiation', () => {
 		await page.goto('/routing/content-negotiation');
 		expect(await page.textContent('p')).toBe('Hi');
 
+		const pre = page.locator('pre');
 		for (const method of ['GET', 'PUT', 'PATCH', 'POST', 'DELETE']) {
 			await page.click(`button:has-text("${method}")`);
-			await page.waitForFunction(
-				(method) => document.querySelector('pre')?.textContent === method,
-				method
-			);
+			await expect(pre).toHaveText(method);
 		}
 	});
 
diff --git a/packages/kit/test/apps/basics/test/cross-platform/client.test.js b/packages/kit/test/apps/basics/test/cross-platform/client.test.js
index 34de866b9c2d..42693f8f30d4 100644
--- a/packages/kit/test/apps/basics/test/cross-platform/client.test.js
+++ b/packages/kit/test/apps/basics/test/cross-platform/client.test.js
@@ -275,7 +275,7 @@ test.describe('Scrolling', () => {
 	}) => {
 		await page.goto('/anchor');
 		await clicknav('#third-anchor');
-		expect(await page.evaluate(() => scrollY === 0)).toBeTruthy();
+		expect(await page.evaluate(() => scrollY)).toBe(0);
 	});
 
 	test('url-supplied anchor works when navigated from bottom of page', async ({
@@ -294,7 +294,7 @@ test.describe('Scrolling', () => {
 	}) => {
 		await page.goto('/anchor');
 		await clicknav('#last-anchor-2');
-		expect(await page.evaluate(() => scrollY === 0)).toBeTruthy();
+		expect(await page.evaluate(() => scrollY)).toBe(0);
 	});
 
 	test('scroll is restored after hitting the back button', async ({ baseURL, clicknav, page }) => {
@@ -427,16 +427,15 @@ test.describe('afterNavigate', () => {
 });
 
 test.describe('CSS', () => {
-	test('applies generated component styles (hides announcer)', async ({ page, clicknav }) => {
+	test('applies generated component styles (hides announcer)', async ({
+		page,
+		clicknav,
+		get_computed_style
+	}) => {
 		await page.goto('/css');
 		await clicknav('[href="/css/other"]');
 
-		expect(
-			await page.evaluate(() => {
-				const el = document.querySelector('#svelte-announcer');
-				return el && getComputedStyle(el).position;
-			})
-		).toBe('absolute');
+		expect(await get_computed_style('#svelte-announcer', 'position')).toBe('absolute');
 	});
 });
 
diff --git a/packages/kit/test/apps/basics/test/cross-platform/test.js b/packages/kit/test/apps/basics/test/cross-platform/test.js
index fa2e3dd736f8..77defda7364f 100644
--- a/packages/kit/test/apps/basics/test/cross-platform/test.js
+++ b/packages/kit/test/apps/basics/test/cross-platform/test.js
@@ -6,43 +6,28 @@ import { test } from '../../../../utils.js';
 test.describe.configure({ mode: 'parallel' });
 
 test.describe('CSS', () => {
-	test('applies imported styles', async ({ page }) => {
+	test('applies imported styles', async ({ page, get_computed_style }) => {
 		await page.goto('/css');
 
-		expect(
-			await page.evaluate(() => {
-				const el = document.querySelector('.styled');
-				return el && getComputedStyle(el).color;
-			})
-		).toBe('rgb(255, 0, 0)');
+		expect(await get_computed_style('.styled', 'color')).toBe('rgb(255, 0, 0)');
 	});
 
-	test('applies layout styles', async ({ page }) => {
+	test('applies layout styles', async ({ page, get_computed_style }) => {
 		await page.goto('/css');
 
-		expect(
-			await page.evaluate(() => {
-				const el = document.querySelector('footer');
-				return el && getComputedStyle(el).color;
-			})
-		).toBe('rgb(128, 0, 128)');
+		expect(await get_computed_style('footer', 'color')).toBe('rgb(128, 0, 128)');
 	});
 
-	test('applies local styles', async ({ page }) => {
+	test('applies local styles', async ({ page, get_computed_style }) => {
 		await page.goto('/css');
 
-		expect(
-			await page.evaluate(() => {
-				const el = document.querySelector('.also-styled');
-				return el && getComputedStyle(el).color;
-			})
-		).toBe('rgb(0, 0, 255)');
+		expect(await get_computed_style('.also-styled', 'color')).toBe('rgb(0, 0, 255)');
 	});
 
-	test('applies imported styles in the correct order', async ({ page }) => {
+	test('applies imported styles in the correct order', async ({ page, get_computed_style }) => {
 		await page.goto('/css');
 
-		const color = await page.$eval('.overridden', (el) => getComputedStyle(el).color);
+		const color = await get_computed_style('.overridden', 'color');
 		expect(color).toBe('rgb(0, 128, 0)');
 	});
 });
@@ -271,7 +256,7 @@ test.describe('Errors', () => {
 		});
 	}
 
-	test('server-side load errors', async ({ page }) => {
+	test('server-side load errors', async ({ page, get_computed_style }) => {
 		await page.goto('/errors/load-server');
 
 		expect(await page.textContent('footer')).toBe('Custom layout');
@@ -279,12 +264,7 @@ test.describe('Errors', () => {
 			'This is your custom error page saying: "Crashing now"'
 		);
 
-		expect(
-			await page.evaluate(() => {
-				const el = document.querySelector('h1');
-				return el && getComputedStyle(el).color;
-			})
-		).toBe('rgb(255, 0, 0)');
+		expect(await get_computed_style('h1', 'color')).toBe('rgb(255, 0, 0)');
 	});
 
 	test('404', async ({ page }) => {
@@ -800,23 +780,14 @@ test.describe('Routing', () => {
 	});
 
 	test(':target pseudo-selector works when navigating to a hash on the same page', async ({
-		page
+		page,
+		get_computed_style
 	}) => {
 		await page.goto('/routing/hashes/target#p1');
 
-		expect(
-			await page.evaluate(() => {
-				const el = document.getElementById('p1');
-				return el && getComputedStyle(el).color;
-			})
-		).toBe('rgb(255, 0, 0)');
+		expect(await get_computed_style('#p1', 'color')).toBe('rgb(255, 0, 0)');
 		await page.click('[href="#p2"]');
-		expect(
-			await page.evaluate(() => {
-				const el = document.getElementById('p2');
-				return el && getComputedStyle(el).color;
-			})
-		).toBe('rgb(255, 0, 0)');
+		expect(await get_computed_style('#p2', 'color')).toBe('rgb(255, 0, 0)');
 	});
 
 	test('last parameter in a segment wins in cases of ambiguity', async ({ page, clicknav }) => {
diff --git a/packages/kit/test/apps/basics/test/test.js b/packages/kit/test/apps/basics/test/test.js
index 6fb1d89ce00c..696061507ca9 100644
--- a/packages/kit/test/apps/basics/test/test.js
+++ b/packages/kit/test/apps/basics/test/test.js
@@ -447,15 +447,12 @@ test.describe('Load', () => {
 	});
 
 	test('CSS for dynamically imported components is reflected in server render', async ({
-		page
+		page,
+		get_computed_style
 	}) => {
 		await page.goto('/load/dynamic-import-styles');
-		expect(
-			await page.evaluate(() => {
-				const el = document.querySelector('#thing');
-				return el && getComputedStyle(el).color;
-			})
-		).toBe('rgb(255, 0, 0)');
+
+		expect(await get_computed_style('#thing', 'color')).toBe('rgb(255, 0, 0)');
 	});
 
 	test('page without load has access to layout data', async ({ page, clicknav }) => {
@@ -527,7 +524,7 @@ test.describe('Nested layouts', () => {
 		await page.goto('/nested-layout/error');
 
 		expect(await page.textContent('footer')).toBe('Custom layout');
-		expect(await page.evaluate(() => document.querySelector('p#nested'))).toBe(null);
+		expect(await page.$('p#nested')).toBeNull();
 		expect(await page.textContent('#message')).toBe(
 			'This is your custom error page saying: "Error"'
 		);
@@ -538,7 +535,7 @@ test.describe('Nested layouts', () => {
 		await page.goto('/nested-layout/');
 		await clicknav('[href="/nested-layout/error"]');
 		expect(await page.textContent('footer')).toBe('Custom layout');
-		expect(await page.evaluate(() => document.querySelector('p#nested'))).toBe(null);
+		expect(await page.$('p#nested')).toBe(null);
 		expect(await page.textContent('#message')).toBe(
 			'This is your custom error page saying: "Error"'
 		);
@@ -548,9 +545,9 @@ test.describe('Nested layouts', () => {
 	test('renders deeply-nested errors in the right layout', async ({ page }) => {
 		await page.goto('/nested-layout/foo/bar/nope');
 		expect(await page.textContent('footer')).toBe('Custom layout');
-		expect(await page.evaluate(() => document.querySelector('p#nested'))).toBeTruthy();
-		expect(await page.evaluate(() => document.querySelector('p#nested-foo'))).toBeTruthy();
-		expect(await page.evaluate(() => document.querySelector('p#nested-bar'))).toBeTruthy();
+		expect(await page.$('p#nested')).not.toBeNull();
+		expect(await page.$('p#nested-foo')).not.toBeNull();
+		expect(await page.$('p#nested-bar')).not.toBeNull();
 		expect(await page.textContent('#nested-error-message')).toBe('error.message: nope');
 	});
 
@@ -581,16 +578,10 @@ test.describe('Page options', () => {
 		if (!javaScriptEnabled) {
 			await page.goto('/no-csr');
 			expect(await page.textContent('h1')).toBe('look ma no javascript');
-			expect(
-				await page.evaluate(() => document.querySelectorAll('link[rel="modulepreload"]').length)
-			).toBe(0);
+			expect(await page.$$('link[rel="modulepreload"]')).toHaveLength(0);
 
 			// ensure data wasn't inlined
-			expect(
-				await page.evaluate(
-					() => document.querySelectorAll('script[sveltekit\\:data-type="data"]').length
-				)
-			).toBe(0);
+			expect(await page.$$('script[sveltekit\\:data-type="data"]')).toHaveLength(0);
 		}
 	});
 
@@ -600,8 +591,8 @@ test.describe('Page options', () => {
 		if (javaScriptEnabled) {
 			expect(await page.textContent('h1')).toBe('content was rendered');
 		} else {
-			expect(await page.evaluate(() => document.querySelector('h1'))).toBe(null);
-			expect(await page.evaluate(() => document.querySelector('style[data-sveltekit]'))).toBe(null);
+			expect(await page.$('h1')).toBeNull();
+			expect(await page.$('style[data-sveltekit]')).toBeNull();
 		}
 	});
 
diff --git a/packages/kit/test/apps/options/test/test.js b/packages/kit/test/apps/options/test/test.js
index 9921b6ef8653..295985858f70 100644
--- a/packages/kit/test/apps/options/test/test.js
+++ b/packages/kit/test/apps/options/test/test.js
@@ -59,20 +59,15 @@ test.describe('base path', () => {
 		}
 	});
 
-	test('loads CSS', async ({ page }) => {
+	test('loads CSS', async ({ page, get_computed_style }) => {
 		await page.goto('/path-base/base/');
-		expect(
-			await page.evaluate(() => {
-				const el = document.querySelector('p');
-				return el && getComputedStyle(el).color;
-			})
-		).toBe('rgb(255, 0, 0)');
+		expect(await get_computed_style('p', 'color')).toBe('rgb(255, 0, 0)');
 	});
 
 	test('inlines CSS', async ({ page, javaScriptEnabled }) => {
 		await page.goto('/path-base/base/');
 		if (process.env.DEV) {
-			const ssr_style = await page.evaluate(() => document.querySelector('style[data-sveltekit]'));
+			const ssr_style = await page.$('style[data-sveltekit]');
 
 			if (javaScriptEnabled) {
 				// <style data-sveltekit> is removed upon hydration
@@ -81,17 +76,11 @@ test.describe('base path', () => {
 				expect(ssr_style).not.toBeNull();
 			}
 
-			expect(
-				await page.evaluate(() => document.querySelector('link[rel="stylesheet"]'))
-			).toBeNull();
+			expect(await page.$('link[rel="stylesheet"]')).toBeNull();
 		} else {
-			expect(await page.evaluate(() => document.querySelector('style'))).not.toBeNull();
-			expect(
-				await page.evaluate(() => document.querySelector('link[rel="stylesheet"][disabled]'))
-			).not.toBeNull();
-			expect(
-				await page.evaluate(() => document.querySelector('link[rel="stylesheet"]:not([disabled])'))
-			).not.toBeNull();
+			expect(await page.$('style')).not.toBeNull();
+			expect(await page.$('link[rel="stylesheet"][disabled]')).not.toBeNull();
+			expect(await page.$('link[rel="stylesheet"]:not([disabled])')).not.toBeNull();
 		}
 	});
 
diff --git a/packages/kit/test/prerendering/basics/test/test.js b/packages/kit/test/prerendering/basics/test/test.js
index 07237ae90a00..9604856215c9 100644
--- a/packages/kit/test/prerendering/basics/test/test.js
+++ b/packages/kit/test/prerendering/basics/test/test.js
@@ -10,7 +10,7 @@ const read = (file, encoding = 'utf-8') => fs.readFileSync(`${build}/${file}`, e
 
 test('prerenders /', () => {
 	const content = read('index.html');
-	assert.ok(content.includes('<h1>hello</h1>'));
+	assert.match(content, '<h1>hello</h1>');
 });
 
 test('renders a redirect', () => {
@@ -51,12 +51,12 @@ test('escapes characters in redirect', () => {
 
 test('inserts http-equiv tag for cache-control headers', () => {
 	const content = read('max-age.html');
-	assert.ok(content.includes('<meta http-equiv="cache-control" content="max-age=300">'));
+	assert.match(content, '<meta http-equiv="cache-control" content="max-age=300">');
 });
 
 test('renders page with data from endpoint', () => {
 	const content = read('fetch-endpoint/buffered.html');
-	assert.ok(content.includes('<h1>the answer is 42</h1>'));
+	assert.match(content, '<h1>the answer is 42</h1>');
 
 	const json = read('fetch-endpoint/buffered.json');
 	assert.equal(json, JSON.stringify({ answer: 42 }));
@@ -64,7 +64,7 @@ test('renders page with data from endpoint', () => {
 
 test('renders page with unbuffered data from endpoint', () => {
 	const content = read('fetch-endpoint/not-buffered.html');
-	assert.ok(content.includes('<h1>content-type: application/json</h1>'), content);
+	assert.match(content, '<h1>content-type: application/json</h1>');
 
 	const json = read('fetch-endpoint/not-buffered.json');
 	assert.equal(json, JSON.stringify({ answer: 42 }));
@@ -72,7 +72,7 @@ test('renders page with unbuffered data from endpoint', () => {
 
 test('loads a file with spaces in the filename', () => {
 	const content = read('load-file-with-spaces.html');
-	assert.ok(content.includes('<h1>answer: 42</h1>'), content);
+	assert.match(content, '<h1>answer: 42</h1>');
 });
 
 test('generates __data.json file for shadow endpoints', () => {
@@ -104,32 +104,31 @@ test('generates __data.json file for shadow endpoints', () => {
 });
 
 test('does not prerender page with shadow endpoint with non-load handler', () => {
-	assert.ok(!fs.existsSync(`${build}/shadowed-post.html`));
-	assert.ok(!fs.existsSync(`${build}/shadowed-post/__data.json`));
+	assert.not(fs.existsSync(`${build}/shadowed-post.html`));
+	assert.not(fs.existsSync(`${build}/shadowed-post/__data.json`));
 });
 
 test('decodes paths when writing files', () => {
 	let content = read('encoding/path with spaces.html');
-	assert.ok(content.includes('<p id="a">path with spaces</p>'));
-	assert.ok(content.includes('<p id="b">path with encoded spaces</p>'));
+	assert.match(content, '<p id="a">path with spaces</p>');
+	assert.match(content, '<p id="b">path with encoded spaces</p>');
 
 	content = read('encoding/dynamic path with spaces.html');
-	assert.ok(
-		content.includes('<h1>dynamic path with spaces / /encoding/dynamic%20path%20with%20spaces</h1>')
+	assert.match(
+		content,
+		'<h1>dynamic path with spaces / /encoding/dynamic%20path%20with%20spaces</h1>'
 	);
 
 	content = read('encoding/dynamic path with encoded spaces.html');
-	assert.ok(
-		content.includes(
-			'<h1>dynamic path with encoded spaces / /encoding/dynamic%20path%20with%20encoded%20spaces</h1>'
-		)
+	assert.match(
+		content,
+		'<h1>dynamic path with encoded spaces / /encoding/dynamic%20path%20with%20encoded%20spaces</h1>'
 	);
 
 	content = read('encoding/redirected path with encoded spaces.html');
-	assert.ok(
-		content.includes(
-			'<h1>redirected path with encoded spaces / /encoding/redirected%20path%20with%20encoded%20spaces</h1>'
-		)
+	assert.match(
+		content,
+		'<h1>redirected path with encoded spaces / /encoding/redirected%20path%20with%20encoded%20spaces</h1>'
 	);
 
 	content = read('encoding/path with spaces.json');
@@ -141,12 +140,12 @@ test('decodes paths when writing files', () => {
 
 test('prerendering is set to true in root +layout.js', () => {
 	const content = read('prerendering-true.html');
-	assert.ok(content.includes('<h1>prerendering: true/true</h1>'), content);
+	assert.match(content, '<h1>prerendering: true/true</h1>');
 });
 
 test('fetching missing content results in a 404', () => {
 	const content = read('fetch-404.html');
-	assert.ok(content.includes('<h1>status: 404</h1>'), content);
+	assert.match(content, '<h1>status: 404</h1>');
 });
 
 test('prerenders binary data', async () => {
@@ -175,7 +174,7 @@ test('fetches data from local endpoint', () => {
 
 test('respects config.prerender.origin', () => {
 	const content = read('origin.html');
-	assert.ok(content.includes('<h2>http://example.com</h2>'));
+	assert.match(content, '<h2>http://example.com</h2>');
 });
 
 test('$env - includes environment variables', () => {
@@ -195,17 +194,17 @@ test('$env - includes environment variables', () => {
 
 test('prerenders a page in a (group)', () => {
 	const content = read('grouped.html');
-	assert.ok(content.includes('<h1>grouped</h1>'));
+	assert.match(content, '<h1>grouped</h1>');
 });
 
 test('injects relative service worker', () => {
 	const content = read('index.html');
-	assert.ok(content.includes(`navigator.serviceWorker.register('./service-worker.js')`));
+	assert.match(content, `navigator.serviceWorker.register('./service-worker.js')`);
 });
 
 test('define service worker variables', () => {
 	const content = read('service-worker.js');
-	assert.ok(content.includes(`MY_ENV DEFINED`));
+	assert.match(content, `MY_ENV DEFINED`);
 });
 
 test('prerendered.paths omits trailing slashes for endpoints', () => {
@@ -216,7 +215,7 @@ test('prerendered.paths omits trailing slashes for endpoints', () => {
 		'/trailing-slash/page/__data.json',
 		'/trailing-slash/standalone-endpoint.json'
 	]) {
-		assert.ok(content.includes(`"${path}"`), `Missing ${path}`);
+		assert.match(content, `"${path}"`, `Missing ${path}`);
 	}
 });
 
diff --git a/packages/kit/test/prerendering/options/test/test.js b/packages/kit/test/prerendering/options/test/test.js
index 7e8635cc8d22..3d81d7539672 100644
--- a/packages/kit/test/prerendering/options/test/test.js
+++ b/packages/kit/test/prerendering/options/test/test.js
@@ -10,35 +10,34 @@ const read = (file) => fs.readFileSync(`${build}/${file}`, 'utf-8');
 
 test('prerenders /path-base', () => {
 	const content = read('index.html');
-	assert.ok(content.includes('<h1>hello</h1>'));
+	assert.match(content, '<h1>hello</h1>');
 });
 
 test('prerenders nested /path-base', () => {
 	const content = read('nested/index.html');
-	assert.ok(content.includes('<h1>nested hello</h1>'));
+	assert.match(content, '<h1>nested hello</h1>');
 });
 
 test('adds CSP headers via meta tag', () => {
 	const content = read('index.html');
-	assert.ok(
-		content.includes(
-			'<meta http-equiv="content-security-policy" content="script-src \'self\' \'sha256-'
-		)
+	assert.match(
+		content,
+		'<meta http-equiv="content-security-policy" content="script-src \'self\' \'sha256-'
 	);
 });
 
 test('does not copy `public` into `_app`', () => {
-	assert.ok(!fs.existsSync(`${build}/_app/robots.txt`));
+	assert.not(fs.existsSync(`${build}/_app/robots.txt`));
 });
 
 // https://github.com/sveltejs/kit/issues/4340
 test('populates fallback 200.html file', () => {
 	const content = read('200.html');
-	assert.ok(content !== '');
+	assert.is.not(content, '');
 });
 
 test('does not prerender linked +server.js route', () => {
-	assert.ok(!fs.existsSync(`${build}/rss.xml`));
+	assert.not(fs.existsSync(`${build}/rss.xml`));
 });
 
 test.run();
diff --git a/packages/kit/test/utils.d.ts b/packages/kit/test/utils.d.ts
index ea9455e5e9f6..6ba3c0b8d89f 100644
--- a/packages/kit/test/utils.d.ts
+++ b/packages/kit/test/utils.d.ts
@@ -22,6 +22,7 @@ export const test: TestType<
 			};
 			clicknav(selector: string, options?: { timeout?: number }): Promise<void>;
 			in_view(selector: string): Promise<boolean>;
+			get_computed_style(selector: string, prop: string): Promise<string>;
 			/**
 			 * `handleError` defines the shape
 			 */
diff --git a/packages/kit/test/utils.js b/packages/kit/test/utils.js
index d8b0690271bd..55cc863bf55b 100644
--- a/packages/kit/test/utils.js
+++ b/packages/kit/test/utils.js
@@ -80,6 +80,23 @@ export const test = base.extend({
 		use(in_view);
 	},
 
+	get_computed_style: async ({ page }, use) => {
+		
+		/**
+		 * @param {string} selector
+		 * @param {string} prop
+		 */
+		async function get_computed_style(selector, prop) {
+			return page.$eval(
+				selector,
+				(node, prop) => window.getComputedStyle(node).getPropertyValue(prop),
+				prop
+			);
+		}
+
+		await use(get_computed_style);
+	},
+
 	page: async ({ page, javaScriptEnabled }, use) => {
 		// automatically wait for kit started event after navigation functions if js is enabled
 		const page_navigation_functions = ['goto', 'goBack', 'reload'];

From f35b0bb1f75fd61669b95ae2c829556e39a7d7ea Mon Sep 17 00:00:00 2001
From: gtmnayan <50981692+gtm-nayan@users.noreply.github.com>
Date: Fri, 21 Apr 2023 19:01:30 +0545
Subject: [PATCH 73/74] chore: separate `create-svelte` tests (#9728)

- move create-svelte test into own ci for better parallelization (and also declutters output for other runs)
- reorder install: create a temporary workspace to install all dependencies at once, which speeds up the test setup
---
 .github/workflows/ci.yml             |  11 ++
 package.json                         |   3 +-
 packages/create-svelte/test/check.js | 155 ++++++++++++---------------
 3 files changed, 82 insertions(+), 87 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 242087c1b568..4733f343fbd5 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -123,3 +123,14 @@ jobs:
           retention-days: 3
           name: test-failure-cross-platform-${{ matrix.mode }}-${{ github.run_id }}-${{ matrix.os }}-${{ matrix.node-version }}-${{ matrix.e2e-browser }}
           path: test-results-cross-platform-${{ matrix.mode }}.tar.gz
+  Test-create-svelte:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: pnpm/action-setup@v2.2.4
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 16
+          cache: pnpm
+      - run: pnpm install --frozen-lockfile
+      - run: pnpm run test:create-svelte
diff --git a/package.json b/package.json
index 426cd5cacd48..74dd99ac7ddb 100644
--- a/package.json
+++ b/package.json
@@ -4,10 +4,11 @@
 	"description": "monorepo for @sveltejs/kit and friends",
 	"private": true,
 	"scripts": {
-		"test": "pnpm test -r --filter=./packages/*",
+		"test": "pnpm test -r --filter=./packages/* --filter=!./packages/create-svelte",
 		"test:cross-platform:dev": "pnpm run --dir packages/kit test:cross-platform:dev",
 		"test:cross-platform:build": "pnpm run --dir packages/kit test:cross-platform:build",
 		"test:vite-ecosystem-ci": "pnpm test --dir packages/kit",
+		"test:create-svelte": "pnpm run --dir packages/create-svelte test",
 		"check": "pnpm -r check",
 		"lint": "pnpm -r lint && eslint 'packages/**/*.js'",
 		"format": "pnpm -r format",
diff --git a/packages/create-svelte/test/check.js b/packages/create-svelte/test/check.js
index 56531994c458..46b79050d92a 100644
--- a/packages/create-svelte/test/check.js
+++ b/packages/create-svelte/test/check.js
@@ -6,20 +6,20 @@ import * as assert from 'uvu/assert';
 import { create } from '../index.js';
 import { fileURLToPath } from 'node:url';
 import glob from 'tiny-glob';
+
+/** Resolve the given path relative to the current file */
+const resolve_path = (path) => fileURLToPath(new URL(path, import.meta.url));
+
 // use a directory outside of packages to ensure it isn't added to the pnpm workspace
-const test_workspace_dir = fileURLToPath(
-	new URL('../../../.test-tmp/create-svelte/', import.meta.url)
-);
+const test_workspace_dir = resolve_path('../../../.test-tmp/create-svelte/');
 
 const existing_workspace_overrides = JSON.parse(
-	fs.readFileSync(fileURLToPath(new URL('../../../package.json', import.meta.url)), 'utf-8')
+	fs.readFileSync(resolve_path('../../../package.json'), 'utf-8')
 ).pnpm?.overrides;
 
 const overrides = { ...existing_workspace_overrides };
 
-(
-	await glob(fileURLToPath(new URL('../../../packages', import.meta.url)) + '/*/package.json')
-).forEach((pkgPath) => {
+(await glob(resolve_path('../../../packages') + '/*/package.json')).forEach((pkgPath) => {
 	const name = JSON.parse(fs.readFileSync(pkgPath, 'utf-8')).name;
 	// use `file:` protocol for opting into stricter resolve logic which catches more bugs,
 	// but only on CI because it doesn't work locally for some reason
@@ -28,7 +28,7 @@ const overrides = { ...existing_workspace_overrides };
 });
 
 try {
-	const kit_dir = fileURLToPath(new URL('../../../packages/kit', import.meta.url));
+	const kit_dir = resolve_path('../../../packages/kit');
 	const ls_vite_result = execSync(`pnpm ls --json vite`, { cwd: kit_dir });
 	const vite_version = JSON.parse(ls_vite_result)[0].devDependencies.vite.version;
 	overrides.vite = vite_version;
@@ -37,97 +37,80 @@ try {
 	throw e;
 }
 
-test.before(() => {
-	try {
-		// prepare test pnpm workspace
-		fs.rmSync(test_workspace_dir, { recursive: true, force: true });
-		fs.mkdirSync(test_workspace_dir, { recursive: true });
-		const workspace = {
-			name: 'svelte-check-test-fake-pnpm-workspace',
-			private: true,
-			version: '0.0.0',
-			pnpm: { overrides },
-			devDependencies: overrides
-		};
-		fs.writeFileSync(
-			path.join(test_workspace_dir, 'package.json'),
-			JSON.stringify(workspace, null, '\t')
-		);
-		fs.writeFileSync(path.join(test_workspace_dir, 'pnpm-workspace.yaml'), 'packages:\n  - ./*\n');
-
-		// force creation of pnpm-lock.yaml in test workspace
-		console.log(`running pnpm install in .test-tmp/create-svelte`);
-		execSync('pnpm install --no-frozen-lockfile', { dir: test_workspace_dir, stdio: 'ignore' });
-	} catch (e) {
-		console.error('failed to setup create-svelte test workspace', e);
-		throw e;
-	}
-});
+// prepare test pnpm workspace
+fs.rmSync(test_workspace_dir, { recursive: true, force: true });
+fs.mkdirSync(test_workspace_dir, { recursive: true });
+const workspace = {
+	name: 'svelte-check-test-fake-pnpm-workspace',
+	private: true,
+	version: '0.0.0',
+	pnpm: { overrides },
+	devDependencies: overrides
+};
+fs.writeFileSync(
+	path.join(test_workspace_dir, 'package.json'),
+	JSON.stringify(workspace, null, '\t')
+);
+fs.writeFileSync(path.join(test_workspace_dir, 'pnpm-workspace.yaml'), 'packages:\n  - ./*\n');
 
 for (const template of fs.readdirSync('templates')) {
 	if (template[0] === '.') continue;
 
 	for (const types of ['checkjs', 'typescript']) {
-		test(`${template}: ${types}`, () => {
-			const cwd = path.join(test_workspace_dir, `${template}-${types}`);
-			fs.rmSync(cwd, { recursive: true, force: true });
+		const cwd = path.join(test_workspace_dir, `${template}-${types}`);
+		fs.rmSync(cwd, { recursive: true, force: true });
 
-			create(cwd, {
-				name: `create-svelte-test-${template}-${types}`,
-				template,
-				types,
-				prettier: true,
-				eslint: true,
-				playwright: false
-			});
-			const pkg = JSON.parse(fs.readFileSync(path.join(cwd, 'package.json'), 'utf-8'));
-			Object.entries(overrides).forEach(([key, value]) => {
-				if (pkg.devDependencies?.[key]) {
-					pkg.devDependencies[key] = value;
-				}
-				if (pkg.dependencies?.[key]) {
-					pkg.dependencies[key] = value;
-				}
-				if (!pkg.pnpm) {
-					pkg.pnpm = {};
-				}
-				if (!pkg.pnpm.overrides) {
-					pkg.pnpm.overrides = {};
-				}
-				pkg.pnpm.overrides = { ...pkg.pnpm.overrides, ...overrides };
-			});
-			pkg.private = true;
-			fs.writeFileSync(path.join(cwd, 'package.json'), JSON.stringify(pkg, null, '\t') + '\n');
-
-			// this pnpm install works in the test workspace, which redirects to our local packages again
-			console.log(`running pnpm install in ${cwd}`);
-			execSync('pnpm install --no-frozen-lockfile', { cwd, stdio: 'ignore' });
-
-			// run provided scripts that are non-blocking. All of them should exit with 0
-			const scripts_to_test = ['sync', 'format', 'lint', 'check', 'build'];
-
-			// package script requires lib dir
-			if (fs.existsSync(path.join(cwd, 'src', 'lib'))) {
-				scripts_to_test.push('package');
+		create(cwd, {
+			name: `create-svelte-test-${template}-${types}`,
+			template,
+			types,
+			prettier: true,
+			eslint: true,
+			playwright: false
+		});
+		const pkg = JSON.parse(fs.readFileSync(path.join(cwd, 'package.json'), 'utf-8'));
+		Object.entries(overrides).forEach(([key, value]) => {
+			if (pkg.devDependencies?.[key]) {
+				pkg.devDependencies[key] = value;
+			}
+			if (pkg.dependencies?.[key]) {
+				pkg.dependencies[key] = value;
+			}
+			if (!pkg.pnpm) {
+				pkg.pnpm = {};
 			}
+			if (!pkg.pnpm.overrides) {
+				pkg.pnpm.overrides = {};
+			}
+			pkg.pnpm.overrides = { ...pkg.pnpm.overrides, ...overrides };
+		});
+		pkg.private = true;
+		fs.writeFileSync(path.join(cwd, 'package.json'), JSON.stringify(pkg, null, '\t') + '\n');
+
+		// run provided scripts that are non-blocking. All of them should exit with 0
+		// package script requires lib dir
+		const scripts_to_test = ['sync', 'format', 'lint', 'check', 'build'];
+		if (fs.existsSync(path.join(cwd, 'src', 'lib'))) {
+			scripts_to_test.push('package');
+		}
 
-			// not all templates have all scripts
-			console.group(`${template}-${types}`);
-			for (const script of scripts_to_test.filter((s) => !!pkg.scripts[s])) {
+		for (const script of scripts_to_test.filter((s) => !!pkg.scripts[s])) {
+			test(`${template}-${types}: ${script}`, () => {
 				try {
 					execSync(`pnpm ${script}`, { cwd, stdio: 'pipe' });
-					console.log(`✅ ${script}`);
 				} catch (e) {
-					console.error(`❌ ${script}`);
-					console.error(`---\nstdout:\n${e.stdout}`);
-					console.error(`---\nstderr:\n${e.stderr}`);
-					console.groupEnd();
-					assert.unreachable(e.message);
+					assert.unreachable(
+						`script: ${script} failed\n` +
+							`---\nstdout:\n${e.stdout}\n` +
+							`---\nstderr:\n${e.stderr}`
+					);
 				}
-			}
-			console.groupEnd();
-		});
+			});
+		}
 	}
 }
 
+console.log('installing dependencies...');
+execSync('pnpm install --no-frozen-lockfile', { cwd: test_workspace_dir, stdio: 'ignore' });
+console.log('done installing dependencies');
 test.run();

From 3a8195dfe0f55c024b7b347e74c6e21480bda5bd Mon Sep 17 00:00:00 2001
From: Ben McCann <322311+benmccann@users.noreply.github.com>
Date: Fri, 21 Apr 2023 06:49:49 -0700
Subject: [PATCH 74/74] chore: fix formatting

---
 packages/kit/test/utils.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/kit/test/utils.js b/packages/kit/test/utils.js
index 55cc863bf55b..1507cd332d17 100644
--- a/packages/kit/test/utils.js
+++ b/packages/kit/test/utils.js
@@ -81,7 +81,6 @@ export const test = base.extend({
 	},
 
 	get_computed_style: async ({ page }, use) => {
-		
 		/**
 		 * @param {string} selector
 		 * @param {string} prop