@sveltejs/kit 1.0.0-next.357 → 1.0.0-next.358

package/dist/chunks/sync.js

@@ -137,35 +137,6 @@ function logger({ verbose }) {
 	return log;
 }
 
-/**
- * Given an entry point like [cwd]/src/hooks, returns a filename like [cwd]/src/hooks.js or [cwd]/src/hooks/index.js
- * @param {string} entry
- * @returns {string|null}
- */
-function resolve_entry(entry) {
-	if (fs__default.existsSync(entry)) {
-		const stats = fs__default.statSync(entry);
-		if (stats.isDirectory()) {
-			return resolve_entry(path__default.join(entry, 'index'));
-		}
-
-		return entry;
-	} else {
-		const dir = path__default.dirname(entry);
-
-		if (fs__default.existsSync(dir)) {
-			const base = path__default.basename(entry);
-			const files = fs__default.readdirSync(dir);
-
-			const found = files.find((file) => file.replace(/\.[^.]+$/, '') === base);
-
-			if (found) return path__default.join(dir, found);
-		}
-	}
-
-	return null;
-}
-
 /** @param {import('types').ManifestData} manifest_data */
 function get_mime_lookup(manifest_data) {
 	/** @type {Record<string, string>} */
@@ -181,25 +152,6 @@ function get_mime_lookup(manifest_data) {
 	return mime;
 }
 
-/** @param {import('types').ValidatedKitConfig} config */
-function get_aliases(config) {
-	/** @type {Record<string, string>} */
-	const alias = {
-		__GENERATED__: path__default.posix.join(config.outDir, 'generated'),
-		$app: `${get_runtime_path(config)}/app`,
-
-		// For now, we handle `$lib` specially here rather than make it a default value for
-		// `config.kit.alias` since it has special meaning for packaging, etc.
-		$lib: config.files.lib
-	};
-
-	for (const [key, value] of Object.entries(config.alias)) {
-		alias[key] = path__default.resolve(value);
-	}
-
-	return alias;
-}
-
 const param_pattern = /^(\.\.\.)?(\w+)(?:=(\w+))?$/;
 
 /** @param {string} id */
@@ -1025,4 +977,4 @@ var sync = /*#__PURE__*/Object.freeze({
   all: all
 });
 
-export { get_runtime_path as a, get_mime_lookup as b, all as c, sync as d, get_aliases as g, init as i, logger as l, parse_route_id as p, resolve_entry as r, s, update as u };
+export { get_mime_lookup as a, all as b, sync as c, get_runtime_path as g, init as i, logger as l, parse_route_id as p, s, update as u };

package/dist/cli.js

@@ -41,7 +41,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.357');
+const prog = sade('svelte-kit').version('1.0.0-next.358');
 
 prog
 	.command('dev')
@@ -218,7 +218,7 @@ prog
 
 		try {
 			const config = await load_config();
-			const sync = await import('./chunks/sync.js').then(function (n) { return n.d; });
+			const sync = await import('./chunks/sync.js').then(function (n) { return n.c; });
 			sync.all(config);
 		} catch (error) {
 			handle_error(error);
@@ -242,7 +242,7 @@ prog.parse(process.argv, { unknown: (arg) => `Unknown option: ${arg}` });
 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.357'}\n`));
+	console.log($.bold().cyan(`\n  SvelteKit v${'1.0.0-next.358'}\n`));
 
 	const protocol = https ? 'https:' : 'http:';
 	const exposed = typeof host !== 'undefined' && host !== 'localhost' && host !== '127.0.0.1';

package/dist/vite.js

@@ -6,7 +6,7 @@ import { svelte } from '@sveltejs/vite-plugin-svelte';
 import * as vite from 'vite';
 import { searchForWorkspaceRoot } from 'vite';
 import { p as posixify, m as mkdirp, r as rimraf } from './chunks/write_tsconfig.js';
-import { g as get_aliases, r as resolve_entry, a as get_runtime_path, s, i as init, u as update, b as get_mime_lookup, p as parse_route_id, c as all, l as logger } from './chunks/sync.js';
+import { g as get_runtime_path, s, i as init, u as update, a as get_mime_lookup, p as parse_route_id, b as all, l as logger } from './chunks/sync.js';
 import { pathToFileURL, URL as URL$1 } from 'url';
 import { installPolyfills } from './node/polyfills.js';
 import * as qs from 'querystring';
@@ -110,6 +110,54 @@ function merge_into(a, b) {
 	}
 }
 
+/** @param {import('types').ValidatedKitConfig} config */
+function get_aliases(config) {
+	/** @type {Record<string, string>} */
+	const alias = {
+		__GENERATED__: path__default.posix.join(config.outDir, 'generated'),
+		$app: `${get_runtime_path(config)}/app`,
+
+		// For now, we handle `$lib` specially here rather than make it a default value for
+		// `config.kit.alias` since it has special meaning for packaging, etc.
+		$lib: config.files.lib
+	};
+
+	for (const [key, value] of Object.entries(config.alias)) {
+		alias[key] = path__default.resolve(value);
+	}
+
+	return alias;
+}
+
+/**
+ * Given an entry point like [cwd]/src/hooks, returns a filename like [cwd]/src/hooks.js or [cwd]/src/hooks/index.js
+ * @param {string} entry
+ * @returns {string|null}
+ */
+function resolve_entry(entry) {
+	if (fs__default.existsSync(entry)) {
+		const stats = fs__default.statSync(entry);
+		if (stats.isDirectory()) {
+			return resolve_entry(path__default.join(entry, 'index'));
+		}
+
+		return entry;
+	} else {
+		const dir = path__default.dirname(entry);
+
+		if (fs__default.existsSync(dir)) {
+			const base = path__default.basename(entry);
+			const files = fs__default.readdirSync(dir);
+
+			const found = files.find((file) => file.replace(/\.[^.]+$/, '') === base);
+
+			if (found) return path__default.join(dir, found);
+		}
+	}
+
+	return null;
+}
+
 /**
  * @typedef {import('rollup').RollupOutput} RollupOutput
  * @typedef {import('rollup').OutputChunk} OutputChunk
@@ -2683,6 +2731,7 @@ function scoped(scope, handler) {
 
 const cwd = process.cwd();
 
+/** @type {Record<string, any>} */
 const enforced_config = {
 	base: true,
 	build: {
@@ -2752,15 +2801,6 @@ function kit() {
 		name: 'vite-plugin-svelte-kit',
 
 		async config(config, { command }) {
-			const overridden = find_overridden_config(config, enforced_config);
-
-			if (overridden.length > 0) {
-				console.log(
-					$.bold().red('The following Vite config options will be overridden by SvelteKit:')
-				);
-				console.log(overridden.map((key) => `  - ${key}`).join('\n'));
-			}
-
 			vite_user_config = config;
 			svelte_config = await load_config();
 
@@ -2795,16 +2835,19 @@ function kit() {
 					input[name] = resolved;
 				});
 
-				return get_default_config({
+				const result = get_default_config({
 					config: svelte_config,
 					input,
 					ssr: false,
 					outDir: `${paths.client_out_dir}/immutable`
 				});
+
+				warn_overridden_config(config, result);
+				return result;
 			}
 
 			// dev and preview config can be shared
-			return {
+			const result = {
 				base: '/',
 				build: {
 					rollupOptions: {
@@ -2820,6 +2863,7 @@ function kit() {
 				resolve: {
 					alias: get_aliases(svelte_config.kit)
 				},
+				root: cwd,
 				server: {
 					fs: {
 						allow: [
@@ -2843,6 +2887,8 @@ function kit() {
 					}
 				}
 			};
+			warn_overridden_config(config, result);
+			return result;
 		},
 
 		buildStart() {
@@ -2971,17 +3017,22 @@ function kit() {
 			if (svelte_config.kit.adapter) {
 				const { adapt } = await import('./chunks/index2.js');
 				await adapt(svelte_config, build_data, prerendered, { log });
+			} else {
+				console.log($.bold().yellow('\nNo adapter specified'));
+				// prettier-ignore
+				console.log(
+					`See ${$.bold().cyan('https://kit.svelte.dev/docs/adapters')} to learn how to configure your app to run on the platform of your choosing`
+				);
+			}
+		},
 
-				// this is necessary to close any open db connections, etc
+		closeBundle() {
+			if (svelte_config.kit.prerender.enabled) {
+				// this is necessary to close any open db connections, etc.
+				// TODO: prerender in a subprocess so we can exit in isolation
+				// https://github.com/sveltejs/kit/issues/5306
 				process.exit(0);
 			}
-
-			console.log($.bold().yellow('\nNo adapter specified'));
-
-			// prettier-ignore
-			console.log(
-				`See ${$.bold().cyan('https://kit.svelte.dev/docs/adapters')} to learn how to configure your app to run on the platform of your choosing`
-			);
 		},
 
 		async configureServer(vite) {
@@ -2997,17 +3048,33 @@ function kit() {
 
 /**
  * @param {Record<string, any>} config
- * @param {Record<string, any>} enforced_config
+ * @param {Record<string, any>} resolved_config
  * @param {string} [path]
  * @param {string[]} [out] used locally to compute the return value
  */
-function find_overridden_config(config, enforced_config, path = '', out = []) {
+function warn_overridden_config(config, resolved_config, path = '', out = []) {
+	const overridden = find_overridden_config(config, resolved_config, path, out);
+	if (overridden.length > 0) {
+		console.log(
+			$.bold().red('The following Vite config options will be overridden by SvelteKit:')
+		);
+		console.log(overridden.map((key) => `  - ${key}`).join('\n'));
+	}
+}
+
+/**
+ * @param {Record<string, any>} config
+ * @param {Record<string, any>} resolved_config
+ * @param {string} path
+ * @param {string[]} out used locally to compute the return value
+ */
+function find_overridden_config(config, resolved_config, path, out) {
 	for (const key in enforced_config) {
 		if (key in config) {
-			if (enforced_config[key] === true) {
+			if (enforced_config[key] === true && config[key] !== resolved_config[key]) {
 				out.push(path + key);
 			} else {
-				find_overridden_config(config[key], enforced_config[key], path + key + '.', out);
+				find_overridden_config(config[key], resolved_config[key], path + key + '.', out);
 			}
 		}
 	}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sveltejs/kit",
-  "version": "1.0.0-next.357",
+  "version": "1.0.0-next.358",
   "repository": {
     "type": "git",
     "url": "https://github.com/sveltejs/kit",
@@ -34,7 +34,7 @@
     "marked": "^4.0.16",
     "mime": "^3.0.0",
     "node-fetch": "^3.2.4",
-    "port-authority": "^1.2.0",
+    "port-authority": "^2.0.1",
     "rollup": "^2.75.3",
     "selfsigned": "^2.0.1",
     "set-cookie-parser": "^2.4.8",