@sveltejs/kit 3.0.0-next.20 → 3.0.0-next.21

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

@@ -74,9 +74,9 @@ export function is_app_route(route) {
  * @param {import('types').ValidatedConfig} config
  */
 export function create_assets(config) {
-	return list_files(config.kit.files.assets).map((file) => ({
+	return list_files(config.files.assets).map((file) => ({
 		file,
-		size: fs.statSync(path.resolve(config.kit.files.assets, file)).size,
+		size: fs.statSync(path.resolve(config.files.assets, file)).size,
 		type: lookup(file) || null
 	}));
 }
@@ -86,9 +86,9 @@ export function create_assets(config) {
  * @param {string} cwd
  */
 function create_hooks(config, cwd) {
-	const client = resolve_entry(config.kit.files.hooks.client);
-	const server = resolve_entry(config.kit.files.hooks.server);
-	const universal = resolve_entry(config.kit.files.hooks.universal);
+	const client = resolve_entry(config.files.hooks.client);
+	const server = resolve_entry(config.files.hooks.server);
+	const universal = resolve_entry(config.files.hooks.universal);
 
 	return {
 		client: client && posixify(path.relative(cwd, client)),
@@ -102,7 +102,7 @@ function create_hooks(config, cwd) {
  * @param {string} cwd
  */
 function resolve_params(config, cwd) {
-	const params_file = resolve_entry(config.kit.files.params);
+	const params_file = resolve_entry(config.files.params);
 	return params_file ? posixify(path.relative(cwd, params_file)) : null;
 }
 
@@ -115,15 +115,15 @@ function create_routes_and_nodes(cwd, config, fallback) {
 	/** @type {import('types').RouteData[]} */
 	let routes = [];
 
-	const routes_base = posixify(path.relative(cwd, config.kit.files.routes));
+	const routes_base = posixify(path.relative(cwd, config.files.routes));
 
-	const valid_extensions = [...config.extensions, ...config.kit.moduleExtensions];
+	const valid_extensions = [...config.extensions, ...config.moduleExtensions];
 
 	/** @type {import('types').PageNode[]} */
 	const nodes = [];
 
 	// create route data by processing files in `src/routes`
-	if (fs.existsSync(config.kit.files.routes)) {
+	if (fs.existsSync(config.files.routes)) {
 		/**
 		 * @param {number} depth
 		 * @param {string} id
@@ -280,10 +280,10 @@ function create_routes_and_nodes(cwd, config, fallback) {
 					project_relative,
 					file.name,
 					config.extensions,
-					config.kit.moduleExtensions
+					config.moduleExtensions
 				);
 
-				if (config.kit.router.type === 'hash' && item.kind === 'server') {
+				if (config.router.type === 'hash' && item.kind === 'server') {
 					throw new Error(
 						`Cannot use server-only files in an app with \`router.type === 'hash': ${project_relative}`
 					);

package/src/core/sync/sync.js

@@ -18,7 +18,7 @@ import { write_env } from './write_env.js';
  * @param {string} root The project root directory
  */
 export function init(config, root) {
-	write_tsconfig(config.kit, root);
+	write_tsconfig(config, root);
 }
 
 /**
@@ -29,12 +29,12 @@ export function init(config, root) {
 export function create(config, root) {
 	const manifest_data = create_manifest_data({ config, cwd: root });
 
-	const output = path.join(config.kit.outDir, 'generated');
+	const output = path.join(config.outDir, 'generated');
 
-	write_client_manifest(config.kit, manifest_data, `${output}/client`);
+	write_client_manifest(config, manifest_data, `${output}/client`);
 	write_server(config, output, root);
 	write_all_types(config, manifest_data, root);
-	write_app_types(config.kit, manifest_data, root);
+	write_app_types(config, manifest_data, root);
 
 	return { manifest_data };
 }
@@ -64,7 +64,7 @@ export function update(config, manifest_data, file, root) {
 		}
 
 		write_types(config, manifest_data, file, root);
-		write_app_types(config.kit, manifest_data, root);
+		write_app_types(config, manifest_data, root);
 	} catch (error) {
 		// A route file can disappear before the watcher delivers its unlink event. In that case,
 		// the manifest is stale and must be rebuilt instead of incrementally updated.
@@ -97,13 +97,13 @@ export function all_types(config, root) {
 	init(config, root);
 	const manifest_data = create_manifest_data({ config, cwd: root });
 	write_all_types(config, manifest_data, root);
-	write_app_types(config.kit, manifest_data, root);
+	write_app_types(config, manifest_data, root);
 }
 
 /**
  * Generate modules and types for explicit env vars
  * @param {typeof import('vite')} vite
- * @param {import('types').ValidatedKitConfig} kit
+ * @param {import('types').ValidatedConfig} kit
  * @param {string | null} entry
  * @param {string} root The Vite root
  * @param {string} mode The Vite mode
@@ -122,5 +122,5 @@ export async function env(vite, kit, entry, root, mode) {
  * @param {string} root The project root directory
  */
 export function server(config, root) {
-	write_server(config, path.join(config.kit.outDir, 'generated'), root);
+	write_server(config, path.join(config.outDir, 'generated'), root);
 }

package/src/core/sync/write_app_types.js

@@ -101,7 +101,7 @@ declare module "svelte/elements" {
 /**
  * Generate app types interface extension
  * @param {import('types').ManifestData} manifest_data
- * @param {import('types').ValidatedKitConfig} config
+ * @param {import('types').ValidatedConfig} config
  * @param {string} dir
  */
 function generate_app_types(manifest_data, config, dir) {
@@ -297,7 +297,7 @@ function generate_app_types(manifest_data, config, dir) {
  * Writes `node_modules/$app/types/index.d.ts`. This file contains
  * declarations for `$app/types` and `svelte/elements`, and
  * imports `env.ts` which declares `$app/env/(public|private)`
- * @param {import('types').ValidatedKitConfig} config
+ * @param {import('types').ValidatedConfig} config
  * @param {import('types').ManifestData} manifest_data
  * @param {string} root
  */

package/src/core/sync/write_client_manifest.js

@@ -5,7 +5,7 @@ import { s } from '../../utils/misc.js';
 /**
  * Writes the client manifest to disk. The manifest is used to power the router. It contains the
  * list of routes and corresponding Svelte components (i.e. pages and layouts).
- * @param {import('types').ValidatedKitConfig} kit
+ * @param {import('types').ValidatedConfig} kit
  * @param {import('types').ManifestData} manifest_data
  * @param {string} output
  * @param {import('types').ServerMetadata['nodes']} [metadata] If this is omitted, we have to assume that all routes with a `+layout/page.server.js` file have a server load function

package/src/core/sync/write_server.js

@@ -30,31 +30,31 @@ import error from '../shared/error-template.js';
 
 export const options = {
 	app_template_contains_nonce: ${template.includes('%sveltekit.nonce%')},
-	csp: ${s(config.kit.csp)},
-	csrf_check_origin: ${s(!config.kit.csrf.trustedOrigins.includes('*'))},
-	csrf_trusted_origins: ${s(config.kit.csrf.trustedOrigins)},
-	embedded: ${config.kit.embedded},
-	hash_routing: ${s(config.kit.router.type === 'hash')},
+	csp: ${s(config.csp)},
+	csrf_check_origin: ${s(!config.csrf.trustedOrigins.includes('*'))},
+	csrf_trusted_origins: ${s(config.csrf.trustedOrigins)},
+	embedded: ${config.embedded},
+	hash_routing: ${s(config.router.type === 'hash')},
 	hooks: null, // added lazily, via \`get_hooks\`
-	link_header_preload: ${s(config.kit.output.linkHeaderPreload)},
-	paths_origin: ${s(config.kit.paths.origin)},
+	link_header_preload: ${s(config.output.linkHeaderPreload)},
+	paths_origin: ${s(config.paths.origin)},
 	service_worker: ${has_service_worker},
-	service_worker_options: ${config.kit.serviceWorker.register ? s(config.kit.serviceWorker.options) : 'null'},
+	service_worker_options: ${config.serviceWorker.register ? s(config.serviceWorker.options) : 'null'},
 	templates: {
 		app: ({ head, body, assets, nonce, env }) => ${s(template)
 			.replace('%sveltekit.head%', '" + head + "')
 			.replace('%sveltekit.body%', '" + body + "')
 			.replace(/%sveltekit\.assets%/g, '" + assets + "')
 			.replace(/%sveltekit\.nonce%/g, '" + nonce + "')
-			.replace(/%sveltekit\.version%/g, escape_html(config.kit.version.name))
+			.replace(/%sveltekit\.version%/g, escape_html(config.version.name))
 			.replace(
 				/%sveltekit\.env\.([^%]+)%/g,
 				(_match, capture) => `" + (env[${s(capture)}] ?? "") + "`
 			)},
 		error
 	},
-	version: ${s(config.kit.version.name)},
-	version_hash: ${s(hash(config.kit.version.name))}
+	version: ${s(config.version.name)},
+	version_hash: ${s(hash(config.version.name))}
 };
 
 export async function get_hooks() {
@@ -88,8 +88,8 @@ export { set_assets, set_building, set_fix_stack_trace, set_manifest, set_preren
  * @param {string} root The project root directory
  */
 export function write_server(config, output, root) {
-	const server_hooks_file = resolve_entry(config.kit.files.hooks.server);
-	const universal_hooks_file = resolve_entry(config.kit.files.hooks.universal);
+	const server_hooks_file = resolve_entry(config.files.hooks.server);
+	const universal_hooks_file = resolve_entry(config.files.hooks.universal);
 
 	if (!server_hooks_file) {
 		check_spelling('src/hooks.server', 'src/+hooks.server', 'Unexpected + prefix');
@@ -122,7 +122,7 @@ export function write_server(config, output, root) {
 			server_hooks: server_hooks_file ? relative(server_hooks_file) : null,
 			universal_hooks: universal_hooks_file ? relative(universal_hooks_file) : null,
 			has_service_worker:
-				config.kit.serviceWorker.register && !!resolve_entry(config.kit.files.serviceWorker),
+				config.serviceWorker.register && !!resolve_entry(config.files.serviceWorker),
 			template: load_template(root, config)
 		})
 	);

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

@@ -1,4 +1,4 @@
-/** @import { ValidatedKitConfig } from 'types' */
+/** @import { ValidatedConfig } from 'types' */
 import process from 'node:process';
 import fs from 'node:fs';
 import path from 'node:path';
@@ -22,7 +22,7 @@ try {
 
 /**
  * Generates the tsconfig that the user's tsconfig inherits from.
- * @param {import('types').ValidatedKitConfig} kit
+ * @param {ValidatedConfig} kit
  * @param {string} root
  */
 export function write_tsconfig(kit, root) {
@@ -83,7 +83,7 @@ export function write_tsconfig(kit, root) {
  * @param {string} root The project root
  * @param {string} id The id of the generated config
  * @param {any} config The contents of the generated tsconfig, with paths relative to `root`
- * @param {ValidatedKitConfig['typescript']['config']} [transform] TODO get rid of this
+ * @param {ValidatedConfig['typescript']['config']} [transform] TODO get rid of this
  */
 function write_parent_tsconfig(root, id, config, transform) {
 	// simplified tsconfig resolvers (e.g. Playwright's) only find `${id}.json`, not `${id}/tsconfig.json`
@@ -236,7 +236,7 @@ const alias_value = /^(.+?)((\/\*)|(\.\w+))?$/;
  * Generates tsconfig path aliases from kit's aliases and the package.json `imports` field.
  * Related to vite alias creation.
  *
- * @param {import('types').ValidatedKitConfig} config
+ * @param {import('types').ValidatedConfig} config
  * @param {string} root
  * @returns {Record<string, string[]>}
  */

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

@@ -35,11 +35,11 @@ const is_whitespace = (/** @type {string} */ char) => /\s/.test(char);
 export function write_all_types(config, manifest_data, root) {
 	if (!ts) return;
 
-	const types_dir = `${config.kit.outDir}/types`;
+	const types_dir = `${config.outDir}/types`;
 
 	// empty out files that no longer need to exist
 	const routes_dir = remove_relative_parent_traversals(
-		posixify(path.relative(root, config.kit.files.routes))
+		posixify(path.relative(root, config.files.routes))
 	);
 	const expected_directories = new Set(
 		manifest_data.routes.map((route) => path.join(routes_dir, route.id))
@@ -66,7 +66,7 @@ export function write_all_types(config, manifest_data, root) {
 	for (const route of manifest_data.routes) {
 		if (!route.leaf && !route.layout && !route.endpoint) continue; // nothing to do
 
-		const outdir = path.join(config.kit.outDir, 'types', routes_dir, route.id);
+		const outdir = path.join(config.outDir, 'types', routes_dir, route.id);
 
 		// check if the types are out of date
 		/** @type {string[]} */
@@ -148,7 +148,7 @@ export function write_types(config, manifest_data, file, root) {
 		return;
 	}
 
-	const id = '/' + posixify(path.relative(config.kit.files.routes, path.dirname(file)));
+	const id = '/' + posixify(path.relative(config.files.routes, path.dirname(file)));
 
 	const route = manifest_data.routes.find((route) => route.id === id);
 	if (!route) return;
@@ -182,9 +182,9 @@ function create_routes_map(manifest_data) {
  */
 function update_types(config, routes, route, root, to_delete = new Set()) {
 	const routes_dir = remove_relative_parent_traversals(
-		posixify(path.relative(root, config.kit.files.routes))
+		posixify(path.relative(root, config.files.routes))
 	);
-	const outdir = path.join(config.kit.outDir, 'types', routes_dir, route.id);
+	const outdir = path.join(config.outDir, 'types', routes_dir, route.id);
 
 	// now generate new types
 	const imports = [
@@ -354,7 +354,9 @@ function update_types(config, routes, route, root, to_delete = new Set()) {
 	}
 
 	if (route.leaf?.server || route.layout?.server || route.endpoint) {
-		exports.push('export type RequestEvent = Kit.RequestEvent<RouteParams, RouteId>;');
+		exports.push(
+			"export type RequestEvent = import('$app/server').RequestEvent<RouteParams, RouteId>;"
+		);
 	}
 
 	const output = [imports.join('\n'), declarations.join('\n'), exports.join('\n')]
@@ -603,8 +605,7 @@ function replace_ext_with_js(file_path) {
 function generate_params_type(params, outdir, config) {
 	const path_to_params = () => {
 		const params_file =
-			resolve_entry(config.kit.files.params) ??
-			config.kit.files.params.replace(/\.(js|ts)$/, '') + '.js';
+			resolve_entry(config.files.params) ?? config.files.params.replace(/\.(js|ts)$/, '') + '.js';
 
 		return posixify(path.relative(outdir, params_file));
 	};

package/src/exports/hooks/public.d.ts

@@ -1,5 +1,6 @@
 import { StandardSchemaV1 } from '@standard-schema/spec';
-import { NavigationEvent, RequestEvent } from '@sveltejs/kit';
+import { NavigationEvent } from '@sveltejs/kit';
+import { RequestEvent } from '$app/server';
 import { MaybePromise } from 'types';
 
 export * from './index.js';

package/src/exports/hooks/sequence.js

@@ -1,4 +1,4 @@
-/** @import { RequestEvent } from '@sveltejs/kit' */
+/** @import { RequestEvent } from '$app/server' */
 /** @import { Handle, ResolveOptions } from '@sveltejs/kit/hooks' */
 import {
 	merge_tracing,

package/src/exports/index.js

@@ -270,16 +270,6 @@ export function invalid(...issues) {
 	);
 }
 
-/**
- * Checks whether this is an validation error thrown by {@link invalid}.
- * @param {unknown} e The object to check.
- * @return {e is import('$app/server').ValidationError}
- * @since 2.47.3
- */
-export function isValidationError(e) {
-	return e instanceof ValidationError;
-}
-
 /**
  * Strips possible SvelteKit-internal suffixes and trailing slashes from the URL pathname.
  * Returns the normalized URL as well as a method for adding the potential suffix back

package/src/exports/internal/server/event.js

@@ -1,4 +1,4 @@
-/** @import { RequestEvent } from '@sveltejs/kit' */
+/** @import { RequestEvent } from '$app/server' */
 /** @import { RequestStore } from 'types' */
 /** @import { AsyncLocalStorage } from 'node:async_hooks' */
 import { IN_WEBCONTAINER } from '../../../constants.js';