@sveltejs/kit 1.0.0-next.583 → 1.0.0-next.585

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sveltejs/kit",
-  "version": "1.0.0-next.583",
+  "version": "1.0.0-next.585",
   "repository": {
     "type": "git",
     "url": "https://github.com/sveltejs/kit",

package/src/core/config/index.js

@@ -43,7 +43,14 @@ export function load_template(cwd, config) {
  * @param {import('types').ValidatedConfig} config
  */
 export function load_error_page(config) {
-	const { errorTemplate } = config.kit.files;
+	let { errorTemplate } = config.kit.files;
+
+	// Don't do this inside resolving the config, because that would mean
+	// adding/removing error.html isn't detected and would require a restart.
+	if (!fs.existsSync(config.kit.files.errorTemplate)) {
+		errorTemplate = url.fileURLToPath(new URL('./default-error.html', import.meta.url));
+	}
+
 	return fs.readFileSync(errorTemplate, 'utf-8');
 }
 
@@ -86,12 +93,6 @@ function process_config(config, { cwd = process.cwd() } = {}) {
 		}
 	}
 
-	if (!fs.existsSync(validated.kit.files.errorTemplate)) {
-		validated.kit.files.errorTemplate = url.fileURLToPath(
-			new URL('./default-error.html', import.meta.url)
-		);
-	}
-
 	return validated;
 }
 

package/src/exports/vite/build/utils.js

@@ -117,8 +117,6 @@ export function resolve_symlinks(manifest, file) {
  * @return {import('vite').UserConfig}
  */
 export function get_build_setup_config({ config, ssr }) {
-	const prefix = `${config.kit.appDir}/immutable`;
-
 	return {
 		build: {
 			// don't use the default name to avoid collisions with 'static/manifest.json'
@@ -148,15 +146,6 @@ export function get_build_setup_config({ config, ssr }) {
 				// because they for example use esbuild.build with `platform: 'browser'`
 				'esm-env'
 			]
-		},
-		worker: {
-			rollupOptions: {
-				output: {
-					entryFileNames: `${prefix}/workers/[name]-[hash].js`,
-					chunkFileNames: `${prefix}/workers/chunks/[name]-[hash].js`,
-					hoistTransitiveImports: false
-				}
-			}
 		}
 	};
 }
@@ -194,7 +183,16 @@ export function get_build_compile_config({ config, input, ssr, outDir }) {
 			},
 			target: ssr ? 'node16.14' : undefined
 		},
-		publicDir: ssr ? false : config.kit.files.assets
+		publicDir: ssr ? false : config.kit.files.assets,
+		worker: {
+			rollupOptions: {
+				output: {
+					entryFileNames: `${prefix}/workers/[name]-[hash].js`,
+					chunkFileNames: `${prefix}/workers/chunks/[name]-[hash].js`,
+					hoistTransitiveImports: false
+				}
+			}
+		}
 	};
 }
 

package/src/exports/vite/dev/index.js

