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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sveltejs/kit",
-  "version": "3.0.0-next.2",
+  "version": "3.0.0-next.21",
   "description": "SvelteKit is the fastest way to build Svelte apps",
   "keywords": [
     "framework",
@@ -18,37 +18,39 @@
   "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",
-    "devalue": "^5.8.1",
+    "@rolldown/pluginutils": "^1.0.1",
+    "@standard-schema/spec": "^1.1.0",
+    "@sveltejs/acorn-typescript": "^1.0.12",
+    "acorn": "^8.18.0",
+    "cookie": "^2.0.1",
+    "devalue": "^5.9.0",
     "esm-env": "^1.2.2",
-    "magic-string": "^0.30.5",
-    "mrmime": "^2.0.0",
-    "sirv": "^3.0.0"
+    "magic-string": "^1.1.0",
+    "mrmime": "^2.0.1",
+    "sirv": "^3.0.2"
   },
   "devDependencies": {
-    "@opentelemetry/api": "^1.0.0",
-    "@playwright/test": "^1.60.0",
-    "@sveltejs/vite-plugin-svelte": "^7.0.0",
+    "@opentelemetry/api": "^1.9.1",
+    "@playwright/test": "^1.62.0",
+    "@sveltejs/vite-plugin-svelte": "^7.3.0",
     "@types/connect": "^3.4.38",
+    "@typescript/native": "npm:typescript@^7.0.2",
     "@types/node": "^22.19.19",
-    "dts-buddy": "^0.8.0",
-    "jsdom": "^29.1.1",
-    "rolldown": "^1.0.0-rc.6",
-    "svelte": "^5.55.7",
+    "dts-buddy": "^0.8.3",
+    "jsdom": "^30.0.0",
+    "svelte": "^5.56.8",
     "svelte-preprocess": "^6.0.5",
-    "typescript": "~6.0.0",
-    "vite": "^8.0.10",
-    "vitest": "^4.1.7"
+    "typescript": "~6.0.3",
+    "valibot": "^1.4.2",
+    "vite": "^8.2.1",
+    "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": {
@@ -70,13 +72,24 @@
     "svelte-kit.js"
   ],
   "imports": {
+    "#app/internal/transport": {
+      "default": "./src/runtime/app/internal/transport.js"
+    },
     "#app/paths": {
+      "types": "./src/runtime/app/paths/internal.d.ts",
+      "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 +107,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 +121,18 @@
       "types": "./types/index.d.ts",
       "import": "./src/exports/hooks/index.js"
     },
+    "./env": {
+      "types": "./types/index.d.ts",
+      "import": "./src/exports/env/index.js"
+    },
+    "./params": {
+      "types": "./types/index.d.ts",
+      "import": "./src/exports/params/index.js"
+    },
+    "./remote": {
+      "types": "./types/index.d.ts",
+      "import": "./src/exports/remote/index.js"
+    },
     "./vite": {
       "types": "./types/index.d.ts",
       "import": "./src/exports/vite/index.js"
@@ -115,24 +140,25 @@
   },
   "types": "types/index.d.ts",
   "engines": {
-    "node": ">=22"
+    "node": ">=22.17"
   },
   "scripts": {
-    "lint": "prettier --config ../../.prettierrc --check .",
-    "check": "tsc && cd ./test/types && tsc",
-    "check:all": "tsc && pnpm -r --filter=\"./**\" check",
-    "format": "prettier --config ../../.prettierrc --write .",
+    "lint": "oxfmt --check .",
+    "check": "pnpm tsc-native && pnpm tsc-native --project test/types/tsconfig.json && pnpm tsc-native --project test/types/app-error-enhanced/tsconfig.json",
+    "check:all": "pnpm tsc-native && pnpm -r --filter=\"./**\" check",
+    "format": "oxfmt --write .",
     "test": "pnpm test:unit && pnpm test:integration",
     "test:integration": "pnpm -r --workspace-concurrency 1 --filter=\"./test/**\" test",
-    "test:cross-platform:dev": "pnpm -r --workspace-concurrency 1 --filter=\"./test/**\" test:cross-platform:dev",
-    "test:cross-platform:build": "pnpm test:unit && pnpm -r --workspace-concurrency 1 --filter=\"./test/**\" test:cross-platform:build",
+    "test:dev": "pnpm -r --workspace-concurrency 1 --filter=\"./test/**\" test:dev",
+    "test:build": "pnpm -r --workspace-concurrency 1 --filter=\"./test/**\" test:build",
+    "test:cross-platform:dev": "pnpm test:unit && pnpm -r --workspace-concurrency 1 --filter=\"./test/**\" test:cross-platform:dev",
+    "test:cross-platform:build": "pnpm -r --workspace-concurrency 1 --filter=\"./test/**\" test:cross-platform:build",
     "test:server-side-route-resolution:dev": "pnpm -r --workspace-concurrency 1 --filter=\"./test/**\" test:server-side-route-resolution:dev",
-    "test:server-side-route-resolution:build": "pnpm test:unit && pnpm -r --workspace-concurrency 1 --filter=\"./test/**\" test:server-side-route-resolution:build",
+    "test:server-side-route-resolution:build": "pnpm -r --workspace-concurrency 1 --filter=\"./test/**\" test:server-side-route-resolution:build",
     "test:svelte-async:dev": "pnpm -r --workspace-concurrency 1 --filter=\"./test/**\" test:svelte-async:dev",
-    "test:svelte-async:build": "pnpm test:unit && pnpm -r --workspace-concurrency 1 --filter=\"./test/**\" test:svelte-async:build",
-    "test:unit:dev": "vitest --config kit.vitest.config.js run",
-    "test:unit:prod": "NODE_ENV=production vitest --config kit.vitest.config.js run csp.spec.js cookie.spec.js",
-    "test:unit": "pnpm test:unit:dev && pnpm test:unit:prod",
+    "test:svelte-async:build": "pnpm -r --workspace-concurrency 1 --filter=\"./test/**\" test:svelte-async:build",
+    "test:unit": "vitest run -c vitest.kit.config.js",
+    "tsc-native": "node node_modules/@typescript/native/bin/tsc",
     "generate:version": "node scripts/generate-version.js",
     "generate:types": "node scripts/generate-dts.js"
   }

package/src/cli.js

@@ -2,8 +2,9 @@ import fs from 'node:fs';
 import process from 'node:process';
 import { parseArgs, styleText } from 'node:util';
 import { extract_svelte_config, load_vite_config } from './core/config/index.js';
-import { coalesce_to_error } from './utils/error.js';
 import { resolve_explicit_env_entry } from './core/env.js';
+import { coalesce_to_error } from './utils/error.js';
+import { import_peer } from './utils/import.js';
 
 /** @param {unknown} e */
 function handle_error(e) {
@@ -75,19 +76,19 @@ if (!command) {
 }
 
 if (command === 'sync') {
-	// create placeholder .svelte-kit/tsconfig.json if necessary, to squelch warnings.
+	// create placeholder node_modules/$app/tsconfig.json if necessary, to squelch warnings.
 	// this isn't bulletproof — if someone has some esoteric config, it will continue
 	// to harmlessly warn — but we handle the 90% case and clean up after ourselves
-	const sveltekit_dir = '.svelte-kit';
-	const base_tsconfig = `${sveltekit_dir}/tsconfig.json`;
+	const dir = 'node_modules/$app';
+	const base_tsconfig = `${dir}/tsconfig.json`;
 	const base_tsconfig_json = '{}';
 
-	const sveltekit_dir_exists = fs.existsSync(sveltekit_dir);
+	const sveltekit_dir_exists = fs.existsSync(dir);
 	const base_tsconfig_exists = fs.existsSync(base_tsconfig);
 
 	if (!base_tsconfig_exists) {
 		try {
-			fs.mkdirSync('.svelte-kit');
+			fs.mkdirSync(dir, { recursive: true });
 		} catch {
 			// ignore
 		}
@@ -96,14 +97,16 @@ if (command === 'sync') {
 	}
 
 	try {
-		const vite_config = await load_vite_config(values.config);
+		const vite = /** @type {typeof import('vite')} */ (await import_peer('vite', process.cwd()));
+
+		const vite_config = await load_vite_config(values.config, vite);
 		const sveltekit_config = extract_svelte_config(vite_config);
 
 		const sync = await import('./core/sync/sync.js');
-		sync.all_types(sveltekit_config);
+		sync.all_types(sveltekit_config, vite_config.root);
 
-		const explicit_env_entry = resolve_explicit_env_entry(sveltekit_config.kit);
-		await sync.env(sveltekit_config.kit, explicit_env_entry, vite_config.root, values.mode);
+		const explicit_env_entry = resolve_explicit_env_entry(sveltekit_config);
+		await sync.env(vite, sveltekit_config, explicit_env_entry, vite_config.root, values.mode);
 	} catch (error) {
 		handle_error(error);
 	} finally {
@@ -113,8 +116,8 @@ if (command === 'sync') {
 			fs.unlinkSync(base_tsconfig);
 		}
 
-		if (!sveltekit_dir_exists && fs.readdirSync(sveltekit_dir).length === 0) {
-			fs.rmSync(sveltekit_dir, { recursive: true });
+		if (!sveltekit_dir_exists && fs.readdirSync(dir).length === 0) {
+			fs.rmSync(dir, { recursive: true });
 		}
 	}
 } else {

package/src/constants.js

@@ -4,10 +4,15 @@
  */
 export const SVELTE_KIT_ASSETS = '/_svelte_kit_assets';
 
-export const GENERATED_COMMENT = '// this file is generated — do not edit it\n';
+export const GENERATED_COMMENT = '// this file is generated — do not edit it';
 
 export const ENDPOINT_METHODS = ['GET', 'POST', 'PUT', 'PATCH', 'DELETE', 'OPTIONS', 'HEAD'];
 
 export const MUTATIVE_METHODS = ['POST', 'PUT', 'PATCH', 'DELETE'];
 
 export const PAGE_METHODS = ['GET', 'POST', 'HEAD'];
+
+export const SRC_ROOT = import.meta.dirname;
+
+// eslint-disable-next-line n/prefer-global/process
+export const IN_WEBCONTAINER = !!globalThis.process?.versions?.webcontainer;

package/src/core/adapt/builder.js

@@ -1,16 +1,24 @@
 /** @import { StandardSchemaV1 } from '@standard-schema/spec' */
 /** @import { Builder } from '@sveltejs/kit' */
 /** @import { ResolvedConfig } from 'vite' */
-/** @import { RouteDefinition, EnvVarConfig } from '@sveltejs/kit' */
+/** @import { RouteDefinition } from '@sveltejs/kit' */
+/** @import { EnvVarConfig } from '@sveltejs/kit/env' */
 /** @import { RouteData, ValidatedConfig, BuildData, ServerMetadata, ServerMetadataRoute, Prerendered, PrerenderMap, Logger, RemoteChunk } from 'types' */
 import { loadEnv } from 'vite';
 import * as devalue from 'devalue';
-import { createReadStream, createWriteStream, existsSync, statSync } from 'node:fs';
+import {
+	createReadStream,
+	createWriteStream,
+	existsSync,
+	mkdirSync,
+	rmSync,
+	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 { copy } from '../../utils/filesystem.js';
 import { posixify } from '../../utils/os.js';
 import { generate_manifest } from '../generate_manifest/index.js';
 import { get_route_segments } from '../../utils/routing.js';
@@ -18,11 +26,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.
@@ -87,8 +107,8 @@ export function create_builder({
 
 	return {
 		log,
-		rimraf,
-		mkdirp,
+		rimraf: (dir) => rmSync(dir, { force: true, recursive: true }),
+		mkdirp: (dir) => mkdirSync(dir, { recursive: true }),
 		copy,
 
 		config,
@@ -97,16 +117,19 @@ export function create_builder({
 
 		async compress(directory) {
 			if (!existsSync(directory)) {
-				return;
+				return [];
 			}
 
-			const files = list_files(directory, (file) => extensions.includes(extname(file))).map(
-				(file) => resolve(directory, file)
-			);
+			const files = list_files(directory, (file) => extensions.includes(extname(file)));
 
 			await Promise.all(
-				files.flatMap((file) => [compress_file(file, 'gz'), compress_file(file, 'br')])
+				files.flatMap((file) => {
+					const abs = resolve(directory, file);
+					return [compress_file(abs, 'gz'), compress_file(abs, 'br')];
+				})
 			);
+
+			return files;
 		},
 
 		findServerAssets(route_data) {
@@ -118,23 +141,20 @@ export function create_builder({
 		},
 
 		async generateFallback(dest) {
-			const manifest_path = `${config.kit.outDir}/output/server/manifest-full.js`;
-			const env = loadEnv(vite_config.mode, config.kit.env.dir, '');
+			const manifest_path = `${config.outDir}/output/server/manifest-full.js`;
+			const env = loadEnv(vite_config.mode, config.env.dir, '');
 
 			const fallback = await generate_fallback({
 				manifest_path,
 				env,
-				out_dir: config.kit.outDir,
-				origin: config.kit.prerender.origin,
-				assets: config.kit.files.assets
+				out_dir: config.outDir,
+				origin: config.paths.origin || 'http://sveltekit-prerender',
+				assets: config.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,8 +164,8 @@ 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 env = loadEnv(vite_config.mode, config.kit.env.dir, '');
+			const dest = `${config.outDir}/output/prerendered/dependencies/${config.appDir}`;
+			const env = loadEnv(vite_config.mode, config.env.dir, '');
 
 			/** @type {Record<string, any>} */
 			const values = {};
@@ -161,7 +181,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 }) {
@@ -178,15 +200,15 @@ export function create_builder({
 		},
 
 		getBuildDirectory(name) {
-			return `${config.kit.outDir}/${name}`;
+			return `${config.outDir}/${name}`;
 		},
 
 		getClientDirectory() {
-			return `${config.kit.outDir}/output/client`;
+			return `${config.outDir}/output/client`;
 		},
 
 		getServerDirectory() {
-			return `${config.kit.outDir}/output/server`;
+			return `${config.outDir}/output/server`;
 		},
 
 		getAppPath() {
@@ -194,14 +216,14 @@ export function create_builder({
 		},
 
 		writeClient(dest) {
-			return copy(`${config.kit.outDir}/output/client`, dest, {
+			return copy(`${config.outDir}/output/client`, dest, {
 				// avoid making vite build artefacts public
 				filter: (basename) => basename !== '.vite'
 			});
 		},
 
 		writePrerendered(dest) {
-			const source = `${config.kit.outDir}/output/prerendered`;
+			const source = `${config.outDir}/output/prerendered`;
 
 			return [
 				...copy(`${source}/pages`, dest),
@@ -211,11 +233,11 @@ export function create_builder({
 		},
 
 		writeServer(dest) {
-			return copy(`${config.kit.outDir}/output/server`, dest);
+			return copy(`${config.outDir}/output/server`, dest);
 		},
 
 		hasServerInstrumentationFile() {
-			return existsSync(`${config.kit.outDir}/output/server/instrumentation.server.js`);
+			return existsSync(`${config.outDir}/output/server/instrumentation.server.js`);
 		},
 
 		instrument({
@@ -257,7 +279,7 @@ export function create_builder({
 							exports: module.exports
 						});
 
-			rimraf(entrypoint);
+			rmSync(entrypoint, { force: true, recursive: true });
 			write(entrypoint, facade);
 		}
 	};
@@ -291,53 +313,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
@@ -12,10 +10,9 @@ import { create_builder } from './builder.js';
  * @param {import('types').Logger} log
  * @param {import('types').RemoteChunk[]} remotes
  * @param {import('vite').ResolvedConfig} vite_config
- * @param {Record<string, import('@sveltejs/kit').EnvVarConfig<any>> | null} explicit_env_config
+ * @param {Record<string, import('@sveltejs/kit/env').EnvVarConfig<any>> | null} explicit_env_config
  */
 export async function adapt(
-	adapter,
 	config,
 	build_data,
 	server_metadata,
@@ -26,12 +23,26 @@ export async function adapt(
 	vite_config,
 	explicit_env_config
 ) {
-	const { name, adapt } = adapter;
+	const { name, adapt } = config.adapter;
 
 	console.log(styleText(['bold', 'cyan'], `\n> Using ${name}`));
 
+	let warned = false;
+
 	const builder = create_builder({
-		config,
+		config: {
+			...config,
+			get kit() {
+				if (!warned) {
+					warned = true;
+					log.warn(
+						`Reading \`config.kit\` inside adapters is deprecated — it should access configuration on the \`config\` object directly. You may need to update your adapter`
+					);
+				}
+
+				return config;
+			}
+		},
 		build_data,
 		server_metadata,
 		route_data: build_data.manifest_data.routes.filter((route) => route.page || route.endpoint),