@sveltejs/kit 1.0.0-next.348 → 1.0.0-next.349

package/dist/cli.js

@@ -1,8 +1,6 @@
 import chokidar from 'chokidar';
 import fs__default from 'fs';
 import path__default, { join, relative } from 'path';
-import { createConnection, createServer } from 'net';
-import { exec as exec$1 } from 'child_process';
 import sade from 'sade';
 import * as vite from 'vite';
 import * as url from 'url';
@@ -115,109 +113,6 @@ function init(open, close) {
 	};
 }
 
-const host = 'localhost';
-
-let promise;
-
-
-function weird() {
-	if (!promise) {
-		promise = get_weird(9000);
-	}
-	return promise;
-}
-
-function get_weird(port) {
-	return new Promise(fulfil => {
-		const server = createServer();
-
-		server.unref();
-
-		server.on('error', () => {
-			fulfil(get_weird(port + 1));
-		});
-
-		server.listen({ host, port }, () => {
-			const server2 = createServer();
-
-			server2.unref();
-
-			server2.on('error', () => {
-				server.close(() => {
-					fulfil(false);
-				});
-			});
-
-			server2.listen({ host, port }, () => {
-        server2.close(() => {
-          server.close(() => {
-            fulfil(true);
-          });
-        });
-      });
-		});
-	});
-}
-
-function check(port) {
-	return weird().then(weird => {
-		if (weird) {
-			return check_weird(port);
-		}
-
-		return new Promise(fulfil => {
-			const server = createServer();
-
-			server.unref();
-
-			server.on('error', () => {
-				fulfil(false);
-			});
-
-			server.listen({ host, port }, () => {
-				server.close(() => {
-					fulfil(true);
-				});
-			});
-		});
-	});
-}
-
-function check_weird(port) {
-	return new Promise(fulfil => {
-		const client = createConnection({ host, port }, () => {
-				client.end();
-				fulfil(false);
-			})
-			.on('error', () => {
-				fulfil(true);
-			});
-	});
-}
-
-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').ValidatedKitConfig} config */ (config) =>
 			posixify_path(path__default.join(config.outDir, 'runtime'))
 	;
