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

package/package.json

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

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/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));
 		}
 

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 {