@sveltejs/kit 1.0.0-next.211 → 1.0.0-next.212

package/assets/kit.js

@@ -598,7 +598,7 @@ async function render_response({
 				navigating: writable(null),
 				session
 			},
-			page: { url, params },
+			page: { url, params, status, error },
 			components: branch.map(({ node }) => node.module.default)
 		};
 

package/assets/runtime/app/stores.js

@@ -57,7 +57,7 @@ const navigating = {
 };
 
 /** @param {string} verb */
-const error = (verb) => {
+const throw_error = (verb) => {
 	throw new Error(
 		ssr
 			? `Can only ${verb} session store in browser`
@@ -77,8 +77,8 @@ const session = {
 
 		return store.subscribe(fn);
 	},
-	set: () => error('set'),
-	update: () => error('update')
+	set: () => throw_error('set'),
+	update: () => throw_error('update')
 };
 
 export { getStores, navigating, page, session, stores };

package/assets/runtime/internal/start.js

@@ -563,7 +563,7 @@ class Renderer {
 
 			result = error_args
 				? await this._load_error(error_args)
-				: await this._get_navigation_result_from_branch({ url, params, branch });
+				: await this._get_navigation_result_from_branch({ url, params, branch, status, error });
 		} catch (e) {
 			if (error) throw e;
 
@@ -800,9 +800,11 @@ class Renderer {
 	 *   url: URL;
 	 *   params: Record<string, string>;
 	 *   branch: Array<import('./types').BranchNode | undefined>;
+	 *   status: number;
+	 *   error?: Error;
 	 * }} opts
 	 */
-	async _get_navigation_result_from_branch({ url, params, branch }) {
+	async _get_navigation_result_from_branch({ url, params, branch, status, error }) {
 		const filtered = /** @type {import('./types').BranchNode[] } */ (branch.filter(Boolean));
 		const redirect = filtered.find((f) => f.loaded && f.loaded.redirect);
 
@@ -826,7 +828,7 @@ class Renderer {
 		}
 
 		if (!this.current.url || url.href !== this.current.url.href) {
-			result.props.page = { url, params };
+			result.props.page = { url, params, status, error };
 
 			// TODO remove this for 1.0
 			/**
@@ -1120,12 +1122,12 @@ class Renderer {
 			}
 		}
 
-		return await this._get_navigation_result_from_branch({ url, params, branch });
+		return await this._get_navigation_result_from_branch({ url, params, branch, status, error });
 	}
 
 	/**
 	 * @param {{
-	 *   status?: number;
+	 *   status: number;
 	 *   error: Error;
 	 *   url: URL;
 	 * }} opts
@@ -1153,7 +1155,7 @@ class Renderer {
 			})
 		];
 
-		return await this._get_navigation_result_from_branch({ url, params, branch });
+		return await this._get_navigation_result_from_branch({ url, params, branch, status, error });
 	}
 }
 

package/dist/chunks/index.js

@@ -4540,14 +4540,16 @@ function find_deps(node, deps) {
 	}
 }
 
-/** @typedef {{
+/**
+ * @typedef {{
  *   cwd: string,
  *   port: number,
  *   host?: string,
  *   https: boolean,
  *   config: import('types/config').ValidatedConfig
- * }} Options */
-/** @typedef {import('types/internal').SSRComponent} SSRComponent */
+ * }} Options
+ * @typedef {import('types/internal').SSRComponent} SSRComponent
+ */
 
 /** @param {Options} opts */
 async function dev({ cwd, port, host, https, config }) {
@@ -4590,6 +4592,13 @@ async function dev({ cwd, port, host, https, config }) {
 				$lib: config.kit.files.lib
 			}
 		},
+		build: {
+			rollupOptions: {
+				// Vite dependency crawler needs an explicit JS entry point
+				// eventhough server otherwise works without it
+				input: path__default.resolve(`${output}/runtime/internal/start.js`)
+			}
+		},
 		plugins: [
 			svelte({
 				extensions: config.extensions,

package/dist/chunks/index2.js

@@ -686,6 +686,9 @@ function comparator(a, b) {
 		if (!b_sub_part) return -1;
 
 		if (a_sub_part.rest && b_sub_part.rest) {
+			if (a.is_page !== b.is_page) {
+				return a.is_page ? 1 : -1;
+			}
 			// sort alphabetically
 			return a_sub_part.content < b_sub_part.content ? -1 : 1;
 		}

package/dist/chunks/index3.js

@@ -1,11 +1,11 @@
-import fs__default, { writeFileSync } from 'fs';
+import fs__default from 'fs';
 import path__default from 'path';
-import { p as print_config_conflicts, c as copy_assets, b as posixify, r as resolve_entry, a as rimraf, m as mkdirp } from '../cli.js';
+import { p as print_config_conflicts, c as copy_assets, b as posixify, r as resolve_entry, m as mkdirp, a as rimraf } from '../cli.js';
 import { d as deep_merge, a as create_app, c as create_manifest_data } from './index2.js';
 import { S as SVELTE_KIT } from './constants.js';
 import { g as generate_manifest } from './index4.js';
-import { s } from './misc.js';
 import vite from 'vite';
+import { s } from './misc.js';
 import { svelte } from '@sveltejs/vite-plugin-svelte';
 import 'sade';
 import 'child_process';
@@ -358,10 +358,12 @@ export class App {
  *   output_dir: string;
  * }} options
  * @param {string} runtime
+ * @param {{ vite_manifest: import('vite').Manifest, assets: import('rollup').OutputAsset[] }} client
  */
 async function build_server(
 	{ cwd, assets_base, config, manifest_data, build_dir, output_dir },
-	runtime
+	runtime,
+	client
 ) {
 	let hooks_file = resolve_entry(config.kit.files.hooks);
 	if (!hooks_file || !fs__default.existsSync(hooks_file)) {
@@ -482,10 +484,42 @@ async function build_server(
 		}
 	});
 
+	/** @type {import('vite').Manifest} */
+	const vite_manifest = JSON.parse(fs__default.readFileSync(`${output_dir}/server/manifest.json`, 'utf-8'));
+
+	const styles_lookup = new Map();
+	if (config.kit.amp) {
+		client.assets.forEach((asset) => {
+			if (asset.fileName.endsWith('.css')) {
+				styles_lookup.set(asset.fileName, asset.source);
+			}
+		});
+	}
+
+	mkdirp(`${output_dir}/server/nodes`);
+	manifest_data.components.forEach((component, i) => {
+		const file = `${output_dir}/server/nodes/${i}.js`;
+
+		const js = new Set();
+		const css = new Set();
+		find_deps(component, client.vite_manifest, js, css);
+
+		const styles = config.kit.amp && Array.from(css).map((file) => styles_lookup.get(file));
+
+		const node = `import * as module from '../${vite_manifest[component].file}';
+			export { module };
+			export const entry = '${client.vite_manifest[component].file}';
+			export const js = ${JSON.stringify(Array.from(js))};
+			export const css = ${JSON.stringify(Array.from(css))};
+			${styles ? `export const styles = ${s(styles)}` : ''}
+			`.replace(/^\t\t\t/gm, '');
+
+		fs__default.writeFileSync(file, node);
+	});
+
 	return {
 		chunks,
-		/** @type {import('vite').Manifest} */
-		vite_manifest: JSON.parse(fs__default.readFileSync(`${output_dir}/server/manifest.json`, 'utf-8')),
+		vite_manifest,
 		methods: get_methods(cwd, chunks, manifest_data)
 	};
 }
@@ -564,37 +598,7 @@ async function build(config, { cwd = process.cwd(), runtime = './kit.js' } = {})
 	};
 
 	const client = await build_client(options);
-	const server = await build_server(options, runtime);
-
-	const styles_lookup = new Map();
-	if (options.config.kit.amp) {
-		client.assets.forEach((asset) => {
-			if (asset.fileName.endsWith('.css')) {
-				styles_lookup.set(asset.fileName, asset.source);
-			}
-		});
-	}
-
-	mkdirp(`${output_dir}/server/nodes`);
-	options.manifest_data.components.forEach((component, i) => {
-		const file = `${output_dir}/server/nodes/${i}.js`;
-
-		const js = new Set();
-		const css = new Set();
-		find_deps(component, client.vite_manifest, js, css);
-
-		const styles = config.kit.amp && Array.from(css).map((file) => styles_lookup.get(file));
-
-		const node = `import * as module from '../${server.vite_manifest[component].file}';
-			export { module };
-			export const entry = '${client.vite_manifest[component].file}';
-			export const js = ${JSON.stringify(Array.from(js))};
-			export const css = ${JSON.stringify(Array.from(css))};
-			${styles ? `export const styles = ${s(styles)}` : ''}
-			`.replace(/^\t\t\t/gm, '');
-
-		writeFileSync(file, node);
-	});
+	const server = await build_server(options, runtime, client);
 
 	if (options.service_worker_entry_file) {
 		if (config.kit.paths.assets) {

package/dist/cli.js

@@ -887,7 +887,7 @@ async function launch(port, https) {
 	exec(`${cmd} ${https ? 'https' : 'http'}://localhost:${port}`);
 }
 
-const prog = sade('svelte-kit').version('1.0.0-next.211');
+const prog = sade('svelte-kit').version('1.0.0-next.212');
 
 prog
 	.command('dev')
@@ -1039,7 +1039,7 @@ async function check_port(port) {
 function welcome({ port, host, https, open, loose, allow, cwd }) {
 	if (open) launch(port, https);
 
-	console.log($.bold().cyan(`\n  SvelteKit v${'1.0.0-next.211'}\n`));
+	console.log($.bold().cyan(`\n  SvelteKit v${'1.0.0-next.212'}\n`));
 
 	const protocol = https ? 'https:' : 'http:';
 	const exposed = typeof host !== 'undefined' && host !== 'localhost' && host !== '127.0.0.1';

package/dist/ssr.js

@@ -567,7 +567,7 @@ async function render_response({
 				navigating: writable(null),
 				session
 			},
-			page: { url, params },
+			page: { url, params, status, error },
 			components: branch.map(({ node }) => node.module.default)
 		};
 

package/package.json

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

package/types/ambient-modules.d.ts

@@ -93,6 +93,8 @@ declare module '$app/stores' {
 		page: Readable<{
 			url: URL;
 			params: Record<string, string>;
+			status: number;
+			error: Error | null;
 		}>;
 		session: Writable<Session>;
 	};
@@ -103,6 +105,8 @@ declare module '$app/stores' {
 	export const page: Readable<{
 		url: URL;
 		params: Record<string, string>;
+		status: number;
+		error: Error | null;
 	}>;
 	/**
 	 * A readable store.