diff --git a/packages/adapter-static/test/apps/prerendered/vite.config.js b/packages/adapter-static/test/apps/prerendered/vite.config.js
index c1b5219e47cb..29ad08debe6a 100644
--- a/packages/adapter-static/test/apps/prerendered/vite.config.js
+++ b/packages/adapter-static/test/apps/prerendered/vite.config.js
@@ -1,11 +1,11 @@
-import { plugin } from '../../utils.js';
+import { sveltekit } from '@sveltejs/kit/vite';
 
 /** @type {import('vite').UserConfig} */
 const config = {
 	build: {
 		minify: false
 	},
-	plugins: [plugin()]
+	plugins: [sveltekit()]
 };
 
 export default config;
diff --git a/packages/adapter-static/test/apps/spa/vite.config.js b/packages/adapter-static/test/apps/spa/vite.config.js
index c1b5219e47cb..29ad08debe6a 100644
--- a/packages/adapter-static/test/apps/spa/vite.config.js
+++ b/packages/adapter-static/test/apps/spa/vite.config.js
@@ -1,11 +1,11 @@
-import { plugin } from '../../utils.js';
+import { sveltekit } from '@sveltejs/kit/vite';
 
 /** @type {import('vite').UserConfig} */
 const config = {
 	build: {
 		minify: false
 	},
-	plugins: [plugin()]
+	plugins: [sveltekit()]
 };
 
 export default config;
