@sveltejs/kit 1.0.10 → 1.0.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sveltejs/kit",
-  "version": "1.0.10",
+  "version": "1.0.12",
   "repository": {
     "type": "git",
     "url": "https://github.com/sveltejs/kit",
@@ -22,7 +22,7 @@
     "set-cookie-parser": "^2.5.1",
     "sirv": "^2.0.2",
     "tiny-glob": "^0.2.9",
-    "undici": "5.14.0"
+    "undici": "5.15.0"
   },
   "devDependencies": {
     "@playwright/test": "^1.29.2",
@@ -34,7 +34,7 @@
     "@types/set-cookie-parser": "^2.4.2",
     "marked": "^4.2.3",
     "rollup": "^3.7.0",
-    "svelte": "^3.55.0",
+    "svelte": "^3.55.1",
     "svelte-preprocess": "^5.0.0",
     "typescript": "^4.9.4",
     "uvu": "^0.5.6",

package/src/core/prerender/prerender.js

@@ -413,7 +413,7 @@ export async function prerender() {
 				// People can opt out of this behavior by explicitly setting prerender to false
 				(should_prerender !== false && get_option(nodes, 'ssr') === false && !page?.server?.actions
 					? 'auto'
-					: false);
+					: should_prerender ?? false);
 
 			prerender_map.set(route.id, prerender);
 		}

package/src/runtime/client/client.js

