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

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 * as child_process from 'child_process';
+import * as net from 'net';
+import sade from 'sade';
+import * as vite from 'vite';
 import * as url from 'url';
 import { networkInterfaces, release } from 'os';
 
@@ -114,15 +115,20 @@ function init(open, close) {
 	};
 }
 
+/** @param {string} cmd */
 function exec(cmd) {
 	return new Promise((fulfil, reject) => {
-		exec$1(cmd, (error, stdout, stderr) => {
+		child_process.exec(cmd, (error, stdout, stderr) => {
 			if (error) return reject(error);
 			fulfil({ stdout, stderr });
 		});
 	});
 }
 
+/**
+ * Find the PID of the process using `port`
+ * @param {number} port
+ */
 async function blame(port) {
 	try {
 		const { stdout } = await exec(`lsof -i :${port} -sTCP:LISTEN -Fp`);
@@ -137,6 +143,9 @@ async function blame(port) {
 	}
 }
 
+const host = 'localhost';
+
+/** @type {Promise<any>} */
 let promise;
 
 function weird() {
@@ -146,9 +155,10 @@ function weird() {
 	return promise;
 }
 
+/** @param {number} port */
 function get_weird(port) {
-	return new Promise(fulfil => {
-		const server = createServer();
+	return new Promise((fulfil) => {
+		const server = net.createServer();
 
 		server.unref();
 
@@ -156,8 +166,8 @@ function get_weird(port) {
 			fulfil(get_weird(port + 1));
 		});
 
-		server.listen({ port }, () => {
-			const server2 = createServer();
+		server.listen({ host, port }, () => {
+			const server2 = net.createServer();
 
 			server2.unref();
 
@@ -167,7 +177,7 @@ function get_weird(port) {
 				});
 			});
 
-			server2.listen({ port }, () => {
+			server2.listen({ host, port }, () => {
 				server2.close(() => {
 					server.close(() => {
 						fulfil(true);
@@ -178,14 +188,18 @@ function get_weird(port) {
 	});
 }
 
+/**
+ * Check if `port` is available
+ * @param {number} port
+ */
 function check(port) {
-	return weird().then(weird => {
+	return weird().then((weird) => {
 		if (weird) {
 			return check_weird(port);
 		}
 
-		return new Promise(fulfil => {
-			const server = createServer();
+		return new Promise((fulfil) => {
+			const server = net.createServer();
 
 			server.unref();
 
@@ -193,7 +207,7 @@ function check(port) {
 				fulfil(false);
 			});
 
-			server.listen({ port }, () => {
+			server.listen({ host, port }, () => {
 				server.close(() => {
 					fulfil(true);
 				});
@@ -202,9 +216,11 @@ function check(port) {
 	});
 }
 
+/** @param {number} port */
 function check_weird(port) {
-	return new Promise(fulfil => {
-		const client = createConnection({ port }, () => {
+	return new Promise((fulfil) => {
+		const client = net
+			.createConnection({ host, port }, () => {
 				client.end();
 				fulfil(false);
 			})
@@ -904,7 +920,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.345');
+const prog = sade('svelte-kit').version('1.0.0-next.346');
 
 prog
 	.command('dev')
@@ -923,28 +939,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 +989,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 +1038,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 +1046,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 +1080,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 +1097,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 +1161,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.345'}\n`));
+	console.log($.bold().cyan(`\n  SvelteKit v${'1.0.0-next.346'}\n`));
 
 	const protocol = https ? 'https:' : 'http:';
 	const exposed = typeof host !== 'undefined' && host !== 'localhost' && host !== '127.0.0.1';
@@ -1161,4 +1199,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 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sveltejs/kit",
-  "version": "1.0.0-next.345",
+  "version": "1.0.0-next.346",
   "repository": {
     "type": "git",
     "url": "https://github.com/sveltejs/kit",
@@ -10,7 +10,7 @@
   "homepage": "https://kit.svelte.dev",
   "type": "module",
   "dependencies": {
-    "@sveltejs/vite-plugin-svelte": "^1.0.0-next.44",
+    "@sveltejs/vite-plugin-svelte": "^1.0.0-next.46",
     "chokidar": "^3.5.3",
     "sade": "^1.7.4",
     "vite": "^2.9.9"

package/types/private.d.ts

@@ -27,8 +27,8 @@ export interface AdapterEntry {
 }
 
 export type BodyValidator<T> = {
-	[P in keyof T]: T[P] extends { [k: string]: infer V }
-		? BodyValidator<V> // recurse when T[P] is an object
+	[P in keyof T]: T[P] extends { [k: string]: unknown }
+		? BodyValidator<T[P]> // recurse when T[P] is an object
 		: T[P] extends BigInt | Function | Symbol
 		? never
 		: T[P];