From 1ec306443cea92f8097a7b12d9da9bfedd431bda Mon Sep 17 00:00:00 2001
From: "S. Elliott Johnson" <sejohnson@torchcloudconsulting.com>
Date: Sat, 16 Jul 2022 21:28:49 -0600
Subject: [PATCH 01/95] feat: Add env config object

---
 packages/kit/src/core/config/options.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/kit/src/core/config/options.js b/packages/kit/src/core/config/options.js
index b19a3fa842bc..92718f71f8df 100644
--- a/packages/kit/src/core/config/options.js
+++ b/packages/kit/src/core/config/options.js
@@ -123,6 +123,10 @@ const options = object(
 				(keypath) => `${keypath} has been renamed to config.kit.moduleExtensions`
 			),
 
+			env: object({
+				publicPrefix: string('PUBLIC_')
+			}),
+
 			files: object({
 				assets: string('static'),
 				hooks: string(join('src', 'hooks')),

From 2b5e0c45d396bdfc6fdf7c0641b696efc2f99cc2 Mon Sep 17 00:00:00 2001
From: "S. Elliott Johnson" <sejohnson@torchcloudconsulting.com>
Date: Sat, 16 Jul 2022 21:31:49 -0600
Subject: [PATCH 02/95] feat: Added types

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

diff --git a/packages/kit/types/index.d.ts b/packages/kit/types/index.d.ts
index 97ff605ca3ec..bf9ea4322140 100644
--- a/packages/kit/types/index.d.ts
+++ b/packages/kit/types/index.d.ts
@@ -107,6 +107,9 @@ export interface KitConfig {
 		directives?: CspDirectives;
 		reportOnly?: CspDirectives;
 	};
+	env?: {
+		publicPrefix: string;
+	};
 	moduleExtensions?: string[];
 	files?: {
 		assets?: string;

From 91d04135630ea4100ac120848079fa65226943e5 Mon Sep 17 00:00:00 2001
From: "S. Elliott Johnson" <sejohnson@torchcloudconsulting.com>
Date: Sun, 17 Jul 2022 21:26:29 -0600
Subject: [PATCH 03/95] feat: Add .d.ts import to tsconfig

---
 packages/kit/src/core/sync/write_tsconfig.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/kit/src/core/sync/write_tsconfig.js b/packages/kit/src/core/sync/write_tsconfig.js
index 02bfa06a0c73..4956b89f3d38 100644
--- a/packages/kit/src/core/sync/write_tsconfig.js
+++ b/packages/kit/src/core/sync/write_tsconfig.js
@@ -36,6 +36,7 @@ export function write_tsconfig(config, cwd = process.cwd()) {
 		include.push(config_relative(`${dir}/**/*.ts`));
 		include.push(config_relative(`${dir}/**/*.svelte`));
 	});
+	include.push('types/ambient.d.ts');
 
 	/** @type {Record<string, string[]>} */
 	const paths = {};

From 12a3fd1128d89a5f21223b31c68c9790171700f4 Mon Sep 17 00:00:00 2001
From: "S. Elliott Johnson" <sejohnson@torchcloudconsulting.com>
Date: Sun, 17 Jul 2022 23:14:59 -0600
Subject: [PATCH 04/95] feat: Generate env var dump code

---
 packages/kit/src/core/sync/sync.js           |   2 +
 packages/kit/src/core/sync/utils.js          |  29 +++++
 packages/kit/src/core/sync/write_env.js      | 122 +++++++++++++++++++
 packages/kit/src/core/sync/write_tsconfig.js |   2 +-
 4 files changed, 154 insertions(+), 1 deletion(-)
 create mode 100644 packages/kit/src/core/sync/write_env.js

diff --git a/packages/kit/src/core/sync/sync.js b/packages/kit/src/core/sync/sync.js
index b88af92c7a0b..71d0555e127f 100644
--- a/packages/kit/src/core/sync/sync.js
+++ b/packages/kit/src/core/sync/sync.js
@@ -6,6 +6,7 @@ import { write_matchers } from './write_matchers.js';
 import { write_root } from './write_root.js';
 import { write_tsconfig } from './write_tsconfig.js';
 import { write_types } from './write_types.js';
+import { write_env } from './write_env';
 
 /** @param {import('types').ValidatedConfig} config */
 export function init(config) {
@@ -24,6 +25,7 @@ export function update(config) {
 	write_root(manifest_data, output);
 	write_matchers(manifest_data, output);
 	write_types(config, manifest_data);
+	write_env(config.kit);
 
 	return { manifest_data };
 }
diff --git a/packages/kit/src/core/sync/utils.js b/packages/kit/src/core/sync/utils.js
index be1862cd1927..a5b7c3c8cb40 100644
--- a/packages/kit/src/core/sync/utils.js
+++ b/packages/kit/src/core/sync/utils.js
@@ -31,3 +31,32 @@ export function trim(str) {
 	const pattern = new RegExp(`^${indentation}`, 'gm');
 	return str.replace(pattern, '').trim();
 }
+
+/**
+ * Adapted from https://github.com/joliss/js-string-escape/blob/master/index.js
+ * @param {string} str
+ * @returns
+ */
+export function escape(str) {
+	return str.replace(/["'\\\n\r\u2028\u2029]/g, (character) => {
+		// Escape all characters not included in SingleStringCharacters and
+		// DoubleStringCharacters on
+		// http://www.ecma-international.org/ecma-262/5.1/#sec-7.8.4
+		switch (character) {
+			case '"':
+			case "'":
+			case '\\':
+				return '\\' + character;
+			// Four possible LineTerminator characters need to be escaped:
+			case '\n':
+				return '\\n';
+			case '\r':
+				return '\\r';
+			case '\u2028':
+				return '\\u2028';
+			case '\u2029':
+				return '\\u2029';
+		}
+		return '';
+	});
+}
diff --git a/packages/kit/src/core/sync/write_env.js b/packages/kit/src/core/sync/write_env.js
new file mode 100644
index 000000000000..fbb96fb14bf4
--- /dev/null
+++ b/packages/kit/src/core/sync/write_env.js
@@ -0,0 +1,122 @@
+import { write_if_changed } from './utils';
+import path from 'path';
+import { escape } from './utils';
+import fs from 'fs';
+
+const autogen_comment = '// this section is auto-generated';
+
+/**
+ * @param {boolean} pub
+ * @param {Record<string, string>} env
+ * @returns {string}
+ */
+function const_declaration_template(pub, env) {
+	return `${autogen_comment}
+${
+	pub
+		? ''
+		: `if (!import.meta.env.SSR) {
+  throw new Error('Cannot import $app/env/private into client-side code');
+}
+`
+}
+${Object.entries(env)
+	.map(
+		([k, v]) => `/**
+ * @type {import('$app/env${pub ? '' : '/private'}').${k}}
+ */
+export const ${k} = "${escape(v)}";
+`
+	)
+	.join('\n')}
+`;
+}
+
+/**
+ * @param {boolean} pub
+ * @param {Record<string, string>} env
+ * @returns {string}
+ */
+function type_declaration_template(pub, env) {
+	return `declare module '$app/env${pub ? '' : '/private'}' {
+  ${Object.entries(env)
+		.map(([k]) => `export const ${k}: string;`)
+		.join('\n  ')}
+}`;
+}
+
+/**
+ * Writes the existing environment variables in process.env to
+ * $app/env and $app/env/public
+ * @param {import('types').ValidatedKitConfig} config
+ */
+export function write_env(config) {
+	const pub_out = path.join(config.outDir, 'runtime/app/env.js');
+	const priv_out = path.join(config.outDir, 'runtime/app/env/private.js');
+	const type_declaration_out = path.join(config.outDir, 'types/ambient.d.ts');
+
+	// public is a little difficult since we append to an
+	// already-existing file
+	const pub = resolve_public_env(config.env.publicPrefix);
+	let pub_content = const_declaration_template(true, pub);
+	const old_pub_content = fs.readFileSync(pub_out).toString();
+	const autogen_content_start = old_pub_content.indexOf(autogen_comment);
+	if (autogen_content_start === -1) {
+		pub_content = old_pub_content + '\n' + pub_content;
+	} else {
+		pub_content = old_pub_content.slice(0, autogen_content_start) + '\n' + pub_content;
+	}
+	write_if_changed(pub_out, pub_content);
+
+	// private is easy since it has its own file: just write if changed
+	const priv = resolve_private_env(config.env.publicPrefix);
+	const priv_content = const_declaration_template(false, priv);
+	write_if_changed(priv_out, priv_content);
+
+	const pub_declaration = type_declaration_template(true, pub);
+	const priv_declaration = type_declaration_template(false, priv);
+	write_if_changed(type_declaration_out, `${priv_declaration}\n${pub_declaration}`);
+}
+
+/**
+ * Generate a Record<string, string> of private environment variables
+ * (those that do not begin with public_prefix)
+ * @param {string} public_prefix
+ * @returns {Record<string, string>}
+ */
+function resolve_private_env(public_prefix) {
+	return resolve_env(false, public_prefix);
+}
+
+/**
+ * Generate a Record<string, string> of public environment variables
+ * (those that do begin with public_prefix)
+ * @param {string} public_prefix
+ * @returns {Record<string, string>}
+ */
+function resolve_public_env(public_prefix) {
+	return resolve_env(true, public_prefix);
+}
+
+/**
+ * Generate a Record<string, string> containing environment
+ * variable entries.
+ * @param {boolean} pub
+ * @param {string} public_prefix
+ * @returns {Record<string, string>}
+ */
+function resolve_env(pub, public_prefix) {
+	/** @type {Record<string, string>} */
+	const resolved = {};
+
+	// I'm smart enough to do this with reduce,
+	// but I'm also smart enough not to force
+	// someone else to read this with reduce later
+	Object.entries(process.env)
+		.filter(([k]) => (pub ? k.startsWith(public_prefix) : !k.startsWith(public_prefix)))
+		.forEach(([k, v]) => {
+			resolved[k] = v ?? '';
+		});
+
+	return resolved;
+}
diff --git a/packages/kit/src/core/sync/write_tsconfig.js b/packages/kit/src/core/sync/write_tsconfig.js
index 4956b89f3d38..bb0fe540ce1b 100644
--- a/packages/kit/src/core/sync/write_tsconfig.js
+++ b/packages/kit/src/core/sync/write_tsconfig.js
@@ -79,7 +79,7 @@ export function write_tsconfig(config, cwd = process.cwd()) {
 					target: 'esnext'
 				},
 				include,
-				exclude: [config_relative('node_modules/**'), './**']
+				exclude: [config_relative('node_modules/**'), './[!types/ambient.d.ts]**']
 			},
 			null,
 			'\t'

From 498d4f229ee3c538254c08589c2808a8bf8319de Mon Sep 17 00:00:00 2001
From: "S. Elliott Johnson" <sejohnson@torchcloudconsulting.com>
Date: Wed, 20 Jul 2022 23:13:59 -0600
Subject: [PATCH 05/95] fix: imports

---
 packages/kit/src/core/sync/sync.js      |  2 +-
 packages/kit/src/core/sync/write_env.js | 18 ++++++++++--------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/packages/kit/src/core/sync/sync.js b/packages/kit/src/core/sync/sync.js
index 71d0555e127f..3bf25dbeb79c 100644
--- a/packages/kit/src/core/sync/sync.js
+++ b/packages/kit/src/core/sync/sync.js
@@ -6,7 +6,7 @@ import { write_matchers } from './write_matchers.js';
 import { write_root } from './write_root.js';
 import { write_tsconfig } from './write_tsconfig.js';
 import { write_types } from './write_types.js';
-import { write_env } from './write_env';
+import { write_env } from './write_env.js';
 
 /** @param {import('types').ValidatedConfig} config */
 export function init(config) {
diff --git a/packages/kit/src/core/sync/write_env.js b/packages/kit/src/core/sync/write_env.js
index fbb96fb14bf4..2b88d4738fda 100644
--- a/packages/kit/src/core/sync/write_env.js
+++ b/packages/kit/src/core/sync/write_env.js
@@ -1,6 +1,6 @@
-import { write_if_changed } from './utils';
+import { write_if_changed } from './utils.js';
 import path from 'path';
-import { escape } from './utils';
+import { escape } from './utils.js';
 import fs from 'fs';
 
 const autogen_comment = '// this section is auto-generated';
@@ -59,12 +59,14 @@ export function write_env(config) {
 	// already-existing file
 	const pub = resolve_public_env(config.env.publicPrefix);
 	let pub_content = const_declaration_template(true, pub);
-	const old_pub_content = fs.readFileSync(pub_out).toString();
-	const autogen_content_start = old_pub_content.indexOf(autogen_comment);
-	if (autogen_content_start === -1) {
-		pub_content = old_pub_content + '\n' + pub_content;
-	} else {
-		pub_content = old_pub_content.slice(0, autogen_content_start) + '\n' + pub_content;
+	if (fs.existsSync(pub_out)) {
+		const old_pub_content = fs.readFileSync(pub_out).toString();
+		const autogen_content_start = old_pub_content.indexOf(autogen_comment);
+		if (autogen_content_start === -1) {
+			pub_content = old_pub_content + '\n' + pub_content;
+		} else {
+			pub_content = old_pub_content.slice(0, autogen_content_start) + '\n' + pub_content;
+		}
 	}
 	write_if_changed(pub_out, pub_content);
 

From 08600dfdd8cda36cfb865b5fd99f7f05b30dd355 Mon Sep 17 00:00:00 2001
From: "S. Elliott Johnson" <sejohnson@torchcloudconsulting.com>
Date: Thu, 21 Jul 2022 00:27:44 -0600
Subject: [PATCH 06/95] fix: Remove old error mechanism

---
 packages/kit/src/core/sync/write_env.js | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/packages/kit/src/core/sync/write_env.js b/packages/kit/src/core/sync/write_env.js
index 2b88d4738fda..434f590e2832 100644
--- a/packages/kit/src/core/sync/write_env.js
+++ b/packages/kit/src/core/sync/write_env.js
@@ -12,14 +12,7 @@ const autogen_comment = '// this section is auto-generated';
  */
 function const_declaration_template(pub, env) {
 	return `${autogen_comment}
-${
-	pub
-		? ''
-		: `if (!import.meta.env.SSR) {
-  throw new Error('Cannot import $app/env/private into client-side code');
-}
-`
-}
+
 ${Object.entries(env)
 	.map(
 		([k, v]) => `/**

From d5baa479cd7d481ee0e4d451eeac125d724215dc Mon Sep 17 00:00:00 2001
From: "S. Elliott Johnson" <sejohnson@torchcloudconsulting.com>
Date: Thu, 21 Jul 2022 01:14:21 -0600
Subject: [PATCH 07/95] feat: Rough edges of server-side module protection

---
 packages/kit/src/vite/dev/index.js | 47 +++++++++++++++++++++++++++---
 1 file changed, 43 insertions(+), 4 deletions(-)

diff --git a/packages/kit/src/vite/dev/index.js b/packages/kit/src/vite/dev/index.js
index b118afc23070..4a088be97402 100644
--- a/packages/kit/src/vite/dev/index.js
+++ b/packages/kit/src/vite/dev/index.js
@@ -60,6 +60,10 @@ export async function dev(vite, vite_config, svelte_config) {
 							await vite.ssrLoadModule(url)
 						);
 
+						const node = await vite.moduleGraph.getModuleByUrl(url);
+						if (!node) throw new Error(`Could not find node for ${url}`);
+						throw_if_illegal_private_import(node);
+
 						return {
 							module,
 							index,
@@ -68,10 +72,6 @@ export async function dev(vite, vite_config, svelte_config) {
 							stylesheets: [],
 							// in dev we inline all styles to avoid FOUC
 							inline_styles: async () => {
-								const node = await vite.moduleGraph.getModuleByUrl(url);
-
-								if (!node) throw new Error(`Could not find node for ${url}`);
-
 								const deps = new Set();
 								await find_deps(vite, node, deps);
 
@@ -465,3 +465,42 @@ function has_correct_case(file, assets) {
 
 	return false;
 }
+
+const illegal_import_names /** @type {Array<string>} */ = [
+	'.svelte-kit/runtime/app/env/private.js'
+];
+
+/**
+ * Mmmm, spicy recursion.
+ * Using a depth-first search rather than a breadth-first search because it makes
+ * making a pretty error easier
+ * @param {import('vite').ModuleNode} node
+ * @param {Array<string>} illegal_module_stack
+ */
+function throw_if_illegal_private_import_recursive(node, illegal_module_stack = []) {
+	if (node.importedModules.size === 0) {
+		return;
+	}
+	illegal_module_stack.push(node.file ?? 'unknown');
+	node.importedModules.forEach((childNode) => {
+		if (illegal_import_names.some((name) => childNode.file?.endsWith(name))) {
+			illegal_module_stack.push((childNode?.file ?? 'unknown') + ' (server-side only module)');
+			const stringified_stack = illegal_module_stack
+				.map((mod, i) => `  ${i}: ${mod}`)
+				.join(', which imports:\n');
+			throw new Error(
+				`Found an illegal import originating from: ${illegal_module_stack[0]}. It imports:\n${stringified_stack}`
+			);
+		}
+		throw_if_illegal_private_import_recursive(childNode, illegal_module_stack);
+	});
+	illegal_module_stack.pop();
+}
+
+/**
+ * Throw an error if a private module is imported from a client-side node.
+ * @param {import('vite').ModuleNode} node
+ */
+function throw_if_illegal_private_import(node) {
+	throw_if_illegal_private_import_recursive(node);
+}

From 87b3760a8f89b06d220dca1728221e49c69e7b34 Mon Sep 17 00:00:00 2001
From: "S. Elliott Johnson" <sejohnson@torchcloudconsulting.com>
Date: Thu, 21 Jul 2022 13:32:50 -0600
Subject: [PATCH 08/95] fix: Performance and add Vite overlay

---
 packages/kit/src/vite/dev/index.js | 46 ++++++++++++++++++++++++------
 1 file changed, 38 insertions(+), 8 deletions(-)

diff --git a/packages/kit/src/vite/dev/index.js b/packages/kit/src/vite/dev/index.js
index 4a088be97402..225b76d1f29d 100644
--- a/packages/kit/src/vite/dev/index.js
+++ b/packages/kit/src/vite/dev/index.js
@@ -62,7 +62,7 @@ export async function dev(vite, vite_config, svelte_config) {
 
 						const node = await vite.moduleGraph.getModuleByUrl(url);
 						if (!node) throw new Error(`Could not find node for ${url}`);
-						throw_if_illegal_private_import(node);
+						throw_if_illegal_private_import(vite.ws, node);
 
 						return {
 							module,
@@ -474,33 +474,63 @@ const illegal_import_names /** @type {Array<string>} */ = [
  * Mmmm, spicy recursion.
  * Using a depth-first search rather than a breadth-first search because it makes
  * making a pretty error easier
+ *
+ * It uses a set to prevent import cycles and a list to keep track of the current import
+ * "stack". This (roughly) doubles the memory footprint, but it's unlikely to be large,
+ * and it prevents the O(n) operation of having to check Array.prototype.includes.
+ * @param {import('vite').WebSocketServer} ws
  * @param {import('vite').ModuleNode} node
  * @param {Array<string>} illegal_module_stack
+ * @param {Set<string>} illegal_module_set
  */
-function throw_if_illegal_private_import_recursive(node, illegal_module_stack = []) {
-	if (node.importedModules.size === 0) {
+function throw_if_illegal_private_import_recursive(
+	ws,
+	node,
+	illegal_module_stack = [],
+	illegal_module_set = new Set()
+) {
+	const file = node.file ?? 'unknown';
+	// This prevents cyclical imports creating a stack overflow
+	if (illegal_module_set.has(file) || node.importedModules.size === 0) {
 		return;
 	}
-	illegal_module_stack.push(node.file ?? 'unknown');
+	illegal_module_set.add(file);
+	illegal_module_stack.push(file);
 	node.importedModules.forEach((childNode) => {
 		if (illegal_import_names.some((name) => childNode.file?.endsWith(name))) {
 			illegal_module_stack.push((childNode?.file ?? 'unknown') + ' (server-side only module)');
 			const stringified_stack = illegal_module_stack
 				.map((mod, i) => `  ${i}: ${mod}`)
 				.join(', which imports:\n');
-			throw new Error(
+			const err = new Error(
 				`Found an illegal import originating from: ${illegal_module_stack[0]}. It imports:\n${stringified_stack}`
 			);
+			ws.send({
+				type: 'error',
+				err: {
+					message: err.message,
+					stack: err.stack ?? '',
+					plugin: 'vite-plugin-svelte',
+					id: file
+				}
+			});
 		}
-		throw_if_illegal_private_import_recursive(childNode, illegal_module_stack);
+		throw_if_illegal_private_import_recursive(
+			ws,
+			childNode,
+			illegal_module_stack,
+			illegal_module_set
+		);
 	});
+	illegal_module_set.delete(file);
 	illegal_module_stack.pop();
 }
 
 /**
  * Throw an error if a private module is imported from a client-side node.
+ * @param {import('vite').WebSocketServer} ws
  * @param {import('vite').ModuleNode} node
  */
-function throw_if_illegal_private_import(node) {
-	throw_if_illegal_private_import_recursive(node);
+function throw_if_illegal_private_import(ws, node) {
+	throw_if_illegal_private_import_recursive(ws, node);
 }

From 27b7cee62801eeed4d4dd26f1bcc7fe2f833a6e7 Mon Sep 17 00:00:00 2001
From: "S. Elliott Johnson" <sejohnson@torchcloudconsulting.com>
Date: Thu, 21 Jul 2022 17:10:34 -0600
Subject: [PATCH 09/95] feat: First full draft of static environment vars

---
 packages/kit/src/vite/dev/index.js |  78 ++-------------
 packages/kit/src/vite/index.js     |  19 +++-
 packages/kit/src/vite/utils.js     | 154 +++++++++++++++++++++++++++++
 3 files changed, 179 insertions(+), 72 deletions(-)

diff --git a/packages/kit/src/vite/dev/index.js b/packages/kit/src/vite/dev/index.js
index 225b76d1f29d..d6a247b4a6c5 100644
--- a/packages/kit/src/vite/dev/index.js
+++ b/packages/kit/src/vite/dev/index.js
@@ -12,7 +12,11 @@ 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 { resolve_entry } from '../utils.js';
+import {
+	resolve_entry,
+	web_socket_server_to_error_handler,
+	throw_if_illegal_private_import_vite
+} from '../utils.js';
 
 // Vite doesn't expose this so we just copy the list for now
 // https://github.com/vitejs/vite/blob/3edd1af56e980aef56641a5a51cf2932bb580d41/packages/vite/src/node/plugins/css.ts#L96
@@ -62,7 +66,8 @@ export async function dev(vite, vite_config, svelte_config) {
 
 						const node = await vite.moduleGraph.getModuleByUrl(url);
 						if (!node) throw new Error(`Could not find node for ${url}`);
-						throw_if_illegal_private_import(vite.ws, node);
+						const error_handler = web_socket_server_to_error_handler(vite.ws);
+						throw_if_illegal_private_import_vite(error_handler, node);
 
 						return {
 							module,
@@ -465,72 +470,3 @@ function has_correct_case(file, assets) {
 
 	return false;
 }
-
-const illegal_import_names /** @type {Array<string>} */ = [
-	'.svelte-kit/runtime/app/env/private.js'
-];
-
-/**
- * Mmmm, spicy recursion.
- * Using a depth-first search rather than a breadth-first search because it makes
- * making a pretty error easier
- *
- * It uses a set to prevent import cycles and a list to keep track of the current import
- * "stack". This (roughly) doubles the memory footprint, but it's unlikely to be large,
- * and it prevents the O(n) operation of having to check Array.prototype.includes.
- * @param {import('vite').WebSocketServer} ws
- * @param {import('vite').ModuleNode} node
- * @param {Array<string>} illegal_module_stack
- * @param {Set<string>} illegal_module_set
- */
-function throw_if_illegal_private_import_recursive(
-	ws,
-	node,
-	illegal_module_stack = [],
-	illegal_module_set = new Set()
-) {
-	const file = node.file ?? 'unknown';
-	// This prevents cyclical imports creating a stack overflow
-	if (illegal_module_set.has(file) || node.importedModules.size === 0) {
-		return;
-	}
-	illegal_module_set.add(file);
-	illegal_module_stack.push(file);
-	node.importedModules.forEach((childNode) => {
-		if (illegal_import_names.some((name) => childNode.file?.endsWith(name))) {
-			illegal_module_stack.push((childNode?.file ?? 'unknown') + ' (server-side only module)');
-			const stringified_stack = illegal_module_stack
-				.map((mod, i) => `  ${i}: ${mod}`)
-				.join(', which imports:\n');
-			const err = new Error(
-				`Found an illegal import originating from: ${illegal_module_stack[0]}. It imports:\n${stringified_stack}`
-			);
-			ws.send({
-				type: 'error',
-				err: {
-					message: err.message,
-					stack: err.stack ?? '',
-					plugin: 'vite-plugin-svelte',
-					id: file
-				}
-			});
-		}
-		throw_if_illegal_private_import_recursive(
-			ws,
-			childNode,
-			illegal_module_stack,
-			illegal_module_set
-		);
-	});
-	illegal_module_set.delete(file);
-	illegal_module_stack.pop();
-}
-
-/**
- * Throw an error if a private module is imported from a client-side node.
- * @param {import('vite').WebSocketServer} ws
- * @param {import('vite').ModuleNode} node
- */
-function throw_if_illegal_private_import(ws, node) {
-	throw_if_illegal_private_import_recursive(ws, node);
-}
diff --git a/packages/kit/src/vite/index.js b/packages/kit/src/vite/index.js
index c170cc9984f0..b94f02954055 100644
--- a/packages/kit/src/vite/index.js
+++ b/packages/kit/src/vite/index.js
@@ -14,7 +14,7 @@ import { generate_manifest } from '../core/generate_manifest/index.js';
 import { get_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 } from './utils.js';
+import { get_aliases, resolve_entry, throw_if_illegal_private_import_rollup } from './utils.js';
 
 const cwd = process.cwd();
 
@@ -267,6 +267,23 @@ function kit() {
 		 * then use this hook to kick off builds for the server and service worker.
 		 */
 		async writeBundle(_options, bundle) {
+			for (const id of this.getModuleIds()) {
+				const found = manifest_data.components.find((comp) => id.endsWith(comp));
+				if (found) {
+					const module_info = this.getModuleInfo(id);
+					if (module_info === null) {
+						throw new Error(`Failed to locate module info for ${module_info}`);
+					}
+					throw_if_illegal_private_import_rollup(
+						this.getModuleInfo.bind(this),
+						(id, err) => {
+							throw err;
+						},
+						module_info
+					);
+				}
+			}
+
 			log = logger({
 				verbose: vite_config.logLevel === 'info'
 			});
diff --git a/packages/kit/src/vite/utils.js b/packages/kit/src/vite/utils.js
index 1a7eafaf92f0..29ea893c09d6 100644
--- a/packages/kit/src/vite/utils.js
+++ b/packages/kit/src/vite/utils.js
@@ -134,3 +134,157 @@ export function resolve_entry(entry) {
 
 	return null;
 }
+
+/**
+ * Derive an error handler from a web socket server.
+ * @param {import('vite').WebSocketServer} ws
+ */
+export function web_socket_server_to_error_handler(ws) {
+	/** @type {(id: string, err: Error) => void} */
+	return (id, err) =>
+		ws.send({
+			type: 'error',
+			err: {
+				message: err.message,
+				stack: err.stack ?? '',
+				plugin: 'vite-plugin-svelte',
+				id
+			}
+		});
+}
+
+const illegal_import_names /** @type {Array<string>} */ = [
+	'.svelte-kit/runtime/app/env/private.js'
+];
+
+/**
+ * Create a formatted error for an illegal import.
+ * @param {string} error_module_id
+ * @param {Array<string>} stack
+ * @param {(id: string, err: Error) => void} error_handler
+ */
+function handle_illegal_import_error(error_module_id, stack, error_handler) {
+	stack.push(error_module_id + ' (server-side only module)');
+	const stringified_stack = stack.map((mod, i) => `  ${i}: ${mod}`).join(', which imports:\n');
+	const err = new Error(
+		`Found an illegal import originating from: ${stack[0]}. It imports:\n${stringified_stack}`
+	);
+	error_handler(error_module_id, err);
+	return;
+}
+
+/**
+ * Recurse through the ModuleNode graph, throwing if the module
+ * imports a private module.
+ * @param {(id: string, err: Error) => void} error_handler
+ * @param {import('vite').ModuleNode} node
+ * @param {Array<string>} illegal_module_stack
+ * @param {Set<string>} illegal_module_set
+ */
+function throw_if_illegal_private_import_recursive_vite(
+	node,
+	error_handler = (id, err) => {
+		throw err;
+	},
+	illegal_module_stack = [],
+	illegal_module_set = new Set()
+) {
+	const file = node.file ?? 'unknown';
+	// This prevents cyclical imports creating a stack overflow
+	if (illegal_module_set.has(file) || node.importedModules.size === 0) {
+		return;
+	}
+	illegal_module_set.add(file);
+	illegal_module_stack.push(file);
+	node.importedModules.forEach((childNode) => {
+		if (illegal_import_names.some((name) => childNode.file?.endsWith(name))) {
+			handle_illegal_import_error(
+				childNode?.file ?? 'unknown',
+				illegal_module_stack,
+				error_handler
+			);
+			return;
+		}
+		throw_if_illegal_private_import_recursive_vite(
+			childNode,
+			error_handler,
+			illegal_module_stack,
+			illegal_module_set
+		);
+	});
+	illegal_module_set.delete(file);
+	illegal_module_stack.pop();
+}
+
+/**
+ * Throw an error if a private module is imported from a client-side node.
+ * @param {(id: string, err: Error) => void} error_handler
+ * @param {import('vite').ModuleNode} node
+ */
+export function throw_if_illegal_private_import_vite(error_handler, node) {
+	throw_if_illegal_private_import_recursive_vite(node, error_handler);
+}
+
+/**
+ * Recurse through the ModuleInfo graph, throwing if the module
+ * imports a private module.
+ * @param {import('rollup').GetModuleInfo} node_getter
+ * @param {import('rollup').ModuleInfo} node
+ * @param {(id: string, err: Error) => void} error_handler
+ * @param {Array<string>} illegal_module_stack
+ * @param {Set<string>} illegal_module_set
+ */
+function throw_if_illegal_private_import_recursive_rollup(
+	node_getter,
+	node,
+	error_handler = (id, err) => {
+		throw err;
+	},
+	illegal_module_stack = [],
+	illegal_module_set = new Set()
+) {
+	const id = node.id;
+	// This prevents cyclical imports creating a stack overflow
+	if (
+		illegal_module_set.has(id) ||
+		(node.importedIds.length === 0 && node.dynamicImporters.length === 0)
+	) {
+		return;
+	}
+	illegal_module_set.add(id);
+	illegal_module_stack.push(id);
+	/** @type {(child_id: string) => void} */
+	const recursiveChildNodeHandler = (childId) => {
+		const childNode = node_getter(childId);
+		if (childNode === null) {
+			const err = new Error(`Failed to find module info for ${childId}`);
+			error_handler(childId, err);
+			return;
+		}
+		if (illegal_import_names.some((name) => childId.endsWith(name))) {
+			handle_illegal_import_error(childId, illegal_module_stack, error_handler);
+			return;
+		}
+		throw_if_illegal_private_import_recursive_rollup(
+			node_getter,
+			childNode,
+			error_handler,
+			illegal_module_stack,
+			illegal_module_set
+		);
+	};
+	node.importedIds.forEach(recursiveChildNodeHandler);
+	node.dynamicallyImportedIds.forEach(recursiveChildNodeHandler);
+	illegal_module_set.delete(id);
+	illegal_module_stack.pop();
+}
+
+/**
+ * Throw an error if a private module is imported from a client-side node.
+ * @param {import('rollup').GetModuleInfo} node_getter
+ * @param {(id: string, err: Error) => void} error_handler
+ * @param {import('rollup').ModuleInfo} module_info
+ */
+export function throw_if_illegal_private_import_rollup(node_getter, error_handler, module_info) {
+	throw_if_illegal_private_import_recursive_rollup(node_getter, module_info, error_handler);
+}

From 42ac833a2c0aa25c4095d0073beb011076f724dc Mon Sep 17 00:00:00 2001
From: Rich Harris <hello@rich-harris.dev>
Date: Thu, 21 Jul 2022 19:28:44 -0400
Subject: [PATCH 10/95] fix unit tests

---
 packages/kit/src/core/config/index.spec.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/kit/src/core/config/index.spec.js b/packages/kit/src/core/config/index.spec.js
index ad9973ec12dd..1467c74bb779 100644
--- a/packages/kit/src/core/config/index.spec.js
+++ b/packages/kit/src/core/config/index.spec.js
@@ -73,6 +73,9 @@ const get_defaults = (prefix = '') => ({
 			reportOnly: directive_defaults
 		},
 		endpointExtensions: undefined,
+		env: {
+			publicPrefix: 'PUBLIC_'
+		},
 		files: {
 			assets: join(prefix, 'static'),
 			hooks: join(prefix, 'src/hooks'),

From 6522e56f7021d5408f554f45abecddec6bbe67b0 Mon Sep 17 00:00:00 2001
From: "S. Elliott Johnson" <sejohnson@torchcloudconsulting.com>
Date: Thu, 21 Jul 2022 18:24:46 -0600
Subject: [PATCH 11/95] fix: Rich is smarter than I am

---
 packages/kit/src/core/sync/utils.js     | 29 -------------------------
 packages/kit/src/core/sync/write_env.js |  7 +++---
 2 files changed, 3 insertions(+), 33 deletions(-)

diff --git a/packages/kit/src/core/sync/utils.js b/packages/kit/src/core/sync/utils.js
index a5b7c3c8cb40..be1862cd1927 100644
--- a/packages/kit/src/core/sync/utils.js
+++ b/packages/kit/src/core/sync/utils.js
@@ -31,32 +31,3 @@ export function trim(str) {
 	const pattern = new RegExp(`^${indentation}`, 'gm');
 	return str.replace(pattern, '').trim();
 }
-
-/**
- * Adapted from https://github.com/joliss/js-string-escape/blob/master/index.js
- * @param {string} str
- * @returns
- */
-export function escape(str) {
-	return str.replace(/["'\\\n\r\u2028\u2029]/g, (character) => {
-		// Escape all characters not included in SingleStringCharacters and
-		// DoubleStringCharacters on
-		// http://www.ecma-international.org/ecma-262/5.1/#sec-7.8.4
-		switch (character) {
-			case '"':
-			case "'":
-			case '\\':
-				return '\\' + character;
-			// Four possible LineTerminator characters need to be escaped:
-			case '\n':
-				return '\\n';
-			case '\r':
-				return '\\r';
-			case '\u2028':
-				return '\\u2028';
-			case '\u2029':
-				return '\\u2029';
-		}
-		return '';
-	});
-}
diff --git a/packages/kit/src/core/sync/write_env.js b/packages/kit/src/core/sync/write_env.js
index 434f590e2832..f8a322be9bbe 100644
--- a/packages/kit/src/core/sync/write_env.js
+++ b/packages/kit/src/core/sync/write_env.js
@@ -1,6 +1,5 @@
 import { write_if_changed } from './utils.js';
 import path from 'path';
-import { escape } from './utils.js';
 import fs from 'fs';
 
 const autogen_comment = '// this section is auto-generated';
@@ -18,7 +17,7 @@ ${Object.entries(env)
 		([k, v]) => `/**
  * @type {import('$app/env${pub ? '' : '/private'}').${k}}
  */
-export const ${k} = "${escape(v)}";
+export const ${k} = "${JSON.stringify(v)}";
 `
 	)
 	.join('\n')}
@@ -32,8 +31,8 @@ export const ${k} = "${escape(v)}";
  */
 function type_declaration_template(pub, env) {
 	return `declare module '$app/env${pub ? '' : '/private'}' {
-  ${Object.entries(env)
-		.map(([k]) => `export const ${k}: string;`)
+  ${Object.keys(env)
+		.map((k) => `export const ${k}: string;`)
 		.join('\n  ')}
 }`;
 }

From 736e1f3c7b0666b588a6a97f3f8251d6d0713f50 Mon Sep 17 00:00:00 2001
From: "S. Elliott Johnson" <sejohnson@torchcloudconsulting.com>
Date: Thu, 21 Jul 2022 19:35:01 -0600
Subject: [PATCH 12/95] feat: Let  know about Vite mode

---
 packages/kit/src/core/sync/sync.js      | 33 ++++++++++++++++++-------
 packages/kit/src/core/sync/write_env.js | 31 +++++++++++++++--------
 packages/kit/src/vite/dev/index.js      |  4 +--
 packages/kit/src/vite/index.js          |  2 +-
 4 files changed, 48 insertions(+), 22 deletions(-)

diff --git a/packages/kit/src/core/sync/sync.js b/packages/kit/src/core/sync/sync.js
index 3bf25dbeb79c..bf03872647ad 100644
--- a/packages/kit/src/core/sync/sync.js
+++ b/packages/kit/src/core/sync/sync.js
@@ -8,14 +8,23 @@ import { write_tsconfig } from './write_tsconfig.js';
 import { write_types } from './write_types.js';
 import { write_env } from './write_env.js';
 
-/** @param {import('types').ValidatedConfig} config */
-export function init(config) {
+/**
+ * Initialize SvelteKit's generated files.
+ * @param {import('types').ValidatedConfig} config
+ * @param {string | undefined} mode
+ */
+export function init(config, mode = undefined) {
 	copy_assets(path.join(config.kit.outDir, 'runtime'));
 	write_tsconfig(config.kit);
 }
 
-/** @param {import('types').ValidatedConfig} config */
-export function update(config) {
+/**
+ * Update SvelteKit's generated files.
+ * @param {import('types').ValidatedConfig} config
+ * @param {string | undefined} mode
+ * The Vite mode
+ */
+export function update(config, mode = undefined) {
 	const manifest_data = create_manifest_data({ config });
 
 	const output = path.join(config.kit.outDir, 'generated');
@@ -25,13 +34,19 @@ export function update(config) {
 	write_root(manifest_data, output);
 	write_matchers(manifest_data, output);
 	write_types(config, manifest_data);
-	write_env(config.kit);
+	write_env(config.kit, mode);
 
 	return { manifest_data };
 }
 
-/** @param {import('types').ValidatedConfig} config */
-export function all(config) {
-	init(config);
-	return update(config);
+/**
+ * Run sync.init and sync.update in series, returning the result from
+ * sync.update.
+ * @param {import('types').ValidatedConfig} config
+ * @param {string | undefined} mode
+ * The Vite mode
+ */
+export function all(config, mode = undefined) {
+	init(config, mode);
+	return update(config, mode);
 }
diff --git a/packages/kit/src/core/sync/write_env.js b/packages/kit/src/core/sync/write_env.js
index f8a322be9bbe..2bae3479fde5 100644
--- a/packages/kit/src/core/sync/write_env.js
+++ b/packages/kit/src/core/sync/write_env.js
@@ -1,6 +1,7 @@
 import { write_if_changed } from './utils.js';
 import path from 'path';
 import fs from 'fs';
+import { loadEnv } from 'vite';
 
 const autogen_comment = '// this section is auto-generated';
 
@@ -17,7 +18,7 @@ ${Object.entries(env)
 		([k, v]) => `/**
  * @type {import('$app/env${pub ? '' : '/private'}').${k}}
  */
-export const ${k} = "${JSON.stringify(v)}";
+export const ${k} = ${JSON.stringify(v)};
 `
 	)
 	.join('\n')}
@@ -41,15 +42,17 @@ function type_declaration_template(pub, env) {
  * Writes the existing environment variables in process.env to
  * $app/env and $app/env/public
  * @param {import('types').ValidatedKitConfig} config
+ * @param {string | undefined} mode
+ * The Vite mode.
  */
-export function write_env(config) {
+export function write_env(config, mode = undefined) {
 	const pub_out = path.join(config.outDir, 'runtime/app/env.js');
 	const priv_out = path.join(config.outDir, 'runtime/app/env/private.js');
 	const type_declaration_out = path.join(config.outDir, 'types/ambient.d.ts');
 
 	// public is a little difficult since we append to an
 	// already-existing file
-	const pub = resolve_public_env(config.env.publicPrefix);
+	const pub = resolve_public_env(config.env.publicPrefix, mode);
 	let pub_content = const_declaration_template(true, pub);
 	if (fs.existsSync(pub_out)) {
 		const old_pub_content = fs.readFileSync(pub_out).toString();
@@ -63,7 +66,7 @@ export function write_env(config) {
 	write_if_changed(pub_out, pub_content);
 
 	// private is easy since it has its own file: just write if changed
-	const priv = resolve_private_env(config.env.publicPrefix);
+	const priv = resolve_private_env(config.env.publicPrefix, mode);
 	const priv_content = const_declaration_template(false, priv);
 	write_if_changed(priv_out, priv_content);
 
@@ -76,20 +79,22 @@ export function write_env(config) {
  * Generate a Record<string, string> of private environment variables
  * (those that do not begin with public_prefix)
  * @param {string} public_prefix
+ * @param {string | undefined} mode
  * @returns {Record<string, string>}
  */
-function resolve_private_env(public_prefix) {
-	return resolve_env(false, public_prefix);
+function resolve_private_env(public_prefix, mode = undefined) {
+	return resolve_env(false, public_prefix, mode);
 }
 
 /**
  * Generate a Record<string, string> of public environment variables
  * (those that do begin with public_prefix)
  * @param {string} public_prefix
+ * @param {string | undefined} mode
  * @returns {Record<string, string>}
  */
-function resolve_public_env(public_prefix) {
-	return resolve_env(true, public_prefix);
+function resolve_public_env(public_prefix, mode = undefined) {
+	return resolve_env(true, public_prefix, mode);
 }
 
 /**
@@ -97,16 +102,22 @@ function resolve_public_env(public_prefix) {
  * variable entries.
  * @param {boolean} pub
  * @param {string} public_prefix
+ * @param {string} mode
  * @returns {Record<string, string>}
  */
-function resolve_env(pub, public_prefix) {
+function resolve_env(pub, public_prefix, mode = 'development') {
 	/** @type {Record<string, string>} */
 	const resolved = {};
 
+	const env = {
+		...process.env,
+		...loadEnv(mode, process.cwd(), '')
+	};
+
 	// I'm smart enough to do this with reduce,
 	// but I'm also smart enough not to force
 	// someone else to read this with reduce later
-	Object.entries(process.env)
+	Object.entries(env)
 		.filter(([k]) => (pub ? k.startsWith(public_prefix) : !k.startsWith(public_prefix)))
 		.forEach(([k, v]) => {
 			resolved[k] = v ?? '';
diff --git a/packages/kit/src/vite/dev/index.js b/packages/kit/src/vite/dev/index.js
index d6a247b4a6c5..d59a7e4ae587 100644
--- a/packages/kit/src/vite/dev/index.js
+++ b/packages/kit/src/vite/dev/index.js
@@ -33,7 +33,7 @@ const cwd = process.cwd();
 export async function dev(vite, vite_config, svelte_config) {
 	installPolyfills();
 
-	sync.init(svelte_config);
+	sync.init(svelte_config, vite_config.mode);
 
 	const runtime = get_runtime_prefix(svelte_config.kit);
 
@@ -44,7 +44,7 @@ export async function dev(vite, vite_config, svelte_config) {
 	let manifest;
 
 	function update_manifest() {
-		const { manifest_data } = sync.update(svelte_config);
+		const { manifest_data } = sync.update(svelte_config, vite_config.mode);
 
 		manifest = {
 			appDir: svelte_config.kit.appDir,
diff --git a/packages/kit/src/vite/index.js b/packages/kit/src/vite/index.js
index b94f02954055..8e298933f7f4 100644
--- a/packages/kit/src/vite/index.js
+++ b/packages/kit/src/vite/index.js
@@ -184,7 +184,7 @@ function kit() {
 			};
 
 			if (is_build) {
-				manifest_data = sync.all(svelte_config).manifest_data;
+				manifest_data = sync.all(svelte_config, config_env.mode).manifest_data;
 
 				const new_config = vite_client_build_config();
 

From 9c1381a61f0202abf4940fe0ce45abcdbe947803 Mon Sep 17 00:00:00 2001
From: "S. Elliott Johnson" <sejohnson@torchcloudconsulting.com>
Date: Thu, 21 Jul 2022 19:40:11 -0600
Subject: [PATCH 13/95] feat: Added  to sync CLI

---
 packages/kit/src/cli.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/packages/kit/src/cli.js b/packages/kit/src/cli.js
index 3f1a28f3764e..bb4bf7edb1af 100755
--- a/packages/kit/src/cli.js
+++ b/packages/kit/src/cli.js
@@ -38,7 +38,12 @@ prog
 prog
 	.command('sync')
 	.describe('Synchronise generated files')
-	.action(async () => {
+	.option(
+		'--mode',
+		'Specify a mode for loading environment variables (default: "development")',
+		undefined
+	)
+	.action(async ({ mode }) => {
 		if (!fs.existsSync('svelte.config.js')) {
 			console.warn('Missing svelte.config.js — skipping');
 			return;
@@ -47,7 +52,7 @@ prog
 		try {
 			const config = await load_config();
 			const sync = await import('./core/sync/sync.js');
-			sync.all(config);
+			sync.all(config, mode);
 		} catch (error) {
 			handle_error(error);
 		}

From 351c4cbcda7a7320383db9282d49ad5a5717e5f2 Mon Sep 17 00:00:00 2001
From: "S. Elliott Johnson" <sejohnson@torchcloudconsulting.com>
Date: Thu, 21 Jul 2022 22:33:20 -0600
Subject: [PATCH 14/95] feat: Added runtime variable support

---
 packages/adapter-node/src/handler.js        |  1 +
 packages/kit/src/core/sync/write_env.js     | 62 ++++++++++++++++++++-
 packages/kit/src/vite/build/build_server.js |  6 ++
 packages/kit/types/ambient.d.ts             | 12 ++++
 packages/kit/types/index.d.ts               |  5 ++
 5 files changed, 83 insertions(+), 3 deletions(-)

diff --git a/packages/adapter-node/src/handler.js b/packages/adapter-node/src/handler.js
index 4e3cfe1eeef3..e5e67bfa3af9 100644
--- a/packages/adapter-node/src/handler.js
+++ b/packages/adapter-node/src/handler.js
@@ -11,6 +11,7 @@ import { env } from './env.js';
 /* global ENV_PREFIX */
 
 const server = new Server(manifest);
+server.init({ env: process.env });
 const origin = env('ORIGIN', undefined);
 const xff_depth = parseInt(env('XFF_DEPTH', '1'));
 
diff --git a/packages/kit/src/core/sync/write_env.js b/packages/kit/src/core/sync/write_env.js
index 2bae3479fde5..5ed745fe0236 100644
--- a/packages/kit/src/core/sync/write_env.js
+++ b/packages/kit/src/core/sync/write_env.js
@@ -38,17 +38,39 @@ function type_declaration_template(pub, env) {
 }`;
 }
 
+function runtime_env_template() {
+	return `/** @type {App.RuntimeEnv} */
+export let env = {};
+
+/** @type {(environment: Record<string, string>) => void} */
+export function set_env(environment) {
+  env = environment;
+}`;
+}
+
 /**
  * Writes the existing environment variables in process.env to
- * $app/env and $app/env/public
+ * $app/env and $app/env/private
  * @param {import('types').ValidatedKitConfig} config
  * @param {string | undefined} mode
  * The Vite mode.
  */
 export function write_env(config, mode = undefined) {
+	const pub = write_public_env(config, mode);
+	const priv = write_private_env(config, mode);
+	write_runtime_env(config);
+	write_typedef(config, pub, priv);
+}
+
+/**
+ * Writes the existing environment variables prefixed with config.kit.env.publicPrefix
+ * in process.env to $app/env
+ * @param {import('types').ValidatedKitConfig} config
+ * @param {string | undefined} mode
+ * The Vite mode.
+ */
+function write_public_env(config, mode = undefined) {
 	const pub_out = path.join(config.outDir, 'runtime/app/env.js');
-	const priv_out = path.join(config.outDir, 'runtime/app/env/private.js');
-	const type_declaration_out = path.join(config.outDir, 'types/ambient.d.ts');
 
 	// public is a little difficult since we append to an
 	// already-existing file
@@ -64,12 +86,46 @@ export function write_env(config, mode = undefined) {
 		}
 	}
 	write_if_changed(pub_out, pub_content);
+	return pub;
+}
+
+/**
+ * Writes the existing environment variables not prefixed with config.kit.env.publicPrefix
+ * in process.env to $app/env/private
+ * @param {import('types').ValidatedKitConfig} config
+ * @param {string | undefined} mode
+ * The Vite mode.
+ */
+function write_private_env(config, mode = undefined) {
+	const priv_out = path.join(config.outDir, 'runtime/app/env/private.js');
 
 	// private is easy since it has its own file: just write if changed
 	const priv = resolve_private_env(config.env.publicPrefix, mode);
 	const priv_content = const_declaration_template(false, priv);
 	write_if_changed(priv_out, priv_content);
+	return priv;
+}
+
+/**
+ * Writes a blank export to $app/env/runtime. This should be populated by
+ * Server.init whenever an adapter calls it
+ * @param {import('types').ValidatedKitConfig} config
+ */
+function write_runtime_env(config) {
+	const runtime_out = path.join(config.outDir, 'runtime/app/env/runtime.js');
+
+	write_if_changed(runtime_out, runtime_env_template());
+}
 
+/**
+ * Writes the type definitions for the environment variable files
+ * to types/ambient.d.ts
+ * @param {import('types').ValidatedKitConfig} config
+ * @param {Record<string, string>} pub
+ * @param {Record<string, string>} priv
+ */
+function write_typedef(config, pub, priv) {
+	const type_declaration_out = path.join(config.outDir, 'types/ambient.d.ts');
 	const pub_declaration = type_declaration_template(true, pub);
 	const priv_declaration = type_declaration_template(false, priv);
 	write_if_changed(type_declaration_out, `${priv_declaration}\n${pub_declaration}`);
diff --git a/packages/kit/src/vite/build/build_server.js b/packages/kit/src/vite/build/build_server.js
index db7908b0e20a..a1f2135411b9 100644
--- a/packages/kit/src/vite/build/build_server.js
+++ b/packages/kit/src/vite/build/build_server.js
@@ -27,6 +27,7 @@ import root from '__GENERATED__/root.svelte';
 import { respond } from '${runtime}/server/index.js';
 import { set_paths, assets, base } from '${runtime}/paths.js';
 import { set_prerendering } from '${runtime}/env.js';
+import { set_env } from '${runtime}/app/env/runtime.js';
 
 const template = ({ head, body, assets, nonce }) => ${s(template)
 	.replace('%sveltekit.head%', '" + head + "')
@@ -88,6 +89,11 @@ export class Server {
 		};
 	}
 
+  init(options = { env: {} }) {
+    set_env(options.env);
+    return Promise.resolve();
+  }
+
 	async respond(request, options = {}) {
 		if (!(request instanceof Request)) {
 			throw new Error('The first argument to server.respond must be a Request object. See https://github.com/sveltejs/kit/pull/3384 for details');
diff --git a/packages/kit/types/ambient.d.ts b/packages/kit/types/ambient.d.ts
index 0662f091dacd..b755862cbda6 100644
--- a/packages/kit/types/ambient.d.ts
+++ b/packages/kit/types/ambient.d.ts
@@ -61,6 +61,11 @@ declare namespace App {
 	 * The interface that defines `stuff`, as input or output to [`load`](/docs/loading) or as the value of the `stuff` property of the [page store](/docs/modules#$app-stores).
 	 */
 	export interface Stuff {}
+
+	/**
+	 * The interface that defines the runtime environment variables exported from '$app/env/runtime'.
+	 */
+	export interface RuntimeEnv extends Record<string, string> {}
 }
 
 /**
@@ -85,6 +90,13 @@ declare module '$app/env' {
 	export const prerendering: boolean;
 }
 
+declare module '$app/env/runtime' {
+	/**
+	 * The runtime environment variables, as defined by the adapter.
+	 */
+	export let env: App.RuntimeEnv;
+}
+
 /**
  * ```ts
  * import {
diff --git a/packages/kit/types/index.d.ts b/packages/kit/types/index.d.ts
index c3d79edf0c6d..3995824b0c16 100644
--- a/packages/kit/types/index.d.ts
+++ b/packages/kit/types/index.d.ts
@@ -271,9 +271,14 @@ export type ResponseBody = JSONValue | Uint8Array | ReadableStream | Error;
 
 export class Server {
 	constructor(manifest: SSRManifest);
+	init(options: ServerInitOptions): Promise<void>;
 	respond(request: Request, options: RequestOptions): Promise<Response>;
 }
 
+export interface ServerInitOptions {
+	env: Record<string, string>;
+}
+
 export interface SSRManifest {
 	appDir: string;
 	assets: Set<string>;

From 944ff734f3f913a1a8a46f099a01f069087d4c6b Mon Sep 17 00:00:00 2001
From: "S. Elliott Johnson" <sejohnson@torchcloudconsulting.com>
Date: Thu, 21 Jul 2022 22:37:30 -0600
Subject: [PATCH 15/95] feat: Make server.init multicalls a noop

---
 packages/kit/src/vite/build/build_server.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/kit/src/vite/build/build_server.js b/packages/kit/src/vite/build/build_server.js
index a1f2135411b9..7101c4578bfe 100644
--- a/packages/kit/src/vite/build/build_server.js
+++ b/packages/kit/src/vite/build/build_server.js
@@ -36,6 +36,7 @@ const template = ({ head, body, assets, nonce }) => ${s(template)
 	.replace(/%sveltekit\.nonce%/g, '" + nonce + "')};
 
 let read = null;
+let initialized = false;
 
 set_paths(${s(config.kit.paths)});
 
@@ -90,7 +91,10 @@ export class Server {
 	}
 
   init(options = { env: {} }) {
-    set_env(options.env);
+    if (!initialized) {
+      set_env(options.env);
+      initialized = true;
+    }
     return Promise.resolve();
   }
 

From a04007830a3fe2ada319aa17fb5c74f9aff7414d Mon Sep 17 00:00:00 2001
From: "S. Elliott Johnson" <sejohnson@torchcloudconsulting.com>
Date: Thu, 21 Jul 2022 23:19:00 -0600
Subject: [PATCH 16/95] feat: Set runtime env in preview

---
 packages/kit/src/vite/preview/index.js | 6 ++++++
 packages/kit/types/internal.d.ts       | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/packages/kit/src/vite/preview/index.js b/packages/kit/src/vite/preview/index.js
index 078e6146ed3a..697e363a5b9e 100644
--- a/packages/kit/src/vite/preview/index.js
+++ b/packages/kit/src/vite/preview/index.js
@@ -42,6 +42,12 @@ export async function preview(vite, config, protocol) {
 	});
 
 	const server = new Server(manifest);
+	server.init({
+		// This just makes sure no values are undefined
+		env: Object.entries(process.env).reduce((prev, [k, v]) => {
+			return { ...prev, [k]: v ?? '' };
+		}, {})
+	});
 
 	return () => {
 		// files in `static`
diff --git a/packages/kit/types/internal.d.ts b/packages/kit/types/internal.d.ts
index f7a88de58f37..952bd877ac0e 100644
--- a/packages/kit/types/internal.d.ts
+++ b/packages/kit/types/internal.d.ts
@@ -11,6 +11,7 @@ import {
 	RequestHandler,
 	ResolveOptions,
 	Server,
+	ServerInitOptions,
 	SSRManifest
 } from './index.js';
 import {
@@ -92,6 +93,7 @@ export interface Hooks {
 }
 
 export class InternalServer extends Server {
+	init(options: ServerInitOptions): Promise<void>;
 	respond(
 		request: Request,
 		options: RequestOptions & {

From 34801e1cd2b2cffbf3565e169605a91548a485ee Mon Sep 17 00:00:00 2001
From: "S. Elliott Johnson" <sejohnson@torchcloudconsulting.com>
Date: Thu, 21 Jul 2022 23:19:33 -0600
Subject: [PATCH 17/95] this doesn't work?!: Set runtime env in dev

---
 packages/kit/src/vite/dev/index.js | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/packages/kit/src/vite/dev/index.js b/packages/kit/src/vite/dev/index.js
index d59a7e4ae587..4bd4d237fa48 100644
--- a/packages/kit/src/vite/dev/index.js
+++ b/packages/kit/src/vite/dev/index.js
@@ -240,6 +240,16 @@ export async function dev(vite, vite_config, svelte_config) {
 					? await vite.ssrLoadModule(`/${svelte_config.kit.files.hooks}`)
 					: {};
 
+				/** @type {(env: Record<string, string>) => void} */
+				const set_env = (await import(`${runtime}/app/env/runtime.js`)).set_env;
+
+				set_env(
+					// This just makes sure no values are undefined
+					Object.entries(process.env).reduce((prev, [k, v]) => {
+						return { ...prev, [k]: v ?? '' };
+					}, {})
+				);
+
 				const handle = user_hooks.handle || (({ event, resolve }) => resolve(event));
 
 				/** @type {import('types').Hooks} */

From 035a2cd72fcde8bf69e330f32d397be4bbaaa549 Mon Sep 17 00:00:00 2001
From: "S. Elliott Johnson" <sejohnson@torchcloudconsulting.com>
Date: Thu, 21 Jul 2022 23:22:23 -0600
Subject: [PATCH 18/95] feat: Added runtime env handler to cloudflare for
 testing

---
 packages/adapter-cloudflare/src/worker.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/adapter-cloudflare/src/worker.js b/packages/adapter-cloudflare/src/worker.js
index 1ba1bf8d145a..20993ee11beb 100644
--- a/packages/adapter-cloudflare/src/worker.js
+++ b/packages/adapter-cloudflare/src/worker.js
@@ -9,6 +9,7 @@ const prefix = `/${manifest.appDir}/`;
 /** @type {import('worktop/cfw').Module.Worker<{ ASSETS: import('worktop/cfw.durable').Durable.Object }>} */
 const worker = {
 	async fetch(req, env, context) {
+		server.init({ env });
 		// skip cache if "cache-control: no-cache" in request
 		let pragma = req.headers.get('cache-control') || '';
 		let res = !pragma.includes('no-cache') && (await Cache.lookup(req));

From 48f8cba448f014a6880bf3d421fbbfb9c6d7b1b5 Mon Sep 17 00:00:00 2001
From: Rich Harris <hello@rich-harris.dev>
Date: Fri, 22 Jul 2022 11:06:59 -0400
Subject: [PATCH 19/95] Update packages/kit/src/cli.js

---
 packages/kit/src/cli.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/kit/src/cli.js b/packages/kit/src/cli.js
index bb4bf7edb1af..1202838d843c 100755
--- a/packages/kit/src/cli.js
+++ b/packages/kit/src/cli.js
@@ -40,8 +40,8 @@ prog
 	.describe('Synchronise generated files')
 	.option(
 		'--mode',
-		'Specify a mode for loading environment variables (default: "development")',
-		undefined
+		'Specify a mode for loading environment variables',
+		'development'
 	)
 	.action(async ({ mode }) => {
 		if (!fs.existsSync('svelte.config.js')) {

From 61e3a67bfccc2fed3f9549ffb4a14291936c68de Mon Sep 17 00:00:00 2001
From: Rich Harris <hello@rich-harris.dev>
Date: Fri, 22 Jul 2022 11:08:40 -0400
Subject: [PATCH 20/95] Update packages/kit/src/core/sync/write_env.js

---
 packages/kit/src/core/sync/write_env.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/kit/src/core/sync/write_env.js b/packages/kit/src/core/sync/write_env.js
index 5ed745fe0236..641369f60172 100644
--- a/packages/kit/src/core/sync/write_env.js
+++ b/packages/kit/src/core/sync/write_env.js
@@ -74,7 +74,7 @@ function write_public_env(config, mode = undefined) {
 
 	// public is a little difficult since we append to an
 	// already-existing file
-	const pub = resolve_public_env(config.env.publicPrefix, mode);
+	const pub = loadEnv(mode, process.cwd(), config.env.publicPrefix);
 	let pub_content = const_declaration_template(true, pub);
 	if (fs.existsSync(pub_out)) {
 		const old_pub_content = fs.readFileSync(pub_out).toString();

From 1e6906a85c75a6ef41d0eb313cf6d0ae2e192bb9 Mon Sep 17 00:00:00 2001
From: Rich Harris <hello@rich-harris.dev>
Date: Fri, 22 Jul 2022 11:08:55 -0400
Subject: [PATCH 21/95] Update packages/kit/src/core/sync/write_env.js

---
 packages/kit/src/core/sync/write_env.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/kit/src/core/sync/write_env.js b/packages/kit/src/core/sync/write_env.js
index 641369f60172..efb820f9f697 100644
--- a/packages/kit/src/core/sync/write_env.js
+++ b/packages/kit/src/core/sync/write_env.js
@@ -100,7 +100,7 @@ function write_private_env(config, mode = undefined) {
 	const priv_out = path.join(config.outDir, 'runtime/app/env/private.js');
 
 	// private is easy since it has its own file: just write if changed
-	const priv = resolve_private_env(config.env.publicPrefix, mode);
+	const priv = loadEnv(mode, process.cwd(), '');
 	const priv_content = const_declaration_template(false, priv);
 	write_if_changed(priv_out, priv_content);
 	return priv;

From 1f70c4db93de6607badd1ae4db88552d55e5bba3 Mon Sep 17 00:00:00 2001
From: Rich Harris <hello@rich-harris.dev>
Date: Fri, 22 Jul 2022 11:09:08 -0400
Subject: [PATCH 22/95] Update packages/kit/src/vite/build/build_server.js

---
 packages/kit/src/vite/build/build_server.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/kit/src/vite/build/build_server.js b/packages/kit/src/vite/build/build_server.js
index 7101c4578bfe..7da158889027 100644
--- a/packages/kit/src/vite/build/build_server.js
+++ b/packages/kit/src/vite/build/build_server.js
@@ -95,7 +95,6 @@ export class Server {
       set_env(options.env);
       initialized = true;
     }
-    return Promise.resolve();
   }
 
 	async respond(request, options = {}) {

From 5f41062c5ec2cb662031535fe11fea3f877621df Mon Sep 17 00:00:00 2001
From: Rich Harris <hello@rich-harris.dev>
Date: Fri, 22 Jul 2022 11:09:23 -0400
Subject: [PATCH 23/95] Update packages/kit/src/core/sync/write_env.js

---
 packages/kit/src/core/sync/write_env.js | 51 -------------------------
 1 file changed, 51 deletions(-)

diff --git a/packages/kit/src/core/sync/write_env.js b/packages/kit/src/core/sync/write_env.js
index efb820f9f697..1c5cafd70312 100644
--- a/packages/kit/src/core/sync/write_env.js
+++ b/packages/kit/src/core/sync/write_env.js
@@ -130,54 +130,3 @@ function write_typedef(config, pub, priv) {
 	const priv_declaration = type_declaration_template(false, priv);
 	write_if_changed(type_declaration_out, `${priv_declaration}\n${pub_declaration}`);
 }
-
-/**
- * Generate a Record<string, string> of private environment variables
- * (those that do not begin with public_prefix)
- * @param {string} public_prefix
- * @param {string | undefined} mode
- * @returns {Record<string, string>}
- */
-function resolve_private_env(public_prefix, mode = undefined) {
-	return resolve_env(false, public_prefix, mode);
-}
-
-/**
- * Generate a Record<string, string> of public environment variables
- * (those that do begin with public_prefix)
- * @param {string} public_prefix
- * @param {string | undefined} mode
- * @returns {Record<string, string>}
- */
-function resolve_public_env(public_prefix, mode = undefined) {
-	return resolve_env(true, public_prefix, mode);
-}
-
-/**
- * Generate a Record<string, string> containing environment
- * variable entries.
- * @param {boolean} pub
- * @param {string} public_prefix
- * @param {string} mode
- * @returns {Record<string, string>}
- */
-function resolve_env(pub, public_prefix, mode = 'development') {
-	/** @type {Record<string, string>} */
-	const resolved = {};
-
-	const env = {
-		...process.env,
-		...loadEnv(mode, process.cwd(), '')
-	};
-
-	// I'm smart enough to do this with reduce,
-	// but I'm also smart enough not to force
-	// someone else to read this with reduce later
-	Object.entries(env)
-		.filter(([k]) => (pub ? k.startsWith(public_prefix) : !k.startsWith(public_prefix)))
-		.forEach(([k, v]) => {
-			resolved[k] = v ?? '';
-		});
-
-	return resolved;
-}

From 069e3dce3696cd0ea77730ee76278bfa40ca51fb Mon Sep 17 00:00:00 2001
From: Rich Harris <hello@rich-harris.dev>
Date: Fri, 22 Jul 2022 11:11:49 -0400
Subject: [PATCH 24/95] make mode required

---
 packages/kit/src/core/sync/sync.js      | 10 ++++------
 packages/kit/src/core/sync/write_env.js | 12 ++++++------
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/packages/kit/src/core/sync/sync.js b/packages/kit/src/core/sync/sync.js
index bf03872647ad..47e6bd8ba159 100644
--- a/packages/kit/src/core/sync/sync.js
+++ b/packages/kit/src/core/sync/sync.js
@@ -21,10 +21,9 @@ export function init(config, mode = undefined) {
 /**
  * Update SvelteKit's generated files.
  * @param {import('types').ValidatedConfig} config
- * @param {string | undefined} mode
- * The Vite mode
+ * @param {string} mode The Vite mode
  */
-export function update(config, mode = undefined) {
+export function update(config, mode) {
 	const manifest_data = create_manifest_data({ config });
 
 	const output = path.join(config.kit.outDir, 'generated');
@@ -43,10 +42,9 @@ export function update(config, mode = undefined) {
  * Run sync.init and sync.update in series, returning the result from
  * sync.update.
  * @param {import('types').ValidatedConfig} config
- * @param {string | undefined} mode
- * The Vite mode
+ * @param {string} mode The Vite mode
  */
-export function all(config, mode = undefined) {
+export function all(config, mode) {
 	init(config, mode);
 	return update(config, mode);
 }
diff --git a/packages/kit/src/core/sync/write_env.js b/packages/kit/src/core/sync/write_env.js
index 1c5cafd70312..c2b3314847ca 100644
--- a/packages/kit/src/core/sync/write_env.js
+++ b/packages/kit/src/core/sync/write_env.js
@@ -52,10 +52,10 @@ export function set_env(environment) {
  * Writes the existing environment variables in process.env to
  * $app/env and $app/env/private
  * @param {import('types').ValidatedKitConfig} config
- * @param {string | undefined} mode
+ * @param {string} mode
  * The Vite mode.
  */
-export function write_env(config, mode = undefined) {
+export function write_env(config, mode) {
 	const pub = write_public_env(config, mode);
 	const priv = write_private_env(config, mode);
 	write_runtime_env(config);
@@ -66,10 +66,10 @@ export function write_env(config, mode = undefined) {
  * Writes the existing environment variables prefixed with config.kit.env.publicPrefix
  * in process.env to $app/env
  * @param {import('types').ValidatedKitConfig} config
- * @param {string | undefined} mode
+ * @param {string} mode
  * The Vite mode.
  */
-function write_public_env(config, mode = undefined) {
+function write_public_env(config, mode) {
 	const pub_out = path.join(config.outDir, 'runtime/app/env.js');
 
 	// public is a little difficult since we append to an
@@ -93,10 +93,10 @@ function write_public_env(config, mode = undefined) {
  * Writes the existing environment variables not prefixed with config.kit.env.publicPrefix
  * in process.env to $app/env/private
  * @param {import('types').ValidatedKitConfig} config
- * @param {string | undefined} mode
+ * @param {string} mode
  * The Vite mode.
  */
-function write_private_env(config, mode = undefined) {
+function write_private_env(config, mode) {
 	const priv_out = path.join(config.outDir, 'runtime/app/env/private.js');
 
 	// private is easy since it has its own file: just write if changed

From 5774f08e3e929b4998bdc18573162a748455e972 Mon Sep 17 00:00:00 2001
From: Rich Harris <hello@rich-harris.dev>
Date: Fri, 22 Jul 2022 11:13:31 -0400
Subject: [PATCH 25/95] move env/runtime to a file

---
 packages/kit/rollup.config.js               |  1 +
 packages/kit/src/core/sync/write_env.js     | 22 ---------------------
 packages/kit/src/runtime/app/env/runtime.js |  7 +++++++
 3 files changed, 8 insertions(+), 22 deletions(-)
 create mode 100644 packages/kit/src/runtime/app/env/runtime.js

diff --git a/packages/kit/rollup.config.js b/packages/kit/rollup.config.js
index 7fa7819d249d..0cab93621d98 100644
--- a/packages/kit/rollup.config.js
+++ b/packages/kit/rollup.config.js
@@ -23,6 +23,7 @@ export default [
 			'app/stores': 'src/runtime/app/stores.js',
 			'app/paths': 'src/runtime/app/paths.js',
 			'app/env': 'src/runtime/app/env.js',
+			'app/env/runtime': 'src/runtime/app/env/runtime.js',
 			paths: 'src/runtime/paths.js',
 			env: 'src/runtime/env.js'
 		},
diff --git a/packages/kit/src/core/sync/write_env.js b/packages/kit/src/core/sync/write_env.js
index c2b3314847ca..5b9eb79ea8c5 100644
--- a/packages/kit/src/core/sync/write_env.js
+++ b/packages/kit/src/core/sync/write_env.js
@@ -38,16 +38,6 @@ function type_declaration_template(pub, env) {
 }`;
 }
 
-function runtime_env_template() {
-	return `/** @type {App.RuntimeEnv} */
-export let env = {};
-
-/** @type {(environment: Record<string, string>) => void} */
-export function set_env(environment) {
-  env = environment;
-}`;
-}
-
 /**
  * Writes the existing environment variables in process.env to
  * $app/env and $app/env/private
@@ -58,7 +48,6 @@ export function set_env(environment) {
 export function write_env(config, mode) {
 	const pub = write_public_env(config, mode);
 	const priv = write_private_env(config, mode);
-	write_runtime_env(config);
 	write_typedef(config, pub, priv);
 }
 
@@ -106,17 +95,6 @@ function write_private_env(config, mode) {
 	return priv;
 }
 
-/**
- * Writes a blank export to $app/env/runtime. This should be populated by
- * Server.init whenever an adapter calls it
- * @param {import('types').ValidatedKitConfig} config
- */
-function write_runtime_env(config) {
-	const runtime_out = path.join(config.outDir, 'runtime/app/env/runtime.js');
-
-	write_if_changed(runtime_out, runtime_env_template());
-}
-
 /**
  * Writes the type definitions for the environment variable files
  * to types/ambient.d.ts
diff --git a/packages/kit/src/runtime/app/env/runtime.js b/packages/kit/src/runtime/app/env/runtime.js
new file mode 100644
index 000000000000..5a609006220b
--- /dev/null
+++ b/packages/kit/src/runtime/app/env/runtime.js
@@ -0,0 +1,7 @@
+/** @type {App.RuntimeEnv} */
+export let env = {};
+
+/** @type {(environment: Record<string, string>) => void} */
+export function set_env(environment) {
+	env = environment;
+}

From 9091d2c0e91d780f0eb6924bdb6989e3293233f2 Mon Sep 17 00:00:00 2001
From: Rich Harris <hello@rich-harris.dev>
Date: Fri, 22 Jul 2022 11:40:28 -0400
Subject: [PATCH 26/95] simplify write_env

---
 packages/kit/src/core/sync/write_env.js | 128 ++++++++----------------
 1 file changed, 42 insertions(+), 86 deletions(-)

diff --git a/packages/kit/src/core/sync/write_env.js b/packages/kit/src/core/sync/write_env.js
index 5b9eb79ea8c5..8ec89839b3c2 100644
--- a/packages/kit/src/core/sync/write_env.js
+++ b/packages/kit/src/core/sync/write_env.js
@@ -1,42 +1,8 @@
-import { write_if_changed } from './utils.js';
 import path from 'path';
-import fs from 'fs';
 import { loadEnv } from 'vite';
+import { write_if_changed } from './utils.js';
 
-const autogen_comment = '// this section is auto-generated';
-
-/**
- * @param {boolean} pub
- * @param {Record<string, string>} env
- * @returns {string}
- */
-function const_declaration_template(pub, env) {
-	return `${autogen_comment}
-
-${Object.entries(env)
-	.map(
-		([k, v]) => `/**
- * @type {import('$app/env${pub ? '' : '/private'}').${k}}
- */
-export const ${k} = ${JSON.stringify(v)};
-`
-	)
-	.join('\n')}
-`;
-}
-
-/**
- * @param {boolean} pub
- * @param {Record<string, string>} env
- * @returns {string}
- */
-function type_declaration_template(pub, env) {
-	return `declare module '$app/env${pub ? '' : '/private'}' {
-  ${Object.keys(env)
-		.map((k) => `export const ${k}: string;`)
-		.join('\n  ')}
-}`;
-}
+const autogen_comment = '// this file is generated — do not edit it\n';
 
 /**
  * Writes the existing environment variables in process.env to
@@ -46,65 +12,55 @@ function type_declaration_template(pub, env) {
  * The Vite mode.
  */
 export function write_env(config, mode) {
-	const pub = write_public_env(config, mode);
-	const priv = write_private_env(config, mode);
-	write_typedef(config, pub, priv);
-}
+	const entries = Object.entries(loadEnv(mode, process.cwd(), ''));
+	const pub = Object.fromEntries(entries.filter(([k]) => k.startsWith(config.env.publicPrefix)));
+	const prv = Object.fromEntries(entries.filter(([k]) => !k.startsWith(config.env.publicPrefix)));
 
-/**
- * Writes the existing environment variables prefixed with config.kit.env.publicPrefix
- * in process.env to $app/env
- * @param {import('types').ValidatedKitConfig} config
- * @param {string} mode
- * The Vite mode.
- */
-function write_public_env(config, mode) {
-	const pub_out = path.join(config.outDir, 'runtime/app/env.js');
+	// TODO when testing src, `$app` points at `src/runtime/app`... will
+	// probably need to fiddle with aliases
+	write_if_changed(
+		path.join(config.outDir, 'runtime/app/env/public/index.js'),
+		create_module('$app/env/public', pub)
+	);
 
-	// public is a little difficult since we append to an
-	// already-existing file
-	const pub = loadEnv(mode, process.cwd(), config.env.publicPrefix);
-	let pub_content = const_declaration_template(true, pub);
-	if (fs.existsSync(pub_out)) {
-		const old_pub_content = fs.readFileSync(pub_out).toString();
-		const autogen_content_start = old_pub_content.indexOf(autogen_comment);
-		if (autogen_content_start === -1) {
-			pub_content = old_pub_content + '\n' + pub_content;
-		} else {
-			pub_content = old_pub_content.slice(0, autogen_content_start) + '\n' + pub_content;
-		}
-	}
-	write_if_changed(pub_out, pub_content);
-	return pub;
+	write_if_changed(
+		path.join(config.outDir, 'runtime/app/env/private/index.js'),
+		create_module('$app/env/private', prv)
+	);
+
+	write_if_changed(
+		path.join(config.outDir, 'types/ambient.d.ts'),
+		autogen_comment +
+			create_types('$app/env/public', pub) +
+			'\n\n' +
+			create_types('$app/env/private', prv)
+	);
 }
 
 /**
- * Writes the existing environment variables not prefixed with config.kit.env.publicPrefix
- * in process.env to $app/env/private
- * @param {import('types').ValidatedKitConfig} config
- * @param {string} mode
- * The Vite mode.
+ * @param {string} id
+ * @param {Record<string, string>} env
+ * @returns {string}
  */
-function write_private_env(config, mode) {
-	const priv_out = path.join(config.outDir, 'runtime/app/env/private.js');
+function create_module(id, env) {
+	const declarations = Object.entries(env)
+		.map(
+			([k, v]) => `/** @type {import('${id}'}').${k}} */\nexport const ${k} = ${JSON.stringify(v)};`
+		)
+		.join('\n\n');
 
-	// private is easy since it has its own file: just write if changed
-	const priv = loadEnv(mode, process.cwd(), '');
-	const priv_content = const_declaration_template(false, priv);
-	write_if_changed(priv_out, priv_content);
-	return priv;
+	return autogen_comment + declarations;
 }
 
 /**
- * Writes the type definitions for the environment variable files
- * to types/ambient.d.ts
- * @param {import('types').ValidatedKitConfig} config
- * @param {Record<string, string>} pub
- * @param {Record<string, string>} priv
+ * @param {string} id
+ * @param {Record<string, string>} env
+ * @returns {string}
  */
-function write_typedef(config, pub, priv) {
-	const type_declaration_out = path.join(config.outDir, 'types/ambient.d.ts');
-	const pub_declaration = type_declaration_template(true, pub);
-	const priv_declaration = type_declaration_template(false, priv);
-	write_if_changed(type_declaration_out, `${priv_declaration}\n${pub_declaration}`);
+function create_types(id, env) {
+	const declarations = Object.keys(env)
+		.map((k) => `\texport const ${k}: string;`)
+		.join('\n');
+
+	return `declare module '${id}' {\n${declarations}\n}`;
 }

From cf09ed72af204dd001b4986bc4b35ebe0e4da1cc Mon Sep 17 00:00:00 2001
From: Rich Harris <hello@rich-harris.dev>
Date: Fri, 22 Jul 2022 12:00:37 -0400
Subject: [PATCH 27/95] Update packages/kit/src/vite/preview/index.js

---
 packages/kit/src/vite/preview/index.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/kit/src/vite/preview/index.js b/packages/kit/src/vite/preview/index.js
index 697e363a5b9e..b2205cb07fe9 100644
--- a/packages/kit/src/vite/preview/index.js
+++ b/packages/kit/src/vite/preview/index.js
@@ -44,9 +44,7 @@ export async function preview(vite, config, protocol) {
 	const server = new Server(manifest);
 	server.init({
 		// This just makes sure no values are undefined
-		env: Object.entries(process.env).reduce((prev, [k, v]) => {
-			return { ...prev, [k]: v ?? '' };
-		}, {})
+		env: process.env
 	});
 
 	return () => {

From b7b1fca3358c774e6d4fa32c7bca8bdb83f47967 Mon Sep 17 00:00:00 2001
From: Rich Harris <hello@rich-harris.dev>
Date: Fri, 22 Jul 2022 12:03:46 -0400
Subject: [PATCH 28/95] remove unnecessary index.js suffix

---
 packages/kit/src/core/sync/write_env.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/kit/src/core/sync/write_env.js b/packages/kit/src/core/sync/write_env.js
index 8ec89839b3c2..11f0bca86c54 100644
--- a/packages/kit/src/core/sync/write_env.js
+++ b/packages/kit/src/core/sync/write_env.js
@@ -19,12 +19,12 @@ export function write_env(config, mode) {
 	// TODO when testing src, `$app` points at `src/runtime/app`... will
 	// probably need to fiddle with aliases
 	write_if_changed(
-		path.join(config.outDir, 'runtime/app/env/public/index.js'),
+		path.join(config.outDir, 'runtime/app/env/public.js'),
 		create_module('$app/env/public', pub)
 	);
 
 	write_if_changed(
-		path.join(config.outDir, 'runtime/app/env/private/index.js'),
+		path.join(config.outDir, 'runtime/app/env/private.js'),
 		create_module('$app/env/private', prv)
 	);
 

From b4a1ee45f0a1837a2ec9e82e9a53c6f452118e3d Mon Sep 17 00:00:00 2001
From: Rich Harris <hello@rich-harris.dev>
Date: Fri, 22 Jul 2022 12:03:51 -0400
Subject: [PATCH 29/95] simplify

---
 packages/kit/src/core/sync/write_tsconfig.js | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/packages/kit/src/core/sync/write_tsconfig.js b/packages/kit/src/core/sync/write_tsconfig.js
index bb0fe540ce1b..c75cce8e5adc 100644
--- a/packages/kit/src/core/sync/write_tsconfig.js
+++ b/packages/kit/src/core/sync/write_tsconfig.js
@@ -24,19 +24,13 @@ export function write_tsconfig(config, cwd = process.cwd()) {
 	/** @param {string} file */
 	const config_relative = (file) => posixify(path.relative(config.outDir, file));
 
-	const dirs = new Set([
-		project_relative(path.dirname(config.files.routes)),
-		project_relative(path.dirname(config.files.lib))
-	]);
-
-	/** @type {string[]} */
-	const include = [];
-	dirs.forEach((dir) => {
-		include.push(config_relative(`${dir}/**/*.js`));
-		include.push(config_relative(`${dir}/**/*.ts`));
-		include.push(config_relative(`${dir}/**/*.svelte`));
-	});
-	include.push('types/ambient.d.ts');
+	const include = ['types/ambient.d.ts'];
+	for (const dir of [config.files.routes, config.files.lib]) {
+		const relative = project_relative(path.dirname(dir));
+		include.push(config_relative(`${relative}/**/*.js`));
+		include.push(config_relative(`${relative}/**/*.ts`));
+		include.push(config_relative(`${relative}/**/*.svelte`));
+	}
 
 	/** @type {Record<string, string[]>} */
 	const paths = {};

From 905ef240e723dea16c6b5ab242693d936b8fc733 Mon Sep 17 00:00:00 2001
From: Rich Harris <hello@rich-harris.dev>
Date: Fri, 22 Jul 2022 12:04:48 -0400
Subject: [PATCH 30/95] tabs

---
 packages/kit/src/vite/build/build_server.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/kit/src/vite/build/build_server.js b/packages/kit/src/vite/build/build_server.js
index 7da158889027..6d022b20e4e8 100644
--- a/packages/kit/src/vite/build/build_server.js
+++ b/packages/kit/src/vite/build/build_server.js
@@ -90,12 +90,12 @@ export class Server {
 		};
 	}
 
-  init(options = { env: {} }) {
-    if (!initialized) {
-      set_env(options.env);
-      initialized = true;
-    }
-  }
+	init(options = { env: {} }) {
+		if (!initialized) {
+			set_env(options.env);
+			initialized = true;
+		}
+	}
 
 	async respond(request, options = {}) {
 		if (!(request instanceof Request)) {

From d2352b366fe7ed2bb22b25557cb9f6eded37024f Mon Sep 17 00:00:00 2001
From: Rich Harris <hello@rich-harris.dev>
Date: Fri, 22 Jul 2022 12:07:37 -0400
Subject: [PATCH 31/95] make init sync, make options required

---
 packages/kit/src/vite/build/build_server.js | 4 ++--
 packages/kit/types/index.d.ts               | 2 +-
 packages/kit/types/internal.d.ts            | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/kit/src/vite/build/build_server.js b/packages/kit/src/vite/build/build_server.js
index 6d022b20e4e8..f2b9f179c4ea 100644
--- a/packages/kit/src/vite/build/build_server.js
+++ b/packages/kit/src/vite/build/build_server.js
@@ -90,9 +90,9 @@ export class Server {
 		};
 	}
 
-	init(options = { env: {} }) {
+	init({ env }) {
 		if (!initialized) {
-			set_env(options.env);
+			set_env(env);
 			initialized = true;
 		}
 	}
diff --git a/packages/kit/types/index.d.ts b/packages/kit/types/index.d.ts
index 3995824b0c16..23b4e86af7a1 100644
--- a/packages/kit/types/index.d.ts
+++ b/packages/kit/types/index.d.ts
@@ -271,7 +271,7 @@ export type ResponseBody = JSONValue | Uint8Array | ReadableStream | Error;
 
 export class Server {
 	constructor(manifest: SSRManifest);
-	init(options: ServerInitOptions): Promise<void>;
+	init(options: ServerInitOptions): void;
 	respond(request: Request, options: RequestOptions): Promise<Response>;
 }
 
diff --git a/packages/kit/types/internal.d.ts b/packages/kit/types/internal.d.ts
index 952bd877ac0e..bb7b815dc20b 100644
--- a/packages/kit/types/internal.d.ts
+++ b/packages/kit/types/internal.d.ts
@@ -93,7 +93,7 @@ export interface Hooks {
 }
 
 export class InternalServer extends Server {
-	init(options: ServerInitOptions): Promise<void>;
+	init(options: ServerInitOptions): void;
 	respond(
 		request: Request,
 		options: RequestOptions & {

From a858d193f04a50745c7b32a83862d9998217ab42 Mon Sep 17 00:00:00 2001
From: Rich Harris <hello@rich-harris.dev>
Date: Fri, 22 Jul 2022 12:30:11 -0400
Subject: [PATCH 32/95] format

---
 packages/kit/src/cli.js | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/packages/kit/src/cli.js b/packages/kit/src/cli.js
index 1202838d843c..7168b2a67d67 100755
--- a/packages/kit/src/cli.js
+++ b/packages/kit/src/cli.js
@@ -38,11 +38,7 @@ prog
 prog
 	.command('sync')
 	.describe('Synchronise generated files')
-	.option(
-		'--mode',
-		'Specify a mode for loading environment variables',
-		'development'
-	)
+	.option('--mode', 'Specify a mode for loading environment variables', 'development')
 	.action(async ({ mode }) => {
 		if (!fs.existsSync('svelte.config.js')) {
 			console.warn('Missing svelte.config.js — skipping');

From 17ffba0542391cd044e7f826fe8d3f1b030a85d8 Mon Sep 17 00:00:00 2001
From: Rich Harris <hello@rich-harris.dev>
Date: Fri, 22 Jul 2022 12:30:53 -0400
Subject: [PATCH 33/95] cast process.env

---
 packages/kit/src/vite/preview/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/kit/src/vite/preview/index.js b/packages/kit/src/vite/preview/index.js
index b2205cb07fe9..2fe9f61bb33a 100644
--- a/packages/kit/src/vite/preview/index.js
+++ b/packages/kit/src/vite/preview/index.js
@@ -44,7 +44,7 @@ export async function preview(vite, config, protocol) {
 	const server = new Server(manifest);
 	server.init({
 		// This just makes sure no values are undefined
-		env: process.env
+		env: /** @type {Record<string, string>} */ (process.env)
 	});
 
 	return () => {

From af2b1aaef4991abba1b285173bd9a58d4f654c78 Mon Sep 17 00:00:00 2001
From: Rich Harris <hello@rich-harris.dev>
Date: Fri, 22 Jul 2022 12:32:38 -0400
Subject: [PATCH 34/95] remove the overlay stuff, just throw an error

---
 packages/kit/src/vite/dev/index.js | 11 ++++-------
 packages/kit/src/vite/utils.js     | 18 ------------------
 2 files changed, 4 insertions(+), 25 deletions(-)

diff --git a/packages/kit/src/vite/dev/index.js b/packages/kit/src/vite/dev/index.js
index 4bd4d237fa48..033431631c63 100644
--- a/packages/kit/src/vite/dev/index.js
+++ b/packages/kit/src/vite/dev/index.js
@@ -12,11 +12,7 @@ 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 {
-	resolve_entry,
-	web_socket_server_to_error_handler,
-	throw_if_illegal_private_import_vite
-} from '../utils.js';
+import { resolve_entry, throw_if_illegal_private_import_vite } from '../utils.js';
 
 // Vite doesn't expose this so we just copy the list for now
 // https://github.com/vitejs/vite/blob/3edd1af56e980aef56641a5a51cf2932bb580d41/packages/vite/src/node/plugins/css.ts#L96
@@ -66,8 +62,9 @@ export async function dev(vite, vite_config, svelte_config) {
 
 						const node = await vite.moduleGraph.getModuleByUrl(url);
 						if (!node) throw new Error(`Could not find node for ${url}`);
-						const error_handler = web_socket_server_to_error_handler(vite.ws);
-						throw_if_illegal_private_import_vite(error_handler, node);
+						throw_if_illegal_private_import_vite((err) => {
+							throw err;
+						}, node);
 
 						return {
 							module,
diff --git a/packages/kit/src/vite/utils.js b/packages/kit/src/vite/utils.js
index 29ea893c09d6..42531bf422fe 100644
--- a/packages/kit/src/vite/utils.js
+++ b/packages/kit/src/vite/utils.js
@@ -135,24 +135,6 @@ export function resolve_entry(entry) {
 	return null;
 }
 
-/**
- * Derive an error handler from a web socket server.
- * @param {import('vite').WebSocketServer} ws
- */
-export function web_socket_server_to_error_handler(ws) {
-	/** @type {(id: string, err: Error) => void} */
-	return (id, err) =>
-		ws.send({
-			type: 'error',
-			err: {
-				message: err.message,
-				stack: err.stack ?? '',
-				plugin: 'vite-plugin-svelte',
-				id
-			}
-		});
-}
-
 const illegal_import_names /** @type {Array<string>} */ = [
 	'.svelte-kit/runtime/app/env/private.js'
 ];

From b0477aa6abcaae728fa17a92504f147f7d9bee44 Mon Sep 17 00:00:00 2001
From: Rich Harris <hello@rich-harris.dev>
Date: Fri, 22 Jul 2022 12:38:26 -0400
Subject: [PATCH 35/95] just throw

---
 packages/kit/src/vite/dev/index.js |  5 ++--
 packages/kit/src/vite/index.js     |  8 +-----
 packages/kit/src/vite/utils.js     | 44 ++++++++----------------------
 3 files changed, 15 insertions(+), 42 deletions(-)

diff --git a/packages/kit/src/vite/dev/index.js b/packages/kit/src/vite/dev/index.js
index 033431631c63..0a8d8d7d7398 100644
--- a/packages/kit/src/vite/dev/index.js
+++ b/packages/kit/src/vite/dev/index.js
@@ -62,9 +62,8 @@ export async function dev(vite, vite_config, svelte_config) {
 
 						const node = await vite.moduleGraph.getModuleByUrl(url);
 						if (!node) throw new Error(`Could not find node for ${url}`);
-						throw_if_illegal_private_import_vite((err) => {
-							throw err;
-						}, node);
+
+						throw_if_illegal_private_import_vite(node);
 
 						return {
 							module,
diff --git a/packages/kit/src/vite/index.js b/packages/kit/src/vite/index.js
index 8e298933f7f4..312109fcacfc 100644
--- a/packages/kit/src/vite/index.js
+++ b/packages/kit/src/vite/index.js
@@ -274,13 +274,7 @@ function kit() {
 					if (module_info === null) {
 						throw new Error(`Failed to locate module info for ${module_info}`);
 					}
-					throw_if_illegal_private_import_rollup(
-						this.getModuleInfo.bind(this),
-						(id, err) => {
-							throw err;
-						},
-						module_info
-					);
+					throw_if_illegal_private_import_rollup(this.getModuleInfo.bind(this), module_info);
 				}
 			}
 
diff --git a/packages/kit/src/vite/utils.js b/packages/kit/src/vite/utils.js
index 42531bf422fe..26b8e18902da 100644
--- a/packages/kit/src/vite/utils.js
+++ b/packages/kit/src/vite/utils.js
@@ -143,31 +143,25 @@ const illegal_import_names /** @type {Array<string>} */ = [
  * Create a formatted error for an illegal import.
  * @param {string} error_module_id
  * @param {Array<string>} stack
- * @param {(id: string, err: Error) => void} error_handler
  */
-function handle_illegal_import_error(error_module_id, stack, error_handler) {
+function handle_illegal_import_error(error_module_id, stack) {
 	stack.push(error_module_id + ' (server-side only module)');
 	const stringified_stack = stack.map((mod, i) => `  ${i}: ${mod}`).join(', which imports:\n');
-	const err = new Error(
+
+	return new Error(
 		`Found an illegal import originating from: ${stack[0]}. It imports:\n${stringified_stack}`
 	);
-	error_handler(error_module_id, err);
-	return;
 }
 
 /**
  * Recurse through the ModuleNode graph, throwing if the module
  * imports a private module.
- * @param {(id: string, err: Error) => void} error_handler
  * @param {import('vite').ModuleNode} node
  * @param {Array<string>} illegal_module_stack
  * @param {Set<string>} illegal_module_set
  */
 function throw_if_illegal_private_import_recursive_vite(
 	node,
-	error_handler = (id, err) => {
-		throw err;
-	},
 	illegal_module_stack = [],
 	illegal_module_set = new Set()
 ) {
@@ -180,16 +174,10 @@ function throw_if_illegal_private_import_recursive_vite(
 	illegal_module_stack.push(file);
 	node.importedModules.forEach((childNode) => {
 		if (illegal_import_names.some((name) => childNode.file?.endsWith(name))) {
-			handle_illegal_import_error(
-				childNode?.file ?? 'unknown',
-				illegal_module_stack,
-				error_handler
-			);
-			return;
+			throw handle_illegal_import_error(childNode?.file ?? 'unknown', illegal_module_stack);
 		}
 		throw_if_illegal_private_import_recursive_vite(
 			childNode,
-			error_handler,
 			illegal_module_stack,
 			illegal_module_set
 		);
@@ -200,11 +188,10 @@ function throw_if_illegal_private_import_recursive_vite(
 
 /**
  * Throw an error if a private module is imported from a client-side node.
- * @param {(id: string, err: Error) => void} error_handler
  * @param {import('vite').ModuleNode} node
  */
-export function throw_if_illegal_private_import_vite(error_handler, node) {
-	throw_if_illegal_private_import_recursive_vite(node, error_handler);
+export function throw_if_illegal_private_import_vite(node) {
+	throw_if_illegal_private_import_recursive_vite(node);
 }
 
 /**
@@ -212,16 +199,12 @@ export function throw_if_illegal_private_import_vite(error_handler, node) {
  * imports a private module.
  * @param {import('rollup').GetModuleInfo} node_getter
  * @param {import('rollup').ModuleInfo} node
- * @param {(id: string, err: Error) => void} error_handler
  * @param {Array<string>} illegal_module_stack
  * @param {Set<string>} illegal_module_set
  */
 function throw_if_illegal_private_import_recursive_rollup(
 	node_getter,
 	node,
-	error_handler = (id, err) => {
-		throw err;
-	},
 	illegal_module_stack = [],
 	illegal_module_set = new Set()
 ) {
@@ -239,18 +222,16 @@ function throw_if_illegal_private_import_recursive_rollup(
 	const recursiveChildNodeHandler = (childId) => {
 		const childNode = node_getter(childId);
 		if (childNode === null) {
-			const err = new Error(`Failed to find module info for ${childId}`);
-			error_handler(childId, err);
-			return;
+			throw new Error(`Failed to find module info for ${childId}`);
 		}
+
 		if (illegal_import_names.some((name) => childId.endsWith(name))) {
-			handle_illegal_import_error(childId, illegal_module_stack, error_handler);
-			return;
+			throw handle_illegal_import_error(childId, illegal_module_stack);
 		}
+
 		throw_if_illegal_private_import_recursive_rollup(
 			node_getter,
 			childNode,
-			error_handler,
 			illegal_module_stack,
 			illegal_module_set
 		);
@@ -264,9 +245,8 @@ function throw_if_illegal_private_import_recursive_rollup(
 /**
  * Throw an error if a private module is imported from a client-side node.
  * @param {import('rollup').GetModuleInfo} node_getter
- * @param {(id: string, err: Error) => void} error_handler
  * @param {import('rollup').ModuleInfo} module_info
  */
-export function throw_if_illegal_private_import_rollup(node_getter, error_handler, module_info) {
-	throw_if_illegal_private_import_recursive_rollup(node_getter, module_info, error_handler);
+export function throw_if_illegal_private_import_rollup(node_getter, module_info) {
+	throw_if_illegal_private_import_recursive_rollup(node_getter, module_info);
 }

From 490f3fc46af92f17994d4111c62bfe3d697ed897 Mon Sep 17 00:00:00 2001
From: Rich Harris <hello@rich-harris.dev>
Date: Fri, 22 Jul 2022 13:35:22 -0400
Subject: [PATCH 36/95] simplify traversal

---
 packages/kit/src/vite/utils.js | 161 +++++++++++++++------------------
 1 file changed, 72 insertions(+), 89 deletions(-)

diff --git a/packages/kit/src/vite/utils.js b/packages/kit/src/vite/utils.js
index 26b8e18902da..088a898867ee 100644
--- a/packages/kit/src/vite/utils.js
+++ b/packages/kit/src/vite/utils.js
@@ -135,55 +135,31 @@ export function resolve_entry(entry) {
 	return null;
 }
 
-const illegal_import_names /** @type {Array<string>} */ = [
-	'.svelte-kit/runtime/app/env/private.js'
-];
+// TODO remove hardcoded path
+// TODO are module IDs absolute paths on Windows as well?
+const illegal_import_names = new Set([path.resolve('.svelte-kit/runtime/app/env/private.js')]);
 
+/**
+ *
+ * @param {string} str
+ * @param {number} times
+ * @returns
+ */
+function repeat(str, times) {
+	return new Array(times + 1).join(str);
+}
 /**
  * Create a formatted error for an illegal import.
- * @param {string} error_module_id
  * @param {Array<string>} stack
  */
-function handle_illegal_import_error(error_module_id, stack) {
-	stack.push(error_module_id + ' (server-side only module)');
-	const stringified_stack = stack.map((mod, i) => `  ${i}: ${mod}`).join(', which imports:\n');
-
-	return new Error(
-		`Found an illegal import originating from: ${stack[0]}. It imports:\n${stringified_stack}`
+function handle_illegal_import_error(stack) {
+	stack = stack.map((file) =>
+		path.relative(process.cwd(), file).replace('.svelte-kit/runtime/app', '$app')
 	);
-}
 
-/**
- * Recurse through the ModuleNode graph, throwing if the module
- * imports a private module.
- * @param {import('vite').ModuleNode} node
- * @param {Array<string>} illegal_module_stack
- * @param {Set<string>} illegal_module_set
- */
-function throw_if_illegal_private_import_recursive_vite(
-	node,
-	illegal_module_stack = [],
-	illegal_module_set = new Set()
-) {
-	const file = node.file ?? 'unknown';
-	// This prevents cyclical imports creating a stack overflow
-	if (illegal_module_set.has(file) || node.importedModules.size === 0) {
-		return;
-	}
-	illegal_module_set.add(file);
-	illegal_module_stack.push(file);
-	node.importedModules.forEach((childNode) => {
-		if (illegal_import_names.some((name) => childNode.file?.endsWith(name))) {
-			throw handle_illegal_import_error(childNode?.file ?? 'unknown', illegal_module_stack);
-		}
-		throw_if_illegal_private_import_recursive_vite(
-			childNode,
-			illegal_module_stack,
-			illegal_module_set
-		);
-	});
-	illegal_module_set.delete(file);
-	illegal_module_stack.pop();
+	const pyramid = stack.map((file, i) => `${repeat(' ', i * 2)}- ${file}`).join('\n');
+
+	return new Error(`Cannot import ${stack.at(-1)} into client-side code:\n${pyramid}`);
 }
 
 /**
@@ -191,62 +167,69 @@ function throw_if_illegal_private_import_recursive_vite(
  * @param {import('vite').ModuleNode} node
  */
 export function throw_if_illegal_private_import_vite(node) {
-	throw_if_illegal_private_import_recursive_vite(node);
-}
+	const seen = new Set();
 
-/**
- * Recurse through the ModuleInfo graph, throwing if the module
- * imports a private module.
- * @param {import('rollup').GetModuleInfo} node_getter
- * @param {import('rollup').ModuleInfo} node
- * @param {Array<string>} illegal_module_stack
- * @param {Set<string>} illegal_module_set
- */
-function throw_if_illegal_private_import_recursive_rollup(
-	node_getter,
-	node,
-	illegal_module_stack = [],
-	illegal_module_set = new Set()
-) {
-	const id = node.id;
-	// This prevents cyclical imports creating a stack overflow
-	if (
-		illegal_module_set.has(id) ||
-		(node.importedIds.length === 0 && node.dynamicImporters.length === 0)
-	) {
-		return;
-	}
-	illegal_module_set.add(id);
-	illegal_module_stack.push(id);
-	/** @type {(child_id: string) => void} */
-	const recursiveChildNodeHandler = (childId) => {
-		const childNode = node_getter(childId);
-		if (childNode === null) {
-			throw new Error(`Failed to find module info for ${childId}`);
+	/**
+	 * @param {import('vite').ModuleNode} node
+	 * @returns {string[] | null}
+	 */
+	function find(node) {
+		if (!node.id) return null; // TODO when does this happen?
+
+		if (seen.has(node.id)) return null;
+		seen.add(node.id);
+
+		if (node.id && illegal_import_names.has(node.id)) {
+			return [node.id];
 		}
 
-		if (illegal_import_names.some((name) => childId.endsWith(name))) {
-			throw handle_illegal_import_error(childId, illegal_module_stack);
+		for (const child of node.importedModules) {
+			const chain = child && find(child);
+			if (chain) return [node.id, ...chain];
 		}
 
-		throw_if_illegal_private_import_recursive_rollup(
-			node_getter,
-			childNode,
-			illegal_module_stack,
-			illegal_module_set
-		);
-	};
-	node.importedIds.forEach(recursiveChildNodeHandler);
-	node.dynamicallyImportedIds.forEach(recursiveChildNodeHandler);
-	illegal_module_set.delete(id);
-	illegal_module_stack.pop();
+		return null;
+	}
+
+	const chain = find(node);
+
+	if (chain) {
+		throw handle_illegal_import_error(chain);
+	}
 }
 
 /**
  * Throw an error if a private module is imported from a client-side node.
  * @param {import('rollup').GetModuleInfo} node_getter
- * @param {import('rollup').ModuleInfo} module_info
+ * @param {import('rollup').ModuleInfo} node
  */
-export function throw_if_illegal_private_import_rollup(node_getter, module_info) {
-	throw_if_illegal_private_import_recursive_rollup(node_getter, module_info);
+export function throw_if_illegal_private_import_rollup(node_getter, node) {
+	const seen = new Set();
+
+	/**
+	 * @param {import('rollup').ModuleInfo} node
+	 * @returns {string[] | null}
+	 */
+	function find(node) {
+		if (seen.has(node.id)) return null;
+		seen.add(node.id);
+
+		if (illegal_import_names.has(node.id)) {
+			return [node.id];
+		}
+
+		for (const id of [...node.importedIds, ...node.dynamicallyImportedIds]) {
+			const child = node_getter(id);
+			const chain = child && find(child);
+			if (chain) return [node.id, ...chain];
+		}
+
+		return null;
+	}
+
+	const chain = find(node);
+
+	if (chain) {
+		throw handle_illegal_import_error(chain);
+	}
 }

From 13bc94a48a292454c60b7af5325b5eadb68c01f7 Mon Sep 17 00:00:00 2001
From: Rich Harris <hello@rich-harris.dev>
Date: Fri, 22 Jul 2022 14:07:18 -0400
Subject: [PATCH 37/95] make build-time traversal more efficient

---
 packages/kit/src/vite/dev/index.js |  5 +--
 packages/kit/src/vite/index.js     | 45 ++++++++++++++++++++------
 packages/kit/src/vite/utils.js     | 51 ++++--------------------------
 3 files changed, 44 insertions(+), 57 deletions(-)

diff --git a/packages/kit/src/vite/dev/index.js b/packages/kit/src/vite/dev/index.js
index 0a8d8d7d7398..8483bc422c51 100644
--- a/packages/kit/src/vite/dev/index.js
+++ b/packages/kit/src/vite/dev/index.js
@@ -24,9 +24,10 @@ const cwd = process.cwd();
  * @param {import('vite').ViteDevServer} vite
  * @param {import('vite').ResolvedConfig} vite_config
  * @param {import('types').ValidatedConfig} svelte_config
+ * @param {Set<string>} illegal_imports
  * @return {Promise<Promise<() => void>>}
  */
-export async function dev(vite, vite_config, svelte_config) {
+export async function dev(vite, vite_config, svelte_config, illegal_imports) {
 	installPolyfills();
 
 	sync.init(svelte_config, vite_config.mode);
@@ -63,7 +64,7 @@ export async function dev(vite, vite_config, svelte_config) {
 						const node = await vite.moduleGraph.getModuleByUrl(url);
 						if (!node) throw new Error(`Could not find node for ${url}`);
 
-						throw_if_illegal_private_import_vite(node);
+						throw_if_illegal_private_import_vite(node, illegal_imports);
 
 						return {
 							module,
diff --git a/packages/kit/src/vite/index.js b/packages/kit/src/vite/index.js
index 312109fcacfc..6b3f13c7b00d 100644
--- a/packages/kit/src/vite/index.js
+++ b/packages/kit/src/vite/index.js
@@ -14,7 +14,7 @@ import { generate_manifest } from '../core/generate_manifest/index.js';
 import { get_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, throw_if_illegal_private_import_rollup } from './utils.js';
+import { get_aliases, resolve_entry, format_illegal_import_chain } from './utils.js';
 
 const cwd = process.cwd();
 
@@ -100,6 +100,9 @@ function kit() {
 	/** @type {import('types').BuildData} */
 	let build_data;
 
+	/** @type {Set<string>} */
+	let illegal_imports;
+
 	/**
 	 * @type {{
 	 *   build_dir: string;
@@ -183,6 +186,8 @@ function kit() {
 				client_out_dir: `${svelte_config.kit.outDir}/output/client/`
 			};
 
+			illegal_imports = new Set([`${svelte_config.kit.outDir}/runtime/app/env/private.js`]);
+
 			if (is_build) {
 				manifest_data = sync.all(svelte_config, config_env.mode).manifest_data;
 
@@ -267,14 +272,34 @@ function kit() {
 		 * then use this hook to kick off builds for the server and service worker.
 		 */
 		async writeBundle(_options, bundle) {
-			for (const id of this.getModuleIds()) {
-				const found = manifest_data.components.find((comp) => id.endsWith(comp));
-				if (found) {
-					const module_info = this.getModuleInfo(id);
-					if (module_info === null) {
-						throw new Error(`Failed to locate module info for ${module_info}`);
-					}
-					throw_if_illegal_private_import_rollup(this.getModuleInfo.bind(this), module_info);
+			const seen = new Set();
+
+			/**
+			 * @param {import('rollup').ModuleInfo} node
+			 * @returns {string[] | undefined}
+			 */
+			const find_illegal_imports = (node) => {
+				if (seen.has(node.id)) return;
+				seen.add(node.id);
+
+				if (illegal_imports.has(node.id)) {
+					return [node.id];
+				}
+
+				for (const id of [...node.importedIds, ...node.dynamicallyImportedIds]) {
+					const child = this.getModuleInfo(id);
+					const chain = child && find_illegal_imports(child);
+					if (chain) return [node.id, ...chain];
+				}
+			};
+
+			for (const file of manifest_data.components) {
+				const id = path.resolve(file);
+				const node = this.getModuleInfo(id);
+
+				if (node) {
+					const chain = find_illegal_imports(node);
+					if (chain) throw new Error(format_illegal_import_chain(chain));
 				}
 			}
 
@@ -399,7 +424,7 @@ function kit() {
 		 * @see https://vitejs.dev/guide/api-plugin.html#configureserver
 		 */
 		async configureServer(vite) {
-			return await dev(vite, vite_config, svelte_config);
+			return await dev(vite, vite_config, svelte_config, illegal_imports);
 		},
 
 		/**
diff --git a/packages/kit/src/vite/utils.js b/packages/kit/src/vite/utils.js
index 088a898867ee..f57c0792e0e2 100644
--- a/packages/kit/src/vite/utils.js
+++ b/packages/kit/src/vite/utils.js
@@ -135,10 +135,6 @@ export function resolve_entry(entry) {
 	return null;
 }
 
-// TODO remove hardcoded path
-// TODO are module IDs absolute paths on Windows as well?
-const illegal_import_names = new Set([path.resolve('.svelte-kit/runtime/app/env/private.js')]);
-
 /**
  *
  * @param {string} str
@@ -152,21 +148,22 @@ function repeat(str, times) {
  * Create a formatted error for an illegal import.
  * @param {Array<string>} stack
  */
-function handle_illegal_import_error(stack) {
+export function format_illegal_import_chain(stack) {
 	stack = stack.map((file) =>
 		path.relative(process.cwd(), file).replace('.svelte-kit/runtime/app', '$app')
 	);
 
 	const pyramid = stack.map((file, i) => `${repeat(' ', i * 2)}- ${file}`).join('\n');
 
-	return new Error(`Cannot import ${stack.at(-1)} into client-side code:\n${pyramid}`);
+	return `Cannot import ${stack.at(-1)} into client-side code:\n${pyramid}`;
 }
 
 /**
  * Throw an error if a private module is imported from a client-side node.
  * @param {import('vite').ModuleNode} node
+ * @param {Set<string>} illegal_imports
  */
-export function throw_if_illegal_private_import_vite(node) {
+export function throw_if_illegal_private_import_vite(node, illegal_imports) {
 	const seen = new Set();
 
 	/**
@@ -179,7 +176,7 @@ export function throw_if_illegal_private_import_vite(node) {
 		if (seen.has(node.id)) return null;
 		seen.add(node.id);
 
-		if (node.id && illegal_import_names.has(node.id)) {
+		if (node.id && illegal_imports.has(node.id)) {
 			return [node.id];
 		}
 
@@ -194,42 +191,6 @@ export function throw_if_illegal_private_import_vite(node) {
 	const chain = find(node);
 
 	if (chain) {
-		throw handle_illegal_import_error(chain);
-	}
-}
-
-/**
- * Throw an error if a private module is imported from a client-side node.
- * @param {import('rollup').GetModuleInfo} node_getter
- * @param {import('rollup').ModuleInfo} node
- */
-export function throw_if_illegal_private_import_rollup(node_getter, node) {
-	const seen = new Set();
-
-	/**
-	 * @param {import('rollup').ModuleInfo} node
-	 * @returns {string[] | null}
-	 */
-	function find(node) {
-		if (seen.has(node.id)) return null;
-		seen.add(node.id);
-
-		if (illegal_import_names.has(node.id)) {
-			return [node.id];
-		}
-
-		for (const id of [...node.importedIds, ...node.dynamicallyImportedIds]) {
-			const child = node_getter(id);
-			const chain = child && find(child);
-			if (chain) return [node.id, ...chain];
-		}
-
-		return null;
-	}
-
-	const chain = find(node);
-
-	if (chain) {
-		throw handle_illegal_import_error(chain);
+		throw new Error(format_illegal_import_chain(chain));
 	}
 }

From 40a6eaae193591ae46f6881f8864107cd2e9ea09 Mon Sep 17 00:00:00 2001
From: Rich Harris <hello@rich-harris.dev>
Date: Fri, 22 Jul 2022 14:16:55 -0400
Subject: [PATCH 38/95] move dev code into dev module

---
 packages/kit/src/vite/dev/index.js | 41 ++++++++++++++++++++++++++++--
 packages/kit/src/vite/utils.js     | 37 ---------------------------
 2 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/packages/kit/src/vite/dev/index.js b/packages/kit/src/vite/dev/index.js
index 8483bc422c51..4f16f503636f 100644
--- a/packages/kit/src/vite/dev/index.js
+++ b/packages/kit/src/vite/dev/index.js
@@ -12,7 +12,7 @@ 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 { resolve_entry, throw_if_illegal_private_import_vite } from '../utils.js';
+import { format_illegal_import_chain, resolve_entry } from '../utils.js';
 
 // Vite doesn't expose this so we just copy the list for now
 // https://github.com/vitejs/vite/blob/3edd1af56e980aef56641a5a51cf2932bb580d41/packages/vite/src/node/plugins/css.ts#L96
@@ -64,7 +64,7 @@ export async function dev(vite, vite_config, svelte_config, illegal_imports) {
 						const node = await vite.moduleGraph.getModuleByUrl(url);
 						if (!node) throw new Error(`Could not find node for ${url}`);
 
-						throw_if_illegal_private_import_vite(node, illegal_imports);
+						prevent_illegal_imports(node, illegal_imports);
 
 						return {
 							module,
@@ -457,6 +457,43 @@ async function find_deps(vite, node, deps) {
 	await Promise.all(branches);
 }
 
+/**
+ * Throw an error if a private module is imported from a client-side node.
+ * @param {import('vite').ModuleNode} node
+ * @param {Set<string>} illegal_imports
+ */
+export function prevent_illegal_imports(node, illegal_imports) {
+	const seen = new Set();
+
+	/**
+	 * @param {import('vite').ModuleNode} node
+	 * @returns {string[] | null}
+	 */
+	function find(node) {
+		if (!node.id) return null; // TODO when does this happen?
+
+		if (seen.has(node.id)) return null;
+		seen.add(node.id);
+
+		if (node.id && illegal_imports.has(node.id)) {
+			return [node.id];
+		}
+
+		for (const child of node.importedModules) {
+			const chain = child && find(child);
+			if (chain) return [node.id, ...chain];
+		}
+
+		return null;
+	}
+
+	const chain = find(node);
+
+	if (chain) {
+		throw new Error(format_illegal_import_chain(chain));
+	}
+}
+
 /**
  * Determine if a file is being requested with the correct case,
  * to ensure consistent behaviour between dev and prod and across
diff --git a/packages/kit/src/vite/utils.js b/packages/kit/src/vite/utils.js
index f57c0792e0e2..a4e3766ed9a6 100644
--- a/packages/kit/src/vite/utils.js
+++ b/packages/kit/src/vite/utils.js
@@ -157,40 +157,3 @@ export function format_illegal_import_chain(stack) {
 
 	return `Cannot import ${stack.at(-1)} into client-side code:\n${pyramid}`;
 }
-
-/**
- * Throw an error if a private module is imported from a client-side node.
- * @param {import('vite').ModuleNode} node
- * @param {Set<string>} illegal_imports
- */
-export function throw_if_illegal_private_import_vite(node, illegal_imports) {
-	const seen = new Set();
-
-	/**
-	 * @param {import('vite').ModuleNode} node
-	 * @returns {string[] | null}
-	 */
-	function find(node) {
-		if (!node.id) return null; // TODO when does this happen?
-
-		if (seen.has(node.id)) return null;
-		seen.add(node.id);
-
-		if (node.id && illegal_imports.has(node.id)) {
-			return [node.id];
-		}
-
-		for (const child of node.importedModules) {
-			const chain = child && find(child);
-			if (chain) return [node.id, ...chain];
-		}
-
-		return null;
-	}
-
-	const chain = find(node);
-
-	if (chain) {
-		throw new Error(format_illegal_import_chain(chain));
-	}
-}

From 312a7bc6e51f6ccc448b25c032fa19477a6c3ea3 Mon Sep 17 00:00:00 2001
From: Rich Harris <hello@rich-harris.dev>
Date: Fri, 22 Jul 2022 14:18:59 -0400
Subject: [PATCH 39/95] always set env

---
 packages/kit/src/vite/build/build_server.js | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/packages/kit/src/vite/build/build_server.js b/packages/kit/src/vite/build/build_server.js
index f2b9f179c4ea..7cb6b6152ee2 100644
--- a/packages/kit/src/vite/build/build_server.js
+++ b/packages/kit/src/vite/build/build_server.js
@@ -36,7 +36,6 @@ const template = ({ head, body, assets, nonce }) => ${s(template)
 	.replace(/%sveltekit\.nonce%/g, '" + nonce + "')};
 
 let read = null;
-let initialized = false;
 
 set_paths(${s(config.kit.paths)});
 
@@ -91,10 +90,7 @@ export class Server {
 	}
 
 	init({ env }) {
-		if (!initialized) {
-			set_env(env);
-			initialized = true;
-		}
+		set_env(env);
 	}
 
 	async respond(request, options = {}) {

From 672eb85e73f40e014a9088dcc77233500905882c Mon Sep 17 00:00:00 2001
From: Rich Harris <hello@rich-harris.dev>
Date: Fri, 22 Jul 2022 14:19:51 -0400
Subject: [PATCH 40/95] simplify

---
 packages/kit/src/vite/dev/index.js | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/packages/kit/src/vite/dev/index.js b/packages/kit/src/vite/dev/index.js
index b241ece45ed8..615c85223a8e 100644
--- a/packages/kit/src/vite/dev/index.js
+++ b/packages/kit/src/vite/dev/index.js
@@ -239,13 +239,7 @@ export async function dev(vite, vite_config, svelte_config, illegal_imports) {
 
 				/** @type {(env: Record<string, string>) => void} */
 				const set_env = (await import(`${runtime}/app/env/runtime.js`)).set_env;
-
-				set_env(
-					// This just makes sure no values are undefined
-					Object.entries(process.env).reduce((prev, [k, v]) => {
-						return { ...prev, [k]: v ?? '' };
-					}, {})
-				);
+				set_env(/** @type {Record<string, string>} */ (process.env));
 
 				const handle = user_hooks.handle || (({ event, resolve }) => resolve(event));
 

From 8ce2740ca6e2abb36bd5d10263272a454d6bcc37 Mon Sep 17 00:00:00 2001
From: Rich Harris <hello@rich-harris.dev>
Date: Fri, 22 Jul 2022 14:25:40 -0400
Subject: [PATCH 41/95] remove hard-coded .svelte-kit

---
 packages/kit/src/vite/dev/index.js |  7 ++++---
 packages/kit/src/vite/index.js     |  2 +-
 packages/kit/src/vite/utils.js     | 12 ++++++++----
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/packages/kit/src/vite/dev/index.js b/packages/kit/src/vite/dev/index.js
index 615c85223a8e..4ac46a7705a3 100644
--- a/packages/kit/src/vite/dev/index.js
+++ b/packages/kit/src/vite/dev/index.js
@@ -64,7 +64,7 @@ export async function dev(vite, vite_config, svelte_config, illegal_imports) {
 						const node = await vite.moduleGraph.getModuleByUrl(url);
 						if (!node) throw new Error(`Could not find node for ${url}`);
 
-						prevent_illegal_imports(node, illegal_imports);
+						prevent_illegal_imports(node, svelte_config.kit, illegal_imports);
 
 						return {
 							module,
@@ -455,9 +455,10 @@ async function find_deps(vite, node, deps) {
 /**
  * Throw an error if a private module is imported from a client-side node.
  * @param {import('vite').ModuleNode} node
+ * @param {import('types').ValidatedKitConfig} config
  * @param {Set<string>} illegal_imports
  */
-export function prevent_illegal_imports(node, illegal_imports) {
+export function prevent_illegal_imports(node, config, illegal_imports) {
 	const seen = new Set();
 
 	/**
@@ -485,7 +486,7 @@ export function prevent_illegal_imports(node, illegal_imports) {
 	const chain = find(node);
 
 	if (chain) {
-		throw new Error(format_illegal_import_chain(chain));
+		throw new Error(format_illegal_import_chain(chain, config));
 	}
 }
 
diff --git a/packages/kit/src/vite/index.js b/packages/kit/src/vite/index.js
index 1dca0b650db8..81c817e840b4 100644
--- a/packages/kit/src/vite/index.js
+++ b/packages/kit/src/vite/index.js
@@ -305,7 +305,7 @@ function kit() {
 
 				if (node) {
 					const chain = find_illegal_imports(node);
-					if (chain) throw new Error(format_illegal_import_chain(chain));
+					if (chain) throw new Error(format_illegal_import_chain(chain, svelte_config.kit));
 				}
 			}
 
diff --git a/packages/kit/src/vite/utils.js b/packages/kit/src/vite/utils.js
index a4e3766ed9a6..af927b4bf013 100644
--- a/packages/kit/src/vite/utils.js
+++ b/packages/kit/src/vite/utils.js
@@ -147,11 +147,15 @@ function repeat(str, times) {
 /**
  * Create a formatted error for an illegal import.
  * @param {Array<string>} stack
+ * @param {import('types').ValidatedKitConfig} config
  */
-export function format_illegal_import_chain(stack) {
-	stack = stack.map((file) =>
-		path.relative(process.cwd(), file).replace('.svelte-kit/runtime/app', '$app')
-	);
+export function format_illegal_import_chain(stack, config) {
+	const app = path.join(config.outDir, 'runtime/app');
+
+	stack = stack.map((file) => {
+		if (file.startsWith(app)) return file.replace(app, '$app');
+		return path.relative(process.cwd(), file);
+	});
 
 	const pyramid = stack.map((file, i) => `${repeat(' ', i * 2)}- ${file}`).join('\n');
 

From 65ee08c83944b02e22dd88d54d4111ff10ff627a Mon Sep 17 00:00:00 2001
From: Rich Harris <hello@rich-harris.dev>
Date: Fri, 22 Jul 2022 15:02:04 -0400
Subject: [PATCH 42/95] rename env/runtime to env/platform and get it working
 in dev

---
 packages/kit/rollup.config.js                        |  2 +-
 .../src/runtime/app/env/{runtime.js => platform.js}  |  0
 packages/kit/src/vite/build/build_server.js          |  2 +-
 packages/kit/src/vite/dev/index.js                   | 12 +++++++++---
 packages/kit/src/vite/index.js                       |  5 ++++-
 packages/kit/types/ambient.d.ts                      |  4 ++--
 6 files changed, 17 insertions(+), 8 deletions(-)
 rename packages/kit/src/runtime/app/env/{runtime.js => platform.js} (100%)

diff --git a/packages/kit/rollup.config.js b/packages/kit/rollup.config.js
index 0cab93621d98..7bc1d56bed9e 100644
--- a/packages/kit/rollup.config.js
+++ b/packages/kit/rollup.config.js
@@ -23,7 +23,7 @@ export default [
 			'app/stores': 'src/runtime/app/stores.js',
 			'app/paths': 'src/runtime/app/paths.js',
 			'app/env': 'src/runtime/app/env.js',
-			'app/env/runtime': 'src/runtime/app/env/runtime.js',
+			'app/env/platform': 'src/runtime/app/env/platform.js',
 			paths: 'src/runtime/paths.js',
 			env: 'src/runtime/env.js'
 		},
diff --git a/packages/kit/src/runtime/app/env/runtime.js b/packages/kit/src/runtime/app/env/platform.js
similarity index 100%
rename from packages/kit/src/runtime/app/env/runtime.js
rename to packages/kit/src/runtime/app/env/platform.js
diff --git a/packages/kit/src/vite/build/build_server.js b/packages/kit/src/vite/build/build_server.js
index 7cb6b6152ee2..f68fb0ccf049 100644
--- a/packages/kit/src/vite/build/build_server.js
+++ b/packages/kit/src/vite/build/build_server.js
@@ -27,7 +27,7 @@ import root from '__GENERATED__/root.svelte';
 import { respond } from '${runtime}/server/index.js';
 import { set_paths, assets, base } from '${runtime}/paths.js';
 import { set_prerendering } from '${runtime}/env.js';
-import { set_env } from '${runtime}/app/env/runtime.js';
+import { set_env } from '${runtime}/app/env/platform.js';
 
 const template = ({ head, body, assets, nonce }) => ${s(template)
 	.replace('%sveltekit.head%', '" + head + "')
diff --git a/packages/kit/src/vite/dev/index.js b/packages/kit/src/vite/dev/index.js
index 4ac46a7705a3..00591376f699 100644
--- a/packages/kit/src/vite/dev/index.js
+++ b/packages/kit/src/vite/dev/index.js
@@ -237,9 +237,15 @@ export async function dev(vite, vite_config, svelte_config, illegal_imports) {
 					? await vite.ssrLoadModule(`/${svelte_config.kit.files.hooks}`)
 					: {};
 
-				/** @type {(env: Record<string, string>) => void} */
-				const set_env = (await import(`${runtime}/app/env/runtime.js`)).set_env;
-				set_env(/** @type {Record<string, string>} */ (process.env));
+				const { set_env } = await vite.ssrLoadModule(
+					process.env.BUNDLED
+						? `/${posixify(
+								path.relative(cwd, `${svelte_config.kit.outDir}/runtime/app/env/platform.js`)
+						  )}`
+						: `/@fs${runtime}/app/env/platform.js`
+				);
+
+				set_env(process.env);
 
 				const handle = user_hooks.handle || (({ event, resolve }) => resolve(event));
 
diff --git a/packages/kit/src/vite/index.js b/packages/kit/src/vite/index.js
index 81c817e840b4..525d5046e06e 100644
--- a/packages/kit/src/vite/index.js
+++ b/packages/kit/src/vite/index.js
@@ -189,7 +189,10 @@ function kit() {
 				client_out_dir: `${svelte_config.kit.outDir}/output/client/`
 			};
 
-			illegal_imports = new Set([`${svelte_config.kit.outDir}/runtime/app/env/private.js`]);
+			illegal_imports = new Set([
+				`${svelte_config.kit.outDir}/runtime/app/env/platform.js`,
+				`${svelte_config.kit.outDir}/runtime/app/env/private.js`
+			]);
 
 			if (is_build) {
 				manifest_data = sync.all(svelte_config, config_env.mode).manifest_data;
diff --git a/packages/kit/types/ambient.d.ts b/packages/kit/types/ambient.d.ts
index b755862cbda6..3e360e57644b 100644
--- a/packages/kit/types/ambient.d.ts
+++ b/packages/kit/types/ambient.d.ts
@@ -63,7 +63,7 @@ declare namespace App {
 	export interface Stuff {}
 
 	/**
-	 * The interface that defines the runtime environment variables exported from '$app/env/runtime'.
+	 * The interface that defines the dynamic environment variables exported from '$app/env/platform'.
 	 */
 	export interface RuntimeEnv extends Record<string, string> {}
 }
@@ -90,7 +90,7 @@ declare module '$app/env' {
 	export const prerendering: boolean;
 }
 
-declare module '$app/env/runtime' {
+declare module '$app/env/platform' {
 	/**
 	 * The runtime environment variables, as defined by the adapter.
 	 */

From 133cc7a9a9bea1cafa00bd111bae8ce1f0e5eb82 Mon Sep 17 00:00:00 2001
From: Rich Harris <hello@rich-harris.dev>
Date: Fri, 22 Jul 2022 15:05:25 -0400
Subject: [PATCH 43/95] remove outdated comment

---
 packages/kit/src/vite/preview/index.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/kit/src/vite/preview/index.js b/packages/kit/src/vite/preview/index.js
index d5e588360650..240db53c436b 100644
--- a/packages/kit/src/vite/preview/index.js
+++ b/packages/kit/src/vite/preview/index.js
@@ -43,7 +43,6 @@ export async function preview(vite, config, protocol) {
 
 	const server = new Server(manifest);
 	server.init({
-		// This just makes sure no values are undefined
 		env: /** @type {Record<string, string>} */ (process.env)
 	});
 

From e56bf28ce962daacaa908cd0f5fac4a21bc52395 Mon Sep 17 00:00:00 2001
From: Rich Harris <hello@rich-harris.dev>
Date: Fri, 22 Jul 2022 16:56:01 -0400
Subject: [PATCH 44/95] docs

---
 documentation/docs/15-configuration.md        |  15 ++-
 documentation/faq/60-env-vars.md              |   6 +-
 packages/kit/scripts/extract-types.js         | 120 ++++++++++--------
 .../scripts/special-types/$app+env+private.md |   7 +
 .../scripts/special-types/$app+env+public.md  |   7 +
 packages/kit/scripts/special-types/$lib.md    |   1 +
 packages/kit/types/ambient.d.ts               |  37 ++++--
 .../src/lib/docs/server/modules.js            |   6 +-
 8 files changed, 121 insertions(+), 78 deletions(-)
 create mode 100644 packages/kit/scripts/special-types/$app+env+private.md
 create mode 100644 packages/kit/scripts/special-types/$app+env+public.md
 create mode 100644 packages/kit/scripts/special-types/$lib.md

diff --git a/documentation/docs/15-configuration.md b/documentation/docs/15-configuration.md
index c51d158e81b5..d48e3a3d2255 100644
--- a/documentation/docs/15-configuration.md
+++ b/documentation/docs/15-configuration.md
@@ -29,7 +29,9 @@ const config = {
 				// ...
 			}
 		},
-		moduleExtensions: ['.js', '.ts'],
+		env: {
+			publicPrefix: 'PUBLIC_'
+		},
 		files: {
 			assets: 'static',
 			hooks: 'src/hooks',
@@ -44,6 +46,7 @@ const config = {
 			parameter: '_method',
 			allowed: []
 		},
+		moduleExtensions: ['.js', '.ts'],
 		outDir: '.svelte-kit',
 		package: {
 			dir: 'package',
@@ -157,9 +160,11 @@ When pages are prerendered, the CSP header is added via a `<meta http-equiv>` ta
 
 > Note that most [Svelte transitions](https://svelte.dev/tutorial/transition) work by creating an inline `<style>` element. If you use these in your app, you must either leave the `style-src` directive unspecified or add `unsafe-inline`.
 
-### moduleExtensions
+### env
 
-An array of file extensions that SvelteKit will treat as modules. Files with extensions that match neither `config.extensions` nor `config.kit.moduleExtensions` will be ignored by the router.
+Environment variable configuration:
+
+- `publicPrefix` — a prefix that signals that an environment variable is safe to expose to client-side code. See [`$app/env/public`](/docs/modules#$app-env-public)
 
 ### files
 
@@ -186,6 +191,10 @@ See [HTTP Method Overrides](/docs/routing#endpoints-http-method-overrides). An o
 - `parameter` — query parameter name to use for passing the intended method value
 - `allowed` - array of HTTP methods that can be used when overriding the original request method
 
+### moduleExtensions
+
+An array of file extensions that SvelteKit will treat as modules. Files with extensions that match neither `config.extensions` nor `config.kit.moduleExtensions` will be ignored by the router.
+
 ### outDir
 
 The directory that SvelteKit writes files to during `dev` and `build`. You should exclude this directory from version control.
diff --git a/documentation/faq/60-env-vars.md b/documentation/faq/60-env-vars.md
index 41d121f5bf15..6acf24e4bb2f 100644
--- a/documentation/faq/60-env-vars.md
+++ b/documentation/faq/60-env-vars.md
@@ -2,8 +2,6 @@
 title: How do I use environment variables?
 ---
 
-Vite uses [dotenv](https://github.com/motdotla/dotenv) to load environment variables from a file named `.env` or similar. Only environment variables prefixed with `VITE_` are exposed ([you can set `envPrefix` to change this](https://vitejs.dev/config/shared-options.html#envprefix)). You can access the variable using `import.meta.env.VITE_ENV_VAR`, and Vite will statically replace them at build-time.
+Environment variables are [loaded by Vite](https://vitejs.dev/guide/env-and-mode.html#env-files) from `.env` files and `process.env` during dev and build. These are available to your app via the [`$app/env/private`](/docs/modules#$app-env-private) and [`$app/env/public`](/docs/modules#$app-env-public) modules. Public variables — i.e. those that are safe to expose to users — must use a [prefix](/docs/configuration#kit-env-publicprefix) that defaults to `PUBLIC_`. Private variables cannot be imported into client-side code.
 
-To use environment variables at runtime, you would need to instantiate dotenv yourself in your server-side code so that they are exposed at `process.env.YOUR_ENV_VAR`. You may also use `$session` to pass them to the client if needed.
-
-Please see [the Vite documentation](https://vitejs.dev/guide/env-and-mode.html#env-files) for more info about environment variables.
+For environment variables that are not known at build time, you can use [`$app/env/platform`](/docs/modules#$app-env-platform).
diff --git a/packages/kit/scripts/extract-types.js b/packages/kit/scripts/extract-types.js
index 67e273e977e8..fbebcf2db77f 100644
--- a/packages/kit/scripts/extract-types.js
+++ b/packages/kit/scripts/extract-types.js
@@ -2,6 +2,7 @@ import fs from 'fs';
 import ts from 'typescript';
 import prettier from 'prettier';
 import { mkdirp } from '../src/utils/filesystem.js';
+import { fileURLToPath } from 'url';
 
 /** @typedef {{ name: string, comment: string, snippet: string }} Extracted */
 
@@ -19,55 +20,59 @@ function get_types(code, statements) {
 	/** @type {Extracted[]} */
 	const types = [];
 
-	for (const statement of statements) {
-		if (
-			ts.isClassDeclaration(statement) ||
-			ts.isInterfaceDeclaration(statement) ||
-			ts.isTypeAliasDeclaration(statement) ||
-			ts.isModuleDeclaration(statement) ||
-			ts.isVariableStatement(statement) ||
-			ts.isFunctionDeclaration(statement)
-		) {
-			const name_node = ts.isVariableStatement(statement)
-				? statement.declarationList.declarations[0]
-				: statement;
-
-			// @ts-ignore no idea why it's complaining here
-			const name = name_node.name?.escapedText;
-
-			let start = statement.pos;
-			let comment = '';
-
-			// @ts-ignore i think typescript is bad at typescript
-			if (statement.jsDoc) {
-				// @ts-ignore
-				comment = statement.jsDoc[0].comment;
-				// @ts-ignore
-				start = statement.jsDoc[0].end;
+	if (statements) {
+		for (const statement of statements) {
+			if (
+				ts.isClassDeclaration(statement) ||
+				ts.isInterfaceDeclaration(statement) ||
+				ts.isTypeAliasDeclaration(statement) ||
+				ts.isModuleDeclaration(statement) ||
+				ts.isVariableStatement(statement) ||
+				ts.isFunctionDeclaration(statement)
+			) {
+				const name_node = ts.isVariableStatement(statement)
+					? statement.declarationList.declarations[0]
+					: statement;
+
+				// @ts-ignore no idea why it's complaining here
+				const name = name_node.name?.escapedText;
+
+				let start = statement.pos;
+				let comment = '';
+
+				// @ts-ignore i think typescript is bad at typescript
+				if (statement.jsDoc) {
+					// @ts-ignore
+					comment = statement.jsDoc[0].comment;
+					// @ts-ignore
+					start = statement.jsDoc[0].end;
+				}
+
+				const i = code.indexOf('export', start);
+				start = i + 6;
+
+				const snippet = prettier.format(code.slice(start, statement.end).trim(), {
+					parser: 'typescript',
+					printWidth: 80,
+					useTabs: true,
+					singleQuote: true,
+					trailingComma: 'none'
+				});
+
+				const collection =
+					ts.isVariableStatement(statement) || ts.isFunctionDeclaration(statement)
+						? exports
+						: types;
+
+				collection.push({ name, comment, snippet });
+			} else {
+				// console.log(statement.kind);
 			}
-
-			const i = code.indexOf('export', start);
-			start = i + 6;
-
-			const snippet = prettier.format(code.slice(start, statement.end).trim(), {
-				parser: 'typescript',
-				printWidth: 80,
-				useTabs: true,
-				singleQuote: true,
-				trailingComma: 'none'
-			});
-
-			const collection =
-				ts.isVariableStatement(statement) || ts.isFunctionDeclaration(statement) ? exports : types;
-
-			collection.push({ name, comment, snippet });
-		} else {
-			// console.log(statement.kind);
 		}
-	}
 
-	types.sort((a, b) => (a.name < b.name ? -1 : 1));
-	exports.sort((a, b) => (a.name < b.name ? -1 : 1));
+		types.sort((a, b) => (a.name < b.name ? -1 : 1));
+		exports.sort((a, b) => (a.name < b.name ? -1 : 1));
+	}
 
 	return { types, exports };
 }
@@ -95,13 +100,18 @@ function get_types(code, statements) {
 	});
 }
 
-modules.push({
-	name: '$lib',
-	comment:
-		'This is a simple alias to `src/lib`, or whatever directory is specified as [`config.kit.files.lib`](/docs/configuration#files). It allows you to access common components and utility modules without `../../../../` nonsense.',
-	exports: [],
-	types: []
-});
+const dir = fileURLToPath(new URL('./special-types', import.meta.url).href);
+for (const file of fs.readdirSync(dir)) {
+	if (!file.endsWith('.md')) continue;
+
+	const comment = fs.readFileSync(`${dir}/${file}`, 'utf-8');
+	modules.push({
+		name: file.replace(/\+/g, '/').slice(0, -3),
+		comment,
+		exports: [],
+		types: []
+	});
+}
 
 {
 	const code = fs.readFileSync('types/ambient.d.ts', 'utf-8');
@@ -117,9 +127,9 @@ modules.push({
 
 			modules.push({
 				name,
-				comment,
+				comment: comment.replace(/https:\/\/kit\.svelte\.dev/g, ''),
 				// @ts-ignore
-				...get_types(code, statement.body.statements)
+				...get_types(code, statement.body?.statements)
 			});
 		}
 	}
diff --git a/packages/kit/scripts/special-types/$app+env+private.md b/packages/kit/scripts/special-types/$app+env+private.md
new file mode 100644
index 000000000000..6a81b5d54be4
--- /dev/null
+++ b/packages/kit/scripts/special-types/$app+env+private.md
@@ -0,0 +1,7 @@
+Environment variables [loaded by Vite](https://vitejs.dev/guide/env-and-mode.html#env-files) from `.env` files and `process.env`. Like [`$app/env/platform`](https://kit.svelte.dev/docs/modules#$app-env-platform), this module cannot be imported into client-side code.
+
+_Unlike_ [`$app/env/platform`](https://kit.svelte.dev/docs/modules#$app-env-platform), the values exported from this module are statically injected into your bundle at build time, enabling optimisations like dead code elimination.
+
+```ts
+import { API_KEY } from '$app/env/private';
+```
diff --git a/packages/kit/scripts/special-types/$app+env+public.md b/packages/kit/scripts/special-types/$app+env+public.md
new file mode 100644
index 000000000000..39b46f204583
--- /dev/null
+++ b/packages/kit/scripts/special-types/$app+env+public.md
@@ -0,0 +1,7 @@
+Similar to [`$app/env/private`](https://kit.svelte.dev/docs/modules#$app-env-private), except that it only includes environment variables that begin with [`config.kit.env.publicPrefix`](https://kit.svelte.dev/docs/configuration#kit-env-publicprefix) (which defaults to `PUBLIC_`), and can therefore safely be exposed to client-side code.
+
+Values are replaced statically at build time.
+
+```ts
+import { PUBLIC_BASE_URL } from '$app/env/public';
+```
diff --git a/packages/kit/scripts/special-types/$lib.md b/packages/kit/scripts/special-types/$lib.md
new file mode 100644
index 000000000000..7365c4e6f96d
--- /dev/null
+++ b/packages/kit/scripts/special-types/$lib.md
@@ -0,0 +1 @@
+This is a simple alias to `src/lib`, or whatever directory is specified as [`config.kit.files.lib`](https://kit.svelte.dev/docs/configuration#files). It allows you to access common components and utility modules without `../../../../` nonsense.
diff --git a/packages/kit/types/ambient.d.ts b/packages/kit/types/ambient.d.ts
index 3e360e57644b..f779dd055114 100644
--- a/packages/kit/types/ambient.d.ts
+++ b/packages/kit/types/ambient.d.ts
@@ -43,22 +43,22 @@
  */
 declare namespace App {
 	/**
-	 * The interface that defines `event.locals`, which can be accessed in [hooks](/docs/hooks) (`handle`, `handleError` and `getSession`) and [endpoints](/docs/routing#endpoints).
+	 * The interface that defines `event.locals`, which can be accessed in [hooks](https://kit.svelte.dev/docs/hooks) (`handle`, `handleError` and `getSession`) and [endpoints](https://kit.svelte.dev/docs/routing#endpoints).
 	 */
 	export interface Locals {}
 
 	/**
-	 * If your adapter provides [platform-specific context](/docs/adapters#supported-environments-platform-specific-context) via `event.platform`, you can specify it here.
+	 * If your adapter provides [platform-specific context](https://kit.svelte.dev/docs/adapters#supported-environments-platform-specific-context) via `event.platform`, you can specify it here.
 	 */
 	export interface Platform {}
 
 	/**
-	 * The interface that defines `session`, both as an argument to [`load`](/docs/loading) functions and the value of the [session store](/docs/modules#$app-stores).
+	 * The interface that defines `session`, both as an argument to [`load`](https://kit.svelte.dev/docs/loading) functions and the value of the [session store](https://kit.svelte.dev/docs/modules#$app-stores).
 	 */
 	export interface Session {}
 
 	/**
-	 * The interface that defines `stuff`, as input or output to [`load`](/docs/loading) or as the value of the `stuff` property of the [page store](/docs/modules#$app-stores).
+	 * The interface that defines `stuff`, as input or output to [`load`](https://kit.svelte.dev/docs/loading) or as the value of the `stuff` property of the [page store](https://kit.svelte.dev/docs/modules#$app-stores).
 	 */
 	export interface Stuff {}
 
@@ -90,10 +90,19 @@ declare module '$app/env' {
 	export const prerendering: boolean;
 }
 
+/**
+ * This module provides access to runtime environment variables, as defined by the platform you're running on. For example
+ * if you're using [`adapter-node`](https://github.com/sveltejs/kit/tree/master/packages/adapter-node) (or running
+ * [`vite preview`](https://kit.svelte.dev/docs/cli)), this is equivalent to `process.env`.
+ *
+ * This module cannot be imported into client-side code.
+ *
+ * ```ts
+ * import { env } from '$app/env/platform';
+ * console.log(env.MY_DEPLOYMENT_SPECIFIC_VARIABLE);
+ * ```
+ */
 declare module '$app/env/platform' {
-	/**
-	 * The runtime environment variables, as defined by the adapter.
-	 */
 	export let env: App.RuntimeEnv;
 }
 
@@ -179,11 +188,11 @@ declare module '$app/navigation' {
  */
 declare module '$app/paths' {
 	/**
-	 * A string that matches [`config.kit.paths.base`](/docs/configuration#paths). It must start, but not end with `/` (e.g. `/base-path`), unless it is the empty string.
+	 * A string that matches [`config.kit.paths.base`](https://kit.svelte.dev/docs/configuration#paths). It must start, but not end with `/` (e.g. `/base-path`), unless it is the empty string.
 	 */
 	export const base: `/${string}`;
 	/**
-	 * An absolute path that matches [`config.kit.paths.assets`](/docs/configuration#paths).
+	 * An absolute path that matches [`config.kit.paths.assets`](https://kit.svelte.dev/docs/configuration#paths).
 	 *
 	 * > If a value for `config.kit.paths.assets` is specified, it will be replaced with `'/_svelte_kit_assets'` during `vite dev` or `vite preview`, since the assets don't yet live at their eventual URL.
 	 */
@@ -225,12 +234,12 @@ declare module '$app/stores' {
 	 */
 	export const navigating: Readable<Navigation | null>;
 	/**
-	 * A writable store whose initial value is whatever was returned from [`getSession`](/docs/hooks#getsession).
+	 * A writable store whose initial value is whatever was returned from [`getSession`](https://kit.svelte.dev/docs/hooks#getsession).
 	 * It can be written to, but this will not cause changes to persist on the server — this is something you must implement yourself.
 	 */
 	export const session: Writable<App.Session>;
 	/**
-	 *  A readable store whose initial value is `false`. If [`version.pollInterval`](/docs/configuration#version) is a non-zero value, SvelteKit will poll for new versions of the app and update the store value to `true` when it detects one. `updated.check()` will force an immediate check, regardless of polling.
+	 *  A readable store whose initial value is `false`. If [`version.pollInterval`](https://kit.svelte.dev/docs/configuration#version) is a non-zero value, SvelteKit will poll for new versions of the app and update the store value to `true` when it detects one. `updated.check()` will force an immediate check, regardless of polling.
 	 */
 	export const updated: Readable<boolean> & { check: () => boolean };
 }
@@ -240,7 +249,7 @@ declare module '$app/stores' {
  * import { build, files, prerendered, version } from '$service-worker';
  * ```
  *
- * This module is only available to [service workers](/docs/service-workers).
+ * This module is only available to [service workers](https://kit.svelte.dev/docs/service-workers).
  */
 declare module '$service-worker' {
 	/**
@@ -248,7 +257,7 @@ declare module '$service-worker' {
 	 */
 	export const build: string[];
 	/**
-	 * An array of URL strings representing the files in your static directory, or whatever directory is specified by `config.kit.files.assets`. You can customize which files are included from `static` directory using [`config.kit.serviceWorker.files`](/docs/configuration)
+	 * An array of URL strings representing the files in your static directory, or whatever directory is specified by `config.kit.files.assets`. You can customize which files are included from `static` directory using [`config.kit.serviceWorker.files`](https://kit.svelte.dev/docs/configuration)
 	 */
 	export const files: string[];
 	/**
@@ -256,7 +265,7 @@ declare module '$service-worker' {
 	 */
 	export const prerendered: string[];
 	/**
-	 * See [`config.kit.version`](/docs/configuration#version). It's useful for generating unique cache names inside your service worker, so that a later deployment of your app can invalidate old caches.
+	 * See [`config.kit.version`](https://kit.svelte.dev/docs/configuration#version). It's useful for generating unique cache names inside your service worker, so that a later deployment of your app can invalidate old caches.
 	 */
 	export const version: string;
 }
diff --git a/sites/kit.svelte.dev/src/lib/docs/server/modules.js b/sites/kit.svelte.dev/src/lib/docs/server/modules.js
index 219074992c75..aa1667c7fdfe 100644
--- a/sites/kit.svelte.dev/src/lib/docs/server/modules.js
+++ b/sites/kit.svelte.dev/src/lib/docs/server/modules.js
@@ -1,11 +1,13 @@
 import { modules } from '../../../../../../packages/kit/docs/types.js';
 
+const exempt = new Set(['$lib', '$app/env/public', '$app/env/private']);
+
 /** @param {'types' | 'exports'} kind */
 export function render_modules(kind) {
 	return modules
 		.map((module) => {
-			// special case — we want to include $lib in the modules page
-			const is_lib_exports = kind === 'exports' && module.name === '$lib';
+			// special case — we want to include $lib etc in the modules page
+			const is_lib_exports = kind === 'exports' && exempt.has(module.name);
 			const skip = module[kind].length === 0 && !is_lib_exports;
 
 			if (skip) return '';

From e6771028a0ecd2fb1705f09b9741cb6e30c12208 Mon Sep 17 00:00:00 2001
From: Rich Harris <hello@rich-harris.dev>
Date: Fri, 22 Jul 2022 16:58:45 -0400
Subject: [PATCH 45/95] App.RuntimeEnv -> App.Env

---
 packages/kit/src/runtime/app/env/platform.js | 2 +-
 packages/kit/types/ambient.d.ts              | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/kit/src/runtime/app/env/platform.js b/packages/kit/src/runtime/app/env/platform.js
index 5a609006220b..14b4c2554f6a 100644
--- a/packages/kit/src/runtime/app/env/platform.js
+++ b/packages/kit/src/runtime/app/env/platform.js
@@ -1,4 +1,4 @@
-/** @type {App.RuntimeEnv} */
+/** @type {App.Env} */
 export let env = {};
 
 /** @type {(environment: Record<string, string>) => void} */
diff --git a/packages/kit/types/ambient.d.ts b/packages/kit/types/ambient.d.ts
index f779dd055114..5f521b229a57 100644
--- a/packages/kit/types/ambient.d.ts
+++ b/packages/kit/types/ambient.d.ts
@@ -65,7 +65,7 @@ declare namespace App {
 	/**
 	 * The interface that defines the dynamic environment variables exported from '$app/env/platform'.
 	 */
-	export interface RuntimeEnv extends Record<string, string> {}
+	export interface Env extends Record<string, string> {}
 }
 
 /**
@@ -103,7 +103,7 @@ declare module '$app/env' {
  * ```
  */
 declare module '$app/env/platform' {
-	export let env: App.RuntimeEnv;
+	export let env: App.Env;
 }
 
 /**

From e5676a82c69820d360f8815df9dc500034c26306 Mon Sep 17 00:00:00 2001
From: Rich Harris <hello@rich-harris.dev>
Date: Fri, 22 Jul 2022 17:03:48 -0400
Subject: [PATCH 46/95] add Env interface where necessary

---
 documentation/docs/06-hooks.md                     |  3 ---
 .../create-svelte/templates/default/src/app.d.ts   |  2 ++
 .../create-svelte/templates/skeleton/src/app.d.ts  |  1 +
 packages/kit/types/ambient.d.ts                    | 14 ++++++++------
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/documentation/docs/06-hooks.md b/documentation/docs/06-hooks.md
index a6b28d5d28f5..f1769fb23051 100644
--- a/documentation/docs/06-hooks.md
+++ b/documentation/docs/06-hooks.md
@@ -38,9 +38,6 @@ declare namespace App {
 	interface Locals {
 		user: User;
 	}
-	interface Platform {}
-	interface Session {}
-	interface Stuff {}
 }
 
 const getUserInformation: (cookie: string | null) => Promise<User>;
diff --git a/packages/create-svelte/templates/default/src/app.d.ts b/packages/create-svelte/templates/default/src/app.d.ts
index 9ca010a6dc91..a91fdae88060 100644
--- a/packages/create-svelte/templates/default/src/app.d.ts
+++ b/packages/create-svelte/templates/default/src/app.d.ts
@@ -4,6 +4,8 @@
 // for information about these interfaces
 // and what to do when importing types
 declare namespace App {
+	// interface Env {}
+
 	interface Locals {
 		userid: string;
 	}
diff --git a/packages/create-svelte/templates/skeleton/src/app.d.ts b/packages/create-svelte/templates/skeleton/src/app.d.ts
index b28d8405630d..c257d5a96a71 100644
--- a/packages/create-svelte/templates/skeleton/src/app.d.ts
+++ b/packages/create-svelte/templates/skeleton/src/app.d.ts
@@ -4,6 +4,7 @@
 // for information about these interfaces
 // and what to do when importing types
 declare namespace App {
+	// interface Env {}
 	// interface Locals {}
 	// interface Platform {}
 	// interface Session {}
diff --git a/packages/kit/types/ambient.d.ts b/packages/kit/types/ambient.d.ts
index 5f521b229a57..d0bc39e30148 100644
--- a/packages/kit/types/ambient.d.ts
+++ b/packages/kit/types/ambient.d.ts
@@ -5,6 +5,8 @@
  * /// <reference types="@sveltejs/kit" />
  *
  * declare namespace App {
+ * 	interface Env {}
+ *
  * 	interface Locals {}
  *
  * 	interface Platform {}
@@ -15,7 +17,7 @@
  * }
  * ```
  *
- * By populating these interfaces, you will gain type safety when using `event.locals`, `event.platform`, `session` and `stuff`.
+ * By populating these interfaces, you will gain type safety when using `env`, `event.locals`, `event.platform`, `session` and `stuff`.
  *
  * Note that since it's an ambient declaration file, you have to be careful when using `import` statements. Once you add an `import`
  * at the top level, the declaration file is no longer considered ambient and you lose access to these typings in other files.
@@ -42,6 +44,11 @@
  *
  */
 declare namespace App {
+	/**
+	 * The interface that defines the dynamic environment variables exported from '$app/env/platform'.
+	 */
+	export interface Env extends Record<string, string> {}
+
 	/**
 	 * The interface that defines `event.locals`, which can be accessed in [hooks](https://kit.svelte.dev/docs/hooks) (`handle`, `handleError` and `getSession`) and [endpoints](https://kit.svelte.dev/docs/routing#endpoints).
 	 */
@@ -61,11 +68,6 @@ declare namespace App {
 	 * The interface that defines `stuff`, as input or output to [`load`](https://kit.svelte.dev/docs/loading) or as the value of the `stuff` property of the [page store](https://kit.svelte.dev/docs/modules#$app-stores).
 	 */
 	export interface Stuff {}
-
-	/**
-	 * The interface that defines the dynamic environment variables exported from '$app/env/platform'.
-	 */
-	export interface Env extends Record<string, string> {}
 }
 
 /**

From f768a9c62649798e60745c369708494763385df5 Mon Sep 17 00:00:00 2001
From: Rich Harris <hello@rich-harris.dev>
Date: Fri, 22 Jul 2022 17:06:34 -0400
Subject: [PATCH 47/95] update more adapters

---
 packages/adapter-cloudflare-workers/files/entry.js | 2 ++
 packages/adapter-netlify/src/serverless.js         | 4 ++++
 packages/adapter-vercel/files/serverless.js        | 4 ++++
 3 files changed, 10 insertions(+)

diff --git a/packages/adapter-cloudflare-workers/files/entry.js b/packages/adapter-cloudflare-workers/files/entry.js
index 1064a1547763..cd784e5d33c6 100644
--- a/packages/adapter-cloudflare-workers/files/entry.js
+++ b/packages/adapter-cloudflare-workers/files/entry.js
@@ -15,6 +15,8 @@ export default {
 	 * @param {any} context
 	 */
 	async fetch(req, env, context) {
+		server.init({ env });
+
 		const url = new URL(req.url);
 
 		// static assets
diff --git a/packages/adapter-netlify/src/serverless.js b/packages/adapter-netlify/src/serverless.js
index 8c4bcff5d945..aec29eef562a 100644
--- a/packages/adapter-netlify/src/serverless.js
+++ b/packages/adapter-netlify/src/serverless.js
@@ -9,6 +9,10 @@ import { split_headers } from './headers';
 export function init(manifest) {
 	const server = new Server(manifest);
 
+	server.init({
+		env: process.env
+	});
+
 	return async (event, context) => {
 		const response = await server.respond(to_request(event), {
 			platform: { context },
diff --git a/packages/adapter-vercel/files/serverless.js b/packages/adapter-vercel/files/serverless.js
index 551b731f6f6f..639275b9b7a1 100644
--- a/packages/adapter-vercel/files/serverless.js
+++ b/packages/adapter-vercel/files/serverless.js
@@ -7,6 +7,10 @@ installPolyfills();
 
 const server = new Server(manifest);
 
+server.init({
+	env: process.env
+});
+
 /**
  * @param {import('http').IncomingMessage} req
  * @param {import('http').ServerResponse} res

From f685c40320d9d0f0b4452f900800f20ed4696cad Mon Sep 17 00:00:00 2001
From: Rich Harris <hello@rich-harris.dev>
Date: Fri, 22 Jul 2022 17:20:23 -0400
Subject: [PATCH 48/95] changesets

---
 .changeset/beige-gorillas-tell.md | 9 +++++++++
 .changeset/pretty-kings-care.md   | 5 +++++
 2 files changed, 14 insertions(+)
 create mode 100644 .changeset/beige-gorillas-tell.md
 create mode 100644 .changeset/pretty-kings-care.md

diff --git a/.changeset/beige-gorillas-tell.md b/.changeset/beige-gorillas-tell.md
new file mode 100644
index 000000000000..bda60cb27840
--- /dev/null
+++ b/.changeset/beige-gorillas-tell.md
@@ -0,0 +1,9 @@
+---
+'@sveltejs/adapter-cloudflare': patch
+'@sveltejs/adapter-cloudflare-workers': patch
+'@sveltejs/adapter-netlify': patch
+'@sveltejs/adapter-node': patch
+'@sveltejs/adapter-vercel': patch
+---
+
+Initialise \$app/env/platform
diff --git a/.changeset/pretty-kings-care.md b/.changeset/pretty-kings-care.md
new file mode 100644
index 000000000000..24074cff88a9
--- /dev/null
+++ b/.changeset/pretty-kings-care.md
@@ -0,0 +1,5 @@
+---
+'@sveltejs/kit': patch
+---
+
+Add $app/env/public, $app/env/private and \$app/env/platform modules

From 3ac79c567f566c88dcc7045d9edd51eabf2aed28 Mon Sep 17 00:00:00 2001
From: Rich Harris <hello@rich-harris.dev>
Date: Fri, 22 Jul 2022 17:28:19 -0400
Subject: [PATCH 49/95] tweak changesets

---
 .changeset/beige-gorillas-tell.md | 2 +-
 .changeset/pretty-kings-care.md   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.changeset/beige-gorillas-tell.md b/.changeset/beige-gorillas-tell.md
index bda60cb27840..baa05742d6eb 100644
--- a/.changeset/beige-gorillas-tell.md
+++ b/.changeset/beige-gorillas-tell.md
@@ -6,4 +6,4 @@
 '@sveltejs/adapter-vercel': patch
 ---
 
-Initialise \$app/env/platform
+Initialise `$app/env/platform`
diff --git a/.changeset/pretty-kings-care.md b/.changeset/pretty-kings-care.md
index 24074cff88a9..af0c4bdbb6a0 100644
--- a/.changeset/pretty-kings-care.md
+++ b/.changeset/pretty-kings-care.md
@@ -2,4 +2,4 @@
 '@sveltejs/kit': patch
 ---
 
-Add $app/env/public, $app/env/private and \$app/env/platform modules
+Add `$app/env/public`, `$app/env/private` and `$app/env/platform` modules

From 0429f87ec2613ed6060d121186e65376b841f0a8 Mon Sep 17 00:00:00 2001
From: Rich Harris <hello@rich-harris.dev>
Date: Fri, 22 Jul 2022 17:42:36 -0400
Subject: [PATCH 50/95] add a test

---
 packages/kit/src/vite/utils.js                       |  9 ++++++++-
 packages/kit/test/apps/basics/.env                   |  2 ++
 packages/kit/test/apps/basics/.gitignore             |  3 ++-
 .../kit/test/apps/basics/src/routes/env/index.js     |  9 +++++++++
 .../kit/test/apps/basics/src/routes/env/index.svelte |  9 +++++++++
 packages/kit/test/apps/basics/test/test.js           | 12 ++++++++++++
 6 files changed, 42 insertions(+), 2 deletions(-)
 create mode 100644 packages/kit/test/apps/basics/.env
 create mode 100644 packages/kit/test/apps/basics/src/routes/env/index.js
 create mode 100644 packages/kit/test/apps/basics/src/routes/env/index.svelte

diff --git a/packages/kit/src/vite/utils.js b/packages/kit/src/vite/utils.js
index af927b4bf013..4f9aeefbd7c1 100644
--- a/packages/kit/src/vite/utils.js
+++ b/packages/kit/src/vite/utils.js
@@ -92,13 +92,20 @@ export function get_aliases(config) {
 	/** @type {Record<string, string>} */
 	const alias = {
 		__GENERATED__: path.posix.join(config.outDir, 'generated'),
-		$app: `${get_runtime_directory(config)}/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.
 		$lib: config.files.lib
 	};
 
+	if (!process.env.BUNDLED) {
+		alias['$app/env/public'] = path.posix.join(config.outDir, 'runtime/app/env/public.js');
+		alias['$app/env/private'] = path.posix.join(config.outDir, 'runtime/app/env/private.js');
+	}
+
+	// we set $app after $app/env/* so that the more specific aliases resolve first
+	alias['$app'] = `${get_runtime_directory(config)}/app`;
+
 	for (const [key, value] of Object.entries(config.alias)) {
 		alias[key] = path.resolve(value);
 	}
diff --git a/packages/kit/test/apps/basics/.env b/packages/kit/test/apps/basics/.env
new file mode 100644
index 000000000000..15b23d354902
--- /dev/null
+++ b/packages/kit/test/apps/basics/.env
@@ -0,0 +1,2 @@
+SECRET="this is directly accessible to server-side code"
+PUBLIC_VAR="this is directly accessible anywhere"
\ No newline at end of file
diff --git a/packages/kit/test/apps/basics/.gitignore b/packages/kit/test/apps/basics/.gitignore
index 4959267f5bf4..57795199de11 100644
--- a/packages/kit/test/apps/basics/.gitignore
+++ b/packages/kit/test/apps/basics/.gitignore
@@ -1 +1,2 @@
-/test/errors.json
\ No newline at end of file
+/test/errors.json
+!/.env
\ No newline at end of file
diff --git a/packages/kit/test/apps/basics/src/routes/env/index.js b/packages/kit/test/apps/basics/src/routes/env/index.js
new file mode 100644
index 000000000000..593cb126de15
--- /dev/null
+++ b/packages/kit/test/apps/basics/src/routes/env/index.js
@@ -0,0 +1,9 @@
+import { SECRET } from '$app/env/private';
+
+export function GET() {
+	return {
+		body: {
+			SECRET
+		}
+	};
+}
diff --git a/packages/kit/test/apps/basics/src/routes/env/index.svelte b/packages/kit/test/apps/basics/src/routes/env/index.svelte
new file mode 100644
index 000000000000..49bf4ad2823c
--- /dev/null
+++ b/packages/kit/test/apps/basics/src/routes/env/index.svelte
@@ -0,0 +1,9 @@
+<script>
+	import { PUBLIC_VAR } from '$app/env/public';
+
+	/** @type {string} */
+	export let SECRET;
+</script>
+
+<p id="private">SECRET: {SECRET}</p>
+<p id="public">PUBLIC_VAR: {PUBLIC_VAR}</p>
diff --git a/packages/kit/test/apps/basics/test/test.js b/packages/kit/test/apps/basics/test/test.js
index 4de2e65a0a28..b2c98c5b4081 100644
--- a/packages/kit/test/apps/basics/test/test.js
+++ b/packages/kit/test/apps/basics/test/test.js
@@ -338,6 +338,18 @@ test.describe('Encoded paths', () => {
 	});
 });
 
+test.describe('Env', () => {
+	test('includes environment variables', async ({ page }) => {
+		await page.goto('/env');
+		expect(await page.textContent('#private')).toBe(
+			'SECRET: this is directly accessible to server-side code'
+		);
+		expect(await page.textContent('#public')).toBe(
+			'PUBLIC_VAR: this is directly accessible anywhere'
+		);
+	});
+});
+
 test.describe('Errors', () => {
 	if (process.env.DEV) {
 		// TODO these probably shouldn't have the full render treatment,

From 79cc250db154dd52384e60efb83d0f5449a09be7 Mon Sep 17 00:00:00 2001
From: Rich Harris <hello@rich-harris.dev>
Date: Fri, 22 Jul 2022 17:51:43 -0400
Subject: [PATCH 51/95] replace doc links

---
 packages/kit/scripts/extract-types.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/kit/scripts/extract-types.js b/packages/kit/scripts/extract-types.js
index fbebcf2db77f..045a1608eef6 100644
--- a/packages/kit/scripts/extract-types.js
+++ b/packages/kit/scripts/extract-types.js
@@ -104,7 +104,10 @@ const dir = fileURLToPath(new URL('./special-types', import.meta.url).href);
 for (const file of fs.readdirSync(dir)) {
 	if (!file.endsWith('.md')) continue;
 
-	const comment = fs.readFileSync(`${dir}/${file}`, 'utf-8');
+	const comment = fs
+		.readFileSync(`${dir}/${file}`, 'utf-8')
+		.replace(/https:\/\/kit\.svelte\.dev/g, '');
+
 	modules.push({
 		name: file.replace(/\+/g, '/').slice(0, -3),
 		comment,

From 0614a330324068c4b048f9be6e9315e7b2ce3e30 Mon Sep 17 00:00:00 2001
From: "S. Elliott Johnson" <sejohnson@torchcloudconsulting.com>
Date: Sun, 24 Jul 2022 20:36:25 -0600
Subject: [PATCH 52/95] fix: Invalid js identifiers skipped

---
 packages/kit/src/core/sync/utils.js     | 13 +++++++++++++
 packages/kit/src/core/sync/write_env.js |  4 +++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/packages/kit/src/core/sync/utils.js b/packages/kit/src/core/sync/utils.js
index be1862cd1927..f49e905df647 100644
--- a/packages/kit/src/core/sync/utils.js
+++ b/packages/kit/src/core/sync/utils.js
@@ -31,3 +31,16 @@ export function trim(str) {
 	const pattern = new RegExp(`^${indentation}`, 'gm');
 	return str.replace(pattern, '').trim();
 }
+
+/**
+ * Determines whether a string will make a valid JavaScript identifier.
+ * https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Grammar_and_types#variables
+ *
+ * The monstrosity of regex below is shameful but necessary, I suppose?
+ * @param {string} str
+ */
+export function is_valid_js_identifier(str) {
+	const regex =
+		/^(?!(?:do|if|in|for|let|new|try|var|case|else|enum|eval|null|this|true|void|with|await|break|catch|class|const|false|super|throw|while|yield|delete|export|import|public|return|static|switch|typeof|default|extends|finally|package|private|continue|debugger|function|arguments|interface|protected|implements|instanceof)$)(?:[\$A-Z_a-z\xAA\xB5\xBA\xC0-\xD6\xD8-\xF6\xF8-\u02C1\u02C6-\u02D1\u02E0-\u02E4\u02EC\u02EE\u0370-\u0374\u0376\u0377\u037A-\u037D\u037F\u0386\u0388-\u038A\u038C\u038E-\u03A1\u03A3-\u03F5\u03F7-\u0481\u048A-\u052F\u0531-\u0556\u0559\u0560-\u0588\u05D0-\u05EA\u05EF-\u05F2\u0620-\u064A\u066E\u066F\u0671-\u06D3\u06D5\u06E5\u06E6\u06EE\u06EF\u06FA-\u06FC\u06FF\u0710\u0712-\u072F\u074D-\u07A5\u07B1\u07CA-\u07EA\u07F4\u07F5\u07FA\u0800-\u0815\u081A\u0824\u0828\u0840-\u0858\u0860-\u086A\u08A0-\u08B4\u08B6-\u08BD\u0904-\u0939\u093D\u0950\u0958-\u0961\u0971-\u0980\u0985-\u098C\u098F\u0990\u0993-\u09A8\u09AA-\u09B0\u09B2\u09B6-\u09B9\u09BD\u09CE\u09DC\u09DD\u09DF-\u09E1\u09F0\u09F1\u09FC\u0A05-\u0A0A\u0A0F\u0A10\u0A13-\u0A28\u0A2A-\u0A30\u0A32\u0A33\u0A35\u0A36\u0A38\u0A39\u0A59-\u0A5C\u0A5E\u0A72-\u0A74\u0A85-\u0A8D\u0A8F-\u0A91\u0A93-\u0AA8\u0AAA-\u0AB0\u0AB2\u0AB3\u0AB5-\u0AB9\u0ABD\u0AD0\u0AE0\u0AE1\u0AF9\u0B05-\u0B0C\u0B0F\u0B10\u0B13-\u0B28\u0B2A-\u0B30\u0B32\u0B33\u0B35-\u0B39\u0B3D\u0B5C\u0B5D\u0B5F-\u0B61\u0B71\u0B83\u0B85-\u0B8A\u0B8E-\u0B90\u0B92-\u0B95\u0B99\u0B9A\u0B9C\u0B9E\u0B9F\u0BA3\u0BA4\u0BA8-\u0BAA\u0BAE-\u0BB9\u0BD0\u0C05-\u0C0C\u0C0E-\u0C10\u0C12-\u0C28\u0C2A-\u0C39\u0C3D\u0C58-\u0C5A\u0C60\u0C61\u0C80\u0C85-\u0C8C\u0C8E-\u0C90\u0C92-\u0CA8\u0CAA-\u0CB3\u0CB5-\u0CB9\u0CBD\u0CDE\u0CE0\u0CE1\u0CF1\u0CF2\u0D05-\u0D0C\u0D0E-\u0D10\u0D12-\u0D3A\u0D3D\u0D4E\u0D54-\u0D56\u0D5F-\u0D61\u0D7A-\u0D7F\u0D85-\u0D96\u0D9A-\u0DB1\u0DB3-\u0DBB\u0DBD\u0DC0-\u0DC6\u0E01-\u0E30\u0E32\u0E33\u0E40-\u0E46\u0E81\u0E82\u0E84\u0E87\u0E88\u0E8A\u0E8D\u0E94-\u0E97\u0E99-\u0E9F\u0EA1-\u0EA3\u0EA5\u0EA7\u0EAA\u0EAB\u0EAD-\u0EB0\u0EB2\u0EB3\u0EBD\u0EC0-\u0EC4\u0EC6\u0EDC-\u0EDF\u0F00\u0F40-\u0F47\u0F49-\u0F6C\u0F88-\u0F8C\u1000-\u102A\u103F\u1050-\u1055\u105A-\u105D\u1061\u1065\u1066\u106E-\u1070\u1075-\u1081\u108E\u10A0-\u10C5\u10C7\u10CD\u10D0-\u10FA\u10FC-\u1248\u124A-\u124D\u1250-\u1256\u1258\u125A-\u125D\u1260-\u1288\u128A-\u128D\u1290-\u12B0\u12B2-\u12B5\u12B8-\u12BE\u12C0\u12C2-\u12C5\u12C8-\u12D6\u12D8-\u1310\u1312-\u1315\u1318-\u135A\u1380-\u138F\u13A0-\u13F5\u13F8-\u13FD\u1401-\u166C\u166F-\u167F\u1681-\u169A\u16A0-\u16EA\u16EE-\u16F8\u1700-\u170C\u170E-\u1711\u1720-\u1731\u1740-\u1751\u1760-\u176C\u176E-\u1770\u1780-\u17B3\u17D7\u17DC\u1820-\u1878\u1880-\u18A8\u18AA\u18B0-\u18F5\u1900-\u191E\u1950-\u196D\u1970-\u1974\u1980-\u19AB\u19B0-\u19C9\u1A00-\u1A16\u1A20-\u1A54\u1AA7\u1B05-\u1B33\u1B45-\u1B4B\u1B83-\u1BA0\u1BAE\u1BAF\u1BBA-\u1BE5\u1C00-\u1C23\u1C4D-\u1C4F\u1C5A-\u1C7D\u1C80-\u1C88\u1C90-\u1CBA\u1CBD-\u1CBF\u1CE9-\u1CEC\u1CEE-\u1CF1\u1CF5\u1CF6\u1D00-\u1DBF\u1E00-\u1F15\u1F18-\u1F1D\u1F20-\u1F45\u1F48-\u1F4D\u1F50-\u1F57\u1F59\u1F5B\u1F5D\u1F5F-\u1F7D\u1F80-\u1FB4\u1FB6-\u1FBC\u1FBE\u1FC2-\u1FC4\u1FC6-\u1FCC\u1FD0-\u1FD3\u1FD6-\u1FDB\u1FE0-\u1FEC\u1FF2-\u1FF4\u1FF6-\u1FFC\u2071\u207F\u2090-\u209C\u2102\u2107\u210A-\u2113\u2115\u2118-\u211D\u2124\u2126\u2128\u212A-\u2139\u213C-\u213F\u2145-\u2149\u214E\u2160-\u2188\u2C00-\u2C2E\u2C30-\u2C5E\u2C60-\u2CE4\u2CEB-\u2CEE\u2CF2\u2CF3\u2D00-\u2D25\u2D27\u2D2D\u2D30-\u2D67\u2D6F\u2D80-\u2D96\u2DA0-\u2DA6\u2DA8-\u2DAE\u2DB0-\u2DB6\u2DB8-\u2DBE\u2DC0-\u2DC6\u2DC8-\u2DCE\u2DD0-\u2DD6\u2DD8-\u2DDE\u3005-\u3007\u3021-\u3029\u3031-\u3035\u3038-\u303C\u3041-\u3096\u309B-\u309F\u30A1-\u30FA\u30FC-\u30FF\u3105-\u312F\u3131-\u318E\u31A0-\u31BA\u31F0-\u31FF\u3400-\u4DB5\u4E00-\u9FEF\uA000-\uA48C\uA4D0-\uA4FD\uA500-\uA60C\uA610-\uA61F\uA62A\uA62B\uA640-\uA66E\uA67F-\uA69D\uA6A0-\uA6EF\uA717-\uA71F\uA722-\uA788\uA78B-\uA7B9\uA7F7-\uA801\uA803-\uA805\uA807-\uA80A\uA80C-\uA822\uA840-\uA873\uA882-\uA8B3\uA8F2-\uA8F7\uA8FB\uA8FD\uA8FE\uA90A-\uA925\uA930-\uA946\uA960-\uA97C\uA984-\uA9B2\uA9CF\uA9E0-\uA9E4\uA9E6-\uA9EF\uA9FA-\uA9FE\uAA00-\uAA28\uAA40-\uAA42\uAA44-\uAA4B\uAA60-\uAA76\uAA7A\uAA7E-\uAAAF\uAAB1\uAAB5\uAAB6\uAAB9-\uAABD\uAAC0\uAAC2\uAADB-\uAADD\uAAE0-\uAAEA\uAAF2-\uAAF4\uAB01-\uAB06\uAB09-\uAB0E\uAB11-\uAB16\uAB20-\uAB26\uAB28-\uAB2E\uAB30-\uAB5A\uAB5C-\uAB65\uAB70-\uABE2\uAC00-\uD7A3\uD7B0-\uD7C6\uD7CB-\uD7FB\uF900-\uFA6D\uFA70-\uFAD9\uFB00-\uFB06\uFB13-\uFB17\uFB1D\uFB1F-\uFB28\uFB2A-\uFB36\uFB38-\uFB3C\uFB3E\uFB40\uFB41\uFB43\uFB44\uFB46-\uFBB1\uFBD3-\uFD3D\uFD50-\uFD8F\uFD92-\uFDC7\uFDF0-\uFDFB\uFE70-\uFE74\uFE76-\uFEFC\uFF21-\uFF3A\uFF41-\uFF5A\uFF66-\uFFBE\uFFC2-\uFFC7\uFFCA-\uFFCF\uFFD2-\uFFD7\uFFDA-\uFFDC]|\uD800[\uDC00-\uDC0B\uDC0D-\uDC26\uDC28-\uDC3A\uDC3C\uDC3D\uDC3F-\uDC4D\uDC50-\uDC5D\uDC80-\uDCFA\uDD40-\uDD74\uDE80-\uDE9C\uDEA0-\uDED0\uDF00-\uDF1F\uDF2D-\uDF4A\uDF50-\uDF75\uDF80-\uDF9D\uDFA0-\uDFC3\uDFC8-\uDFCF\uDFD1-\uDFD5]|\uD801[\uDC00-\uDC9D\uDCB0-\uDCD3\uDCD8-\uDCFB\uDD00-\uDD27\uDD30-\uDD63\uDE00-\uDF36\uDF40-\uDF55\uDF60-\uDF67]|\uD802[\uDC00-\uDC05\uDC08\uDC0A-\uDC35\uDC37\uDC38\uDC3C\uDC3F-\uDC55\uDC60-\uDC76\uDC80-\uDC9E\uDCE0-\uDCF2\uDCF4\uDCF5\uDD00-\uDD15\uDD20-\uDD39\uDD80-\uDDB7\uDDBE\uDDBF\uDE00\uDE10-\uDE13\uDE15-\uDE17\uDE19-\uDE35\uDE60-\uDE7C\uDE80-\uDE9C\uDEC0-\uDEC7\uDEC9-\uDEE4\uDF00-\uDF35\uDF40-\uDF55\uDF60-\uDF72\uDF80-\uDF91]|\uD803[\uDC00-\uDC48\uDC80-\uDCB2\uDCC0-\uDCF2\uDD00-\uDD23\uDF00-\uDF1C\uDF27\uDF30-\uDF45]|\uD804[\uDC03-\uDC37\uDC83-\uDCAF\uDCD0-\uDCE8\uDD03-\uDD26\uDD44\uDD50-\uDD72\uDD76\uDD83-\uDDB2\uDDC1-\uDDC4\uDDDA\uDDDC\uDE00-\uDE11\uDE13-\uDE2B\uDE80-\uDE86\uDE88\uDE8A-\uDE8D\uDE8F-\uDE9D\uDE9F-\uDEA8\uDEB0-\uDEDE\uDF05-\uDF0C\uDF0F\uDF10\uDF13-\uDF28\uDF2A-\uDF30\uDF32\uDF33\uDF35-\uDF39\uDF3D\uDF50\uDF5D-\uDF61]|\uD805[\uDC00-\uDC34\uDC47-\uDC4A\uDC80-\uDCAF\uDCC4\uDCC5\uDCC7\uDD80-\uDDAE\uDDD8-\uDDDB\uDE00-\uDE2F\uDE44\uDE80-\uDEAA\uDF00-\uDF1A]|\uD806[\uDC00-\uDC2B\uDCA0-\uDCDF\uDCFF\uDE00\uDE0B-\uDE32\uDE3A\uDE50\uDE5C-\uDE83\uDE86-\uDE89\uDE9D\uDEC0-\uDEF8]|\uD807[\uDC00-\uDC08\uDC0A-\uDC2E\uDC40\uDC72-\uDC8F\uDD00-\uDD06\uDD08\uDD09\uDD0B-\uDD30\uDD46\uDD60-\uDD65\uDD67\uDD68\uDD6A-\uDD89\uDD98\uDEE0-\uDEF2]|\uD808[\uDC00-\uDF99]|\uD809[\uDC00-\uDC6E\uDC80-\uDD43]|[\uD80C\uD81C-\uD820\uD840-\uD868\uD86A-\uD86C\uD86F-\uD872\uD874-\uD879][\uDC00-\uDFFF]|\uD80D[\uDC00-\uDC2E]|\uD811[\uDC00-\uDE46]|\uD81A[\uDC00-\uDE38\uDE40-\uDE5E\uDED0-\uDEED\uDF00-\uDF2F\uDF40-\uDF43\uDF63-\uDF77\uDF7D-\uDF8F]|\uD81B[\uDE40-\uDE7F\uDF00-\uDF44\uDF50\uDF93-\uDF9F\uDFE0\uDFE1]|\uD821[\uDC00-\uDFF1]|\uD822[\uDC00-\uDEF2]|\uD82C[\uDC00-\uDD1E\uDD70-\uDEFB]|\uD82F[\uDC00-\uDC6A\uDC70-\uDC7C\uDC80-\uDC88\uDC90-\uDC99]|\uD835[\uDC00-\uDC54\uDC56-\uDC9C\uDC9E\uDC9F\uDCA2\uDCA5\uDCA6\uDCA9-\uDCAC\uDCAE-\uDCB9\uDCBB\uDCBD-\uDCC3\uDCC5-\uDD05\uDD07-\uDD0A\uDD0D-\uDD14\uDD16-\uDD1C\uDD1E-\uDD39\uDD3B-\uDD3E\uDD40-\uDD44\uDD46\uDD4A-\uDD50\uDD52-\uDEA5\uDEA8-\uDEC0\uDEC2-\uDEDA\uDEDC-\uDEFA\uDEFC-\uDF14\uDF16-\uDF34\uDF36-\uDF4E\uDF50-\uDF6E\uDF70-\uDF88\uDF8A-\uDFA8\uDFAA-\uDFC2\uDFC4-\uDFCB]|\uD83A[\uDC00-\uDCC4\uDD00-\uDD43]|\uD83B[\uDE00-\uDE03\uDE05-\uDE1F\uDE21\uDE22\uDE24\uDE27\uDE29-\uDE32\uDE34-\uDE37\uDE39\uDE3B\uDE42\uDE47\uDE49\uDE4B\uDE4D-\uDE4F\uDE51\uDE52\uDE54\uDE57\uDE59\uDE5B\uDE5D\uDE5F\uDE61\uDE62\uDE64\uDE67-\uDE6A\uDE6C-\uDE72\uDE74-\uDE77\uDE79-\uDE7C\uDE7E\uDE80-\uDE89\uDE8B-\uDE9B\uDEA1-\uDEA3\uDEA5-\uDEA9\uDEAB-\uDEBB]|\uD869[\uDC00-\uDED6\uDF00-\uDFFF]|\uD86D[\uDC00-\uDF34\uDF40-\uDFFF]|\uD86E[\uDC00-\uDC1D\uDC20-\uDFFF]|\uD873[\uDC00-\uDEA1\uDEB0-\uDFFF]|\uD87A[\uDC00-\uDFE0]|\uD87E[\uDC00-\uDE1D])(?:[\$0-9A-Z_a-z\xAA\xB5\xB7\xBA\xC0-\xD6\xD8-\xF6\xF8-\u02C1\u02C6-\u02D1\u02E0-\u02E4\u02EC\u02EE\u0300-\u0374\u0376\u0377\u037A-\u037D\u037F\u0386-\u038A\u038C\u038E-\u03A1\u03A3-\u03F5\u03F7-\u0481\u0483-\u0487\u048A-\u052F\u0531-\u0556\u0559\u0560-\u0588\u0591-\u05BD\u05BF\u05C1\u05C2\u05C4\u05C5\u05C7\u05D0-\u05EA\u05EF-\u05F2\u0610-\u061A\u0620-\u0669\u066E-\u06D3\u06D5-\u06DC\u06DF-\u06E8\u06EA-\u06FC\u06FF\u0710-\u074A\u074D-\u07B1\u07C0-\u07F5\u07FA\u07FD\u0800-\u082D\u0840-\u085B\u0860-\u086A\u08A0-\u08B4\u08B6-\u08BD\u08D3-\u08E1\u08E3-\u0963\u0966-\u096F\u0971-\u0983\u0985-\u098C\u098F\u0990\u0993-\u09A8\u09AA-\u09B0\u09B2\u09B6-\u09B9\u09BC-\u09C4\u09C7\u09C8\u09CB-\u09CE\u09D7\u09DC\u09DD\u09DF-\u09E3\u09E6-\u09F1\u09FC\u09FE\u0A01-\u0A03\u0A05-\u0A0A\u0A0F\u0A10\u0A13-\u0A28\u0A2A-\u0A30\u0A32\u0A33\u0A35\u0A36\u0A38\u0A39\u0A3C\u0A3E-\u0A42\u0A47\u0A48\u0A4B-\u0A4D\u0A51\u0A59-\u0A5C\u0A5E\u0A66-\u0A75\u0A81-\u0A83\u0A85-\u0A8D\u0A8F-\u0A91\u0A93-\u0AA8\u0AAA-\u0AB0\u0AB2\u0AB3\u0AB5-\u0AB9\u0ABC-\u0AC5\u0AC7-\u0AC9\u0ACB-\u0ACD\u0AD0\u0AE0-\u0AE3\u0AE6-\u0AEF\u0AF9-\u0AFF\u0B01-\u0B03\u0B05-\u0B0C\u0B0F\u0B10\u0B13-\u0B28\u0B2A-\u0B30\u0B32\u0B33\u0B35-\u0B39\u0B3C-\u0B44\u0B47\u0B48\u0B4B-\u0B4D\u0B56\u0B57\u0B5C\u0B5D\u0B5F-\u0B63\u0B66-\u0B6F\u0B71\u0B82\u0B83\u0B85-\u0B8A\u0B8E-\u0B90\u0B92-\u0B95\u0B99\u0B9A\u0B9C\u0B9E\u0B9F\u0BA3\u0BA4\u0BA8-\u0BAA\u0BAE-\u0BB9\u0BBE-\u0BC2\u0BC6-\u0BC8\u0BCA-\u0BCD\u0BD0\u0BD7\u0BE6-\u0BEF\u0C00-\u0C0C\u0C0E-\u0C10\u0C12-\u0C28\u0C2A-\u0C39\u0C3D-\u0C44\u0C46-\u0C48\u0C4A-\u0C4D\u0C55\u0C56\u0C58-\u0C5A\u0C60-\u0C63\u0C66-\u0C6F\u0C80-\u0C83\u0C85-\u0C8C\u0C8E-\u0C90\u0C92-\u0CA8\u0CAA-\u0CB3\u0CB5-\u0CB9\u0CBC-\u0CC4\u0CC6-\u0CC8\u0CCA-\u0CCD\u0CD5\u0CD6\u0CDE\u0CE0-\u0CE3\u0CE6-\u0CEF\u0CF1\u0CF2\u0D00-\u0D03\u0D05-\u0D0C\u0D0E-\u0D10\u0D12-\u0D44\u0D46-\u0D48\u0D4A-\u0D4E\u0D54-\u0D57\u0D5F-\u0D63\u0D66-\u0D6F\u0D7A-\u0D7F\u0D82\u0D83\u0D85-\u0D96\u0D9A-\u0DB1\u0DB3-\u0DBB\u0DBD\u0DC0-\u0DC6\u0DCA\u0DCF-\u0DD4\u0DD6\u0DD8-\u0DDF\u0DE6-\u0DEF\u0DF2\u0DF3\u0E01-\u0E3A\u0E40-\u0E4E\u0E50-\u0E59\u0E81\u0E82\u0E84\u0E87\u0E88\u0E8A\u0E8D\u0E94-\u0E97\u0E99-\u0E9F\u0EA1-\u0EA3\u0EA5\u0EA7\u0EAA\u0EAB\u0EAD-\u0EB9\u0EBB-\u0EBD\u0EC0-\u0EC4\u0EC6\u0EC8-\u0ECD\u0ED0-\u0ED9\u0EDC-\u0EDF\u0F00\u0F18\u0F19\u0F20-\u0F29\u0F35\u0F37\u0F39\u0F3E-\u0F47\u0F49-\u0F6C\u0F71-\u0F84\u0F86-\u0F97\u0F99-\u0FBC\u0FC6\u1000-\u1049\u1050-\u109D\u10A0-\u10C5\u10C7\u10CD\u10D0-\u10FA\u10FC-\u1248\u124A-\u124D\u1250-\u1256\u1258\u125A-\u125D\u1260-\u1288\u128A-\u128D\u1290-\u12B0\u12B2-\u12B5\u12B8-\u12BE\u12C0\u12C2-\u12C5\u12C8-\u12D6\u12D8-\u1310\u1312-\u1315\u1318-\u135A\u135D-\u135F\u1369-\u1371\u1380-\u138F\u13A0-\u13F5\u13F8-\u13FD\u1401-\u166C\u166F-\u167F\u1681-\u169A\u16A0-\u16EA\u16EE-\u16F8\u1700-\u170C\u170E-\u1714\u1720-\u1734\u1740-\u1753\u1760-\u176C\u176E-\u1770\u1772\u1773\u1780-\u17D3\u17D7\u17DC\u17DD\u17E0-\u17E9\u180B-\u180D\u1810-\u1819\u1820-\u1878\u1880-\u18AA\u18B0-\u18F5\u1900-\u191E\u1920-\u192B\u1930-\u193B\u1946-\u196D\u1970-\u1974\u1980-\u19AB\u19B0-\u19C9\u19D0-\u19DA\u1A00-\u1A1B\u1A20-\u1A5E\u1A60-\u1A7C\u1A7F-\u1A89\u1A90-\u1A99\u1AA7\u1AB0-\u1ABD\u1B00-\u1B4B\u1B50-\u1B59\u1B6B-\u1B73\u1B80-\u1BF3\u1C00-\u1C37\u1C40-\u1C49\u1C4D-\u1C7D\u1C80-\u1C88\u1C90-\u1CBA\u1CBD-\u1CBF\u1CD0-\u1CD2\u1CD4-\u1CF9\u1D00-\u1DF9\u1DFB-\u1F15\u1F18-\u1F1D\u1F20-\u1F45\u1F48-\u1F4D\u1F50-\u1F57\u1F59\u1F5B\u1F5D\u1F5F-\u1F7D\u1F80-\u1FB4\u1FB6-\u1FBC\u1FBE\u1FC2-\u1FC4\u1FC6-\u1FCC\u1FD0-\u1FD3\u1FD6-\u1FDB\u1FE0-\u1FEC\u1FF2-\u1FF4\u1FF6-\u1FFC\u200C\u200D\u203F\u2040\u2054\u2071\u207F\u2090-\u209C\u20D0-\u20DC\u20E1\u20E5-\u20F0\u2102\u2107\u210A-\u2113\u2115\u2118-\u211D\u2124\u2126\u2128\u212A-\u2139\u213C-\u213F\u2145-\u2149\u214E\u2160-\u2188\u2C00-\u2C2E\u2C30-\u2C5E\u2C60-\u2CE4\u2CEB-\u2CF3\u2D00-\u2D25\u2D27\u2D2D\u2D30-\u2D67\u2D6F\u2D7F-\u2D96\u2DA0-\u2DA6\u2DA8-\u2DAE\u2DB0-\u2DB6\u2DB8-\u2DBE\u2DC0-\u2DC6\u2DC8-\u2DCE\u2DD0-\u2DD6\u2DD8-\u2DDE\u2DE0-\u2DFF\u3005-\u3007\u3021-\u302F\u3031-\u3035\u3038-\u303C\u3041-\u3096\u3099-\u309F\u30A1-\u30FA\u30FC-\u30FF\u3105-\u312F\u3131-\u318E\u31A0-\u31BA\u31F0-\u31FF\u3400-\u4DB5\u4E00-\u9FEF\uA000-\uA48C\uA4D0-\uA4FD\uA500-\uA60C\uA610-\uA62B\uA640-\uA66F\uA674-\uA67D\uA67F-\uA6F1\uA717-\uA71F\uA722-\uA788\uA78B-\uA7B9\uA7F7-\uA827\uA840-\uA873\uA880-\uA8C5\uA8D0-\uA8D9\uA8E0-\uA8F7\uA8FB\uA8FD-\uA92D\uA930-\uA953\uA960-\uA97C\uA980-\uA9C0\uA9CF-\uA9D9\uA9E0-\uA9FE\uAA00-\uAA36\uAA40-\uAA4D\uAA50-\uAA59\uAA60-\uAA76\uAA7A-\uAAC2\uAADB-\uAADD\uAAE0-\uAAEF\uAAF2-\uAAF6\uAB01-\uAB06\uAB09-\uAB0E\uAB11-\uAB16\uAB20-\uAB26\uAB28-\uAB2E\uAB30-\uAB5A\uAB5C-\uAB65\uAB70-\uABEA\uABEC\uABED\uABF0-\uABF9\uAC00-\uD7A3\uD7B0-\uD7C6\uD7CB-\uD7FB\uF900-\uFA6D\uFA70-\uFAD9\uFB00-\uFB06\uFB13-\uFB17\uFB1D-\uFB28\uFB2A-\uFB36\uFB38-\uFB3C\uFB3E\uFB40\uFB41\uFB43\uFB44\uFB46-\uFBB1\uFBD3-\uFD3D\uFD50-\uFD8F\uFD92-\uFDC7\uFDF0-\uFDFB\uFE00-\uFE0F\uFE20-\uFE2F\uFE33\uFE34\uFE4D-\uFE4F\uFE70-\uFE74\uFE76-\uFEFC\uFF10-\uFF19\uFF21-\uFF3A\uFF3F\uFF41-\uFF5A\uFF66-\uFFBE\uFFC2-\uFFC7\uFFCA-\uFFCF\uFFD2-\uFFD7\uFFDA-\uFFDC]|\uD800[\uDC00-\uDC0B\uDC0D-\uDC26\uDC28-\uDC3A\uDC3C\uDC3D\uDC3F-\uDC4D\uDC50-\uDC5D\uDC80-\uDCFA\uDD40-\uDD74\uDDFD\uDE80-\uDE9C\uDEA0-\uDED0\uDEE0\uDF00-\uDF1F\uDF2D-\uDF4A\uDF50-\uDF7A\uDF80-\uDF9D\uDFA0-\uDFC3\uDFC8-\uDFCF\uDFD1-\uDFD5]|\uD801[\uDC00-\uDC9D\uDCA0-\uDCA9\uDCB0-\uDCD3\uDCD8-\uDCFB\uDD00-\uDD27\uDD30-\uDD63\uDE00-\uDF36\uDF40-\uDF55\uDF60-\uDF67]|\uD802[\uDC00-\uDC05\uDC08\uDC0A-\uDC35\uDC37\uDC38\uDC3C\uDC3F-\uDC55\uDC60-\uDC76\uDC80-\uDC9E\uDCE0-\uDCF2\uDCF4\uDCF5\uDD00-\uDD15\uDD20-\uDD39\uDD80-\uDDB7\uDDBE\uDDBF\uDE00-\uDE03\uDE05\uDE06\uDE0C-\uDE13\uDE15-\uDE17\uDE19-\uDE35\uDE38-\uDE3A\uDE3F\uDE60-\uDE7C\uDE80-\uDE9C\uDEC0-\uDEC7\uDEC9-\uDEE6\uDF00-\uDF35\uDF40-\uDF55\uDF60-\uDF72\uDF80-\uDF91]|\uD803[\uDC00-\uDC48\uDC80-\uDCB2\uDCC0-\uDCF2\uDD00-\uDD27\uDD30-\uDD39\uDF00-\uDF1C\uDF27\uDF30-\uDF50]|\uD804[\uDC00-\uDC46\uDC66-\uDC6F\uDC7F-\uDCBA\uDCD0-\uDCE8\uDCF0-\uDCF9\uDD00-\uDD34\uDD36-\uDD3F\uDD44-\uDD46\uDD50-\uDD73\uDD76\uDD80-\uDDC4\uDDC9-\uDDCC\uDDD0-\uDDDA\uDDDC\uDE00-\uDE11\uDE13-\uDE37\uDE3E\uDE80-\uDE86\uDE88\uDE8A-\uDE8D\uDE8F-\uDE9D\uDE9F-\uDEA8\uDEB0-\uDEEA\uDEF0-\uDEF9\uDF00-\uDF03\uDF05-\uDF0C\uDF0F\uDF10\uDF13-\uDF28\uDF2A-\uDF30\uDF32\uDF33\uDF35-\uDF39\uDF3B-\uDF44\uDF47\uDF48\uDF4B-\uDF4D\uDF50\uDF57\uDF5D-\uDF63\uDF66-\uDF6C\uDF70-\uDF74]|\uD805[\uDC00-\uDC4A\uDC50-\uDC59\uDC5E\uDC80-\uDCC5\uDCC7\uDCD0-\uDCD9\uDD80-\uDDB5\uDDB8-\uDDC0\uDDD8-\uDDDD\uDE00-\uDE40\uDE44\uDE50-\uDE59\uDE80-\uDEB7\uDEC0-\uDEC9\uDF00-\uDF1A\uDF1D-\uDF2B\uDF30-\uDF39]|\uD806[\uDC00-\uDC3A\uDCA0-\uDCE9\uDCFF\uDE00-\uDE3E\uDE47\uDE50-\uDE83\uDE86-\uDE99\uDE9D\uDEC0-\uDEF8]|\uD807[\uDC00-\uDC08\uDC0A-\uDC36\uDC38-\uDC40\uDC50-\uDC59\uDC72-\uDC8F\uDC92-\uDCA7\uDCA9-\uDCB6\uDD00-\uDD06\uDD08\uDD09\uDD0B-\uDD36\uDD3A\uDD3C\uDD3D\uDD3F-\uDD47\uDD50-\uDD59\uDD60-\uDD65\uDD67\uDD68\uDD6A-\uDD8E\uDD90\uDD91\uDD93-\uDD98\uDDA0-\uDDA9\uDEE0-\uDEF6]|\uD808[\uDC00-\uDF99]|\uD809[\uDC00-\uDC6E\uDC80-\uDD43]|[\uD80C\uD81C-\uD820\uD840-\uD868\uD86A-\uD86C\uD86F-\uD872\uD874-\uD879][\uDC00-\uDFFF]|\uD80D[\uDC00-\uDC2E]|\uD811[\uDC00-\uDE46]|\uD81A[\uDC00-\uDE38\uDE40-\uDE5E\uDE60-\uDE69\uDED0-\uDEED\uDEF0-\uDEF4\uDF00-\uDF36\uDF40-\uDF43\uDF50-\uDF59\uDF63-\uDF77\uDF7D-\uDF8F]|\uD81B[\uDE40-\uDE7F\uDF00-\uDF44\uDF50-\uDF7E\uDF8F-\uDF9F\uDFE0\uDFE1]|\uD821[\uDC00-\uDFF1]|\uD822[\uDC00-\uDEF2]|\uD82C[\uDC00-\uDD1E\uDD70-\uDEFB]|\uD82F[\uDC00-\uDC6A\uDC70-\uDC7C\uDC80-\uDC88\uDC90-\uDC99\uDC9D\uDC9E]|\uD834[\uDD65-\uDD69\uDD6D-\uDD72\uDD7B-\uDD82\uDD85-\uDD8B\uDDAA-\uDDAD\uDE42-\uDE44]|\uD835[\uDC00-\uDC54\uDC56-\uDC9C\uDC9E\uDC9F\uDCA2\uDCA5\uDCA6\uDCA9-\uDCAC\uDCAE-\uDCB9\uDCBB\uDCBD-\uDCC3\uDCC5-\uDD05\uDD07-\uDD0A\uDD0D-\uDD14\uDD16-\uDD1C\uDD1E-\uDD39\uDD3B-\uDD3E\uDD40-\uDD44\uDD46\uDD4A-\uDD50\uDD52-\uDEA5\uDEA8-\uDEC0\uDEC2-\uDEDA\uDEDC-\uDEFA\uDEFC-\uDF14\uDF16-\uDF34\uDF36-\uDF4E\uDF50-\uDF6E\uDF70-\uDF88\uDF8A-\uDFA8\uDFAA-\uDFC2\uDFC4-\uDFCB\uDFCE-\uDFFF]|\uD836[\uDE00-\uDE36\uDE3B-\uDE6C\uDE75\uDE84\uDE9B-\uDE9F\uDEA1-\uDEAF]|\uD838[\uDC00-\uDC06\uDC08-\uDC18\uDC1B-\uDC21\uDC23\uDC24\uDC26-\uDC2A]|\uD83A[\uDC00-\uDCC4\uDCD0-\uDCD6\uDD00-\uDD4A\uDD50-\uDD59]|\uD83B[\uDE00-\uDE03\uDE05-\uDE1F\uDE21\uDE22\uDE24\uDE27\uDE29-\uDE32\uDE34-\uDE37\uDE39\uDE3B\uDE42\uDE47\uDE49\uDE4B\uDE4D-\uDE4F\uDE51\uDE52\uDE54\uDE57\uDE59\uDE5B\uDE5D\uDE5F\uDE61\uDE62\uDE64\uDE67-\uDE6A\uDE6C-\uDE72\uDE74-\uDE77\uDE79-\uDE7C\uDE7E\uDE80-\uDE89\uDE8B-\uDE9B\uDEA1-\uDEA3\uDEA5-\uDEA9\uDEAB-\uDEBB]|\uD869[\uDC00-\uDED6\uDF00-\uDFFF]|\uD86D[\uDC00-\uDF34\uDF40-\uDFFF]|\uD86E[\uDC00-\uDC1D\uDC20-\uDFFF]|\uD873[\uDC00-\uDEA1\uDEB0-\uDFFF]|\uD87A[\uDC00-\uDFE0]|\uD87E[\uDC00-\uDE1D]|\uDB40[\uDD00-\uDDEF])*$/;
+	return regex.test(str);
+}
diff --git a/packages/kit/src/core/sync/write_env.js b/packages/kit/src/core/sync/write_env.js
index 11f0bca86c54..3e0c6cb3f2a5 100644
--- a/packages/kit/src/core/sync/write_env.js
+++ b/packages/kit/src/core/sync/write_env.js
@@ -1,6 +1,6 @@
 import path from 'path';
 import { loadEnv } from 'vite';
-import { write_if_changed } from './utils.js';
+import { write_if_changed, is_valid_js_identifier } from './utils.js';
 
 const autogen_comment = '// this file is generated — do not edit it\n';
 
@@ -44,6 +44,7 @@ export function write_env(config, mode) {
  */
 function create_module(id, env) {
 	const declarations = Object.entries(env)
+		.filter(([k]) => is_valid_js_identifier(k))
 		.map(
 			([k, v]) => `/** @type {import('${id}'}').${k}} */\nexport const ${k} = ${JSON.stringify(v)};`
 		)
@@ -59,6 +60,7 @@ function create_module(id, env) {
  */
 function create_types(id, env) {
 	const declarations = Object.keys(env)
+		.filter((k) => is_valid_js_identifier(k))
 		.map((k) => `\texport const ${k}: string;`)
 		.join('\n');
 

From 23676f28767056d91046030868b517ae614c6f32 Mon Sep 17 00:00:00 2001
From: Rich Harris <hello@rich-harris.dev>
Date: Mon, 25 Jul 2022 13:37:07 -0400
Subject: [PATCH 53/95] rename modules

---
 .changeset/beige-gorillas-tell.md                  |  2 +-
 .changeset/pretty-kings-care.md                    |  2 +-
 documentation/docs/15-configuration.md             |  2 +-
 documentation/faq/60-env-vars.md                   |  4 ++--
 packages/kit/scripts/extract-types.js              |  5 +++--
 .../kit/scripts/special-types/$app+env+private.md  |  7 -------
 .../kit/scripts/special-types/$app+env+public.md   |  7 -------
 .../scripts/special-types/$env+static+private.md   |  7 +++++++
 .../scripts/special-types/$env+static+public.md    |  7 +++++++
 packages/kit/src/core/sync/write_env.js            | 14 +++++++-------
 packages/kit/src/vite/utils.js                     |  9 ++++-----
 .../kit/test/apps/basics/src/routes/env/index.js   |  2 +-
 .../test/apps/basics/src/routes/env/index.svelte   |  2 +-
 packages/kit/types/ambient.d.ts                    |  7 ++++---
 .../kit.svelte.dev/src/lib/docs/server/modules.js  |  6 ++----
 15 files changed, 41 insertions(+), 42 deletions(-)
 delete mode 100644 packages/kit/scripts/special-types/$app+env+private.md
 delete mode 100644 packages/kit/scripts/special-types/$app+env+public.md
 create mode 100644 packages/kit/scripts/special-types/$env+static+private.md
 create mode 100644 packages/kit/scripts/special-types/$env+static+public.md

diff --git a/.changeset/beige-gorillas-tell.md b/.changeset/beige-gorillas-tell.md
index baa05742d6eb..a82d844b974c 100644
--- a/.changeset/beige-gorillas-tell.md
+++ b/.changeset/beige-gorillas-tell.md
@@ -6,4 +6,4 @@
 '@sveltejs/adapter-vercel': patch
 ---
 
-Initialise `$app/env/platform`
+Initialise `$env/dynamic/private`
diff --git a/.changeset/pretty-kings-care.md b/.changeset/pretty-kings-care.md
index af0c4bdbb6a0..fc1fd37e5ce7 100644
--- a/.changeset/pretty-kings-care.md
+++ b/.changeset/pretty-kings-care.md
@@ -2,4 +2,4 @@
 '@sveltejs/kit': patch
 ---
 
-Add `$app/env/public`, `$app/env/private` and `$app/env/platform` modules
+Add `$env/static/private`, `$env/static/public`, `$env/dynamic/private` and `$env/dynamic/public` modules
diff --git a/documentation/docs/15-configuration.md b/documentation/docs/15-configuration.md
index d48e3a3d2255..af141405b4a6 100644
--- a/documentation/docs/15-configuration.md
+++ b/documentation/docs/15-configuration.md
@@ -164,7 +164,7 @@ When pages are prerendered, the CSP header is added via a `<meta http-equiv>` ta
 
 Environment variable configuration:
 
-- `publicPrefix` — a prefix that signals that an environment variable is safe to expose to client-side code. See [`$app/env/public`](/docs/modules#$app-env-public)
+- `publicPrefix` — a prefix that signals that an environment variable is safe to expose to client-side code. See [`$env/static/public`](/docs/modules#$env-static-public) and [`$env/dynamic/public`](/docs/modules#$env-dynamic-public)
 
 ### files
 
diff --git a/documentation/faq/60-env-vars.md b/documentation/faq/60-env-vars.md
index 6acf24e4bb2f..03c0701b60d0 100644
--- a/documentation/faq/60-env-vars.md
+++ b/documentation/faq/60-env-vars.md
@@ -2,6 +2,6 @@
 title: How do I use environment variables?
 ---
 
-Environment variables are [loaded by Vite](https://vitejs.dev/guide/env-and-mode.html#env-files) from `.env` files and `process.env` during dev and build. These are available to your app via the [`$app/env/private`](/docs/modules#$app-env-private) and [`$app/env/public`](/docs/modules#$app-env-public) modules. Public variables — i.e. those that are safe to expose to users — must use a [prefix](/docs/configuration#kit-env-publicprefix) that defaults to `PUBLIC_`. Private variables cannot be imported into client-side code.
+Environment variables are [loaded by Vite](https://vitejs.dev/guide/env-and-mode.html#env-files) from `.env` files and `process.env` during dev and build. These are available to your app via the [`$env/static/private`](/docs/modules#$env-static-private) and [`$env/static/public`](/docs/modules#$env-static-public) modules. Public variables — i.e. those that are safe to expose to users — must use a [prefix](/docs/configuration#kit-env-publicprefix) that defaults to `PUBLIC_`. Private variables cannot be imported into client-side code.
 
-For environment variables that are not known at build time, you can use [`$app/env/platform`](/docs/modules#$app-env-platform).
+For environment variables that are not known at build time, you can use [`$env/dynamic/private`](/docs/modules#$env-dynamic-private) and [`$env/dynamic/public`](/docs/modules#$env-dynamic-public).
diff --git a/packages/kit/scripts/extract-types.js b/packages/kit/scripts/extract-types.js
index 045a1608eef6..4dcd943425c4 100644
--- a/packages/kit/scripts/extract-types.js
+++ b/packages/kit/scripts/extract-types.js
@@ -6,7 +6,7 @@ import { fileURLToPath } from 'url';
 
 /** @typedef {{ name: string, comment: string, snippet: string }} Extracted */
 
-/** @type {Array<{ name: string, comment: string, exports: Extracted[], types: Extracted[] }>} */
+/** @type {Array<{ name: string, comment: string, exports: Extracted[], types: Extracted[], exempt?: boolean }>} */
 const modules = [];
 
 /**
@@ -112,7 +112,8 @@ for (const file of fs.readdirSync(dir)) {
 		name: file.replace(/\+/g, '/').slice(0, -3),
 		comment,
 		exports: [],
-		types: []
+		types: [],
+		exempt: true
 	});
 }
 
diff --git a/packages/kit/scripts/special-types/$app+env+private.md b/packages/kit/scripts/special-types/$app+env+private.md
deleted file mode 100644
index 6a81b5d54be4..000000000000
--- a/packages/kit/scripts/special-types/$app+env+private.md
+++ /dev/null
@@ -1,7 +0,0 @@
-Environment variables [loaded by Vite](https://vitejs.dev/guide/env-and-mode.html#env-files) from `.env` files and `process.env`. Like [`$app/env/platform`](https://kit.svelte.dev/docs/modules#$app-env-platform), this module cannot be imported into client-side code.
-
-_Unlike_ [`$app/env/platform`](https://kit.svelte.dev/docs/modules#$app-env-platform), the values exported from this module are statically injected into your bundle at build time, enabling optimisations like dead code elimination.
-
-```ts
-import { API_KEY } from '$app/env/private';
-```
diff --git a/packages/kit/scripts/special-types/$app+env+public.md b/packages/kit/scripts/special-types/$app+env+public.md
deleted file mode 100644
index 39b46f204583..000000000000
--- a/packages/kit/scripts/special-types/$app+env+public.md
+++ /dev/null
@@ -1,7 +0,0 @@
-Similar to [`$app/env/private`](https://kit.svelte.dev/docs/modules#$app-env-private), except that it only includes environment variables that begin with [`config.kit.env.publicPrefix`](https://kit.svelte.dev/docs/configuration#kit-env-publicprefix) (which defaults to `PUBLIC_`), and can therefore safely be exposed to client-side code.
-
-Values are replaced statically at build time.
-
-```ts
-import { PUBLIC_BASE_URL } from '$app/env/public';
-```
diff --git a/packages/kit/scripts/special-types/$env+static+private.md b/packages/kit/scripts/special-types/$env+static+private.md
new file mode 100644
index 000000000000..d0f160b90cef
--- /dev/null
+++ b/packages/kit/scripts/special-types/$env+static+private.md
@@ -0,0 +1,7 @@
+Environment variables [loaded by Vite](https://vitejs.dev/guide/env-and-mode.html#env-files) from `.env` files and `process.env`. Like [`$env/dynamic/private`](https://kit.svelte.dev/docs/modules#$env-dynamic-platform), this module cannot be imported into client-side code.
+
+_Unlike_ [`$env/dynamic/platform`](https://kit.svelte.dev/docs/modules#$env-dynamic-platform), the values exported from this module are statically injected into your bundle at build time, enabling optimisations like dead code elimination.
+
+```ts
+import { API_KEY } from '$env/static/private';
+```
diff --git a/packages/kit/scripts/special-types/$env+static+public.md b/packages/kit/scripts/special-types/$env+static+public.md
new file mode 100644
index 000000000000..60fc224fa6d4
--- /dev/null
+++ b/packages/kit/scripts/special-types/$env+static+public.md
@@ -0,0 +1,7 @@
+Similar to [`$env/static/private`](https://kit.svelte.dev/docs/modules#$env-static-private), except that it only includes environment variables that begin with [`config.kit.env.publicPrefix`](https://kit.svelte.dev/docs/configuration#kit-env-publicprefix) (which defaults to `PUBLIC_`), and can therefore safely be exposed to client-side code.
+
+Values are replaced statically at build time.
+
+```ts
+import { PUBLIC_BASE_URL } from '$env/static/public';
+```
diff --git a/packages/kit/src/core/sync/write_env.js b/packages/kit/src/core/sync/write_env.js
index 3e0c6cb3f2a5..6986b87a499d 100644
--- a/packages/kit/src/core/sync/write_env.js
+++ b/packages/kit/src/core/sync/write_env.js
@@ -6,7 +6,7 @@ const autogen_comment = '// this file is generated — do not edit it\n';
 
 /**
  * Writes the existing environment variables in process.env to
- * $app/env and $app/env/private
+ * $env/static/private and $env/static/public
  * @param {import('types').ValidatedKitConfig} config
  * @param {string} mode
  * The Vite mode.
@@ -19,21 +19,21 @@ export function write_env(config, mode) {
 	// TODO when testing src, `$app` points at `src/runtime/app`... will
 	// probably need to fiddle with aliases
 	write_if_changed(
-		path.join(config.outDir, 'runtime/app/env/public.js'),
-		create_module('$app/env/public', pub)
+		path.join(config.outDir, 'runtime/env/static/public.js'),
+		create_module('$env/static/public', pub)
 	);
 
 	write_if_changed(
-		path.join(config.outDir, 'runtime/app/env/private.js'),
-		create_module('$app/env/private', prv)
+		path.join(config.outDir, 'runtime/env/static/private.js'),
+		create_module('$env/static/private', prv)
 	);
 
 	write_if_changed(
 		path.join(config.outDir, 'types/ambient.d.ts'),
 		autogen_comment +
-			create_types('$app/env/public', pub) +
+			create_types('$env/static/public', pub) +
 			'\n\n' +
-			create_types('$app/env/private', prv)
+			create_types('$env/static/private', prv)
 	);
 }
 
diff --git a/packages/kit/src/vite/utils.js b/packages/kit/src/vite/utils.js
index 4f9aeefbd7c1..ea3fd0b4ec1b 100644
--- a/packages/kit/src/vite/utils.js
+++ b/packages/kit/src/vite/utils.js
@@ -93,19 +93,18 @@ export function get_aliases(config) {
 	const alias = {
 		__GENERATED__: path.posix.join(config.outDir, 'generated'),
 
+		$app: `${get_runtime_directory(config)}/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.
 		$lib: config.files.lib
 	};
 
 	if (!process.env.BUNDLED) {
-		alias['$app/env/public'] = path.posix.join(config.outDir, 'runtime/app/env/public.js');
-		alias['$app/env/private'] = path.posix.join(config.outDir, 'runtime/app/env/private.js');
+		alias['$env/static/public'] = path.posix.join(config.outDir, 'runtime/env/static/public.js');
+		alias['$env/static/private'] = path.posix.join(config.outDir, 'runtime/env/static/private.js');
 	}
 
-	// we set $app after $app/env/* so that the more specific aliases resolve first
-	alias['$app'] = `${get_runtime_directory(config)}/app`;
-
 	for (const [key, value] of Object.entries(config.alias)) {
 		alias[key] = path.resolve(value);
 	}
diff --git a/packages/kit/test/apps/basics/src/routes/env/index.js b/packages/kit/test/apps/basics/src/routes/env/index.js
index 593cb126de15..781261a32168 100644
--- a/packages/kit/test/apps/basics/src/routes/env/index.js
+++ b/packages/kit/test/apps/basics/src/routes/env/index.js
@@ -1,4 +1,4 @@
-import { SECRET } from '$app/env/private';
+import { SECRET } from '$env/static/private';
 
 export function GET() {
 	return {
diff --git a/packages/kit/test/apps/basics/src/routes/env/index.svelte b/packages/kit/test/apps/basics/src/routes/env/index.svelte
index 49bf4ad2823c..c84d1bc14049 100644
--- a/packages/kit/test/apps/basics/src/routes/env/index.svelte
+++ b/packages/kit/test/apps/basics/src/routes/env/index.svelte
@@ -1,5 +1,5 @@
 <script>
-	import { PUBLIC_VAR } from '$app/env/public';
+	import { PUBLIC_VAR } from '$env/static/public';
 
 	/** @type {string} */
 	export let SECRET;
diff --git a/packages/kit/types/ambient.d.ts b/packages/kit/types/ambient.d.ts
index d0bc39e30148..6a47b89c9510 100644
--- a/packages/kit/types/ambient.d.ts
+++ b/packages/kit/types/ambient.d.ts
@@ -45,7 +45,8 @@
  */
 declare namespace App {
 	/**
-	 * The interface that defines the dynamic environment variables exported from '$app/env/platform'.
+	 * TODO need separate PrivateEnv and PublicEnv?
+	 * The interface that defines the dynamic environment variables exported from '$env/dynamic/private'.
 	 */
 	export interface Env extends Record<string, string> {}
 
@@ -100,11 +101,11 @@ declare module '$app/env' {
  * This module cannot be imported into client-side code.
  *
  * ```ts
- * import { env } from '$app/env/platform';
+ * import { env } from '$env/dynamic/private';
  * console.log(env.MY_DEPLOYMENT_SPECIFIC_VARIABLE);
  * ```
  */
-declare module '$app/env/platform' {
+declare module '$env/dynamic/platform' {
 	export let env: App.Env;
 }
 
diff --git a/sites/kit.svelte.dev/src/lib/docs/server/modules.js b/sites/kit.svelte.dev/src/lib/docs/server/modules.js
index aa1667c7fdfe..97b8576db5a8 100644
--- a/sites/kit.svelte.dev/src/lib/docs/server/modules.js
+++ b/sites/kit.svelte.dev/src/lib/docs/server/modules.js
@@ -1,14 +1,12 @@
 import { modules } from '../../../../../../packages/kit/docs/types.js';
 
-const exempt = new Set(['$lib', '$app/env/public', '$app/env/private']);
-
 /** @param {'types' | 'exports'} kind */
 export function render_modules(kind) {
 	return modules
 		.map((module) => {
 			// special case — we want to include $lib etc in the modules page
-			const is_lib_exports = kind === 'exports' && exempt.has(module.name);
-			const skip = module[kind].length === 0 && !is_lib_exports;
+			const is_exempt = kind === 'exports' && module.exempt;
+			const skip = module[kind].length === 0 && !is_exempt;
 
 			if (skip) return '';
 

From 5a436486c448770d823c325e45598f2c6ff92896 Mon Sep 17 00:00:00 2001
From: Rich Harris <hello@rich-harris.dev>
Date: Mon, 25 Jul 2022 15:32:18 -0400
Subject: [PATCH 54/95] fix some stuff, break some stuff

---
 packages/kit/rollup.config.js                  |  3 ++-
 .../special-types/$env+static+private.md       |  2 +-
 .../env/platform.js => env/dynamic/private.js} |  2 ++
 packages/kit/src/runtime/env/dynamic/public.js |  9 +++++++++
 packages/kit/src/vite/build/build_server.js    |  2 +-
 packages/kit/src/vite/dev/index.js             |  4 ++--
 packages/kit/src/vite/index.js                 |  4 ++--
 packages/kit/src/vite/utils.js                 |  2 ++
 packages/kit/test/apps/basics/.env             |  7 +++++--
 .../test/apps/basics/src/routes/env/index.js   |  6 ++++--
 .../apps/basics/src/routes/env/index.svelte    | 15 +++++++++++----
 packages/kit/test/apps/basics/test/test.js     | 18 +++++++++++++-----
 packages/kit/types/ambient.d.ts                |  2 +-
 13 files changed, 55 insertions(+), 21 deletions(-)
 rename packages/kit/src/runtime/{app/env/platform.js => env/dynamic/private.js} (60%)
 create mode 100644 packages/kit/src/runtime/env/dynamic/public.js

diff --git a/packages/kit/rollup.config.js b/packages/kit/rollup.config.js
index 7bc1d56bed9e..72bad7c65c96 100644
--- a/packages/kit/rollup.config.js
+++ b/packages/kit/rollup.config.js
@@ -23,7 +23,8 @@ export default [
 			'app/stores': 'src/runtime/app/stores.js',
 			'app/paths': 'src/runtime/app/paths.js',
 			'app/env': 'src/runtime/app/env.js',
-			'app/env/platform': 'src/runtime/app/env/platform.js',
+			'env/dynamic/private': 'src/runtime/env/dynamic/private.js',
+			'env/dynamic/public': 'src/runtime/env/dynamic/public.js',
 			paths: 'src/runtime/paths.js',
 			env: 'src/runtime/env.js'
 		},
diff --git a/packages/kit/scripts/special-types/$env+static+private.md b/packages/kit/scripts/special-types/$env+static+private.md
index d0f160b90cef..79fdc20b808a 100644
--- a/packages/kit/scripts/special-types/$env+static+private.md
+++ b/packages/kit/scripts/special-types/$env+static+private.md
@@ -1,6 +1,6 @@
 Environment variables [loaded by Vite](https://vitejs.dev/guide/env-and-mode.html#env-files) from `.env` files and `process.env`. Like [`$env/dynamic/private`](https://kit.svelte.dev/docs/modules#$env-dynamic-platform), this module cannot be imported into client-side code.
 
-_Unlike_ [`$env/dynamic/platform`](https://kit.svelte.dev/docs/modules#$env-dynamic-platform), the values exported from this module are statically injected into your bundle at build time, enabling optimisations like dead code elimination.
+_Unlike_ [`$env/dynamic/private`](https://kit.svelte.dev/docs/modules#$env-dynamic-platform), the values exported from this module are statically injected into your bundle at build time, enabling optimisations like dead code elimination.
 
 ```ts
 import { API_KEY } from '$env/static/private';
diff --git a/packages/kit/src/runtime/app/env/platform.js b/packages/kit/src/runtime/env/dynamic/private.js
similarity index 60%
rename from packages/kit/src/runtime/app/env/platform.js
rename to packages/kit/src/runtime/env/dynamic/private.js
index 14b4c2554f6a..efd2411364b8 100644
--- a/packages/kit/src/runtime/app/env/platform.js
+++ b/packages/kit/src/runtime/env/dynamic/private.js
@@ -1,6 +1,8 @@
+// TODO need separate public/private types
 /** @type {App.Env} */
 export let env = {};
 
+// TODO put this in a separate module, so it's not user-accessible
 /** @type {(environment: Record<string, string>) => void} */
 export function set_env(environment) {
 	env = environment;
diff --git a/packages/kit/src/runtime/env/dynamic/public.js b/packages/kit/src/runtime/env/dynamic/public.js
new file mode 100644
index 000000000000..efd2411364b8
--- /dev/null
+++ b/packages/kit/src/runtime/env/dynamic/public.js
@@ -0,0 +1,9 @@
+// TODO need separate public/private types
+/** @type {App.Env} */
+export let env = {};
+
+// TODO put this in a separate module, so it's not user-accessible
+/** @type {(environment: Record<string, string>) => void} */
+export function set_env(environment) {
+	env = environment;
+}
diff --git a/packages/kit/src/vite/build/build_server.js b/packages/kit/src/vite/build/build_server.js
index f68fb0ccf049..c7520ce11595 100644
--- a/packages/kit/src/vite/build/build_server.js
+++ b/packages/kit/src/vite/build/build_server.js
@@ -27,7 +27,7 @@ import root from '__GENERATED__/root.svelte';
 import { respond } from '${runtime}/server/index.js';
 import { set_paths, assets, base } from '${runtime}/paths.js';
 import { set_prerendering } from '${runtime}/env.js';
-import { set_env } from '${runtime}/app/env/platform.js';
+import { set_env } from '${runtime}/env/dynamic/private.js';
 
 const template = ({ head, body, assets, nonce }) => ${s(template)
 	.replace('%sveltekit.head%', '" + head + "')
diff --git a/packages/kit/src/vite/dev/index.js b/packages/kit/src/vite/dev/index.js
index d8e03ad6b7e1..64e099b931ee 100644
--- a/packages/kit/src/vite/dev/index.js
+++ b/packages/kit/src/vite/dev/index.js
@@ -240,9 +240,9 @@ export async function dev(vite, vite_config, svelte_config, illegal_imports) {
 				const { set_env } = await vite.ssrLoadModule(
 					process.env.BUNDLED
 						? `/${posixify(
-								path.relative(cwd, `${svelte_config.kit.outDir}/runtime/app/env/platform.js`)
+								path.relative(cwd, `${svelte_config.kit.outDir}/runtime/env/dynamic/private.js`)
 						  )}`
-						: `/@fs${runtime}/app/env/platform.js`
+						: `/@fs${runtime}/env/dynamic/private.js`
 				);
 
 				set_env(process.env);
diff --git a/packages/kit/src/vite/index.js b/packages/kit/src/vite/index.js
index 81437a57c3b6..5982fea7a11f 100644
--- a/packages/kit/src/vite/index.js
+++ b/packages/kit/src/vite/index.js
@@ -190,8 +190,8 @@ function kit() {
 			};
 
 			illegal_imports = new Set([
-				`${svelte_config.kit.outDir}/runtime/app/env/platform.js`,
-				`${svelte_config.kit.outDir}/runtime/app/env/private.js`
+				`${svelte_config.kit.outDir}/runtime/env/dynamic/private.js`,
+				`${svelte_config.kit.outDir}/runtime/env/static/private.js`
 			]);
 
 			if (is_build) {
diff --git a/packages/kit/src/vite/utils.js b/packages/kit/src/vite/utils.js
index ea3fd0b4ec1b..5a37d65a42b3 100644
--- a/packages/kit/src/vite/utils.js
+++ b/packages/kit/src/vite/utils.js
@@ -105,6 +105,8 @@ export function get_aliases(config) {
 		alias['$env/static/private'] = path.posix.join(config.outDir, 'runtime/env/static/private.js');
 	}
 
+	alias['$env'] = `${get_runtime_directory(config)}/env`;
+
 	for (const [key, value] of Object.entries(config.alias)) {
 		alias[key] = path.resolve(value);
 	}
diff --git a/packages/kit/test/apps/basics/.env b/packages/kit/test/apps/basics/.env
index 15b23d354902..7f2de5e30f7d 100644
--- a/packages/kit/test/apps/basics/.env
+++ b/packages/kit/test/apps/basics/.env
@@ -1,2 +1,5 @@
-SECRET="this is directly accessible to server-side code"
-PUBLIC_VAR="this is directly accessible anywhere"
\ No newline at end of file
+PRIVATE_STATIC="accessible to server-side code/replaced at build-time"
+PRIVATE_DYNAMIC="accessible to server-side code/evaluated at run-time"
+
+PUBLIC_STATIC="accessible anywhere/replaced at build-time"
+PUBLIC_DYNAMIC="accessible anywhere/evaluated at run-time"
\ No newline at end of file
diff --git a/packages/kit/test/apps/basics/src/routes/env/index.js b/packages/kit/test/apps/basics/src/routes/env/index.js
index 781261a32168..968b678a922d 100644
--- a/packages/kit/test/apps/basics/src/routes/env/index.js
+++ b/packages/kit/test/apps/basics/src/routes/env/index.js
@@ -1,9 +1,11 @@
-import { SECRET } from '$env/static/private';
+import { PRIVATE_STATIC } from '$env/static/private';
+import { env } from '$env/dynamic/private';
 
 export function GET() {
 	return {
 		body: {
-			SECRET
+			PRIVATE_STATIC,
+			PRIVATE_DYNAMIC: env.PRIVATE_DYNAMIC
 		}
 	};
 }
diff --git a/packages/kit/test/apps/basics/src/routes/env/index.svelte b/packages/kit/test/apps/basics/src/routes/env/index.svelte
index c84d1bc14049..4788b13e363f 100644
--- a/packages/kit/test/apps/basics/src/routes/env/index.svelte
+++ b/packages/kit/test/apps/basics/src/routes/env/index.svelte
@@ -1,9 +1,16 @@
 <script>
-	import { PUBLIC_VAR } from '$env/static/public';
+	import { PUBLIC_STATIC } from '$env/static/public';
+	import { env } from '$env/dynamic/public';
 
 	/** @type {string} */
-	export let SECRET;
+	export let PRIVATE_STATIC;
+
+	/** @type {string} */
+	export let PRIVATE_DYNAMIC;
 </script>
 
-<p id="private">SECRET: {SECRET}</p>
-<p id="public">PUBLIC_VAR: {PUBLIC_VAR}</p>
+<p id="static-private">PRIVATE_STATIC: {PRIVATE_STATIC}</p>
+<p id="dynamic-private">PRIVATE_DYNAMIC: {PRIVATE_DYNAMIC}</p>
+
+<p id="static-public">PUBLIC_STATIC: {PUBLIC_STATIC}</p>
+<p id="dynamic-public">PUBLIC_DYNAMIC: {env.PUBLIC_DYNAMIC}</p>
diff --git a/packages/kit/test/apps/basics/test/test.js b/packages/kit/test/apps/basics/test/test.js
index bdb7f098937c..7a066c1c1c30 100644
--- a/packages/kit/test/apps/basics/test/test.js
+++ b/packages/kit/test/apps/basics/test/test.js
@@ -339,13 +339,21 @@ test.describe('Encoded paths', () => {
 });
 
 test.describe('Env', () => {
-	test('includes environment variables', async ({ page }) => {
+	test.only('includes environment variables', async ({ page }) => {
 		await page.goto('/env');
-		expect(await page.textContent('#private')).toBe(
-			'SECRET: this is directly accessible to server-side code'
+
+		expect(await page.textContent('#static-private')).toBe(
+			'PRIVATE_STATIC: accessible to server-side code/replaced at build-time'
+		);
+		expect(await page.textContent('#dynamic-private')).toBe(
+			'PRIVATE_DYNAMIC: accessible to server-side code/evaluated at run-time'
+		);
+
+		expect(await page.textContent('#static-public')).toBe(
+			'PUBLIC_STATIC: accessible anywhere/replaced at build-time'
 		);
-		expect(await page.textContent('#public')).toBe(
-			'PUBLIC_VAR: this is directly accessible anywhere'
+		expect(await page.textContent('#static-public')).toBe(
+			'PUBLIC_DYNAMIC: accessible anywhere/evaluated at run-time'
 		);
 	});
 });
diff --git a/packages/kit/types/ambient.d.ts b/packages/kit/types/ambient.d.ts
index 6a47b89c9510..cf37f3efd1a4 100644
--- a/packages/kit/types/ambient.d.ts
+++ b/packages/kit/types/ambient.d.ts
@@ -105,7 +105,7 @@ declare module '$app/env' {
  * console.log(env.MY_DEPLOYMENT_SPECIFIC_VARIABLE);
  * ```
  */
-declare module '$env/dynamic/platform' {
+declare module '$env/dynamic/private' {
 	export let env: App.Env;
 }
 

From 03b27b1beac993d880321dfc6e019642177aa22c Mon Sep 17 00:00:00 2001
From: Rich Harris <hello@rich-harris.dev>
Date: Mon, 25 Jul 2022 15:42:27 -0400
Subject: [PATCH 55/95] update tests

---
 packages/kit/test/apps/basics/.env         | 4 ++--
 packages/kit/test/apps/basics/package.json | 4 ++--
 packages/kit/test/apps/basics/test/test.js | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/kit/test/apps/basics/.env b/packages/kit/test/apps/basics/.env
index 7f2de5e30f7d..2f5102d02b9c 100644
--- a/packages/kit/test/apps/basics/.env
+++ b/packages/kit/test/apps/basics/.env
@@ -1,5 +1,5 @@
 PRIVATE_STATIC="accessible to server-side code/replaced at build-time"
-PRIVATE_DYNAMIC="accessible to server-side code/evaluated at run-time"
+PRIVATE_DYNAMIC="should not see me"
 
 PUBLIC_STATIC="accessible anywhere/replaced at build-time"
-PUBLIC_DYNAMIC="accessible anywhere/evaluated at run-time"
\ No newline at end of file
+PUBLIC_DYNAMIC="should not see me"
\ No newline at end of file
diff --git a/packages/kit/test/apps/basics/package.json b/packages/kit/test/apps/basics/package.json
index eee4f24d884a..77e9a02c9533 100644
--- a/packages/kit/test/apps/basics/package.json
+++ b/packages/kit/test/apps/basics/package.json
@@ -3,8 +3,8 @@
 	"private": true,
 	"version": "0.0.2-next.0",
 	"scripts": {
-		"dev": "vite dev",
-		"build": "vite build",
+		"dev": "PRIVATE_DYNAMIC=\"private var set in npm run dev\" PUBLIC_DYNAMIC=\"public var set in npm run dev\" vite dev",
+		"build": "PRIVATE_DYNAMIC=\"private var set in npm run build\" PUBLIC_DYNAMIC=\"public var set in npm run build\" vite build",
 		"preview": "vite preview",
 		"prepare": "node ../../cli.js sync",
 		"check": "tsc && svelte-check",
diff --git a/packages/kit/test/apps/basics/test/test.js b/packages/kit/test/apps/basics/test/test.js
index 7a066c1c1c30..30a5c2a15639 100644
--- a/packages/kit/test/apps/basics/test/test.js
+++ b/packages/kit/test/apps/basics/test/test.js
@@ -346,13 +346,13 @@ test.describe('Env', () => {
 			'PRIVATE_STATIC: accessible to server-side code/replaced at build-time'
 		);
 		expect(await page.textContent('#dynamic-private')).toBe(
-			'PRIVATE_DYNAMIC: accessible to server-side code/evaluated at run-time'
+			'PRIVATE_DYNAMIC: private var set in npm run dev'
 		);
 
 		expect(await page.textContent('#static-public')).toBe(
 			'PUBLIC_STATIC: accessible anywhere/replaced at build-time'
 		);
-		expect(await page.textContent('#static-public')).toBe(
+		expect(await page.textContent('#dynamic-public')).toBe(
 			'PUBLIC_DYNAMIC: accessible anywhere/evaluated at run-time'
 		);
 	});

From ce5c11323634c48769ccf3959a9bc2fd4f7d8f81 Mon Sep 17 00:00:00 2001
From: Rich Harris <hello@rich-harris.dev>
Date: Mon, 25 Jul 2022 16:33:37 -0400
Subject: [PATCH 56/95] ok i think thats almost everything

---
 packages/kit/src/core/sync/write_env.js       | 14 ++++-----
 packages/kit/src/runtime/client/start.js      |  2 ++
 .../kit/src/runtime/env/dynamic/private.js    |  2 +-
 .../kit/src/runtime/env/dynamic/public.js     |  2 +-
 .../kit/src/runtime/server/page/render.js     |  5 +++-
 packages/kit/src/vite/build/build_server.js   | 19 ++++++++++--
 packages/kit/src/vite/dev/index.js            | 29 ++++++++++---------
 packages/kit/src/vite/index.js                |  2 +-
 packages/kit/src/vite/preview/index.js        | 29 ++++++++++---------
 packages/kit/src/vite/utils.js                | 16 +++++++++-
 packages/kit/test/apps/basics/.env            |  8 ++---
 packages/kit/test/apps/basics/package.json    |  4 +--
 packages/kit/test/apps/basics/test/test.js    | 10 ++++---
 packages/kit/types/internal.d.ts              |  1 +
 14 files changed, 92 insertions(+), 51 deletions(-)

diff --git a/packages/kit/src/core/sync/write_env.js b/packages/kit/src/core/sync/write_env.js
index 6986b87a499d..3161fd38e023 100644
--- a/packages/kit/src/core/sync/write_env.js
+++ b/packages/kit/src/core/sync/write_env.js
@@ -1,5 +1,5 @@
 import path from 'path';
-import { loadEnv } from 'vite';
+import { get_env } from '../../vite/utils.js';
 import { write_if_changed, is_valid_js_identifier } from './utils.js';
 
 const autogen_comment = '// this file is generated — do not edit it\n';
@@ -12,28 +12,26 @@ const autogen_comment = '// this file is generated — do not edit it\n';
  * The Vite mode.
  */
 export function write_env(config, mode) {
-	const entries = Object.entries(loadEnv(mode, process.cwd(), ''));
-	const pub = Object.fromEntries(entries.filter(([k]) => k.startsWith(config.env.publicPrefix)));
-	const prv = Object.fromEntries(entries.filter(([k]) => !k.startsWith(config.env.publicPrefix)));
+	const env = get_env(mode, config.env.publicPrefix);
 
 	// TODO when testing src, `$app` points at `src/runtime/app`... will
 	// probably need to fiddle with aliases
 	write_if_changed(
 		path.join(config.outDir, 'runtime/env/static/public.js'),
-		create_module('$env/static/public', pub)
+		create_module('$env/static/public', env.public)
 	);
 
 	write_if_changed(
 		path.join(config.outDir, 'runtime/env/static/private.js'),
-		create_module('$env/static/private', prv)
+		create_module('$env/static/private', env.private)
 	);
 
 	write_if_changed(
 		path.join(config.outDir, 'types/ambient.d.ts'),
 		autogen_comment +
-			create_types('$env/static/public', pub) +
+			create_types('$env/static/public', env.public) +
 			'\n\n' +
-			create_types('$env/static/private', prv)
+			create_types('$env/static/private', env.private)
 	);
 }
 
diff --git a/packages/kit/src/runtime/client/start.js b/packages/kit/src/runtime/client/start.js
index d63cf11c7016..2bb7f900f366 100644
--- a/packages/kit/src/runtime/client/start.js
+++ b/packages/kit/src/runtime/client/start.js
@@ -2,6 +2,8 @@ import { create_client } from './client.js';
 import { init } from './singletons.js';
 import { set_paths } from '../paths.js';
 
+export { set_public_env } from '../env/dynamic/public.js';
+
 /**
  * @param {{
  *   paths: {
diff --git a/packages/kit/src/runtime/env/dynamic/private.js b/packages/kit/src/runtime/env/dynamic/private.js
index efd2411364b8..11e2b2493ee4 100644
--- a/packages/kit/src/runtime/env/dynamic/private.js
+++ b/packages/kit/src/runtime/env/dynamic/private.js
@@ -4,6 +4,6 @@ export let env = {};
 
 // TODO put this in a separate module, so it's not user-accessible
 /** @type {(environment: Record<string, string>) => void} */
-export function set_env(environment) {
+export function set_private_env(environment) {
 	env = environment;
 }
diff --git a/packages/kit/src/runtime/env/dynamic/public.js b/packages/kit/src/runtime/env/dynamic/public.js
index efd2411364b8..6eac7ab4812b 100644
--- a/packages/kit/src/runtime/env/dynamic/public.js
+++ b/packages/kit/src/runtime/env/dynamic/public.js
@@ -4,6 +4,6 @@ export let env = {};
 
 // TODO put this in a separate module, so it's not user-accessible
 /** @type {(environment: Record<string, string>) => void} */
-export function set_env(environment) {
+export function set_public_env(environment) {
 	env = environment;
 }
diff --git a/packages/kit/src/runtime/server/page/render.js b/packages/kit/src/runtime/server/page/render.js
index a03b342969c5..2d1d2e42566d 100644
--- a/packages/kit/src/runtime/server/page/render.js
+++ b/packages/kit/src/runtime/server/page/render.js
@@ -171,7 +171,10 @@ export async function render_response({
 
 	// prettier-ignore
 	const init_app = `
-		import { start } from ${s(options.prefix + entry.file)};
+		import { set_public_env, start } from ${s(options.prefix + entry.file)};
+
+		set_public_env(${s(options.public_env)});
+
 		start({
 			target: document.querySelector('[data-sveltekit-hydrate="${target}"]').parentNode,
 			paths: ${s(options.paths)},
diff --git a/packages/kit/src/vite/build/build_server.js b/packages/kit/src/vite/build/build_server.js
index c7520ce11595..f178e813d0bd 100644
--- a/packages/kit/src/vite/build/build_server.js
+++ b/packages/kit/src/vite/build/build_server.js
@@ -27,7 +27,8 @@ import root from '__GENERATED__/root.svelte';
 import { respond } from '${runtime}/server/index.js';
 import { set_paths, assets, base } from '${runtime}/paths.js';
 import { set_prerendering } from '${runtime}/env.js';
-import { set_env } from '${runtime}/env/dynamic/private.js';
+import { set_private_env } from '${runtime}/env/dynamic/private.js';
+import { set_public_env } from '${runtime}/env/dynamic/public.js';
 
 const template = ({ head, body, assets, nonce }) => ${s(template)
 	.replace('%sveltekit.head%', '" + head + "')
@@ -79,6 +80,7 @@ export class Server {
 				default: ${config.kit.prerender.default},
 				enabled: ${config.kit.prerender.enabled}
 			},
+			public_env: {},
 			read,
 			root,
 			service_worker: ${has_service_worker ? "base + '/service-worker.js'" : 'null'},
@@ -90,7 +92,20 @@ export class Server {
 	}
 
 	init({ env }) {
-		set_env(env);
+		const entries = Object.entries(env);
+
+		const prv = Object.fromEntries(Object.entries(env).filter(([k]) => !k.startsWith('${
+			config.kit.env.publicPrefix
+		}')));
+
+		const pub = Object.fromEntries(Object.entries(env).filter(([k]) => k.startsWith('${
+			config.kit.env.publicPrefix
+		}')));
+
+		set_private_env(prv);
+		set_public_env(pub);
+
+		this.options.public_env = pub;
 	}
 
 	async respond(request, options = {}) {
diff --git a/packages/kit/src/vite/dev/index.js b/packages/kit/src/vite/dev/index.js
index 64e099b931ee..4589fa2a7f27 100644
--- a/packages/kit/src/vite/dev/index.js
+++ b/packages/kit/src/vite/dev/index.js
@@ -12,7 +12,7 @@ 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 { format_illegal_import_chain, resolve_entry } from '../utils.js';
+import { format_illegal_import_chain, get_env, resolve_entry } from '../utils.js';
 
 // Vite doesn't expose this so we just copy the list for now
 // https://github.com/vitejs/vite/blob/3edd1af56e980aef56641a5a51cf2932bb580d41/packages/vite/src/node/plugins/css.ts#L96
@@ -237,15 +237,21 @@ export async function dev(vite, vite_config, svelte_config, illegal_imports) {
 					? await vite.ssrLoadModule(`/${svelte_config.kit.files.hooks}`)
 					: {};
 
-				const { set_env } = await vite.ssrLoadModule(
-					process.env.BUNDLED
-						? `/${posixify(
-								path.relative(cwd, `${svelte_config.kit.outDir}/runtime/env/dynamic/private.js`)
-						  )}`
-						: `/@fs${runtime}/env/dynamic/private.js`
+				const runtime_base = process.env.BUNDLED
+					? `/${posixify(path.relative(cwd, `${svelte_config.kit.outDir}/runtime`))}`
+					: `/@fs${runtime}`;
+
+				const { set_private_env } = await vite.ssrLoadModule(
+					`${runtime_base}/env/dynamic/private.js`
+				);
+
+				const { set_public_env } = await vite.ssrLoadModule(
+					`${runtime_base}/env/dynamic/public.js`
 				);
 
-				set_env(process.env);
+				const env = get_env(vite_config.mode, svelte_config.kit.env.publicPrefix);
+				set_private_env(env.private);
+				set_public_env(env.public);
 
 				const handle = user_hooks.handle || (({ event, resolve }) => resolve(event));
 
@@ -287,11 +293,7 @@ export async function dev(vite, vite_config, svelte_config, illegal_imports) {
 					`/${posixify(path.relative(cwd, `${svelte_config.kit.outDir}/generated/root.svelte`))}`
 				);
 
-				const paths = await vite.ssrLoadModule(
-					process.env.BUNDLED
-						? `/${posixify(path.relative(cwd, `${svelte_config.kit.outDir}/runtime/paths.js`))}`
-						: `/@fs${runtime}/paths.js`
-				);
+				const paths = await vite.ssrLoadModule(`${runtime_base}/paths.js`);
 
 				paths.set_paths({
 					base: svelte_config.kit.paths.base,
@@ -350,6 +352,7 @@ export async function dev(vite, vite_config, svelte_config, illegal_imports) {
 							default: svelte_config.kit.prerender.default,
 							enabled: svelte_config.kit.prerender.enabled
 						},
+						public_env: env.public,
 						read: (file) => fs.readFileSync(path.join(svelte_config.kit.files.assets, file)),
 						root,
 						router: svelte_config.kit.browser.router,
diff --git a/packages/kit/src/vite/index.js b/packages/kit/src/vite/index.js
index 5982fea7a11f..3182f260e897 100644
--- a/packages/kit/src/vite/index.js
+++ b/packages/kit/src/vite/index.js
@@ -432,7 +432,7 @@ function kit() {
 		 * @see https://vitejs.dev/guide/api-plugin.html#configurepreviewserver
 		 */
 		configurePreviewServer(vite) {
-			return preview(vite, svelte_config, vite_config.preview.https ? 'https' : 'http');
+			return preview(vite, vite_config, svelte_config);
 		}
 	};
 }
diff --git a/packages/kit/src/vite/preview/index.js b/packages/kit/src/vite/preview/index.js
index bd173531e683..a8ec05c23c87 100644
--- a/packages/kit/src/vite/preview/index.js
+++ b/packages/kit/src/vite/preview/index.js
@@ -5,6 +5,7 @@ import { pathToFileURL } from 'url';
 import { getRequest, setResponse } from '../../node/index.js';
 import { installPolyfills } from '../../node/polyfills.js';
 import { SVELTE_KIT_ASSETS } from '../../core/constants.js';
+import { loadEnv } from 'vite';
 
 /** @typedef {import('http').IncomingMessage} Req */
 /** @typedef {import('http').ServerResponse} Res */
@@ -15,20 +16,22 @@ import { SVELTE_KIT_ASSETS } from '../../core/constants.js';
  *   middlewares: import('connect').Server;
  *   httpServer: import('http').Server;
  * }} vite
- * @param {import('types').ValidatedConfig} config
- * @param {'http' | 'https'} protocol
+ * @param {import('vite').ResolvedConfig} vite_config
+ * @param {import('types').ValidatedConfig} svelte_config
  */
-export async function preview(vite, config, protocol) {
+export async function preview(vite, vite_config, svelte_config) {
 	installPolyfills();
 
-	const { paths } = config.kit;
+	const { paths } = svelte_config.kit;
 	const base = paths.base;
 	const assets = paths.assets ? SVELTE_KIT_ASSETS : paths.base;
 
+	const protocol = vite_config.preview.https ? 'https' : 'http';
+
 	const etag = `"${Date.now()}"`;
 
-	const index_file = join(config.kit.outDir, 'output/server/index.js');
-	const manifest_file = join(config.kit.outDir, 'output/server/manifest.js');
+	const index_file = join(svelte_config.kit.outDir, 'output/server/index.js');
+	const manifest_file = join(svelte_config.kit.outDir, 'output/server/manifest.js');
 
 	/** @type {import('types').ServerModule} */
 	const { Server, override } = await import(pathToFileURL(index_file).href);
@@ -38,26 +41,26 @@ export async function preview(vite, config, protocol) {
 		paths: { base, assets },
 		prerendering: false,
 		protocol,
-		read: (file) => fs.readFileSync(join(config.kit.files.assets, file))
+		read: (file) => fs.readFileSync(join(svelte_config.kit.files.assets, file))
 	});
 
 	const server = new Server(manifest);
 	server.init({
-		env: /** @type {Record<string, string>} */ (process.env)
+		env: loadEnv(vite_config.mode, process.cwd(), '')
 	});
 
 	return () => {
 		// files in `static`
-		vite.middlewares.use(scoped(assets, mutable(config.kit.files.assets)));
+		vite.middlewares.use(scoped(assets, mutable(svelte_config.kit.files.assets)));
 
 		// immutable generated client assets
 		vite.middlewares.use(
 			scoped(
 				assets,
-				sirv(join(config.kit.outDir, 'output/client'), {
+				sirv(join(svelte_config.kit.outDir, 'output/client'), {
 					setHeaders: (res, pathname) => {
 						// only apply to build directory, not e.g. version.json
-						if (pathname.startsWith(`/${config.kit.appDir}/immutable`)) {
+						if (pathname.startsWith(`/${svelte_config.kit.appDir}/immutable`)) {
 							res.setHeader('cache-control', 'public,max-age=31536000,immutable');
 						}
 					}
@@ -79,7 +82,7 @@ export async function preview(vite, config, protocol) {
 
 		// prerendered dependencies
 		vite.middlewares.use(
-			scoped(base, mutable(join(config.kit.outDir, 'output/prerendered/dependencies')))
+			scoped(base, mutable(join(svelte_config.kit.outDir, 'output/prerendered/dependencies')))
 		);
 
 		// prerendered pages (we can't just use sirv because we need to
@@ -103,7 +106,7 @@ export async function preview(vite, config, protocol) {
 				// only treat this as a page if it doesn't include an extension
 				if (pathname === '/' || /\/[^./]+\/?$/.test(pathname)) {
 					const file = join(
-						config.kit.outDir,
+						svelte_config.kit.outDir,
 						'output/prerendered/pages' +
 							pathname +
 							(pathname.endsWith('/') ? 'index.html' : '.html')
diff --git a/packages/kit/src/vite/utils.js b/packages/kit/src/vite/utils.js
index 5a37d65a42b3..3ed1a156fdac 100644
--- a/packages/kit/src/vite/utils.js
+++ b/packages/kit/src/vite/utils.js
@@ -1,6 +1,6 @@
 import fs from 'fs';
 import path from 'path';
-import { loadConfigFromFile } from 'vite';
+import { loadConfigFromFile, loadEnv } from 'vite';
 import { get_runtime_directory } from '../core/utils.js';
 
 /**
@@ -169,3 +169,17 @@ export function format_illegal_import_chain(stack, config) {
 
 	return `Cannot import ${stack.at(-1)} into client-side code:\n${pyramid}`;
 }
+
+/**
+ * Load envinronment variables from process.env and .env files
+ * @param {string} mode
+ * @param {string} prefix
+ */
+export function get_env(mode, prefix) {
+	const entries = Object.entries(loadEnv(mode, process.cwd(), ''));
+
+	return {
+		public: Object.fromEntries(entries.filter(([k]) => k.startsWith(prefix))),
+		private: Object.fromEntries(entries.filter(([k]) => !k.startsWith(prefix)))
+	};
+}
diff --git a/packages/kit/test/apps/basics/.env b/packages/kit/test/apps/basics/.env
index 2f5102d02b9c..b12773447030 100644
--- a/packages/kit/test/apps/basics/.env
+++ b/packages/kit/test/apps/basics/.env
@@ -1,5 +1,5 @@
-PRIVATE_STATIC="accessible to server-side code/replaced at build-time"
-PRIVATE_DYNAMIC="should not see me"
+PRIVATE_STATIC="accessible to server-side code/replaced at build time"
+PRIVATE_DYNAMIC="accessible to server-side code/evaluated at run time"
 
-PUBLIC_STATIC="accessible anywhere/replaced at build-time"
-PUBLIC_DYNAMIC="should not see me"
\ No newline at end of file
+PUBLIC_STATIC="accessible anywhere/replaced at build time"
+PUBLIC_DYNAMIC="accessible anywhere/evaluated at run time"
\ No newline at end of file
diff --git a/packages/kit/test/apps/basics/package.json b/packages/kit/test/apps/basics/package.json
index 77e9a02c9533..eee4f24d884a 100644
--- a/packages/kit/test/apps/basics/package.json
+++ b/packages/kit/test/apps/basics/package.json
@@ -3,8 +3,8 @@
 	"private": true,
 	"version": "0.0.2-next.0",
 	"scripts": {
-		"dev": "PRIVATE_DYNAMIC=\"private var set in npm run dev\" PUBLIC_DYNAMIC=\"public var set in npm run dev\" vite dev",
-		"build": "PRIVATE_DYNAMIC=\"private var set in npm run build\" PUBLIC_DYNAMIC=\"public var set in npm run build\" vite build",
+		"dev": "vite dev",
+		"build": "vite build",
 		"preview": "vite preview",
 		"prepare": "node ../../cli.js sync",
 		"check": "tsc && svelte-check",
diff --git a/packages/kit/test/apps/basics/test/test.js b/packages/kit/test/apps/basics/test/test.js
index 30a5c2a15639..ca20281a2ab9 100644
--- a/packages/kit/test/apps/basics/test/test.js
+++ b/packages/kit/test/apps/basics/test/test.js
@@ -342,18 +342,20 @@ test.describe('Env', () => {
 	test.only('includes environment variables', async ({ page }) => {
 		await page.goto('/env');
 
+		const command = process.env.DEV ? 'dev' : 'preview';
+
 		expect(await page.textContent('#static-private')).toBe(
-			'PRIVATE_STATIC: accessible to server-side code/replaced at build-time'
+			'PRIVATE_STATIC: accessible to server-side code/replaced at build time'
 		);
 		expect(await page.textContent('#dynamic-private')).toBe(
-			'PRIVATE_DYNAMIC: private var set in npm run dev'
+			'PRIVATE_DYNAMIC: accessible to server-side code/evaluated at run time'
 		);
 
 		expect(await page.textContent('#static-public')).toBe(
-			'PUBLIC_STATIC: accessible anywhere/replaced at build-time'
+			'PUBLIC_STATIC: accessible anywhere/replaced at build time'
 		);
 		expect(await page.textContent('#dynamic-public')).toBe(
-			'PUBLIC_DYNAMIC: accessible anywhere/evaluated at run-time'
+			'PUBLIC_DYNAMIC: accessible anywhere/evaluated at run time'
 		);
 	});
 });
diff --git a/packages/kit/types/internal.d.ts b/packages/kit/types/internal.d.ts
index bb7b815dc20b..517ec91e4fc3 100644
--- a/packages/kit/types/internal.d.ts
+++ b/packages/kit/types/internal.d.ts
@@ -251,6 +251,7 @@ export interface SSROptions {
 		default: boolean;
 		enabled: boolean;
 	};
+	public_env: Record<string, string>;
 	read(file: string): Buffer;
 	root: SSRComponent['default'];
 	router: boolean;

From e0dc06643aba88d3065eca2ad16099e0ac3c45ed Mon Sep 17 00:00:00 2001
From: Rich Harris <hello@rich-harris.dev>
Date: Mon, 25 Jul 2022 16:33:52 -0400
Subject: [PATCH 57/95] oops

---
 packages/kit/test/apps/basics/test/test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/kit/test/apps/basics/test/test.js b/packages/kit/test/apps/basics/test/test.js
index ca20281a2ab9..86e9eb2aa11c 100644
--- a/packages/kit/test/apps/basics/test/test.js
+++ b/packages/kit/test/apps/basics/test/test.js
@@ -339,7 +339,7 @@ test.describe('Encoded paths', () => {
 });
 
 test.describe('Env', () => {
-	test.only('includes environment variables', async ({ page }) => {
+	test('includes environment variables', async ({ page }) => {
 		await page.goto('/env');
 
 		const command = process.env.DEV ? 'dev' : 'preview';

From 04c80fc0a64ac28b8859fd9f0272250dc9999137 Mon Sep 17 00:00:00 2001
From: Rich Harris <hello@rich-harris.dev>
Date: Mon, 25 Jul 2022 16:40:39 -0400
Subject: [PATCH 58/95] hide functions

---
 packages/kit/src/runtime/client/start.js        |  2 +-
 packages/kit/src/runtime/env-private.js         |  9 +++++++++
 packages/kit/src/runtime/env-public.js          |  9 +++++++++
 packages/kit/src/runtime/env/dynamic/private.js | 10 +---------
 packages/kit/src/runtime/env/dynamic/public.js  | 10 +---------
 packages/kit/src/vite/build/build_server.js     |  4 ++--
 packages/kit/src/vite/dev/index.js              |  9 ++-------
 packages/kit/test/apps/basics/test/test.js      |  2 --
 8 files changed, 25 insertions(+), 30 deletions(-)
 create mode 100644 packages/kit/src/runtime/env-private.js
 create mode 100644 packages/kit/src/runtime/env-public.js

diff --git a/packages/kit/src/runtime/client/start.js b/packages/kit/src/runtime/client/start.js
index 2bb7f900f366..fcba7c748bd6 100644
--- a/packages/kit/src/runtime/client/start.js
+++ b/packages/kit/src/runtime/client/start.js
@@ -2,7 +2,7 @@ import { create_client } from './client.js';
 import { init } from './singletons.js';
 import { set_paths } from '../paths.js';
 
-export { set_public_env } from '../env/dynamic/public.js';
+export { set_public_env } from '../env-public.js';
 
 /**
  * @param {{
diff --git a/packages/kit/src/runtime/env-private.js b/packages/kit/src/runtime/env-private.js
new file mode 100644
index 000000000000..11e2b2493ee4
--- /dev/null
+++ b/packages/kit/src/runtime/env-private.js
@@ -0,0 +1,9 @@
+// TODO need separate public/private types
+/** @type {App.Env} */
+export let env = {};
+
+// TODO put this in a separate module, so it's not user-accessible
+/** @type {(environment: Record<string, string>) => void} */
+export function set_private_env(environment) {
+	env = environment;
+}
diff --git a/packages/kit/src/runtime/env-public.js b/packages/kit/src/runtime/env-public.js
new file mode 100644
index 000000000000..6eac7ab4812b
--- /dev/null
+++ b/packages/kit/src/runtime/env-public.js
@@ -0,0 +1,9 @@
+// TODO need separate public/private types
+/** @type {App.Env} */
+export let env = {};
+
+// TODO put this in a separate module, so it's not user-accessible
+/** @type {(environment: Record<string, string>) => void} */
+export function set_public_env(environment) {
+	env = environment;
+}
diff --git a/packages/kit/src/runtime/env/dynamic/private.js b/packages/kit/src/runtime/env/dynamic/private.js
index 11e2b2493ee4..971d61ed5667 100644
--- a/packages/kit/src/runtime/env/dynamic/private.js
+++ b/packages/kit/src/runtime/env/dynamic/private.js
@@ -1,9 +1 @@
-// TODO need separate public/private types
-/** @type {App.Env} */
-export let env = {};
-
-// TODO put this in a separate module, so it's not user-accessible
-/** @type {(environment: Record<string, string>) => void} */
-export function set_private_env(environment) {
-	env = environment;
-}
+export { env } from '../../env-private.js';
diff --git a/packages/kit/src/runtime/env/dynamic/public.js b/packages/kit/src/runtime/env/dynamic/public.js
index 6eac7ab4812b..34dc1950be3a 100644
--- a/packages/kit/src/runtime/env/dynamic/public.js
+++ b/packages/kit/src/runtime/env/dynamic/public.js
@@ -1,9 +1 @@
-// TODO need separate public/private types
-/** @type {App.Env} */
-export let env = {};
-
-// TODO put this in a separate module, so it's not user-accessible
-/** @type {(environment: Record<string, string>) => void} */
-export function set_public_env(environment) {
-	env = environment;
-}
+export { env } from '../../env-public.js';
diff --git a/packages/kit/src/vite/build/build_server.js b/packages/kit/src/vite/build/build_server.js
index b572f11f3cb9..ae8fc4e454bc 100644
--- a/packages/kit/src/vite/build/build_server.js
+++ b/packages/kit/src/vite/build/build_server.js
@@ -27,8 +27,8 @@ import root from '__GENERATED__/root.svelte';
 import { respond } from '${runtime}/server/index.js';
 import { set_paths, assets, base } from '${runtime}/paths.js';
 import { set_prerendering } from '${runtime}/env.js';
-import { set_private_env } from '${runtime}/env/dynamic/private.js';
-import { set_public_env } from '${runtime}/env/dynamic/public.js';
+import { set_private_env } from '${runtime}/env-private.js';
+import { set_public_env } from '${runtime}/env-public.js';
 
 const template = ({ head, body, assets, nonce }) => ${s(template)
 	.replace('%sveltekit.head%', '" + head + "')
diff --git a/packages/kit/src/vite/dev/index.js b/packages/kit/src/vite/dev/index.js
index 23b6be53449f..b78b9d4c5bc4 100644
--- a/packages/kit/src/vite/dev/index.js
+++ b/packages/kit/src/vite/dev/index.js
@@ -254,13 +254,8 @@ export async function dev(vite, vite_config, svelte_config, illegal_imports) {
 					? `/${posixify(path.relative(cwd, `${svelte_config.kit.outDir}/runtime`))}`
 					: `/@fs${runtime}`;
 
-				const { set_private_env } = await vite.ssrLoadModule(
-					`${runtime_base}/env/dynamic/private.js`
-				);
-
-				const { set_public_env } = await vite.ssrLoadModule(
-					`${runtime_base}/env/dynamic/public.js`
-				);
+				const { set_private_env } = await vite.ssrLoadModule(`${runtime_base}/env-private.js`);
+				const { set_public_env } = await vite.ssrLoadModule(`${runtime_base}/env-public.js`);
 
 				const env = get_env(vite_config.mode, svelte_config.kit.env.publicPrefix);
 				set_private_env(env.private);
diff --git a/packages/kit/test/apps/basics/test/test.js b/packages/kit/test/apps/basics/test/test.js
index 86e9eb2aa11c..83a4c5b780b3 100644
--- a/packages/kit/test/apps/basics/test/test.js
+++ b/packages/kit/test/apps/basics/test/test.js
@@ -342,8 +342,6 @@ test.describe('Env', () => {
 	test('includes environment variables', async ({ page }) => {
 		await page.goto('/env');
 
-		const command = process.env.DEV ? 'dev' : 'preview';
-
 		expect(await page.textContent('#static-private')).toBe(
 			'PRIVATE_STATIC: accessible to server-side code/replaced at build time'
 		);

From 831c5b3868020e501a5175ed0abf15dfe8c89538 Mon Sep 17 00:00:00 2001
From: Rich Harris <hello@rich-harris.dev>
Date: Mon, 25 Jul 2022 16:45:31 -0400
Subject: [PATCH 59/95] separate PrivateEnv from PublicEnv

---
 .../templates/default/src/app.d.ts            |  6 ++-
 .../templates/skeleton/src/app.d.ts           |  3 +-
 packages/kit/types/ambient.d.ts               | 40 ++++++++++++++-----
 3 files changed, 36 insertions(+), 13 deletions(-)

diff --git a/packages/create-svelte/templates/default/src/app.d.ts b/packages/create-svelte/templates/default/src/app.d.ts
index a91fdae88060..c9d56c4cab5c 100644
--- a/packages/create-svelte/templates/default/src/app.d.ts
+++ b/packages/create-svelte/templates/default/src/app.d.ts
@@ -4,14 +4,16 @@
 // for information about these interfaces
 // and what to do when importing types
 declare namespace App {
-	// interface Env {}
-
 	interface Locals {
 		userid: string;
 	}
 
 	// interface Platform {}
 
+	// interface PrivateEnv {}
+
+	// interface PublicEnv {}
+
 	// interface Session {}
 
 	// interface Stuff {}
diff --git a/packages/create-svelte/templates/skeleton/src/app.d.ts b/packages/create-svelte/templates/skeleton/src/app.d.ts
index c257d5a96a71..ff717de9551f 100644
--- a/packages/create-svelte/templates/skeleton/src/app.d.ts
+++ b/packages/create-svelte/templates/skeleton/src/app.d.ts
@@ -4,9 +4,10 @@
 // for information about these interfaces
 // and what to do when importing types
 declare namespace App {
-	// interface Env {}
 	// interface Locals {}
 	// interface Platform {}
+	// interface PrivateEnv {}
+	// interface PublicEnv {}
 	// interface Session {}
 	// interface Stuff {}
 }
diff --git a/packages/kit/types/ambient.d.ts b/packages/kit/types/ambient.d.ts
index cf37f3efd1a4..fb09ec49977f 100644
--- a/packages/kit/types/ambient.d.ts
+++ b/packages/kit/types/ambient.d.ts
@@ -5,12 +5,14 @@
  * /// <reference types="@sveltejs/kit" />
  *
  * declare namespace App {
- * 	interface Env {}
- *
  * 	interface Locals {}
  *
  * 	interface Platform {}
  *
+ * 	interface PrivateEnv {}
+ *
+ * 	interface PublicEnv {}
+ *
  * 	interface Session {}
  *
  * 	interface Stuff {}
@@ -44,12 +46,6 @@
  *
  */
 declare namespace App {
-	/**
-	 * TODO need separate PrivateEnv and PublicEnv?
-	 * The interface that defines the dynamic environment variables exported from '$env/dynamic/private'.
-	 */
-	export interface Env extends Record<string, string> {}
-
 	/**
 	 * The interface that defines `event.locals`, which can be accessed in [hooks](https://kit.svelte.dev/docs/hooks) (`handle`, `handleError` and `getSession`) and [endpoints](https://kit.svelte.dev/docs/routing#endpoints).
 	 */
@@ -60,6 +56,16 @@ declare namespace App {
 	 */
 	export interface Platform {}
 
+	/**
+	 * The interface that defines the dynamic environment variables exported from '$env/dynamic/private'.
+	 */
+	export interface PrivateEnv extends Record<string, string> {}
+
+	/**
+	 * The interface that defines the dynamic environment variables exported from '$env/dynamic/public'.
+	 */
+	export interface PublicEnv extends Record<string, string> {}
+
 	/**
 	 * The interface that defines `session`, both as an argument to [`load`](https://kit.svelte.dev/docs/loading) functions and the value of the [session store](https://kit.svelte.dev/docs/modules#$app-stores).
 	 */
@@ -102,11 +108,25 @@ declare module '$app/env' {
  *
  * ```ts
  * import { env } from '$env/dynamic/private';
- * console.log(env.MY_DEPLOYMENT_SPECIFIC_VARIABLE);
+ * console.log(env.DEPLOYMENT_SPECIFIC_VARIABLE);
  * ```
  */
 declare module '$env/dynamic/private' {
-	export let env: App.Env;
+	export let env: App.PrivateEnv;
+}
+
+/**
+ * Similar to [`$env/dynamic/private`](https://kit.svelte.dev/docs/modules#$env-dynamic-private), but only includes
+ * variables that begin with [`config.kit.env.publicPrefix`](https://kit.svelte.dev/docs/configuration#kit-env-publicprefix)
+ * (which defaults to `PUBLIC_`), and can therefore safely be exposed to client-side code
+ *
+ * ```ts
+ * import { env } from '$env/dynamic/private';
+ * console.log(env.PUBLIC_DEPLOYMENT_SPECIFIC_VARIABLE);
+ * ```
+ */
+declare module '$env/dynamic/public' {
+	export let env: App.PublicEnv;
 }
 
 /**

From 7f03ac7844085a495058c320e0edfcfb029a1132 Mon Sep 17 00:00:00 2001
From: Rich Harris <hello@rich-harris.dev>
Date: Mon, 25 Jul 2022 16:53:09 -0400
Subject: [PATCH 60/95] expose entry points

---
 packages/kit/rollup.config.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/kit/rollup.config.js b/packages/kit/rollup.config.js
index 77421bd78f4b..884eba331230 100644
--- a/packages/kit/rollup.config.js
+++ b/packages/kit/rollup.config.js
@@ -25,6 +25,8 @@ export default [
 			'app/env': 'src/runtime/app/env.js',
 			'env/dynamic/private': 'src/runtime/env/dynamic/private.js',
 			'env/dynamic/public': 'src/runtime/env/dynamic/public.js',
+			'env-private': 'src/runtime/env-private.js',
+			'env-public': 'src/runtime/env-public.js',
 			paths: 'src/runtime/paths.js',
 			env: 'src/runtime/env.js'
 		},

From ca72f76e86022637aeac459922423c8ea30d028d Mon Sep 17 00:00:00 2001
From: Rich Harris <hello@rich-harris.dev>
Date: Mon, 25 Jul 2022 16:55:51 -0400
Subject: [PATCH 61/95] fix turbo config

---
 turbo.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/turbo.json b/turbo.json
index 7e3c4be01eaf..16e829cd6f5d 100644
--- a/turbo.json
+++ b/turbo.json
@@ -3,14 +3,14 @@
 	"pipeline": {
 		"@sveltejs/kit#build": {
 			"dependsOn": ["^build"],
-			"inputs": ["src/**", "scripts/**", "types/**"],
+			"inputs": ["rollup.config.js", "src/**", "scripts/**", "types/**"],
 			"outputs": ["dist/**", "docs/**", "assets/**"],
 			"outputMode": "new-only"
 		},
 		"kit.svelte.dev#build": {
 			"dependsOn": ["^build", "$VERCEL", "$ENABLE_VC_BUILD"],
 			"inputs": ["src/**", "../../packages/kit/docs/**", "../../documentation/**"],
-			"outputs": [".vercel_build_output/**", ".vercel/output/**" ],
+			"outputs": [".vercel_build_output/**", ".vercel/output/**"],
 			"outputMode": "new-only"
 		},
 		"build": {

From 8d8eaa0264c44c1a9808652c1b802929f2007db3 Mon Sep 17 00:00:00 2001
From: Rich Harris <hello@rich-harris.dev>
Date: Mon, 25 Jul 2022 17:01:02 -0400
Subject: [PATCH 62/95] fix

---
 packages/kit/src/runtime/env-private.js | 2 +-
 packages/kit/src/runtime/env-public.js  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/kit/src/runtime/env-private.js b/packages/kit/src/runtime/env-private.js
index 11e2b2493ee4..67c4423472e1 100644
--- a/packages/kit/src/runtime/env-private.js
+++ b/packages/kit/src/runtime/env-private.js
@@ -1,5 +1,5 @@
 // TODO need separate public/private types
-/** @type {App.Env} */
+/** @type {App.PrivateEnv} */
 export let env = {};
 
 // TODO put this in a separate module, so it's not user-accessible
diff --git a/packages/kit/src/runtime/env-public.js b/packages/kit/src/runtime/env-public.js
index 6eac7ab4812b..3165c17bede4 100644
--- a/packages/kit/src/runtime/env-public.js
+++ b/packages/kit/src/runtime/env-public.js
@@ -1,5 +1,5 @@
 // TODO need separate public/private types
-/** @type {App.Env} */
+/** @type {App.PublicEnv} */
 export let env = {};
 
 // TODO put this in a separate module, so it's not user-accessible

From c8e7ab537a791f1793e2119a0b72cabae0374761 Mon Sep 17 00:00:00 2001
From: Rich Harris <hello@rich-harris.dev>
Date: Mon, 25 Jul 2022 17:09:42 -0400
Subject: [PATCH 63/95] Update .changeset/beige-gorillas-tell.md

---
 .changeset/beige-gorillas-tell.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.changeset/beige-gorillas-tell.md b/.changeset/beige-gorillas-tell.md
index a82d844b974c..7912e6f4ea90 100644
--- a/.changeset/beige-gorillas-tell.md
+++ b/.changeset/beige-gorillas-tell.md
@@ -6,4 +6,4 @@
 '@sveltejs/adapter-vercel': patch
 ---
 
-Initialise `$env/dynamic/private`
+Initialise `env`

From 84d06f421ef117bf2dae3a3083e05dc8ebc05023 Mon Sep 17 00:00:00 2001
From: Rich Harris <hello@rich-harris.dev>
Date: Mon, 25 Jul 2022 17:09:48 -0400
Subject: [PATCH 64/95] Update packages/kit/src/runtime/env-public.js

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

diff --git a/packages/kit/src/runtime/env-public.js b/packages/kit/src/runtime/env-public.js
index 3165c17bede4..f1b31ffcb8c2 100644
--- a/packages/kit/src/runtime/env-public.js
+++ b/packages/kit/src/runtime/env-public.js
@@ -2,7 +2,6 @@
 /** @type {App.PublicEnv} */
 export let env = {};
 
-// TODO put this in a separate module, so it's not user-accessible
 /** @type {(environment: Record<string, string>) => void} */
 export function set_public_env(environment) {
 	env = environment;

From caf7cabe26057a74be75c5243bbf980694c2926d Mon Sep 17 00:00:00 2001
From: Rich Harris <hello@rich-harris.dev>
Date: Mon, 25 Jul 2022 17:09:53 -0400
Subject: [PATCH 65/95] Update packages/kit/src/runtime/env-private.js

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

diff --git a/packages/kit/src/runtime/env-private.js b/packages/kit/src/runtime/env-private.js
index 67c4423472e1..a865e80da3d4 100644
--- a/packages/kit/src/runtime/env-private.js
+++ b/packages/kit/src/runtime/env-private.js
@@ -2,7 +2,6 @@
 /** @type {App.PrivateEnv} */
 export let env = {};
 
-// TODO put this in a separate module, so it's not user-accessible
 /** @type {(environment: Record<string, string>) => void} */
 export function set_private_env(environment) {
 	env = environment;

From 3416554b26852a982f80d53d17e2a47ff9035c81 Mon Sep 17 00:00:00 2001
From: Rich Harris <hello@rich-harris.dev>
Date: Mon, 25 Jul 2022 17:09:59 -0400
Subject: [PATCH 66/95] Update packages/kit/src/runtime/env-public.js

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

diff --git a/packages/kit/src/runtime/env-public.js b/packages/kit/src/runtime/env-public.js
index f1b31ffcb8c2..0b8c28cc6af4 100644
--- a/packages/kit/src/runtime/env-public.js
+++ b/packages/kit/src/runtime/env-public.js
@@ -1,4 +1,3 @@
-// TODO need separate public/private types
 /** @type {App.PublicEnv} */
 export let env = {};
 

From 6264418ce1b8bd81a26e0418fc9c8ee9621033c1 Mon Sep 17 00:00:00 2001
From: Rich Harris <hello@rich-harris.dev>
Date: Mon, 25 Jul 2022 17:10:05 -0400
Subject: [PATCH 67/95] Update packages/kit/src/runtime/env-private.js

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

diff --git a/packages/kit/src/runtime/env-private.js b/packages/kit/src/runtime/env-private.js
index a865e80da3d4..9fdd71a7f3d2 100644
--- a/packages/kit/src/runtime/env-private.js
+++ b/packages/kit/src/runtime/env-private.js
@@ -1,4 +1,3 @@
-// TODO need separate public/private types
 /** @type {App.PrivateEnv} */
 export let env = {};
 

From d7a415976990726261f35b33cfa5a1b91c075d41 Mon Sep 17 00:00:00 2001
From: Rich Harris <hello@rich-harris.dev>
Date: Mon, 25 Jul 2022 17:26:43 -0400
Subject: [PATCH 68/95] Update packages/kit/src/core/sync/sync.js

Co-authored-by: Ben McCann <322311+benmccann@users.noreply.github.com>
---
 packages/kit/src/core/sync/sync.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/kit/src/core/sync/sync.js b/packages/kit/src/core/sync/sync.js
index 47e6bd8ba159..2376d2b657df 100644
--- a/packages/kit/src/core/sync/sync.js
+++ b/packages/kit/src/core/sync/sync.js
@@ -39,8 +39,7 @@ export function update(config, mode) {
 }
 
 /**
- * Run sync.init and sync.update in series, returning the result from
- * sync.update.
+ * Run sync.init and sync.update in series, returning the result from sync.update.
  * @param {import('types').ValidatedConfig} config
  * @param {string} mode The Vite mode
  */

From c53600f6a560ad6f2170b0fd62759881caf92efd Mon Sep 17 00:00:00 2001
From: Rich Harris <hello@rich-harris.dev>
Date: Mon, 25 Jul 2022 17:26:51 -0400
Subject: [PATCH 69/95] Update packages/kit/src/vite/utils.js

Co-authored-by: Ben McCann <322311+benmccann@users.noreply.github.com>
---
 packages/kit/src/vite/utils.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/kit/src/vite/utils.js b/packages/kit/src/vite/utils.js
index 0b65db045cd1..dd20f9d5d6bf 100644
--- a/packages/kit/src/vite/utils.js
+++ b/packages/kit/src/vite/utils.js
@@ -151,10 +151,8 @@ export function resolve_entry(entry) {
 }
 
 /**
- *
  * @param {string} str
  * @param {number} times
- * @returns
  */
 function repeat(str, times) {
 	return new Array(times + 1).join(str);

From 96c7a4aa20a33165f7cb5fd5f8b8a29bf8ff1999 Mon Sep 17 00:00:00 2001
From: Rich Harris <hello@rich-harris.dev>
Date: Mon, 25 Jul 2022 17:26:58 -0400
Subject: [PATCH 70/95] Update packages/kit/src/vite/utils.js

Co-authored-by: Ben McCann <322311+benmccann@users.noreply.github.com>
---
 packages/kit/src/vite/utils.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/kit/src/vite/utils.js b/packages/kit/src/vite/utils.js
index dd20f9d5d6bf..19241ee54c82 100644
--- a/packages/kit/src/vite/utils.js
+++ b/packages/kit/src/vite/utils.js
@@ -176,7 +176,7 @@ export function format_illegal_import_chain(stack, config) {
 }
 
 /**
- * Load envinronment variables from process.env and .env files
+ * Load environment variables from process.env and .env files
  * @param {string} mode
  * @param {string} prefix
  */

From eb34e95fbc9651f5ba52110b43d172e4d5ec10bf Mon Sep 17 00:00:00 2001
From: Rich Harris <hello@rich-harris.dev>
Date: Mon, 25 Jul 2022 17:27:28 -0400
Subject: [PATCH 71/95] Update packages/kit/test/apps/basics/.env

Co-authored-by: Ben McCann <322311+benmccann@users.noreply.github.com>
---
 packages/kit/test/apps/basics/.env | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/kit/test/apps/basics/.env b/packages/kit/test/apps/basics/.env
index b12773447030..1597af1243ec 100644
--- a/packages/kit/test/apps/basics/.env
+++ b/packages/kit/test/apps/basics/.env
@@ -2,4 +2,4 @@ PRIVATE_STATIC="accessible to server-side code/replaced at build time"
 PRIVATE_DYNAMIC="accessible to server-side code/evaluated at run time"
 
 PUBLIC_STATIC="accessible anywhere/replaced at build time"
-PUBLIC_DYNAMIC="accessible anywhere/evaluated at run time"
\ No newline at end of file
+PUBLIC_DYNAMIC="accessible anywhere/evaluated at run time"

From 63f6604eae3bc843bebbade2c2801b2d23805fdf Mon Sep 17 00:00:00 2001
From: Rich Harris <hello@rich-harris.dev>
Date: Mon, 25 Jul 2022 17:27:34 -0400
Subject: [PATCH 72/95] Update packages/kit/test/apps/basics/.gitignore

Co-authored-by: Ben McCann <322311+benmccann@users.noreply.github.com>
---
 packages/kit/test/apps/basics/.gitignore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/kit/test/apps/basics/.gitignore b/packages/kit/test/apps/basics/.gitignore
index 57795199de11..fa2f5a579236 100644
--- a/packages/kit/test/apps/basics/.gitignore
+++ b/packages/kit/test/apps/basics/.gitignore
@@ -1,2 +1,2 @@
 /test/errors.json
-!/.env
\ No newline at end of file
+!/.env

From 4449fb294990f85d6bd15c1ccd7b02d85d73e184 Mon Sep 17 00:00:00 2001
From: Rich Harris <hello@rich-harris.dev>
Date: Mon, 25 Jul 2022 17:39:18 -0400
Subject: [PATCH 73/95] write_env in init, not update

---
 packages/kit/src/core/sync/sync.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/kit/src/core/sync/sync.js b/packages/kit/src/core/sync/sync.js
index 2376d2b657df..5493d477ceb1 100644
--- a/packages/kit/src/core/sync/sync.js
+++ b/packages/kit/src/core/sync/sync.js
@@ -11,19 +11,20 @@ import { write_env } from './write_env.js';
 /**
  * Initialize SvelteKit's generated files.
  * @param {import('types').ValidatedConfig} config
- * @param {string | undefined} mode
+ * @param {string} mode
  */
-export function init(config, mode = undefined) {
+export function init(config, mode) {
 	copy_assets(path.join(config.kit.outDir, 'runtime'));
+
 	write_tsconfig(config.kit);
+	write_env(config.kit, mode);
 }
 
 /**
  * Update SvelteKit's generated files.
  * @param {import('types').ValidatedConfig} config
- * @param {string} mode The Vite mode
  */
-export function update(config, mode) {
+export function update(config) {
 	const manifest_data = create_manifest_data({ config });
 
 	const output = path.join(config.kit.outDir, 'generated');
@@ -33,7 +34,6 @@ export function update(config, mode) {
 	write_root(manifest_data, output);
 	write_matchers(manifest_data, output);
 	write_types(config, manifest_data);
-	write_env(config.kit, mode);
 
 	return { manifest_data };
 }
@@ -45,5 +45,5 @@ export function update(config, mode) {
  */
 export function all(config, mode) {
 	init(config, mode);
-	return update(config, mode);
+	return update(config);
 }

From 38025bebe5d7570210e0f5da8c8f9e82aaace7e7 Mon Sep 17 00:00:00 2001
From: Rich Harris <hello@rich-harris.dev>
Date: Mon, 25 Jul 2022 17:44:31 -0400
Subject: [PATCH 74/95] lint

---
 packages/kit/src/vite/dev/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/kit/src/vite/dev/index.js b/packages/kit/src/vite/dev/index.js
index b78b9d4c5bc4..66eebe64701d 100644
--- a/packages/kit/src/vite/dev/index.js
+++ b/packages/kit/src/vite/dev/index.js
@@ -41,7 +41,7 @@ export async function dev(vite, vite_config, svelte_config, illegal_imports) {
 	let manifest;
 
 	function update_manifest() {
-		const { manifest_data } = sync.update(svelte_config, vite_config.mode);
+		const { manifest_data } = sync.update(svelte_config);
 
 		manifest = {
 			appDir: svelte_config.kit.appDir,

From c9d222a3e558969c8ed1953f3f4411416a60f497 Mon Sep 17 00:00:00 2001
From: Rich Harris <hello@rich-harris.dev>
Date: Mon, 25 Jul 2022 18:38:00 -0400
Subject: [PATCH 75/95] simplify valid identifier check, allow exports of
 reserved words

---
 packages/kit/src/core/sync/utils.js     | 64 ++++++++++++++++++++-----
 packages/kit/src/core/sync/write_env.js | 22 ++++++---
 2 files changed, 68 insertions(+), 18 deletions(-)

diff --git a/packages/kit/src/core/sync/utils.js b/packages/kit/src/core/sync/utils.js
index f49e905df647..d8cce64dec8c 100644
--- a/packages/kit/src/core/sync/utils.js
+++ b/packages/kit/src/core/sync/utils.js
@@ -32,15 +32,55 @@ export function trim(str) {
 	return str.replace(pattern, '').trim();
 }
 
-/**
- * Determines whether a string will make a valid JavaScript identifier.
- * https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Grammar_and_types#variables
- *
- * The monstrosity of regex below is shameful but necessary, I suppose?
- * @param {string} str
- */
-export function is_valid_js_identifier(str) {
-	const regex =
-		/^(?!(?:do|if|in|for|let|new|try|var|case|else|enum|eval|null|this|true|void|with|await|break|catch|class|const|false|super|throw|while|yield|delete|export|import|public|return|static|switch|typeof|default|extends|finally|package|private|continue|debugger|function|arguments|interface|protected|implements|instanceof)$)(?:[\$A-Z_a-z\xAA\xB5\xBA\xC0-\xD6\xD8-\xF6\xF8-\u02C1\u02C6-\u02D1\u02E0-\u02E4\u02EC\u02EE\u0370-\u0374\u0376\u0377\u037A-\u037D\u037F\u0386\u0388-\u038A\u038C\u038E-\u03A1\u03A3-\u03F5\u03F7-\u0481\u048A-\u052F\u0531-\u0556\u0559\u0560-\u0588\u05D0-\u05EA\u05EF-\u05F2\u0620-\u064A\u066E\u066F\u0671-\u06D3\u06D5\u06E5\u06E6\u06EE\u06EF\u06FA-\u06FC\u06FF\u0710\u0712-\u072F\u074D-\u07A5\u07B1\u07CA-\u07EA\u07F4\u07F5\u07FA\u0800-\u0815\u081A\u0824\u0828\u0840-\u0858\u0860-\u086A\u08A0-\u08B4\u08B6-\u08BD\u0904-\u0939\u093D\u0950\u0958-\u0961\u0971-\u0980\u0985-\u098C\u098F\u0990\u0993-\u09A8\u09AA-\u09B0\u09B2\u09B6-\u09B9\u09BD\u09CE\u09DC\u09DD\u09DF-\u09E1\u09F0\u09F1\u09FC\u0A05-\u0A0A\u0A0F\u0A10\u0A13-\u0A28\u0A2A-\u0A30\u0A32\u0A33\u0A35\u0A36\u0A38\u0A39\u0A59-\u0A5C\u0A5E\u0A72-\u0A74\u0A85-\u0A8D\u0A8F-\u0A91\u0A93-\u0AA8\u0AAA-\u0AB0\u0AB2\u0AB3\u0AB5-\u0AB9\u0ABD\u0AD0\u0AE0\u0AE1\u0AF9\u0B05-\u0B0C\u0B0F\u0B10\u0B13-\u0B28\u0B2A-\u0B30\u0B32\u0B33\u0B35-\u0B39\u0B3D\u0B5C\u0B5D\u0B5F-\u0B61\u0B71\u0B83\u0B85-\u0B8A\u0B8E-\u0B90\u0B92-\u0B95\u0B99\u0B9A\u0B9C\u0B9E\u0B9F\u0BA3\u0BA4\u0BA8-\u0BAA\u0BAE-\u0BB9\u0BD0\u0C05-\u0C0C\u0C0E-\u0C10\u0C12-\u0C28\u0C2A-\u0C39\u0C3D\u0C58-\u0C5A\u0C60\u0C61\u0C80\u0C85-\u0C8C\u0C8E-\u0C90\u0C92-\u0CA8\u0CAA-\u0CB3\u0CB5-\u0CB9\u0CBD\u0CDE\u0CE0\u0CE1\u0CF1\u0CF2\u0D05-\u0D0C\u0D0E-\u0D10\u0D12-\u0D3A\u0D3D\u0D4E\u0D54-\u0D56\u0D5F-\u0D61\u0D7A-\u0D7F\u0D85-\u0D96\u0D9A-\u0DB1\u0DB3-\u0DBB\u0DBD\u0DC0-\u0DC6\u0E01-\u0E30\u0E32\u0E33\u0E40-\u0E46\u0E81\u0E82\u0E84\u0E87\u0E88\u0E8A\u0E8D\u0E94-\u0E97\u0E99-\u0E9F\u0EA1-\u0EA3\u0EA5\u0EA7\u0EAA\u0EAB\u0EAD-\u0EB0\u0EB2\u0EB3\u0EBD\u0EC0-\u0EC4\u0EC6\u0EDC-\u0EDF\u0F00\u0F40-\u0F47\u0F49-\u0F6C\u0F88-\u0F8C\u1000-\u102A\u103F\u1050-\u1055\u105A-\u105D\u1061\u1065\u1066\u106E-\u1070\u1075-\u1081\u108E\u10A0-\u10C5\u10C7\u10CD\u10D0-\u10FA\u10FC-\u1248\u124A-\u124D\u1250-\u1256\u1258\u125A-\u125D\u1260-\u1288\u128A-\u128D\u1290-\u12B0\u12B2-\u12B5\u12B8-\u12BE\u12C0\u12C2-\u12C5\u12C8-\u12D6\u12D8-\u1310\u1312-\u1315\u1318-\u135A\u1380-\u138F\u13A0-\u13F5\u13F8-\u13FD\u1401-\u166C\u166F-\u167F\u1681-\u169A\u16A0-\u16EA\u16EE-\u16F8\u1700-\u170C\u170E-\u1711\u1720-\u1731\u1740-\u1751\u1760-\u176C\u176E-\u1770\u1780-\u17B3\u17D7\u17DC\u1820-\u1878\u1880-\u18A8\u18AA\u18B0-\u18F5\u1900-\u191E\u1950-\u196D\u1970-\u1974\u1980-\u19AB\u19B0-\u19C9\u1A00-\u1A16\u1A20-\u1A54\u1AA7\u1B05-\u1B33\u1B45-\u1B4B\u1B83-\u1BA0\u1BAE\u1BAF\u1BBA-\u1BE5\u1C00-\u1C23\u1C4D-\u1C4F\u1C5A-\u1C7D\u1C80-\u1C88\u1C90-\u1CBA\u1CBD-\u1CBF\u1CE9-\u1CEC\u1CEE-\u1CF1\u1CF5\u1CF6\u1D00-\u1DBF\u1E00-\u1F15\u1F18-\u1F1D\u1F20-\u1F45\u1F48-\u1F4D\u1F50-\u1F57\u1F59\u1F5B\u1F5D\u1F5F-\u1F7D\u1F80-\u1FB4\u1FB6-\u1FBC\u1FBE\u1FC2-\u1FC4\u1FC6-\u1FCC\u1FD0-\u1FD3\u1FD6-\u1FDB\u1FE0-\u1FEC\u1FF2-\u1FF4\u1FF6-\u1FFC\u2071\u207F\u2090-\u209C\u2102\u2107\u210A-\u2113\u2115\u2118-\u211D\u2124\u2126\u2128\u212A-\u2139\u213C-\u213F\u2145-\u2149\u214E\u2160-\u2188\u2C00-\u2C2E\u2C30-\u2C5E\u2C60-\u2CE4\u2CEB-\u2CEE\u2CF2\u2CF3\u2D00-\u2D25\u2D27\u2D2D\u2D30-\u2D67\u2D6F\u2D80-\u2D96\u2DA0-\u2DA6\u2DA8-\u2DAE\u2DB0-\u2DB6\u2DB8-\u2DBE\u2DC0-\u2DC6\u2DC8-\u2DCE\u2DD0-\u2DD6\u2DD8-\u2DDE\u3005-\u3007\u3021-\u3029\u3031-\u3035\u3038-\u303C\u3041-\u3096\u309B-\u309F\u30A1-\u30FA\u30FC-\u30FF\u3105-\u312F\u3131-\u318E\u31A0-\u31BA\u31F0-\u31FF\u3400-\u4DB5\u4E00-\u9FEF\uA000-\uA48C\uA4D0-\uA4FD\uA500-\uA60C\uA610-\uA61F\uA62A\uA62B\uA640-\uA66E\uA67F-\uA69D\uA6A0-\uA6EF\uA717-\uA71F\uA722-\uA788\uA78B-\uA7B9\uA7F7-\uA801\uA803-\uA805\uA807-\uA80A\uA80C-\uA822\uA840-\uA873\uA882-\uA8B3\uA8F2-\uA8F7\uA8FB\uA8FD\uA8FE\uA90A-\uA925\uA930-\uA946\uA960-\uA97C\uA984-\uA9B2\uA9CF\uA9E0-\uA9E4\uA9E6-\uA9EF\uA9FA-\uA9FE\uAA00-\uAA28\uAA40-\uAA42\uAA44-\uAA4B\uAA60-\uAA76\uAA7A\uAA7E-\uAAAF\uAAB1\uAAB5\uAAB6\uAAB9-\uAABD\uAAC0\uAAC2\uAADB-\uAADD\uAAE0-\uAAEA\uAAF2-\uAAF4\uAB01-\uAB06\uAB09-\uAB0E\uAB11-\uAB16\uAB20-\uAB26\uAB28-\uAB2E\uAB30-\uAB5A\uAB5C-\uAB65\uAB70-\uABE2\uAC00-\uD7A3\uD7B0-\uD7C6\uD7CB-\uD7FB\uF900-\uFA6D\uFA70-\uFAD9\uFB00-\uFB06\uFB13-\uFB17\uFB1D\uFB1F-\uFB28\uFB2A-\uFB36\uFB38-\uFB3C\uFB3E\uFB40\uFB41\uFB43\uFB44\uFB46-\uFBB1\uFBD3-\uFD3D\uFD50-\uFD8F\uFD92-\uFDC7\uFDF0-\uFDFB\uFE70-\uFE74\uFE76-\uFEFC\uFF21-\uFF3A\uFF41-\uFF5A\uFF66-\uFFBE\uFFC2-\uFFC7\uFFCA-\uFFCF\uFFD2-\uFFD7\uFFDA-\uFFDC]|\uD800[\uDC00-\uDC0B\uDC0D-\uDC26\uDC28-\uDC3A\uDC3C\uDC3D\uDC3F-\uDC4D\uDC50-\uDC5D\uDC80-\uDCFA\uDD40-\uDD74\uDE80-\uDE9C\uDEA0-\uDED0\uDF00-\uDF1F\uDF2D-\uDF4A\uDF50-\uDF75\uDF80-\uDF9D\uDFA0-\uDFC3\uDFC8-\uDFCF\uDFD1-\uDFD5]|\uD801[\uDC00-\uDC9D\uDCB0-\uDCD3\uDCD8-\uDCFB\uDD00-\uDD27\uDD30-\uDD63\uDE00-\uDF36\uDF40-\uDF55\uDF60-\uDF67]|\uD802[\uDC00-\uDC05\uDC08\uDC0A-\uDC35\uDC37\uDC38\uDC3C\uDC3F-\uDC55\uDC60-\uDC76\uDC80-\uDC9E\uDCE0-\uDCF2\uDCF4\uDCF5\uDD00-\uDD15\uDD20-\uDD39\uDD80-\uDDB7\uDDBE\uDDBF\uDE00\uDE10-\uDE13\uDE15-\uDE17\uDE19-\uDE35\uDE60-\uDE7C\uDE80-\uDE9C\uDEC0-\uDEC7\uDEC9-\uDEE4\uDF00-\uDF35\uDF40-\uDF55\uDF60-\uDF72\uDF80-\uDF91]|\uD803[\uDC00-\uDC48\uDC80-\uDCB2\uDCC0-\uDCF2\uDD00-\uDD23\uDF00-\uDF1C\uDF27\uDF30-\uDF45]|\uD804[\uDC03-\uDC37\uDC83-\uDCAF\uDCD0-\uDCE8\uDD03-\uDD26\uDD44\uDD50-\uDD72\uDD76\uDD83-\uDDB2\uDDC1-\uDDC4\uDDDA\uDDDC\uDE00-\uDE11\uDE13-\uDE2B\uDE80-\uDE86\uDE88\uDE8A-\uDE8D\uDE8F-\uDE9D\uDE9F-\uDEA8\uDEB0-\uDEDE\uDF05-\uDF0C\uDF0F\uDF10\uDF13-\uDF28\uDF2A-\uDF30\uDF32\uDF33\uDF35-\uDF39\uDF3D\uDF50\uDF5D-\uDF61]|\uD805[\uDC00-\uDC34\uDC47-\uDC4A\uDC80-\uDCAF\uDCC4\uDCC5\uDCC7\uDD80-\uDDAE\uDDD8-\uDDDB\uDE00-\uDE2F\uDE44\uDE80-\uDEAA\uDF00-\uDF1A]|\uD806[\uDC00-\uDC2B\uDCA0-\uDCDF\uDCFF\uDE00\uDE0B-\uDE32\uDE3A\uDE50\uDE5C-\uDE83\uDE86-\uDE89\uDE9D\uDEC0-\uDEF8]|\uD807[\uDC00-\uDC08\uDC0A-\uDC2E\uDC40\uDC72-\uDC8F\uDD00-\uDD06\uDD08\uDD09\uDD0B-\uDD30\uDD46\uDD60-\uDD65\uDD67\uDD68\uDD6A-\uDD89\uDD98\uDEE0-\uDEF2]|\uD808[\uDC00-\uDF99]|\uD809[\uDC00-\uDC6E\uDC80-\uDD43]|[\uD80C\uD81C-\uD820\uD840-\uD868\uD86A-\uD86C\uD86F-\uD872\uD874-\uD879][\uDC00-\uDFFF]|\uD80D[\uDC00-\uDC2E]|\uD811[\uDC00-\uDE46]|\uD81A[\uDC00-\uDE38\uDE40-\uDE5E\uDED0-\uDEED\uDF00-\uDF2F\uDF40-\uDF43\uDF63-\uDF77\uDF7D-\uDF8F]|\uD81B[\uDE40-\uDE7F\uDF00-\uDF44\uDF50\uDF93-\uDF9F\uDFE0\uDFE1]|\uD821[\uDC00-\uDFF1]|\uD822[\uDC00-\uDEF2]|\uD82C[\uDC00-\uDD1E\uDD70-\uDEFB]|\uD82F[\uDC00-\uDC6A\uDC70-\uDC7C\uDC80-\uDC88\uDC90-\uDC99]|\uD835[\uDC00-\uDC54\uDC56-\uDC9C\uDC9E\uDC9F\uDCA2\uDCA5\uDCA6\uDCA9-\uDCAC\uDCAE-\uDCB9\uDCBB\uDCBD-\uDCC3\uDCC5-\uDD05\uDD07-\uDD0A\uDD0D-\uDD14\uDD16-\uDD1C\uDD1E-\uDD39\uDD3B-\uDD3E\uDD40-\uDD44\uDD46\uDD4A-\uDD50\uDD52-\uDEA5\uDEA8-\uDEC0\uDEC2-\uDEDA\uDEDC-\uDEFA\uDEFC-\uDF14\uDF16-\uDF34\uDF36-\uDF4E\uDF50-\uDF6E\uDF70-\uDF88\uDF8A-\uDFA8\uDFAA-\uDFC2\uDFC4-\uDFCB]|\uD83A[\uDC00-\uDCC4\uDD00-\uDD43]|\uD83B[\uDE00-\uDE03\uDE05-\uDE1F\uDE21\uDE22\uDE24\uDE27\uDE29-\uDE32\uDE34-\uDE37\uDE39\uDE3B\uDE42\uDE47\uDE49\uDE4B\uDE4D-\uDE4F\uDE51\uDE52\uDE54\uDE57\uDE59\uDE5B\uDE5D\uDE5F\uDE61\uDE62\uDE64\uDE67-\uDE6A\uDE6C-\uDE72\uDE74-\uDE77\uDE79-\uDE7C\uDE7E\uDE80-\uDE89\uDE8B-\uDE9B\uDEA1-\uDEA3\uDEA5-\uDEA9\uDEAB-\uDEBB]|\uD869[\uDC00-\uDED6\uDF00-\uDFFF]|\uD86D[\uDC00-\uDF34\uDF40-\uDFFF]|\uD86E[\uDC00-\uDC1D\uDC20-\uDFFF]|\uD873[\uDC00-\uDEA1\uDEB0-\uDFFF]|\uD87A[\uDC00-\uDFE0]|\uD87E[\uDC00-\uDE1D])(?:[\$0-9A-Z_a-z\xAA\xB5\xB7\xBA\xC0-\xD6\xD8-\xF6\xF8-\u02C1\u02C6-\u02D1\u02E0-\u02E4\u02EC\u02EE\u0300-\u0374\u0376\u0377\u037A-\u037D\u037F\u0386-\u038A\u038C\u038E-\u03A1\u03A3-\u03F5\u03F7-\u0481\u0483-\u0487\u048A-\u052F\u0531-\u0556\u0559\u0560-\u0588\u0591-\u05BD\u05BF\u05C1\u05C2\u05C4\u05C5\u05C7\u05D0-\u05EA\u05EF-\u05F2\u0610-\u061A\u0620-\u0669\u066E-\u06D3\u06D5-\u06DC\u06DF-\u06E8\u06EA-\u06FC\u06FF\u0710-\u074A\u074D-\u07B1\u07C0-\u07F5\u07FA\u07FD\u0800-\u082D\u0840-\u085B\u0860-\u086A\u08A0-\u08B4\u08B6-\u08BD\u08D3-\u08E1\u08E3-\u0963\u0966-\u096F\u0971-\u0983\u0985-\u098C\u098F\u0990\u0993-\u09A8\u09AA-\u09B0\u09B2\u09B6-\u09B9\u09BC-\u09C4\u09C7\u09C8\u09CB-\u09CE\u09D7\u09DC\u09DD\u09DF-\u09E3\u09E6-\u09F1\u09FC\u09FE\u0A01-\u0A03\u0A05-\u0A0A\u0A0F\u0A10\u0A13-\u0A28\u0A2A-\u0A30\u0A32\u0A33\u0A35\u0A36\u0A38\u0A39\u0A3C\u0A3E-\u0A42\u0A47\u0A48\u0A4B-\u0A4D\u0A51\u0A59-\u0A5C\u0A5E\u0A66-\u0A75\u0A81-\u0A83\u0A85-\u0A8D\u0A8F-\u0A91\u0A93-\u0AA8\u0AAA-\u0AB0\u0AB2\u0AB3\u0AB5-\u0AB9\u0ABC-\u0AC5\u0AC7-\u0AC9\u0ACB-\u0ACD\u0AD0\u0AE0-\u0AE3\u0AE6-\u0AEF\u0AF9-\u0AFF\u0B01-\u0B03\u0B05-\u0B0C\u0B0F\u0B10\u0B13-\u0B28\u0B2A-\u0B30\u0B32\u0B33\u0B35-\u0B39\u0B3C-\u0B44\u0B47\u0B48\u0B4B-\u0B4D\u0B56\u0B57\u0B5C\u0B5D\u0B5F-\u0B63\u0B66-\u0B6F\u0B71\u0B82\u0B83\u0B85-\u0B8A\u0B8E-\u0B90\u0B92-\u0B95\u0B99\u0B9A\u0B9C\u0B9E\u0B9F\u0BA3\u0BA4\u0BA8-\u0BAA\u0BAE-\u0BB9\u0BBE-\u0BC2\u0BC6-\u0BC8\u0BCA-\u0BCD\u0BD0\u0BD7\u0BE6-\u0BEF\u0C00-\u0C0C\u0C0E-\u0C10\u0C12-\u0C28\u0C2A-\u0C39\u0C3D-\u0C44\u0C46-\u0C48\u0C4A-\u0C4D\u0C55\u0C56\u0C58-\u0C5A\u0C60-\u0C63\u0C66-\u0C6F\u0C80-\u0C83\u0C85-\u0C8C\u0C8E-\u0C90\u0C92-\u0CA8\u0CAA-\u0CB3\u0CB5-\u0CB9\u0CBC-\u0CC4\u0CC6-\u0CC8\u0CCA-\u0CCD\u0CD5\u0CD6\u0CDE\u0CE0-\u0CE3\u0CE6-\u0CEF\u0CF1\u0CF2\u0D00-\u0D03\u0D05-\u0D0C\u0D0E-\u0D10\u0D12-\u0D44\u0D46-\u0D48\u0D4A-\u0D4E\u0D54-\u0D57\u0D5F-\u0D63\u0D66-\u0D6F\u0D7A-\u0D7F\u0D82\u0D83\u0D85-\u0D96\u0D9A-\u0DB1\u0DB3-\u0DBB\u0DBD\u0DC0-\u0DC6\u0DCA\u0DCF-\u0DD4\u0DD6\u0DD8-\u0DDF\u0DE6-\u0DEF\u0DF2\u0DF3\u0E01-\u0E3A\u0E40-\u0E4E\u0E50-\u0E59\u0E81\u0E82\u0E84\u0E87\u0E88\u0E8A\u0E8D\u0E94-\u0E97\u0E99-\u0E9F\u0EA1-\u0EA3\u0EA5\u0EA7\u0EAA\u0EAB\u0EAD-\u0EB9\u0EBB-\u0EBD\u0EC0-\u0EC4\u0EC6\u0EC8-\u0ECD\u0ED0-\u0ED9\u0EDC-\u0EDF\u0F00\u0F18\u0F19\u0F20-\u0F29\u0F35\u0F37\u0F39\u0F3E-\u0F47\u0F49-\u0F6C\u0F71-\u0F84\u0F86-\u0F97\u0F99-\u0FBC\u0FC6\u1000-\u1049\u1050-\u109D\u10A0-\u10C5\u10C7\u10CD\u10D0-\u10FA\u10FC-\u1248\u124A-\u124D\u1250-\u1256\u1258\u125A-\u125D\u1260-\u1288\u128A-\u128D\u1290-\u12B0\u12B2-\u12B5\u12B8-\u12BE\u12C0\u12C2-\u12C5\u12C8-\u12D6\u12D8-\u1310\u1312-\u1315\u1318-\u135A\u135D-\u135F\u1369-\u1371\u1380-\u138F\u13A0-\u13F5\u13F8-\u13FD\u1401-\u166C\u166F-\u167F\u1681-\u169A\u16A0-\u16EA\u16EE-\u16F8\u1700-\u170C\u170E-\u1714\u1720-\u1734\u1740-\u1753\u1760-\u176C\u176E-\u1770\u1772\u1773\u1780-\u17D3\u17D7\u17DC\u17DD\u17E0-\u17E9\u180B-\u180D\u1810-\u1819\u1820-\u1878\u1880-\u18AA\u18B0-\u18F5\u1900-\u191E\u1920-\u192B\u1930-\u193B\u1946-\u196D\u1970-\u1974\u1980-\u19AB\u19B0-\u19C9\u19D0-\u19DA\u1A00-\u1A1B\u1A20-\u1A5E\u1A60-\u1A7C\u1A7F-\u1A89\u1A90-\u1A99\u1AA7\u1AB0-\u1ABD\u1B00-\u1B4B\u1B50-\u1B59\u1B6B-\u1B73\u1B80-\u1BF3\u1C00-\u1C37\u1C40-\u1C49\u1C4D-\u1C7D\u1C80-\u1C88\u1C90-\u1CBA\u1CBD-\u1CBF\u1CD0-\u1CD2\u1CD4-\u1CF9\u1D00-\u1DF9\u1DFB-\u1F15\u1F18-\u1F1D\u1F20-\u1F45\u1F48-\u1F4D\u1F50-\u1F57\u1F59\u1F5B\u1F5D\u1F5F-\u1F7D\u1F80-\u1FB4\u1FB6-\u1FBC\u1FBE\u1FC2-\u1FC4\u1FC6-\u1FCC\u1FD0-\u1FD3\u1FD6-\u1FDB\u1FE0-\u1FEC\u1FF2-\u1FF4\u1FF6-\u1FFC\u200C\u200D\u203F\u2040\u2054\u2071\u207F\u2090-\u209C\u20D0-\u20DC\u20E1\u20E5-\u20F0\u2102\u2107\u210A-\u2113\u2115\u2118-\u211D\u2124\u2126\u2128\u212A-\u2139\u213C-\u213F\u2145-\u2149\u214E\u2160-\u2188\u2C00-\u2C2E\u2C30-\u2C5E\u2C60-\u2CE4\u2CEB-\u2CF3\u2D00-\u2D25\u2D27\u2D2D\u2D30-\u2D67\u2D6F\u2D7F-\u2D96\u2DA0-\u2DA6\u2DA8-\u2DAE\u2DB0-\u2DB6\u2DB8-\u2DBE\u2DC0-\u2DC6\u2DC8-\u2DCE\u2DD0-\u2DD6\u2DD8-\u2DDE\u2DE0-\u2DFF\u3005-\u3007\u3021-\u302F\u3031-\u3035\u3038-\u303C\u3041-\u3096\u3099-\u309F\u30A1-\u30FA\u30FC-\u30FF\u3105-\u312F\u3131-\u318E\u31A0-\u31BA\u31F0-\u31FF\u3400-\u4DB5\u4E00-\u9FEF\uA000-\uA48C\uA4D0-\uA4FD\uA500-\uA60C\uA610-\uA62B\uA640-\uA66F\uA674-\uA67D\uA67F-\uA6F1\uA717-\uA71F\uA722-\uA788\uA78B-\uA7B9\uA7F7-\uA827\uA840-\uA873\uA880-\uA8C5\uA8D0-\uA8D9\uA8E0-\uA8F7\uA8FB\uA8FD-\uA92D\uA930-\uA953\uA960-\uA97C\uA980-\uA9C0\uA9CF-\uA9D9\uA9E0-\uA9FE\uAA00-\uAA36\uAA40-\uAA4D\uAA50-\uAA59\uAA60-\uAA76\uAA7A-\uAAC2\uAADB-\uAADD\uAAE0-\uAAEF\uAAF2-\uAAF6\uAB01-\uAB06\uAB09-\uAB0E\uAB11-\uAB16\uAB20-\uAB26\uAB28-\uAB2E\uAB30-\uAB5A\uAB5C-\uAB65\uAB70-\uABEA\uABEC\uABED\uABF0-\uABF9\uAC00-\uD7A3\uD7B0-\uD7C6\uD7CB-\uD7FB\uF900-\uFA6D\uFA70-\uFAD9\uFB00-\uFB06\uFB13-\uFB17\uFB1D-\uFB28\uFB2A-\uFB36\uFB38-\uFB3C\uFB3E\uFB40\uFB41\uFB43\uFB44\uFB46-\uFBB1\uFBD3-\uFD3D\uFD50-\uFD8F\uFD92-\uFDC7\uFDF0-\uFDFB\uFE00-\uFE0F\uFE20-\uFE2F\uFE33\uFE34\uFE4D-\uFE4F\uFE70-\uFE74\uFE76-\uFEFC\uFF10-\uFF19\uFF21-\uFF3A\uFF3F\uFF41-\uFF5A\uFF66-\uFFBE\uFFC2-\uFFC7\uFFCA-\uFFCF\uFFD2-\uFFD7\uFFDA-\uFFDC]|\uD800[\uDC00-\uDC0B\uDC0D-\uDC26\uDC28-\uDC3A\uDC3C\uDC3D\uDC3F-\uDC4D\uDC50-\uDC5D\uDC80-\uDCFA\uDD40-\uDD74\uDDFD\uDE80-\uDE9C\uDEA0-\uDED0\uDEE0\uDF00-\uDF1F\uDF2D-\uDF4A\uDF50-\uDF7A\uDF80-\uDF9D\uDFA0-\uDFC3\uDFC8-\uDFCF\uDFD1-\uDFD5]|\uD801[\uDC00-\uDC9D\uDCA0-\uDCA9\uDCB0-\uDCD3\uDCD8-\uDCFB\uDD00-\uDD27\uDD30-\uDD63\uDE00-\uDF36\uDF40-\uDF55\uDF60-\uDF67]|\uD802[\uDC00-\uDC05\uDC08\uDC0A-\uDC35\uDC37\uDC38\uDC3C\uDC3F-\uDC55\uDC60-\uDC76\uDC80-\uDC9E\uDCE0-\uDCF2\uDCF4\uDCF5\uDD00-\uDD15\uDD20-\uDD39\uDD80-\uDDB7\uDDBE\uDDBF\uDE00-\uDE03\uDE05\uDE06\uDE0C-\uDE13\uDE15-\uDE17\uDE19-\uDE35\uDE38-\uDE3A\uDE3F\uDE60-\uDE7C\uDE80-\uDE9C\uDEC0-\uDEC7\uDEC9-\uDEE6\uDF00-\uDF35\uDF40-\uDF55\uDF60-\uDF72\uDF80-\uDF91]|\uD803[\uDC00-\uDC48\uDC80-\uDCB2\uDCC0-\uDCF2\uDD00-\uDD27\uDD30-\uDD39\uDF00-\uDF1C\uDF27\uDF30-\uDF50]|\uD804[\uDC00-\uDC46\uDC66-\uDC6F\uDC7F-\uDCBA\uDCD0-\uDCE8\uDCF0-\uDCF9\uDD00-\uDD34\uDD36-\uDD3F\uDD44-\uDD46\uDD50-\uDD73\uDD76\uDD80-\uDDC4\uDDC9-\uDDCC\uDDD0-\uDDDA\uDDDC\uDE00-\uDE11\uDE13-\uDE37\uDE3E\uDE80-\uDE86\uDE88\uDE8A-\uDE8D\uDE8F-\uDE9D\uDE9F-\uDEA8\uDEB0-\uDEEA\uDEF0-\uDEF9\uDF00-\uDF03\uDF05-\uDF0C\uDF0F\uDF10\uDF13-\uDF28\uDF2A-\uDF30\uDF32\uDF33\uDF35-\uDF39\uDF3B-\uDF44\uDF47\uDF48\uDF4B-\uDF4D\uDF50\uDF57\uDF5D-\uDF63\uDF66-\uDF6C\uDF70-\uDF74]|\uD805[\uDC00-\uDC4A\uDC50-\uDC59\uDC5E\uDC80-\uDCC5\uDCC7\uDCD0-\uDCD9\uDD80-\uDDB5\uDDB8-\uDDC0\uDDD8-\uDDDD\uDE00-\uDE40\uDE44\uDE50-\uDE59\uDE80-\uDEB7\uDEC0-\uDEC9\uDF00-\uDF1A\uDF1D-\uDF2B\uDF30-\uDF39]|\uD806[\uDC00-\uDC3A\uDCA0-\uDCE9\uDCFF\uDE00-\uDE3E\uDE47\uDE50-\uDE83\uDE86-\uDE99\uDE9D\uDEC0-\uDEF8]|\uD807[\uDC00-\uDC08\uDC0A-\uDC36\uDC38-\uDC40\uDC50-\uDC59\uDC72-\uDC8F\uDC92-\uDCA7\uDCA9-\uDCB6\uDD00-\uDD06\uDD08\uDD09\uDD0B-\uDD36\uDD3A\uDD3C\uDD3D\uDD3F-\uDD47\uDD50-\uDD59\uDD60-\uDD65\uDD67\uDD68\uDD6A-\uDD8E\uDD90\uDD91\uDD93-\uDD98\uDDA0-\uDDA9\uDEE0-\uDEF6]|\uD808[\uDC00-\uDF99]|\uD809[\uDC00-\uDC6E\uDC80-\uDD43]|[\uD80C\uD81C-\uD820\uD840-\uD868\uD86A-\uD86C\uD86F-\uD872\uD874-\uD879][\uDC00-\uDFFF]|\uD80D[\uDC00-\uDC2E]|\uD811[\uDC00-\uDE46]|\uD81A[\uDC00-\uDE38\uDE40-\uDE5E\uDE60-\uDE69\uDED0-\uDEED\uDEF0-\uDEF4\uDF00-\uDF36\uDF40-\uDF43\uDF50-\uDF59\uDF63-\uDF77\uDF7D-\uDF8F]|\uD81B[\uDE40-\uDE7F\uDF00-\uDF44\uDF50-\uDF7E\uDF8F-\uDF9F\uDFE0\uDFE1]|\uD821[\uDC00-\uDFF1]|\uD822[\uDC00-\uDEF2]|\uD82C[\uDC00-\uDD1E\uDD70-\uDEFB]|\uD82F[\uDC00-\uDC6A\uDC70-\uDC7C\uDC80-\uDC88\uDC90-\uDC99\uDC9D\uDC9E]|\uD834[\uDD65-\uDD69\uDD6D-\uDD72\uDD7B-\uDD82\uDD85-\uDD8B\uDDAA-\uDDAD\uDE42-\uDE44]|\uD835[\uDC00-\uDC54\uDC56-\uDC9C\uDC9E\uDC9F\uDCA2\uDCA5\uDCA6\uDCA9-\uDCAC\uDCAE-\uDCB9\uDCBB\uDCBD-\uDCC3\uDCC5-\uDD05\uDD07-\uDD0A\uDD0D-\uDD14\uDD16-\uDD1C\uDD1E-\uDD39\uDD3B-\uDD3E\uDD40-\uDD44\uDD46\uDD4A-\uDD50\uDD52-\uDEA5\uDEA8-\uDEC0\uDEC2-\uDEDA\uDEDC-\uDEFA\uDEFC-\uDF14\uDF16-\uDF34\uDF36-\uDF4E\uDF50-\uDF6E\uDF70-\uDF88\uDF8A-\uDFA8\uDFAA-\uDFC2\uDFC4-\uDFCB\uDFCE-\uDFFF]|\uD836[\uDE00-\uDE36\uDE3B-\uDE6C\uDE75\uDE84\uDE9B-\uDE9F\uDEA1-\uDEAF]|\uD838[\uDC00-\uDC06\uDC08-\uDC18\uDC1B-\uDC21\uDC23\uDC24\uDC26-\uDC2A]|\uD83A[\uDC00-\uDCC4\uDCD0-\uDCD6\uDD00-\uDD4A\uDD50-\uDD59]|\uD83B[\uDE00-\uDE03\uDE05-\uDE1F\uDE21\uDE22\uDE24\uDE27\uDE29-\uDE32\uDE34-\uDE37\uDE39\uDE3B\uDE42\uDE47\uDE49\uDE4B\uDE4D-\uDE4F\uDE51\uDE52\uDE54\uDE57\uDE59\uDE5B\uDE5D\uDE5F\uDE61\uDE62\uDE64\uDE67-\uDE6A\uDE6C-\uDE72\uDE74-\uDE77\uDE79-\uDE7C\uDE7E\uDE80-\uDE89\uDE8B-\uDE9B\uDEA1-\uDEA3\uDEA5-\uDEA9\uDEAB-\uDEBB]|\uD869[\uDC00-\uDED6\uDF00-\uDFFF]|\uD86D[\uDC00-\uDF34\uDF40-\uDFFF]|\uD86E[\uDC00-\uDC1D\uDC20-\uDFFF]|\uD873[\uDC00-\uDEA1\uDEB0-\uDFFF]|\uD87A[\uDC00-\uDFE0]|\uD87E[\uDC00-\uDE1D]|\uDB40[\uDD00-\uDDEF])*$/;
-	return regex.test(str);
-}
+export const reserved = new Set([
+	'do',
+	'if',
+	'in',
+	'for',
+	'let',
+	'new',
+	'try',
+	'var',
+	'case',
+	'else',
+	'enum',
+	'eval',
+	'null',
+	'this',
+	'true',
+	'void',
+	'with',
+	'await',
+	'break',
+	'catch',
+	'class',
+	'const',
+	'false',
+	'super',
+	'throw',
+	'while',
+	'yield',
+	'delete',
+	'export',
+	'import',
+	'public',
+	'return',
+	'static',
+	'switch',
+	'typeof',
+	'default',
+	'extends',
+	'finally',
+	'package',
+	'private',
+	'continue',
+	'debugger',
+	'function',
+	'arguments',
+	'interface',
+	'protected',
+	'implements',
+	'instanceof'
+]);
+
+export const valid_identifier = /^[a-zA-Z_$][a-zA-Z0-9_$]*$/;
diff --git a/packages/kit/src/core/sync/write_env.js b/packages/kit/src/core/sync/write_env.js
index 3161fd38e023..1874224c7adf 100644
--- a/packages/kit/src/core/sync/write_env.js
+++ b/packages/kit/src/core/sync/write_env.js
@@ -1,6 +1,6 @@
 import path from 'path';
 import { get_env } from '../../vite/utils.js';
-import { write_if_changed, is_valid_js_identifier } from './utils.js';
+import { write_if_changed, reserved, valid_identifier } from './utils.js';
 
 const autogen_comment = '// this file is generated — do not edit it\n';
 
@@ -42,10 +42,20 @@ export function write_env(config, mode) {
  */
 function create_module(id, env) {
 	const declarations = Object.entries(env)
-		.filter(([k]) => is_valid_js_identifier(k))
-		.map(
-			([k, v]) => `/** @type {import('${id}'}').${k}} */\nexport const ${k} = ${JSON.stringify(v)};`
-		)
+		.filter(([k]) => valid_identifier.test(k))
+		.map(([k, v]) => {
+			const comment = `/** @type {import('${id}'}').${k}} */`;
+
+			if (reserved.has(k)) {
+				let i = 1;
+				while (k + i in env) i++;
+				const name = k + 1;
+
+				return `${comment}\nconst ${name} = ${JSON.stringify(v)}; export { ${name} as ${k} }`;
+			}
+
+			return `${comment}\nexport const ${k} = ${JSON.stringify(v)};`;
+		})
 		.join('\n\n');
 
 	return autogen_comment + declarations;
@@ -58,7 +68,7 @@ function create_module(id, env) {
  */
 function create_types(id, env) {
 	const declarations = Object.keys(env)
-		.filter((k) => is_valid_js_identifier(k))
+		.filter((k) => valid_identifier.test(k))
 		.map((k) => `\texport const ${k}: string;`)
 		.join('\n');
 

From a08d383c9a86adcc2a06abdb7767c1a15664d3a0 Mon Sep 17 00:00:00 2001
From: Rich Harris <hello@rich-harris.dev>
Date: Mon, 25 Jul 2022 18:49:01 -0400
Subject: [PATCH 76/95] move types/ambient.d.ts to ambient.d.ts so it doesnt
 get nuked on update

---
 packages/kit/src/core/sync/write_env.js      | 2 +-
 packages/kit/src/core/sync/write_tsconfig.js | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/kit/src/core/sync/write_env.js b/packages/kit/src/core/sync/write_env.js
index 1874224c7adf..45a2e336b5bd 100644
--- a/packages/kit/src/core/sync/write_env.js
+++ b/packages/kit/src/core/sync/write_env.js
@@ -27,7 +27,7 @@ export function write_env(config, mode) {
 	);
 
 	write_if_changed(
-		path.join(config.outDir, 'types/ambient.d.ts'),
+		path.join(config.outDir, 'ambient.d.ts'),
 		autogen_comment +
 			create_types('$env/static/public', env.public) +
 			'\n\n' +
diff --git a/packages/kit/src/core/sync/write_tsconfig.js b/packages/kit/src/core/sync/write_tsconfig.js
index c75cce8e5adc..e93d60e4cd7e 100644
--- a/packages/kit/src/core/sync/write_tsconfig.js
+++ b/packages/kit/src/core/sync/write_tsconfig.js
@@ -24,7 +24,7 @@ export function write_tsconfig(config, cwd = process.cwd()) {
 	/** @param {string} file */
 	const config_relative = (file) => posixify(path.relative(config.outDir, file));
 
-	const include = ['types/ambient.d.ts'];
+	const include = ['ambient.d.ts'];
 	for (const dir of [config.files.routes, config.files.lib]) {
 		const relative = project_relative(path.dirname(dir));
 		include.push(config_relative(`${relative}/**/*.js`));
@@ -73,7 +73,7 @@ export function write_tsconfig(config, cwd = process.cwd()) {
 					target: 'esnext'
 				},
 				include,
-				exclude: [config_relative('node_modules/**'), './[!types/ambient.d.ts]**']
+				exclude: [config_relative('node_modules/**'), './[!ambient.d.ts]**']
 			},
 			null,
 			'\t'

From d2b10d96606548f16f962880b47b197781d497a4 Mon Sep 17 00:00:00 2001
From: Rich Harris <hello@rich-harris.dev>
Date: Mon, 25 Jul 2022 20:06:03 -0400
Subject: [PATCH 77/95] Update documentation/docs/15-configuration.md

Co-authored-by: Ben McCann <322311+benmccann@users.noreply.github.com>
---
 documentation/docs/15-configuration.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/documentation/docs/15-configuration.md b/documentation/docs/15-configuration.md
index af141405b4a6..6bd606854ec2 100644
--- a/documentation/docs/15-configuration.md
+++ b/documentation/docs/15-configuration.md
@@ -164,7 +164,7 @@ When pages are prerendered, the CSP header is added via a `<meta http-equiv>` ta
 
 Environment variable configuration:
 
-- `publicPrefix` — a prefix that signals that an environment variable is safe to expose to client-side code. See [`$env/static/public`](/docs/modules#$env-static-public) and [`$env/dynamic/public`](/docs/modules#$env-dynamic-public)
+- `publicPrefix` — a prefix that signals that an environment variable is safe to expose to client-side code. See [`$env/static/public`](/docs/modules#$env-static-public) and [`$env/dynamic/public`](/docs/modules#$env-dynamic-public). Note that Vite's [`envPrefix`](https://vitejs.dev/config/shared-options.html#envprefix) must be set separately if you are using Vite's environment variable handling - though use of that feature should generally be unnecessary.
 
 ### files
 

From 5253136a616051f6dcc781aeff75035848266092 Mon Sep 17 00:00:00 2001
From: Rich Harris <hello@rich-harris.dev>
Date: Mon, 25 Jul 2022 20:06:43 -0400
Subject: [PATCH 78/95] remove env vars FAQ

---
 documentation/faq/60-env-vars.md                           | 7 -------
 .../{65-read-package-json.md => 60-read-package-json.md}   | 0
 2 files changed, 7 deletions(-)
 delete mode 100644 documentation/faq/60-env-vars.md
 rename documentation/faq/{65-read-package-json.md => 60-read-package-json.md} (100%)

diff --git a/documentation/faq/60-env-vars.md b/documentation/faq/60-env-vars.md
deleted file mode 100644
index 03c0701b60d0..000000000000
--- a/documentation/faq/60-env-vars.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-title: How do I use environment variables?
----
-
-Environment variables are [loaded by Vite](https://vitejs.dev/guide/env-and-mode.html#env-files) from `.env` files and `process.env` during dev and build. These are available to your app via the [`$env/static/private`](/docs/modules#$env-static-private) and [`$env/static/public`](/docs/modules#$env-static-public) modules. Public variables — i.e. those that are safe to expose to users — must use a [prefix](/docs/configuration#kit-env-publicprefix) that defaults to `PUBLIC_`. Private variables cannot be imported into client-side code.
-
-For environment variables that are not known at build time, you can use [`$env/dynamic/private`](/docs/modules#$env-dynamic-private) and [`$env/dynamic/public`](/docs/modules#$env-dynamic-public).
diff --git a/documentation/faq/65-read-package-json.md b/documentation/faq/60-read-package-json.md
similarity index 100%
rename from documentation/faq/65-read-package-json.md
rename to documentation/faq/60-read-package-json.md

From 2d203dbb860afa25012fdba89b2545d1b4db0f05 Mon Sep 17 00:00:00 2001
From: "S. Elliott Johnson" <sejohnson@torchcloudconsulting.com>
Date: Tue, 26 Jul 2022 00:56:26 -0600
Subject: [PATCH 79/95] feat: Testing for import analysis

---
 packages/kit/src/vite/dev/index.js  |  42 +-------
 packages/kit/src/vite/index.js      |  36 +++----
 packages/kit/src/vite/utils.js      | 109 ++++++++++++++++++--
 packages/kit/src/vite/utils.spec.js | 154 +++++++++++++++++++++++++++-
 packages/kit/types/internal.d.ts    |   5 +
 5 files changed, 273 insertions(+), 73 deletions(-)

diff --git a/packages/kit/src/vite/dev/index.js b/packages/kit/src/vite/dev/index.js
index 66eebe64701d..0b967136efe1 100644
--- a/packages/kit/src/vite/dev/index.js
+++ b/packages/kit/src/vite/dev/index.js
@@ -12,7 +12,7 @@ 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 { format_illegal_import_chain, get_env, resolve_entry } from '../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
 // https://github.com/vitejs/vite/blob/3edd1af56e980aef56641a5a51cf2932bb580d41/packages/vite/src/node/plugins/css.ts#L96
@@ -64,7 +64,7 @@ export async function dev(vite, vite_config, svelte_config, illegal_imports) {
 						const node = await vite.moduleGraph.getModuleByUrl(url);
 						if (!node) throw new Error(`Could not find node for ${url}`);
 
-						prevent_illegal_imports(node, svelte_config.kit, illegal_imports);
+						prevent_illegal_vite_imports(node, illegal_imports, svelte_config.kit.outDir);
 
 						return {
 							module,
@@ -469,44 +469,6 @@ async function find_deps(vite, node, deps) {
 	await Promise.all(branches);
 }
 
-/**
- * Throw an error if a private module is imported from a client-side node.
- * @param {import('vite').ModuleNode} node
- * @param {import('types').ValidatedKitConfig} config
- * @param {Set<string>} illegal_imports
- */
-export function prevent_illegal_imports(node, config, illegal_imports) {
-	const seen = new Set();
-
-	/**
-	 * @param {import('vite').ModuleNode} node
-	 * @returns {string[] | null}
-	 */
-	function find(node) {
-		if (!node.id) return null; // TODO when does this happen?
-
-		if (seen.has(node.id)) return null;
-		seen.add(node.id);
-
-		if (node.id && illegal_imports.has(node.id)) {
-			return [node.id];
-		}
-
-		for (const child of node.importedModules) {
-			const chain = child && find(child);
-			if (chain) return [node.id, ...chain];
-		}
-
-		return null;
-	}
-
-	const chain = find(node);
-
-	if (chain) {
-		throw new Error(format_illegal_import_chain(chain, config));
-	}
-}
-
 /**
  * Determine if a file is being requested with the correct case,
  * to ensure consistent behaviour between dev and prod and across
diff --git a/packages/kit/src/vite/index.js b/packages/kit/src/vite/index.js
index 79fea487d990..45ab59cf5c93 100644
--- a/packages/kit/src/vite/index.js
+++ b/packages/kit/src/vite/index.js
@@ -14,7 +14,12 @@ import { generate_manifest } from '../core/generate_manifest/index.js';
 import { get_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, format_illegal_import_chain } from './utils.js';
+import {
+	get_aliases,
+	resolve_entry,
+	format_illegal_import_chain,
+	prevent_illegal_rollup_imports
+} from './utils.js';
 import { fileURLToPath } from 'node:url';
 
 const cwd = process.cwd();
@@ -282,34 +287,17 @@ function kit() {
 		 * then use this hook to kick off builds for the server and service worker.
 		 */
 		async writeBundle(_options, bundle) {
-			const seen = new Set();
-
-			/**
-			 * @param {import('rollup').ModuleInfo} node
-			 * @returns {string[] | undefined}
-			 */
-			const find_illegal_imports = (node) => {
-				if (seen.has(node.id)) return;
-				seen.add(node.id);
-
-				if (illegal_imports.has(node.id)) {
-					return [node.id];
-				}
-
-				for (const id of [...node.importedIds, ...node.dynamicallyImportedIds]) {
-					const child = this.getModuleInfo(id);
-					const chain = child && find_illegal_imports(child);
-					if (chain) return [node.id, ...chain];
-				}
-			};
-
 			for (const file of manifest_data.components) {
 				const id = path.resolve(file);
 				const node = this.getModuleInfo(id);
 
 				if (node) {
-					const chain = find_illegal_imports(node);
-					if (chain) throw new Error(format_illegal_import_chain(chain, svelte_config.kit));
+					prevent_illegal_rollup_imports(
+						this.getModuleInfo.bind(this),
+						node,
+						illegal_imports,
+						svelte_config.kit.outDir
+					);
 				}
 			}
 
diff --git a/packages/kit/src/vite/utils.js b/packages/kit/src/vite/utils.js
index 19241ee54c82..c09348c1c72f 100644
--- a/packages/kit/src/vite/utils.js
+++ b/packages/kit/src/vite/utils.js
@@ -159,20 +159,28 @@ function repeat(str, times) {
 }
 /**
  * Create a formatted error for an illegal import.
- * @param {Array<string>} stack
- * @param {import('types').ValidatedKitConfig} config
+ * @param {Array<{name: string, dynamic: boolean}>} stack
+ * @param {string} out_dir
+ * The directory specified by config.kit.outDir.
  */
-export function format_illegal_import_chain(stack, config) {
-	const app = path.join(config.outDir, 'runtime/app');
+export function format_illegal_import_chain(stack, out_dir) {
+	const app = path.join(out_dir, 'runtime/env');
 
 	stack = stack.map((file) => {
-		if (file.startsWith(app)) return file.replace(app, '$app');
-		return path.relative(process.cwd(), file);
+		if (file.name.startsWith(app)) return { ...file, name: file.name.replace(app, '$env') };
+		return { ...file, name: path.relative(process.cwd(), file.name) };
 	});
 
-	const pyramid = stack.map((file, i) => `${repeat(' ', i * 2)}- ${file}`).join('\n');
+	const pyramid = stack
+		.map(
+			(file, i) =>
+				`${repeat(' ', i * 2)}- ${file.name} ${
+					file.dynamic ? '(imported by parent dynamically)' : ''
+				}`
+		)
+		.join('\n');
 
-	return `Cannot import ${stack.at(-1)} into client-side code:\n${pyramid}`;
+	return `Cannot import ${stack.at(-1)?.name} into client-side code:\n${pyramid}`;
 }
 
 /**
@@ -188,3 +196,88 @@ export function get_env(mode, prefix) {
 		private: Object.fromEntries(entries.filter(([k]) => !k.startsWith(prefix)))
 	};
 }
+
+/**
+ * @param {(id: string) => import('rollup').ModuleInfo | null} node_getter
+ * @param {import('rollup').ModuleInfo} node
+ * @param {Set<string>} illegal_imports
+ * @param {string} out_dir
+ * The directory specified by config.kit.outDir.
+ */
+export function prevent_illegal_rollup_imports(node_getter, node, illegal_imports, out_dir) {
+	const chain = find_illegal_rollup_imports(node_getter, node, false, illegal_imports);
+	if (chain) throw new Error(format_illegal_import_chain(chain, out_dir));
+}
+
+/**
+ * @param {(id: string) => import('rollup').ModuleInfo | null} node_getter
+ * @param {import('rollup').ModuleInfo} node
+ * @param {boolean} dynamic
+ * @param {Set<string>} illegal_imports
+ * @param {Set<string>} seen
+ * @returns {Array<import('types').ImportNode> | undefined}
+ */
+const find_illegal_rollup_imports = (
+	node_getter,
+	node,
+	dynamic,
+	illegal_imports,
+	seen = new Set()
+) => {
+	if (seen.has(node.id)) return;
+	seen.add(node.id);
+
+	if (illegal_imports.has(node.id)) {
+		return [{ name: node.id, dynamic }];
+	}
+
+	for (const id of node.importedIds) {
+		const child = node_getter(id);
+		const chain =
+			child && find_illegal_rollup_imports(node_getter, child, false, illegal_imports, seen);
+		if (chain) return [{ name: node.id, dynamic }, ...chain];
+	}
+
+	for (const id of node.dynamicallyImportedIds) {
+		const child = node_getter(id);
+		const chain =
+			child && find_illegal_rollup_imports(node_getter, child, true, illegal_imports, seen);
+		if (chain) return [{ name: node.id, dynamic }, ...chain];
+	}
+};
+
+/**
+ * Throw an error if a private module is imported from a client-side node.
+ * @param {import('vite').ModuleNode} node
+ * @param {Set<string>} illegal_imports
+ * @param {string} out_dir
+ * The directory specified by config.kit.outDir.
+ */
+export function prevent_illegal_vite_imports(node, illegal_imports, out_dir) {
+	const chain = find_illegal_vite_imports(node, illegal_imports);
+	if (chain) throw new Error(format_illegal_import_chain(chain, out_dir));
+}
+
+/**
+ * @param {import('vite').ModuleNode} node
+ * @param {Set<string>} illegal_imports
+ * @param {Set<string>} seen
+ * @returns {Array<import('types').ImportNode> | null}
+ */
+function find_illegal_vite_imports(node, illegal_imports, seen = new Set()) {
+	if (!node.id) return null; // TODO when does this happen?
+
+	if (seen.has(node.id)) return null;
+	seen.add(node.id);
+
+	if (node.id && illegal_imports.has(node.id)) {
+		return [{ name: node.id, dynamic: false }];
+	}
+
+	for (const child of node.importedModules) {
+		const chain = child && find_illegal_vite_imports(child, illegal_imports, seen);
+		if (chain) return [{ name: node.id, dynamic: false }, ...chain];
+	}
+
+	return null;
+}
diff --git a/packages/kit/src/vite/utils.spec.js b/packages/kit/src/vite/utils.spec.js
index 46146aa83b94..e0899957b3f3 100644
--- a/packages/kit/src/vite/utils.spec.js
+++ b/packages/kit/src/vite/utils.spec.js
@@ -1,6 +1,12 @@
+import { rollup } from 'rollup';
 import { test } from 'uvu';
 import * as assert from 'uvu/assert';
-import { deep_merge, merge_vite_configs } from './utils.js';
+import {
+	deep_merge,
+	merge_vite_configs,
+	prevent_illegal_rollup_imports,
+	prevent_illegal_vite_imports
+} from './utils.js';
 
 test('basic test no conflicts', async () => {
 	const merged = deep_merge(
@@ -195,4 +201,150 @@ test('merge resolve.alias', () => {
 	});
 });
 
+/** @typedef {{id: string, importedIds: Array<string>, dynamicallyImportedIds: Array<string> }} RollupNode */
+
+/** @type {(id: string) => RollupNode | null} */
+const rollup_node_getter = (id) => {
+	/** @type {{[key: string]: RollupNode}} */
+	const nodes = {
+		'/test/path1.js': {
+			id: '/test/path1.js',
+			importedIds: ['/test/path2.js', '/test/path3.js'],
+			dynamicallyImportedIds: ['/test/path4.js', '/test/path5.js']
+		},
+		'/test/path2.js': {
+			id: '/test/path2.js',
+			importedIds: ['/test/path3.js'],
+			dynamicallyImportedIds: ['/test/path5.js']
+		},
+		'/test/path3.js': {
+			id: '/test/path3.js',
+			importedIds: ['/test/path5.js'],
+			dynamicallyImportedIds: ['/test/path1.js']
+		},
+		'/test/path4.js': {
+			id: '/test/path4.js',
+			importedIds: ['/test/path5.js'],
+			dynamicallyImportedIds: ['/test/path3.js']
+		},
+		'/test/path5.js': {
+			id: '/test/path5.js',
+			importedIds: ['/test/path1.js'],
+			dynamicallyImportedIds: ['/test/path3.js']
+		},
+		'/bad/static.js': {
+			id: '/bad/static.js',
+			importedIds: ['/statically-imports/bad/module.js'],
+			dynamicallyImportedIds: ['/test/path1.js']
+		},
+		'/statically-imports/bad/module.js': {
+			id: '/statically-imports/bad/module.js',
+			importedIds: ['/illegal/boom.js'],
+			dynamicallyImportedIds: ['/test/path2.js']
+		},
+		'/bad/dynamic.js': {
+			id: '/bad/dynamic.js',
+			importedIds: ['/dynamically-imports/bad/module.js'],
+			dynamicallyImportedIds: ['/test/path1.js']
+		},
+		'/dynamically-imports/bad/module.js': {
+			id: '/dynamically-imports/bad/module.js',
+			importedIds: ['/test/path5.js'],
+			dynamicallyImportedIds: ['/test/path2.js', '/illegal/boom.js']
+		},
+		'/illegal/boom.js': {
+			id: '/illegal/boom.js',
+			importedIds: [],
+			dynamicallyImportedIds: []
+		}
+	};
+	return nodes[id] ?? null;
+};
+
+const illegal_imports = new Set(['/illegal/boom.js']);
+const ok_rollup_node = rollup_node_getter('/test/path1.js');
+const bad_rollup_node_static = rollup_node_getter('/bad/static.js');
+const bad_rollup_node_dynamic = rollup_node_getter('/bad/dynamic.js');
+
+test('allows ok rollup imports', () => {
+	assert.not.throws(() => {
+		// @ts-ignore
+		prevent_illegal_rollup_imports(rollup_node_getter, ok_rollup_node, illegal_imports, '');
+	});
+});
+
+test('does not allow bad static rollup imports', () => {
+	assert.throws(() => {
+		// @ts-ignore
+		prevent_illegal_rollup_imports(rollup_node_getter, bad_rollup_node_static, illegal_imports, '');
+	});
+});
+
+test('does not allow bad dynamic rollup imports', () => {
+	assert.throws(() => {
+		prevent_illegal_rollup_imports(
+			// @ts-ignore
+			rollup_node_getter,
+			bad_rollup_node_dynamic,
+			illegal_imports,
+			''
+		);
+	});
+});
+
+/** @typedef {{id: string, importedModules: Set<ViteNode>}} ViteNode */
+
+/** @type {ViteNode} */
+const ok_vite_node = {
+	id: '/test/ok.js',
+	importedModules: new Set([
+		{
+			id: '/test/path1.js',
+			importedModules: new Set([
+				{
+					id: '/test/path2.js',
+					importedModules: new Set()
+				}
+			])
+		},
+		{ id: '/test/path3.js', importedModules: new Set() }
+	])
+};
+
+/** @type {ViteNode} */
+const bad_vite_node = {
+	id: '/test/bad-static.js',
+	importedModules: new Set([
+		{
+			id: '/test/path1.js',
+			importedModules: new Set([
+				{
+					id: '/test/path2.js',
+					importedModules: new Set([
+						{
+							id: '/illegal/boom.js',
+							importedModules: new Set()
+						}
+					])
+				}
+			])
+		},
+		{ id: '/test/path3.js', importedModules: new Set() }
+	])
+};
+
+test('allows ok vite imports', () => {
+	assert.not.throws(() => {
+		// @ts-ignore
+		prevent_illegal_vite_imports(ok_vite_node, illegal_imports, '');
+	});
+});
+
+test('does not allow bad static rollup imports', () => {
+	assert.throws(() => {
+		// @ts-ignore
+		prevent_illegal_vite_imports(bad_vite_node, illegal_imports, '');
+	});
+});
+
 test.run();
diff --git a/packages/kit/types/internal.d.ts b/packages/kit/types/internal.d.ts
index 517ec91e4fc3..3e05cf415983 100644
--- a/packages/kit/types/internal.d.ts
+++ b/packages/kit/types/internal.d.ts
@@ -92,6 +92,11 @@ export interface Hooks {
 	handleError: HandleError;
 }
 
+export interface ImportNode {
+	name: string;
+	dynamic: boolean;
+}
+
 export class InternalServer extends Server {
 	init(options: ServerInitOptions): void;
 	respond(

From bdffe39473c53e222cd4831ebfc917fbf22633e0 Mon Sep 17 00:00:00 2001
From: Rich Harris <hello@rich-harris.dev>
Date: Tue, 26 Jul 2022 09:56:22 -0400
Subject: [PATCH 80/95] Update packages/kit/types/ambient.d.ts

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

diff --git a/packages/kit/types/ambient.d.ts b/packages/kit/types/ambient.d.ts
index fb09ec49977f..f2a1055f1a5d 100644
--- a/packages/kit/types/ambient.d.ts
+++ b/packages/kit/types/ambient.d.ts
@@ -120,6 +120,8 @@ declare module '$env/dynamic/private' {
  * variables that begin with [`config.kit.env.publicPrefix`](https://kit.svelte.dev/docs/configuration#kit-env-publicprefix)
  * (which defaults to `PUBLIC_`), and can therefore safely be exposed to client-side code
  *
+ * Note that public dynamic environment variables must all be sent from the server to the client, causing larger network requests — when possible, use `$env/static/public` instead.
+ *
  * ```ts
  * import { env } from '$env/dynamic/private';
  * console.log(env.PUBLIC_DEPLOYMENT_SPECIFIC_VARIABLE);

From b5cabd07226a4f2270f1e19c566e4c2d3dd3d76c Mon Sep 17 00:00:00 2001
From: Rich Harris <hello@rich-harris.dev>
Date: Tue, 26 Jul 2022 10:46:33 -0400
Subject: [PATCH 81/95] warn if env vars are invalid

---
 packages/kit/src/core/sync/write_env.js | 35 ++++++++++++++++---------
 1 file changed, 22 insertions(+), 13 deletions(-)

diff --git a/packages/kit/src/core/sync/write_env.js b/packages/kit/src/core/sync/write_env.js
index 45a2e336b5bd..aa635a29688b 100644
--- a/packages/kit/src/core/sync/write_env.js
+++ b/packages/kit/src/core/sync/write_env.js
@@ -1,4 +1,5 @@
 import path from 'path';
+import colors from 'kleur';
 import { get_env } from '../../vite/utils.js';
 import { write_if_changed, reserved, valid_identifier } from './utils.js';
 
@@ -41,22 +42,30 @@ export function write_env(config, mode) {
  * @returns {string}
  */
 function create_module(id, env) {
-	const declarations = Object.entries(env)
-		.filter(([k]) => valid_identifier.test(k))
-		.map(([k, v]) => {
-			const comment = `/** @type {import('${id}'}').${k}} */`;
+	/** @type {string[]} */
+	const declarations = [];
 
-			if (reserved.has(k)) {
-				let i = 1;
-				while (k + i in env) i++;
-				const name = k + 1;
+	for (const key in env) {
+		const warning = !valid_identifier.test(key)
+			? 'not a valid identifier'
+			: reserved.has(key)
+			? 'a reserved word'
+			: null;
 
-				return `${comment}\nconst ${name} = ${JSON.stringify(v)}; export { ${name} as ${k} }`;
-			}
+		if (warning) {
+			console.error(
+				colors
+					.bold()
+					.yellow(`Omitting environment variable "${key}" from ${id} as it is ${warning}`)
+			);
+			continue;
+		}
 
-			return `${comment}\nexport const ${k} = ${JSON.stringify(v)};`;
-		})
-		.join('\n\n');
+		const comment = `/** @type {import('${id}'}').${key}} */`;
+		const declaration = `export const ${key} = ${JSON.stringify(env[key])};`;
+
+		declarations.push(`${comment}\n${declaration}`);
+	}
 
 	return autogen_comment + declarations;
 }

From fd65c1e49361ab9d8dc4ab9617454548086fb7b9 Mon Sep 17 00:00:00 2001
From: Rich Harris <hello@rich-harris.dev>
Date: Tue, 26 Jul 2022 11:04:24 -0400
Subject: [PATCH 82/95] oops

---
 packages/kit/src/core/sync/write_env.js    | 2 +-
 packages/kit/test/apps/basics/test/test.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/kit/src/core/sync/write_env.js b/packages/kit/src/core/sync/write_env.js
index aa635a29688b..aeca744ed5ad 100644
--- a/packages/kit/src/core/sync/write_env.js
+++ b/packages/kit/src/core/sync/write_env.js
@@ -67,7 +67,7 @@ function create_module(id, env) {
 		declarations.push(`${comment}\n${declaration}`);
 	}
 
-	return autogen_comment + declarations;
+	return autogen_comment + declarations.join('\n\n');
 }
 
 /**
diff --git a/packages/kit/test/apps/basics/test/test.js b/packages/kit/test/apps/basics/test/test.js
index 83a4c5b780b3..76e4d5903a5a 100644
--- a/packages/kit/test/apps/basics/test/test.js
+++ b/packages/kit/test/apps/basics/test/test.js
@@ -339,7 +339,7 @@ test.describe('Encoded paths', () => {
 });
 
 test.describe('Env', () => {
-	test('includes environment variables', async ({ page }) => {
+	test.only('includes environment variables', async ({ page }) => {
 		await page.goto('/env');
 
 		expect(await page.textContent('#static-private')).toBe(

From 26ad5071e7101a64e1d2a1acada612cd406cfc98 Mon Sep 17 00:00:00 2001
From: Rich Harris <hello@rich-harris.dev>
Date: Tue, 26 Jul 2022 11:08:27 -0400
Subject: [PATCH 83/95] argh

---
 packages/kit/test/apps/basics/test/test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/kit/test/apps/basics/test/test.js b/packages/kit/test/apps/basics/test/test.js
index 76e4d5903a5a..83a4c5b780b3 100644
--- a/packages/kit/test/apps/basics/test/test.js
+++ b/packages/kit/test/apps/basics/test/test.js
@@ -339,7 +339,7 @@ test.describe('Encoded paths', () => {
 });
 
 test.describe('Env', () => {
-	test.only('includes environment variables', async ({ page }) => {
+	test('includes environment variables', async ({ page }) => {
 		await page.goto('/env');
 
 		expect(await page.textContent('#static-private')).toBe(

From 9c56f37b71f65cbf393dedda997790a80124b4cf Mon Sep 17 00:00:00 2001
From: Rich Harris <hello@rich-harris.dev>
Date: Tue, 26 Jul 2022 11:26:10 -0400
Subject: [PATCH 84/95] Update packages/kit/scripts/extract-types.js

Co-authored-by: Ben McCann <322311+benmccann@users.noreply.github.com>
---
 packages/kit/scripts/extract-types.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/kit/scripts/extract-types.js b/packages/kit/scripts/extract-types.js
index 4dcd943425c4..34412b053154 100644
--- a/packages/kit/scripts/extract-types.js
+++ b/packages/kit/scripts/extract-types.js
@@ -65,8 +65,6 @@ function get_types(code, statements) {
 						: types;
 
 				collection.push({ name, comment, snippet });
-			} else {
-				// console.log(statement.kind);
 			}
 		}
 

From 30f98f02638105aa641b671a555c13603bb05db3 Mon Sep 17 00:00:00 2001
From: Rich Harris <hello@rich-harris.dev>
Date: Tue, 26 Jul 2022 11:31:32 -0400
Subject: [PATCH 85/95] explain why we strip the origin

---
 packages/kit/scripts/extract-types.js | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/packages/kit/scripts/extract-types.js b/packages/kit/scripts/extract-types.js
index 34412b053154..b3b8b17f2909 100644
--- a/packages/kit/scripts/extract-types.js
+++ b/packages/kit/scripts/extract-types.js
@@ -75,6 +75,17 @@ function get_types(code, statements) {
 	return { types, exports };
 }
 
+/**
+ * Type declarations include fully qualified URLs so that they become links when
+ * you hover over names in an editor with TypeScript enabled. We need to remove
+ * the origin so that they become root-relative, so that they work in preview
+ * deployments and when developing locally
+ * @param {string} str
+ */
+function strip_origin(str) {
+	return str.replace(/https:\/\/kit\.svelte\.dev/g, '');
+}
+
 {
 	const code = fs.readFileSync('types/index.d.ts', 'utf-8');
 	const node = ts.createSourceFile('index.d.ts', code, ts.ScriptTarget.Latest);
@@ -102,9 +113,7 @@ const dir = fileURLToPath(new URL('./special-types', import.meta.url).href);
 for (const file of fs.readdirSync(dir)) {
 	if (!file.endsWith('.md')) continue;
 
-	const comment = fs
-		.readFileSync(`${dir}/${file}`, 'utf-8')
-		.replace(/https:\/\/kit\.svelte\.dev/g, '');
+	const comment = strip_origin(fs.readFileSync(`${dir}/${file}`, 'utf-8'));
 
 	modules.push({
 		name: file.replace(/\+/g, '/').slice(0, -3),
@@ -125,11 +134,11 @@ for (const file of fs.readdirSync(dir)) {
 			const name = statement.name.text || statement.name.escapedText;
 
 			// @ts-ignore
-			const comment = statement.jsDoc?.[0].comment ?? '';
+			const comment = strip_origin(statement.jsDoc?.[0].comment ?? '');
 
 			modules.push({
 				name,
-				comment: comment.replace(/https:\/\/kit\.svelte\.dev/g, ''),
+				comment,
 				// @ts-ignore
 				...get_types(code, statement.body?.statements)
 			});

From 92a1559bd5b003c2a4e639b5e1674cc104fa39b2 Mon Sep 17 00:00:00 2001
From: Rich Harris <hello@rich-harris.dev>
Date: Tue, 26 Jul 2022 11:34:29 -0400
Subject: [PATCH 86/95] Update packages/kit/types/ambient.d.ts

Co-authored-by: Ben McCann <322311+benmccann@users.noreply.github.com>
---
 packages/kit/types/ambient.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/kit/types/ambient.d.ts b/packages/kit/types/ambient.d.ts
index f2a1055f1a5d..5035601d81c9 100644
--- a/packages/kit/types/ambient.d.ts
+++ b/packages/kit/types/ambient.d.ts
@@ -123,7 +123,7 @@ declare module '$env/dynamic/private' {
  * Note that public dynamic environment variables must all be sent from the server to the client, causing larger network requests — when possible, use `$env/static/public` instead.
  *
  * ```ts
- * import { env } from '$env/dynamic/private';
+ * import { env } from '$env/dynamic/public';
  * console.log(env.PUBLIC_DEPLOYMENT_SPECIFIC_VARIABLE);
  * ```
  */

From c1a5d52fc86fd34ff0be2d2d641dfa66116c5d80 Mon Sep 17 00:00:00 2001
From: Rich Harris <hello@rich-harris.dev>
Date: Tue, 26 Jul 2022 11:52:10 -0400
Subject: [PATCH 87/95] temporarily disable

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

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

From b2d41ac324eb0551bfc38710b98fec2ad76dcf10 Mon Sep 17 00:00:00 2001
From: Rich Harris <hello@rich-harris.dev>
Date: Tue, 26 Jul 2022 12:15:56 -0400
Subject: [PATCH 88/95] Revert "temporarily disable"

This reverts commit c1a5d52fc86fd34ff0be2d2d641dfa66116c5d80.
---
 sites/kit.svelte.dev/vercel.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

From 5f3dc7b78ccdfa67efb7e19bece3f4b125875b7b Mon Sep 17 00:00:00 2001
From: Rich Harris <hello@rich-harris.dev>
Date: Tue, 26 Jul 2022 12:20:44 -0400
Subject: [PATCH 89/95] tidy up

---
 packages/kit/src/vite/index.js | 7 +------
 packages/kit/src/vite/utils.js | 2 +-
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/packages/kit/src/vite/index.js b/packages/kit/src/vite/index.js
index 45ab59cf5c93..a2469f555143 100644
--- a/packages/kit/src/vite/index.js
+++ b/packages/kit/src/vite/index.js
@@ -14,12 +14,7 @@ import { generate_manifest } from '../core/generate_manifest/index.js';
 import { get_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,
-	format_illegal_import_chain,
-	prevent_illegal_rollup_imports
-} from './utils.js';
+import { get_aliases, resolve_entry, prevent_illegal_rollup_imports } from './utils.js';
 import { fileURLToPath } from 'node:url';
 
 const cwd = process.cwd();
diff --git a/packages/kit/src/vite/utils.js b/packages/kit/src/vite/utils.js
index c09348c1c72f..ebe8b2b4bdb7 100644
--- a/packages/kit/src/vite/utils.js
+++ b/packages/kit/src/vite/utils.js
@@ -163,7 +163,7 @@ function repeat(str, times) {
  * @param {string} out_dir
  * The directory specified by config.kit.outDir.
  */
-export function format_illegal_import_chain(stack, out_dir) {
+function format_illegal_import_chain(stack, out_dir) {
 	const app = path.join(out_dir, 'runtime/env');
 
 	stack = stack.map((file) => {

From f257a0ea4b713de3a8b524bb8df7bf477ccf5351 Mon Sep 17 00:00:00 2001
From: Rich Harris <hello@rich-harris.dev>
Date: Tue, 26 Jul 2022 12:21:14 -0400
Subject: [PATCH 90/95] remove another unused import

---
 packages/kit/src/vite/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/kit/src/vite/index.js b/packages/kit/src/vite/index.js
index a2469f555143..d01b45b40835 100644
--- a/packages/kit/src/vite/index.js
+++ b/packages/kit/src/vite/index.js
@@ -1,5 +1,5 @@
 import { fork } from 'node:child_process';
-import fs, { existsSync } from 'node:fs';
+import fs from 'node:fs';
 import path from 'node:path';
 import colors from 'kleur';
 import { svelte } from '@sveltejs/vite-plugin-svelte';

From 3c15b90699e55a52aa5322006086c12ab27ecc03 Mon Sep 17 00:00:00 2001
From: "S. Elliott Johnson" <sejohnson@torchcloudconsulting.com>
Date: Tue, 26 Jul 2022 11:17:03 -0600
Subject: [PATCH 91/95] Update packages/kit/src/vite/utils.js

Co-authored-by: Ben McCann <322311+benmccann@users.noreply.github.com>
---
 packages/kit/src/vite/utils.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/kit/src/vite/utils.js b/packages/kit/src/vite/utils.js
index ebe8b2b4bdb7..40b74b1f4a62 100644
--- a/packages/kit/src/vite/utils.js
+++ b/packages/kit/src/vite/utils.js
@@ -201,8 +201,7 @@ export function get_env(mode, prefix) {
  * @param {(id: string) => import('rollup').ModuleInfo | null} node_getter
  * @param {import('rollup').ModuleInfo} node
  * @param {Set<string>} illegal_imports
- * @param {string} out_dir
- * The directory specified by config.kit.outDir.
+ * @param {string} out_dir The directory specified by config.kit.outDir
  */
 export function prevent_illegal_rollup_imports(node_getter, node, illegal_imports, out_dir) {
 	const chain = find_illegal_rollup_imports(node_getter, node, false, illegal_imports);

From 49ecafda6563186d1d54e1d0ecbf25b48d98e70d Mon Sep 17 00:00:00 2001
From: "S. Elliott Johnson" <sejohnson@torchcloudconsulting.com>
Date: Tue, 26 Jul 2022 11:17:13 -0600
Subject: [PATCH 92/95] Update packages/kit/src/vite/utils.js

Co-authored-by: Ben McCann <322311+benmccann@users.noreply.github.com>
---
 packages/kit/src/vite/utils.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/kit/src/vite/utils.js b/packages/kit/src/vite/utils.js
index 40b74b1f4a62..95016d008167 100644
--- a/packages/kit/src/vite/utils.js
+++ b/packages/kit/src/vite/utils.js
@@ -160,8 +160,7 @@ function repeat(str, times) {
 /**
  * Create a formatted error for an illegal import.
  * @param {Array<{name: string, dynamic: boolean}>} stack
- * @param {string} out_dir
- * The directory specified by config.kit.outDir.
+ * @param {string} out_dir The directory specified by config.kit.outDir
  */
 function format_illegal_import_chain(stack, out_dir) {
 	const app = path.join(out_dir, 'runtime/env');

From 06fcd1c24248c604e0f70289431cafa1f3f487d7 Mon Sep 17 00:00:00 2001
From: "S. Elliott Johnson" <sejohnson@torchcloudconsulting.com>
Date: Tue, 26 Jul 2022 11:17:21 -0600
Subject: [PATCH 93/95] Update packages/kit/src/vite/utils.js

Co-authored-by: Ben McCann <322311+benmccann@users.noreply.github.com>
---
 packages/kit/src/vite/utils.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/kit/src/vite/utils.js b/packages/kit/src/vite/utils.js
index 95016d008167..3940ee61a2eb 100644
--- a/packages/kit/src/vite/utils.js
+++ b/packages/kit/src/vite/utils.js
@@ -157,6 +157,7 @@ export function resolve_entry(entry) {
 function repeat(str, times) {
 	return new Array(times + 1).join(str);
 }
+
 /**
  * Create a formatted error for an illegal import.
  * @param {Array<{name: string, dynamic: boolean}>} stack

From 4a17268333f3e45edefac60f63ffb166eb9884fc Mon Sep 17 00:00:00 2001
From: "S. Elliott Johnson" <sejohnson@torchcloudconsulting.com>
Date: Tue, 26 Jul 2022 11:17:28 -0600
Subject: [PATCH 94/95] Update packages/kit/src/vite/utils.js

Co-authored-by: Ben McCann <322311+benmccann@users.noreply.github.com>
---
 packages/kit/src/vite/utils.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/kit/src/vite/utils.js b/packages/kit/src/vite/utils.js
index 3940ee61a2eb..721c9398cb90 100644
--- a/packages/kit/src/vite/utils.js
+++ b/packages/kit/src/vite/utils.js
@@ -249,8 +249,7 @@ const find_illegal_rollup_imports = (
  * Throw an error if a private module is imported from a client-side node.
  * @param {import('vite').ModuleNode} node
  * @param {Set<string>} illegal_imports
- * @param {string} out_dir
- * The directory specified by config.kit.outDir.
+ * @param {string} out_dir The directory specified by config.kit.outDir
  */
 export function prevent_illegal_vite_imports(node, illegal_imports, out_dir) {
 	const chain = find_illegal_vite_imports(node, illegal_imports);

From a5e3a879e9c3a22eef28d5629ff0e4c3ab759e19 Mon Sep 17 00:00:00 2001
From: "S. Elliott Johnson" <sejohnson@torchcloudconsulting.com>
Date: Tue, 26 Jul 2022 11:17:34 -0600
Subject: [PATCH 95/95] Update packages/kit/src/core/sync/write_env.js

Co-authored-by: Ben McCann <322311+benmccann@users.noreply.github.com>
---
 packages/kit/src/core/sync/write_env.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/kit/src/core/sync/write_env.js b/packages/kit/src/core/sync/write_env.js
index aeca744ed5ad..7ed0798832de 100644
--- a/packages/kit/src/core/sync/write_env.js
+++ b/packages/kit/src/core/sync/write_env.js
@@ -9,8 +9,7 @@ const autogen_comment = '// this file is generated — do not edit it\n';
  * Writes the existing environment variables in process.env to
  * $env/static/private and $env/static/public
  * @param {import('types').ValidatedKitConfig} config
- * @param {string} mode
- * The Vite mode.
+ * @param {string} mode The Vite mode
  */
 export function write_env(config, mode) {
 	const env = get_env(mode, config.env.publicPrefix);