From e3f1986bb4b7377d47c3aedb99061e00364a3b17 Mon Sep 17 00:00:00 2001
From: Ben McCann <322311+benmccann@users.noreply.github.com>
Date: Thu, 21 Jul 2022 19:50:55 -0700
Subject: [PATCH 01/12] [fix] prerender in subprocess

---
 .changeset/witty-avocados-admire.md          |  5 +++
 packages/kit/rollup.config.js                |  3 +-
 packages/kit/src/core/prerender/prerender.js | 42 +++++++++++++++++---
 packages/kit/src/vite/index.js               | 40 +++++++++++--------
 4 files changed, 67 insertions(+), 23 deletions(-)
 create mode 100644 .changeset/witty-avocados-admire.md

diff --git a/.changeset/witty-avocados-admire.md b/.changeset/witty-avocados-admire.md
new file mode 100644
index 000000000000..a5368e39f720
--- /dev/null
+++ b/.changeset/witty-avocados-admire.md
@@ -0,0 +1,5 @@
+---
+'@sveltejs/kit': patch
+---
+
+[breaking] remove Prerendered.assets
diff --git a/packages/kit/rollup.config.js b/packages/kit/rollup.config.js
index 7fa7819d249d..1abcaa774219 100644
--- a/packages/kit/rollup.config.js
+++ b/packages/kit/rollup.config.js
@@ -61,9 +61,10 @@ export default [
 	{
 		input: {
 			cli: 'src/cli.js',
+			hooks: 'src/hooks.js',
 			node: 'src/node/index.js',
 			'node/polyfills': 'src/node/polyfills.js',
-			hooks: 'src/hooks.js',
+			prerender: 'src/core/prerender/prerender.js',
 			vite: 'src/vite/index.js'
 		},
 		output: {
diff --git a/packages/kit/src/core/prerender/prerender.js b/packages/kit/src/core/prerender/prerender.js
index 6d6b58187f14..79460040ea6c 100644
--- a/packages/kit/src/core/prerender/prerender.js
+++ b/packages/kit/src/core/prerender/prerender.js
@@ -1,5 +1,6 @@
 import { readFileSync, writeFileSync } from 'fs';
 import { dirname, join } from 'path';
+import sade from 'sade';
 import { pathToFileURL, URL } from 'url';
 import { mkdirp, posixify, walk } from '../../utils/filesystem.js';
 import { installPolyfills } from '../../node/polyfills.js';
@@ -7,12 +8,27 @@ import { is_root_relative, resolve } from '../../utils/url.js';
 import { queue } from './queue.js';
 import { crawl } from './crawl.js';
 import { escape_html_attr } from '../../utils/escape.js';
+import { logger } from '../utils.js';
+import { load_config } from '../config/index.js';
 
 /**
  * @typedef {import('types').PrerenderErrorHandler} PrerenderErrorHandler
  * @typedef {import('types').Logger} Logger
  */
 
+const prog = sade('prerender');
+prog
+	.command('run', '', { default: true })
+	.describe('Runs prerendering. Only for internal use')
+	.option('--client_out_dir', "Vite's output directory", '')
+	.option('--results_path', 'Where to put the results', '')
+	.option('--manifest_path', "SvelteKit's manifest file", '')
+	.option('--verbose', 'Whether logging should be verbose', false)
+	.action(async (opts) => {
+		prerender(opts);
+	});
+prog.parse(process.argv, { unknown: (arg) => `Unknown option: ${arg}` });
+
 /**
  * @param {Parameters<PrerenderErrorHandler>[0]} details
  * @param {import('types').ValidatedKitConfig} config
@@ -49,15 +65,24 @@ function normalise_error_handler(log, config) {
 const OK = 2;
 const REDIRECT = 3;
 
+/**
+ * @param {string} path
+ * @param {import('types').Prerendered} prerendered
+ */
+const output_and_exit = (path, prerendered) => {
+	writeFileSync(path, JSON.stringify(prerendered));
+	process.exit(0);
+};
+
 /**
  * @param {{
- *   config: import('types').ValidatedKitConfig;
  *   client_out_dir: string;
+ *   results_path: string;
  *   manifest_path: string;
- *   log: Logger;
+ *   verbose: boolean;
  * }} opts
  */
-export async function prerender({ config, client_out_dir, manifest_path, log }) {
+export async function prerender({ client_out_dir, results_path, manifest_path, verbose }) {
 	/** @type {import('types').Prerendered} */
 	const prerendered = {
 		pages: new Map(),
@@ -66,10 +91,17 @@ export async function prerender({ config, client_out_dir, manifest_path, log })
 		paths: []
 	};
 
+	/** @type {import('types').ValidatedKitConfig} */
+	const config = (await load_config()).kit;
+
 	if (!config.prerender.enabled) {
-		return prerendered;
+		output_and_exit(results_path, prerendered);
+		return;
 	}
 
+	/** @type {import('types').Logger} */
+	const log = logger({ verbose });
+
 	installPolyfills();
 	const { fetch } = globalThis;
 	globalThis.fetch = async (info, init) => {
@@ -349,7 +381,7 @@ export async function prerender({ config, client_out_dir, manifest_path, log })
 	mkdirp(dirname(file));
 	writeFileSync(file, await rendered.text());
 
-	return prerendered;
+	output_and_exit(results_path, prerendered);
 }
 
 /** @return {string} */
diff --git a/packages/kit/src/vite/index.js b/packages/kit/src/vite/index.js
index 950cae8e25b5..1be6d3528aaf 100644
--- a/packages/kit/src/vite/index.js
+++ b/packages/kit/src/vite/index.js
@@ -1,3 +1,4 @@
+import { spawnSync } from 'child_process';
 import fs from 'fs';
 import path from 'path';
 import colors from 'kleur';
@@ -7,7 +8,6 @@ import { mkdirp, posixify, rimraf } from '../utils/filesystem.js';
 import * as sync from '../core/sync/sync.js';
 import { build_server } from './build/build_server.js';
 import { build_service_worker } from './build/build_service_worker.js';
-import { prerender } from '../core/prerender/prerender.js';
 import { load_config } from '../core/config/index.js';
 import { dev } from './dev/index.js';
 import { generate_manifest } from '../core/generate_manifest/index.js';
@@ -273,9 +273,8 @@ function kit() {
 		 * then use this hook to kick off builds for the server and service worker.
 		 */
 		async writeBundle(_options, bundle) {
-			log = logger({
-				verbose: vite_config.logLevel === 'info'
-			});
+			const verbose = vite_config.logLevel === 'info';
+			log = logger({ verbose });
 
 			fs.writeFileSync(
 				`${paths.client_out_dir}/${svelte_config.kit.appDir}/version.json`,
@@ -320,12 +319,26 @@ function kit() {
 			process.env.SVELTEKIT_SERVER_BUILD_COMPLETED = 'true';
 			log.info('Prerendering');
 
-			prerendered = await prerender({
-				config: svelte_config.kit,
-				client_out_dir: vite_config.build.outDir,
-				manifest_path,
-				log
-			});
+			const results_path = `${svelte_config.kit.outDir}/generated/prerendered.json`;
+
+			// do prerendering in a subprocess so any dangling stuff gets killed upon completion
+			spawnSync(
+				'node',
+				[
+					'./node_modules/@sveltejs/kit/dist/prerender.js',
+					'--client_out_dir',
+					vite_config.build.outDir,
+					'--results_path',
+					results_path,
+					'--manifest_path',
+					manifest_path,
+					'--verbose',
+					'' + verbose
+				],
+				{ stdio: 'inherit' }
+			);
+
+			prerendered = JSON.parse(fs.readFileSync(results_path, 'utf8'));
 
 			if (options.service_worker_entry_file) {
 				if (svelte_config.kit.paths.assets) {
@@ -364,13 +377,6 @@ function kit() {
 					`See ${colors.bold().cyan('https://kit.svelte.dev/docs/adapters')} to learn how to configure your app to run on the platform of your choosing`
 				);
 			}
-
-			if (svelte_config.kit.prerender.enabled) {
-				// this is necessary to close any open db connections, etc.
-				// TODO: prerender in a subprocess so we can exit in isolation and then remove this
-				// https://github.com/sveltejs/kit/issues/5306
-				process.exit(0);
-			}
 		},
 
 		/**

From 273af4414ee7fe75986cbd47ff528df92fc062b9 Mon Sep 17 00:00:00 2001
From: Ben McCann <322311+benmccann@users.noreply.github.com>
Date: Fri, 22 Jul 2022 12:58:05 -0700
Subject: [PATCH 02/12] check subprocess exit code

---
 packages/kit/src/vite/index.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/kit/src/vite/index.js b/packages/kit/src/vite/index.js
index 1be6d3528aaf..a421cc75c3e4 100644
--- a/packages/kit/src/vite/index.js
+++ b/packages/kit/src/vite/index.js
@@ -322,7 +322,7 @@ function kit() {
 			const results_path = `${svelte_config.kit.outDir}/generated/prerendered.json`;
 
 			// do prerendering in a subprocess so any dangling stuff gets killed upon completion
-			spawnSync(
+			const { status } = spawnSync(
 				'node',
 				[
 					'./node_modules/@sveltejs/kit/dist/prerender.js',
@@ -337,6 +337,9 @@ function kit() {
 				],
 				{ stdio: 'inherit' }
 			);
+			if (status !== 0) {
+				throw new Error('prerendering failed');
+			}
 
 			prerendered = JSON.parse(fs.readFileSync(results_path, 'utf8'));
 

From 16d116732838e42205fc67c205aca426e9e28a30 Mon Sep 17 00:00:00 2001
From: Ben McCann <322311+benmccann@users.noreply.github.com>
Date: Fri, 22 Jul 2022 13:53:51 -0700
Subject: [PATCH 03/12] resolve package

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

diff --git a/packages/kit/src/vite/index.js b/packages/kit/src/vite/index.js
index a421cc75c3e4..bf7145b5d13c 100644
--- a/packages/kit/src/vite/index.js
+++ b/packages/kit/src/vite/index.js
@@ -1,6 +1,7 @@
-import { spawnSync } from 'child_process';
-import fs from 'fs';
-import path from 'path';
+import { spawnSync } from 'node:child_process';
+import fs from 'node:fs';
+import { createRequire } from 'node:module';
+import path from 'node:path';
 import colors from 'kleur';
 import { svelte } from '@sveltejs/vite-plugin-svelte';
 import * as vite from 'vite';
@@ -322,10 +323,13 @@ function kit() {
 			const results_path = `${svelte_config.kit.outDir}/generated/prerendered.json`;
 
 			// do prerendering in a subprocess so any dangling stuff gets killed upon completion
+			const kit_dir = createRequire(import.meta.url)
+				.resolve('@sveltejs/kit/package.json')
+				.slice(0, -'package.json'.length);
 			const { status } = spawnSync(
 				'node',
 				[
-					'./node_modules/@sveltejs/kit/dist/prerender.js',
+					kit_dir + 'dist/prerender.js',
 					'--client_out_dir',
 					vite_config.build.outDir,
 					'--results_path',

From 5f46a15290a9cd0ae34b4618557146c1ea37cad8 Mon Sep 17 00:00:00 2001
From: Ben McCann <322311+benmccann@users.noreply.github.com>
Date: Fri, 22 Jul 2022 15:28:08 -0700
Subject: [PATCH 04/12] drop sade

---
 packages/kit/src/core/prerender/prerender.js | 16 +++-------------
 packages/kit/src/vite/index.js               |  4 ----
 2 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/packages/kit/src/core/prerender/prerender.js b/packages/kit/src/core/prerender/prerender.js
index 79460040ea6c..91baf3ef01fc 100644
--- a/packages/kit/src/core/prerender/prerender.js
+++ b/packages/kit/src/core/prerender/prerender.js
@@ -1,6 +1,5 @@
 import { readFileSync, writeFileSync } from 'fs';
 import { dirname, join } from 'path';
-import sade from 'sade';
 import { pathToFileURL, URL } from 'url';
 import { mkdirp, posixify, walk } from '../../utils/filesystem.js';
 import { installPolyfills } from '../../node/polyfills.js';
@@ -16,18 +15,9 @@ import { load_config } from '../config/index.js';
  * @typedef {import('types').Logger} Logger
  */
 
-const prog = sade('prerender');
-prog
-	.command('run', '', { default: true })
-	.describe('Runs prerendering. Only for internal use')
-	.option('--client_out_dir', "Vite's output directory", '')
-	.option('--results_path', 'Where to put the results', '')
-	.option('--manifest_path', "SvelteKit's manifest file", '')
-	.option('--verbose', 'Whether logging should be verbose', false)
-	.action(async (opts) => {
-		prerender(opts);
-	});
-prog.parse(process.argv, { unknown: (arg) => `Unknown option: ${arg}` });
+const [, , client_out_dir, results_path, manifest_path, verbose] = process.argv;
+
+prerender({ client_out_dir, results_path, manifest_path, verbose: verbose === 'true' });
 
 /**
  * @param {Parameters<PrerenderErrorHandler>[0]} details
diff --git a/packages/kit/src/vite/index.js b/packages/kit/src/vite/index.js
index bf7145b5d13c..342c10b9a88a 100644
--- a/packages/kit/src/vite/index.js
+++ b/packages/kit/src/vite/index.js
@@ -330,13 +330,9 @@ function kit() {
 				'node',
 				[
 					kit_dir + 'dist/prerender.js',
-					'--client_out_dir',
 					vite_config.build.outDir,
-					'--results_path',
 					results_path,
-					'--manifest_path',
 					manifest_path,
-					'--verbose',
 					'' + verbose
 				],
 				{ stdio: 'inherit' }

From c26162415f5b43e94685e34bd812736f10f10c8d Mon Sep 17 00:00:00 2001
From: Ben McCann <322311+benmccann@users.noreply.github.com>
Date: Fri, 22 Jul 2022 15:48:39 -0700
Subject: [PATCH 05/12] fix

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

diff --git a/packages/kit/src/core/prerender/prerender.js b/packages/kit/src/core/prerender/prerender.js
index 91baf3ef01fc..b5174e811505 100644
--- a/packages/kit/src/core/prerender/prerender.js
+++ b/packages/kit/src/core/prerender/prerender.js
@@ -60,7 +60,12 @@ const REDIRECT = 3;
  * @param {import('types').Prerendered} prerendered
  */
 const output_and_exit = (path, prerendered) => {
-	writeFileSync(path, JSON.stringify(prerendered));
+	writeFileSync(
+		path,
+		JSON.stringify(prerendered, (_key, value) =>
+			value instanceof Map ? Array.from(value.entries()) : value
+		)
+	);
 	process.exit(0);
 };
 
diff --git a/packages/kit/src/vite/index.js b/packages/kit/src/vite/index.js
index 342c10b9a88a..d227b9b0e632 100644
--- a/packages/kit/src/vite/index.js
+++ b/packages/kit/src/vite/index.js
@@ -341,7 +341,12 @@ function kit() {
 				throw new Error('prerendering failed');
 			}
 
-			prerendered = JSON.parse(fs.readFileSync(results_path, 'utf8'));
+			prerendered = JSON.parse(fs.readFileSync(results_path, 'utf8'), (key, value) => {
+				if (key === 'pages' || key === 'assets' || key === 'redirects') {
+					return new Map(value);
+				}
+				return value;
+			});
 
 			if (options.service_worker_entry_file) {
 				if (svelte_config.kit.paths.assets) {

From 2ca652c2b3c8997bffedcc4bf93f857d514762b0 Mon Sep 17 00:00:00 2001
From: Ben McCann <322311+benmccann@users.noreply.github.com>
Date: Fri, 22 Jul 2022 15:59:04 -0700
Subject: [PATCH 06/12] run without building

---
 packages/kit/src/vite/index.js | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/packages/kit/src/vite/index.js b/packages/kit/src/vite/index.js
index d227b9b0e632..b966dad4d9e5 100644
--- a/packages/kit/src/vite/index.js
+++ b/packages/kit/src/vite/index.js
@@ -1,5 +1,5 @@
 import { spawnSync } from 'node:child_process';
-import fs from 'node:fs';
+import fs, { existsSync } from 'node:fs';
 import { createRequire } from 'node:module';
 import path from 'node:path';
 import colors from 'kleur';
@@ -16,6 +16,7 @@ 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 { fileURLToPath } from 'node:url';
 
 const cwd = process.cwd();
 
@@ -323,18 +324,15 @@ function kit() {
 			const results_path = `${svelte_config.kit.outDir}/generated/prerendered.json`;
 
 			// do prerendering in a subprocess so any dangling stuff gets killed upon completion
-			const kit_dir = createRequire(import.meta.url)
-				.resolve('@sveltejs/kit/package.json')
-				.slice(0, -'package.json'.length);
+			const file = fileURLToPath(import.meta.url);
+			const dir = file.substring(0, file.lastIndexOf(path.sep));
+			const dist_script = path.join(dir, 'prerender.js');
+			const script = existsSync(dist_script)
+				? dist_script
+				: path.join(dir, '../core/prerender/prerender.js');
 			const { status } = spawnSync(
 				'node',
-				[
-					kit_dir + 'dist/prerender.js',
-					vite_config.build.outDir,
-					results_path,
-					manifest_path,
-					'' + verbose
-				],
+				[script, vite_config.build.outDir, results_path, manifest_path, '' + verbose],
 				{ stdio: 'inherit' }
 			);
 			if (status !== 0) {

From ecbbaffc51e523d3d23f6595e4005e62c1d9a600 Mon Sep 17 00:00:00 2001
From: Rich Harris <hello@rich-harris.dev>
Date: Mon, 25 Jul 2022 14:34:30 -0400
Subject: [PATCH 07/12] reduce indirection (we could reduce it much further but
 it would dirty up the PR; maybe later

---
 packages/kit/src/core/prerender/prerender.js | 25 +++++++-------------
 1 file changed, 9 insertions(+), 16 deletions(-)

diff --git a/packages/kit/src/core/prerender/prerender.js b/packages/kit/src/core/prerender/prerender.js
index b5174e811505..80471728d105 100644
--- a/packages/kit/src/core/prerender/prerender.js
+++ b/packages/kit/src/core/prerender/prerender.js
@@ -17,7 +17,7 @@ import { load_config } from '../config/index.js';
 
 const [, , client_out_dir, results_path, manifest_path, verbose] = process.argv;
 
-prerender({ client_out_dir, results_path, manifest_path, verbose: verbose === 'true' });
+prerender();
 
 /**
  * @param {Parameters<PrerenderErrorHandler>[0]} details
@@ -56,12 +56,11 @@ const OK = 2;
 const REDIRECT = 3;
 
 /**
- * @param {string} path
  * @param {import('types').Prerendered} prerendered
  */
-const output_and_exit = (path, prerendered) => {
+const output_and_exit = (prerendered) => {
 	writeFileSync(
-		path,
+		results_path,
 		JSON.stringify(prerendered, (_key, value) =>
 			value instanceof Map ? Array.from(value.entries()) : value
 		)
@@ -69,15 +68,7 @@ const output_and_exit = (path, prerendered) => {
 	process.exit(0);
 };
 
-/**
- * @param {{
- *   client_out_dir: string;
- *   results_path: string;
- *   manifest_path: string;
- *   verbose: boolean;
- * }} opts
- */
-export async function prerender({ client_out_dir, results_path, manifest_path, verbose }) {
+export async function prerender() {
 	/** @type {import('types').Prerendered} */
 	const prerendered = {
 		pages: new Map(),
@@ -90,12 +81,14 @@ export async function prerender({ client_out_dir, results_path, manifest_path, v
 	const config = (await load_config()).kit;
 
 	if (!config.prerender.enabled) {
-		output_and_exit(results_path, prerendered);
+		output_and_exit(prerendered);
 		return;
 	}
 
 	/** @type {import('types').Logger} */
-	const log = logger({ verbose });
+	const log = logger({
+		verbose: verbose === 'true'
+	});
 
 	installPolyfills();
 	const { fetch } = globalThis;
@@ -376,7 +369,7 @@ export async function prerender({ client_out_dir, results_path, manifest_path, v
 	mkdirp(dirname(file));
 	writeFileSync(file, await rendered.text());
 
-	output_and_exit(results_path, prerendered);
+	output_and_exit(prerendered);
 }
 
 /** @return {string} */

From f851c33df6ee164d93aa06b766855ce65ae34225 Mon Sep 17 00:00:00 2001
From: Rich Harris <hello@rich-harris.dev>
Date: Mon, 25 Jul 2022 14:51:47 -0400
Subject: [PATCH 08/12] use fork instead of spawn (more efficient)

---
 packages/kit/src/vite/index.js | 60 ++++++++++++++++++++--------------
 1 file changed, 35 insertions(+), 25 deletions(-)

diff --git a/packages/kit/src/vite/index.js b/packages/kit/src/vite/index.js
index 9581556bceb6..0ee69743d116 100644
--- a/packages/kit/src/vite/index.js
+++ b/packages/kit/src/vite/index.js
@@ -1,6 +1,5 @@
-import { spawnSync } from 'node:child_process';
+import { fork } from 'node:child_process';
 import fs, { existsSync } from 'node:fs';
-import { createRequire } from 'node:module';
 import path from 'node:path';
 import colors from 'kleur';
 import { svelte } from '@sveltejs/vite-plugin-svelte';
@@ -319,32 +318,43 @@ function kit() {
 				})};\n`
 			);
 
+			// TODO where is this used?
 			process.env.SVELTEKIT_SERVER_BUILD_COMPLETED = 'true';
-			log.info('Prerendering');
 
-			const results_path = `${svelte_config.kit.outDir}/generated/prerendered.json`;
-
-			// do prerendering in a subprocess so any dangling stuff gets killed upon completion
-			const file = fileURLToPath(import.meta.url);
-			const dir = file.substring(0, file.lastIndexOf(path.sep));
-			const dist_script = path.join(dir, 'prerender.js');
-			const script = existsSync(dist_script)
-				? dist_script
-				: path.join(dir, '../core/prerender/prerender.js');
-			const { status } = spawnSync(
-				'node',
-				[script, vite_config.build.outDir, results_path, manifest_path, '' + verbose],
-				{ stdio: 'inherit' }
-			);
-			if (status !== 0) {
-				throw new Error('prerendering failed');
-			}
+			log.info('Prerendering');
+			await new Promise((fulfil, reject) => {
+				const results_path = `${svelte_config.kit.outDir}/generated/prerendered.json`;
+
+				// do prerendering in a subprocess so any dangling stuff gets killed upon completion
+				const file = fileURLToPath(import.meta.url);
+				const dir = file.substring(0, file.lastIndexOf(path.sep));
+				const dist_script = path.join(dir, 'prerender.js');
+				const script = existsSync(dist_script)
+					? dist_script
+					: path.join(dir, '../core/prerender/prerender.js');
+
+				const child = fork(
+					script,
+					[vite_config.build.outDir, results_path, manifest_path, '' + verbose],
+					{
+						stdio: 'inherit'
+					}
+				);
 
-			prerendered = JSON.parse(fs.readFileSync(results_path, 'utf8'), (key, value) => {
-				if (key === 'pages' || key === 'assets' || key === 'redirects') {
-					return new Map(value);
-				}
-				return value;
+				child.on('exit', (code) => {
+					if (code) {
+						reject(new Error(`Prerendering failed with code ${code}`));
+					} else {
+						prerendered = JSON.parse(fs.readFileSync(results_path, 'utf8'), (key, value) => {
+							if (key === 'pages' || key === 'assets' || key === 'redirects') {
+								return new Map(value);
+							}
+							return value;
+						});
+						console.log(prerendered);
+						fulfil(undefined);
+					}
+				});
 			});
 
 			if (options.service_worker_entry_file) {

From 5e1ecc9b7e1b0a4c9a02864fa8aeed0d9d01b6b2 Mon Sep 17 00:00:00 2001
From: Rich Harris <hello@rich-harris.dev>
Date: Mon, 25 Jul 2022 14:55:17 -0400
Subject: [PATCH 09/12] switch on process.env.BUNDLED, not existence or
 otherwise of dist file

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

diff --git a/packages/kit/src/vite/index.js b/packages/kit/src/vite/index.js
index 0ee69743d116..09c9222a2142 100644
--- a/packages/kit/src/vite/index.js
+++ b/packages/kit/src/vite/index.js
@@ -326,12 +326,12 @@ function kit() {
 				const results_path = `${svelte_config.kit.outDir}/generated/prerendered.json`;
 
 				// do prerendering in a subprocess so any dangling stuff gets killed upon completion
-				const file = fileURLToPath(import.meta.url);
-				const dir = file.substring(0, file.lastIndexOf(path.sep));
-				const dist_script = path.join(dir, 'prerender.js');
-				const script = existsSync(dist_script)
-					? dist_script
-					: path.join(dir, '../core/prerender/prerender.js');
+				const script = fileURLToPath(
+					new URL(
+						process.env.BUNDLED ? './prerender.js' : '../core/prerender/prerender.js',
+						import.meta.url
+					)
+				);
 
 				const child = fork(
 					script,

From 70a8a8693f06589f996241e41736215db6479831 Mon Sep 17 00:00:00 2001
From: Rich Harris <hello@rich-harris.dev>
Date: Mon, 25 Jul 2022 15:02:28 -0400
Subject: [PATCH 10/12] oops, leftover

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

diff --git a/packages/kit/src/vite/index.js b/packages/kit/src/vite/index.js
index 09c9222a2142..961556fa59bd 100644
--- a/packages/kit/src/vite/index.js
+++ b/packages/kit/src/vite/index.js
@@ -351,7 +351,6 @@ function kit() {
 							}
 							return value;
 						});
-						console.log(prerendered);
 						fulfil(undefined);
 					}
 				});

From ec93b592419dd09b2cad38e88b6da8c246ff5a24 Mon Sep 17 00:00:00 2001
From: Rich Harris <hello@rich-harris.dev>
Date: Mon, 25 Jul 2022 15:05:42 -0400
Subject: [PATCH 11/12] Update .changeset/witty-avocados-admire.md

---
 .changeset/witty-avocados-admire.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.changeset/witty-avocados-admire.md b/.changeset/witty-avocados-admire.md
index a5368e39f720..4f7cf8b081b1 100644
--- a/.changeset/witty-avocados-admire.md
+++ b/.changeset/witty-avocados-admire.md
@@ -2,4 +2,4 @@
 '@sveltejs/kit': patch
 ---
 
-[breaking] remove Prerendered.assets
+prerender in a subprocess

From 1bb4305af35c1cff21468088cac3a4b08b895aa0 Mon Sep 17 00:00:00 2001
From: Rich Harris <hello@rich-harris.dev>
Date: Mon, 25 Jul 2022 15:06:10 -0400
Subject: [PATCH 12/12] remove unused env var assignment

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

diff --git a/packages/kit/src/vite/index.js b/packages/kit/src/vite/index.js
index 961556fa59bd..4d9bd942e742 100644
--- a/packages/kit/src/vite/index.js
+++ b/packages/kit/src/vite/index.js
@@ -318,9 +318,6 @@ function kit() {
 				})};\n`
 			);
 
-			// TODO where is this used?
-			process.env.SVELTEKIT_SERVER_BUILD_COMPLETED = 'true';
-
 			log.info('Prerendering');
 			await new Promise((fulfil, reject) => {
 				const results_path = `${svelte_config.kit.outDir}/generated/prerendered.json`;