@sveltejs/kit 3.0.0-next.1 → 3.0.0-next.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sveltejs/kit",
-  "version": "3.0.0-next.1",
+  "version": "3.0.0-next.11",
   "description": "SvelteKit is the fastest way to build Svelte apps",
   "keywords": [
     "framework",
@@ -18,37 +18,38 @@
   "homepage": "https://svelte.dev",
   "type": "module",
   "dependencies": {
-    "@standard-schema/spec": "^1.0.0",
-    "@sveltejs/acorn-typescript": "^1.0.9",
-    "acorn": "^8.16.0",
-    "cookie": "^1.1.1",
+    "@standard-schema/spec": "^1.1.0",
+    "@sveltejs/acorn-typescript": "^1.0.10",
+    "acorn": "^8.17.0",
+    "cookie": "^2.0.0",
     "devalue": "^5.8.1",
     "esm-env": "^1.2.2",
-    "magic-string": "^0.30.5",
+    "magic-string": "^0.30.21",
     "mrmime": "^2.0.0",
-    "sirv": "^3.0.0"
+    "sirv": "^3.0.2"
   },
   "devDependencies": {
-    "@opentelemetry/api": "^1.0.0",
-    "@playwright/test": "^1.60.0",
+    "@opentelemetry/api": "^1.9.0",
+    "@playwright/test": "^1.61.1",
     "@sveltejs/vite-plugin-svelte": "^7.0.0",
     "@types/connect": "^3.4.38",
     "@types/node": "^22.19.19",
-    "dts-buddy": "^0.8.0",
+    "dts-buddy": "^0.8.3",
     "jsdom": "^29.1.1",
-    "rolldown": "^1.0.0-rc.6",
-    "svelte": "^5.55.7",
+    "rolldown": "^1.2.0",
+    "svelte": "^5.56.3",
     "svelte-preprocess": "^6.0.5",
-    "typescript": "~6.0.0",
-    "vite": "^8.0.10",
-    "vitest": "^4.1.7"
+    "typescript": "~6.0.3",
+    "valibot": "^1.2.0",
+    "vite": "^8.1.5",
+    "vitest": "^4.1.10"
   },
   "peerDependencies": {
-    "@sveltejs/vite-plugin-svelte": "^7.0.0",
     "@opentelemetry/api": "^1.0.0",
-    "svelte": "^5.48.0",
+    "@sveltejs/vite-plugin-svelte": "^7.0.0",
+    "svelte": "^5.56.4",
     "typescript": "^6.0.0",
-    "vite": "^8.0.0"
+    "vite": "^8.0.12"
   },
   "peerDependenciesMeta": {
     "@opentelemetry/api": {
@@ -71,12 +72,19 @@
   ],
   "imports": {
     "#app/paths": {
+      "workerd": "./src/runtime/app/paths/server.js",
       "browser": "./src/runtime/app/paths/client.js",
       "default": "./src/runtime/app/paths/server.js"
     },
     "#app/env/public": {
+      "workerd": "./src/runtime/app/env/public/server.js",
       "browser": "./src/runtime/app/env/public/client.js",
       "default": "./src/runtime/app/env/public/server.js"
+    },
+    "#internal": {
+      "workerd": "./src/exports/internal/server/index.js",
+      "browser": "./src/exports/internal/client.js",
+      "default": "./src/exports/internal/server/index.js"
     }
   },
   "exports": {
@@ -94,11 +102,11 @@
       "import": "./src/exports/internal/env.js"
     },
     "./internal/types": {
-      "import": "./src/exports/internal/types.js"
+      "types": "./src/exports/internal/types.d.ts"
     },
     "./internal/server": {
       "types": "./types/index.d.ts",
-      "import": "./src/exports/internal/server.js"
+      "import": "./src/exports/internal/server/index.js"
     },
     "./node": {
       "types": "./types/index.d.ts",
@@ -108,6 +116,10 @@
       "types": "./types/index.d.ts",
       "import": "./src/exports/hooks/index.js"
     },
+    "./env": {
+      "types": "./types/index.d.ts",
+      "import": "./src/exports/env/index.js"
+    },
     "./vite": {
       "types": "./types/index.d.ts",
       "import": "./src/exports/vite/index.js"
@@ -119,7 +131,7 @@
   },
   "scripts": {
     "lint": "prettier --config ../../.prettierrc --check .",
-    "check": "tsc && cd ./test/types && tsc",
+    "check": "tsc && cd ./test/types && tsc && cd ./app-error-enhanced && tsc",
     "check:all": "tsc && pnpm -r --filter=\"./**\" check",
     "format": "prettier --config ../../.prettierrc --write .",
     "test": "pnpm test:unit && pnpm test:integration",

package/src/constants.js

@@ -11,3 +11,5 @@ export const ENDPOINT_METHODS = ['GET', 'POST', 'PUT', 'PATCH', 'DELETE', 'OPTIO
 export const MUTATIVE_METHODS = ['POST', 'PUT', 'PATCH', 'DELETE'];
 
 export const PAGE_METHODS = ['GET', 'POST', 'HEAD'];
+
+export const SRC_ROOT = import.meta.dirname;

package/src/core/adapt/builder.js

@@ -8,7 +8,7 @@ import * as devalue from 'devalue';
 import { createReadStream, createWriteStream, existsSync, statSync } from 'node:fs';
 import { extname, resolve, join, dirname, relative } from 'node:path';
 import { pipeline } from 'node:stream';
-import { promisify, styleText } from 'node:util';
+import { promisify } from 'node:util';
 import zlib from 'node:zlib';
 import { copy, rimraf, mkdirp } from '../../utils/filesystem.js';
 import { posixify } from '../../utils/os.js';
@@ -18,11 +18,23 @@ import generate_fallback from '../postbuild/fallback.js';
 import { write } from '../sync/utils.js';
 import { list_files } from '../utils.js';
 import { find_server_assets } from '../generate_manifest/find_server_assets.js';
-import { reserved } from '../env.js';
+import { create_exported_declarations } from '../env.js';
 import { handle_issues, validate } from '../../exports/internal/env.js';
 
 const pipe = promisify(pipeline);
-const extensions = ['.html', '.js', '.mjs', '.json', '.css', '.svg', '.xml', '.wasm', '.txt'];
+const extensions = [
+	'.html',
+	'.js',
+	'.mjs',
+	'.json',
+	'.css',
+	'.svg',
+	'.xml',
+	'.wasm',
+	'.txt',
+	'.md',
+	'.mdx'
+];
 
 /**
  * Creates the Builder which is passed to adapters for building the application.
@@ -125,16 +137,13 @@ export function create_builder({
 				manifest_path,
 				env,
 				out_dir: config.kit.outDir,
-				origin: config.kit.prerender.origin,
+				origin: config.kit.paths.origin || 'http://sveltekit-prerender',
 				assets: config.kit.files.assets
 			});
 
 			if (existsSync(dest)) {
-				console.log(
-					styleText(
-						['bold', 'yellow'],
-						`Overwriting ${dest} with fallback page. Consider using a different name for the fallback.`
-					)
+				log.warn(
+					`\nOverwriting ${dest} with fallback page. Consider using a different name for the fallback.\n`
 				);
 			}
 
@@ -144,7 +153,7 @@ export function create_builder({
 		generateEnvModule() {
 			if (!build_data.client?.uses_env_dynamic_public) return;
 
-			const dest = `${config.kit.outDir}/output/prerendered/dependencies/${config.kit.appDir}/env.js`;
+			const dest = `${config.kit.outDir}/output/prerendered/dependencies/${config.kit.appDir}`;
 			const env = loadEnv(vite_config.mode, config.kit.env.dir, '');
 
 			/** @type {Record<string, any>} */
@@ -161,7 +170,9 @@ export function create_builder({
 
 			handle_issues(issues);
 
-			write(dest, `export const env=${devalue.uneval(values)}`);
+			const payload = devalue.uneval(values);
+
+			write(`${dest}/env.js`, `export const env=${payload}`);
 		},
 
 		generateManifest({ relativePath, routes: subset }) {
@@ -291,53 +302,25 @@ async function compress_file(file, format = 'gz') {
  * - Imports `exports` from the entrypoint (dynamically, if `tla` is true)
  * - Re-exports `exports` from the entrypoint
  *
- * `default` receives special treatment: It will be imported as `default` and exported with `export default`.
- *
  * @param {{ instrumentation: string; start: string; exports: string[] }} opts
  * @returns {string}
  */
 function create_instrumentation_facade({ instrumentation, start, exports }) {
 	const import_instrumentation = `import './${instrumentation}';`;
 
-	let alias_index = 0;
-	const aliases = new Map();
-
-	for (const name of exports.filter((name) => reserved.has(name))) {
-		/*
-		 * you can do evil things like `export { c as class }`.
-		 * in order to import these, you need to alias them, and then un-alias them when re-exporting
-		 * this map will allow us to generate the following:
-		 * import { class as _1 } from 'entrypoint';
-		 * export { _1 as class };
-		 */
-		let alias = `_${alias_index++}`;
-		while (exports.includes(alias)) {
-			alias = `_${alias_index++}`;
-		}
-
-		aliases.set(name, alias);
-	}
-
-	const import_statements = [];
-	const export_statements = [];
-
-	for (const name of exports) {
-		const alias = aliases.get(name);
-		if (alias) {
-			import_statements.push(`${name}: ${alias}`);
-			export_statements.push(`${alias} as ${name}`);
-		} else {
-			import_statements.push(`${name}`);
-			export_statements.push(`${name}`);
-		}
-	}
+	const { namespace, declarations, reexports } = create_exported_declarations(
+		exports,
+		(name, ns) => `${ns}.${name}`,
+		'__mod'
+	);
 
-	const entrypoint_facade = [
-		`const { ${import_statements.join(', ')} } = await import('./${start}');`,
-		export_statements.length > 0 ? `export { ${export_statements.join(', ')} };` : ''
+	const parts = [
+		`const ${namespace} = await import('./${start}');`,
+		declarations.join('\n'),
+		reexports.length > 0 ? `export { ${reexports.join(', ')} };` : ''
 	]
 		.filter(Boolean)
 		.join('\n');
 
-	return `${import_instrumentation}\n${entrypoint_facade}`;
+	return `${import_instrumentation}\n${parts}`;
 }

package/src/core/adapt/index.js

@@ -1,9 +1,7 @@
-/** @import { Adapter } from '@sveltejs/kit' */
 import { styleText } from 'node:util';
 import { create_builder } from './builder.js';
 
 /**
- * @param {Adapter} adapter
  * @param {import('types').ValidatedConfig} config
  * @param {import('types').BuildData} build_data
  * @param {import('types').ServerMetadata} server_metadata
@@ -15,7 +13,6 @@ import { create_builder } from './builder.js';
  * @param {Record<string, import('@sveltejs/kit').EnvVarConfig<any>> | null} explicit_env_config
  */
 export async function adapt(
-	adapter,
 	config,
 	build_data,
 	server_metadata,
@@ -26,7 +23,7 @@ export async function adapt(
 	vite_config,
 	explicit_env_config
 ) {
-	const { name, adapt } = adapter;
+	const { name, adapt } = config.kit.adapter;
 
 	console.log(styleText(['bold', 'cyan'], `\n> Using ${name}`));
 

package/src/core/config/index.js

@@ -1,13 +1,78 @@
-/** @import { Config } from '@sveltejs/kit' */
+/** @import { Config, KitConfig } from '@sveltejs/kit' */
+/** @import { Options, SvelteConfig } from '@sveltejs/vite-plugin-svelte' */
 /** @import { ValidatedConfig } from 'types' */
 /** @import { ResolvedConfig } from 'vite' */
 import fs from 'node:fs';
 import path from 'node:path';
 import process from 'node:process';
 import * as url from 'node:url';
-import options from './options.js';
+import { styleText } from 'node:util';
+import {
+	validate_kit_options,
+	kit_options,
+	kit_experimental_options,
+	validate_svelte_options
+} from './options.js';
 import { resolve_entry } from '../../utils/filesystem.js';
 import { import_peer } from '../../utils/import.js';
+import { stackless } from '../../utils/error.js';
+
+/**
+ * Splits the config passed to the `sveltekit` Vite plugin into the options that
+ * SvelteKit processes itself and the options that are forwarded to
+ * `vite-plugin-svelte`. SvelteKit makes no assumptions about which options
+ * `vite-plugin-svelte` accepts — it plucks out its own options and passes
+ * everything else along (`vite-plugin-svelte` does its own validation).
+ * @param {KitConfig & Omit<Options, 'onwarn'> & Pick<SvelteConfig, 'vitePlugin'>} config
+ * @returns {{ svelte_config: Config, vite_plugin_svelte_config: Record<string, any> }}
+ */
+export function split_config(config) {
+	const { extensions, compilerOptions, vitePlugin, preprocess, ...rest } = config;
+
+	/** @type {KitConfig} */
+	const kit = {};
+
+	/** @type {Record<string, any>} */
+	const vite_plugin_svelte_config = {};
+
+	for (const key in rest) {
+		if (key === 'experimental') {
+			// `experimental` is a namespace that both SvelteKit and vite-plugin-svelte
+			// use, so pluck out the flags SvelteKit recognises and pass the rest along
+			const experimental = /** @type {Record<string, any>} */ (rest[key]) ?? {};
+
+			/** @type {Record<string, any>} */
+			const kit_experimental = {};
+			/** @type {Record<string, any>} */
+			const vps_experimental = {};
+
+			for (const flag in experimental) {
+				if (kit_experimental_options.includes(flag)) {
+					kit_experimental[flag] = experimental[flag];
+				} else {
+					vps_experimental[flag] = experimental[flag];
+				}
+			}
+
+			if (Object.keys(kit_experimental).length > 0) {
+				kit.experimental = kit_experimental;
+			}
+			if (Object.keys(vps_experimental).length > 0) {
+				vite_plugin_svelte_config.experimental = vps_experimental;
+			}
+		} else if (kit_options.includes(key)) {
+			// @ts-expect-error - we've verified this is one of SvelteKit's own options
+			kit[key] = rest[key];
+		} else {
+			vite_plugin_svelte_config[key] = /** @type {Record<string, any>} */ (rest)[key];
+		}
+	}
+
+	return {
+		svelte_config: { extensions, compilerOptions, vitePlugin, preprocess, kit },
+		vite_plugin_svelte_config
+	};
+}
 
 /**
  * Loads the template (src/app.html by default) and validates that it has the
@@ -70,98 +135,99 @@ export async function load_vite_config(config) {
  */
 export function extract_svelte_config(vite_config) {
 	const plugin = vite_config.plugins.find((p) => p.name === 'vite-plugin-sveltekit-setup');
-	return plugin?.api.options ?? process_config({});
+	return plugin?.api.options ?? process_config(validate_config({}), vite_config.root);
 }
 
 /**
- * @param {Config} config
+ * @param {ValidatedConfig} config
+ * @param {string} cwd
  * @returns {ValidatedConfig}
  */
-export function process_config(config, { cwd = process.cwd(), source = 'svelte.config.js' } = {}) {
-	try {
-		const validated = validate_config(config, cwd);
-
-		validated.kit.outDir = path.resolve(cwd, validated.kit.outDir);
+export function process_config(config, cwd) {
+	if (
+		config.kit.csp?.directives?.['require-trusted-types-for']?.includes('script') &&
+		config.kit.serviceWorker.register &&
+		resolve_entry(path.resolve(cwd, config.kit.files.serviceWorker)) &&
+		!config.kit.csp?.directives?.['trusted-types']?.includes('sveltekit-trusted-url')
+	) {
+		throw new Error(
+			"The `csp.directives['trusted-types']` option must include 'sveltekit-trusted-url' when `serviceWorker.register` is true"
+		);
+	}
 
-		for (const key in validated.kit.files) {
-			if (key === 'hooks') {
-				validated.kit.files.hooks.client = path.resolve(cwd, validated.kit.files.hooks.client);
-				validated.kit.files.hooks.server = path.resolve(cwd, validated.kit.files.hooks.server);
-				validated.kit.files.hooks.universal = path.resolve(
-					cwd,
-					validated.kit.files.hooks.universal
-				);
-			} else {
-				// @ts-expect-error
-				validated.kit.files[key] = path.resolve(cwd, validated.kit.files[key]);
-			}
+	config.kit.outDir = path.resolve(cwd, config.kit.outDir);
+	config.kit.env.dir = path.resolve(cwd, config.kit.env.dir);
+
+	for (const key in config.kit.files) {
+		if (key === 'hooks') {
+			config.kit.files.hooks.client = path.resolve(cwd, config.kit.files.hooks.client);
+			config.kit.files.hooks.server = path.resolve(cwd, config.kit.files.hooks.server);
+			config.kit.files.hooks.universal = path.resolve(cwd, config.kit.files.hooks.universal);
+		} else if (key !== 'lib' /* TODO remove when we remove the `lib` option altogether */) {
+			// @ts-expect-error
+			config.kit.files[key] = path.resolve(cwd, config.kit.files[key]);
 		}
-
-		return validated;
-	} catch (e) {
-		const error = /** @type {Error} */ (e);
-
-		// redact the stack trace — it's not helpful to users
-		error.stack = `Error loading ${source}: ${error.message}\n`;
-		throw error;
 	}
+
+	return config;
 }
 
 /**
  * @param {Config} config
- * @param {string} [cwd]
  * @returns {ValidatedConfig}
  */
-export function validate_config(config, cwd = process.cwd()) {
-	if (typeof config !== 'object') {
-		throw new Error(
-			'The Svelte config file must have a configuration object as its default export. See https://svelte.dev/docs/kit/configuration'
-		);
-	}
-
-	/** @type {ValidatedConfig} */
-	const validated = options(config, 'config');
-	const files = validated.kit.files;
-
-	files.hooks.client ??= path.join(files.src, 'hooks.client');
-	files.hooks.server ??= path.join(files.src, 'hooks.server');
-	files.hooks.universal ??= path.join(files.src, 'hooks');
-	files.lib ??= path.join(files.src, 'lib');
-	files.params ??= path.join(files.src, 'params');
-	files.routes ??= path.join(files.src, 'routes');
-	files.serviceWorker ??= path.join(files.src, 'service-worker');
-	files.appTemplate ??= path.join(files.src, 'app.html');
-	files.errorTemplate ??= path.join(files.src, 'error.html');
-
-	if (validated.kit.router.resolution === 'server') {
-		if (validated.kit.router.type === 'hash') {
-			throw new Error(
-				"The `router.resolution` option cannot be 'server' if `router.type` is 'hash'"
-			);
-		}
-		if (validated.kit.output.bundleStrategy !== 'split') {
+export function validate_config(config) {
+	try {
+		if (typeof config !== 'object') {
 			throw new Error(
-				"The `router.resolution` option cannot be 'server' if `output.bundleStrategy` is 'inline' or 'single'"
+				'The SvelteKit options from the Vite config must be an object. See https://svelte.dev/docs/kit/configuration'
 			);
 		}
-	}
 
-	if (validated.kit.csp?.directives?.['require-trusted-types-for']?.includes('script')) {
-		if (!validated.kit.csp?.directives?.['trusted-types']?.includes('svelte-trusted-html')) {
-			throw new Error(
-				"The `csp.directives['trusted-types']` option must include 'svelte-trusted-html'"
-			);
+		const validated = /** @type {ValidatedConfig} */ ({
+			...validate_svelte_options(config, 'config'),
+			kit: validate_kit_options(config.kit, 'config')
+		});
+		const files = validated.kit.files;
+
+		files.hooks.client ??= path.join(files.src, 'hooks.client');
+		files.hooks.server ??= path.join(files.src, 'hooks.server');
+		files.hooks.universal ??= path.join(files.src, 'hooks');
+		files.params ??= path.join(files.src, 'params');
+		files.routes ??= path.join(files.src, 'routes');
+		files.serviceWorker ??= path.join(files.src, 'service-worker');
+		files.appTemplate ??= path.join(files.src, 'app.html');
+		files.errorTemplate ??= path.join(files.src, 'error.html');
+
+		if (validated.kit.router.resolution === 'server') {
+			if (validated.kit.router.type === 'hash') {
+				throw new Error(
+					"The `router.resolution` option cannot be 'server' if `router.type` is 'hash'"
+				);
+			}
+			if (validated.kit.output.bundleStrategy !== 'split') {
+				throw new Error(
+					"The `router.resolution` option cannot be 'server' if `output.bundleStrategy` is 'inline' or 'single'"
+				);
+			}
 		}
+
 		if (
-			validated.kit.serviceWorker?.register &&
-			resolve_entry(path.resolve(cwd, validated.kit.files.serviceWorker)) &&
-			!validated.kit.csp?.directives?.['trusted-types']?.includes('sveltekit-trusted-url')
+			validated.kit.csp?.directives?.['require-trusted-types-for']?.includes('script') &&
+			!validated.kit.csp?.directives?.['trusted-types']?.includes('svelte-trusted-html')
 		) {
 			throw new Error(
-				"The `csp.directives['trusted-types']` option must include 'sveltekit-trusted-url' when `serviceWorker.register` is true"
+				"The `csp.directives['trusted-types']` option must include 'svelte-trusted-html'"
 			);
 		}
-	}
 
-	return validated;
+		return validated;
+	} catch (e) {
+		const error = /** @type {Error} */ (e);
+
+		// Print a nicer version of the error to the console
+		console.log(styleText(['bold', 'red'], `\n${error.message}\n`));
+
+		throw stackless('Failed to load SvelteKit options from Vite config');
+	}
 }