@sveltejs/kit 1.0.0-next.501 → 1.0.0-next.503

package/package.json

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

package/postinstall.js

@@ -4,35 +4,44 @@ import glob from 'tiny-glob/sync.js';
 import { load_config } from './src/core/config/index.js';
 import * as sync from './src/core/sync/sync.js';
 
-const cwd = process.env.INIT_CWD ?? process.cwd();
-process.chdir(cwd);
+try {
+	const cwd = process.env.INIT_CWD ?? process.cwd();
+	process.chdir(cwd);
 
-const pkg = JSON.parse(fs.readFileSync('package.json', 'utf8'));
+	if (fs.existsSync('package.json')) {
+		const pkg = JSON.parse(fs.readFileSync('package.json', 'utf8'));
 
-const directories = [];
+		const directories = [];
 
-if (pkg.workspaces) {
-	for (const directory of pkg.workspaces) {
-		directories.push(...glob(directory, { cwd }).map((dir) => path.resolve(cwd, dir)));
-	}
-} else {
-	directories.push(cwd);
-}
+		if (pkg.workspaces) {
+			// we have to do this because of https://classic.yarnpkg.com/blog/2018/02/15/nohoist/
+			const packages = Array.isArray(pkg.workspaces) ? pkg.workspaces : pkg.workspaces.packages;
 
-for (const cwd of directories) {
-	process.chdir(cwd);
+			for (const directory of packages) {
+				directories.push(...glob(directory, { cwd }).map((dir) => path.resolve(cwd, dir)));
+			}
+		} else {
+			directories.push(cwd);
+		}
+
+		for (const cwd of directories) {
+			process.chdir(cwd);
 
-	if (!fs.existsSync('package.json')) continue;
-	if (!fs.existsSync('svelte.config.js')) continue;
+			if (!fs.existsSync('package.json')) continue;
+			if (!fs.existsSync('svelte.config.js')) continue;
 
-	const pkg = JSON.parse(fs.readFileSync('package.json', 'utf8'));
-	if (!pkg.dependencies?.['@sveltejs/kit'] && !pkg.devDependencies?.['@sveltejs/kit']) continue;
+			const pkg = JSON.parse(fs.readFileSync('package.json', 'utf8'));
+			if (!pkg.dependencies?.['@sveltejs/kit'] && !pkg.devDependencies?.['@sveltejs/kit']) continue;
 
-	try {
-		const config = await load_config();
-		await sync.all(config, 'development');
-	} catch (e) {
-		console.log('Error while trying to sync SvelteKit config');
-		console.log(e);
+			try {
+				const config = await load_config();
+				await sync.all(config, 'development');
+			} catch (error) {
+				console.log('Error while trying to sync SvelteKit config');
+				console.log(error.stack);
+			}
+		}
 	}
+} catch (error) {
+	console.error(error.stack);
 }

package/src/core/prerender/prerender.js

@@ -85,6 +85,9 @@ export async function prerender() {
 	/** @type {import('types').PrerenderMap} */
 	const prerender_map = new Map();
 
+	/** @type {Set<string>} */
+	const prerendered_routes = new Set();
+
 	/** @type {import('types').ValidatedKitConfig} */
 	const config = (await load_config()).kit;
 
@@ -302,6 +305,9 @@ export async function prerender() {
 
 		if (written.has(file)) return;
 
+		const route_id = response.headers.get('x-sveltekit-routeid');
+		if (route_id !== null) prerendered_routes.add(route_id);
+
 		if (response_type === REDIRECT) {
 			const location = headers['location'];
 
@@ -410,6 +416,23 @@ export async function prerender() {
 
 	await q.done();
 
+	/** @type {string[]} */
+	const not_prerendered = [];
+
+	for (const [route_id, prerender] of prerender_map) {
+		if (prerender === true && !prerendered_routes.has(route_id)) {
+			not_prerendered.push(route_id);
+		}
+	}
+
+	if (not_prerendered.length > 0) {
+		throw new Error(
+			`The following routes were marked as prerenderable, but were not prerendered:\n${not_prerendered.map(
+				(id) => `  - ${id}`
+			)}\n\nSee https://kit.svelte.dev/docs/page-options#prerender-troubleshooting for more info`
+		);
+	}
+
 	const rendered = await server.respond(new Request(config.prerender.origin + '/[fallback]'), {
 		getClientAddress,
 		prerendering: {

package/src/core/sync/write_types/index.js

@@ -46,11 +46,82 @@ export async function write_all_types(config, manifest_data) {
 		}
 	}
 
+	// Read/write meta data on each invocation, not once per node process,
+	// it could be invoked by another process in the meantime.
+	const meta_data_file = `${types_dir}/route_meta_data.json`;
+	const has_meta_data = fs.existsSync(meta_data_file);
+	let meta_data = has_meta_data
+		? /** @type {Record<string, string[]>} */ (JSON.parse(fs.readFileSync(meta_data_file, 'utf-8')))
+		: {};
 	const routes_map = create_routes_map(manifest_data);
 	// For each directory, write $types.d.ts
 	for (const route of manifest_data.routes) {
-		update_types(config, routes_map, route);
+		if (!route.leaf && !route.layout && !route.endpoint) continue; // nothing to do
+
+		const outdir = path.join(config.kit.outDir, 'types', routes_dir, route.id);
+
+		// check if the types are out of date
+		/** @type {string[]} */
+		const input_files = [];
+
+		/** @type {import('types').PageNode | null} */
+		let node = route.leaf;
+		while (node) {
+			if (node.shared) input_files.push(node.shared);
+			if (node.server) input_files.push(node.server);
+			node = node.parent ?? null;
+		}
+
+		/** @type {import('types').PageNode | null} */
+		node = route.layout;
+		while (node) {
+			if (node.shared) input_files.push(node.shared);
+			if (node.server) input_files.push(node.server);
+			node = node.parent ?? null;
+		}
+
+		if (route.endpoint) {
+			input_files.push(route.endpoint.file);
+		}
+
+		try {
+			fs.mkdirSync(outdir, { recursive: true });
+		} catch {}
+
+		const output_files = compact(
+			fs.readdirSync(outdir).map((name) => {
+				const stats = fs.statSync(path.join(outdir, name));
+				if (stats.isDirectory()) return;
+				return {
+					name,
+					updated: stats.mtimeMs
+				};
+			})
+		);
+
+		const source_last_updated = Math.max(
+			// ctimeMs includes move operations whereas mtimeMs does not
+			...input_files.map((file) => fs.statSync(file).ctimeMs)
+		);
+		const types_last_updated = Math.max(...output_files.map((file) => file.updated));
+
+		const should_generate =
+			// source files were generated more recently than the types
+			source_last_updated > types_last_updated ||
+			// no meta data file exists yet
+			!has_meta_data ||
+			// some file was deleted
+			!meta_data[route.id]?.every((file) => input_files.includes(file));
+
+		if (should_generate) {
+			// track which old files end up being surplus to requirements
+			const to_delete = new Set(output_files.map((file) => file.name));
+			update_types(config, routes_map, route, to_delete);
+			meta_data[route.id] = input_files;
+		}
 	}
+
+	fs.writeFileSync(meta_data_file, JSON.stringify(meta_data, null, '\t'));
 }
 
 /**
@@ -72,6 +143,7 @@ export async function write_types(config, manifest_data, file) {
 
 	const route = manifest_data.routes.find((route) => route.id === id);
 	if (!route) return; // this shouldn't ever happen
+	if (!route.leaf && !route.layout && !route.endpoint) return; // nothing to do
 
 	update_types(config, create_routes_map(manifest_data), route);
 }
@@ -96,60 +168,12 @@ function create_routes_map(manifest_data) {
  * @param {import('types').ValidatedConfig} config
  * @param {Map<import('types').PageNode, import('types').RouteData>} routes
  * @param {import('types').RouteData} route
+ * @param {Set<string>} [to_delete]
  */
-function update_types(config, routes, route) {
-	if (!route.leaf && !route.layout && !route.endpoint) return; // nothing to do
-
+function update_types(config, routes, route, to_delete = new Set()) {
 	const routes_dir = posixify(path.relative('.', config.kit.files.routes));
 	const outdir = path.join(config.kit.outDir, 'types', routes_dir, route.id);
 
-	// first, check if the types are out of date
-	const input_files = [];
-
-	/** @type {import('types').PageNode | null} */
-	let node = route.leaf;
-	while (node) {
-		if (node.shared) input_files.push(node.shared);
-		if (node.server) input_files.push(node.server);
-		node = node.parent ?? null;
-	}
-
-	/** @type {import('types').PageNode | null} */
-	node = route.layout;
-	while (node) {
-		if (node.shared) input_files.push(node.shared);
-		if (node.server) input_files.push(node.server);
-		node = node.parent ?? null;
-	}
-
-	if (route.endpoint) {
-		input_files.push(route.endpoint.file);
-	}
-
-	try {
-		fs.mkdirSync(outdir, { recursive: true });
-	} catch {}
-
-	const output_files = compact(
-		fs.readdirSync(outdir).map((name) => {
-			const stats = fs.statSync(path.join(outdir, name));
-			if (stats.isDirectory()) return;
-			return {
-				name,
-				updated: stats.mtimeMs
-			};
-		})
-	);
-
-	const source_last_updated = Math.max(...input_files.map((file) => fs.statSync(file).mtimeMs));
-	const types_last_updated = Math.max(...output_files.map((file) => file?.updated));
-
-	// types were generated more recently than the source files, so don't regenerate
-	if (types_last_updated > source_last_updated) return;
-
-	// track which old files end up being surplus to requirements
-	const to_delete = new Set(output_files.map((file) => file.name));
-
 	// now generate new types
 	const imports = [`import type * as Kit from '@sveltejs/kit';`];
 
@@ -180,7 +204,7 @@ function update_types(config, routes, route) {
 			`type OutputDataShape<T> = MaybeWithVoid<Omit<App.PageData, RequiredKeys<T>> & Partial<Pick<App.PageData, keyof T & keyof App.PageData>> & Record<string, any>>`
 		);
 		// null & {} == null, we need to prevent that in some situations
-		declarations.push(`type EnsureParentData<T> = T extends null | undefined ? {} : T;`);
+		declarations.push(`type EnsureDefined<T> = T extends null | undefined ? {} : T;`);
 	}
 
 	if (route.leaf) {
@@ -308,7 +332,7 @@ function process_node(node, outdir, is_page, all_pages_have_load = true) {
 						? `./proxy${replace_ext_with_js(basename)}`
 						: path_to_original(outdir, node.server);
 
-					type = `Expand<Kit.AwaitedActions<typeof import('${from}').actions>>`;
+					type = `Expand<Kit.AwaitedActions<typeof import('${from}').actions>> | undefined`;
 				}
 			}
 			exports.push(`export type ActionData = ${type};`);
@@ -329,9 +353,13 @@ function process_node(node, outdir, is_page, all_pages_have_load = true) {
 			written_proxies.push(`proxy${path.basename(node.shared)}`);
 		}
 
-		const type = get_data_type(node.shared, `${parent_type} & ${prefix}ServerData`, proxy);
+		const type = get_data_type(
+			node.shared,
+			`${parent_type} & EnsureDefined<${prefix}ServerData>`,
+			proxy
+		);
 
-		data = `Expand<Omit<${parent_type}, keyof ${type}> & ${type}>`;
+		data = `Expand<Omit<${parent_type}, keyof ${type}> & EnsureDefined<${type}>>`;
 
 		const output_data_shape =
 			!is_page && all_pages_have_load
@@ -345,7 +373,7 @@ function process_node(node, outdir, is_page, all_pages_have_load = true) {
 	} else if (server_data === 'null') {
 		data = `Expand<${parent_type}>`;
 	} else {
-		data = `Expand<Omit<${parent_type}, keyof ${prefix}ServerData> & ${prefix}ServerData>`;
+		data = `Expand<Omit<${parent_type}, keyof ${prefix}ServerData> & EnsureDefined<${prefix}ServerData>>`;
 	}
 
 	exports.push(`export type ${prefix}Data = ${data};`);
@@ -396,14 +424,14 @@ function get_parent_type(node, type) {
 		parent = parent.parent;
 	}
 
-	let parent_str = `EnsureParentData<${parent_imports[0] || '{}'}>`;
+	let parent_str = `EnsureDefined<${parent_imports[0] || '{}'}>`;
 	for (let i = 1; i < parent_imports.length; i++) {
 		// Omit is necessary because a parent could have a property with the same key which would
 		// cause a type conflict. At runtime the child overwrites the parent property in this case,
 		// so reflect that in the type definition.
-		// EnsureParentData is necessary because {something: string} & null becomes null.
+		// EnsureDefined is necessary because {something: string} & null becomes null.
 		// Output types of server loads can be null but when passed in through the `parent` parameter they are the empty object instead.
-		parent_str = `Omit<${parent_str}, keyof ${parent_imports[i]}> & EnsureParentData<${parent_imports[i]}>`;
+		parent_str = `Omit<${parent_str}, keyof ${parent_imports[i]}> & EnsureDefined<${parent_imports[i]}>`;
 	}
 	return parent_str;
 }

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

@@ -46,7 +46,7 @@ export async function preview(vite, vite_config, svelte_config) {
 
 	const server = new Server(manifest);
 	await server.init({
-		env: loadEnv(vite_config.mode, process.cwd(), '')
+		env: loadEnv(vite_config.mode, svelte_config.kit.env.dir, '')
 	});
 
 	return () => {

package/src/runtime/app/forms.js

@@ -73,7 +73,8 @@ export function enhance(form, submit = () => {}) {
 			const response = await fetch(action, {
 				method: 'POST',
 				headers: {
-					accept: 'application/json'
+					accept: 'application/json',
+					'x-sveltekit-action': 'true'
 				},
 				body: data,
 				signal: controller.signal

package/src/runtime/client/client.js

@@ -438,7 +438,11 @@ export function create_client({ target, base, trailing_slash }) {
 		}
 
 		const page_changed =
-			!current.url || url.href !== current.url.href || current.error !== error || data_changed;
+			!current.url ||
+			url.href !== current.url.href ||
+			current.error !== error ||
+			form !== undefined ||
+			data_changed;
 
 		if (page_changed) {
 			result.props.page = {
@@ -447,6 +451,7 @@ export function create_client({ target, base, trailing_slash }) {
 				routeId: route && route.id,
 				status,
 				url,
+				form,
 				// The whole page store is updated, but this way the object reference stays the same
 				data: data_changed ? data : page.data
 			};
@@ -1203,13 +1208,10 @@ export function create_client({ target, base, trailing_slash }) {
 				goto(result.location, {}, []);
 			} else {
 				/** @type {Record<string, any>} */
-				const props = { form: result.data };
-
-				if (result.status !== page.status) {
-					page = { ...page, status: result.status };
-					props.page = page;
-				}
-
+				const props = {
+					form: result.data,
+					page: { ...page, form: result.data, status: result.status }
+				};
 				const post_update = pre_update();
 				root.$set(props);
 				post_update();

package/src/runtime/server/endpoint.js

@@ -54,7 +54,6 @@ export async function render_endpoint(event, mod, state) {
 		}
 
 		if (state.prerendering) {
-			response.headers.set('x-sveltekit-routeid', /** @type {string} */ (event.routeId));
 			response.headers.set('x-sveltekit-prerender', String(prerender));
 		}
 
@@ -77,13 +76,16 @@ export async function render_endpoint(event, mod, state) {
  * @param {import('types').RequestEvent} event
  */
 export function is_endpoint_request(event) {
-	const { method } = event.request;
+	const { method, headers } = event.request;
 
 	if (method === 'PUT' || method === 'PATCH' || method === 'DELETE') {
 		// These methods exist exclusively for endpoints
 		return true;
 	}
 
+	// use:enhance uses a custom header to disambiguate
+	if (method === 'POST' && headers.get('x-sveltekit-action') === 'true') return false;
+
 	// GET/POST requests may be for endpoints or pages. We prefer endpoints if this isn't a text/html request
 	const accept = event.request.headers.get('accept') ?? '*/*';
 	return negotiate(accept, ['*', 'text/html']) !== 'text/html';

package/src/runtime/server/index.js

@@ -296,6 +296,11 @@ export async function respond(request, options, state) {
 						}
 					}
 					add_cookies_to_headers(response.headers, Array.from(new_cookies.values()));
+
+					if (state.prerendering && event.routeId !== null) {
+						response.headers.set('x-sveltekit-routeid', event.routeId);
+					}
+
 					return response;
 				}),
 			// TODO remove for 1.0

package/src/runtime/server/page/render.js

@@ -98,7 +98,8 @@ export async function render_response({
 			routeId: event.routeId,
 			status,
 			url: event.url,
-			data
+			data,
+			form: form_value
 		};
 
 		// TODO remove this for 1.0

package/types/index.d.ts

@@ -302,6 +302,7 @@ export interface Page<Params extends Record<string, string> = Record<string, str
 	status: number;
 	error: App.Error | null;
 	data: App.PageData & Record<string, any>;
+	form: any;
 }
 
 export interface ParamMatcher {