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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sveltejs/kit",
-  "version": "3.0.0-next.3",
+  "version": "3.0.0-next.6",
   "description": "SvelteKit is the fastest way to build Svelte apps",
   "keywords": [
     "framework",
@@ -18,37 +18,37 @@
   "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",
+    "@opentelemetry/api": "^1.9.0",
     "@playwright/test": "^1.60.0",
     "@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.1",
     "jsdom": "^29.1.1",
-    "rolldown": "^1.0.0-rc.6",
+    "rolldown": "^1.1.2",
     "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",
+    "vite": "^8.0.16",
+    "vitest": "^4.1.9"
   },
   "peerDependencies": {
-    "@sveltejs/vite-plugin-svelte": "^7.0.0",
     "@opentelemetry/api": "^1.0.0",
+    "@sveltejs/vite-plugin-svelte": "^7.0.0",
     "svelte": "^5.48.0",
     "typescript": "^6.0.0",
-    "vite": "^8.0.0"
+    "vite": "^8.0.12"
   },
   "peerDependenciesMeta": {
     "@opentelemetry/api": {
@@ -94,7 +94,7 @@
       "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",
@@ -119,7 +119,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/core/adapt/builder.js

@@ -22,7 +22,19 @@ import { reserved } 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,7 +137,7 @@ 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
 			});
 
