@sveltejs/kit 1.0.0-next.342 → 1.0.0-next.345

package/assets/client/start.js

@@ -1668,7 +1668,7 @@ function create_client({ target, session, base, trailing_slash }) {
 					}
 
 					const node = await load_node({
-						module: await nodes[i],
+						module: await components[nodes[i]](),
 						url,
 						params,
 						stuff,
@@ -1750,7 +1750,7 @@ function create_client({ target, session, base, trailing_slash }) {
  *   hydrate: {
  *     status: number;
  *     error: Error;
- *     nodes: Array<Promise<import('types').CSRComponent>>;
+ *     nodes: number[];
  *     params: Record<string, string>;
  *     routeId: string | null;
  *   };

package/assets/server/index.js

@@ -1231,11 +1231,7 @@ async function render_response({
 			hydrate: ${resolve_opts.ssr && page_config.hydrate ? `{
 				status: ${status},
 				error: ${serialize_error(error)},
-				nodes: [
-					${(branch || [])
-					.map(({ node }) => `import(${s(options.prefix + node.entry)})`)
-					.join(',\n\t\t\t\t\t\t')}
-				],
+				nodes: [${branch.map(({ node }) => node.index).join(', ')}],
 				params: ${devalue(event.params)},
 				routeId: ${s(event.routeId)}
 			}` : 'null'}

package/dist/chunks/index.js

@@ -2,12 +2,12 @@ import path__default from 'path';
 import { svelte } from '@sveltejs/vite-plugin-svelte';
 import * as vite from 'vite';
 import { d as deep_merge } from './object.js';
-import { g as get_runtime_path, r as resolve_entry, $, l as load_template, c as coalesce_to_error, a as get_mime_lookup, b as get_aliases, p as print_config_conflicts } from '../cli.js';
+import { g as get_runtime_path, r as resolve_entry, $, l as load_template, c as coalesce_to_error, a as get_mime_lookup, b as load_config, d as get_aliases, p as print_config_conflicts } from '../cli.js';
 import fs__default from 'fs';
 import { URL } from 'url';
 import { S as SVELTE_KIT_ASSETS, s as sirv } from './constants.js';
 import { installPolyfills } from '../node/polyfills.js';
-import { update, init } from './sync.js';
+import { init, update } from './sync.js';
 import { getRequest, setResponse } from '../node.js';
 import { p as posixify } from './filesystem.js';
 import { p as parse_route_id } from './misc.js';
@@ -38,19 +38,21 @@ const cwd$1 = process.cwd();
  * @returns {Promise<import('vite').Plugin>}
  */
 async function create_plugin(config) {
-	const runtime = get_runtime_path(config);
-
-	process.env.VITE_SVELTEKIT_APP_VERSION_POLL_INTERVAL = '0';
-
-	/** @type {import('types').Respond} */
-	const respond = (await import(`${runtime}/server/index.js`)).respond;
-
 	return {
 		name: 'vite-plugin-svelte-kit',
 
-		configureServer(vite) {
+		async configureServer(vite) {
 			installPolyfills();
 
+			init(config);
+
+			const runtime = get_runtime_path(config);
+
+			process.env.VITE_SVELTEKIT_APP_VERSION_POLL_INTERVAL = '0';
+
+			/** @type {import('types').Respond} */
+			const respond = (await import(`${runtime}/server/index.js`)).respond;
+
 			/** @type {import('types').SSRManifest} */
 			let manifest;
 
@@ -67,7 +69,7 @@ async function create_plugin(config) {
 							css: [],
 							js: []
 						},
-						nodes: manifest_data.components.map((id) => {
+						nodes: manifest_data.components.map((id, index) => {
 							return async () => {
 								const url = id.startsWith('..') ? `/@fs${path__default.posix.resolve(id)}` : `/${id}`;
 
@@ -105,6 +107,7 @@ async function create_plugin(config) {
 
 								return {
 									module,
+									index,
 									entry: url.endsWith('.svelte') ? url : url + '?import',
 									css: [],
 									js: [],
@@ -175,8 +178,13 @@ async function create_plugin(config) {
 
 			update_manifest();
 
-			vite.watcher.on('add', update_manifest);
-			vite.watcher.on('unlink', update_manifest);
+			for (const event of ['add', 'unlink']) {
+				vite.watcher.on(event, (file) => {
+					if (file.startsWith(config.kit.files.routes + path__default.sep)) {
+						update_manifest();
+					}
+				});
+			}
 
 			const assets = config.kit.paths.assets ? SVELTE_KIT_ASSETS : config.kit.paths.base;
 			const asset_server = sirv(config.kit.files.assets, {
@@ -451,14 +459,14 @@ const cwd = process.cwd();
  *   port: number,
  *   host?: string,
  *   https: boolean,
- *   config: import('types').ValidatedConfig
  * }} Options
  * @typedef {import('types').SSRComponent} SSRComponent
  */
 
 /** @param {Options} opts */
-async function dev({ port, host, https, config }) {
-	init(config);
+async function dev({ port, host, https }) {
+	/** @type {import('types').ValidatedConfig} */
+	const config = await load_config();
 
 	const [vite_config] = deep_merge(
 		{
@@ -535,14 +543,9 @@ async function dev({ port, host, https, config }) {
 	const server = await vite.createServer(merged_config);
 	await server.listen(port);
 
-	const address_info = /** @type {import('net').AddressInfo} */ (
-		/** @type {import('http').Server} */ (server.httpServer).address()
-	);
-
 	return {
-		address_info,
-		server_config: vite_config.server,
-		close: () => server.close()
+		server,
+		config
 	};
 }
 

package/dist/chunks/index2.js

@@ -2,7 +2,7 @@ import fs__default, { readFileSync, writeFileSync } from 'fs';
 import path__default, { join, dirname } from 'path';
 import { p as posixify, m as mkdirp, r as rimraf } from './filesystem.js';
 import { all } from './sync.js';
-import { p as print_config_conflicts, b as get_aliases, r as resolve_entry, g as get_runtime_path, l as load_template } from '../cli.js';
+import { p as print_config_conflicts, d as get_aliases, r as resolve_entry, g as get_runtime_path, l as load_template } from '../cli.js';
 import { g as generate_manifest } from './index3.js';
 import * as vite from 'vite';
 import { s } from './misc.js';
@@ -118,7 +118,7 @@ async function build_service_worker(
 
 			export const build = [
 				${Array.from(build)
-					.map((file) => `${s(`${config.kit.paths.base}/${config.kit.appDir}/${file}`)}`)
+					.map((file) => `${s(`${config.kit.paths.base}/${config.kit.appDir}/immutable/${file}`)}`)
 					.join(',\n\t\t\t\t')}
 			];
 
@@ -267,7 +267,7 @@ async function build_client({
 		build: {
 			cssCodeSplit: true,
 			manifest: true,
-			outDir: client_out_dir,
+			outDir: `${client_out_dir}/immutable`,
 			polyfillDynamicImport: false,
 			rollupOptions: {
 				input,
@@ -303,7 +303,9 @@ async function build_client({
 	const { chunks, assets } = await create_build(merged_config);
 
 	/** @type {import('vite').Manifest} */
-	const vite_manifest = JSON.parse(fs__default.readFileSync(`${client_out_dir}/manifest.json`, 'utf-8'));
+	const vite_manifest = JSON.parse(
+		fs__default.readFileSync(`${client_out_dir}/immutable/manifest.json`, 'utf-8')
+	);
 
 	const entry = posixify(client_entry_file);
 	const entry_js = new Set();
@@ -388,7 +390,7 @@ export class Server {
 			manifest,
 			method_override: ${s(config.kit.methodOverride)},
 			paths: { base, assets },
-			prefix: assets + '/${config.kit.appDir}/',
+			prefix: assets + '/${config.kit.appDir}/immutable/',
 			prerender: {
 				default: ${config.kit.prerender.default},
 				enabled: ${config.kit.prerender.enabled}
@@ -598,6 +600,7 @@ async function build_server(
 
 		const exports = [
 			'export { module };',
+			`export const index = ${i};`,
 			`export const entry = '${client.vite_manifest[component].file}';`,
 			`export const js = ${s(Array.from(js))};`,
 			`export const css = ${s(Array.from(css))};`
@@ -1312,15 +1315,18 @@ async function build(config, { log }) {
 
 	const { manifest_data } = all(config);
 
+	// TODO this is so that Vite's preloading works. Unfortunately, it fails
+	// during `svelte-kit preview`, because we use a local asset path. If Vite
+	// used relative paths, I _think_ this could get fixed. Issue here:
+	// https://github.com/vitejs/vite/issues/2009
+	const { base, assets } = config.kit.paths;
+	const assets_base = `${assets || base}/${config.kit.appDir}/immutable/`;
+
 	const options = {
 		cwd,
 		config,
 		build_dir,
-		// TODO this is so that Vite's preloading works. Unfortunately, it fails
-		// during `svelte-kit preview`, because we use a local asset path. If Vite
-		// used relative paths, I _think_ this could get fixed. Issue here:
-		// https://github.com/vitejs/vite/issues/2009
-		assets_base: `${config.kit.paths.assets || config.kit.paths.base}/${config.kit.appDir}/`,
+		assets_base,
 		manifest_data,
 		output_dir,
 		client_entry_file: path__default.relative(cwd, `${get_runtime_path(config)}/client/start.js`),
@@ -1351,8 +1357,8 @@ async function build(config, { log }) {
 
 	const files = new Set([
 		...static_files,
-		...client.chunks.map((chunk) => `${config.kit.appDir}/${chunk.fileName}`),
-		...client.assets.map((chunk) => `${config.kit.appDir}/${chunk.fileName}`)
+		...client.chunks.map((chunk) => `${config.kit.appDir}/immutable/${chunk.fileName}`),
+		...client.assets.map((chunk) => `${config.kit.appDir}/immutable/${chunk.fileName}`)
 	]);
 
 	// TODO is this right?

package/dist/chunks/index5.js

@@ -6,6 +6,7 @@ import { S as SVELTE_KIT_ASSETS, s as sirv } from './constants.js';
 import { pathToFileURL } from 'url';
 import { getRequest, setResponse } from '../node.js';
 import { installPolyfills } from '../node/polyfills.js';
+import { b as load_config } from '../cli.js';
 import 'querystring';
 import 'stream';
 import 'node:http';
@@ -16,6 +17,10 @@ import 'node:util';
 import 'node:url';
 import 'net';
 import 'crypto';
+import 'sade';
+import 'child_process';
+import 'chokidar';
+import 'os';
 
 /** @typedef {import('http').IncomingMessage} Req */
 /** @typedef {import('http').ServerResponse} Res */
@@ -37,14 +42,14 @@ const mutable = (dir) =>
  * @param {{
  *   port: number;
  *   host?: string;
- *   config: import('types').ValidatedConfig;
  *   https?: boolean;
  *   cwd?: string;
  * }} opts
  */
-async function preview({ port, host, config, https: use_https = false }) {
+async function preview({ port, host, https: use_https = false }) {
 	installPolyfills();
 
+	const config = await load_config();
 	const { paths } = config.kit;
 	const base = paths.base;
 	const assets = paths.assets ? SVELTE_KIT_ASSETS : paths.base;
@@ -75,8 +80,12 @@ async function preview({ port, host, config, https: use_https = false }) {
 		scoped(
 			assets,
 			sirv(join(config.kit.outDir, 'output/client'), {
-				maxAge: 31536000,
-				immutable: true
+				setHeaders: (res, pathname) => {
+					// only apply to build directory, not e.g. version.json
+					if (pathname.startsWith(`/${config.kit.appDir}/immutable`)) {
+						res.setHeader('cache-control', 'public,max-age=31536000,immutable');
+					}
+				}
 			})
 		),
 
@@ -172,7 +181,7 @@ async function preview({ port, host, config, https: use_https = false }) {
 
 	return new Promise((fulfil) => {
 		http_server.listen(port, host, () => {
-			fulfil(http_server);
+			fulfil({ server: http_server, config });
 		});
 	});
 }

package/dist/chunks/index6.js

@@ -5,7 +5,7 @@ import { $ } from '../cli.js';
 import chokidar from 'chokidar';
 import { w as walk$1, m as mkdirp, p as posixify, r as rimraf, c as copy } from './filesystem.js';
 import { createRequire } from 'module';
-import { a as write_tsconfig } from './write_tsconfig.js';
+import { b as write_tsconfig } from './write_tsconfig.js';
 import 'sade';
 import 'child_process';
 import 'net';

package/dist/chunks/sync.js

@@ -4,7 +4,7 @@ import { g as get_runtime_path } from '../cli.js';
 import { p as posixify, c as copy, r as rimraf } from './filesystem.js';
 import { p as parse_route_id, s } from './misc.js';
 import { fileURLToPath } from 'url';
-import { w as write_if_changed, t as trim, a as write_tsconfig } from './write_tsconfig.js';
+import { w as write_if_changed, t as trim, a as write, b as write_tsconfig } from './write_tsconfig.js';
 import 'sade';
 import 'child_process';
 import 'net';
@@ -821,10 +821,7 @@ function write_types(config, manifest_data) {
 		const parts = (key || 'index').split('/');
 		parts.push('__types', /** @type {string} */ (parts.pop()));
 
-		write_if_changed(
-			`${config.kit.outDir}/types/${parts.join('/')}.d.ts`,
-			content.join('\n').trim()
-		);
+		write(`${config.kit.outDir}/types/${parts.join('/')}.d.ts`, content.join('\n').trim());
 	});
 }
 

package/dist/chunks/write_tsconfig.js

@@ -12,12 +12,20 @@ const previous_contents = new Map();
  */
 function write_if_changed(file, code) {
 	if (code !== previous_contents.get(file)) {
-		previous_contents.set(file, code);
-		mkdirp(path__default.dirname(file));
-		fs__default.writeFileSync(file, code);
+		write(file, code);
 	}
 }
 
+/**
+ * @param {string} file
+ * @param {string} code
+ */
+function write(file, code) {
+	previous_contents.set(file, code);
+	mkdirp(path__default.dirname(file));
+	fs__default.writeFileSync(file, code);
+}
+
 /** @param {string} str */
 function trim(str) {
 	const indentation = /** @type {RegExpExecArray} */ (/\n?(\s*)/.exec(str))[1];
@@ -157,4 +165,4 @@ function validate(config, cwd, out, user_file) {
 	}
 }
 
-export { write_tsconfig as a, trim as t, write_if_changed as w };
+export { write as a, write_tsconfig as b, trim as t, write_if_changed as w };

package/dist/cli.js

@@ -904,7 +904,7 @@ async function launch(port, https, base) {
 	exec(`${cmd} ${https ? 'https' : 'http'}://localhost:${port}${base}`);
 }
 
-const prog = sade('svelte-kit').version('1.0.0-next.342');
+const prog = sade('svelte-kit').version('1.0.0-next.345');
 
 prog
 	.command('dev')
@@ -922,30 +922,34 @@ prog
 		/** @type {() => Promise<void>} */
 		let close;
 
-		/** @param {import('types').ValidatedConfig} config */
-		async function start(config) {
+		async function start() {
 			const { dev } = await import('./chunks/index.js');
 
-			const { address_info, server_config, close } = await dev({
+			const { server, config } = await dev({
 				port,
 				host,
-				https,
-				config
+				https
 			});
 
+			const address_info = /** @type {import('net').AddressInfo} */ (
+				/** @type {import('http').Server} */ (server.httpServer).address()
+			);
+
+			const vite_config = server.config;
+
 			welcome({
 				port: address_info.port,
 				host: address_info.address,
-				https: !!(https || server_config.https),
-				open: first && (open || !!server_config.open),
+				https: !!(https || vite_config.server.https),
+				open: first && (open || !!vite_config.server.open),
 				base: config.kit.paths.base,
-				loose: server_config.fs.strict === false,
-				allow: server_config.fs.allow
+				loose: vite_config.server.fs.strict === false,
+				allow: vite_config.server.fs.allow
 			});
 
 			first = false;
 
-			return close;
+			return server.close;
 		}
 
 		async function relaunch() {
@@ -953,9 +957,8 @@ prog
 			relaunching = true;
 
 			try {
-				const updated_config = await load_config();
 				await close();
-				close = await start(updated_config);
+				close = await start();
 
 				if (id !== uid) relaunch();
 			} catch (e) {
@@ -975,8 +978,7 @@ prog
 
 			process.env.NODE_ENV = process.env.NODE_ENV || 'development';
 
-			const config = await load_config();
-			close = await start(config);
+			close = await start();
 
 			chokidar.watch('svelte.config.js', { ignoreInitial: true }).on('change', () => {
 				if (relaunching) uid += 1;
@@ -1039,11 +1041,10 @@ prog
 			await check_port(port);
 
 			process.env.NODE_ENV = process.env.NODE_ENV || 'production';
-			const config = await load_config();
 
 			const { preview } = await import('./chunks/index5.js');
 
-			await preview({ port, host, config, https });
+			const { config } = await preview({ port, host, https });
 
 			welcome({ port, host, https, open, base: config.kit.paths.base });
 		} catch (error) {
@@ -1122,7 +1123,7 @@ async function check_port(port) {
 function welcome({ port, host, https, open, base, loose, allow, cwd }) {
 	if (open) launch(port, https, base);
 
-	console.log($.bold().cyan(`\n  SvelteKit v${'1.0.0-next.342'}\n`));
+	console.log($.bold().cyan(`\n  SvelteKit v${'1.0.0-next.345'}\n`));
 
 	const protocol = https ? 'https:' : 'http:';
 	const exposed = typeof host !== 'undefined' && host !== 'localhost' && host !== '127.0.0.1';
@@ -1160,4 +1161,4 @@ function welcome({ port, host, https, open, base, loose, allow, cwd }) {
 	console.log('\n');
 }
 
-export { $, get_mime_lookup as a, get_aliases as b, coalesce_to_error as c, get_runtime_path as g, load_template as l, print_config_conflicts as p, resolve_entry as r };
+export { $, get_mime_lookup as a, load_config as b, coalesce_to_error as c, get_aliases as d, get_runtime_path as g, load_template as l, print_config_conflicts as p, resolve_entry as r };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sveltejs/kit",
-  "version": "1.0.0-next.342",
+  "version": "1.0.0-next.345",
   "repository": {
     "type": "git",
     "url": "https://github.com/sveltejs/kit",
@@ -61,7 +61,7 @@
   },
   "types": "types/index.d.ts",
   "engines": {
-    "node": ">=16"
+    "node": ">=16.7"
   },
   "scripts": {
     "build": "rollup -c && node scripts/cp.js src/runtime/components assets/components && npm run types",

package/types/internal.d.ts

@@ -226,6 +226,8 @@ export interface SSREndpoint {
 
 export interface SSRNode {
 	module: SSRComponent;
+	/** index into the `components` array in client-manifest.js */
+	index: number;
 	/** client-side module URL for this component */
 	entry: string;
 	/** external CSS files */