@sveltejs/kit 1.30.2 → 2.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sveltejs/kit",
-  "version": "1.30.2",
+  "version": "2.0.0",
   "description": "The fastest way to build Svelte apps",
   "repository": {
     "type": "git",
@@ -11,37 +11,37 @@
   "homepage": "https://kit.svelte.dev",
   "type": "module",
   "dependencies": {
-    "@sveltejs/vite-plugin-svelte": "^2.5.0",
-    "@types/cookie": "^0.5.1",
-    "cookie": "^0.5.0",
-    "devalue": "^4.3.1",
+    "@types/cookie": "^0.6.0",
+    "cookie": "^0.6.0",
+    "devalue": "^4.3.2",
     "esm-env": "^1.0.0",
     "kleur": "^4.1.5",
-    "magic-string": "^0.30.0",
+    "magic-string": "^0.30.5",
     "mrmime": "^1.0.1",
     "sade": "^1.8.1",
     "set-cookie-parser": "^2.6.0",
-    "sirv": "^2.0.2",
-    "tiny-glob": "^0.2.9",
-    "undici": "~5.26.2"
+    "sirv": "^2.0.3",
+    "tiny-glob": "^0.2.9"
   },
   "devDependencies": {
     "@playwright/test": "1.30.0",
-    "@types/connect": "^3.4.35",
-    "@types/node": "^16.18.6",
-    "@types/sade": "^1.7.4",
-    "@types/set-cookie-parser": "^2.4.2",
-    "dts-buddy": "^0.2.4",
-    "rollup": "^3.29.4",
-    "svelte": "^4.2.7",
-    "svelte-preprocess": "^5.1.1",
-    "typescript": "^4.9.4",
-    "vite": "^4.4.9",
-    "vitest": "^0.34.5"
+    "@sveltejs/vite-plugin-svelte": "^3.0.1",
+    "@types/connect": "^3.4.38",
+    "@types/node": "^18.19.3",
+    "@types/sade": "^1.7.8",
+    "@types/set-cookie-parser": "^2.4.7",
+    "dts-buddy": "^0.4.3",
+    "rollup": "^4.8.0",
+    "svelte": "^4.2.8",
+    "svelte-preprocess": "^5.1.2",
+    "typescript": "^5.3.3",
+    "vite": "^5.0.8",
+    "vitest": "^1.0.4"
   },
   "peerDependencies": {
-    "svelte": "^3.54.0 || ^4.0.0-next.0 || ^5.0.0-next.0",
-    "vite": "^4.0.0"
+    "@sveltejs/vite-plugin-svelte": "^3.0.0",
+    "svelte": "^4.0.0 || ^5.0.0-next.0",
+    "vite": "^5.0.3"
   },
   "bin": {
     "svelte-kit": "svelte-kit.js"
@@ -80,11 +80,11 @@
   },
   "types": "types/index.d.ts",
   "engines": {
-    "node": "^16.14 || >=18"
+    "node": ">=18.13"
   },
   "scripts": {
     "lint": "prettier --config ../../.prettierrc --check .",
-    "check": "tsc",
+    "check": "tsc && cd ./test/types && 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

@@ -156,6 +156,13 @@ export function create_builder({
 			write(dest, fallback);
 		},
 
+		generateEnvModule() {
+			const dest = `${config.kit.outDir}/output/prerendered/dependencies/${config.kit.appDir}/env.js`;
+			const env = get_env(config.kit.env, vite_config.mode);
+
+			write(dest, `export const env=${JSON.stringify(env.public)}`);
+		},
+
 		generateManifest({ relativePath, routes: subset }) {
 			return generate_manifest({
 				build_data,
@@ -213,7 +220,7 @@ async function compress_file(file, format = 'gz') {
 						[zlib.constants.BROTLI_PARAM_QUALITY]: zlib.constants.BROTLI_MAX_QUALITY,
 						[zlib.constants.BROTLI_PARAM_SIZE_HINT]: statSync(file).size
 					}
-			  })
+				})
 			: zlib.createGzip({ level: zlib.constants.Z_BEST_COMPRESSION });
 
 	const source = createReadStream(file);

package/src/core/config/index.js

@@ -69,7 +69,15 @@ export async function load_config({ cwd = process.cwd() } = {}) {
 
 	const config = await import(`${url.pathToFileURL(config_file).href}?ts=${Date.now()}`);
 
-	return process_config(config.default, { cwd });
+	try {
+		return process_config(config.default, { cwd });
+	} catch (e) {
+		const error = /** @type {Error} */ (e);
+
+		// redact the stack trace — it's not helpful to users
+		error.stack = `Could not load svelte.config.js: ${error.message}\n`;
+		throw error;
+	}
 }
 
 /**

package/src/core/config/options.js

@@ -111,11 +111,6 @@ const options = object(
 				checkOrigin: boolean(true)
 			}),
 
-			dangerZone: object({
-				// TODO 2.0: Remove this
-				trackServerFetches: boolean(false)
-			}),
-
 			embedded: boolean(false),
 
 			env: object({
@@ -179,13 +174,7 @@ const options = object(
 
 					return input;
 				}),
-				relative: validate(undefined, (input, keypath) => {
-					if (typeof input !== 'boolean') {
-						throw new Error(`${keypath} option must be a boolean or undefined`);
-					}
-
-					return input;
-				})
+				relative: boolean(true)
 			}),
 
 			prerender: object({

package/src/core/postbuild/analyse.js

@@ -10,11 +10,10 @@ import {
 } from '../../utils/exports.js';
 import { load_config } from '../config/index.js';
 import { forked } from '../../utils/fork.js';
-import { should_polyfill } from '../../utils/platform.js';
 import { installPolyfills } from '../../exports/node/polyfills.js';
-import { resolvePath } from '../../exports/index.js';
 import { ENDPOINT_METHODS } from '../../constants.js';
 import { filter_private_env, filter_public_env } from '../../utils/env.js';
+import { resolve_route } from '../../utils/routing.js';
 
 export default forked(import.meta.url, analyse);
 
@@ -36,9 +35,7 @@ async function analyse({ manifest_path, env }) {
 	/** @type {import('types').ServerInternalModule} */
 	const internal = await import(pathToFileURL(`${server_root}/server/internal.js`).href);
 
-	if (should_polyfill) {
-		installPolyfills();
-	}
+	installPolyfills();
 
 	// configure `import { building } from '$app/environment'` —
 	// essential we do this before analysing the code
@@ -46,8 +43,11 @@ async function analyse({ manifest_path, env }) {
 
 	// set env, in case it's used in initialisation
 	const { publicPrefix: public_prefix, privatePrefix: private_prefix } = config.env;
-	internal.set_private_env(filter_private_env(env, { public_prefix, private_prefix }));
-	internal.set_public_env(filter_public_env(env, { public_prefix, private_prefix }));
+	const private_env = filter_private_env(env, { public_prefix, private_prefix });
+	const public_env = filter_public_env(env, { public_prefix, private_prefix });
+	internal.set_private_env(private_env);
+	internal.set_public_env(public_env);
+	internal.set_safe_public_env(public_env);
 
 	/** @type {import('types').ServerMetadata} */
 	const metadata = {
@@ -55,10 +55,10 @@ async function analyse({ manifest_path, env }) {
 		routes: new Map()
 	};
 
-	// analyse nodes
-	for (const loader of manifest._.nodes) {
-		const node = await loader();
+	const nodes = await Promise.all(manifest._.nodes.map((loader) => loader()));
 
+	// analyse nodes
+	for (const node of nodes) {
 		metadata.nodes[node.index] = {
 			has_server_load: node.server?.load !== undefined || node.server?.trailingSlash !== undefined
 		};
@@ -66,78 +66,35 @@ async function analyse({ manifest_path, env }) {
 
 	// analyse routes
 	for (const route of manifest._.routes) {
-		/** @type {Array<'GET' | 'POST'>} */
-		const page_methods = [];
-
-		/** @type {(import('types').HttpMethod | '*')[]} */
-		const api_methods = [];
+		const page =
+			route.page &&
+			analyse_page(
+				route.page.layouts.map((n) => (n === undefined ? n : nodes[n])),
+				nodes[route.page.leaf]
+			);
 
-		/** @type {import('types').PrerenderOption | undefined} */
-		let prerender = undefined;
-		/** @type {any} */
-		let config = undefined;
-		/** @type {import('types').PrerenderEntryGenerator | undefined} */
-		let entries = undefined;
+		const endpoint = route.endpoint && analyse_endpoint(route, await route.endpoint());
 
-		if (route.endpoint) {
-			const mod = await route.endpoint();
-			if (mod.prerender !== undefined) {
-				validate_server_exports(mod, route.id);
+		if (page?.prerender && endpoint?.prerender) {
+			throw new Error(`Cannot prerender a route with both +page and +server files (${route.id})`);
+		}
 
-				if (mod.prerender && (mod.POST || mod.PATCH || mod.PUT || mod.DELETE)) {
+		if (page?.config && endpoint?.config) {
+			for (const key in { ...page.config, ...endpoint.config }) {
+				if (JSON.stringify(page.config[key]) !== JSON.stringify(endpoint.config[key])) {
 					throw new Error(
-						`Cannot prerender a +server file with POST, PATCH, PUT, or DELETE (${route.id})`
+						`Mismatched route config for ${route.id} — the +page and +server files must export the same config, if any`
 					);
 				}
-
-				prerender = mod.prerender;
-			}
-
-			for (const method of /** @type {import('types').HttpMethod[]} */ (ENDPOINT_METHODS)) {
-				if (mod[method]) api_methods.push(method);
 			}
-
-			if (mod.fallback) {
-				api_methods.push('*');
-			}
-
-			config = mod.config;
-			entries = mod.entries;
 		}
 
-		if (route.page) {
-			const nodes = await Promise.all(
-				[...route.page.layouts, route.page.leaf].map((n) => {
-					if (n !== undefined) return manifest._.nodes[n]();
-				})
-			);
-
-			const layouts = nodes.slice(0, -1);
-			const page = nodes.at(-1);
-
-			for (const layout of layouts) {
-				if (layout) {
-					validate_layout_server_exports(layout.server, layout.server_id);
-					validate_layout_exports(layout.universal, layout.universal_id);
-				}
-			}
-
-			if (page) {
-				page_methods.push('GET');
-				if (page.server?.actions) page_methods.push('POST');
-
-				validate_page_server_exports(page.server, page.server_id);
-				validate_page_exports(page.universal, page.universal_id);
-			}
-
-			prerender = get_option(nodes, 'prerender') ?? false;
-
-			config = get_config(nodes);
-			entries ??= get_option(nodes, 'entries');
-		}
+		const page_methods = page?.methods ?? [];
+		const api_methods = endpoint?.methods ?? [];
+		const entries = page?.entries ?? endpoint?.entries;
 
 		metadata.routes.set(route.id, {
-			config,
+			config: page?.config ?? endpoint?.config,
 			methods: Array.from(new Set([...page_methods, ...api_methods])),
 			page: {
 				methods: page_methods
@@ -145,29 +102,90 @@ async function analyse({ manifest_path, env }) {
 			api: {
 				methods: api_methods
 			},
-			prerender,
+			prerender: page?.prerender ?? endpoint?.prerender,
 			entries:
-				entries && (await entries()).map((entry_object) => resolvePath(route.id, entry_object))
+				entries && (await entries()).map((entry_object) => resolve_route(route.id, entry_object))
 		});
 	}
 
 	return metadata;
 }
 
+/**
+ * @param {import('types').SSRRoute} route
+ * @param {import('types').SSREndpoint} mod
+ */
+function analyse_endpoint(route, mod) {
+	validate_server_exports(mod, route.id);
+
+	if (mod.prerender && (mod.POST || mod.PATCH || mod.PUT || mod.DELETE)) {
+		throw new Error(
+			`Cannot prerender a +server file with POST, PATCH, PUT, or DELETE (${route.id})`
+		);
+	}
+
+	/** @type {Array<import('types').HttpMethod | '*'>} */
+	const methods = [];
+
+	for (const method of /** @type {import('types').HttpMethod[]} */ (ENDPOINT_METHODS)) {
+		if (mod[method]) methods.push(method);
+	}
+
+	if (mod.fallback) {
+		methods.push('*');
+	}
+
+	return {
+		config: mod.config,
+		entries: mod.entries,
+		methods,
+		prerender: mod.prerender ?? false
+	};
+}
+
+/**
+ * @param {Array<import('types').SSRNode | undefined>} layouts
+ * @param {import('types').SSRNode} leaf
+ */
+function analyse_page(layouts, leaf) {
+	for (const layout of layouts) {
+		if (layout) {
+			validate_layout_server_exports(layout.server, layout.server_id);
+			validate_layout_exports(layout.universal, layout.universal_id);
+		}
+	}
+
+	/** @type {Array<'GET' | 'POST'>} */
+	const methods = ['GET'];
+	if (leaf.server?.actions) methods.push('POST');
+
+	validate_page_server_exports(leaf.server, leaf.server_id);
+	validate_page_exports(leaf.universal, leaf.universal_id);
+
+	return {
+		config: get_config([...layouts, leaf]),
+		entries: leaf.universal?.entries ?? leaf.server?.entries,
+		methods,
+		prerender: get_option([...layouts, leaf], 'prerender') ?? false
+	};
+}
+
 /**
  * Do a shallow merge (first level) of the config object
  * @param {Array<import('types').SSRNode | undefined>} nodes
  */
 function get_config(nodes) {
+	/** @type {any} */
 	let current = {};
+
 	for (const node of nodes) {
-		const config = node?.universal?.config ?? node?.server?.config;
-		if (config) {
-			current = {
-				...current,
-				...config
-			};
-		}
+		if (!node?.universal?.config && !node?.server?.config) continue;
+
+		current = {
+			...current,
+			...node?.universal?.config,
+			...node?.server?.config
+		};
 	}
 
 	return Object.keys(current).length ? current : undefined;

package/src/core/postbuild/prerender.js

@@ -3,7 +3,6 @@ import { dirname, join } from 'node:path';
 import { pathToFileURL } from 'node:url';
 import { installPolyfills } from '../../exports/node/polyfills.js';
 import { mkdirp, posixify, walk } from '../../utils/filesystem.js';
-import { should_polyfill } from '../../utils/platform.js';
 import { decode_uri, is_root_relative, resolve } from '../../utils/url.js';
 import { escape_html_attr } from '../../utils/escape.js';
 import { logger } from '../utils.js';
@@ -94,9 +93,7 @@ async function prerender({ out, manifest_path, metadata, verbose, env }) {
 	/** @type {import('types').Logger} */
 	const log = logger({ verbose });
 
-	if (should_polyfill) {
-		installPolyfills();
-	}
+	installPolyfills();
 
 	/** @type {Map<string, string>} */
 	const saved = new Map();
@@ -153,6 +150,7 @@ async function prerender({ out, manifest_path, metadata, verbose, env }) {
 	}
 
 	const files = new Set(walk(`${out}/client`).map(posixify));
+	files.add(`${config.appDir}/env.js`);
 
 	const immutable = `${config.appDir}/immutable`;
 	if (existsSync(`${out}/server/${immutable}`)) {
@@ -429,8 +427,12 @@ async function prerender({ out, manifest_path, metadata, verbose, env }) {
 		if (entry === '*') {
 			for (const [id, prerender] of prerender_map) {
 				if (prerender) {
-					if (id.includes('[')) continue;
-					const path = `/${get_route_segments(id).join('/')}`;
+					// remove optional parameters from the route
+					const segments = get_route_segments(id).filter((segment) => !segment.startsWith('[['));
+					const processed_id = '/' + segments.join('/');
+
+					if (processed_id.includes('[')) continue;
+					const path = `/${get_route_segments(processed_id).join('/')}`;
 					enqueue(null, config.paths.base + path);
 				}
 			}
@@ -472,10 +474,10 @@ async function prerender({ out, manifest_path, metadata, verbose, env }) {
 	}
 
 	if (not_prerendered.length > 0) {
+		const list = not_prerendered.map((id) => `  - ${id}`).join('\n');
+
 		throw new Error(
-			`The following routes were marked as prerenderable, but were not prerendered because they were not found while crawling your app:\n${not_prerendered.map(
-				(id) => `  - ${id}`
-			)}\n\nSee https://kit.svelte.dev/docs/page-options#prerender-troubleshooting for info on how to solve this`
+			`The following routes were marked as prerenderable, but were not prerendered because they were not found while crawling your app:\n${list}\n\nSee https://kit.svelte.dev/docs/page-options#prerender-troubleshooting for info on how to solve this`
 		);
 	}
 

package/src/core/sync/sync.js

@@ -5,6 +5,7 @@ import { write_root } from './write_root.js';
 import { write_tsconfig } from './write_tsconfig.js';
 import { write_types, write_all_types } from './write_types/index.js';
 import { write_ambient } from './write_ambient.js';
+import { write_non_ambient } from './write_non_ambient.js';
 import { write_server } from './write_server.js';
 
 /**
@@ -15,6 +16,7 @@ import { write_server } from './write_server.js';
 export function init(config, mode) {
 	write_tsconfig(config.kit);
 	write_ambient(config.kit, mode);
+	write_non_ambient(config.kit);
 }
 
 /**

package/src/core/sync/write_non_ambient.js

@@ -0,0 +1,42 @@
+import path from 'node:path';
+import { GENERATED_COMMENT } from '../../constants.js';
+import { write_if_changed } from './utils.js';
+
+// `declare module "svelte/elements"` needs to happen in a non-ambient module, and dts-buddy generates one big ambient module,
+// so we can't add it there - therefore generate the typings ourselves here.
+// We're not using the `declare namespace svelteHTML` variant because that one doesn't augment the HTMLAttributes interface
+// people could use to type their own components.
+// The T generic is needed or else there's a "all declarations must have identical type parameters" error.
+const template = `
+${GENERATED_COMMENT}
+
+declare module "svelte/elements" {
+	export interface HTMLAttributes<T> {
+		'data-sveltekit-keepfocus'?: true | '' | 'off' | undefined | null;
+		'data-sveltekit-noscroll'?: true | '' | 'off' | undefined | null;
+		'data-sveltekit-preload-code'?:
+			| true
+			| ''
+			| 'eager'
+			| 'viewport'
+			| 'hover'
+			| 'tap'
+			| 'off'
+			| undefined
+			| null;
+		'data-sveltekit-preload-data'?: true | '' | 'hover' | 'tap' | 'off' | undefined | null;
+		'data-sveltekit-reload'?: true | '' | 'off' | undefined | null;
+		'data-sveltekit-replacestate'?: true | '' | 'off' | undefined | null;
+	}
+}
+
+export {};
+`;
+
+/**
+ * Writes non-ambient declarations to the output directory
+ * @param {import('types').ValidatedKitConfig} config
+ */
+export function write_non_ambient(config) {
+	write_if_changed(path.join(config.outDir, 'non-ambient.d.ts'), template);
+}

package/src/core/sync/write_server.js

@@ -28,13 +28,13 @@ const server_template = ({
 import root from '../root.${isSvelte5Plus() ? 'js' : 'svelte'}';
 import { set_building } from '__sveltekit/environment';
 import { set_assets } from '__sveltekit/paths';
-import { set_private_env, set_public_env } from '${runtime_directory}/shared-server.js';
+import { set_private_env, set_public_env, set_safe_public_env } from '${runtime_directory}/shared-server.js';
 
 export const options = {
+	app_dir: ${s(config.kit.appDir)},
 	app_template_contains_nonce: ${template.includes('%sveltekit.nonce%')},
 	csp: ${s(config.kit.csp)},
 	csrf_check_origin: ${s(config.kit.csrf.checkOrigin)},
-	track_server_fetches: ${s(config.kit.dangerZone.trackServerFetches)},
 	embedded: ${config.kit.embedded},
 	env_public_prefix: '${config.kit.env.publicPrefix}',
 	env_private_prefix: '${config.kit.env.privatePrefix}',
@@ -63,7 +63,7 @@ export function get_hooks() {
 	return ${hooks ? `import(${s(hooks)})` : '{}'};
 }
 
-export { set_assets, set_building, set_private_env, set_public_env };
+export { set_assets, set_building, set_private_env, set_public_env, set_safe_public_env };
 `;
 
 // TODO need to re-run this whenever src/app.html or src/error.html are