@sveltejs/kit 1.0.0-next.561 → 1.0.0-next.563

package/package.json

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

package/src/core/adapt/builder.js

@@ -93,24 +93,22 @@ export function create_builder({ config, build_data, routes, prerendered, log })
 
 				if (filtered.size > 0) {
 					await complete({
-						generateManifest: ({ relativePath, format }) =>
+						generateManifest: ({ relativePath }) =>
 							generate_manifest({
 								build_data,
 								relative_path: relativePath,
-								routes: Array.from(filtered),
-								format
+								routes: Array.from(filtered)
 							})
 					});
 				}
 			}
 		},
 
-		generateManifest: ({ relativePath, format }) => {
+		generateManifest: ({ relativePath }) => {
 			return generate_manifest({
 				build_data,
 				relative_path: relativePath,
-				routes,
-				format
+				routes
 			});
 		},
 
@@ -126,10 +124,6 @@ export function create_builder({ config, build_data, routes, prerendered, log })
 			return `${config.kit.outDir}/output/server`;
 		},
 
-		getStaticDirectory() {
-			return config.kit.files.assets;
-		},
-
 		getAppPath() {
 			return build_data.app_path;
 		},

package/src/core/generate_manifest/index.js

@@ -11,10 +11,9 @@ import { join_relative } from '../../utils/filesystem.js';
  *   build_data: import('types').BuildData;
  *   relative_path: string;
  *   routes: import('types').RouteData[];
- *   format?: 'esm' | 'cjs'
  * }} opts
  */
-export function generate_manifest({ build_data, relative_path, routes, format = 'esm' }) {
+export function generate_manifest({ build_data, relative_path, routes }) {
 	/**
 	 * @type {Map<any, number>} The new index of each node in the filtered nodes array
 	 */
@@ -55,13 +54,7 @@ export function generate_manifest({ build_data, relative_path, routes, format =
 	});
 
 	/** @type {(path: string) => string} */
-	const load =
-		format === 'esm'
-			? (path) => `import('${path}')`
-			: (path) => `Promise.resolve().then(() => require('${path}'))`;
-
-	/** @type {(path: string) => string} */
-	const loader = (path) => `() => ${load(path)}`;
+	const loader = (path) => `() => import('${path}')`;
 
 	const assets = build_data.manifest_data.assets.map((asset) => asset.file);
 	if (build_data.service_worker) {
@@ -115,7 +108,7 @@ export function generate_manifest({ build_data, relative_path, routes, format =
 				}).filter(Boolean).join(',\n\t\t\t\t')}
 			],
 			matchers: async () => {
-				${Array.from(matchers).map(type => `const { match: ${type} } = await ${load(join_relative(relative_path, `/entries/matchers/${type}.js`))}`).join('\n\t\t\t\t')}
+				${Array.from(matchers).map(type => `const { match: ${type} } = await import ('${(join_relative(relative_path, `/entries/matchers/${type}.js`))}')`).join('\n\t\t\t\t')}
 				return { ${Array.from(matchers).join(', ')} };
 			}
 		}

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

@@ -426,28 +426,29 @@ export async function dev(vite, vite_config, svelte_config) {
 							check_origin: svelte_config.kit.csrf.checkOrigin
 						},
 						dev: true,
