@sveltejs/kit 2.62.0 → 3.0.0-next.0

package/src/core/postbuild/prerender.js

@@ -1,13 +1,14 @@
+/** @import { Adapter } from '@sveltejs/kit' */
 import { existsSync, readFileSync, statSync, writeFileSync } from 'node:fs';
 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 { mkdirp, walk } from '../../utils/filesystem.js';
+import { posixify } from '../../utils/os.js';
 import { noop } from '../../utils/functions.js';
 import { decode_uri, is_root_relative, resolve } from '../../utils/url.js';
 import { escape_html } from '../../utils/escape.js';
 import { logger } from '../utils.js';
-import { load_config } from '../config/index.js';
+import { extract_svelte_config, load_vite_config } from '../config/index.js';
 import { get_route_segments } from '../../utils/routing.js';
 import { queue } from './queue.js';
 import { crawl } from './crawl.js';
@@ -16,7 +17,6 @@ import * as devalue from 'devalue';
 import { createReadableStream } from '@sveltejs/kit/node';
 import generate_fallback from './fallback.js';
 import { stringify_remote_arg } from '../../runtime/shared.js';
-import { filter_env } from '../../utils/env.js';
 
 export default forked(import.meta.url, prerender);
 
@@ -33,10 +33,11 @@ const SPECIAL_HASHLINKS = new Set(['', 'top']);
  *   manifest_path: string;
  *   metadata: import('types').ServerMetadata;
  *   verbose: boolean;
- *   env: Record<string, string>
+ *   env: Record<string, string>;
+ *   vite_config_file: string | undefined;
  * }} opts
  */
