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

package/dist/cli.js

@@ -1,9 +1,10 @@
-import sade from 'sade';
+import chokidar from 'chokidar';
 import fs__default from 'fs';
 import path__default, { join, relative } from 'path';
-import { exec as exec$1 } from 'child_process';
 import { createConnection, createServer } from 'net';
-import chokidar from 'chokidar';
+import { exec as exec$1 } from 'child_process';
+import sade from 'sade';
+import * as vite from 'vite';
 import * as url from 'url';
 import { networkInterfaces, release } from 'os';
 
@@ -114,31 +115,11 @@ function init(open, close) {
 	};
 }
 
-function exec(cmd) {
-	return new Promise((fulfil, reject) => {
-		exec$1(cmd, (error, stdout, stderr) => {
-			if (error) return reject(error);
-			fulfil({ stdout, stderr });
-		});
-	});
-}
-
-async function blame(port) {
-	try {
-		const { stdout } = await exec(`lsof -i :${port} -sTCP:LISTEN -Fp`);
-
-		if (!stdout) return null;
-		const pid = parseInt(stdout.slice(1), 10);
-		if (isNaN(pid)) throw new Error(`Invalid stdout ${stdout}`);
-
-		return pid;
-	} catch (error) {
-		return null;
-	}
-}
+const host = 'localhost';
 
 let promise;
 
+
 function weird() {
 	if (!promise) {
 		promise = get_weird(9000);
@@ -156,7 +137,7 @@ function get_weird(port) {
 			fulfil(get_weird(port + 1));
 		});
 
-		server.listen({ port }, () => {
+		server.listen({ host, port }, () => {
 			const server2 = createServer();
 
 			server2.unref();
@@ -167,13 +148,13 @@ function get_weird(port) {
 				});
 			});
 
-			server2.listen({ port }, () => {
-				server2.close(() => {
-					server.close(() => {
-						fulfil(true);
-					});
-				});
-			});
+			server2.listen({ host, port }, () => {
+        server2.close(() => {
+          server.close(() => {
+            fulfil(true);
+          });
+        });
+      });
 		});
 	});
 }
@@ -193,7 +174,7 @@ function check(port) {
 				fulfil(false);
 			});
 