-						handle_error: (error, event) => {
-							return (
-								hooks.handleError({
-									error: new Proxy(error, {
-										get: (target, property) => {
-											if (property === 'stack') {
-												return fix_stack_trace(error);
-											}
-
-											return Reflect.get(target, property, target);
+						handle_error: async (error, event) => {
+							const error_object = await hooks.handleError({
+								error: new Proxy(error, {
+									get: (target, property) => {
+										if (property === 'stack') {
+											return fix_stack_trace(error);
 										}
-									}),
-									event,
-
-									// TODO remove for 1.0
-									// @ts-expect-error
-									get request() {
-										throw new Error(
-											'request in handleError has been replaced with event. See https://github.com/sveltejs/kit/pull/3384 for details'
-										);
+
+										return Reflect.get(target, property, target);
 									}
-								}) ?? { message: event.route.id != null ? 'Internal Error' : 'Not Found' }
+								}),
+								event,
+
+								// TODO remove for 1.0
+								// @ts-expect-error
+								get request() {
+									throw new Error(
+										'request in handleError has been replaced with event. See https://github.com/sveltejs/kit/pull/3384 for details'
+									);
+								}
+							});
+							return (
+								error_object ?? { message: event.route.id != null ? 'Internal Error' : 'Not Found' }
 							);
 						},
 						hooks,

package/src/runtime/client/client.js

@@ -248,7 +248,7 @@ export function create_client({ target, base }) {
 			navigation_result = await server_fallback(
 				url,
 				{ id: null },
-				handle_error(new Error(`Not found: ${url.pathname}`), {
+				await handle_error(new Error(`Not found: ${url.pathname}`), {
 					url,
 					params: {},
 					route: { id: null }
@@ -268,7 +268,11 @@ export function create_client({ target, base }) {
 			if (redirect_chain.length > 10 || redirect_chain.includes(url.pathname)) {
 				navigation_result = await load_root_error_page({
 					status: 500,
-					error: handle_error(new Error('Redirect loop'), { url, params: {}, route: { id: null } }),
+					error: await handle_error(new Error('Redirect loop'), {
+						url,
+						params: {},
+						route: { id: null }
+					}),
 					url,
 					route: { id: null }
 				});
@@ -770,7 +774,7 @@ export function create_client({ target, base }) {
 			} catch (error) {
 				return load_root_error_page({
 					status: 500,
-					error: handle_error(error, { url, params, route: { id: route.id } }),
+					error: await handle_error(error, { url, params, route: { id: route.id } }),
 					url,
 					route
 				});
@@ -859,7 +863,7 @@ export function create_client({ target, base }) {
 						status = err.status;
 						error = err.body;
 					} else {
-						error = handle_error(err, { params, url, route: { id: route.id } });
+						error = await handle_error(err, { params, url, route: { id: route.id } });
 					}
 
 					const error_load = await load_nearest_error_page(i, branch, errors);
@@ -1385,7 +1389,7 @@ export function create_client({ target, base }) {
 				}, 20);
 			};
 
-			target.addEventListener('touchstart', trigger_prefetch);
+			target.addEventListener('touchstart', trigger_prefetch, { passive: true });
 			target.addEventListener('mousemove', handle_mousemove);
 			target.addEventListener('sveltekit:trigger_prefetch', trigger_prefetch);
 
@@ -1567,7 +1571,7 @@ export function create_client({ target, base }) {
 
 				result = await load_root_error_page({
 					status: error instanceof HttpError ? error.status : 500,
-					error: handle_error(error, { url, params, route }),
+					error: await handle_error(error, { url, params, route }),
 					url,
 					route
 				});
@@ -1619,7 +1623,7 @@ async function load_data(url, invalid) {
 /**
  * @param {unknown} error
  * @param {import('types').NavigationEvent} event
- * @returns {App.Error}
+ * @returns {import('../../../types/private.js').MaybePromise<App.Error>}
  */
 function handle_error(error, event) {
 	if (error instanceof HttpError) {
@@ -1717,8 +1721,8 @@ function reset_focus() {
 
 if (__SVELTEKIT_DEV__) {
 	// Nasty hack to silence harmless warnings the user can do nothing about
-	const warn = console.warn;
-	console.warn = (...args) => {
+	const console_warn = console.warn;
+	console.warn = function warn(...args) {
 		if (
 			args.length === 1 &&
 			/<(Layout|Page)(_[\w$]+)?> was created (with unknown|without expected) prop '(data|form)'/.test(
@@ -1727,6 +1731,6 @@ if (__SVELTEKIT_DEV__) {
 		) {
 			return;
 		}
-		warn(...args);
+		console_warn(...args);
 	};
 }

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

@@ -87,7 +87,7 @@ export async function render_data(event, route, options, state, trailing_slash)
 		let length = promises.length;
 		const nodes = await Promise.all(
 			promises.map((p, i) =>
-				p.catch((error) => {
+				p.catch(async (error) => {
 					if (error instanceof Redirect) {
 						throw error;
 					}
@@ -97,7 +97,7 @@ export async function render_data(event, route, options, state, trailing_slash)
 
 					return /** @type {import('types').ServerErrorNode} */ ({
 						type: 'error',
-						error: handle_error_and_jsonify(event, options, error),
+						error: await handle_error_and_jsonify(event, options, error),
 						status: error instanceof HttpError ? error.status : undefined
 					});
 				})
@@ -117,15 +117,10 @@ export async function render_data(event, route, options, state, trailing_slash)
 		const error = normalize_error(e);
 
 		if (error instanceof Redirect) {
-			return json_response(
-				JSON.stringify({
-					type: 'redirect',
-					location: error.location
-				})
-			);
+			return redirect_json_response(error);
 		} else {
 			// TODO make it clearer that this was an unexpected error
-			return json_response(JSON.stringify(handle_error_and_jsonify(event, options, error)));
+			return json_response(JSON.stringify(await handle_error_and_jsonify(event, options, error)));
 		}
 	}
 }
@@ -143,3 +138,15 @@ function json_response(json, status = 200) {
 		}
 	});
 }
+
+/**
+ * @param {Redirect} redirect
+ */
+export function redirect_json_response(redirect) {
+	return json_response(
+		JSON.stringify({
+			type: 'redirect',
+			location: redirect.location
+		})
+	);
+}

package/src/runtime/server/index.js

@@ -13,7 +13,7 @@ import {
 	strip_data_suffix
 } from '../../utils/url.js';
 import { exec } from '../../utils/routing.js';
-import { INVALIDATED_HEADER, render_data } from './data/index.js';
+import { INVALIDATED_HEADER, 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';
@@ -289,12 +289,25 @@ export async function respond(request, options, state) {
 			}
 		}
 
+		// Edge case: If user does `return Response(30x)` in handle hook while processing a data request,
+		// we need to transform the redirect response to a corresponding JSON response.
+		if (is_data_request && response.status >= 300 && response.status <= 308) {
+			const location = response.headers.get('location');
+			if (location) {
+				return redirect_json_response(new Redirect(/** @type {any} */ (response.status), location));
+			}
+		}
+
 		return response;
 	} catch (error) {
 		if (error instanceof Redirect) {
-			return redirect_response(error.status, error.location);
+			if (is_data_request) {
+				return redirect_json_response(error);
+			} else {
+				return redirect_response(error.status, error.location);
+			}
 		}
-		return handle_fatal_error(event, options, error);
+		return await handle_fatal_error(event, options, error);
 	}
 
 	/**
@@ -386,7 +399,7 @@ export async function respond(request, options, state) {
 			return await fetch(request);
 		} catch (error) {
 			// HttpError from endpoint can end up here - TODO should it be handled there instead?
-			return handle_fatal_error(event, options, error);
+			return await handle_fatal_error(event, options, error);
 		} finally {
 			event.cookies.set = () => {
 				throw new Error('Cannot use `cookies.set(...)` after the response has been generated');

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

@@ -72,7 +72,7 @@ export async function handle_action_json_request(event, options, server) {
 		return action_json(
 			{
 				type: 'error',
-				error: handle_error_and_jsonify(event, options, check_incorrect_invalid_use(error))
+				error: await handle_error_and_jsonify(event, options, check_incorrect_invalid_use(error))
 			},
 			{
 				status: error instanceof HttpError ? error.status : 500

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

@@ -223,7 +223,7 @@ export async function render_page(event, route, page, options, state, resolve_op
 					}
 
 					const status = err instanceof HttpError ? err.status : 500;
-					const error = handle_error_and_jsonify(event, options, err);
+					const error = await handle_error_and_jsonify(event, options, err);
 
 					while (i--) {
 						if (page.errors[i]) {

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

@@ -80,7 +80,7 @@ export async function respond_with_error({ event, options, state, status, error,
 				csr: get_option([default_layout], 'csr') ?? true
 			},
 			status,
-			error: handle_error_and_jsonify(event, options, error),
+			error: await handle_error_and_jsonify(event, options, error),
 			branch,
 			fetched,
 			event,
@@ -96,7 +96,7 @@ export async function respond_with_error({ event, options, state, status, error,
 		return static_error_page(
 			options,
 			error instanceof HttpError ? error.status : 500,
-			handle_error_and_jsonify(event, options, error).message
+			(await handle_error_and_jsonify(event, options, error)).message
 		);
 	}
 }

package/src/runtime/server/utils.js

@@ -113,10 +113,10 @@ export function static_error_page(options, status, message) {
  * @param {import('types').SSROptions} options
  * @param {unknown} error
  */
-export function handle_fatal_error(event, options, error) {
+export async function handle_fatal_error(event, options, error) {
 	error = error instanceof HttpError ? error : coalesce_to_error(error);
 	const status = error instanceof HttpError ? error.status : 500;
-	const body = handle_error_and_jsonify(event, options, error);
+	const body = await handle_error_and_jsonify(event, options, error);
 
 	// ideally we'd use sec-fetch-dest instead, but Safari — quelle surprise — doesn't support it
 	const type = negotiate(event.request.headers.get('accept') || 'text/html', [
@@ -138,7 +138,7 @@ export function handle_fatal_error(event, options, error) {
  * @param {import('types').RequestEvent} event
  * @param {import('types').SSROptions} options
  * @param {any} error
- * @returns {App.Error}
+ * @returns {import('types').MaybePromise<App.Error>}
  */
 export function handle_error_and_jsonify(event, options, error) {
 	if (error instanceof HttpError) {

package/types/index.d.ts

@@ -72,12 +72,11 @@ export interface Builder {
 	 */
 	createEntries(fn: (route: RouteDefinition) => AdapterEntry): Promise<void>;
 
-	generateManifest(opts: { relativePath: string; format?: 'esm' | 'cjs' }): string;
+	generateManifest(opts: { relativePath: string }): string;
 
 	getBuildDirectory(name: string): string;
 	getClientDirectory(): string;
 	getServerDirectory(): string;
-	getStaticDirectory(): string;
 	/** The application path including any configured base path */
 	getAppPath(): string;
 
@@ -242,12 +241,20 @@ export interface Handle {
 	}): MaybePromise<Response>;
 }
 
+/**
+ * If an unexpected error is thrown during loading or rendering, this function will be called with the error and the event.
+ * Make sure that this function _never_ throws an error.
+ */
 export interface HandleServerError {
-	(input: { error: unknown; event: RequestEvent }): void | App.Error;
+	(input: { error: unknown; event: RequestEvent }): MaybePromise<void | App.Error>;
 }
 
+/**
+ * If an unexpected error is thrown during loading or the following render, this function will be called with the error and the event.
+ * Make sure that this function _never_ throws an error.
+ */
 export interface HandleClientError {
-	(input: { error: unknown; event: NavigationEvent }): void | App.Error;
+	(input: { error: unknown; event: NavigationEvent }): MaybePromise<void | App.Error>;
 }
 
 export interface HandleFetch {

package/types/internal.d.ts

@@ -298,7 +298,7 @@ export interface SSROptions {
 		check_origin: boolean;
 	};
 	dev: boolean;
-	handle_error(error: Error & { frame?: string }, event: RequestEvent): App.Error;
+	handle_error(error: Error & { frame?: string }, event: RequestEvent): MaybePromise<App.Error>;
 	hooks: ServerHooks;
 	manifest: SSRManifest;
 	paths: {

package/types/private.d.ts

@@ -21,9 +21,7 @@ export interface AdapterEntry {
 	 * A function that is invoked once the entry has been created. This is where you
 	 * should write the function to the filesystem and generate redirect manifests.
 	 */
-	complete(entry: {
-		generateManifest(opts: { relativePath: string; format?: 'esm' | 'cjs' }): string;
-	}): MaybePromise<void>;
+	complete(entry: { generateManifest(opts: { relativePath: string }): string }): MaybePromise<void>;
 }
 
 // Based on https://github.com/josh-hemphill/csp-typed-directives/blob/latest/src/csp.types.ts