@@ -316,6 +211,10 @@ function get_aliases(config) {
 /** @type {Validator} */
 const options = object(
 	{
+		compilerOptions: object({
+			hydratable: boolean(true)
+		}),
+
 		extensions: validate(['.svelte'], (input, keypath) => {
 			if (!Array.isArray(input) || !input.every((page) => typeof page === 'string')) {
 				throw new Error(`${keypath} must be an array of strings`);
@@ -385,7 +284,10 @@ const options = object(
 			}),
 
 			browser: object({
-				hydrate: boolean(true),
+				// TODO remove for 1.0
+				hydrate: error(
+					(keypath) => `${keypath} has been moved to config.compilerOptions.hydratable`
+				),
 				router: boolean(true)
 			}),
 
@@ -453,7 +355,7 @@ const options = object(
 			),
 
 			// TODO remove for 1.0
-			hydrate: error((keypath) => `${keypath} has been moved to config.kit.browser.hydrate`),
+			hydrate: error((keypath) => `${keypath} has been moved to config.compilerOptions.hydratable`),
 
 			inlineStyleThreshold: number(0),
 
@@ -780,6 +682,8 @@ function error(fn) {
 }
 
 /**
+ * Loads the template (src/app.html by default) and validates that it has the
+ * required content.
  * @param {string} cwd
  * @param {import('types').ValidatedConfig} config
  */
@@ -811,6 +715,11 @@ function load_template(cwd, config) {
 	return fs__default.readFileSync(template, 'utf-8');
 }
 
+/**
+ * Loads and validates svelte.config.js
+ * @param {{ cwd?: string }} options
+ * @returns {Promise<import('types').ValidatedConfig>}
+ */
 async function load_config({ cwd = process.cwd() } = {}) {
 	const config_file = path__default.join(cwd, 'svelte.config.js');
 
@@ -849,6 +758,7 @@ function validate_config(config) {
 }
 
 /**
+ * Ensures the user does not override any config values that SvelteKit must control.
  * @param {string[]} conflicts - array of conflicts in dotted notation
  * @param {string=} pathPrefix - prepended in front of the path
  * @param {string=} scope - used to prefix the whole error message
@@ -908,7 +818,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.348');
+const prog = sade('svelte-kit').version('1.0.0-next.349');
 
 prog
 	.command('dev')
@@ -927,15 +837,16 @@ prog
 		let close;
 
 		async function start() {
-			const svelte_config = await load_config();
 			const { plugins } = await import('./chunks/plugin.js');
+			const svelte_config = await load_config();
 			const vite_config = await svelte_config.kit.vite();
 
 			/** @type {import('vite').UserConfig} */
 			const config = {
+				...vite_config,
 				plugins: [...(vite_config.plugins || []), plugins(svelte_config)]
 			};
-			config.server = {};
+			config.server = config.server || {};
 
 			// optional config from command-line flags
 			// these should take precedence, but not print conflict warnings
@@ -1064,15 +975,34 @@ prog
 		try {
 			if (H) throw new Error('-H is no longer supported — use --https instead');
 
-			await check_port(port);
-
 			process.env.NODE_ENV = process.env.NODE_ENV || 'production';
 
-			const { preview } = await import('./chunks/index4.js');
+			const { sveltekit_plugin } = await import('./chunks/index4.js');
+			const svelte_config = await load_config();
+			const vite_config = await svelte_config.kit.vite();
+
+			/** @type {import('vite').UserConfig} */
+			const config = {
+				...vite_config,
+				plugins: [...(vite_config.plugins || []), sveltekit_plugin]
+			};
+			config.preview = config.preview || {};
+
+			// optional config from command-line flags
+			// these should take precedence, but not print conflict warnings
+			if (host) {
+				config.preview.host = host;
+			}
+			if (https) {
+				config.preview.https = https;
+			}
+			if (port) {
+				config.preview.port = port;
+			}
 
-			const { config } = await preview({ port, host, https });
+			const preview_server = await vite.preview(config);
 
-			welcome({ port, host, https, open, base: config.kit.paths.base });
+			welcome({ port, host, https, open, base: preview_server.config.base });
 		} catch (error) {
 			handle_error(error);
 		}
@@ -1113,27 +1043,6 @@ prog
 
 prog.parse(process.argv, { unknown: (arg) => `Unknown option: ${arg}` });
 
-/** @param {number} port */
-async function check_port(port) {
-	if (await check(port)) {
-		return;
-	}
-	console.error($.bold().red(`Port ${port} is occupied`));
-	const n = await blame(port);
-	if (n) {
-		// prettier-ignore
-		console.error(
-			`Terminate process ${$.bold(n)} or specify a different port with ${$.bold('--port')}\n`
-		);
-	} else {
-		// prettier-ignore
-		console.error(
-			`Terminate the process occupying the port or specify a different port with ${$.bold('--port')}\n`
-		);
-	}
-	process.exit(1);
-}
-
 /**
  * @param {{
  *   open: boolean;
@@ -1149,7 +1058,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.348'}\n`));
+	console.log($.bold().cyan(`\n  SvelteKit v${'1.0.0-next.349'}\n`));
 
 	const protocol = https ? 'https:' : 'http:';
 	const exposed = typeof host !== 'undefined' && host !== 'localhost' && host !== '127.0.0.1';

package/dist/node/polyfills.js

@@ -6651,4 +6651,4 @@ function installPolyfills() {
 	}
 }
 
-export { FormData as F, File as a, commonjsGlobal as c, installPolyfills };
+export { FormData as F, File as a, installPolyfills };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sveltejs/kit",
-  "version": "1.0.0-next.348",
+  "version": "1.0.0-next.349",
   "repository": {
     "type": "git",
     "url": "https://github.com/sveltejs/kit",
@@ -13,7 +13,7 @@
     "@sveltejs/vite-plugin-svelte": "^1.0.0-next.46",
     "chokidar": "^3.5.3",
     "sade": "^1.8.1",
-    "vite": "^2.9.9"
+    "vite": "^2.9.10"
   },
   "devDependencies": {
     "@playwright/test": "^1.22.2",