@@ -36,6 +36,9 @@ export async function dev(vite, vite_config, svelte_config) {
 	/** @type {import('types').SSRManifest} */
 	let manifest;
 
+	/** @type {Error | null} */
+	let manifest_error = null;
+
 	/** @param {string} id */
 	async function resolve(id) {
 		const url = id.startsWith('..') ? `/@fs${path.posix.resolve(id)}` : `/${id}`;
@@ -51,18 +54,24 @@ export async function dev(vite, vite_config, svelte_config) {
 	async function update_manifest() {
 		try {
 			({ manifest_data } = await sync.create(svelte_config));
+
+			if (manifest_error) {
+				manifest_error = null;
+				vite.ws.send({ type: 'full-reload' });
+			}
 		} catch (error) {
-			console.error(colors.bold().red('Failed to update manifest'));
+			manifest_error = /** @type {Error} */ (error);
+
+			console.error(colors.bold().red('Invalid routes'));
 			console.error(error);
 			vite.ws.send({
 				type: 'error',
 				err: {
-					message: `Failed to udpate manifest: ${
-						/** @type {Error} */ (error)?.message ?? 'Unknown error'
-					}`,
-					stack: /** @type {Error} */ (error)?.stack ?? ''
+					message: manifest_error.message ?? 'Invalid routes',
+					stack: ''
 				}
 			});
+
 			return;
 		}
 
@@ -447,6 +456,27 @@ export async function dev(vite, vite_config, svelte_config) {
 				const template = load_template(cwd, svelte_config);
 				const error_page = load_error_page(svelte_config);
 
+				/** @param {{ status: number; message: string }} opts */
+				const error_template = ({ status, message }) => {
+					return error_page
+						.replace(/%sveltekit\.status%/g, String(status))
+						.replace(/%sveltekit\.error\.message%/g, message);
+				};
+
+				if (manifest_error) {
+					console.error(colors.bold().red('Invalid routes'));
+					console.error(manifest_error);
+
+					res.writeHead(500, {
+						'Content-Type': 'text/html; charset=utf-8'
+					});
+					res.end(
+						error_template({ status: 500, message: manifest_error.message ?? 'Invalid routes' })
+					);
+
+					return;
+				}
+
 				const rendered = await respond(
 					request,
 					{
@@ -501,11 +531,7 @@ export async function dev(vite, vite_config, svelte_config) {
 							);
 						},
 						app_template_contains_nonce: template.includes('%sveltekit.nonce%'),
-						error_template: ({ status, message }) => {
-							return error_page
-								.replace(/%sveltekit\.status%/g, String(status))
-								.replace(/%sveltekit\.error\.message%/g, message);
-						},
+						error_template,
 						service_worker:
 							svelte_config.kit.serviceWorker.register &&
 							!!resolve_entry(svelte_config.kit.files.serviceWorker),

package/src/exports/vite/index.js

@@ -354,9 +354,7 @@ function kit({ svelte_config }) {
 		 * Clears the output directories.
 		 */
 		buildStart() {
-			if (vite_config.build.ssr) {
-				return;
-			}
+			if (vite_config.build.ssr) return;
 
 			// Reset for new build. Goes here because `build --watch` calls buildStart but not config
 			completed_build = false;
@@ -371,6 +369,16 @@ function kit({ svelte_config }) {
 			}
 		},
 
+		generateBundle() {
+			if (vite_config.build.ssr) return;
+
+			this.emitFile({
+				type: 'asset',
+				fileName: `${svelte_config.kit.appDir}/version.json`,
+				source: JSON.stringify({ version: svelte_config.kit.version.name })
+			});
+		},
+
 		/**
 		 * Vite builds a single bundle. We need three bundles: client, server, and service worker.
 		 * The user's package.json scripts will invoke the Vite CLI to execute the client build. We
@@ -379,9 +387,7 @@ function kit({ svelte_config }) {
 		writeBundle: {
 			sequential: true,
 			async handler(_options, bundle) {
-				if (vite_config.build.ssr) {
-					return;
-				}
+				if (vite_config.build.ssr) return;
 
 				const guard = module_guard(this, {
 					cwd: vite.normalizePath(process.cwd()),
@@ -401,11 +407,6 @@ function kit({ svelte_config }) {
 					verbose
 				});
 
-				fs.writeFileSync(
-					`${paths.client_out_dir}/${svelte_config.kit.appDir}/version.json`,
-					JSON.stringify({ version: svelte_config.kit.version.name })
-				);
-
 				const { assets, chunks } = collect_output(bundle);
 				log.info(
 					`Client build completed. Wrote ${chunks.length} chunks and ${assets.length} assets`

package/src/runtime/components/error.svelte

@@ -3,14 +3,4 @@
 </script>
 
 <h1>{$page.status}</h1>
-
-<pre>{$page.error.message}</pre>
-
-<!-- TODO figure out what to do with frames/stacktraces in prod -->
-<!-- frame is populated by Svelte in its CompileError and is a Rollup/Vite convention -->
-{#if $page.error.frame}
-	<pre>{$page.error.frame}</pre>
-{/if}
-{#if $page.error.stack}
-	<pre>{$page.error.stack}</pre>
-{/if}
+<p>{$page.error?.message}</p>