@@ -467,7 +467,7 @@ export function create_client({ target, base }) {
 			!current.url ||
 			url.href !== current.url.href ||
 			current.error !== error ||
-			form !== undefined ||
+			(form !== undefined && form !== page.form) ||
 			data_changed;
 
 		if (page_changed) {
@@ -824,6 +824,12 @@ export function create_client({ target, base }) {
 						status = err.status;
 						error = err.body;
 					} else {
+						// Referenced node could have been removed due to redeploy, check
+						const updated = await stores.updated.check();
+						if (updated) {
+							return await native_navigation(url);
+						}
+
 						error = await handle_error(err, { params, url, route: { id: route.id } });
 					}
 

package/src/runtime/client/fetcher.js

@@ -24,12 +24,20 @@ if (DEV) {
 	check_stack_trace();
 
 	window.fetch = (input, init) => {
+		// Check if fetch was called via load_node. the lock method only checks if it was called at the
+		// same time, but not necessarily if it was called from `load`.
+		// We use just the filename as the method name sometimes does not appear on the CI.
 		const url = input instanceof Request ? input.url : input.toString();
-		const stack = /** @type {string} */ (new Error().stack);
+		const stack_array = /** @type {string} */ (new Error().stack).split('\n');
+		// We need to do some Firefox-specific cutoff because it (impressively) maintains the stack
+		// across events and for example traces a `fetch` call triggered from a button back
+		// to the creation of the event listener and the element creation itself,
+		// where at some point client.js will show up, leading to false positives.
+		const firefox_cutoff = stack_array.findIndex((a) => a.includes('*listen@'));
+		const stack = stack_array
+			.slice(0, firefox_cutoff !== -1 ? firefox_cutoff : undefined)
+			.join('\n');
 
-		// check if fetch was called via load_node. the lock method only checks if it was called at the
-		// same time, but not necessarily if it was called from `load`
-		// we use just the filename as the method name sometimes does not appear on the CI
 		const heuristic = can_inspect_stack_trace
 			? stack.includes('src/runtime/client/client.js')
 			: loading;

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

@@ -26,7 +26,7 @@ export interface Client {
 	// private API
 	_hydrate(opts: {
 		status: number;
-		error: App.Error;
+		error: App.Error | null;
 		node_ids: number[];
 		params: Record<string, string>;
 		route: { id: string | null };

package/src/runtime/client/utils.js

@@ -105,7 +105,7 @@ function parent_element(element) {
  */
 export function find_anchor(element, target) {
 	while (element && element !== target) {
-		if (element.nodeName.toUpperCase() === 'A') {
+		if (element.nodeName.toUpperCase() === 'A' && element.hasAttribute('href')) {
 			return /** @type {HTMLAnchorElement | SVGAElement} */ (element);
 		}
 

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

@@ -31,6 +31,8 @@ export async function render_data(
 		});
 	}
 
+	state.initiator = route;
+
 	try {
 		const node_ids = [...route.page.layouts, route.page.leaf];
 		const invalidated = invalidated_data_nodes ?? node_ids.map(() => true);

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

@@ -33,6 +33,12 @@ export async function load_server_data({ event, options, state, node, parent })
 
 	const result = await node.server.load?.call(null, {
 		...event,
+		fetch: (info, init) => {
+			const url = new URL(info instanceof Request ? info.url : info, event.url);
+			uses.dependencies.add(url.href);
+
+			return event.fetch(info, init);
+		},
 		/** @param {string[]} deps */
 		depends: (...deps) => {
 			for (const dep of deps) {

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

@@ -6,6 +6,7 @@ import { s } from '../../../utils/misc.js';
 import { Csp } from './csp.js';
 import { uneval_action_response } from './actions.js';
 import { clarify_devalue_error } from '../utils.js';
+import { DEV } from 'esm-env';
 
 // TODO rename this function/module
 
@@ -157,7 +158,7 @@ export async function render_response({
 	/** @param {string} path */
 	const prefixed = (path) => (path.startsWith('/') ? path : `${assets}/${path}`);
 
-	const serialized = { data: '', form: 'null' };
+	const serialized = { data: '', form: 'null', error: 'null' };
 
 	try {
 		serialized.data = `[${branch
@@ -195,6 +196,10 @@ export async function render_response({
 		serialized.form = uneval_action_response(form_value, /** @type {string} */ (event.route.id));
 	}
 
+	if (error) {
+		serialized.error = devalue.uneval(error);
+	}
+
 	if (inline_styles.size > 0) {
 		const content = Array.from(inline_styles.values()).join('\n');
 
@@ -255,17 +260,14 @@ export async function render_response({
 			const hydrate = [
 				`node_ids: [${branch.map(({ node }) => node.index).join(', ')}]`,
 				`data: ${serialized.data}`,
-				`form: ${serialized.form}`
+				`form: ${serialized.form}`,
+				`error: ${serialized.error}`
 			];
 
 			if (status !== 200) {
 				hydrate.push(`status: ${status}`);
 			}
 
-			if (error) {
-				hydrate.push(`error: ${devalue.uneval(error)}`);
-			}
-
 			if (options.embedded) {
 				hydrate.push(`params: ${devalue.uneval(event.params)}`, `route: ${s(event.route)}`);
 			}
@@ -353,17 +355,34 @@ export async function render_response({
 	// add the content after the script/css links so the link elements are parsed first
 	head += rendered.head;
 
+	const html = options.app_template({
+		head,
+		body,
+		assets,
+		nonce: /** @type {string} */ (csp.nonce)
+	});
+
 	// TODO flush chunks as early as we can
-	const html =
+	const transformed =
 		(await resolve_opts.transformPageChunk({
-			html: options.app_template({ head, body, assets, nonce: /** @type {string} */ (csp.nonce) }),
+			html,
 			done: true
 		})) || '';
 
+	if (DEV && page_config.csr) {
+		if (transformed.split('<!--').length < html.split('<!--').length) {
+			// the \u001B stuff is ANSI codes, so that we don't need to add a library to the runtime
+			// https://svelte.dev/repl/1b3f49696f0c44c881c34587f2537aa2
+			console.warn(
+				"\u001B[1m\u001B[31mRemoving comments in transformPageChunk can break Svelte's hydration\u001B[39m\u001B[22m"
+			);
+		}
+	}
+
 	const headers = new Headers({
 		'x-sveltekit-page': 'true',
 		'content-type': 'text/html',
-		etag: `"${hash(html)}"`
+		etag: `"${hash(transformed)}"`
 	});
 
 	if (!state.prerendering) {
@@ -381,7 +400,7 @@ export async function render_response({
 		}
 	}
 
-	return new Response(html, {
+	return new Response(transformed, {
 		status,
 		headers
 	});

package/types/index.d.ts

@@ -1080,7 +1080,7 @@ export type ActionResult<
  * Creates an `HttpError` object with an HTTP status code and an optional message.
  * This object, if thrown during request handling, will cause SvelteKit to
  * return an error response without invoking `handleError`
- * @param status The HTTP status code
+ * @param status The [HTTP status code](https://developer.mozilla.org/en-US/docs/Web/HTTP/Status#client_error_responses). Must be in the range 400-599.
  * @param body An object that conforms to the App.Error type. If a string is passed, it will be used as the message property.
  */
 export function error(status: number, body: App.Error): HttpError;
@@ -1094,15 +1094,16 @@ export function error(
  * The object returned by the [`error`](https://kit.svelte.dev/docs/modules#sveltejs-kit-error) function.
  */
 export interface HttpError {
-	/** The [HTTP status code](https://httpstatusdogs.com), in the range 400-599 */
+	/** The [HTTP status code](https://developer.mozilla.org/en-US/docs/Web/HTTP/Status#client_error_responses), in the range 400-599. */
 	status: number;
 	/** The content of the error. */
 	body: App.Error;
 }
 
 /**
- * Create a `Redirect` object. If thrown during request handling, SvelteKit will
- * return a redirect response.
+ * Create a `Redirect` object. If thrown during request handling, SvelteKit will return a redirect response.
+ * @param status The [HTTP status code](https://developer.mozilla.org/en-US/docs/Web/HTTP/Status#redirection_messages). Must be in the range 300-308.
+ * @param location The location to redirect to.
  */
 export function redirect(
 	status: 300 | 301 | 302 | 303 | 304 | 305 | 306 | 307 | 308,
@@ -1113,7 +1114,7 @@ export function redirect(
  * The object returned by the [`redirect`](https://kit.svelte.dev/docs/modules#sveltejs-kit-redirect) function
  */
 export interface Redirect {
-	/** The [HTTP status code](https://httpstatusdogs.com), in the range 300-308. */
+	/** The [HTTP status code](https://developer.mozilla.org/en-US/docs/Web/HTTP/Status#redirection_messages), in the range 300-308. */
 	status: 300 | 301 | 302 | 303 | 304 | 305 | 306 | 307 | 308;
 	/** The location to redirect to. */
 	location: string;
@@ -1128,6 +1129,8 @@ export function json(data: any, init?: ResponseInit): Response;
 
 /**
  * Create an `ActionFailure` object.
+ * @param status The [HTTP status code](https://developer.mozilla.org/en-US/docs/Web/HTTP/Status#client_error_responses). Must be in the range 400-599.
+ * @param data Data associated with the failure (e.g. validation errors)
  */
 export function fail<T extends Record<string, unknown> | undefined>(
 	status: number,
@@ -1139,7 +1142,9 @@ export function fail<T extends Record<string, unknown> | undefined>(
  */
 export interface ActionFailure<T extends Record<string, unknown> | undefined = undefined>
 	extends UniqueInterface {
+	/** The [HTTP status code](https://developer.mozilla.org/en-US/docs/Web/HTTP/Status#client_error_responses), in the range 400-599. */
 	status: number;
+	/** Data associated with the failure (e.g. validation errors) */
 	data: T;
 }
 

package/types/internal.d.ts

@@ -383,11 +383,8 @@ export * from './private';
 
 declare global {
 	const __SVELTEKIT_ADAPTER_NAME__: string;
-	const __SVELTEKIT_APP_VERSION__: string;
 	const __SVELTEKIT_APP_VERSION_FILE__: string;
 	const __SVELTEKIT_APP_VERSION_POLL_INTERVAL__: number;
-	const __SVELTEKIT_BROWSER__: boolean;
-	const __SVELTEKIT_DEV__: boolean;
 	const __SVELTEKIT_EMBEDDED__: boolean;
 	var Bun: object;
 	var Deno: object;