@sveltejs/kit 3.0.0-next.22 → 3.0.0-next.24

package/src/runtime/server/respond.js

@@ -1,6 +1,6 @@
 /** @import { SSRNode } from 'types' */
 import { DEV } from 'esm-env';
-import { json, text } from '@sveltejs/kit';
+import { text } from '@sveltejs/kit';
 import { Redirect, SvelteKitError } from '@sveltejs/kit/internal';
 import {
 	merge_tracing,
@@ -111,7 +111,7 @@ export async function internal_respond(request, options, manifest, state) {
 				})
 			) {
 				const message = 'Cross-site remote requests are forbidden';
-				return json({ message }, { status: 403 });
+				return Response.json({ message }, { status: 403 });
 			}
 		} else if (options.csrf_check_origin) {
 			const forbidden = is_csrf_forbidden({
@@ -126,7 +126,7 @@ export async function internal_respond(request, options, manifest, state) {
 				const opts = { status: 403 };
 
 				if (request.headers.get('accept') === 'application/json') {
-					return json({ message }, opts);
+					return Response.json({ message }, opts);
 				}
 
 				return text(message, opts);
@@ -754,6 +754,26 @@ export async function internal_respond(request, options, manifest, state) {
 			// if this request came direct from the user, rather than
 			// via our own `fetch`, render a 404 page
 			if (state.depth === 0) {
+				// Error-page data requests only invalidate the root layout.
+				if (
+					!state.prerendering &&
+					is_data_request &&
+					invalidated_data_nodes?.length === 1 &&
+					invalidated_data_nodes[0]
+				) {
+					return await render_data(
+						event,
+						state,
+						{ page: { layouts: [], leaf: 0 } },
+						options,
+						manifest,
+						invalidated_data_nodes,
+						// there is no route to take a trailing slash option from, and the
+						// SSR'd error page sees the pathname as-is
+						'ignore'
+					);
+				}
+
 				if (non_html_fetch_destinations.has(event.request.headers.get('sec-fetch-dest') ?? '')) {
 					return text('Not Found', {
 						status: 404,

package/src/telemetry.js

@@ -1,36 +1,4 @@
-/** @import { Tracer, Span, SpanContext } from '@opentelemetry/api' */
-
-/**
- * Tracer implementation that does nothing (null object).
- * @type {Tracer}
- */
-export const noop_tracer = {
-	/**
-	 * @returns {Span}
-	 */
-	startSpan() {
-		return noop_span;
-	},
-
-	/**
-	 * @param {unknown} _name
-	 * @param {unknown} arg_1
-	 * @param {unknown} [arg_2]
-	 * @param {Function} [arg_3]
-	 * @returns {unknown}
-	 */
-	startActiveSpan(_name, arg_1, arg_2, arg_3) {
-		if (typeof arg_1 === 'function') {
-			return arg_1(noop_span);
-		}
-		if (typeof arg_2 === 'function') {
-			return arg_2(noop_span);
-		}
-		if (typeof arg_3 === 'function') {
-			return arg_3(noop_span);
-		}
-	}
-};
+/** @import { Span, SpanContext } from '@opentelemetry/api' */
 
 /**
  * @type {Span}

package/src/types/ambient-private.d.ts

@@ -1,18 +1,10 @@
-/** Internal version of $app/paths */
-declare module '__sveltekit/paths' {
-	export let base: '' | `/${string}`;
-	export let assets: '' | `https://${string}` | `http://${string}` | '/_svelte_kit_assets';
-	export let app_dir: string;
-	export let relative: boolean;
-	export function reset(): void;
-	export function override(paths: { base: string; assets: string }): void;
-	export function set_assets(path: string): void;
-}
-
 /** Internal version of $app/server */
-declare module '__sveltekit/server' {
+declare module '<sveltekit:generated>/server.js' {
 	import { SSRManifest } from '@sveltejs/kit';
+	import { SSROptions, ServerHooks } from 'types';
 
+	export const options: SSROptions;
+	export const get_hooks: () => Promise<Partial<ServerHooks>>;
 	export let fix_stack_trace: (error: Error) => string;
 	export let manifest: SSRManifest;
 	export function read_implementation(path: string): ReadableStream;
@@ -21,7 +13,7 @@ declare module '__sveltekit/server' {
 	export function set_read_implementation(fn: (path: string) => ReadableStream): void;
 }
 
-declare module '__sveltekit/env' {
+declare module '<sveltekit:generated>/env/config.js' {
 	// exported environment variables are defined in env.d.ts
 
 	/** Populate exported environment variables */
@@ -34,20 +26,20 @@ declare module '__sveltekit/env' {
 	export const rendered_env: Record<string, any>;
 }
 
-declare module '__sveltekit/env/private' {
+declare module '<sveltekit:generated>/env/private/server.js' {
 	// exported environment variables are defined in env.d.ts
 }
 
-declare module '__sveltekit/env/public/client' {
+declare module '<sveltekit:generated>/env/public/client.js' {
 	// exported environment variables are defined in env.d.ts
 }
 
-declare module '__sveltekit/env/public/server' {
+declare module '<sveltekit:generated>/env/public/server.js' {
 	// exported environment variables are defined in env.d.ts
 }
 
 /** Internal version of $app/manifest */
-declare module '__sveltekit/manifest-data' {
+declare module '<sveltekit:generated>/app-manifest.js' {
 	export const immutable: Array<{ path: string }>;
 	export const assets: Array<{ path: string }>;
 	export const prerendered: Array<{ path: string }>;

package/src/types/internal.d.ts

@@ -8,9 +8,10 @@ import {
 	Actions,
 	RequestEvent,
 	SSRManifest,
-	Emulator
+	Emulator,
+	HttpError
 } from '@sveltejs/kit';
-import { RemoteFormIssue, RemoteQuery, RemoteLiveQuery } from '@sveltejs/kit/remote';
+import { RemoteFormIssue, RemoteQuery, RemoteLiveQuery } from '$app/server';
 import { Config } from '@sveltejs/kit/vite';
 import {
 	ClientInit,
@@ -61,10 +62,17 @@ export interface AssetDependencies {
 	file: string;
 	imports: string[];
 	stylesheets: string[];
-	fonts: string[];
+	fonts: FontDependency[];
 	stylesheet_map: Map<string, { css: Set<string>; assets: Set<string> }>;
 }
 
+export interface FontDependency {
+	/** emitted file path, relative to the client output directory */
+	file: string;
+	/** the source file path relative to the project root, before hashing and character sanitization */
+	filename: string;
+}
+
 export interface BuildData {
 	app_dir: string;
 	app_path: string;
@@ -97,7 +105,7 @@ export interface BuildData {
 		 */
 		routes?: SSRClientRoute[];
 		stylesheets: string[];
-		fonts: string[];
+		fonts: FontDependency[];
 		/**
 		 * Whether the client uses public dynamic env vars — `$env/dynamic/public` or `$app/env/public`.
 		 */
@@ -292,6 +300,14 @@ export interface RouteData {
 	} | null;
 }
 
+/**
+ * The server-side form of `ActionResult`, before the error is passed
+ * through `handleError` and the data is serialized
+ */
+export type ServerActionResult =
+	| Exclude<import('$app/forms').ActionResult, { type: 'error' }>
+	| { type: 'error'; location: string; error: Error | HttpError };
+
 export type ServerRedirectNode = {
 	type: 'redirect';
 	status: number;
@@ -449,7 +465,7 @@ export interface SSRNode {
 	/** external CSS files that are loaded on the client */
 	stylesheets: string[];
 	/** external font files that are loaded on the client */
-	fonts: string[];
+	fonts: FontDependency[];
 
 	universal_id?: string;
 	server_id?: string;

package/src/types/private.d.ts

@@ -154,7 +154,7 @@ export interface CspDirectives {
 	>;
 }
 
-export type HttpMethod = 'GET' | 'HEAD' | 'POST' | 'PUT' | 'DELETE' | 'PATCH' | 'OPTIONS';
+export type HttpMethod = 'GET' | 'HEAD' | 'POST' | 'PUT' | 'DELETE' | 'PATCH' | 'OPTIONS' | 'QUERY';
 
 export interface Logger {
 	(msg: string): void;

package/src/utils/exports.js

@@ -79,6 +79,7 @@ const valid_server_exports = new Set([
 	'DELETE',
 	'OPTIONS',
 	'HEAD',
+	'QUERY',
 	'fallback',
 	'prerender',
 	'trailingSlash',

package/src/utils/filesystem.js

@@ -63,30 +63,18 @@ export function copy(source, target, opts = {}) {
 /**
  * Get a list of all files in a directory
  * @param {string} cwd - the directory to walk
- * @param {boolean} [dirs] - whether to include directories in the result
- * @returns {string[]} a list of all found files (and possibly directories) relative to `cwd`
+ * @param {string} [dir] - the subdirectory to walk, relative to `cwd`
+ * @returns {Generator<string>} the posix paths of all found files, relative to `cwd`
  */
-export function walk(cwd, dirs = false) {
-	/** @type {string[]} */
-	const all_files = [];
-
-	/** @param {string} dir */
-	function walk_dir(dir) {
-		const files = fs.readdirSync(path.join(cwd, dir));
-
-		for (const file of files) {
-			const joined = path.join(dir, file);
-			const stats = fs.statSync(path.join(cwd, joined));
-			if (stats.isDirectory()) {
-				if (dirs) all_files.push(joined);
-				walk_dir(joined);
-			} else {
-				all_files.push(joined);
-			}
+export function* walk(cwd, dir = '') {
+	for (const file of fs.readdirSync(path.join(cwd, dir))) {
+		const joined = dir ? `${dir}/${file}` : file;
+		if (fs.statSync(path.join(cwd, joined)).isDirectory()) {
+			yield* walk(cwd, joined);
+		} else {
+			yield joined;
 		}
 	}
-
-	return (walk_dir(''), all_files);
 }
 
 /**

package/src/utils/functions.js

@@ -16,3 +16,13 @@ export function once(fn) {
 		return (result = fn());
 	};
 }
+
+/**
+ * @param {string} name
+ * @param {string} [parens]
+ */
+export function disallow_on_server(name, parens = '(...)') {
+	return () => {
+		throw new Error(`Cannot call \`${name}${parens}\` on the server`);
+	};
+}

package/src/utils/promise.js

@@ -0,0 +1,25 @@
+/**
+ * Replacement for `Promise.withResolvers()` that does not require the native
+ * static method, which only shipped in Safari 17.4 / Chrome 119 / Firefox 121.
+ *
+ * The client remote-function runtime is bundled and shipped to browsers verbatim
+ * (Vite 8's default build target is Safari 16.4 / Chrome 111) and is not
+ * polyfilled, so it must not assume `Promise.withResolvers` exists. The
+ * server-side and build-time call sites run on Node 22+ and keep using the
+ * native method.
+ *
+ * @template T
+ * @returns {PromiseWithResolvers<T>}
+ */
+export function with_resolvers() {
+	let resolve;
+	let reject;
+
+	const promise = new Promise((res, rej) => {
+		resolve = res;
+		reject = rej;
+	});
+
+	// @ts-expect-error `resolve` and `reject` are assigned!
+	return { promise, resolve, reject };
+}

package/src/utils/routing.js

@@ -116,17 +116,6 @@ export function parse_route_id(id) {
 	return { pattern, params };
 }
 
-const optional_param_regex = /\/\[\[[\w-]+?(?:=[\w-]+)?\]\]/;
-
-/**
- * Removes optional params from a route ID.
- * @param {string} id
- * @returns The route id with optional params removed
- */
-export function remove_optional_params(id) {
-	return id.replace(optional_param_regex, '');
-}
-
 /**
  * Returns `false` for `(group)` segments
  * @param {string} segment

package/src/utils/url.js

@@ -82,17 +82,6 @@ export function decode_pathname(pathname) {
 	return pathname.split('%25').map(decodeURI).join('%25');
 }
 
-/** @param {Record<string, string>} params */
-export function decode_params(params) {
-	for (const key in params) {
-		// input has already been decoded by decodeURI
-		// now handle the rest
-		params[key] = decodeURIComponent(params[key]);
-	}
-
-	return params;
-}
-
 /**
  * The error when a URL is malformed is not very helpful, so we augment it with the URI
  * @param {string} uri

package/src/version.js

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