@@ -144,7 +156,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 +173,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 }) {

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,14 +1,72 @@
-/** @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 { options, kit_options, kit_experimental_options } from './options.js';
 import { resolve_entry } from '../../utils/filesystem.js';
 import { import_peer } from '../../utils/import.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
  * required content.
@@ -77,11 +135,12 @@ export function extract_svelte_config(vite_config) {
  * @param {Config} config
  * @returns {ValidatedConfig}
  */
-export function process_config(config, { cwd = process.cwd(), source = 'svelte.config.js' } = {}) {
+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') {
@@ -102,7 +161,7 @@ export function process_config(config, { cwd = process.cwd(), source = 'svelte.c
 		const error = /** @type {Error} */ (e);
 
 		// redact the stack trace — it's not helpful to users
-		error.stack = `Error loading ${source}: ${error.message}\n`;
+		error.stack = `Error loading SvelteKit options from Vite config: ${error.message}\n`;
 		throw error;
 	}
 }
@@ -115,7 +174,7 @@ export function process_config(config, { cwd = process.cwd(), source = 'svelte.c
 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'
+			'The SvelteKit options from the Vite config must be an object. See https://svelte.dev/docs/kit/configuration'
 		);
 	}
 

package/src/core/config/options.js

@@ -1,7 +1,5 @@
 /** @import { Validator } from './types.js' */
 
-import process from 'node:process';
-
 const directives = object({
 	'child-src': string_array(),
 	'default-src': string_array(),
@@ -37,7 +35,7 @@ const directives = object({
 });
 
 /** @type {Validator} */
-const options = object(
+export const options = object(
 	{
 		extensions: validate(['.svelte'], (input, keypath) => {
 			if (!Array.isArray(input) || !input.every((page) => typeof page === 'string')) {
@@ -85,7 +83,7 @@ const options = object(
 				if (input) {
 					if (input.startsWith('/') || input.endsWith('/')) {
 						throw new Error(
-							"config.kit.appDir cannot start or end with '/'. See https://svelte.dev/docs/kit/configuration"
+							`${keypath} cannot start or end with '/'. See https://svelte.dev/docs/kit/configuration`
 						);
 					}
 				} else {
@@ -111,7 +109,7 @@ const options = object(
 			embedded: boolean(false),
 
 			env: object({
-				dir: string(process.cwd())
+				dir: string('')
 			}),
 
 			experimental: object({
@@ -187,6 +185,35 @@ const options = object(
 
 					return input;
 				}),
+				origin: validate(undefined, (input, keypath) => {
+					assert_string(input, keypath);
+
+					let url;
+
+					try {
+						url = new URL(input);
+					} catch {
+						throw new Error(
+							`${keypath} must be a valid origin (e.g. 'https://my-site.com'). '${input}' could not be parsed as a URL`
+						);
+					}
+
+					if (url.protocol !== 'http:' && url.protocol !== 'https:') {
+						throw new Error(
+							`${keypath} must be a valid origin — only 'http' and 'https' protocols are supported, received '${url.protocol}'`
+						);
+					}
+
+					const origin = url.origin;
+
+					if (input !== origin) {
+						throw new Error(
+							`${keypath} must be a valid origin — received '${input}' which contains a path, query, or hash. Use the bare origin '${origin}' instead`
+						);
+					}
+
+					return origin;
+				}),
 				relative: boolean(true)
 			}),
 
@@ -265,23 +292,23 @@ const options = object(
 					}
 				),
 
-				origin: validate('http://sveltekit-prerender', (input, keypath) => {
-					assert_string(input, keypath);
-
-					let origin;
-
-					try {
-						origin = new URL(input).origin;
-					} catch {
-						throw new Error(`${keypath} must be a valid origin`);
-					}
-
-					if (input !== origin) {
-						throw new Error(`${keypath} must be a valid origin (${origin} rather than ${input})`);
+				handleInvalidUrl: validate(
+					(/** @type {any} */ { message }) => {
+						throw new Error(
+							message +
+								'\nTo suppress or handle this error, implement `handleInvalidUrl` in https://svelte.dev/docs/kit/configuration#prerender'
+						);
+					},
+					(input, keypath) => {
+						if (typeof input === 'function') return input;
+						if (['fail', 'warn', 'ignore'].includes(input)) return input;
+						throw new Error(`${keypath} should be "fail", "warn", "ignore" or a custom function`);
 					}
+				),
 
-					return origin;
-				})
+				origin: removed(
+					(keypath) => `\`${keypath}\` has been removed in favour of \`config.paths.origin\``
+				)
 			}),
 
 			router: object({
@@ -321,6 +348,8 @@ const options = object(
 // 		`The \`${keypath}\` option is deprecated, and will be removed in a future version`
 // ) {
 // 	return (input, keypath) => {
+//		keypath = remove_kit_prefix(keypath);
+//
 // 		if (input !== undefined) {
 // 			console.warn(styleText(['bold', 'yellow'], get_message(keypath)));
 // 		}
@@ -329,6 +358,17 @@ const options = object(
 // 	};
 // }
 
+// Derive the names of SvelteKit's own config options from the schema, so they
+// stay in sync automatically. These are used to separate Kit's options from
+// `vite-plugin-svelte`'s options when config is passed via the Vite plugin.
+const defaults = /** @type {Record<string, any>} */ (options({}, 'config'));
+
+/** The names of the options that live under the `kit` namespace */
+export const kit_options = Object.keys(defaults.kit);
+
+/** The names of the options that live under the `kit.experimental` namespace */
+export const kit_experimental_options = Object.keys(defaults.kit.experimental);
+
 /**
  * @param {(keypath: string) => string} get_message
  * @returns {Validator}
@@ -338,6 +378,8 @@ function removed(
 		`The \`${keypath}\` option has been removed. Please see the list of breaking changes for your major release`
 ) {
 	return (input, keypath) => {
+		keypath = remove_kit_prefix(keypath);
+
 		if (typeof input !== 'undefined') {
 			throw new Error(get_message(keypath));
 		}
@@ -351,6 +393,8 @@ function removed(
  */
 export function object(children, allow_unknown = false) {
 	return (input, keypath) => {
+		keypath = remove_kit_prefix(keypath);
+
 		/** @type {Record<string, any>} */
 		const output = {};
 
@@ -391,6 +435,7 @@ export function object(children, allow_unknown = false) {
  */
 export function validate(fallback, fn) {
 	return (input, keypath) => {
+		keypath = remove_kit_prefix(keypath);
 		return input === undefined ? fallback : fn(input, keypath);
 	};
 }
@@ -488,9 +533,16 @@ function fun(fallback) {
  * @param {string} keypath
  */
 function assert_string(input, keypath) {
+	keypath = remove_kit_prefix(keypath);
 	if (typeof input !== 'string') {
 		throw new Error(`${keypath} should be a string, if specified`);
 	}
 }
 
-export default options;
+/**
+ * @param {string} keypath
+ * @deprecated TODO get rid of the nesting so this is unnecessary
+ */
+function remove_kit_prefix(keypath) {
+	return keypath.replace('.kit.', '.');
+}

package/src/core/env.js

@@ -51,6 +51,10 @@ export async function load_explicit_env(kit, file, root, mode) {
 	/** @type {Record<string, EnvVarConfig<any>>} */
 	let variables;
 
+	/** @type {import('../runtime/app/env/internal.js')} */ (
+		await server.ssrLoadModule(`${runtime_directory}/app/env/internal.js`)
+	).set_building();
+
 	try {
 		({ variables } = await server.ssrLoadModule(file));
 
@@ -87,7 +91,7 @@ export async function load_explicit_env(kit, file, root, mode) {
 
 /**
  * Creates the `__sveltekit/env` module
- * @param {Record<string, EnvVarConfig<any>> | null} variables
+ * @param {Record<string, EnvVarConfig<any> | undefined> | null} variables
  * @param {Record<string, string>} env
  * @param {string | null} entry
  */
@@ -106,7 +110,7 @@ export function create_sveltekit_env(variables, env, entry) {
 	const issues = {};
 
 	for (const [name, config] of Object.entries(variables ?? {})) {
-		if (config.static) {
+		if (config?.static) {
 			if (config.public) {
 				const value = validate(variables ?? {}, env[name], name, issues);
 				declarations.push(`explicit_public_env.${name} = ${devalue.uneval(value)};`);
@@ -116,7 +120,7 @@ export function create_sveltekit_env(variables, env, entry) {
 				`const ${name} = validate(variables, env.${name}, ${JSON.stringify(name)}, issues);`
 			);
 
-			if (config.public) {
+			if (config?.public) {
 				setters.push(`explicit_public_env.${name} = ${name};`);
 				setters.push(`rendered_env.${name} = ${name};`);
 			} else {
@@ -213,9 +217,36 @@ export function create_sveltekit_env_public(variables, env, prelude) {
 	return `${prelude}\n\n${exports.join('')}`;
 }
 
+/**
+ * Creates the `__sveltekit/env/service-worker` module used in production. When an app uses
+ * dynamic public env vars, they're loaded at runtime via an import of the prerendered
+ * `env.js`. If there are none, values are inlined.
+ * @param {Record<string, EnvVarConfig<any>> | null} variables
+ * @param {Record<string, string>} env
+ * @param {string} global
+ * @param {string} base
+ * @param {string} app_dir
+ */
+export function create_sveltekit_env_service_worker(variables, env, global, base, app_dir) {
+	const has_dynamic_public_env = Object.values(variables ?? {}).some(
+		(config) => config.public && !config.static
+	);
+
+	if (!has_dynamic_public_env) {
+		return create_sveltekit_env_service_worker_dev(variables, env, global);
+	}
+
+	return dedent`
+		import { env } from '${base}/${app_dir}/env.js';
+
+		globalThis.__SVELTEKIT_EXPERIMENTAL_EXPLICIT_ENVIRONMENT_VARIABLES__ = true;
+
+		${global} = { env };
+	`;
+}
+
 /**
  * Creates the `__sveltekit/env/service-worker` module used in development
- * (but not in prod, which goes through build_service_worker instead)
  * @param {Record<string, EnvVarConfig<any>> | null} variables
  * @param {Record<string, string>} env
  * @param {string} global

package/src/core/postbuild/analyse.js

@@ -1,4 +1,3 @@
-/** @import { Adapter } from '@sveltejs/kit' */
 /** @import { RemoteChunk } from 'types' */
 import { join } from 'node:path';
 import { pathToFileURL } from 'node:url';
@@ -39,15 +38,7 @@ async function analyse({
 	const manifest = (await import(pathToFileURL(manifest_path).href)).manifest;
 
 	const vite_config = await load_vite_config(vite_config_file);
-
 	const config = extract_svelte_config(vite_config).kit;
-
-	// TODO i think this can just be config.adapter?
-	/** @type {Adapter | undefined} */
-	const adapter = vite_config.plugins.find(
-		(plugin) => plugin.name === 'vite-plugin-sveltekit-adapter'
-	)?.api?.adapter;
-
 	const server_root = join(config.outDir, 'output');
 
 	/** @type {import('types').ServerInternalModule} */
@@ -57,11 +48,16 @@ async function analyse({
 	// essential we do this before analysing the code
 	internal.set_building();
 
-	// set env, `read`, and `manifest`, in case they're used in initialisation
-	internal.set_env(env);
+	// set `read` and `manifest`, in case they're used in initialisation
 	internal.set_manifest(manifest);
 	internal.set_read_implementation((file) => createReadableStream(`${server_root}/server/${file}`));
 
+	// `set_env` lives in a separate module that imports the user's `src/env` config. We import it
+	// *after* `set_building()` so that `building`-dependent expressions resolve correctly
+	/** @type {import('__sveltekit/env')} */
+	const { set_env } = await import(pathToFileURL(`${server_root}/server/env.js`).href);
+	set_env(env);
+
 	/** @type {import('types').ServerMetadata} */
 	const metadata = {
 		nodes: [],
@@ -126,7 +122,7 @@ async function analyse({
 				server_manifest,
 				tracked_features
 			)) {
-				check_feature(route.id, route_config, feature, adapter);
+				check_feature(route.id, route_config, feature, config.adapter);
 			}
 		}
 

package/src/core/postbuild/crawl.js

@@ -38,6 +38,18 @@ export function crawl(html, base) {
 	/** @type {string[]} */
 	const hrefs = [];
 
+	/** @type {string[]} */
+	const invalid = [];
+
+	/** @param {string} url */
+	const push_href = (url) => {
+		try {
+			hrefs.push(resolve(base, url));
+		} catch {
+			invalid.push(url);
+		}
+	};
+
 	let i = 0;
 	main: while (i < html.length) {
 		const char = html[i];
@@ -186,9 +198,13 @@ export function crawl(html, base) {
 
 				if (href) {
 					if (tag === 'BASE') {
-						base = resolve(base, href);
+						try {
+							base = resolve(base, href);
+						} catch {
+							invalid.push(href);
+						}
 					} else if (!rel || !/\bexternal\b/i.test(rel)) {
-						hrefs.push(resolve(base, href));
+						push_href(href);
 					}
 				}
 
@@ -201,7 +217,7 @@ export function crawl(html, base) {
 				}
 
 				if (src) {
-					hrefs.push(resolve(base, src));
+					push_href(src);
 				}
 
 				if (srcset) {
@@ -222,7 +238,7 @@ export function crawl(html, base) {
 					candidates.push(value);
 					for (const candidate of candidates) {
 						const src = candidate.split(WHITESPACE)[0];
-						if (src) hrefs.push(resolve(base, src));
+						if (src) push_href(src);
 					}
 				}
 
@@ -230,7 +246,7 @@ export function crawl(html, base) {
 					const attr = name ?? property;
 
 					if (attr && CRAWLABLE_META_NAME_ATTRS.has(attr)) {
-						hrefs.push(resolve(base, content));
+						push_href(content);
 					}
 				}
 			}
@@ -239,5 +255,5 @@ export function crawl(html, base) {
 		i += 1;
 	}
 
-	return { ids, hrefs };
+	return { ids, hrefs, invalid };
 }