@sveltejs/kit 2.20.6 → 2.20.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sveltejs/kit",
-  "version": "2.20.6",
+  "version": "2.20.8",
   "description": "SvelteKit is the fastest way to build Svelte apps",
   "keywords": [
     "framework",
@@ -31,7 +31,7 @@
     "sirv": "^3.0.0"
   },
   "devDependencies": {
-    "@playwright/test": "^1.44.1",
+    "@playwright/test": "^1.51.1",
     "@sveltejs/vite-plugin-svelte": "^5.0.1",
     "@types/connect": "^3.4.38",
     "@types/node": "^18.19.48",
@@ -41,8 +41,8 @@
     "svelte": "^5.23.1",
     "svelte-preprocess": "^6.0.0",
     "typescript": "^5.3.3",
-    "vite": "^6.0.11",
-    "vitest": "^3.0.1"
+    "vite": "^6.2.6",
+    "vitest": "^3.1.1"
   },
   "peerDependencies": {
     "@sveltejs/vite-plugin-svelte": "^3.0.0 || ^4.0.0-next.1 || ^5.0.0",

package/src/runtime/server/data/index.js

@@ -253,7 +253,7 @@ export function get_data_json(event, options, nodes) {
 				return JSON.stringify(node);
 			}
 
-			return `{"type":"data","data":${devalue.stringify(node.data, reducers)},${JSON.stringify(
+			return `{"type":"data","data":${devalue.stringify(node.data, reducers)},"uses":${JSON.stringify(
 				serialize_uses(node)
 			)}${node.slash ? `,"slash":${JSON.stringify(node.slash)}` : ''}}`;
 		});
@@ -263,6 +263,8 @@ export function get_data_json(event, options, nodes) {
 			chunks: count > 0 ? iterator : null
 		};
 	} catch (e) {
+		// @ts-expect-error
+		e.path = 'data' + e.path;
 		throw new Error(clarify_devalue_error(event, /** @type {any} */ (e)));
 	}
 }

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

@@ -15,6 +15,7 @@ import { render_response } from './render.js';
 import { respond_with_error } from './respond_with_error.js';
 import { get_data_json } from '../data/index.js';
 import { DEV } from 'esm-env';
+import { PageNodes } from '../../../utils/page_nodes.js';
 
 /**
  * The maximum request depth permitted before assuming we're stuck in an infinite loop
@@ -93,10 +94,13 @@ export async function render_page(event, page, options, manifest, state, nodes,
 		/** @type {import('./types.js').Fetched[]} */
 		const fetched = [];
 
+		const ssr = nodes.ssr();
+		const csr = nodes.csr();
+
 		// renders an empty 'shell' page if SSR is turned off and if there is
 		// no server data to prerender. As a result, the load functions and rendering
 		// only occur client-side.
-		if (nodes.ssr() === false && !(state.prerendering && should_prerender_data)) {
+		if (ssr === false && !(state.prerendering && should_prerender_data)) {
 			// if the user makes a request through a non-enhanced form, the returned value is lost
 			// because there is no SSR or client-side handling of the response
 			if (DEV && action_result && !event.request.headers.has('x-sveltekit-action')) {
@@ -117,7 +121,7 @@ export async function render_page(event, page, options, manifest, state, nodes,
 				fetched,
 				page_config: {
 					ssr: false,
-					csr: nodes.csr()
+					csr
 				},
 				status,
 				error: null,
@@ -171,8 +175,6 @@ export async function render_page(event, page, options, manifest, state, nodes,
 			});
 		});
 
-		const csr = nodes.csr();
-
 		/** @type {Array<Promise<Record<string, any> | null>>} */
 		const load_promises = nodes.data.map((node, i) => {
 			if (load_error) throw load_error;
@@ -244,16 +246,22 @@ export async function render_page(event, page, options, manifest, state, nodes,
 							let j = i;
 							while (!branch[j]) j -= 1;
 
+							const layouts = compact(branch.slice(0, j + 1));
+							const nodes = new PageNodes(layouts.map((layout) => layout.node));
+
 							return await render_response({
 								event,
 								options,
 								manifest,
 								state,
 								resolve_opts,
-								page_config: { ssr: true, csr: true },
+								page_config: {
+									ssr: nodes.ssr(),
+									csr: nodes.csr()
+								},
 								status,
 								error,
-								branch: compact(branch.slice(0, j + 1)).concat({
+								branch: layouts.concat({
 									node,
 									data: null,
 									server_data: null
@@ -294,8 +302,6 @@ export async function render_page(event, page, options, manifest, state, nodes,
 			});
 		}
 
-		const ssr = nodes.ssr();
-
 		return await render_response({
 			event,
 			options,
@@ -303,7 +309,7 @@ export async function render_page(event, page, options, manifest, state, nodes,
 			state,
 			resolve_opts,
 			page_config: {
-				csr: nodes.csr(),
+				csr,
 				ssr
 			},
 			status,

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

@@ -658,6 +658,8 @@ function get_data(event, options, nodes, csp, global) {
 			chunks: count > 0 ? iterator : null
 		};
 	} catch (e) {
+		// @ts-expect-error
+		e.path = e.path.slice(1);
 		throw new Error(clarify_devalue_error(event, /** @type {any} */ (e)));
 	}
 }

package/src/runtime/server/utils.js

@@ -133,7 +133,7 @@ export function redirect_response(status, location) {
  */
 export function clarify_devalue_error(event, error) {
 	if (error.path) {
-		return `Data returned from \`load\` while rendering ${event.route.id} is not serializable: ${error.message} (data${error.path})`;
+		return `Data returned from \`load\` while rendering ${event.route.id} is not serializable: ${error.message} (${error.path})`;
 	}
 
 	if (error.path === '') {

package/src/version.js

@@ -1,4 +1,4 @@
 // generated during release, do not modify
 
 /** @type {string} */
-export const VERSION = '2.20.6';
+export const VERSION = '2.20.8';