@sveltejs/kit 1.0.0-next.343 → 1.0.0-next.344

package/dist/chunks/index.js

@@ -7,7 +7,7 @@ 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;
 
@@ -460,8 +462,6 @@ async function dev({ port, host, https }) {
 	/** @type {import('types').ValidatedConfig} */
 	const config = await load_config();
 
-	init(config);
-
 	const [vite_config] = deep_merge(
 		{
 			server: {

package/dist/chunks/index2.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}
@@ -1312,15 +1314,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 +1356,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

@@ -80,8 +80,12 @@ async function preview({ port, host, 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');
+					}
+				}
 			})
 		),
 

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.343');
+const prog = sade('svelte-kit').version('1.0.0-next.344');
 
 prog
 	.command('dev')
@@ -1123,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.343'}\n`));
+	console.log($.bold().cyan(`\n  SvelteKit v${'1.0.0-next.344'}\n`));
 
 	const protocol = https ? 'https:' : 'http:';
 	const exposed = typeof host !== 'undefined' && host !== 'localhost' && host !== '127.0.0.1';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sveltejs/kit",
-  "version": "1.0.0-next.343",
+  "version": "1.0.0-next.344",
   "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",