@sveltejs/kit 1.0.0-next.188 → 1.0.0-next.191

package/assets/runtime/app/navigation.js

@@ -47,9 +47,7 @@ async function prefetchRoutes_(pathnames) {
 		? router.routes.filter((route) => pathnames.some((pathname) => route[0].test(pathname)))
 		: router.routes;
 
-	const promises = matching
-		.filter(/** @returns {r is import('types/internal').CSRPage} */ (r) => r && r.length > 1)
-		.map((r) => Promise.all(r[1].map((load) => load())));
+	const promises = matching.map((r) => Promise.all(r[1].map((load) => load())));
 
 	await Promise.all(promises);
 }

package/assets/runtime/internal/start.js

@@ -749,21 +749,13 @@ class Renderer {
 		for (let i = 0; i < info.routes.length; i += 1) {
 			const route = info.routes[i];
 
-			// check if endpoint route
-			if (route.length === 1) {
-				return { reload: true, props: {}, state: this.current };
-			}
-
 			// load code for subsequent routes immediately, if they are as
 			// likely to match the current path/query as the current one
 			let j = i + 1;
 			while (j < info.routes.length) {
 				const next = info.routes[j];
 				if (next[0].toString() === route[0].toString()) {
-					// if it's a page route
-					if (next.length !== 1) {
-						next[1].forEach((loader) => loader());
-					}
+					next[1].forEach((loader) => loader());
 					j += 1;
 				} else {
 					break;
@@ -1141,7 +1133,7 @@ class Renderer {
 	}
 }
 
-// @ts-expect-error - value will be replaced on build step
+// @ts-expect-error - doesn't exist yet. generated by Rollup
 
 /**
  * @param {{

package/dist/chunks/index.js

@@ -4268,6 +4268,20 @@ class Watcher extends EventEmitter {
 		});
 	}
 
+	allowed_directories() {
+		return [
+			...new Set([
+				this.config.kit.files.assets,
+				this.config.kit.files.lib,
+				this.config.kit.files.routes,
+				path__default.resolve(this.cwd, 'src'),
+				path__default.resolve(this.cwd, '.svelte-kit'),
+				path__default.resolve(this.cwd, 'node_modules'),
+				path__default.resolve(vite.searchForWorkspaceRoot(this.cwd), 'node_modules')
+			])
+		];
+	}
+
 	async init_server() {
 		if (!this.manifest) throw new Error('Must call init() before init_server()');
 
@@ -4277,7 +4291,8 @@ class Watcher extends EventEmitter {
 		const default_config = {
 			server: {
 				fs: {
-					strict: true
+					strict: true,
+					allow: this.allowed_directories()
 				},
 				strictPort: true
 			}

package/dist/chunks/index2.js

@@ -171,8 +171,6 @@ function generate_client_manifest(manifest_data, base) {
 					if (params) tuple.push(params);
 
 					return `// ${route.a[route.a.length - 1]}\n\t\t[${tuple.join(', ')}]`;
-				} else {
-					return `// ${route.file}\n\t\t[${route.pattern}]`;
 				}
 			})
 			.join(',\n\n\t\t')}
@@ -200,7 +198,8 @@ function generate_app(manifest_data) {
 	const max_depth = Math.max(
 		...manifest_data.routes.map((route) =>
 			route.type === 'page' ? route.a.filter(Boolean).length : 0
-		)
+		),
+		1
 	);
 
 	const levels = [];

package/dist/chunks/index3.js

@@ -466,12 +466,6 @@ var glob = sync;
 /** @param {any} value */
 const s = (value) => JSON.stringify(value);
 
-/** @typedef {Record<string, {
- *   file: string;
- *   css: string[];
- *   imports: string[];
- * }>} ClientManifest */
-
 /**
  * @param {import('types/config').ValidatedConfig} config
  * @param {{
@@ -562,7 +556,6 @@ async function build_client({
 	process.env.VITE_SVELTEKIT_AMP = config.kit.amp ? 'true' : '';
 
 	const client_out_dir = `${output_dir}/client/${config.kit.appDir}`;
-	const client_manifest_file = `${client_out_dir}/manifest.json`;
 
 	/** @type {Record<string, string>} */
 	const input = {
@@ -637,7 +630,8 @@ async function build_client({
 
 	await vite.build(merged_config);
 
-	/** @type {ClientManifest} */
+	const client_manifest_file = `${client_out_dir}/manifest.json`;
+	/** @type {import('vite').Manifest} */
 	const client_manifest = JSON.parse(fs__default.readFileSync(client_manifest_file, 'utf-8'));
 	fs__default.renameSync(client_manifest_file, `${output_dir}/manifest.json`); // inspectable but not shipped
 
@@ -655,7 +649,7 @@ async function build_client({
  *   client_entry_file: string;
  *   service_worker_entry_file: string | null;
  * }} options
- * @param {ClientManifest} client_manifest
+ * @param {import('vite').Manifest} client_manifest
  * @param {string} runtime
  */
 async function build_server(
@@ -961,7 +955,7 @@ async function build_server(
  *   client_entry_file: string;
  *   service_worker_entry_file: string | null;
  * }} options
- * @param {ClientManifest} client_manifest
+ * @param {import('vite').Manifest} client_manifest
  */
 async function build_service_worker(
 	{ cwd, assets_base, config, manifest, build_dir, output_dir, service_worker_entry_file },

package/dist/chunks/index4.js

@@ -103,10 +103,11 @@ const REDIRECT = 3;
  *   fallback?: string;
  *   all: boolean; // disregard `export const prerender = true`
  * }} opts
+ * @returns {Promise<Array<string>>} returns a promise that resolves to an array of paths corresponding to the files that have been prerendered.
  */
 async function prerender({ cwd, out, log, config, build_data, fallback, all }) {
 	if (!config.kit.prerender.enabled && !fallback) {
-		return;
+		return [];
 	}
 
 	__fetch_polyfill();
@@ -129,6 +130,7 @@ async function prerender({ cwd, out, log, config, build_data, fallback, all }) {
 	const error = chooseErrorHandler(log, config.kit.prerender.onError);
 
 	const files = new Set([...build_data.static, ...build_data.client]);
+	const written_files = [];
 
 	build_data.static.forEach((file) => {
 		if (file.endsWith('/index.html')) {
@@ -199,6 +201,7 @@ async function prerender({ cwd, out, log, config, build_data, fallback, all }) {
 				if (location) {
 					log.warn(`${rendered.status} ${decoded_path} -> ${location}`);
 					writeFileSync(file, `<meta http-equiv="refresh" content="0;url=${encodeURI(location)}">`);
+					written_files.push(file);
 				} else {
 					log.warn(`location header missing on redirect received from ${decoded_path}`);
 				}
@@ -209,6 +212,7 @@ async function prerender({ cwd, out, log, config, build_data, fallback, all }) {
 			if (rendered.status === 200) {
 				log.info(`${rendered.status} ${decoded_path}`);
 				writeFileSync(file, rendered.body || '');
+				written_files.push(file);
 			} else if (response_type !== OK) {
 				error({ status: rendered.status, path, referrer, referenceType: 'linked' });
 			}
@@ -226,7 +230,10 @@ async function prerender({ cwd, out, log, config, build_data, fallback, all }) {
 				const file = `${out}${parts.join('/')}`;
 				mkdirp(dirname(file));
 
-				if (result.body) writeFileSync(file, result.body);
+				if (result.body) {
+					writeFileSync(file, result.body);
+					written_files.push(file);
+				}
 
 				if (response_type === OK) {
 					log.info(`${result.status} ${dependency_path}`);
@@ -318,7 +325,10 @@ async function prerender({ cwd, out, log, config, build_data, fallback, all }) {
 		const file = join(out, fallback);
 		mkdirp(dirname(file));
 		writeFileSync(file, rendered.body || '');
+		written_files.push(file);
 	}
+
+	return written_files;
 }
 
 /**
@@ -338,15 +348,15 @@ function get_utils({ cwd, config, build_data, log }) {
 		copy,
 
 		copy_client_files(dest) {
-			copy(`${cwd}/${SVELTE_KIT}/output/client`, dest, (file) => file[0] !== '.');
+			return copy(`${cwd}/${SVELTE_KIT}/output/client`, dest, (file) => file[0] !== '.');
 		},
 
 		copy_server_files(dest) {
-			copy(`${cwd}/${SVELTE_KIT}/output/server`, dest, (file) => file[0] !== '.');
+			return copy(`${cwd}/${SVELTE_KIT}/output/server`, dest, (file) => file[0] !== '.');
 		},
 
 		copy_static_files(dest) {
-			copy(config.kit.files.assets, dest);
+			return copy(config.kit.files.assets, dest);
 		},
 
 		async prerender({ all = false, dest, fallback }) {

package/dist/cli.js

@@ -1,8 +1,8 @@
 import fs__default, { existsSync } from 'fs';
 import sade from 'sade';
+import path__default, { relative } from 'path';
 import { exec as exec$1 } from 'child_process';
 import { createConnection, createServer } from 'net';
-import path__default from 'path';
 import * as url from 'url';
 import { fileURLToPath } from 'url';
 import { networkInterfaces, release } from 'os';
@@ -817,7 +817,7 @@ async function launch(port, https) {
 	exec(`${cmd} ${https ? 'https' : 'http'}://localhost:${port}`);
 }
 
-const prog = sade('svelte-kit').version('1.0.0-next.188');
+const prog = sade('svelte-kit').version('1.0.0-next.191');
 
 prog
 	.command('dev')
@@ -854,7 +854,14 @@ prog
 			https = https || !!config.kit.vite().server?.https;
 			open = open || !!config.kit.vite().server?.open;
 
-			welcome({ port: address_info.port, host: address_info.address, https, open });
+			welcome({
+				port: address_info.port,
+				host: address_info.address,
+				https,
+				open,
+				allow: watcher.allowed_directories(),
+				cwd: watcher.cwd
+			});
 		} catch (error) {
 			handle_error(error);
 		}
@@ -964,12 +971,14 @@ async function check_port(port) {
  *   host: string;
  *   https: boolean;
  *   port: number;
+ *   allow?: string[];
+ *   cwd?: string;
  * }} param0
  */
-function welcome({ port, host, https, open }) {
+function welcome({ port, host, https, open, allow, cwd }) {
 	if (open) launch(port, https);
 
-	console.log($.bold().cyan(`\n  SvelteKit v${'1.0.0-next.188'}\n`));
+	console.log($.bold().cyan(`\n  SvelteKit v${'1.0.0-next.191'}\n`));
 
 	const protocol = https ? 'https:' : 'http:';
 	const exposed = typeof host !== 'undefined' && host !== 'localhost' && host !== '127.0.0.1';
@@ -987,6 +996,9 @@ function welcome({ port, host, https, open }) {
 
 				if (exposed) {
 					console.log(`  ${$.gray('network:')} ${protocol}//${$.bold(`${details.address}:${port}`)}`);
+					if (allow?.length && cwd) {
+						console.log(`\n  ${$.yellow('Note that all files in the following directories will be accessible to anyone on your network: ' + allow.map(a => relative(cwd, a)).join(', '))}`);
+					}
 				} else {
 					console.log(`  ${$.gray('network: not exposed')}`);
 				}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sveltejs/kit",
-  "version": "1.0.0-next.188",
+  "version": "1.0.0-next.191",
   "repository": {
     "type": "git",
     "url": "https://github.com/sveltejs/kit",
@@ -12,7 +12,7 @@
     "@sveltejs/vite-plugin-svelte": "^1.0.0-next.30",
     "cheap-watch": "^1.0.4",
     "sade": "^1.7.4",
-    "vite": "^2.6.10"
+    "vite": "^2.6.12"
   },
   "devDependencies": {
     "@rollup/plugin-replace": "^3.0.0",

package/types/ambient-modules.d.ts

@@ -161,7 +161,7 @@ declare module '@sveltejs/kit/ssr' {
 	type State = import('@sveltejs/kit/types/internal').SSRRenderState;
 
 	export interface Respond {
-		(incoming: IncomingRequest, options: Options, state?: State): Response;
+		(incoming: IncomingRequest, options: Options, state?: State): Promise<Response>;
 	}
 	export const respond: Respond;
 }

package/types/config.d.ts

@@ -6,10 +6,27 @@ export interface AdapterUtils {
 	log: Logger;
 	rimraf(dir: string): void;
 	mkdirp(dir: string): void;
-	copy_client_files(dest: string): void;
-	copy_server_files(dest: string): void;
-	copy_static_files(dest: string): void;
-	copy(from: string, to: string, filter?: (basename: string) => boolean): void;
+	/**
+	 * @param dest the destination folder to which files should be copied
+	 * @returns an array of paths corresponding to the files that have been created by the copy
+	 */
+	copy_client_files(dest: string): string[];
+	/**
+	 * @param dest the destination folder to which files should be copied
+	 * @returns an array of paths corresponding to the files that have been created by the copy
+	 */
+	copy_server_files(dest: string): string[];
+	/**
+	 * @param dest the destination folder to which files should be copied
+	 * @returns an array of paths corresponding to the files that have been created by the copy
+	 */
+	copy_static_files(dest: string): string[];
+	/**
+	 * @param from the source folder from which files should be copied
+	 * @param to the destination folder to which files should be copied
+	 * @returns an array of paths corresponding to the files that have been created by the copy
+	 */
+	copy(from: string, to: string, filter?: (basename: string) => boolean): string[];
 	prerender(options: { all?: boolean; dest: string; fallback?: string }): Promise<void>;
 }
 

package/types/internal.d.ts

@@ -103,11 +103,7 @@ export interface SSREndpoint {
 
 export type SSRRoute = SSREndpoint | SSRPage;
 
-export type CSRPage = [RegExp, CSRComponentLoader[], CSRComponentLoader[], GetParams?];
-
-export type CSREndpoint = [RegExp];
-
-export type CSRRoute = CSREndpoint | CSRPage;
+export type CSRRoute = [RegExp, CSRComponentLoader[], CSRComponentLoader[], GetParams?];
 
 export interface SSRManifest {
 	assets: Asset[];
@@ -125,9 +121,13 @@ export interface Hooks {
 
 export interface SSRNode {
 	module: SSRComponent;
-	entry: string; // client-side module corresponding to this component
+	/** client-side module URL for this component */
+	entry: string;
+	/** external CSS files */
 	css: string[];
+	/** external JS files */
 	js: string[];
+	/** inlined styles */
 	styles: string[];
 }