@sveltejs/kit 1.15.9 → 1.15.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sveltejs/kit",
-  "version": "1.15.9",
+  "version": "1.15.11",
   "description": "The fastest way to build Svelte apps",
   "repository": {
     "type": "git",
@@ -20,7 +20,7 @@
     "magic-string": "^0.30.0",
     "mime": "^3.0.0",
     "sade": "^1.8.1",
-    "set-cookie-parser": "^2.5.1",
+    "set-cookie-parser": "^2.6.0",
     "sirv": "^2.0.2",
     "tiny-glob": "^0.2.9",
     "undici": "~5.22.0"
@@ -36,7 +36,7 @@
     "marked": "^4.2.3",
     "rollup": "^3.7.0",
     "svelte": "^3.56.0",
-    "svelte-preprocess": "^5.0.0",
+    "svelte-preprocess": "^5.0.3",
     "typescript": "^4.9.4",
     "uvu": "^0.5.6",
     "vite": "^4.3.0"

package/src/core/generate_manifest/index.js

@@ -43,17 +43,6 @@ export function generate_manifest({ build_data, relative_path, routes }) {
 		})
 	);
 
-	/** @typedef {{ index: number, path: string }} LookupEntry */
-	/** @type {Map<import('types').PageNode, LookupEntry>} */
-	const bundled_nodes = new Map();
-
-	build_data.manifest_data.nodes.forEach((node, i) => {
-		bundled_nodes.set(node, {
-			path: join_relative(relative_path, `/nodes/${i}.js`),
-			index: i
-		});
-	});
-
 	/** @type {(path: string) => string} */
 	const loader = (path) => `() => import('${path}')`;
 