-			server.listen({ port }, () => {
+			server.listen({ host, port }, () => {
 				server.close(() => {
 					fulfil(true);
 				});
@@ -204,7 +185,7 @@ function check(port) {
 
 function check_weird(port) {
 	return new Promise(fulfil => {
-		const client = createConnection({ port }, () => {
+		const client = createConnection({ host, port }, () => {
 				client.end();
 				fulfil(false);
 			})
@@ -214,6 +195,29 @@ function check_weird(port) {
 	});
 }
 
+function exec(cmd) {
+	return new Promise((fulfil, reject) => {
+		exec$1(cmd, (error, stdout, stderr) => {
+			if (error) return reject(error);
+			fulfil({ stdout, stderr });
+		});
+	});
+}
+
+async function blame(port) {
+	try {
+		const { stdout } = await exec(`lsof -i :${port} -sTCP:LISTEN -Fp`);
+
+		if (!stdout) return null;
+		const pid = parseInt(stdout.slice(1), 10);
+		if (isNaN(pid)) throw new Error(`Invalid stdout ${stdout}`);
+
+		return pid;
+	} catch (error) {
+		return null;
+	}
+}
+
 const get_runtime_path = /** @param {import('types').ValidatedConfig} config */ (config) =>
 			posixify_path(path__default.join(config.kit.outDir, 'runtime'))
 	;
@@ -538,7 +542,7 @@ const options = object(
 
 				// TODO: remove this for the 1.0 release
 				force: validate(undefined, (input, keypath) => {
-					if (typeof input !== undefined) {
+					if (typeof input !== 'undefined') {
 						const newSetting = input ? 'continue' : 'fail';
 						const needsSetting = newSetting === 'continue';
 						throw new Error(
@@ -620,7 +624,7 @@ const options = object(
  * @param {boolean} [allow_unknown]
  * @returns {Validator}
  */
-function object(children, allow_unknown = false) {
+function object(children, allow_unknown) {
 	return (input, keypath) => {
 		/** @type {Record<string, any>} */
 		const output = {};
@@ -849,7 +853,7 @@ function validate_config(config) {
  * @param {string=} pathPrefix - prepended in front of the path
  * @param {string=} scope - used to prefix the whole error message
  */
-function print_config_conflicts(conflicts, pathPrefix = '', scope) {
+function print_config_conflicts(conflicts, pathPrefix, scope) {
 	const prefix = scope ? scope + ': ' : '';
 	const log = logger({ verbose: false });
 	conflicts.forEach((conflict) => {
@@ -904,7 +908,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.344');
+const prog = sade('svelte-kit').version('1.0.0-next.347');
 
 prog
 	.command('dev')
@@ -923,28 +927,49 @@ prog
 		let close;
 
 		async function start() {
-			const { dev } = await import('./chunks/index.js');
+			const svelte_config = await load_config();
+			const { plugins } = await import('./chunks/plugin.js');
+			const vite_config = await svelte_config.kit.vite();
+
+			/** @type {import('vite').UserConfig} */
+			const config = {
+				plugins: [...(vite_config.plugins || []), plugins(svelte_config)]
+			};
+			config.server = {};
+
+			// optional config from command-line flags
+			// these should take precedence, but not print conflict warnings
+			if (host) {
+				config.server.host = host;
+			}
 
-			const { server, config } = await dev({
-				port,
-				host,
-				https
-			});
+			// if https is already enabled then do nothing. it could be an object and we
+			// don't want to overwrite with a boolean
+			if (https && !vite_config?.server?.https) {
+				config.server.https = https;
+			}
+
+			if (port) {
+				config.server.port = port;
+			}
+
+			const server = await vite.createServer(config);
+			await server.listen(port);
 
 			const address_info = /** @type {import('net').AddressInfo} */ (
 				/** @type {import('http').Server} */ (server.httpServer).address()
 			);
 
-			const vite_config = server.config;
+			const resolved_config = server.config;
 
 			welcome({
 				port: address_info.port,
 				host: address_info.address,
-				https: !!(https || vite_config.server.https),
-				open: first && (open || !!vite_config.server.open),
-				base: config.kit.paths.base,
-				loose: vite_config.server.fs.strict === false,
-				allow: vite_config.server.fs.allow
+				https: !!(https || resolved_config.server.https),
+				open: first && (open || !!resolved_config.server.open),
+				base: svelte_config.kit.paths.base,
+				loose: resolved_config.server.fs.strict === false,
+				allow: resolved_config.server.fs.allow
 			});
 
 			first = false;
@@ -952,6 +977,7 @@ prog
 			return server.close;
 		}
 
+		// TODO: we should probably replace this with something like vite-plugin-restart
 		async function relaunch() {
 			const id = uid;
 			relaunching = true;
@@ -1000,7 +1026,7 @@ prog
 
 			const log = logger({ verbose });
 
-			const { build } = await import('./chunks/index2.js');
+			const { build } = await import('./chunks/index.js');
 			const { build_data, prerendered } = await build(config, { log });
 
 			console.log(
@@ -1008,7 +1034,7 @@ prog
 			);
 
 			if (config.kit.adapter) {
-				const { adapt } = await import('./chunks/index4.js');
+				const { adapt } = await import('./chunks/index3.js');
 				await adapt(config, build_data, prerendered, { log });
 
 				// this is necessary to close any open db connections, etc
@@ -1042,7 +1068,7 @@ prog
 
 			process.env.NODE_ENV = process.env.NODE_ENV || 'production';
 
-			const { preview } = await import('./chunks/index5.js');
+			const { preview } = await import('./chunks/index4.js');
 
 			const { config } = await preview({ port, host, https });
 
@@ -1059,7 +1085,7 @@ prog
 	.action(async ({ watch }) => {
 		try {
 			const config = await load_config();
-			const packaging = await import('./chunks/index6.js');
+			const packaging = await import('./chunks/index5.js');
 
 			await (watch ? packaging.watch(config) : packaging.build(config));
 		} catch (error) {
@@ -1123,7 +1149,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.344'}\n`));
+	console.log($.bold().cyan(`\n  SvelteKit v${'1.0.0-next.347'}\n`));
 
 	const protocol = https ? 'https:' : 'http:';
 	const exposed = typeof host !== 'undefined' && host !== 'localhost' && host !== '127.0.0.1';
@@ -1161,4 +1187,4 @@ function welcome({ port, host, https, open, base, loose, allow, cwd }) {
 	console.log('\n');
 }
 
-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 };
+export { $, get_runtime_path as a, get_mime_lookup as b, coalesce_to_error as c, load_config as d, get_aliases as g, load_template as l, print_config_conflicts as p, resolve_entry as r };