diff --git a/packages/adapter-static/test/utils.js b/packages/adapter-static/test/utils.js
index 5eec374f3243..be3c90f034ec 100644
--- a/packages/adapter-static/test/utils.js
+++ b/packages/adapter-static/test/utils.js
@@ -107,7 +107,3 @@ function create_server(port, handler) {
 function rimraf(path) {
 	(fs.rmSync || fs.rmdirSync)(path, { recursive: true, force: true });
 }
-
-export const plugin = process.env.CI
-	? (await import('../../kit/dist/vite.js')).sveltekit
-	: (await import('../../kit/src/vite/index.js')).sveltekit;
diff --git a/packages/kit/package.json b/packages/kit/package.json
index e8d1c2a1c2ba..794b626e678a 100644
--- a/packages/kit/package.json
+++ b/packages/kit/package.json
@@ -12,12 +12,21 @@
 	"dependencies": {
 		"@sveltejs/vite-plugin-svelte": "^1.0.1",
 		"chokidar": "^3.5.3",
+		"cookie": "^0.5.0",
+		"devalue": "^2.0.1",
+		"kleur": "^4.1.4",
+		"magic-string": "^0.26.2",
+		"mime": "^3.0.0",
+		"node-fetch": "^3.2.4",
 		"sade": "^1.8.1",
-		"tiny-glob": "^0.2.9"
+		"set-cookie-parser": "^2.4.8",
+		"sirv": "^2.0.2",
+		"tiny-glob": "^0.2.9",
+		"typescript": "^4.7.4",
+		"undici": "^5.8.1"
 	},
 	"devDependencies": {
 		"@playwright/test": "^1.23.4",
-		"@rollup/plugin-replace": "^4.0.0",
 		"@types/connect": "^3.4.35",
 		"@types/cookie": "^0.5.1",
 		"@types/marked": "^4.0.3",
@@ -25,24 +34,11 @@
 		"@types/node": "^16.11.36",
 		"@types/sade": "^1.7.4",
 		"@types/set-cookie-parser": "^2.4.2",
-		"cookie": "^0.5.0",
-		"cross-env": "^7.0.3",
-		"devalue": "^2.0.1",
-		"kleur": "^4.1.4",
-		"magic-string": "^0.26.2",
 		"marked": "^4.0.16",
-		"mime": "^3.0.0",
-		"node-fetch": "^3.2.4",
 		"rollup": "^2.75.7",
-		"set-cookie-parser": "^2.4.8",
-		"sirv": "^2.0.2",
 		"svelte": "^3.48.0",
-		"svelte-check": "^2.7.1",
 		"svelte-preprocess": "^4.10.6",
 		"svelte2tsx": "~0.5.10",
-		"tiny-glob": "^0.2.9",
-		"typescript": "^4.7.4",
-		"undici": "^5.8.1",
 		"uvu": "^0.5.3",
 		"vite": "^3.0.0"
 	},
@@ -60,7 +56,7 @@
 		"svelte-kit.js"
 	],
 	"scripts": {
-		"build": "rollup -c && node scripts/cp.js src/runtime/components assets/components && npm run types",
+		"build": "npm run types",
 		"dev": "rollup -cw",
 		"lint": "prettier --check . --config ../../.prettierrc --ignore-path .gitignore",
 		"check": "tsc",
@@ -77,20 +73,20 @@
 	"exports": {
 		"./package.json": "./package.json",
 		".": {
-			"import": "./dist/index.js",
+			"import": "./src/index/index.js",
 			"types": "./types/index.d.ts"
 		},
 		"./node": {
-			"import": "./dist/node.js"
+			"import": "./src/node/index.js"
 		},
 		"./node/polyfills": {
-			"import": "./dist/node/polyfills.js"
+			"import": "./src/node/polyfills.js"
 		},
 		"./hooks": {
-			"import": "./dist/hooks.js"
+			"import": "./src/hooks.js"
 		},
 		"./vite": {
-			"import": "./dist/vite.js"
+			"import": "./src/vite/index.js"
 		}
 	},
 	"types": "types/index.d.ts",
diff --git a/packages/kit/rollup.config.js b/packages/kit/rollup.config.js
deleted file mode 100644
index 0783a9711dd5..000000000000
--- a/packages/kit/rollup.config.js
+++ /dev/null
@@ -1,69 +0,0 @@
-import commonjs from '@rollup/plugin-commonjs';
-import fs from 'fs';
-import replace from '@rollup/plugin-replace';
-import resolve from '@rollup/plugin-node-resolve';
-import pkg from './package.json';
-
-(fs.rmSync || fs.rmdirSync)('assets', { recursive: true, force: true });
-
-const external = [].concat(
-	Object.keys(pkg.dependencies || {}),
-	Object.keys(pkg.peerDependencies || {}),
-	Object.keys(process.binding('natives')),
-	'typescript',
-	'svelte2tsx',
-	'svelte',
-	'svelte/store',
-	'__GENERATED__/root.svelte',
-	'__GENERATED__/client-manifest.js'
-);
-
-export default {
-	input: {
-		// TODO move assets to dist/assets
-		'assets/client/start': 'src/runtime/client/start.js',
-		'assets/client/singletons': 'src/runtime/client/singletons.js',
-		'assets/app/navigation': 'src/runtime/app/navigation.js',
-		'assets/app/stores': 'src/runtime/app/stores.js',
-		'assets/app/paths': 'src/runtime/app/paths.js',
-		'assets/app/env': 'src/runtime/app/env.js',
-		'assets/env/dynamic/private': 'src/runtime/env/dynamic/private.js',
-		'assets/env/dynamic/public': 'src/runtime/env/dynamic/public.js',
-		'assets/env-private': 'src/runtime/env-private.js',
-		'assets/env-public': 'src/runtime/env-public.js',
-		'assets/paths': 'src/runtime/paths.js',
-		'assets/env': 'src/runtime/env.js',
-		'assets/server/index': 'src/runtime/server/index.js',
-
-		// TODO move dist to dist/exports
-		'dist/cli': 'src/cli.js',
-		'dist/index': 'src/index/index.js',
-		'dist/hooks': 'src/hooks.js',
-		'dist/node': 'src/node/index.js',
-		'dist/node/polyfills': 'src/node/polyfills.js',
-		'dist/prerender': 'src/core/prerender/prerender.js',
-		'dist/vite': 'src/vite/index.js'
-	},
-	output: {
-		dir: '.',
-		format: 'esm',
-		chunkFileNames: 'dist/chunks/[name].js'
-	},
-	external: (id) => {
-		return id.startsWith('node:') || external.includes(id);
-	},
-	plugins: [
-		replace({
-			preventAssignment: true,
-			values: {
-				__VERSION__: pkg.version,
-				'process.env.BUNDLED': 'true'
-			}
-		}),
-		resolve({
-			extensions: ['.mjs', '.js', '.ts']
-		}),
-		commonjs()
-	],
-	preserveEntrySignatures: true
-};
diff --git a/packages/kit/src/cli.js b/packages/kit/src/cli.js
index f896733c0a95..b3f172c214d1 100755
--- a/packages/kit/src/cli.js
+++ b/packages/kit/src/cli.js
@@ -19,7 +19,8 @@ function handle_error(e) {
 	process.exit(1);
 }
 
-const prog = sade('svelte-kit').version('__VERSION__');
+const pkg = JSON.parse(fs.readFileSync(new URL('../package.json', import.meta.url), 'utf-8'));
+const prog = sade('svelte-kit').version(pkg.version);
 
 prog
 	.command('package')
diff --git a/packages/kit/src/core/sync/copy_assets.js b/packages/kit/src/core/sync/copy_assets.js
deleted file mode 100644
index 9f0360a1a822..000000000000
--- a/packages/kit/src/core/sync/copy_assets.js
+++ /dev/null
@@ -1,25 +0,0 @@
-import fs from 'fs';
-import path from 'path';
-import { copy } from '../../utils/filesystem.js';
-import { fileURLToPath } from 'url';
-
-const filename = fileURLToPath(import.meta.url);
-const dirname = path.dirname(filename);
-
-/** @param {string} dest */
-export function copy_assets(dest) {
-	if (!process.env.BUNDLED) return;
-	let prefix = '..';
-	do {
-		// we jump through these hoops so that this function
-		// works whether or not it's been bundled
-		const resolved = path.resolve(dirname, `${prefix}/assets`);
-
-		if (fs.existsSync(resolved)) {
-			copy(resolved, dest);
-			return;
-		}
-
-		prefix = `../${prefix}`;
-	} while (true);
-}
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 05d41d9a08d9..c81b73b56d3a 100644
--- a/packages/kit/src/core/sync/create_manifest_data/index.js
+++ b/packages/kit/src/core/sync/create_manifest_data/index.js
@@ -1,7 +1,7 @@
 import fs from 'fs';
 import path from 'path';
 import mime from 'mime';
-import { get_runtime_directory } from '../../utils.js';
+import { runtime_directory } from '../../utils.js';
 import { posixify } from '../../../utils/filesystem.js';
 import { parse_route_id } from '../../../utils/routing.js';
 
@@ -17,7 +17,7 @@ const DEFAULT = 'default';
  */
 export default function create_manifest_data({
 	config,
-	fallback = `${get_runtime_directory(config.kit)}/components`,
+	fallback = `${runtime_directory}/components`,
 	cwd = process.cwd()
 }) {
 	/** @type {Map<string, import('types').RouteData>} */
diff --git a/packages/kit/src/core/sync/sync.js b/packages/kit/src/core/sync/sync.js
index b438a82315f3..e26a08321b30 100644
--- a/packages/kit/src/core/sync/sync.js
+++ b/packages/kit/src/core/sync/sync.js
@@ -1,6 +1,5 @@
 import path from 'path';
 import create_manifest_data from './create_manifest_data/index.js';
-import { copy_assets } from './copy_assets.js';
 import { write_client_manifest } from './write_client_manifest.js';
 import { write_matchers } from './write_matchers.js';
 import { write_root } from './write_root.js';
@@ -14,8 +13,6 @@ import { write_ambient } from './write_ambient.js';
  * @param {string} mode
  */
 export function init(config, mode) {
-	copy_assets(path.join(config.kit.outDir, 'runtime'));
-
 	write_tsconfig(config.kit);
 	write_ambient(config.kit, mode);
 }
diff --git a/packages/kit/src/core/utils.js b/packages/kit/src/core/utils.js
index c60e5d92bdb3..9cd8e3bcc66b 100644
--- a/packages/kit/src/core/utils.js
+++ b/packages/kit/src/core/utils.js
@@ -2,29 +2,11 @@ import path from 'path';
 import colors from 'kleur';
 import { fileURLToPath } from 'url';
 
-/**
- * Get the prefix for the `runtime` directory, for use with import declarations
- * @param {import('types').ValidatedKitConfig} config
- */
-export function get_runtime_prefix(config) {
-	if (process.env.BUNDLED) {
-		return posixify_path(path.join(config.outDir, 'runtime'));
-	}
+/** Resolved path of the `runtime` directory */
+export const runtime_directory = fileURLToPath(new URL('../runtime', import.meta.url));
 
-	return posixify_path(fileURLToPath(new URL('../runtime', import.meta.url)));
-}
-
-/**
- * Get the resolved path of the `runtime` directory
- * @param {import('types').ValidatedKitConfig} config
- */
-export function get_runtime_directory(config) {
-	if (process.env.BUNDLED) {
-		return path.join(config.outDir, 'runtime');
-	}
-
-	return fileURLToPath(new URL('../runtime', import.meta.url));
-}
+/** Prefix for the `runtime` directory, for use with import declarations */
+export const runtime_prefix = posixify_path(runtime_directory);
 
 /** @param {string} str */
 function posixify_path(str) {
diff --git a/packages/kit/src/index/private.js b/packages/kit/src/index/private.js
index 039d45bf3d8d..3d819dd324da 100644
--- a/packages/kit/src/index/private.js
+++ b/packages/kit/src/index/private.js
@@ -6,10 +6,6 @@ export class HttpError {
 	constructor(status, message) {
 		this.status = status;
 		this.message = message || `Error: ${status}`;
-
-		// this is a hack to workaround failed instanceof checks
-		// TODO figure out a better way to do this
-		this.__is_http_error = true;
 	}
 
 	toString() {
@@ -25,9 +21,5 @@ export class Redirect {
 	constructor(status, location) {
 		this.status = status;
 		this.location = location;
-
-		// this is a hack to workaround failed instanceof checks
-		// TODO figure out a better way to do this
-		this.__is_redirect = true;
 	}
 }
diff --git a/packages/kit/src/runtime/client/client.js b/packages/kit/src/runtime/client/client.js
index 4fbaae9a46bd..621dfd26ed58 100644
--- a/packages/kit/src/runtime/client/client.js
+++ b/packages/kit/src/runtime/client/client.js
@@ -16,6 +16,7 @@ import { error, redirect } from '../../index/index.js';
 
 import Root from '__GENERATED__/root.svelte';
 import { nodes, dictionary, matchers } from '__GENERATED__/client-manifest.js';
+import { HttpError, Redirect } from '../../index/private.js';
 
 const SCROLL_KEY = 'sveltekit:scroll';
 const INDEX_KEY = 'sveltekit:index';
@@ -724,16 +725,14 @@ export function create_client({ target, session, base, trailing_slash }) {
 				try {
 					branch.push(await branch_promises[i]);
 				} catch (e) {
-					if (/** @type {Redirect} */ (e)?.__is_redirect) {
+					if (e instanceof Redirect) {
 						return {
 							redirect: true,
 							location: /** @type {Redirect} */ (e).location
 						};
 					}
 
-					const status = /** @type {HttpError} */ (e).__is_http_error
-						? /** @type {HttpError} */ (e).status
-						: 500;
+					const status = e instanceof HttpError ? e.status : 500;
 					const error = coalesce_to_error(e);
 
 					while (i--) {
@@ -1239,7 +1238,7 @@ export function create_client({ target, session, base, trailing_slash }) {
 			} catch (e) {
 				// TODO handle HttpError cases
 				// TODO order of these ifs sensible?
-				if (/** @type {Redirect} */ (e).__is_redirect) {
+				if (e instanceof Redirect) {
 					// this is a real edge case — `load` would need to return
 					// a redirect but only in the browser
 					await native_navigation(new URL(/** @type {Redirect} */ (e).location, location.href));
diff --git a/packages/kit/src/runtime/server/page/index.js b/packages/kit/src/runtime/server/page/index.js
index 83dc461388fe..52b32846696b 100644
--- a/packages/kit/src/runtime/server/page/index.js
+++ b/packages/kit/src/runtime/server/page/index.js
@@ -4,7 +4,7 @@ import { respond_with_error } from './respond_with_error.js';
 import { method_not_allowed, clone_error, allowed_methods } from '../utils.js';
 import { create_fetch } from './fetch.js';
 import { LoadURL, PrerenderingURL } from '../../../utils/url.js';
-import { Redirect } from '../../../index/private.js';
+import { HttpError, Redirect } from '../../../index/private.js';
 import { error } from '../../../index/index.js';
 
 /**
@@ -87,7 +87,7 @@ export async function render_page(event, route, options, state, resolve_opts) {
 					mutation_error = error(405, 'Method not allowed');
 				}
 			} catch (e) {
-				if (e.__is_redirect) {
+				if (e instanceof Redirect) {
 					return redirect_response(e.status, e.location);
 				}
 
@@ -255,15 +255,15 @@ export async function render_page(event, route, options, state, resolve_opts) {
 						state.prerendering.dependencies.set(pathname, dependency);
 					}
 				} catch (error) {
-					if (/** @type {Redirect} */ (error).__is_redirect) {
+					if (error instanceof Redirect) {
 						return redirect_response(error.status, error.location);
 					}
 
-					if (!error.__is_http_error) {
-						options.handle_error(error, event);
+					if (!(error instanceof HttpError)) {
+						options.handle_error(/** @type {Error} */ (error), event);
 					}
 
-					const status = error.__is_http_error ? error.status : 500;
+					const status = error instanceof HttpError ? error.status : 500;
 
 					while (i--) {
 						if (route.errors[i]) {
@@ -393,11 +393,11 @@ export async function handle_json_request(event, options, mod) {
 
 		return new Response(undefined, { status: 204 });
 	} catch (error) {
-		if (error?.__is_redirect) {
+		if (error instanceof Redirect) {
 			return redirect_response(error.status, error.location);
 		}
 
-		if (error?.__is_http_error) {
+		if (error instanceof HttpError) {
 			return json_response({ message: error.message }, error.status);
 		}
 
diff --git a/packages/kit/src/vite/build/build_server.js b/packages/kit/src/vite/build/build_server.js
index c0e093fa63cf..633c03848dd9 100644
--- a/packages/kit/src/vite/build/build_server.js
+++ b/packages/kit/src/vite/build/build_server.js
@@ -3,7 +3,7 @@ import path from 'path';
 import { mkdirp, posixify } from '../../utils/filesystem.js';
 import { get_vite_config, merge_vite_configs, resolve_entry } from '../utils.js';
 import { load_template } from '../../core/config/index.js';
-import { get_runtime_directory } from '../../core/utils.js';
+import { runtime_directory } from '../../core/utils.js';
 import { create_build, find_deps, get_default_config, is_http_method } from './utils.js';
 import { s } from '../../utils/misc.js';
 
@@ -201,7 +201,7 @@ export async function build_server(options, client) {
 			config,
 			hooks: app_relative(hooks_file),
 			has_service_worker: config.kit.serviceWorker.register && !!service_worker_entry_file,
-			runtime: posixify(path.relative(build_dir, get_runtime_directory(config.kit))),
+			runtime: posixify(path.relative(build_dir, runtime_directory)),
 			template: load_template(cwd, config)
 		})
 	);
diff --git a/packages/kit/src/vite/build/utils.js b/packages/kit/src/vite/build/utils.js
index 6a134f21062b..d44e7744e2df 100644
--- a/packages/kit/src/vite/build/utils.js
+++ b/packages/kit/src/vite/build/utils.js
@@ -127,12 +127,11 @@ export const get_default_config = function ({ config, input, ssr, outDir }) {
 			// when developing against the Kit src code, we want to ensure that
 			// our dependencies are bundled so that apps don't need to install
 			// them as peerDependencies
-			noExternal: process.env.BUNDLED
-				? []
-				: Object.keys(
-						JSON.parse(fs.readFileSync(new URL('../../../package.json', import.meta.url), 'utf-8'))
-							.devDependencies
-				  )
+			// TODO is this still necessary?
+			noExternal: Object.keys(
+				JSON.parse(fs.readFileSync(new URL('../../../package.json', import.meta.url), 'utf-8'))
+					.devDependencies
+			)
 		}
 	};
 };
diff --git a/packages/kit/src/vite/dev/index.js b/packages/kit/src/vite/dev/index.js
index 69b11dd29786..f096e941cf33 100644
--- a/packages/kit/src/vite/dev/index.js
+++ b/packages/kit/src/vite/dev/index.js
@@ -11,7 +11,7 @@ import { parse_route_id } from '../../utils/routing.js';
 import { load_template } from '../../core/config/index.js';
 import { SVELTE_KIT_ASSETS } from '../../core/constants.js';
 import * as sync from '../../core/sync/sync.js';
-import { get_mime_lookup, get_runtime_prefix } from '../../core/utils.js';
+import { get_mime_lookup, runtime_prefix } from '../../core/utils.js';
 import { get_env, prevent_illegal_vite_imports, resolve_entry } from '../utils.js';
 
 // Vite doesn't expose this so we just copy the list for now
@@ -32,10 +32,8 @@ export async function dev(vite, vite_config, svelte_config, illegal_imports) {
 
 	sync.init(svelte_config, vite_config.mode);
 
-	const runtime = get_runtime_prefix(svelte_config.kit);
-
 	/** @type {import('types').Respond} */
-	const respond = (await import(`${runtime}/server/index.js`)).respond;
+	const respond = (await import(`${runtime_prefix}/server/index.js`)).respond;
 
 	/** @type {import('types').SSRManifest} */
 	let manifest;
@@ -63,7 +61,7 @@ export async function dev(vite, vite_config, svelte_config, illegal_imports) {
 			mimeTypes: get_mime_lookup(manifest_data),
 			_: {
 				entry: {
-					file: `/@fs${runtime}/client/start.js`,
+					file: `/@fs${runtime_prefix}/client/start.js`,
 					imports: [],
 					stylesheets: []
 				},
@@ -292,9 +290,7 @@ export async function dev(vite, vite_config, svelte_config, illegal_imports) {
 					);
 				}
 
-				const runtime_base = process.env.BUNDLED
-					? `/${posixify(path.relative(cwd, `${svelte_config.kit.outDir}/runtime`))}`
-					: `/@fs${runtime}`;
+				const runtime_base = `/@fs${runtime_prefix}`;
 
 				const { set_private_env } = await vite.ssrLoadModule(`${runtime_base}/env-private.js`);
 				const { set_public_env } = await vite.ssrLoadModule(`${runtime_base}/env-public.js`);
diff --git a/packages/kit/src/vite/index.js b/packages/kit/src/vite/index.js
index 4fa1290fa263..e20496b52eb6 100644
--- a/packages/kit/src/vite/index.js
+++ b/packages/kit/src/vite/index.js
@@ -11,7 +11,7 @@ import { build_service_worker } from './build/build_service_worker.js';
 import { load_config } from '../core/config/index.js';
 import { dev } from './dev/index.js';
 import { generate_manifest } from '../core/generate_manifest/index.js';
-import { get_runtime_directory, logger } from '../core/utils.js';
+import { runtime_directory, logger } from '../core/utils.js';
 import { find_deps, get_default_config as get_default_build_config } from './build/utils.js';
 import { preview } from './preview/index.js';
 import { get_aliases, resolve_entry, prevent_illegal_rollup_imports } from './utils.js';
@@ -123,7 +123,7 @@ function kit() {
 		const input = {
 			// Put unchanging assets in immutable directory. We don't set that in the
 			// outDir so that other plugins can add mutable assets to the bundle
-			start: `${get_runtime_directory(svelte_config.kit)}/client/start.js`
+			start: `${runtime_directory}/client/start.js`
 		};
 
 		manifest_data.nodes.forEach((node) => {
@@ -170,9 +170,7 @@ function kit() {
 			fs.readFileSync(`${paths.client_out_dir}/manifest.json`, 'utf-8')
 		);
 
-		const entry_id = posixify(
-			path.relative(cwd, `${get_runtime_directory(svelte_config.kit)}/client/start.js`)
-		);
+		const entry_id = posixify(path.relative(cwd, `${runtime_directory}/client/start.js`));
 
 		return {
 			assets,
@@ -233,7 +231,7 @@ function kit() {
 					rollupOptions: {
 						// Vite dependency crawler needs an explicit JS entry point
 						// eventhough server otherwise works without it
-						input: `${get_runtime_directory(svelte_config.kit)}/client/start.js`
+						input: `${runtime_directory}/client/start.js`
 					}
 				},
 				define: {
@@ -376,12 +374,7 @@ function kit() {
 				const results_path = `${svelte_config.kit.outDir}/generated/prerendered.json`;
 
 				// do prerendering in a subprocess so any dangling stuff gets killed upon completion
-				const script = fileURLToPath(
-					new URL(
-						process.env.BUNDLED ? './prerender.js' : '../core/prerender/prerender.js',
-						import.meta.url
-					)
-				);
+				const script = fileURLToPath(new URL('../core/prerender/prerender.js', import.meta.url));
 
 				const child = fork(
 					script,
diff --git a/packages/kit/src/vite/utils.js b/packages/kit/src/vite/utils.js
index 466f7d4c08de..1856c48a6d2d 100644
--- a/packages/kit/src/vite/utils.js
+++ b/packages/kit/src/vite/utils.js
@@ -1,7 +1,7 @@
 import fs from 'fs';
 import path from 'path';
 import { loadConfigFromFile, loadEnv, normalizePath } from 'vite';
-import { get_runtime_directory } from '../core/utils.js';
+import { runtime_directory } from '../core/utils.js';
 
 /**
  * @param {import('vite').ResolvedConfig} config
@@ -104,7 +104,7 @@ export function get_aliases(config) {
 	/** @type {import('vite').Alias[]} */
 	const alias = [
 		{ find: '__GENERATED__', replacement: path.posix.join(config.outDir, 'generated') },
-		{ find: '$app', replacement: `${get_runtime_directory(config)}/app` },
+		{ find: '$app', replacement: `${runtime_directory}/app` },
 		// For now, we handle `$lib` specially here rather than make it a default value for
 		// `config.kit.alias` since it has special meaning for packaging, etc.
 		{ find: '$lib', replacement: config.files.lib }
@@ -128,23 +128,20 @@ export function get_aliases(config) {
 		}
 	}
 
-	if (!process.env.BUNDLED) {
-		alias.push(
-			{
-				find: '$env/static/public',
-				replacement: path.posix.join(config.outDir, 'runtime/env/static/public.js')
-			},
-			{
-				find: '$env/static/private',
-				replacement: path.posix.join(config.outDir, 'runtime/env/static/private.js')
-			}
-		);
-	}
-
-	alias.push({
-		find: '$env',
-		replacement: `${get_runtime_directory(config)}/env`
-	});
+	alias.push(
+		{
+			find: '$env/static/public',
+			replacement: path.posix.join(config.outDir, 'runtime/env/static/public.js')
+		},
+		{
+			find: '$env/static/private',
+			replacement: path.posix.join(config.outDir, 'runtime/env/static/private.js')
+		},
+		{
+			find: '$env',
+			replacement: `${runtime_directory}/env`
+		}
+	);
 
 	return alias;
 }
diff --git a/packages/kit/svelte-kit.js b/packages/kit/svelte-kit.js
index bc94d37d31d6..b48389f69625 100755
--- a/packages/kit/svelte-kit.js
+++ b/packages/kit/svelte-kit.js
@@ -1,11 +1,2 @@
 #!/usr/bin/env node
-import fs from 'fs';
-import { fileURLToPath } from 'url';
-
-// in our own CI, and when deploying directly from this monorepo,
-// the `dist` directory will not exist yet
-if (fs.existsSync(fileURLToPath(new URL('./dist', import.meta.url)))) {
-	import('./dist/cli.js');
-} else {
-	console.error('Run "pnpm build" and try running this command again');
-}
+import './src/cli.js';
diff --git a/packages/kit/test/apps/amp/package.json b/packages/kit/test/apps/amp/package.json
index af9154548c7e..bdcaa43af4e7 100644
--- a/packages/kit/test/apps/amp/package.json
+++ b/packages/kit/test/apps/amp/package.json
@@ -6,7 +6,7 @@
 		"dev": "vite dev",
 		"build": "vite build",
 		"preview": "vite preview",
-		"check": "node ../../cli.js sync && tsc && svelte-check",
+		"check": "svelte-kit sync && tsc && svelte-check",
 		"test": "npm run test:dev && npm run test:build",
 		"test:dev": "cross-env DEV=true playwright test",
 		"test:build": "playwright test"
diff --git a/packages/kit/test/apps/amp/vite.config.js b/packages/kit/test/apps/amp/vite.config.js
index 7d997f333156..3c59318ad7c6 100644
--- a/packages/kit/test/apps/amp/vite.config.js
+++ b/packages/kit/test/apps/amp/vite.config.js
@@ -1,5 +1,5 @@
 import * as path from 'path';
-import { plugin } from '../../utils.js';
+import { sveltekit } from '@sveltejs/kit/vite';
 
 /** @type {import('vite').UserConfig} */
 const config = {
@@ -7,7 +7,7 @@ const config = {
 		minify: false
 	},
 	clearScreen: false,
-	plugins: [plugin()],
+	plugins: [sveltekit()],
 	server: {
 		fs: {
 			allow: [path.resolve('../../../src')]
diff --git a/packages/kit/test/apps/basics/package.json b/packages/kit/test/apps/basics/package.json
index 3375f7e65cf1..06a472f7f57d 100644
--- a/packages/kit/test/apps/basics/package.json
+++ b/packages/kit/test/apps/basics/package.json
@@ -6,7 +6,7 @@
 		"dev": "vite dev",
 		"build": "vite build",
 		"preview": "vite preview",
-		"check": "node ../../cli.js sync && tsc && svelte-check",
+		"check": "svelte-kit sync && tsc && svelte-check",
 		"test": "npm run test:dev && npm run test:build",
 		"test:dev": "rimraf test/errors.json && cross-env DEV=true playwright test",
 		"test:build": "rimraf test/errors.json && playwright test"
diff --git a/packages/kit/test/apps/basics/vite.config.js b/packages/kit/test/apps/basics/vite.config.js
index 37431aed85a2..1938615ca91c 100644
--- a/packages/kit/test/apps/basics/vite.config.js
+++ b/packages/kit/test/apps/basics/vite.config.js
@@ -1,5 +1,5 @@
 import * as path from 'path';
-import { plugin } from '../../utils.js';
+import { sveltekit } from '@sveltejs/kit/vite';
 
 /** @type {import('vite').UserConfig} */
 const config = {
@@ -12,7 +12,7 @@ const config = {
 		// the reload confuses Playwright
 		include: ['cookie', 'marked']
 	},
-	plugins: [plugin()],
+	plugins: [sveltekit()],
 	server: {
 		fs: {
 			allow: [path.resolve('../../../src')]
diff --git a/packages/kit/test/apps/options-2/package.json b/packages/kit/test/apps/options-2/package.json
index e320a400103b..096eca6c80a7 100644
--- a/packages/kit/test/apps/options-2/package.json
+++ b/packages/kit/test/apps/options-2/package.json
@@ -6,7 +6,7 @@
 		"dev": "vite dev",
 		"build": "vite build",
 		"preview": "vite preview",
-		"check": "node ../../cli.js sync && tsc && svelte-check",
+		"check": "svelte-kit sync && tsc && svelte-check",
 		"test": "npm run test:dev && npm run test:build",
 		"test:dev": "cross-env DEV=true playwright test",
 		"test:build": "playwright test"
diff --git a/packages/kit/test/apps/options-2/vite.config.js b/packages/kit/test/apps/options-2/vite.config.js
index 7d997f333156..3c59318ad7c6 100644
--- a/packages/kit/test/apps/options-2/vite.config.js
+++ b/packages/kit/test/apps/options-2/vite.config.js
@@ -1,5 +1,5 @@
 import * as path from 'path';
-import { plugin } from '../../utils.js';
+import { sveltekit } from '@sveltejs/kit/vite';
 
 /** @type {import('vite').UserConfig} */
 const config = {
@@ -7,7 +7,7 @@ const config = {
 		minify: false
 	},
 	clearScreen: false,
-	plugins: [plugin()],
+	plugins: [sveltekit()],
 	server: {
 		fs: {
 			allow: [path.resolve('../../../src')]
diff --git a/packages/kit/test/apps/options/package.json b/packages/kit/test/apps/options/package.json
index 7b2ce7d155ba..5da7c11fc3b9 100644
--- a/packages/kit/test/apps/options/package.json
+++ b/packages/kit/test/apps/options/package.json
@@ -6,7 +6,7 @@
 		"dev": "vite dev -c vite.custom.config.js",
 		"build": "vite build -c vite.custom.config.js --mode custom",
 		"preview": "vite preview -c vite.custom.config.js",
-		"check": "node ../../cli.js sync && tsc && svelte-check",
+		"check": "svelte-kit sync && tsc && svelte-check",
 		"test": "npm run test:dev && npm run test:build",
 		"test:dev": "cross-env DEV=true playwright test",
 		"test:build": "playwright test"
diff --git a/packages/kit/test/apps/options/vite.custom.config.js b/packages/kit/test/apps/options/vite.custom.config.js
index 7d997f333156..3c59318ad7c6 100644
--- a/packages/kit/test/apps/options/vite.custom.config.js
+++ b/packages/kit/test/apps/options/vite.custom.config.js
@@ -1,5 +1,5 @@
 import * as path from 'path';
-import { plugin } from '../../utils.js';
+import { sveltekit } from '@sveltejs/kit/vite';
 
 /** @type {import('vite').UserConfig} */
 const config = {
@@ -7,7 +7,7 @@ const config = {
 		minify: false
 	},
 	clearScreen: false,
-	plugins: [plugin()],
+	plugins: [sveltekit()],
 	server: {
 		fs: {
 			allow: [path.resolve('../../../src')]
diff --git a/packages/kit/test/apps/writes/package.json b/packages/kit/test/apps/writes/package.json
index a126ef3427b4..396e62815efe 100644
--- a/packages/kit/test/apps/writes/package.json
+++ b/packages/kit/test/apps/writes/package.json
@@ -6,7 +6,7 @@
 		"dev": "vite dev",
 		"build": "vite build",
 		"preview": "vite preview",
-		"check": "node ../../cli.js sync && tsc && svelte-check",
+		"check": "svelte-kit sync && tsc && svelte-check",
 		"test": "npm run test:dev && npm run test:build",
 		"test:dev": "rimraf test/errors.json && cross-env DEV=true playwright test",
 		"test:build": "rimraf test/errors.json && playwright test"
diff --git a/packages/kit/test/apps/writes/vite.config.js b/packages/kit/test/apps/writes/vite.config.js
index 7d997f333156..3c59318ad7c6 100644
--- a/packages/kit/test/apps/writes/vite.config.js
+++ b/packages/kit/test/apps/writes/vite.config.js
@@ -1,5 +1,5 @@
 import * as path from 'path';
-import { plugin } from '../../utils.js';
+import { sveltekit } from '@sveltejs/kit/vite';
 
 /** @type {import('vite').UserConfig} */
 const config = {
@@ -7,7 +7,7 @@ const config = {
 		minify: false
 	},
 	clearScreen: false,
-	plugins: [plugin()],
+	plugins: [sveltekit()],
 	server: {
 		fs: {
 			allow: [path.resolve('../../../src')]
diff --git a/packages/kit/test/cli.js b/packages/kit/test/cli.js
deleted file mode 100644
index 2749509a930f..000000000000
--- a/packages/kit/test/cli.js
+++ /dev/null
@@ -1,10 +0,0 @@
-import { spawn } from 'child_process';
-import { fileURLToPath } from 'url';
-
-const [node, , ...args] = process.argv;
-const mode = process.env.CI ? 'dist' : 'src';
-const bin = fileURLToPath(new URL(`../${mode}/cli.js`, import.meta.url));
-
-spawn(node, [bin, ...args], {
-	stdio: 'inherit'
-});
diff --git a/packages/kit/test/prerendering/basics/package.json b/packages/kit/test/prerendering/basics/package.json
index a234dd6cb850..3c0ad3cca129 100644
--- a/packages/kit/test/prerendering/basics/package.json
+++ b/packages/kit/test/prerendering/basics/package.json
@@ -6,7 +6,7 @@
 		"dev": "vite dev",
 		"build": "vite build",
 		"preview": "vite preview",
-		"check": "node ../../cli.js sync && tsc && svelte-check",
+		"check": "svelte-kit sync && tsc && svelte-check",
 		"test": "npm run build && uvu test"
 	},
 	"devDependencies": {
diff --git a/packages/kit/test/prerendering/basics/vite.config.js b/packages/kit/test/prerendering/basics/vite.config.js
index 7d997f333156..3c59318ad7c6 100644
--- a/packages/kit/test/prerendering/basics/vite.config.js
+++ b/packages/kit/test/prerendering/basics/vite.config.js
@@ -1,5 +1,5 @@
 import * as path from 'path';
-import { plugin } from '../../utils.js';
+import { sveltekit } from '@sveltejs/kit/vite';
 
 /** @type {import('vite').UserConfig} */
 const config = {
@@ -7,7 +7,7 @@ const config = {
 		minify: false
 	},
 	clearScreen: false,
-	plugins: [plugin()],
+	plugins: [sveltekit()],
 	server: {
 		fs: {
 			allow: [path.resolve('../../../src')]
diff --git a/packages/kit/test/prerendering/fallback/package.json b/packages/kit/test/prerendering/fallback/package.json
index d9d2a6b05034..cd2f0c4c7c30 100644
--- a/packages/kit/test/prerendering/fallback/package.json
+++ b/packages/kit/test/prerendering/fallback/package.json
@@ -6,7 +6,7 @@
 		"dev": "vite dev",
 		"build": "vite build",
 		"preview": "vite preview",
-		"check": "node ../../cli.js sync && tsc && svelte-check",
+		"check": "svelte-kit sync && tsc && svelte-check",
 		"test": "npm run build"
 	},
 	"devDependencies": {
diff --git a/packages/kit/test/prerendering/fallback/vite.config.js b/packages/kit/test/prerendering/fallback/vite.config.js
index 7d997f333156..3c59318ad7c6 100644
--- a/packages/kit/test/prerendering/fallback/vite.config.js
+++ b/packages/kit/test/prerendering/fallback/vite.config.js
@@ -1,5 +1,5 @@
 import * as path from 'path';
-import { plugin } from '../../utils.js';
+import { sveltekit } from '@sveltejs/kit/vite';
 
 /** @type {import('vite').UserConfig} */
 const config = {
@@ -7,7 +7,7 @@ const config = {
 		minify: false
 	},
 	clearScreen: false,
-	plugins: [plugin()],
+	plugins: [sveltekit()],
 	server: {
 		fs: {
 			allow: [path.resolve('../../../src')]
diff --git a/packages/kit/test/prerendering/options/package.json b/packages/kit/test/prerendering/options/package.json
index 29b138f5b496..f83b597edf9a 100644
--- a/packages/kit/test/prerendering/options/package.json
+++ b/packages/kit/test/prerendering/options/package.json
@@ -6,7 +6,7 @@
 		"dev": "vite dev",
 		"build": "vite build",
 		"preview": "vite preview",
-		"check": "node ../../cli.js sync && tsc && svelte-check",
+		"check": "svelte-kit sync && tsc && svelte-check",
 		"test": "npm run build && uvu test"
 	},
 	"devDependencies": {
diff --git a/packages/kit/test/prerendering/options/vite.config.js b/packages/kit/test/prerendering/options/vite.config.js
index 7d997f333156..3c59318ad7c6 100644
--- a/packages/kit/test/prerendering/options/vite.config.js
+++ b/packages/kit/test/prerendering/options/vite.config.js
@@ -1,5 +1,5 @@
 import * as path from 'path';
-import { plugin } from '../../utils.js';
+import { sveltekit } from '@sveltejs/kit/vite';
 
 /** @type {import('vite').UserConfig} */
 const config = {
@@ -7,7 +7,7 @@ const config = {
 		minify: false
 	},
 	clearScreen: false,
-	plugins: [plugin()],
+	plugins: [sveltekit()],
 	server: {
 		fs: {
 			allow: [path.resolve('../../../src')]
diff --git a/packages/kit/test/prerendering/paths-base/package.json b/packages/kit/test/prerendering/paths-base/package.json
index 13950563cfdc..6ad24e692f7a 100644
--- a/packages/kit/test/prerendering/paths-base/package.json
+++ b/packages/kit/test/prerendering/paths-base/package.json
@@ -6,7 +6,7 @@
 		"dev": "vite dev",
 		"build": "vite build",
 		"preview": "vite preview",
-		"check": "node ../../cli.js sync && tsc && svelte-check",
+		"check": "svelte-kit sync && tsc && svelte-check",
 		"test": "npm run build && uvu test"
 	},
 	"devDependencies": {
diff --git a/packages/kit/test/prerendering/paths-base/vite.config.js b/packages/kit/test/prerendering/paths-base/vite.config.js
index 7d997f333156..3c59318ad7c6 100644
--- a/packages/kit/test/prerendering/paths-base/vite.config.js
+++ b/packages/kit/test/prerendering/paths-base/vite.config.js
@@ -1,5 +1,5 @@
 import * as path from 'path';
-import { plugin } from '../../utils.js';
+import { sveltekit } from '@sveltejs/kit/vite';
 
 /** @type {import('vite').UserConfig} */
 const config = {
@@ -7,7 +7,7 @@ const config = {
 		minify: false
 	},
 	clearScreen: false,
-	plugins: [plugin()],
+	plugins: [sveltekit()],
 	server: {
 		fs: {
 			allow: [path.resolve('../../../src')]
diff --git a/packages/kit/test/prerendering/trailing-slash/package.json b/packages/kit/test/prerendering/trailing-slash/package.json
index 8038af7c7045..2fa3e9d82529 100644
--- a/packages/kit/test/prerendering/trailing-slash/package.json
+++ b/packages/kit/test/prerendering/trailing-slash/package.json
@@ -6,7 +6,7 @@
 		"dev": "vite dev",
 		"build": "vite build",
 		"preview": "vite preview",
-		"check": "node ../../cli.js sync && tsc && svelte-check",
+		"check": "svelte-kit sync && tsc && svelte-check",
 		"test": "npm run build && uvu test"
 	},
 	"devDependencies": {
diff --git a/packages/kit/test/prerendering/trailing-slash/vite.config.js b/packages/kit/test/prerendering/trailing-slash/vite.config.js
index 7d997f333156..3c59318ad7c6 100644
--- a/packages/kit/test/prerendering/trailing-slash/vite.config.js
+++ b/packages/kit/test/prerendering/trailing-slash/vite.config.js
@@ -1,5 +1,5 @@
 import * as path from 'path';
-import { plugin } from '../../utils.js';
+import { sveltekit } from '@sveltejs/kit/vite';
 
 /** @type {import('vite').UserConfig} */
 const config = {
@@ -7,7 +7,7 @@ const config = {
 		minify: false
 	},
 	clearScreen: false,
-	plugins: [plugin()],
+	plugins: [sveltekit()],
 	server: {
 		fs: {
 			allow: [path.resolve('../../../src')]
diff --git a/packages/kit/test/utils.js b/packages/kit/test/utils.js
index 017f47585ae3..07d367f93d1e 100644
--- a/packages/kit/test/utils.js
+++ b/packages/kit/test/utils.js
@@ -205,7 +205,3 @@ export async function start_server(handler) {
 		}
 	};
 }
-
-export const plugin = process.env.CI
-	? (await import('../dist/vite.js')).sveltekit
-	: (await import('../src/vite/index.js')).sveltekit;
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index a892497c664b..84fa0d5ca87f 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -269,7 +269,6 @@ importers:
   packages/kit:
     specifiers:
       '@playwright/test': ^1.23.4
-      '@rollup/plugin-replace': ^4.0.0
       '@sveltejs/vite-plugin-svelte': ^1.0.1
       '@types/connect': ^3.4.35
       '@types/cookie': ^0.5.1
@@ -280,7 +279,6 @@ importers:
       '@types/set-cookie-parser': ^2.4.2
       chokidar: ^3.5.3
       cookie: ^0.5.0
-      cross-env: ^7.0.3
       devalue: ^2.0.1
       kleur: ^4.1.4
       magic-string: ^0.26.2
@@ -292,7 +290,6 @@ importers:
       set-cookie-parser: ^2.4.8
       sirv: ^2.0.2
       svelte: ^3.48.0
-      svelte-check: ^2.7.1
       svelte-preprocess: ^4.10.6
       svelte2tsx: ~0.5.10
       tiny-glob: ^0.2.9
@@ -303,11 +300,20 @@ importers:
     dependencies:
       '@sveltejs/vite-plugin-svelte': 1.0.1_svelte@3.48.0+vite@3.0.0
       chokidar: 3.5.3
+      cookie: 0.5.0
+      devalue: 2.0.1
+      kleur: 4.1.5
+      magic-string: 0.26.2
+      mime: 3.0.0
+      node-fetch: 3.2.6
       sade: 1.8.1
+      set-cookie-parser: 2.5.0
+      sirv: 2.0.2
       tiny-glob: 0.2.9
+      typescript: 4.7.4
+      undici: 5.8.1
     devDependencies:
       '@playwright/test': 1.23.4
-      '@rollup/plugin-replace': 4.0.0_rollup@2.75.7
       '@types/connect': 3.4.35
       '@types/cookie': 0.5.1
       '@types/marked': 4.0.3
@@ -315,23 +321,11 @@ importers:
       '@types/node': 16.11.42
       '@types/sade': 1.7.4
       '@types/set-cookie-parser': 2.4.2
-      cookie: 0.5.0
-      cross-env: 7.0.3
-      devalue: 2.0.1
-      kleur: 4.1.5
-      magic-string: 0.26.2
       marked: 4.0.17
-      mime: 3.0.0
-      node-fetch: 3.2.6
       rollup: 2.75.7
-      set-cookie-parser: 2.5.0
-      sirv: 2.0.2
       svelte: 3.48.0
-      svelte-check: 2.8.0_svelte@3.48.0
       svelte-preprocess: 4.10.7_lvfi2wesz6u4l5rfbnetbucfmm
       svelte2tsx: 0.5.11_lvfi2wesz6u4l5rfbnetbucfmm
-      typescript: 4.7.4
-      undici: 5.8.1
       uvu: 0.5.4
       vite: 3.0.0
 
@@ -914,7 +908,6 @@ packages:
 
   /@polka/url/1.0.0-next.21:
     resolution: {integrity: sha512-a5Sab1C4/icpTZVzZc5Ghpz88yQtGOyNqYXcZgOssB2uuAr+wF/MvN6bgtW32q7HHrvBki+BsZ0OuNv6EV3K9g==}
-    dev: true
 
   /@rollup/plugin-commonjs/22.0.1_rollup@2.75.7:
     resolution: {integrity: sha512-dGfEZvdjDHObBiP5IvwTKMVeq/tBZGMBHZFMdIV1ClMM/YoWS34xrHFGfag9SN2ZtMgNZRFruqvxZQEa70O6nQ==}
@@ -956,16 +949,6 @@ packages:
       rollup: 2.75.7
     dev: true
 
-  /@rollup/plugin-replace/4.0.0_rollup@2.75.7:
-    resolution: {integrity: sha512-+rumQFiaNac9y64OHtkHGmdjm7us9bo1PlbgQfdihQtuNxzjpaB064HbRnewUOggLQxVCCyINfStkgmBeQpv1g==}
-    peerDependencies:
-      rollup: ^1.20.0 || ^2.0.0
-    dependencies:
-      '@rollup/pluginutils': 3.1.0_rollup@2.75.7
-      magic-string: 0.25.9
-      rollup: 2.75.7
-    dev: true
-
   /@rollup/pluginutils/3.1.0_rollup@2.75.7:
     resolution: {integrity: sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg==}
     engines: {node: '>= 8.0.0'}
@@ -1573,6 +1556,7 @@ packages:
   /cookie/0.5.0:
     resolution: {integrity: sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==}
     engines: {node: '>= 0.6'}
+    dev: false
 
   /cross-env/7.0.3:
     resolution: {integrity: sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw==}
@@ -1633,7 +1617,6 @@ packages:
   /data-uri-to-buffer/4.0.0:
     resolution: {integrity: sha512-Vr3mLBA8qWmcuschSLAOogKgQ/Jwxulv3RNE4FXnYWRGujzrRWQI4m12fQqRkwX06C0KanhLr4hK+GydchZsaA==}
     engines: {node: '>= 12'}
-    dev: true
 
   /dataloader/1.4.0:
     resolution: {integrity: sha512-68s5jYdlvasItOJnCuI2Q9s4q98g0pCyL3HrcKJu8KNugUl8ahgmZYg38ysLTgQjjXX3H8CJLkAvWrclWfcalw==}
@@ -1722,7 +1705,7 @@ packages:
 
   /devalue/2.0.1:
     resolution: {integrity: sha512-I2TiqT5iWBEyB8GRfTDP0hiLZ0YeDJZ+upDxjBfOC2lebO5LezQMv7QvIUTzdb64jQyAKLf1AHADtGN+jw6v8Q==}
-    dev: true
+    dev: false
 
   /diff/5.1.0:
     resolution: {integrity: sha512-D+mk+qE8VC/PAUrlAU34N+VfXev0ghe5ywmpqrawphmVZc1bEfn56uo9qpyGp1p4xpzOHkSW4ztBd6L7Xx4ACw==}
@@ -2079,7 +2062,6 @@ packages:
     dependencies:
       node-domexception: 1.0.0
       web-streams-polyfill: 3.2.1
-    dev: true
 
   /file-uri-to-path/1.0.0:
     resolution: {integrity: sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==}
@@ -2138,7 +2120,6 @@ packages:
     engines: {node: '>=12.20.0'}
     dependencies:
       fetch-blob: 3.1.5
-    dev: true
 
   /fs-constants/1.0.0:
     resolution: {integrity: sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==}
@@ -2840,7 +2821,6 @@ packages:
     resolution: {integrity: sha512-jSCU7/VB1loIWBZe14aEYHU/+1UMEHoaO7qxCOVJOw9GgH72VAWppxNcjU+x9a2k3GSIBXNKxXQFqRvvZ7vr3A==}
     engines: {node: '>=10.0.0'}
     hasBin: true
-    dev: true
 
   /mimic-fn/1.2.0:
     resolution: {integrity: sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==}
@@ -2961,7 +2941,6 @@ packages:
   /node-domexception/1.0.0:
     resolution: {integrity: sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ==}
     engines: {node: '>=10.5.0'}
-    dev: true
 
   /node-fetch/2.6.7:
     resolution: {integrity: sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==}
@@ -2981,7 +2960,6 @@ packages:
       data-uri-to-buffer: 4.0.0
       fetch-blob: 3.1.5
       formdata-polyfill: 4.0.10
-    dev: true
 
   /node-gyp-build/4.5.0:
     resolution: {integrity: sha512-2iGbaQBV+ITgCz76ZEjmhUKAKVf7xfY1sRl4UiKQspfZMH2h06SyhNsnSVy50cwkFQDGLyif6m/6uFXHkOZ6rg==}
@@ -3624,6 +3602,7 @@ packages:
 
   /set-cookie-parser/2.5.0:
     resolution: {integrity: sha512-cHMAtSXilfyBePduZEBVPTCftTQWz6ehWJD5YNUg4mqvRosrrjKbo4WS8JkB0/RxonMoohHm7cOGH60mDkRQ9w==}
+    dev: false
 
   /sharp/0.30.7:
     resolution: {integrity: sha512-G+MY2YW33jgflKPTXXptVO28HvNOo9G3j0MybYAHeEmby+QuD2U98dT6ueht9cv/XDqZspSpIhoSW+BAKJ7Hig==}
@@ -3734,7 +3713,6 @@ packages:
       '@polka/url': 1.0.0-next.21
       mrmime: 1.0.1
       totalist: 3.0.0
-    dev: true
 
   /sisteransi/1.0.5:
     resolution: {integrity: sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==}
@@ -4194,7 +4172,6 @@ packages:
   /totalist/3.0.0:
     resolution: {integrity: sha512-eM+pCBxXO/njtF7vdFsHuqb+ElbxqtI4r5EAvk6grfAFyJ6IvWlSkfZ5T9ozC6xWw3Fj1fGoSmrl0gUs46JVIw==}
     engines: {node: '>=6'}
-    dev: true
 
   /tr46/0.0.3:
     resolution: {integrity: sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==}
@@ -4410,7 +4387,7 @@ packages:
   /undici/5.8.1:
     resolution: {integrity: sha512-iDRmWX4Zar/4A/t+1LrKQRm102zw2l9Wgat3LtTlTn8ykvMZmAmpq9tjyHEigx18FsY7IfATvyN3xSw9BDz0eA==}
     engines: {node: '>=12.18'}
-    dev: true
+    dev: false
 
   /universalify/0.1.2:
     resolution: {integrity: sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==}
@@ -4515,7 +4492,6 @@ packages:
   /web-streams-polyfill/3.2.1:
     resolution: {integrity: sha512-e0MO3wdXWKrLbL0DgGnUV7WHVuw9OUvL4hjgnPkIeEvESk74gAITi5G606JtZPp39cd8HA9VQzCIvA49LpPN5Q==}
     engines: {node: '>= 8'}
-    dev: true
 
   /webidl-conversions/3.0.1:
     resolution: {integrity: sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==}