@sveltejs/kit 3.0.0-next.6 → 3.0.0-next.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sveltejs/kit",
-  "version": "3.0.0-next.6",
+  "version": "3.0.0-next.7",
   "description": "SvelteKit is the fastest way to build Svelte apps",
   "keywords": [
     "framework",
@@ -40,6 +40,7 @@
     "svelte": "^5.56.3",
     "svelte-preprocess": "^6.0.5",
     "typescript": "~6.0.3",
+    "valibot": "^1.2.0",
     "vite": "^8.0.16",
     "vitest": "^4.1.9"
   },
@@ -77,6 +78,10 @@
     "#app/env/public": {
       "browser": "./src/runtime/app/env/public/client.js",
       "default": "./src/runtime/app/env/public/server.js"
+    },
+    "#internal": {
+      "browser": "./src/exports/internal/client.js",
+      "default": "./src/exports/internal/server/index.js"
     }
   },
   "exports": {
@@ -98,7 +103,7 @@
     },
     "./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",

package/src/core/adapt/builder.js

@@ -18,7 +18,7 @@ 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);
@@ -305,53 +305,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/config/index.js

@@ -6,7 +6,12 @@ import fs from 'node:fs';
 import path from 'node:path';
 import process from 'node:process';
 import * as url from 'node:url';
-import { options, kit_options, kit_experimental_options } from './options.js';
+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';
 
@@ -128,99 +133,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() } = {}) {
-	try {
-		const validated = validate_config(config, cwd);
-
-		validated.kit.outDir = path.resolve(cwd, validated.kit.outDir);
-		validated.kit.env.dir = path.resolve(cwd, validated.kit.env.dir);
-
-		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]);
-			}
-		}
+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"
+		);
+	}
 
-		return validated;
-	} catch (e) {
-		const error = /** @type {Error} */ (e);
+	config.kit.outDir = path.resolve(cwd, config.kit.outDir);
+	config.kit.env.dir = path.resolve(cwd, config.kit.env.dir);
 
-		// redact the stack trace — it's not helpful to users
-		error.stack = `Error loading SvelteKit options from Vite config: ${error.message}\n`;
-		throw error;
+	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 {
+			// @ts-expect-error
+			config.kit.files[key] = path.resolve(cwd, config.kit.files[key]);
+		}
 	}
+
+	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 SvelteKit options from the Vite config must be an object. 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.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') {
+				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);
+
+		// redact the stack trace — it's not helpful to users
+		error.stack = `Error loading SvelteKit options from Vite config: ${error.message}\n`;
+		throw error;
+	}
 }