@@ -68,14 +57,10 @@ export function generate_manifest({ build_data, relative_path, routes }) {
 	function get_nodes(indexes) {
 		let string = indexes.map((n) => reindexed.get(n) ?? '').join(',');
 
-		if (indexes.at(-1) === undefined) {
-			// since JavaScript ignores trailing commas, we need to insert a dummy
-			// comma so that the array has the correct length if the last item
-			// is undefined
-			string += ',';
-		}
-
-		return `[${string}]`;
+		// since JavaScript ignores trailing commas, we need to insert a dummy
+		// comma so that the array has the correct length if the last item
+		// is undefined
+		return `[${string},]`;
 	}
 
 	// prettier-ignore
@@ -94,12 +79,12 @@ export function generate_manifest({ build_data, relative_path, routes }) {
 				],
 				routes: [
 					${routes.map(route => {
+						if (!route.page && !route.endpoint) return;
+						
 						route.params.forEach(param => {
 							if (param.matcher) matchers.add(param.matcher);
 						});
 
-						if (!route.page && !route.endpoint) return;
-
 						return dedent`
 							{
 								id: ${s(route.id)},

package/src/exports/hooks/sequence.js

@@ -21,7 +21,7 @@ export function sequence(...handlers) {
 			return handle({
 				event,
 				resolve: (event, options) => {
-					/** @param {{ html: string, done: boolean }} opts */
+					/** @type {import('types').ResolveOptions['transformPageChunk']} */
 					const transformPageChunk = async ({ html, done }) => {
 						if (options?.transformPageChunk) {
 							html = (await options.transformPageChunk({ html, done })) ?? '';
@@ -34,9 +34,21 @@ export function sequence(...handlers) {
 						return html;
 					};
 
+					/** @type {import('types').ResolveOptions['filterSerializedResponseHeaders']} */
+					const filterSerializedResponseHeaders =
+						parent_options?.filterSerializedResponseHeaders ??
+						options?.filterSerializedResponseHeaders;
+
+					/** @type {import('types').ResolveOptions['preload']} */
+					const preload = parent_options?.preload ?? options?.preload;
+
 					return i < length - 1
-						? apply_handle(i + 1, event, { transformPageChunk })
-						: resolve(event, { transformPageChunk });
+						? apply_handle(i + 1, event, {
+								transformPageChunk,
+								filterSerializedResponseHeaders,
+								preload
+						  })
+						: resolve(event, { transformPageChunk, filterSerializedResponseHeaders, preload });
 				}
 			});
 		}

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

@@ -2,6 +2,7 @@ import fs from 'node:fs';
 import { mkdirp } from '../../../utils/filesystem.js';
 import { find_deps, resolve_symlinks } from './utils.js';
 import { s } from '../../../utils/misc.js';
+import { normalizePath } from 'vite';
 
 /**
  * @param {string} out
@@ -48,12 +49,6 @@ export function build_server_nodes(out, kit, manifest_data, server_manifest, cli
 		const fonts = [];
 
 		if (node.component && client_manifest) {
-			const entry = find_deps(client_manifest, node.component, true);
-
-			imported.push(...entry.imports);
-			stylesheets.push(...entry.stylesheets);
-			fonts.push(...entry.fonts);
-
 			exports.push(
 				`export const component = async () => (await import('../${
 					resolve_symlinks(server_manifest, node.component).chunk.file
@@ -62,14 +57,6 @@ export function build_server_nodes(out, kit, manifest_data, server_manifest, cli
 		}
 
 		if (node.universal) {
-			if (client_manifest) {
-				const entry = find_deps(client_manifest, node.universal, true);
-
-				imported.push(...entry.imports);
-				stylesheets.push(...entry.stylesheets);
-				fonts.push(...entry.fonts);
-			}
-
 			imports.push(`import * as universal from '../${server_manifest[node.universal].file}';`);
 			exports.push(`export { universal };`);
 			exports.push(`export const universal_id = ${s(node.universal)};`);
@@ -81,6 +68,18 @@ export function build_server_nodes(out, kit, manifest_data, server_manifest, cli
 			exports.push(`export const server_id = ${s(node.server)};`);
 		}
 
+		if (client_manifest && (node.universal || node.component)) {
+			const entry = find_deps(
+				client_manifest,
+				`${normalizePath(kit.outDir)}/generated/client-optimized/nodes/${i}.js`,
+				true
+			);
+
+			imported.push(...entry.imports);
+			stylesheets.push(...entry.stylesheets);
+			fonts.push(...entry.fonts);
+		}
+
 		exports.push(
 			`export const imports = ${s(imported)};`,
 			`export const stylesheets = ${s(stylesheets)};`,

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

@@ -1,5 +1,6 @@
 import fs from 'node:fs';
 import path from 'node:path';
+import { normalizePath } from 'vite';
 
 /**
  * Adds transitive JS and CSS dependencies to the js and css inputs.
@@ -72,7 +73,7 @@ export function find_deps(manifest, entry, add_dynamic_css) {
  */
 export function resolve_symlinks(manifest, file) {
 	while (!manifest[file]) {
-		const next = path.relative('.', fs.realpathSync(file));
+		const next = normalizePath(path.relative('.', fs.realpathSync(file)));
 		if (next === file) throw new Error(`Could not find file "${file}" in Vite manifest`);
 		file = next;
 	}

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

@@ -116,7 +116,7 @@ export async function dev(vite, vite_config, svelte_config) {
 			_: {
 				client: {
 					start: `${runtime_base}/client/start.js`,
-					app: `${svelte_config.kit.outDir}/generated/client/app.js`,
+					app: `${to_fs(svelte_config.kit.outDir)}/generated/client/app.js`,
 					imports: [],
 					stylesheets: [],
 					fonts: []

package/src/exports/vite/index.js

@@ -525,27 +525,6 @@ function kit({ svelte_config }) {
 				} else {
 					input['entry/start'] = `${runtime_directory}/client/start.js`;
 					input['entry/app'] = `${kit.outDir}/generated/client-optimized/app.js`;
-
-					/**
-					 * @param {string | undefined} file
-					 */
-					function add_input(file) {
-						if (!file) return;
-
-						const resolved = path.resolve(file);
-						const relative = decodeURIComponent(path.relative(kit.files.routes, resolved));
-
-						const name = relative.startsWith('..')
-							? path.basename(file).replace(/^\+/, '')
-							: relative.replace(/(\\|\/)\+/g, '-').replace(/[\\/]/g, '-');
-
-						input[`entry/${name}`] = resolved;
-					}
-
-					for (const node of manifest_data.nodes) {
-						add_input(node.component);
-						add_input(node.universal);
-					}
 				}
 
 				// see the kit.output.preloadStrategy option for details on why we have multiple options here

package/src/runtime/app/forms.js

@@ -1,19 +1,9 @@
 import * as devalue from 'devalue';
-import { client } from '../client/singletons.js';
+import { DEV } from 'esm-env';
+import { client_method } from '../client/singletons.js';
 import { invalidateAll } from './navigation.js';
-import { BROWSER, DEV } from 'esm-env';
-
-/**
- * @param {string} name
- */
-function guard(name) {
-	return () => {
-		throw new Error(`Cannot call ${name}(...) on the server`);
-	};
-}
 
-/** @type {import('$app/forms').applyAction} */
-export const applyAction = BROWSER ? client.apply_action : guard('applyAction');
+export const applyAction = client_method('apply_action');
 
 /** @type {import('$app/forms').deserialize} */
 export function deserialize(result) {

package/src/runtime/app/navigation.js

@@ -1,22 +1,17 @@
-import { BROWSER } from 'esm-env';
-import { client } from '../client/singletons.js';
-
-/**
- * @param {string} name
- */
-function guard(name) {
-	return () => {
-		throw new Error(`Cannot call ${name}(...) on the server`);
-	};
-}
-
-export const disableScrollHandling = BROWSER
-	? client.disable_scroll_handling
-	: guard('disableScrollHandling');
-export const goto = BROWSER ? client.goto : guard('goto');
-export const invalidate = BROWSER ? client.invalidate : guard('invalidate');
-export const invalidateAll = BROWSER ? client.invalidateAll : guard('invalidateAll');
-export const preloadData = BROWSER ? client.preload_data : guard('preloadData');
-export const preloadCode = BROWSER ? client.preload_code : guard('preloadCode');
-export const beforeNavigate = BROWSER ? client.before_navigate : () => {};
-export const afterNavigate = BROWSER ? client.after_navigate : () => {};
+import { client_method } from '../client/singletons.js';
+
+export const disableScrollHandling = /* @__PURE__ */ client_method('disable_scroll_handling');
+
+export const goto = /* @__PURE__ */ client_method('goto');
+
+export const invalidate = /* @__PURE__ */ client_method('invalidate');
+
+export const invalidateAll = /* @__PURE__ */ client_method('invalidate_all');
+
+export const preloadData = /* @__PURE__ */ client_method('preload_data');
+
+export const preloadCode = /* @__PURE__ */ client_method('preload_code');
+
+export const beforeNavigate = /* @__PURE__ */ client_method('before_navigate');
+
+export const afterNavigate = /* @__PURE__ */ client_method('after_navigate');

package/src/runtime/client/client.js

@@ -33,7 +33,7 @@ import * as devalue from 'devalue';
 import { INDEX_KEY, PRELOAD_PRIORITIES, SCROLL_KEY, SNAPSHOT_KEY } from './constants.js';
 import { validate_common_exports } from '../../utils/exports.js';
 import { compact } from '../../utils/array.js';
-import { validate_depends } from '../shared.js';
+import { INVALIDATED_PARAM, validate_depends } from '../shared.js';
 
 let errored = false;
 
@@ -1354,7 +1354,7 @@ export function create_client(app, target) {
 			return invalidate();
 		},
 
-		invalidateAll: () => {
+		invalidate_all: () => {
 			force_invalidation = true;
 			return invalidate();
 		},
@@ -1775,13 +1775,10 @@ export function create_client(app, target) {
 async function load_data(url, invalid) {
 	const data_url = new URL(url);
 	data_url.pathname = add_data_suffix(url.pathname);
-	if (DEV && url.searchParams.has('x-sveltekit-invalidated')) {
-		throw new Error('Cannot used reserved query parameter "x-sveltekit-invalidated"');
+	if (DEV && url.searchParams.has(INVALIDATED_PARAM)) {
+		throw new Error(`Cannot used reserved query parameter "${INVALIDATED_PARAM}"`);
 	}
-	data_url.searchParams.append(
-		'x-sveltekit-invalidated',
-		invalid.map((x) => (x ? '1' : '')).join('_')
-	);
+	data_url.searchParams.append(INVALIDATED_PARAM, invalid.map((i) => (i ? '1' : '0')).join(''));
 
 	const res = await native_fetch(data_url.href);
 

package/src/runtime/client/singletons.js

@@ -1,5 +1,6 @@
 import { writable } from 'svelte/store';
 import { create_updated_store, notifiable_store } from './utils.js';
+import { BROWSER } from 'esm-env';
 
 /** @type {import('./types').Client} */
 export let client;
@@ -13,6 +14,35 @@ export function init(opts) {
 	client = opts.client;
 }
 
+/**
+ * @template {keyof typeof client} T
+ * @param {T} key
+ * @returns {typeof client[T]}
+ */
+export function client_method(key) {
+	if (!BROWSER) {
+		if (key === 'before_navigate' || key === 'after_navigate') {
+			// @ts-expect-error doesn't recognize that both keys here return void so expects a async function
+			return () => {};
+		} else {
+			/** @type {Record<string, string>} */
+			const name_lookup = {
+				disable_scroll_handling: 'disableScrollHandling',
+				preload_data: 'preloadData',
+				preload_code: 'preloadCode',
+				invalidate_all: 'invalidateAll'
+			};
+
+			return () => {
+				throw new Error(`Cannot call ${name_lookup[key] ?? key}(...) on the server`);
+			};
+		}
+	} else {
+		// @ts-expect-error
+		return (...args) => client[key](...args);
+	}
+}
+
 export const stores = {
 	url: notifiable_store({}),
 	page: notifiable_store({}),

package/src/runtime/client/types.d.ts

@@ -54,7 +54,7 @@ export interface Client {
 	disable_scroll_handling(): void;
 	goto: typeof goto;
 	invalidate: typeof invalidate;
-	invalidateAll: typeof invalidateAll;
+	invalidate_all: typeof invalidateAll;
 	preload_code: typeof preloadCode;
 	preload_data: typeof preloadData;
 	apply_action: typeof applyAction;

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

@@ -8,8 +8,6 @@ import { text } from '../../../exports/index.js';
 import * as devalue from 'devalue';
 import { create_async_iterator } from '../../../utils/streaming.js';
 
-export const INVALIDATED_PARAM = 'x-sveltekit-invalidated';
-
 const encoder = new TextEncoder();
 
 /**

package/src/runtime/server/fetch.js

@@ -16,8 +16,6 @@ export function create_fetch({ event, options, manifest, state, get_cookie_heade
 	return async (info, init) => {
 		const original_request = normalize_fetch_input(info, init, event.url);
 
-		const request_body = init?.body;
-
 		// some runtimes (e.g. Cloudflare) error if you access `request.mode`,
 		// annoyingly, so we need to read the value from the `init` object instead
 		let mode = (info instanceof Request ? info.mode : init?.mode) ?? 'cors';
@@ -111,15 +109,6 @@ export function create_fetch({ event, options, manifest, state, get_cookie_heade
 					}
 				}
 
-				if (request_body && typeof request_body !== 'string' && !ArrayBuffer.isView(request_body)) {
-					// TODO is this still necessary? we just bail out below
-					// per https://developer.mozilla.org/en-US/docs/Web/API/Request/Request, this can be a
-					// Blob, BufferSource, FormData, URLSearchParams, USVString, or ReadableStream object.
-					// non-string bodies are irksome to deal with, but luckily aren't particularly useful
-					// in this context anyway, so we take the easy route and ban them
-					throw new Error('Request body must be a string or TypedArray');
-				}
-
 				if (!request.headers.has('accept')) {
 					request.headers.set('accept', '*/*');
 				}

package/src/runtime/server/index.js

@@ -41,8 +41,7 @@ export class Server {
 
 				this.#options.hooks = {
 					handle: module.handle || (({ event, resolve }) => resolve(event)),
-					// @ts-expect-error
-					handleError: module.handleError || (({ error }) => console.error(error?.stack)),
+					handleError: module.handleError || (({ error }) => console.error(error)),
 					handleFetch: module.handleFetch || (({ request, fetch }) => fetch(request))
 				};
 			} catch (error) {
@@ -51,8 +50,7 @@ export class Server {
 						handle: () => {
 							throw error;
 						},
-						// @ts-expect-error
-						handleError: ({ error }) => console.error(error?.stack),
+						handleError: ({ error }) => console.error(error),
 						handleFetch: ({ request, fetch }) => fetch(request)
 					};
 				} else {

package/src/runtime/server/respond.js

@@ -15,7 +15,7 @@ import {
 	strip_data_suffix
 } from '../../utils/url.js';
 import { exec } from '../../utils/routing.js';
-import { INVALIDATED_PARAM, redirect_json_response, render_data } from './data/index.js';
+import { redirect_json_response, render_data } from './data/index.js';
 import { add_cookies_to_headers, get_cookies } from './cookie.js';
 import { create_fetch } from './fetch.js';
 import { Redirect } from '../control.js';
@@ -27,6 +27,7 @@ import {
 import { get_option } from '../../utils/options.js';
 import { error, json, text } from '../../exports/index.js';
 import { action_json_redirect, is_action_json_request } from './page/actions.js';
+import { INVALIDATED_PARAM } from '../shared.js';
 
 /* global __SVELTEKIT_ADAPTER_NAME__ */
 
@@ -94,7 +95,10 @@ export async function respond(request, options, manifest, state) {
 	if (is_data_request) {
 		decoded = strip_data_suffix(decoded) || '/';
 		url.pathname = strip_data_suffix(url.pathname) || '/';
-		invalidated_data_nodes = url.searchParams.get(INVALIDATED_PARAM)?.split('_').map(Boolean);
+		invalidated_data_nodes = url.searchParams
+			.get(INVALIDATED_PARAM)
+			?.split('')
+			.map((node) => node === '1');
 		url.searchParams.delete(INVALIDATED_PARAM);
 	}
 

package/src/runtime/shared.js

@@ -10,3 +10,5 @@ export function validate_depends(route_id, dep) {
 		);
 	}
 }
+
+export const INVALIDATED_PARAM = 'x-sveltekit-invalidated';

package/types/ambient.d.ts

@@ -359,6 +359,10 @@ declare module '@sveltejs/kit/hooks' {
 
 	/**
 	 * A helper function for sequencing multiple `handle` calls in a middleware-like manner.
+	 * The behavior for the `handle` options is as follows:
+	 * - `transformPageChunk` is applied in reverse order and merged
+	 * - `preload` is applied in forward order, the first option "wins" and no `preload` options after it are called
+	 * - `filterSerializedResponseHeaders` behaves the same as `preload`
 	 *
 	 * ```js
 	 * /// file: src/hooks.server.js
@@ -372,6 +376,10 @@ declare module '@sveltejs/kit/hooks' {
 	 * 			// transforms are applied in reverse order
 	 * 			console.log('first transform');
 	 * 			return html;
+	 * 		},
+	 * 		preload: () => {
+	 * 			// this one wins as it's the first defined in the chain
+	 * 			console.log('first preload');
 	 * 		}
 	 * 	});
 	 * 	console.log('first post-processing');
@@ -385,6 +393,13 @@ declare module '@sveltejs/kit/hooks' {
 	 * 		transformPageChunk: ({ html }) => {
 	 * 			console.log('second transform');
 	 * 			return html;
+	 * 		},
+	 * 		preload: () => {
+	 * 			console.log('second preload');
+	 * 		},
+	 * 		filterSerializedResponseHeaders: () => {
+	 * 			// this one wins as it's the first defined in the chain
+	 *    		console.log('second filterSerializedResponseHeaders');
 	 * 		}
 	 * 	});
 	 * 	console.log('second post-processing');
@@ -398,7 +413,9 @@ declare module '@sveltejs/kit/hooks' {
 	 *
 	 * ```
 	 * first pre-processing
+	 * first preload
 	 * second pre-processing
+	 * second filterSerializedResponseHeaders
 	 * second transform
 	 * first transform
 	 * second post-processing

package/types/index.d.ts

@@ -557,16 +557,16 @@ export interface KitConfig {
 	 * If SvelteKit encounters an error while loading the page and detects that a new version has been deployed (using the `name` specified here, which defaults to a timestamp of the build) it will fall back to traditional full-page navigation.
 	 * Not all navigations will result in an error though, for example if the JavaScript for the next page is already loaded. If you still want to force a full-page navigation in these cases, use techniques such as setting the `pollInterval` and then using `beforeNavigate`:
 	 * ```html
-	 * /// +layout.svelte
+	 * /// file: +layout.svelte
 	 * <script>
-	 * import { beforeNavigate } from '$app/navigation';
-	 * import { updated } from '$app/stores';
+	 *   import { beforeNavigate } from '$app/navigation';
+	 *   import { updated } from '$app/stores';
 	 *
-	 * beforeNavigate(({ willUnload, to }) => {
-	 *   if ($updated && !willUnload && to?.url) {
-	 *     location.href = to.url.href;
-	 *   }
-	 * });
+	 *   beforeNavigate(({ willUnload, to }) => {
+	 *     if ($updated && !willUnload && to?.url) {
+	 *       location.href = to.url.href;
+	 *     }
+	 *   });
 	 * </script>
 	 * ```
 	 *