@sveltejs/kit 1.0.0-next.185 → 1.0.0-next.189

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

@@ -44,6 +44,8 @@ class Router {
 		this.base = base;
 		this.routes = routes;
 		this.trailing_slash = trailing_slash;
+		/** Keeps tracks of multiple navigations caused by redirects during rendering */
+		this.navigating = 0;
 
 		/** @type {import('./renderer').Renderer} */
 		this.renderer = renderer;
@@ -258,6 +260,11 @@ class Router {
 			throw new Error('Attempted to navigate to a URL that does not belong to this app');
 		}
 
+		if (!this.navigating) {
+			dispatchEvent(new CustomEvent('sveltekit:navigation-start'));
+		}
+		this.navigating++;
+
 		// remove trailing slashes
 		if (info.path !== '/') {
 			const has_trailing_slash = info.path.endsWith('/');
@@ -274,12 +281,12 @@ class Router {
 			}
 		}
 
-		this.renderer.notify({
-			path: info.path,
-			query: info.query
-		});
+		await this.renderer.handle_navigation(info, chain, false, { hash, scroll, keepfocus });
 
-		await this.renderer.update(info, chain, false, { hash, scroll, keepfocus });
+		this.navigating--;
+		if (!this.navigating) {
+			dispatchEvent(new CustomEvent('sveltekit:navigation-end'));
+		}
 	}
 }
 
@@ -577,10 +584,13 @@ class Renderer {
 		this._init(result);
 	}
 
-	/** @param {{ path: string, query: URLSearchParams }} destination */
-	notify({ path, query }) {
-		dispatchEvent(new CustomEvent('sveltekit:navigation-start'));
-
+	/**
+	 * @param {import('./types').NavigationInfo} info
+	 * @param {string[]} chain
+	 * @param {boolean} no_cache
+	 * @param {{hash?: string, scroll: { x: number, y: number } | null, keepfocus: boolean}} [opts]
+	 */
+	async handle_navigation(info, chain, no_cache, opts) {
 		if (this.started) {
 			this.stores.navigating.set({
 				from: {
@@ -588,11 +598,13 @@ class Renderer {
 					query: this.current.page.query
 				},
 				to: {
-					path,
-					query
+					path: info.path,
+					query: info.query
 				}
 			});
 		}
+
+		await this.update(info, chain, no_cache, opts);
 	}
 
 	/**
@@ -664,11 +676,12 @@ class Renderer {
 		}
 
 		await 0;
-		dispatchEvent(new CustomEvent('sveltekit:navigation-end'));
+
 		this.loading.promise = null;
 		this.loading.id = null;
 
 		if (!this.router) return;
+
 		const leaf_node = navigation_result.state.branch[navigation_result.state.branch.length - 1];
 		if (leaf_node && leaf_node.module.router === false) {
 			this.router.disable();
@@ -736,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;
@@ -1128,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

@@ -4295,7 +4295,7 @@ class Watcher extends EventEmitter {
 		});
 
 		/** @type {[any, string[]]} */
-		let [merged_config, conflicts] = deep_merge(modified_vite_config, {
+		const [merged_config, conflicts] = deep_merge(modified_vite_config, {
 			configFile: false,
 			root: this.cwd,
 			resolve: {
@@ -4329,13 +4329,17 @@ class Watcher extends EventEmitter {
 
 		// optional config from command-line flags
 		// these should take precedence, but not print conflict warnings
-		[merged_config] = deep_merge(merged_config, {
-			server: {
-				host: this.host,
-				https: this.https,
-				port: this.port
-			}
-		});
+		if (this.host) {
+			merged_config.server.host = this.host;
+		}
+		// https is already enabled then do nothing. it could be an object and we
+		// don't want to overwrite with a boolean
+		if (this.https && !merged_config.server.https) {
+			merged_config.server.https = this.https;
+		}
+		if (this.port) {
+			merged_config.server.port = this.port;
+		}
 
 		this.vite = await vite.createServer(merged_config);
 		remove_html_middlewares(this.vite.middlewares);

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')}

package/dist/cli.js

@@ -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.185');
+const prog = sade('svelte-kit').version('1.0.0-next.189');
 
 prog
 	.command('dev')
@@ -847,11 +847,14 @@ prog
 				throw Error('Could not find server');
 			}
 			// we never start the server on a socket path, so address will be of type AddressInfo
-			const chosen_port = /** @type {import('net').AddressInfo} */ (
+			const address_info = /** @type {import('net').AddressInfo} */ (
 				watcher.vite.httpServer.address()
-			).port;
+			);
+
+			https = https || !!config.kit.vite().server?.https;
+			open = open || !!config.kit.vite().server?.open;
 
-			welcome({ port: chosen_port, host, https, open });
+			welcome({ port: address_info.port, host: address_info.address, https, open });
 		} catch (error) {
 			handle_error(error);
 		}
@@ -966,7 +969,7 @@ async function check_port(port) {
 function welcome({ port, host, https, open }) {
 	if (open) launch(port, https);
 
-	console.log($.bold().cyan(`\n  SvelteKit v${'1.0.0-next.185'}\n`));
+	console.log($.bold().cyan(`\n  SvelteKit v${'1.0.0-next.189'}\n`));
 
 	const protocol = https ? 'https:' : 'http:';
 	const exposed = typeof host !== 'undefined' && host !== 'localhost' && host !== '127.0.0.1';

package/dist/ssr.js

@@ -876,7 +876,10 @@ async function load_node({
 
 				// handle fetch requests for static assets. e.g. prebaked data, etc.
 				// we need to support everything the browser's fetch supports
-				const filename = resolved.replace(options.paths.assets, '').slice(1);
+				const prefix = options.paths.assets || options.paths.base;
+				const filename = (
+					resolved.startsWith(prefix) ? resolved.slice(prefix.length) : resolved
+				).slice(1);
 				const filename_html = `${filename}/index.html`; // path may also match path/index.html
 				const asset = options.manifest.assets.find(
 					(d) => d.file === filename || d.file === filename_html

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sveltejs/kit",
-  "version": "1.0.0-next.185",
+  "version": "1.0.0-next.189",
   "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.7"
+    "vite": "^2.6.10"
   },
   "devDependencies": {
     "@rollup/plugin-replace": "^3.0.0",

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[];