@sveltejs/kit 2.63.0 → 3.0.0-next.1

package/src/core/sync/write_types/index.js

@@ -1,9 +1,9 @@
 import fs from 'node:fs';
 import path from 'node:path';
-import process from 'node:process';
 import MagicString from 'magic-string';
-import { posixify, rimraf, walk } from '../../../utils/filesystem.js';
+import { rimraf, walk } from '../../../utils/filesystem.js';
 import { compact } from '../../../utils/array.js';
+import { posixify } from '../../../utils/os.js';
 import { ts } from '../ts.js';
 const remove_relative_parent_traversals = (/** @type {string} */ path) =>
 	path.replace(/\.\.\//g, '');
@@ -25,21 +25,20 @@ const is_whitespace = (/** @type {string} */ char) => /\s/.test(char);
  *  @typedef {Map<import('types').PageNode, {route: import('types').RouteData, proxies: Proxies}>} RoutesMap
  */
 
-const cwd = process.cwd();
-
 /**
  * Creates types for the whole manifest
  * @param {import('types').ValidatedConfig} config
  * @param {import('types').ManifestData} manifest_data
+ * @param {string} root The project root directory
  */
-export function write_all_types(config, manifest_data) {
+export function write_all_types(config, manifest_data, root) {
 	if (!ts) return;
 
 	const types_dir = `${config.kit.outDir}/types`;
 
 	// empty out files that no longer need to exist
 	const routes_dir = remove_relative_parent_traversals(
-		posixify(path.relative('.', config.kit.files.routes))
+		posixify(path.relative(root, config.kit.files.routes))
 	);
 	const expected_directories = new Set(
 		manifest_data.routes.map((route) => path.join(routes_dir, route.id))
@@ -109,7 +108,7 @@ export function write_all_types(config, manifest_data) {
 
 		const source_last_updated = Math.max(
 			// ctimeMs includes move operations whereas mtimeMs does not
-			...input_files.map((file) => fs.statSync(file).ctimeMs)
+			...input_files.map((file) => fs.statSync(path.resolve(root, file)).ctimeMs)
 		);
 		const types_last_updated = Math.max(...output_files.map((file) => file.updated));
 
@@ -124,7 +123,7 @@ export function write_all_types(config, manifest_data) {
 		if (should_generate) {
 			// track which old files end up being surplus to requirements
 			const to_delete = new Set(output_files.map((file) => file.name));
-			update_types(config, routes_map, route, to_delete);
+			update_types(config, routes_map, route, root, to_delete);
 			meta_data[route.id] = input_files;
 		}
 	}
@@ -138,8 +137,9 @@ export function write_all_types(config, manifest_data) {
  * @param {import('types').ValidatedConfig} config
  * @param {import('types').ManifestData} manifest_data
  * @param {string} file
+ * @param {string} root The project root directory
  */
-export function write_types(config, manifest_data, file) {
+export function write_types(config, manifest_data, file, root) {
 	if (!ts) return;
 
 	if (!path.basename(file).startsWith('+')) {
@@ -153,7 +153,7 @@ export function write_types(config, manifest_data, file) {
 	if (!route) return;
 	if (!route.leaf && !route.layout && !route.endpoint) return; // nothing to do
 
-	update_types(config, create_routes_map(manifest_data), route);
+	update_types(config, create_routes_map(manifest_data), route, root);
 }
 
 /**
@@ -176,11 +176,12 @@ function create_routes_map(manifest_data) {
  * @param {import('types').ValidatedConfig} config
  * @param {RoutesMap} routes
  * @param {import('types').RouteData} route
+ * @param {string} root The project root directory
  * @param {Set<string>} [to_delete]
  */
-function update_types(config, routes, route, to_delete = new Set()) {
+function update_types(config, routes, route, root, to_delete = new Set()) {
 	const routes_dir = remove_relative_parent_traversals(
-		posixify(path.relative('.', config.kit.files.routes))
+		posixify(path.relative(root, config.kit.files.routes))
 	);
 	const outdir = path.join(config.kit.outDir, 'types', routes_dir, route.id);
 
@@ -251,7 +252,7 @@ function update_types(config, routes, route, to_delete = new Set()) {
 			declarations: d,
 			exports: e,
 			proxies
-		} = process_node(route.leaf, outdir, true, route_info.proxies);
+		} = process_node(route.leaf, outdir, true, route_info.proxies, root);
 
 		exports.push(...e);
 		declarations.push(...d);
@@ -300,7 +301,7 @@ function update_types(config, routes, route, to_delete = new Set()) {
 					layout_params.push({ ...param, optional: true });
 				}
 
-				ensureProxies(page, leaf.proxies);
+				ensureProxies(page, leaf.proxies, root);
 
 				if (
 					// Be defensive - if a proxy doesn't exist (because it couldn't be created), assume a load function exists.
@@ -336,6 +337,7 @@ function update_types(config, routes, route, to_delete = new Set()) {
 			outdir,
 			false,
 			{ server: null, universal: null },
+			root,
 			all_pages_have_load
 		);
 
@@ -375,9 +377,10 @@ function update_types(config, routes, route, to_delete = new Set()) {
  * @param {string} outdir
  * @param {boolean} is_page
  * @param {Proxies} proxies
+ * @param {string} root The project root directory
  * @param {boolean} [all_pages_have_load]
  */
-function process_node(node, outdir, is_page, proxies, all_pages_have_load = true) {
+function process_node(node, outdir, is_page, proxies, root, all_pages_have_load = true) {
 	const params = `${is_page ? 'Route' : 'Layout'}Params`;
 	const prefix = is_page ? 'Page' : 'Layout';
 
@@ -393,7 +396,7 @@ function process_node(node, outdir, is_page, proxies, all_pages_have_load = true
 	/** @type {string} */
 	let data;
 
-	ensureProxies(node, proxies);
+	ensureProxies(node, proxies, root);
 
 	if (node.server) {
 		const basename = path.basename(node.server);
@@ -426,7 +429,7 @@ function process_node(node, outdir, is_page, proxies, all_pages_have_load = true
 				// The advantage is that type updates are reflected without saving.
 				const from = proxy.modified
 					? `./proxy${replace_ext_with_js(basename)}`
-					: path_to_original(outdir, node.server);
+					: path_to_original(outdir, node.server, root);
 
 				exports.push(
 					'type ExcludeActionFailure<T> = T extends Kit.ActionFailure<any> ? never : T extends void ? never : T;',
@@ -495,7 +498,7 @@ function process_node(node, outdir, is_page, proxies, all_pages_have_load = true
 				// The advantage is that type updates are reflected without saving.
 				const from = proxy.modified
 					? `./proxy${replace_ext_with_js(path.basename(file_path))}`
-					: path_to_original(outdir, file_path);
+					: path_to_original(outdir, file_path, root);
 				const type = `Kit.LoadProperties<Awaited<ReturnType<typeof import('${from}').load>>>`;
 				return expand ? `Expand<OptionalUnion<EnsureDefined<${type}>>>` : type;
 			} else {
@@ -515,24 +518,26 @@ function process_node(node, outdir, is_page, proxies, all_pages_have_load = true
  *
  * @param {import('types').PageNode} node
  * @param {Proxies} proxies
+ * @param {string} root The project root directory
  */
-function ensureProxies(node, proxies) {
+function ensureProxies(node, proxies, root) {
 	if (node.server && !proxies.server) {
-		proxies.server = createProxy(node.server, true);
+		proxies.server = createProxy(node.server, true, root);
 	}
 
 	if (node.universal && !proxies.universal) {
-		proxies.universal = createProxy(node.universal, false);
+		proxies.universal = createProxy(node.universal, false, root);
 	}
 }
 
 /**
  * @param {string} file_path
  * @param {boolean} is_server
+ * @param {string} root The project root directory
  * @returns {Proxy}
  */
-function createProxy(file_path, is_server) {
-	const proxy = tweak_types(fs.readFileSync(file_path, 'utf8'), is_server);
+function createProxy(file_path, is_server, root) {
+	const proxy = tweak_types(fs.readFileSync(path.resolve(root, file_path), 'utf8'), is_server);
 	if (proxy) {
 		return {
 			...proxy,
@@ -577,9 +582,10 @@ function get_parent_type(node, type) {
 /**
  * @param {string} outdir
  * @param {string} file_path
+ * @param {string} root The project root directory
  */
-function path_to_original(outdir, file_path) {
-	return posixify(path.relative(outdir, path.join(cwd, replace_ext_with_js(file_path))));
+function path_to_original(outdir, file_path, root) {
+	return posixify(path.relative(outdir, path.join(root, replace_ext_with_js(file_path))));
 }
 
 /**

package/src/core/utils.js

@@ -1,10 +1,10 @@
 import fs from 'node:fs';
 import path from 'node:path';
-import process from 'node:process';
 import { fileURLToPath } from 'node:url';
-import colors from 'kleur';
-import { posixify, to_fs } from '../utils/filesystem.js';
+import { styleText } from 'node:util';
+import { to_fs } from '../utils/vite.js';
 import { noop } from '../utils/functions.js';
+import { posixify } from '../utils/os.js';
 
 /**
  * Resolved path of the `runtime` directory
@@ -20,10 +20,14 @@ export const runtime_directory = posixify(fileURLToPath(new URL('../runtime', im
  * This allows us to import SvelteKit internals that aren't exposed via `pkg.exports` in a
  * way that works whether `@sveltejs/kit` is installed inside the project's `node_modules`
  * or in a workspace root
+ * @param {string} root
+ * @returns {string}
  */
-export const runtime_base = runtime_directory.startsWith(process.cwd())
-	? `/${path.relative('.', runtime_directory)}`
-	: to_fs(runtime_directory);
+export function get_runtime_base(root) {
+	return runtime_directory.startsWith(root)
+		? `/${path.relative(root, runtime_directory)}`
+		: to_fs(runtime_directory);
+}
 
 /** @param {{ verbose: boolean }} opts */
 export function logger({ verbose }) {
@@ -33,11 +37,10 @@ export function logger({ verbose }) {
 	/** @param {string} msg */
 	const err = (msg) => console.error(msg.replace(/^/gm, '  '));
 
-	log.success = (msg) => log(colors.green(`✔ ${msg}`));
-	log.error = (msg) => err(colors.bold().red(msg));
-	log.warn = (msg) => log(colors.bold().yellow(msg));
-
-	log.minor = verbose ? (msg) => log(colors.grey(msg)) : noop;
+	log.success = (msg) => log(styleText('green', `✔ ${msg}`));
+	log.error = (msg) => err(styleText(['bold', 'red'], msg));
+	log.warn = (msg) => log(styleText(['bold', 'yellow'], msg));
+	log.minor = verbose ? (msg) => log(styleText('grey', msg)) : noop;
 	log.info = verbose ? log : noop;
 
 	return log;

package/src/exports/index.js

@@ -14,19 +14,6 @@ import { text_encoder } from '../runtime/utils.js';
 
 export { VERSION } from '../version.js';
 
-// TODO 3.0: remove these types as they are not used anymore (we can't remove them yet because that would be a breaking change)
-/**
- * @template {number} TNumber
- * @template {any[]} [TArray=[]]
- * @typedef {TNumber extends TArray['length'] ? TArray[number] : LessThan<TNumber, [...TArray, TArray['length']]>} LessThan
- */
-
-/**
- * @template {number} TStart
- * @template {number} TEnd
- * @typedef {Exclude<TEnd | LessThan<TEnd>, LessThan<TStart>>} NumericRange
- */
-
 // Keep the status codes as `number` because restricting to certain numbers makes it unnecessarily hard to use compared to the benefits
 // (we have runtime errors already to check for invalid codes). Also see https://github.com/sveltejs/kit/issues/11780
 
@@ -44,7 +31,7 @@ export { VERSION } from '../version.js';
  * @param {number} status
  * @param {App.Error} body
  * @return {never}
- * @throws {HttpError} This error instructs SvelteKit to initiate HTTP error handling.
+ * @throws {import('./public.js').HttpError} This error instructs SvelteKit to initiate HTTP error handling.
  * @throws {Error} If the provided status is invalid (not between 400 and 599).
  */
 /**
@@ -58,7 +45,7 @@ export { VERSION } from '../version.js';
  * @param {number} status
  * @param {{ message: string } extends App.Error ? App.Error | string | undefined : never} [body]
  * @return {never}
- * @throws {HttpError} This error instructs SvelteKit to initiate HTTP error handling.
+ * @throws {import('./public.js').HttpError} This error instructs SvelteKit to initiate HTTP error handling.
  * @throws {Error} If the provided status is invalid (not between 400 and 599).
  */
 /**
@@ -69,7 +56,7 @@ export { VERSION } from '../version.js';
  * @param {number} 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 {{ message: string } extends App.Error ? App.Error | string | undefined : never} body An object that conforms to the App.Error type. If a string is passed, it will be used as the message property.
  * @return {never}
- * @throws {HttpError} This error instructs SvelteKit to initiate HTTP error handling.
+ * @throws {import('./public.js').HttpError} This error instructs SvelteKit to initiate HTTP error handling.
  * @throws {Error} If the provided status is invalid (not between 400 and 599).
  */
 export function error(status, body) {
@@ -85,7 +72,7 @@ export function error(status, body) {
  * @template {number} T
  * @param {unknown} e
  * @param {T} [status] The status to filter for.
- * @return {e is (HttpError & { status: T extends undefined ? never : T })}
+ * @return {e is (import('./public.js').HttpError & { status: T extends undefined ? never : T })}
  */
 export function isHttpError(e, status) {
 	if (!(e instanceof HttpError)) return false;
@@ -105,7 +92,7 @@ export function isHttpError(e, status) {
  *
  * @param {300 | 301 | 302 | 303 | 304 | 305 | 306 | 307 | 308 | ({} & number)} 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 {string | URL} location The location to redirect to.
- * @throws {Redirect} This error instructs SvelteKit to redirect to the specified location.
+ * @throws {import('./public.js').Redirect} This error instructs SvelteKit to redirect to the specified location.
  * @throws {Error} If the provided status is invalid or the location cannot be used as a header value.
  * @return {never}
  */
@@ -124,7 +111,7 @@ export function redirect(status, location) {
 /**
  * Checks whether this is a redirect thrown by {@link redirect}.
  * @param {unknown} e The object to check.
- * @return {e is Redirect}
+ * @return {e is import('./public.js').Redirect}
  */
 export function isRedirect(e) {
 	return e instanceof Redirect;
@@ -134,10 +121,9 @@ export function isRedirect(e) {
  * Create a JSON `Response` object from the supplied data.
  * @param {any} data The value that will be serialized as JSON.
  * @param {ResponseInit} [init] Options such as `status` and `headers` that will be added to the response. `Content-Type: application/json` and `Content-Length` headers will be added automatically.
+ * @deprecated use `Response.json`
  */
 export function json(data, init) {
-	// TODO deprecate this in favour of `Response.json` when it's
-	// more widely supported
 	const body = JSON.stringify(data);
 
 	// we can't just do `text(JSON.stringify(data), init)` because
@@ -162,6 +148,7 @@ export function json(data, init) {
  * Create a `Response` object from the supplied body.
  * @param {string} body The value that will be used as-is.
  * @param {ResponseInit} [init] Options such as `status` and `headers` that will be added to the response. A `Content-Length` header will be added automatically.
+ * @deprecated use `new Response`
  */
 export function text(body, init) {
 	const headers = new Headers(init?.headers);

package/src/exports/node/index.js

@@ -2,7 +2,6 @@ import { createReadStream } from 'node:fs';
 import { Readable } from 'node:stream';
 import { SvelteKitError } from '../internal/index.js';
 import { noop } from '../../utils/functions.js';
-import { get_set_cookies } from '../../utils/http.js';
 
 /**
  * @param {import('http').IncomingMessage} req
@@ -38,15 +37,11 @@ function get_raw_body(req, body_size_limit) {
 	return new ReadableStream({
 		start(controller) {
 			if (body_size_limit !== undefined && has_content_length && content_length > body_size_limit) {
-				let message = `Content-length of ${content_length} exceeds limit of ${body_size_limit} bytes.`;
-
-				if (body_size_limit === 0) {
-					// https://github.com/sveltejs/kit/pull/11589
-					// TODO this exists to aid migration — remove in a future version
-					message += ' To disable body size limits, specify Infinity rather than 0.';
-				}
-
-				const error = new SvelteKitError(413, 'Payload Too Large', message);
+				const error = new SvelteKitError(
+					413,
+					'Payload Too Large',
+					`Content-length of ${content_length} exceeds limit of ${body_size_limit} bytes.`
+				);
 
 				controller.error(error);
 				return;
@@ -133,9 +128,9 @@ export async function getRequest({ request, base, bodySizeLimit }) {
 		delete headers[':scheme'];
 	}
 
-	// TODO: Whenever Node >=22 is minimum supported version, we can use `request.readableAborted`
-	// @see https://github.com/nodejs/node/blob/5cf3c3e24c7257a0c6192ed8ef71efec8ddac22b/lib/internal/streams/readable.js#L1443-L1453
 	const controller = new AbortController();
+	// TODO: Whenever Node >=22.17 is the minimum supported version, we can do `if (request.readableAborted) controller.abort()` instead
+	// see https://github.com/nodejs/node/blob/5cf3c3e24c7257a0c6192ed8ef71efec8ddac22b/lib/internal/streams/readable.js#L1443-L1453
 	let errored = false;
 	let end_emitted = false;
 	request.once('error', () => (errored = true));
@@ -169,7 +164,7 @@ export async function getRequest({ request, base, bodySizeLimit }) {
 export async function setResponse(res, response) {
 	for (const [key, value] of response.headers) {
 		try {
-			res.setHeader(key, key === 'set-cookie' ? get_set_cookies(response.headers) : value);
+			res.setHeader(key, key === 'set-cookie' ? response.headers.getSetCookie() : value);
 		} catch (error) {
 			res.getHeaderNames().forEach((name) => res.removeHeader(name));
 			res.writeHead(500).end(String(error));

package/src/exports/public.d.ts

@@ -122,13 +122,12 @@ export interface Builder {
 	/** An array of all routes (including prerendered) */
 	routes: RouteDefinition[];
 
-	// TODO 3.0 remove this method
 	/**
 	 * Create separate functions that map to one or more routes of your app.
 	 * @param fn A function that groups a set of routes into an entry point
-	 * @deprecated Use `builder.routes` instead
+	 * @deprecated removed in 3.0. Use `builder.routes` instead
 	 */
-	createEntries: (fn: (route: RouteDefinition) => AdapterEntry) => Promise<void>;
+	createEntries?: (fn: (route: RouteDefinition) => AdapterEntry) => Promise<void>;
 
 	/**
 	 * Find all the assets imported by server files belonging to `routes`
@@ -141,7 +140,7 @@ export interface Builder {
 	generateFallback: (dest: string) => Promise<void>;
 
 	/**
-	 * Generate a module exposing build-time environment variables as `$env/dynamic/public` if the app uses it.
+	 * Generate a module exposing public environment variables as `$app/env/public` if the app uses it.
 	 */
 	generateEnvModule: () => void;
 
@@ -264,57 +263,50 @@ export interface Cookies {
 	/**
 	 * Gets a cookie that was previously set with `cookies.set`, or from the request headers.
 	 * @param name the name of the cookie
-	 * @param opts the options, passed directly to `cookie.parse`. See documentation [here](https://github.com/jshttp/cookie#cookieparsestr-options)
+	 * @param opts the options, passed directly to `cookie.parse`. See documentation [here](https://github.com/jshttp/cookie?tab=readme-ov-file#cookieparsecookiestr-options)
 	 */
-	get: (name: string, opts?: import('cookie').CookieParseOptions) => string | undefined;
+	get: (name: string, opts?: import('cookie').ParseOptions) => string | undefined;
 
 	/**
 	 * Gets all cookies that were previously set with `cookies.set`, or from the request headers.
-	 * @param opts the options, passed directly to `cookie.parse`. See documentation [here](https://github.com/jshttp/cookie#cookieparsestr-options)
+	 * @param opts the options, passed directly to `cookie.parse`. See documentation [here](https://github.com/jshttp/cookie?tab=readme-ov-file#cookieparsecookiestr-options)
 	 */
-	getAll: (opts?: import('cookie').CookieParseOptions) => Array<{ name: string; value: string }>;
+	getAll: (opts?: import('cookie').ParseOptions) => Array<{ name: string; value: string }>;
 
 	/**
 	 * Sets a cookie. This will add a `set-cookie` header to the response, but also make the cookie available via `cookies.get` or `cookies.getAll` during the current request.
 	 *
-	 * The `httpOnly` and `secure` options are `true` by default (except on http://localhost, where `secure` is `false`), and must be explicitly disabled if you want cookies to be readable by client-side JavaScript and/or transmitted over HTTP. The `sameSite` option defaults to `lax`.
+	 * The `httpOnly` and `secure` options are `true` by default (except on http://localhost, where `secure` is `false`), and must be explicitly disabled if you want cookies to be readable by client-side JavaScript and/or transmitted over HTTP.
 	 *
-	 * You must specify a `path` for the cookie. In most cases you should explicitly set `path: '/'` to make the cookie available throughout your app. You can use relative paths, or set `path: ''` to make the cookie only available on the current path and its children
+	 * The `path` option is `'/'` by default. You can use relative paths, or set `path: ''` to make the cookie only available on the current path and its children.
 	 * @param name the name of the cookie
 	 * @param value the cookie value
-	 * @param opts the options, passed directly to `cookie.serialize`. See documentation [here](https://github.com/jshttp/cookie#cookieserializename-value-options)
+	 * @param opts the options passed to `cookie.serialize` with the SvelteKit defaults described above. See documentation [here](https://github.com/jshttp/cookie?tab=readme-ov-file#cookiestringifysetcookiesetcookieobj-options)
 	 */
-	set: (
-		name: string,
-		value: string,
-		opts: import('cookie').CookieSerializeOptions & { path: string }
-	) => void;
+	set: (name: string, value: string, opts: import('cookie').SerializeOptions) => void;
 
 	/**
 	 * Deletes a cookie by setting its value to an empty string and setting the expiry date in the past.
 	 *
-	 * You must specify a `path` for the cookie. In most cases you should explicitly set `path: '/'` to make the cookie available throughout your app. You can use relative paths, or set `path: ''` to make the cookie only available on the current path and its children
+	 * The `httpOnly` and `secure` options are `true` by default (except on http://localhost, where `secure` is `false`), and must be explicitly disabled if you want cookies to be readable by client-side JavaScript and/or transmitted over HTTP.
+	 *
+	 * The `path` option is `'/'` by default. You can use relative paths, or set `path: ''` to make the cookie only available on the current path and its children.
 	 * @param name the name of the cookie
-	 * @param opts the options, passed directly to `cookie.serialize`. The `path` must match the path of the cookie you want to delete. See documentation [here](https://github.com/jshttp/cookie#cookieserializename-value-options)
+	 * @param opts the options passed to `cookie.serialize` with the SvelteKit defaults described above. See documentation [here](https://github.com/jshttp/cookie?tab=readme-ov-file#cookiestringifysetcookiesetcookieobj-options)
 	 */
-	delete: (name: string, opts: import('cookie').CookieSerializeOptions & { path: string }) => void;
+	delete: (name: string, opts: import('cookie').SerializeOptions) => void;
 
 	/**
 	 * Serialize a cookie name-value pair into a `Set-Cookie` header string, but don't apply it to the response.
 	 *
-	 * The `httpOnly` and `secure` options are `true` by default (except on http://localhost, where `secure` is `false`), and must be explicitly disabled if you want cookies to be readable by client-side JavaScript and/or transmitted over HTTP. The `sameSite` option defaults to `lax`.
-	 *
-	 * You must specify a `path` for the cookie. In most cases you should explicitly set `path: '/'` to make the cookie available throughout your app. You can use relative paths, or set `path: ''` to make the cookie only available on the current path and its children
+	 * The `httpOnly` and `secure` options are `true` by default (except on http://localhost, where `secure` is `false`), and must be explicitly disabled if you want cookies to be readable by client-side JavaScript and/or transmitted over HTTP.
 	 *
+	 * The `path` option is `'/'` by default. You can use relative paths, or set `path: ''` to make the cookie only available on the current path and its children.
 	 * @param name the name of the cookie
 	 * @param value the cookie value
-	 * @param opts the options, passed directly to `cookie.serialize`. See documentation [here](https://github.com/jshttp/cookie#cookieserializename-value-options)
+	 * @param opts the options passed to `cookie.serialize` with the SvelteKit defaults described above. See documentation [here](https://github.com/jshttp/cookie?tab=readme-ov-file#cookiestringifysetcookiesetcookieobj-options)
 	 */
-	serialize: (
-		name: string,
-		value: string,
-		opts: import('cookie').CookieSerializeOptions & { path: string }
-	) => string;
+	serialize: (name: string, value: string, opts: import('cookie').SerializeOptions) => string;
 }
 
 /**
@@ -329,9 +321,11 @@ export interface Emulator {
 }
 
 export interface KitConfig {
+	// TODO: remove this in 4.0
 	/**
 	 * Your [adapter](https://svelte.dev/docs/kit/adapters) is run when executing `vite build`. It determines how the output is converted for different platforms.
 	 * @default undefined
+	 * @deprecated removed in 3.0.0. Adapters should now be passed to the `sveltekit` Vite plugin in `vite.config.js`
 	 */
 	adapter?: Adapter;
 	/**
@@ -428,7 +422,7 @@ export interface KitConfig {
 		 *
 		 * To allow people to make `POST`, `PUT`, `PATCH`, or `DELETE` requests with a `Content-Type` of `application/x-www-form-urlencoded`, `multipart/form-data`, or `text/plain` to your app from other origins, you will need to disable this option. Be careful!
 		 * @default true
-		 * @deprecated Use `trustedOrigins: ['*']` instead
+		 * @deprecated removed in 3.0. Use `trustedOrigins: ['*']` instead
 		 */
 		checkOrigin?: boolean;
 		/**
@@ -462,27 +456,9 @@ export interface KitConfig {
 		 * @default "."
 		 */
 		dir?: string;
-		/**
-		 * A prefix that signals that an environment variable is safe to expose to client-side code. See [`$env/static/public`](https://svelte.dev/docs/kit/$env-static-public) and [`$env/dynamic/public`](https://svelte.dev/docs/kit/$env-dynamic-public). Note that Vite's [`envPrefix`](https://vitejs.dev/config/shared-options.html#envprefix) must be set separately if you are using Vite's environment variable handling - though use of that feature should generally be unnecessary.
-		 * @default "PUBLIC_"
-		 */
-		publicPrefix?: string;
-		/**
-		 * A prefix that signals that an environment variable is unsafe to expose to client-side code. Environment variables matching neither the public nor the private prefix will be discarded completely. See [`$env/static/private`](https://svelte.dev/docs/kit/$env-static-private) and [`$env/dynamic/private`](https://svelte.dev/docs/kit/$env-dynamic-private).
-		 * @default ""
-		 * @since 1.21.0
-		 */
-		privatePrefix?: string;
 	};
 	/** Experimental features. Here be dragons. These are not subject to semantic versioning, so breaking changes or removal can happen in any release. */
 	experimental?: {
-		/**
-		 * Whether to enable explicit environment variables using `src/env.js` or `src/env.ts`.
-		 * @since 2.62.0
-		 * @default false
-		 */
-		explicitEnvironmentVariables?: boolean;
-
 		/**
 		 * Options for enabling server-side [OpenTelemetry](https://opentelemetry.io/) tracing for SvelteKit operations including the [`handle` hook](https://svelte.dev/docs/kit/hooks#Server-hooks-handle), [`load` functions](https://svelte.dev/docs/kit/load), [form actions](https://svelte.dev/docs/kit/form-actions), and [remote functions](https://svelte.dev/docs/kit/remote-functions).
 		 * @default { server: false, serverFile: false }
@@ -627,6 +603,16 @@ export interface KitConfig {
 	 * Options related to the build output format
 	 */
 	output?: {
+		/**
+		 * Whether to use the [HTTP `Link` header](https://developer.mozilla.org/en-US/docs/Web/HTTP/Reference/Headers/Link) to preload assets instead of the [`<link>` HTML element](https://developer.mozilla.org/en-US/docs/Web/HTML/Reference/Elements/link) for non-prerendered pages.
+		 *
+		 * Note that some web servers such as Nginx and Apache have a default header size limit which may be easily exceeded.
+		 * If you are using one of these web servers, you may want to leave this as `false` or configure a higher limit.
+		 *
+		 * @default false
+		 * @since 3.0.0
+		 */
+		linkHeaderPreload?: boolean;
 		/**
 		 * SvelteKit will preload the JavaScript modules needed for the initial page to avoid import 'waterfalls', resulting in faster application startup. There
 		 * are three strategies with different trade-offs:
@@ -635,6 +621,7 @@ export interface KitConfig {
 		 * - `preload-mjs` - uses `<link rel="preload">` but with the `.mjs` extension which prevents double-parsing in Chromium. Some static webservers will fail to serve .mjs files with a `Content-Type: application/javascript` header, which will cause your application to break. If that doesn't apply to you, this is the option that will deliver the best performance for the largest number of users, until `modulepreload` is more widely supported.
 		 * @default "modulepreload"
 		 * @since 1.8.4
+		 * @deprecated removed in 3.0
 		 */
 		preloadStrategy?: 'modulepreload' | 'preload-js' | 'preload-mjs';
 		/**
@@ -643,7 +630,7 @@ export interface KitConfig {
 		 * - If `'single'`, creates just one .js bundle and one .css file containing code for the entire app.
 		 * - If `'inline'`, inlines all JavaScript and CSS of the entire app into the HTML. The result is usable without a server (i.e. you can just open the file in your browser).
 		 *
-		 * When using `'split'`, you can also adjust the bundling behaviour by setting [`output.experimentalMinChunkSize`](https://rollupjs.org/configuration-options/#output-experimentalminchunksize) and [`output.manualChunks`](https://rollupjs.org/configuration-options/#output-manualchunks) inside your Vite config's [`build.rollupOptions`](https://vite.dev/config/build-options.html#build-rollupoptions).
+		 * When using `'split'`, you can also adjust the bundling behaviour by setting [`output.codeSplitting`](https://rolldown.rs/reference/OutputOptions.codeSplitting) inside your Vite config's [`build.rolldownOptions`](https://vite.dev/config/build-options#build-rolldownoptions).
 		 *
 		 * If you want to inline your assets, you'll need to set Vite's [`build.assetsInlineLimit`](https://vite.dev/config/build-options.html#build-assetsinlinelimit) option to an appropriate size then import your assets through Vite.
 		 *
@@ -1288,13 +1275,6 @@ export interface NavigationGoto extends NavigationBase {
 	 * - `goto`: Navigation was triggered by a `goto(...)` call or a redirect
 	 */
 	type: 'goto';
-
-	// TODO 3.0 remove this property, so that it only exists when type is 'popstate'
-	// (would possibly be a breaking change to do it prior to that)
-	/**
-	 * In case of a history back/forward navigation, the number of steps to go back/forward
-	 */
-	delta?: undefined;
 }
 
 export interface NavigationLeave extends NavigationBase {
@@ -1303,13 +1283,6 @@ export interface NavigationLeave extends NavigationBase {
 	 * - `leave`: The app is being left either because the tab is being closed or a navigation to a different document is occurring
 	 */
 	type: 'leave';
-
-	// TODO 3.0 remove this property, so that it only exists when type is 'popstate'
-	// (would possibly be a breaking change to do it prior to that)
-	/**
-	 * In case of a history back/forward navigation, the number of steps to go back/forward
-	 */
-	delta?: undefined;
 }
 
 export interface NavigationFormSubmit extends NavigationBase {
@@ -1323,13 +1296,6 @@ export interface NavigationFormSubmit extends NavigationBase {
 	 * The `SubmitEvent` that caused the navigation
 	 */
 	event: SubmitEvent;
-
-	// TODO 3.0 remove this property, so that it only exists when type is 'popstate'
-	// (would possibly be a breaking change to do it prior to that)
-	/**
-	 * In case of a history back/forward navigation, the number of steps to go back/forward
-	 */
-	delta?: undefined;
 }
 
 export interface NavigationPopState extends NavigationBase {
@@ -1361,13 +1327,6 @@ export interface NavigationLink extends NavigationBase {
 	 * The `PointerEvent` that caused the navigation
 	 */
 	event: PointerEvent;
-
-	// TODO 3.0 remove this property, so that it only exists when type is 'popstate'
-	// (would possibly be a breaking change to do it prior to that)
-	/**
-	 * In case of a history back/forward navigation, the number of steps to go back/forward
-	 */
-	delta?: undefined;
 }
 
 export type Navigation =