-async function prerender({ hash, out, manifest_path, metadata, verbose, env }) {
+async function prerender({ hash, out, manifest_path, metadata, verbose, env, vite_config_file }) {
 	/** @type {import('@sveltejs/kit').SSRManifest} */
 	const manifest = (await import(pathToFileURL(manifest_path).href)).manifest;
 
@@ -46,7 +47,7 @@ async function prerender({ hash, out, manifest_path, metadata, verbose, env }) {
 	/** @type {import('types').ServerModule} */
 	const { Server } = await import(pathToFileURL(`${out}/server/index.js`).href);
 
-	// configure `import { building } from '$app/environment'` —
+	// configure `import { building } from `$app/env` —
 	// essential we do this before analysing the code
 	internal.set_building();
 	internal.set_prerendering();
@@ -100,8 +101,9 @@ async function prerender({ hash, out, manifest_path, metadata, verbose, env }) {
 	/** @type {Set<string>} */
 	const prerendered_routes = new Set();
 
-	/** @type {import('types').ValidatedKitConfig} */
-	const config = (await load_config()).kit;
+	const vite_config = await load_vite_config(vite_config_file);
+
+	const config = extract_svelte_config(vite_config).kit;
 
 	if (hash) {
 		const fallback = await generate_fallback({
@@ -123,13 +125,17 @@ async function prerender({ hash, out, manifest_path, metadata, verbose, env }) {
 		return { prerendered, prerender_map };
 	}
 
-	const emulator = await config.adapter?.emulate?.();
+	// TODO 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 emulator = await adapter?.emulate?.();
 
 	/** @type {import('types').Logger} */
 	const log = logger({ verbose });
 
-	installPolyfills();
-
 	/** @type {Map<string, string>} */
 	const saved = new Map();
 
@@ -492,11 +498,7 @@ async function prerender({ hash, out, manifest_path, metadata, verbose, env }) {
 	// the user's remote function modules may reference environment variables,
 	// `read` or the `manifest` at the top-level so we need to set them before
 	// evaluating those modules to avoid potential runtime errors
-	const { publicPrefix: public_prefix, privatePrefix: private_prefix } = config.env;
-	const private_env = filter_env(env, private_prefix, public_prefix);
-	const public_env = filter_env(env, public_prefix, private_prefix);
-	internal.set_private_env(private_env);
-	internal.set_public_env(public_env);
+	internal.set_env(env);
 	internal.set_manifest(manifest);
 	internal.set_read_implementation((file) => createReadableStream(`${out}/server/${file}`));
 

package/src/core/postbuild/queue.js

@@ -1,6 +1,3 @@
-/** @import { PromiseWithResolvers } from '../../utils/promise.js' */
-import { with_resolvers } from '../../utils/promise.js';
-
 /**
  * @typedef {{
  *   fn: () => Promise<any>,
@@ -13,7 +10,9 @@ import { with_resolvers } from '../../utils/promise.js';
 export function queue(concurrency) {
 	/** @type {Task[]} */
 	const tasks = [];
-	const { promise, resolve, reject } = /** @type {PromiseWithResolvers<void>} */ (with_resolvers());
+	const { promise, resolve, reject } = /** @type {PromiseWithResolvers<void>} */ (
+		Promise.withResolvers()
+	);
 
 	let current = 0;
 	let closed = false;

package/src/core/sync/create_manifest_data/index.js

@@ -1,14 +1,13 @@
+import { lookup } from 'mrmime';
 import fs from 'node:fs';
 import path from 'node:path';
-import process from 'node:process';
-import colors from 'kleur';
-import { lookup } from 'mrmime';
-import { list_files, runtime_directory } from '../../utils.js';
-import { posixify, resolve_entry } from '../../../utils/filesystem.js';
+import { styleText } from 'node:util';
+import { resolve_entry } from '../../../utils/filesystem.js';
+import { posixify } from '../../../utils/os.js';
 import { parse_route_id } from '../../../utils/routing.js';
+import { list_files, runtime_directory } from '../../utils.js';
 import { prevent_conflicts } from './conflict.js';
 import { sort_routes } from './sort.js';
-import { isSvelte5Plus } from '../utils.js';
 import {
 	create_node_analyser,
 	get_page_options
@@ -19,14 +18,14 @@ import {
  * @param {{
  *   config: import('types').ValidatedConfig;
  *   fallback?: string;
- *   cwd?: string;
+ *   cwd: string;
  * }} opts
  * @returns {import('types').ManifestData}
  */
 export default function create_manifest_data({
 	config,
-	fallback = `${runtime_directory}/components/${isSvelte5Plus() ? 'svelte-5' : 'svelte-4'}`,
-	cwd = process.cwd()
+	fallback = `${runtime_directory}/components`,
+	cwd
 }) {
 	const assets = create_assets(config);
 	const hooks = create_hooks(config, cwd);
@@ -116,8 +115,8 @@ function create_matchers(config, cwd) {
 }
 
 /**
- * @param {import('types').ValidatedConfig} config
  * @param {string} cwd
+ * @param {import('types').ValidatedConfig} config
  * @param {string} fallback
  */
 function create_routes_and_nodes(cwd, config, fallback) {
@@ -241,12 +240,11 @@ function create_routes_and_nodes(cwd, config, fallback) {
 						);
 					if (typo) {
 						console.log(
-							colors
-								.bold()
-								.yellow(
-									`Missing route file prefix. Did you mean +${file.name}?` +
-										` at ${path.join(dir, file.name)}`
-								)
+							styleText(
+								['bold', 'yellow'],
+								`Missing route file prefix. Did you mean +${file.name}?` +
+									` at ${path.join(dir, file.name)}`
+							)
 						);
 					}
 
@@ -421,7 +419,7 @@ function create_routes_and_nodes(cwd, config, fallback) {
 
 	const indexes = new Map(nodes.map((node, i) => [node, i]));
 
-	const node_analyser = create_node_analyser();
+	const node_analyser = create_node_analyser(cwd);
 
 	for (const route of routes) {
 		if (!route.leaf) continue;
@@ -473,7 +471,7 @@ function create_routes_and_nodes(cwd, config, fallback) {
 
 	for (const route of routes) {
 		if (route.endpoint) {
-			route.endpoint.page_options = get_page_options(route.endpoint.file);
+			route.endpoint.page_options = get_page_options(route.endpoint.file, cwd);
 		}
 	}
 

package/src/core/sync/sync.js

@@ -1,4 +1,5 @@
 import path from 'node:path';
+import process from 'node:process';
 import create_manifest_data from './create_manifest_data/index.js';
 import { write_client_manifest } from './write_client_manifest.js';
 import { write_root } from './write_root.js';
@@ -11,30 +12,33 @@ import {
 	create_node_analyser,
 	get_page_options
 } from '../../exports/vite/static_analysis/index.js';
+import { load_explicit_env } from '../env.js';
+import { write_env } from './write_env.js';
 
 /**
  * Initialize SvelteKit's generated files that only depend on the config and mode.
  * @param {import('types').ValidatedConfig} config
- * @param {string} mode
+ * @param {string} root The project root directory
  */
-export function init(config, mode) {
-	write_tsconfig(config.kit);
-	write_ambient(config.kit, mode);
+export function init(config, root) {
+	write_tsconfig(config.kit, root);
+	write_ambient(config.kit);
 }
 
 /**
  * Update SvelteKit's generated files
  * @param {import('types').ValidatedConfig} config
+ * @param {string} root The project root directory
  */
-export function create(config) {
-	const manifest_data = create_manifest_data({ config });
+export function create(config, root) {
+	const manifest_data = create_manifest_data({ config, cwd: root });
 
 	const output = path.join(config.kit.outDir, 'generated');
 
 	write_client_manifest(config.kit, manifest_data, `${output}/client`);
-	write_server(config, output);
+	write_server(config, output, root);
 	write_root(manifest_data, config, output);
-	write_all_types(config, manifest_data);
+	write_all_types(config, manifest_data, root);
 	write_non_ambient(config.kit, manifest_data);
 
 	return { manifest_data };
@@ -47,9 +51,10 @@ export function create(config) {
  * @param {import('types').ValidatedConfig} config
  * @param {import('types').ManifestData} manifest_data
  * @param {string} file
+ * @param {string} root The project root directory
  */
-export function update(config, manifest_data, file) {
-	const node_analyser = create_node_analyser();
+export function update(config, manifest_data, file, root) {
+	const node_analyser = create_node_analyser(root);
 
 	for (const node of manifest_data.nodes) {
 		node.page_options = node_analyser.get_page_options(node);
@@ -57,40 +62,56 @@ export function update(config, manifest_data, file) {
 
 	for (const route of manifest_data.routes) {
 		if (route.endpoint) {
-			route.endpoint.page_options = get_page_options(route.endpoint.file);
+			route.endpoint.page_options = get_page_options(route.endpoint.file, root);
 		}
 	}
 
-	write_types(config, manifest_data, file);
+	write_types(config, manifest_data, file, root);
 	write_non_ambient(config.kit, manifest_data);
 }
 
 /**
  * Run sync.init and sync.create in series, returning the result from sync.create.
  * @param {import('types').ValidatedConfig} config
- * @param {string} mode The Vite mode
+ * @param {string} root The project root directory
  */
-export function all(config, mode) {
-	init(config, mode);
-	return create(config);
+export function all(config, root) {
+	init(config, root);
+	return create(config, root);
 }
 
 /**
  * Run sync.init and then generate all type files.
  * @param {import('types').ValidatedConfig} config
- * @param {string} mode The Vite mode
  */
-export function all_types(config, mode) {
-	init(config, mode);
-	const manifest_data = create_manifest_data({ config });
-	write_all_types(config, manifest_data);
+export function all_types(config) {
+	const cwd = process.cwd();
+	init(config, cwd);
+	const manifest_data = create_manifest_data({ config, cwd });
+	write_all_types(config, manifest_data, cwd);
 	write_non_ambient(config.kit, manifest_data);
 }
 
+/**
+ * Generate modules and types for explicit env vars
+ * @param {import('types').ValidatedKitConfig} kit
+ * @param {string | null} entry
+ * @param {string} root The Vite root
+ * @param {string} mode The Vite mode
+ */
+export async function env(kit, entry, root, mode) {
+	const env_config = await load_explicit_env(kit, entry, root, mode);
+
+	write_env(kit, entry, env_config);
+
+	return env_config;
+}
+
 /**
  * Regenerate __SERVER__/internal.js in response to src/{app.html,error.html,service-worker.js} changing
  * @param {import('types').ValidatedConfig} config
+ * @param {string} root The project root directory
  */
-export function server(config) {
-	write_server(config, path.join(config.kit.outDir, 'generated'));
+export function server(config, root) {
+	write_server(config, path.join(config.kit.outDir, 'generated'), root);
 }

package/src/core/sync/utils.js

@@ -1,12 +1,6 @@
 import fs from 'node:fs';
 import path from 'node:path';
 import { mkdirp } from '../../utils/filesystem.js';
-import { import_peer } from '../../utils/import.js';
-
-/** @type {{ VERSION: string }} */
-const { VERSION } = await import_peer('svelte/compiler');
-
-const [MAJOR, MINOR] = VERSION.split('.').map(Number);
 
 /** @type {Map<string, string>} */
 const previous_contents = new Map();
@@ -74,12 +68,3 @@ export function dedent(strings, ...values) {
 
 	return str;
 }
-
-export function isSvelte5Plus() {
-	return MAJOR >= 5;
-}
-
-// TODO 3.0 remove this once we can bump the peerDep range
-export function supportsTrustedTypes() {
-	return (MAJOR === 5 && MINOR >= 51) || MAJOR > 5;
-}

package/src/core/sync/write_ambient.js

@@ -1,63 +1,18 @@
-import fs from 'node:fs';
 import path from 'node:path';
-import { fileURLToPath } from 'node:url';
-import { get_env } from '../../exports/vite/utils.js';
 import { GENERATED_COMMENT } from '../../constants.js';
-import { create_dynamic_types, create_static_types } from '../env.js';
 import { write_if_changed } from './utils.js';
 
-// TODO these types should be described in a neutral place, rather than
-// inside either `packages/kit` or `svelte.dev/docs/kit`
-const descriptions_dir = fileURLToPath(new URL('../../../src/types/synthetic', import.meta.url));
-
-/** @param {string} filename */
-function read_description(filename) {
-	const content = fs.readFileSync(`${descriptions_dir}/${filename}`, 'utf8');
-	return `/**\n${content
-		.trim()
-		.split('\n')
-		.map((line) => ` * ${line}`)
-		.join('\n')}\n */`;
-}
-
-/**
- * @param {import('types').Env} env
- * @param {{
- * 	public_prefix: string;
- * 	private_prefix: string;
- * }} prefixes
- */
-const template = (env, prefixes) => `
-${GENERATED_COMMENT}
-
-/// <reference types="@sveltejs/kit" />
-
-${read_description('$env+static+private.md')}
-${create_static_types('private', env)}
-
-${read_description('$env+static+public.md')}
-${create_static_types('public', env)}
-
-${read_description('$env+dynamic+private.md')}
-${create_dynamic_types('private', env, prefixes)}
-
-${read_description('$env+dynamic+public.md')}
-${create_dynamic_types('public', env, prefixes)}
-`;
+// TODO get rid of this, it's useless
 
 /**
  * Writes ambient declarations including types reference to @sveltejs/kit,
  * and the existing environment variables in process.env to
  * $env/static/private and $env/static/public
  * @param {import('types').ValidatedKitConfig} config
- * @param {string} mode The Vite mode
  */
-export function write_ambient(config, mode) {
-	const env = get_env(config.env, mode);
-	const { publicPrefix: public_prefix, privatePrefix: private_prefix } = config.env;
+export function write_ambient(config) {
+	/** @type {string} */
+	const content = `${GENERATED_COMMENT}\n/// <reference types="@sveltejs/kit" />`;
 
-	write_if_changed(
-		path.join(config.outDir, 'ambient.d.ts'),
-		template(env, { public_prefix, private_prefix })
-	);
+	write_if_changed(path.join(config.outDir, 'ambient.d.ts'), content);
 }

package/src/core/sync/write_client_manifest.js

@@ -1,8 +1,8 @@
 import path from 'node:path';
+import { styleText } from 'node:util';
 import { relative_path, resolve_entry } from '../../utils/filesystem.js';
 import { s } from '../../utils/misc.js';
-import { dedent, isSvelte5Plus, write_if_changed } from './utils.js';
-import colors from 'kleur';
+import { dedent, write_if_changed } from './utils.js';
 
 /**
  * Writes the client manifest to disk. The manifest is used to power the router. It contains the
@@ -126,12 +126,11 @@ export function write_client_manifest(kit, manifest_data, output, metadata) {
 	const typo = resolve_entry('src/+hooks.client');
 	if (typo) {
 		console.log(
-			colors
-				.bold()
-				.yellow(
-					`Unexpected + prefix. Did you mean ${typo.split('/').at(-1)?.slice(1)}?` +
-						` at ${path.resolve(typo)}`
-				)
+			styleText(
+				['bold', 'yellow'],
+				`Unexpected + prefix. Did you mean ${typo.split('/').at(-1)?.slice(1)}?` +
+					` at ${path.resolve(typo)}`
+			)
 		);
 	}
 
@@ -177,7 +176,7 @@ export function write_client_manifest(kit, manifest_data, output, metadata) {
 
 			export const decode = (type, value) => decoders[type](value);
 
-			export { default as root } from '../root.${isSvelte5Plus() ? 'js' : 'svelte'}';
+			export { default as root } from '../root.js';
 		`
 	);
 

package/src/core/sync/write_env.js

@@ -0,0 +1,36 @@
+/** @import { EnvVarConfig } from '@sveltejs/kit' */
+import path from 'node:path';
+import { create_explicit_env_types } from '../env.js';
+import { write_if_changed } from './utils.js';
+
+const DOCS = '// See https://svelte.dev/docs/kit/environment-variables for more information';
+
+/**
+ * Writes ambient declarations including types reference to @sveltejs/kit,
+ * and the existing environment variables in process.env to
+ * $env/static/private and $env/static/public
+ * @param {import('types').ValidatedKitConfig} kit
+ * @param {string | null} entry
+ * @param {Record<string, EnvVarConfig<any>> | null} env_config
+ */
+export function write_env(kit, entry, env_config) {
+	const content = [];
+	const out = path.join(kit.outDir, 'env.d.ts');
+
+	if (entry && env_config) {
+		const relative = path.relative(kit.outDir, entry);
+		content.push(
+			`// This file is generated from ${relative}.\n${DOCS}`,
+			create_explicit_env_types(env_config, relative, 'private'),
+			create_explicit_env_types(env_config, relative, 'public')
+		);
+	} else {
+		content.push(
+			DOCS,
+			create_explicit_env_types({}, '', 'private'),
+			create_explicit_env_types({}, '', 'public')
+		);
+	}
+
+	write_if_changed(out, content.join('\n\n'));
+}

package/src/core/sync/write_non_ambient.js

@@ -1,6 +1,6 @@
 import path from 'node:path';
 import { GENERATED_COMMENT } from '../../constants.js';
-import { posixify } from '../../utils/filesystem.js';
+import { posixify } from '../../utils/os.js';
 import { write_if_changed } from './utils.js';
 import { s } from '../../utils/misc.js';
 import { get_route_segments } from '../../utils/routing.js';
@@ -58,21 +58,21 @@ ${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-keepfocus'?: true | false | '' | undefined | null;
+		'data-sveltekit-noscroll'?: true | false | '' | undefined | null;
 		'data-sveltekit-preload-code'?:
 			| true
+			| false
 			| ''
 			| '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;
+		'data-sveltekit-preload-data'?: true | false | '' | 'hover' | 'tap' | undefined | null;
+		'data-sveltekit-reload'?: true | false | '' | undefined | null;
+		'data-sveltekit-replacestate'?: true | false | '' | undefined | null;
 	}
 }