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

package/dist/chunks/index.js

@@ -2,7 +2,7 @@ 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';
@@ -451,13 +451,15 @@ 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 }) {
+async function dev({ port, host, https }) {
+	/** @type {import('types').ValidatedConfig} */
+	const config = await load_config();
+
 	init(config);
 
 	const [vite_config] = deep_merge(
@@ -535,14 +537,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';

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;
@@ -172,7 +177,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/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.343');
 
 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.343'}\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.343",
   "repository": {
     "type": "git",
     "url": "https://github.com/sveltejs/kit",