@sveltejs/kit 3.0.0-next.18 → 3.0.0-next.19

package/src/runtime/server/fetch.js

@@ -1,7 +1,7 @@
 import { parseSetCookie } from 'cookie';
 import { noop } from '../../utils/functions.js';
 import { respond } from './respond.js';
-import * as paths from '$app/paths/internal/server';
+import * as paths from '#app/paths';
 import { read_implementation } from './internal.js';
 import { has_prerendered_path } from './utils.js';
 import { fork_state_for_subrequest } from './state.js';

package/src/runtime/server/index.js

@@ -1,11 +1,10 @@
 import { noop } from '../../utils/functions.js';
-import { IN_WEBCONTAINER } from './constants.js';
+import { IN_WEBCONTAINER } from '../../constants.js';
 import { respond } from './respond.js';
 import { create_request_state } from './state.js';
 import { options, get_hooks } from '__SERVER__/internal.js';
 import { set_read_implementation, set_manifest, fix_stack_trace } from './internal.js';
 import { set_env } from '__sveltekit/env';
-import { SvelteKitError } from '@sveltejs/kit/internal';
 import { init_tracing } from '@sveltejs/kit/internal/server';
 import { DEV } from 'esm-env';
 import { init_transport } from '#app/internal/transport';
@@ -130,8 +129,13 @@ export class Server {
 					handle: module.handle || (({ event, resolve }) => resolve(event)),
 					handleError:
 						module.handleError ||
-						(({ error }) => {
-							if (error instanceof SvelteKitError) {
+						(({ kind, error, issues }) => {
+							if (kind === 'validation') {
+								console.error('Remote function schema validation failed:', issues);
+								return;
+							}
+
+							if (kind !== 'unknown') {
 								// don't log stack traces for 404s etc, it's all internal gubbins
 								return;
 							}
@@ -149,12 +153,6 @@ export class Server {
 							}
 						}),
 					handleFetch: module.handleFetch || (({ request, fetch }) => fetch(request)),
-					handleValidationError:
-						module.handleValidationError ||
-						(({ issues }) => {
-							console.error('Remote function schema validation failed:', issues);
-							return { message: 'Bad Request', status: 400 };
-						}),
 					reroute: module.reroute || noop
 				};
 
@@ -171,9 +169,6 @@ export class Server {
 						},
 						handleError: ({ error }) => console.error(error),
 						handleFetch: ({ request, fetch }) => fetch(request),
-						handleValidationError: () => {
-							return { message: 'Bad Request' };
-						},
 						reroute: noop
 					};
 				} else {
@@ -192,7 +187,7 @@ export class Server {
 			request,
 			this.#options,
 			this.#manifest,
-			create_request_state(options, this.#options.hooks)
+			create_request_state(options)
 		);
 
 		if (DEV) {

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

@@ -1,4 +1,5 @@
-/** @import { RequestEvent, ActionResult, Actions } from '@sveltejs/kit' */
+/** @import { RequestEvent, Actions } from '@sveltejs/kit' */
+/** @import { ActionResult } from '$app/forms' */
 /** @import { SSROptions, SSRNode, ServerNode } from 'types' */
 import { DEV } from 'esm-env';
 import { json } from '@sveltejs/kit';

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

@@ -1,5 +1,6 @@
 /** @import { Component } from 'svelte' */
-/** @import { ActionResult, RequestEvent, SSRManifest } from '@sveltejs/kit' */
+/** @import { RequestEvent, SSRManifest } from '@sveltejs/kit' */
+/** @import { ActionResult } from '$app/forms' */
 /** @import { PageNodeIndexes, RequestState, RequiredResolveOptions, ServerDataNode, SSRNode, SSROptions } from 'types' */
 import { text } from '@sveltejs/kit';
 import { Redirect } from '@sveltejs/kit/internal';
@@ -112,7 +113,10 @@ export async function render_page(event, state, page, options, manifest, nodes,
 		// 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 (ssr === false && !(state.prerendering && should_prerender_data)) {
+		if (
+			ssr === false &&
+			!((state.prerendering || state.prerender_default === true) && 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')) {
@@ -162,7 +166,7 @@ export async function render_page(event, state, page, options, manifest, nodes,
 
 		const data_serializer = server_data_serializer(event, state, options);
 		const data_serializer_json =
-			state.prerendering && should_prerender_data
+			(state.prerendering || state.prerender_default === true) && should_prerender_data
 				? server_data_serializer_json(event, state, options)
 				: null;
 

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

@@ -65,7 +65,7 @@ export async function load_server_data({ event, state, node, parent }) {
 		}
 	);
 
-	if (state.prerendering) {
+	if (state.prerendering || state.prerender_default === true) {
 		disable_search(url);
 	}
 

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

@@ -2,7 +2,8 @@
 import * as devalue from 'devalue';
 import { DEV } from 'esm-env';
 import { isRedirect, text } from '@sveltejs/kit';
-import * as paths from '$app/paths/internal/server';
+import * as paths from '#app/paths';
+import { relative } from '$app/paths/internal/server';
 import { hash } from '../../../utils/hash.js';
 import { serialize_data } from './serialize_data.js';
 import { s } from '../../../utils/misc.js';
@@ -42,7 +43,7 @@ import { has_custom_transporters, uneval } from '#app/internal/transport';
  *   event: import('@sveltejs/kit').RequestEvent;
  *   state: import('types').RequestState;
  *   resolve_opts: import('types').RequiredResolveOptions;
- *   action_result?: import('@sveltejs/kit').ActionResult;
+ *   action_result?: import('$app/forms').ActionResult;
  *   data_serializer: import('./types.js').ServerDataSerializer;
  *   error_components?: Array<import('svelte').Component | undefined>
  * }} opts
@@ -62,7 +63,7 @@ export async function render_response({
 	data_serializer,
 	error_components
 }) {
-	if (state.prerendering) {
+	if (state.prerendering || state.prerender_default === true) {
 		if (options.csp.mode === 'nonce') {
 			throw new Error('Cannot use prerendering if config.csp.mode === "nonce"');
 		}
@@ -110,11 +111,11 @@ export async function render_response({
 	let base_expression = s(paths.base);
 
 	const csp = new Csp(options.csp, {
-		prerender: !!state.prerendering
+		prerender: !!(state.prerendering || state.prerender_default === true)
 	});
 
 	// if appropriate, use relative paths for greater portability
-	if (paths.relative) {
+	if (relative) {
 		if (!state.prerendering?.fallback) {
 			// the relative path depth must reflect the URL the browser is actually at, which
 			// for a data request includes the `__data.json` suffix that was stripped during routing
@@ -316,7 +317,7 @@ export async function render_response({
 	 * @param {string[]} attributes
 	 */
 	const add_preload = (path, attributes) => {
-		if (options.link_header_preload && !state.prerendering) {
+		if (options.link_header_preload && !(state.prerendering || state.prerender_default === true)) {
 			link_headers.add(`<${encodeURI(path)}>; ${attributes.join('; ')}; nopush`);
 		} else {
 			head.add_link_tag(path, attributes);
@@ -357,7 +358,11 @@ export async function render_response({
 	if (page_config.ssr && page_config.csr) {
 		body += `\n\t\t\t${fetched
 			.map((item) =>
-				serialize_data(item, resolve_opts.filterSerializedResponseHeaders, !!state.prerendering)
+				serialize_data(
+					item,
+					resolve_opts.filterSerializedResponseHeaders,
+					!!(state.prerendering || state.prerender_default === true)
+				)
 			)
 			.join('\n\t\t\t')}`;
 	}
@@ -369,7 +374,8 @@ export async function render_response({
 		// import the env.js module so that it evaluates before any user code can evaluate.
 		// TODO revert to using top-level await once https://bugs.webkit.org/show_bug.cgi?id=242740 is fixed
 		// https://github.com/sveltejs/kit/pull/11601
-		const load_env_eagerly = client.uses_env_dynamic_public && !!state.prerendering;
+		const load_env_eagerly =
+			client.uses_env_dynamic_public && (state.prerendering || state.prerender_default === true);
 
 		if (load_env_eagerly) {
 			modulepreloads.add(`${paths.app_dir}/env.js`);
@@ -400,7 +406,7 @@ export async function render_response({
 			if (route && !state.prerendering.resolved_route_ids.has(route.id)) {
 				state.prerendering.resolved_route_ids.add(route.id);
 
-				const id_pathname = paths.base + route_id_resolution_pathname(paths.app_dir, route.id);
+				const id_pathname = paths.base + route_id_resolution_pathname(route.id);
 
 				state.prerendering.dependencies.set(
 					id_pathname,
@@ -587,14 +593,14 @@ export async function render_response({
 		'content-type': 'text/html'
 	});
 
-	if (state.prerendering) {
+	if (state.prerendering || state.prerender_default === true) {
 		// TODO read headers set with setHeaders and convert into http-equiv where possible
 		const csp_headers = csp.csp_provider.get_meta();
 		if (csp_headers) {
 			head.add_http_equiv(csp_headers);
 		}
 
-		if (state.prerendering.cache) {
+		if (state.prerendering?.cache) {
 			head.add_http_equiv(
 				`<meta http-equiv="cache-control" content="${state.prerendering.cache}">`
 			);

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

@@ -1,5 +1,6 @@
 /** @import { SSRManifest } from '@sveltejs/kit' */
-import { base, assets, relative } from '$app/paths/internal/server';
+import { base, assets } from '#app/paths';
+import { relative } from '$app/paths/internal/server';
 import { text } from '@sveltejs/kit';
 import { s } from '../../../utils/misc.js';
 import { find_route } from '../../../utils/routing.js';
@@ -20,7 +21,7 @@ export function generate_route_object(route, url, client) {
 		.join(',\n\t\t');
 
 	// stringified version of
-	/** @type {import('types').CSRRouteServer} */
+	/* @type {import('types').CSRRouteServer} */
 	return [
 		`{\n\tid: ${s(route.id)}`,
 		`errors: ${s(route.errors)}`,

package/src/runtime/server/remote-functions.js

@@ -1,10 +1,11 @@
-/** @import { ActionResult, RemoteForm, RequestEvent, SSRManifest } from '@sveltejs/kit' */
+/** @import { RemoteForm, RequestEvent, SSRManifest } from '@sveltejs/kit' */
+/** @import { ActionResult } from '$app/forms' */
 /** @import { RemoteFormInternals, RemoteFunctionData, RemoteFunctionResponse, RemoteInternals, RequestState, SSROptions } from 'types' */
 
 import { json, error } from '@sveltejs/kit';
 import { Redirect, SvelteKitError } from '@sveltejs/kit/internal';
 import { with_request_store, merge_tracing, record_span } from '@sveltejs/kit/internal/server';
-import { app_dir, base } from '$app/paths/internal/server';
+import { app_dir, base } from '#app/paths';
 import { is_form_content_type } from '../../utils/http.js';
 import { create_remote_key, parse_remote_arg, split_remote_key } from '../shared.js';
 import { stringify } from '#app/internal/transport';

package/src/runtime/server/respond.js

@@ -8,7 +8,7 @@ import {
 	record_span,
 	with_request_store
 } from '@sveltejs/kit/internal/server';
-import { base, app_dir } from '$app/paths/internal/server';
+import { base, app_dir } from '#app/paths';
 import { is_endpoint_request, render_endpoint } from './endpoint.js';
 import { render_page } from './page/index.js';
 import { render_response } from './page/render.js';
@@ -152,7 +152,7 @@ export async function internal_respond(request, options, manifest, state) {
 		 * for path resolution, then return the route object as a JS file.
 		 */
 		url.pathname = strip_resolution_suffix(url.pathname);
-		is_route_id_resolution_request = is_route_id_resolution_path(url.pathname, base, app_dir);
+		is_route_id_resolution_request = is_route_id_resolution_path(url.pathname);
 	} else if (is_data_request) {
 		url.pathname =
 			strip_data_suffix(url.pathname) +
@@ -339,11 +339,7 @@ export async function internal_respond(request, options, manifest, state) {
 
 	if (is_route_resolution_request) {
 		if (is_route_id_resolution_request) {
-			return resolve_route_by_id(
-				extract_route_id(resolved_path, app_dir),
-				new URL(request.url),
-				manifest
-			);
+			return resolve_route_by_id(extract_route_id(resolved_path), new URL(request.url), manifest);
 		}
 
 		return resolve_route(resolved_path, new URL(request.url), manifest);
@@ -429,7 +425,7 @@ export async function internal_respond(request, options, manifest, state) {
 					prerender = node.prerender ?? prerender;
 				} else if (page_nodes) {
 					config = page_nodes.get_config() ?? config;
-					prerender = page_nodes.prerender();
+					prerender = state.prerender_default = page_nodes.prerender();
 				}
 
 				if (state.emulator?.platform) {

package/src/runtime/server/state.js

@@ -1,4 +1,4 @@
-/** @import { InternalRequestOptions, RequestState, ServerHooks } from 'types' */
+/** @import { InternalRequestOptions, RequestState } from 'types' */
 
 /** Per-request caches and context flags — never carried into a fork. */
 function transient_fields() {
@@ -16,17 +16,15 @@ function transient_fields() {
 		is_in_remote_form_or_command: false,
 		is_in_remote_query: false,
 		is_in_remote_prerender: false,
-		is_in_render: false,
-		original_event: undefined
+		is_in_render: false
 	};
 }
 
 /**
  * @param {InternalRequestOptions} options
- * @param {ServerHooks} hooks
  * @returns {RequestState}
  */
-export function create_request_state(options, hooks) {
+export function create_request_state(options) {
 	// every field is initialized up front so the object shape stays stable
 	return {
 		getClientAddress: options.getClientAddress,
@@ -38,7 +36,6 @@ export function create_request_state(options, hooks) {
 		prerender_default: undefined,
 		error: false,
 		depth: 0,
-		handleValidationError: hooks.handleValidationError,
 		...transient_fields()
 	};
 }

package/src/types/ambient.d.ts

@@ -22,7 +22,7 @@
  */
 declare namespace App {
 	/**
-	 * Defines the common shape of expected and unexpected errors. Expected errors are thrown using the `error` function. Unexpected errors are handled by the `handleError` hooks which should return this shape.
+	 * Defines the common shape of expected and unexpected errors. Expected errors are thrown using the `error` function. Every error passes through the `handleError` hooks, which must return this shape (with `status` and `message` optional, since they default to those of the caught error).
 	 */
 	export interface Error {
 		status: number;

package/src/types/internal.d.ts

@@ -20,7 +20,6 @@ import {
 	ServerInit,
 	ClientInit,
 	Transport,
-	HandleValidationError,
 	RemoteFormIssue,
 	RemoteQuery,
 	RemoteLiveQuery
@@ -156,7 +155,6 @@ export interface ServerHooks {
 	handleFetch: HandleFetch;
 	handle: Handle;
 	handleError: HandleServerError;
-	handleValidationError: HandleValidationError;
 	reroute: Reroute;
 	transport?: Transport;
 	init?: ServerInit;
@@ -232,6 +230,7 @@ export interface PrerenderDependency {
 	body: null | string | Uint8Array;
 }
 
+/** Internal context for the prerendering process */
 export interface PrerenderOptions {
 	cache?: string; // including this here is a bit of a hack, but it makes it easy to add <meta http-equiv>
 	fallback?: boolean;
@@ -627,10 +626,15 @@ export interface RemotePrerenderInternals extends BaseRemoteInternals {
 }
 
 export type RemoteAnyQueryInternals =
-	RemoteQueryInternals | RemoteQueryBatchInternals | RemoteQueryLiveInternals;
+	| RemoteQueryInternals
+	| RemoteQueryBatchInternals
+	| RemoteQueryLiveInternals;
 
 export type RemoteInternals =
-	RemoteAnyQueryInternals | RemoteCommandInternals | RemoteFormInternals | RemotePrerenderInternals;
+	| RemoteAnyQueryInternals
+	| RemoteCommandInternals
+	| RemoteFormInternals
+	| RemotePrerenderInternals;
 
 export interface InternalRemoteFormIssue extends RemoteFormIssue {
 	name: string;
@@ -678,7 +682,6 @@ export interface RequestState {
 	 * Allows us to prevent `event.fetch` from making infinitely looping internal requests.
 	 */
 	readonly depth: number;
-	readonly handleValidationError: ServerHooks['handleValidationError'];
 	readonly remote: {
 		/** Resolved query/prerender data, populated by `await myQuery()` or `myQuery.set(...)` */
 		data: null | Map<RemoteInternals, Record<string, MaybePromise<any>>>;
@@ -729,11 +732,6 @@ export interface RequestState {
 	readonly is_in_remote_query: boolean;
 	readonly is_in_remote_prerender: boolean;
 	readonly is_in_render: boolean;
-	/**
-	 * The event before `derive_remote_function_event` hid or stubbed properties.
-	 * Hooks like `handleValidationError` receive this so `url` etc. stay accessible
-	 */
-	readonly original_event?: RequestEvent;
 }
 
 export interface RequestStore {

package/src/types/private.d.ts

@@ -239,11 +239,20 @@ export interface PrerenderInvalidUrlHandler {
 export type PrerenderHttpErrorHandlerValue = 'fail' | 'warn' | 'ignore' | PrerenderHttpErrorHandler;
 export type PrerenderMissingIdHandlerValue = 'fail' | 'warn' | 'ignore' | PrerenderMissingIdHandler;
 export type PrerenderUnseenRoutesHandlerValue =
-	'fail' | 'warn' | 'ignore' | PrerenderUnseenRoutesHandler;
+	| 'fail'
+	| 'warn'
+	| 'ignore'
+	| PrerenderUnseenRoutesHandler;
 export type PrerenderEntryGeneratorMismatchHandlerValue =
-	'fail' | 'warn' | 'ignore' | PrerenderEntryGeneratorMismatchHandler;
+	| 'fail'
+	| 'warn'
+	| 'ignore'
+	| PrerenderEntryGeneratorMismatchHandler;
 export type PrerenderInvalidUrlHandlerValue =
-	'fail' | 'warn' | 'ignore' | PrerenderInvalidUrlHandler;
+	| 'fail'
+	| 'warn'
+	| 'ignore'
+	| PrerenderInvalidUrlHandler;
 
 export type PrerenderOption = boolean | 'auto';
 

package/src/utils/error.js

@@ -36,23 +36,39 @@ export function normalize_error(error) {
 }
 
 /**
- * @param {any} transformed
- * @param {any} [error]
+ * @param {unknown} error
  */
-export function get_status(transformed, error) {
-	const err = error ?? transformed;
-	const status = err instanceof HttpError || err instanceof SvelteKitError ? err.status : 500;
-
-	if (error == null || typeof transformed?.status !== 'number') {
-		return status;
-	} else {
-		return transformed.status;
-	}
+export function get_status(error) {
+	return error instanceof HttpError || error instanceof SvelteKitError ? error.status : 500;
 }
 
 /**
- * @param {unknown} error
+ * Adds development-only compatibility accessors for the former top-level `status` and `message`
+ * properties of the `handleError` hook input.
+ * @template {object} T
+ * @param {T} input
+ * @param {{ status: number; message: string }} fallback
+ * @returns {T}
  */
-export function get_message(error) {
-	return error instanceof SvelteKitError ? error.text : 'Internal Error';
+export function add_deprecated_handle_error_properties(input, fallback) {
+	Object.defineProperties(input, {
+		status: {
+			get() {
+				console.warn(
+					'The `status` property of `handleError` is deprecated. Use `error.status` for expected and framework errors, or `500` for unexpected errors.'
+				);
+				return fallback.status;
+			}
+		},
+		message: {
+			get() {
+				console.warn(
+					"The `message` property of `handleError` is deprecated. Use `error.message` for expected and framework errors, or 'Internal Error' for unexpected errors."
+				);
+				return fallback.message;
+			}
+		}
+	});
+
+	return input;
 }

package/src/utils/page_nodes.js

@@ -1,3 +1,4 @@
+/** @import { UniversalNode, ServerNode } from 'types' */
 import {
 	validate_layout_exports,
 	validate_layout_server_exports,
@@ -42,10 +43,10 @@ export class PageNodes {
 	/**
 	 * @template {'prerender' | 'ssr' | 'csr' | 'trailingSlash'} Option
 	 * @param {Option} option
-	 * @returns {Value | undefined}
+	 * @returns {(UniversalNode | ServerNode)[Option] | undefined}
 	 */
 	#get_option(option) {
-		/** @typedef {(import('types').UniversalNode | import('types').ServerNode)[Option]} Value */
+		/** @typedef {(UniversalNode | ServerNode)[Option]} Value */
 
 		return this.data.reduce((value, node) => {
 			return node?.universal?.[option] ?? node?.server?.[option] ?? value;

package/src/utils/params.js

@@ -1,3 +1,4 @@
+/** @import { ParamMatcher } from '@sveltejs/kit/params' */
 import path from 'node:path';
 import { pathToFileURL } from 'node:url';
 
@@ -38,7 +39,7 @@ export function validate_param_matchers(params, names, file) {
  *   root: string;
  *   load?: (file: string) => Promise<Record<string, unknown>>;
  * }} opts
- * @returns {Promise<Record<string, import('@sveltejs/kit').ParamMatcher> | null>}
+ * @returns {Promise<Record<string, ParamMatcher> | null>}
  */
 export async function load_and_validate_params({ routes, params_path, root, load }) {
 	const names = collect_matcher_names(routes);
@@ -62,5 +63,5 @@ export async function load_and_validate_params({ routes, params_path, root, load
 		params_path
 	);
 
-	return /** @type {Record<string, import('@sveltejs/kit').ParamMatcher>} */ (module.params);
+	return /** @type {Record<string, ParamMatcher>} */ (module.params);
 }

package/src/utils/routing.js

@@ -1,3 +1,4 @@
+/** @import { ParamMatcher, ParamValue } from '@sveltejs/kit/params' */
 import { BROWSER } from 'esm-env';
 import { escape_for_regexp } from './regex.js';
 
@@ -146,7 +147,7 @@ export function get_route_segments(route) {
 }
 
 /**
- * @param {import('@sveltejs/kit').ParamMatcher} matcher
+ * @param {ParamMatcher} matcher
  * @param {string} value
  * @returns {{ success: true, value: any } | { success: false }}
  */
@@ -178,7 +179,7 @@ function run_matcher(matcher, value) {
 /**
  * @param {RegExpMatchArray} match
  * @param {import('types').RouteParam[]} params
- * @param {Record<string, import('@sveltejs/kit').ParamMatcher>} matchers
+ * @param {Record<string, ParamMatcher>} matchers
  */
 export function exec(match, params, matchers) {
 	/** @type {Record<string, any>} */
@@ -298,7 +299,7 @@ export const segment_pattern = new RegExp(
  * ); // `/blog/hello-world/something/else`
  * ```
  * @param {string} id
- * @param {Record<string, import('@sveltejs/kit').ParamValue | undefined>} params
+ * @param {Record<string, ParamValue | undefined>} params
  * @returns {string}
  */
 export function resolve_route(id, params) {
@@ -360,7 +361,7 @@ export function has_server_load(node) {
  * @template {{pattern: RegExp, params: import('types').RouteParam[]}} Route
  * @param {string} path - The decoded pathname to match
  * @param {Route[]} routes
- * @param {Record<string, import('@sveltejs/kit').ParamMatcher>} matchers
+ * @param {Record<string, ParamMatcher>} matchers
  * @returns {{ route: Route, params: Record<string, any> } | null}
  */
 export function find_route(path, routes, matchers) {

package/src/version.js

@@ -1,4 +1,4 @@
 // generated during release, do not modify
 
 /** @type {string} */
-export const VERSION = '3.0.0-next.18';
+export const VERSION = '3.0.0-next.19';