@sveltejs/kit 1.0.0-next.202 → 1.0.0-next.206

package/assets/runtime/internal/start.js

@@ -99,7 +99,7 @@ class Router {
 			}, 200);
 		});
 
-		/** @param {MouseEvent|TouchEvent} event */
+		/** @param {Event} event */
 		const trigger_prefetch = (event) => {
 			const a = find_anchor(event);
 			if (a && a.href && a.hasAttribute('sveltekit:prefetch')) {
@@ -114,12 +114,17 @@ class Router {
 		const handle_mousemove = (event) => {
 			clearTimeout(mousemove_timeout);
 			mousemove_timeout = setTimeout(() => {
-				trigger_prefetch(event);
+				// event.composedPath(), which is used in find_anchor, will be empty if the event is read in a timeout
+				// add a layer of indirection to address that
+				event.target?.dispatchEvent(
+					new CustomEvent('sveltekit:trigger_prefetch', { bubbles: true })
+				);
 			}, 20);
 		};
 
 		addEventListener('touchstart', trigger_prefetch);
 		addEventListener('mousemove', handle_mousemove);
+		addEventListener('sveltekit:trigger_prefetch', trigger_prefetch);
 
 		/** @param {MouseEvent} event */
 		addEventListener('click', (event) => {

package/dist/chunks/index.js

@@ -4358,7 +4358,6 @@ class Watcher extends EventEmitter {
 		}
 
 		this.vite = await vite.createServer(merged_config);
-		remove_html_middlewares(this.vite.middlewares);
 		await this.vite.listen(this.port);
 	}
 
@@ -4714,6 +4713,7 @@ async function create_plugin(config, dir, cwd, get_manifest) {
 		 */
 		configureServer(vite) {
 			return () => {
+				remove_html_middlewares(vite.middlewares);
 				vite.middlewares.use(create_kit_middleware(vite));
 			};
 		}

package/dist/chunks/index2.js

@@ -212,11 +212,13 @@ function generate_app(manifest_data) {
 
 	while (l--) {
 		pyramid = `
-			<svelte:component this={components[${l}]} {...(props_${l} || {})}>
-				{#if components[${l + 1}]}
+			{#if components[${l + 1}]}
+				<svelte:component this={components[${l}]} {...(props_${l} || {})}>				
 					${pyramid.replace(/\n/g, '\n\t\t\t\t\t')}
-				{/if}
-			</svelte:component>
+				</svelte:component>
+			{:else}
+				<svelte:component this={components[${l}]} {...(props_${l} || {})} />
+			{/if}
 		`
 			.replace(/^\t\t\t/gm, '')
 			.trim();
@@ -498,7 +500,7 @@ function create_manifest_data({ config, output, cwd = process.cwd() }) {
 				basename,
 				ext,
 				parts,
-				file: posixify(file),
+				file,
 				is_dir,
 				is_index,
 				is_page,
@@ -670,9 +672,10 @@ function comparator(a, b) {
 		if (!a_sub_part) return 1; // b is more specific, so goes first
 		if (!b_sub_part) return -1;
 
-		// if spread && index, order later
+		// if spread, order later
 		if (a_sub_part.spread && b_sub_part.spread) {
-			return a.is_index ? 1 : -1;
+			// sort alphabetically
+			return a_sub_part.content < b_sub_part.content ? -1 : 1;
 		}
 
 		// If one is ...spread order it later

package/dist/chunks/index4.js

@@ -17,6 +17,85 @@ import 'node:stream';
 import 'node:util';
 import 'node:url';
 
+/** @typedef {{
+ *   fn: () => Promise<any>,
+ *   fulfil: (value: any) => void,
+ *   reject: (error: Error) => void
+ * }} Task */
+
+/** @param {number} concurrency */
+function queue(concurrency) {
+	/** @type {Task[]} */
+	const tasks = [];
+
+	let current = 0;
+
+	/** @type {(value?: any) => void} */
+	let fulfil;
+
+	/** @type {(error: Error) => void} */
+	let reject;
+
+	let closed = false;
+
+	const done = new Promise((f, r) => {
+		fulfil = f;
+		reject = r;
+	});
+
+	done.catch(() => {
+		// this is necessary in case a catch handler is never added
+		// to the done promise by the user
+	});
+
+	function dequeue() {
+		if (current < concurrency) {
+			const task = tasks.shift();
+
+			if (task) {
+				current += 1;
+				const promise = Promise.resolve(task.fn());
+
+				promise
+					.then(task.fulfil, (err) => {
+						task.reject(err);
+						reject(err);
+					})
+					.then(() => {
+						current -= 1;
+						dequeue();
+					});
+			} else if (current === 0) {
+				closed = true;
+				fulfil();
+			}
+		}
+	}
+
+	return {
+		/** @param {() => any} fn */
+		add: (fn) => {
+			if (closed) throw new Error('Cannot add tasks to a queue that has ended');
+
+			const promise = new Promise((fulfil, reject) => {
+				tasks.push({ fn, fulfil, reject });
+			});
+
+			dequeue();
+			return promise;
+		},
+
+		done: () => {
+			if (current === 0) {
+				closed = true;
+				fulfil();
+			}
+
+			return done;
+		}
+	};
+}
+
 /**
  * @typedef {import('types/config').PrerenderErrorHandler} PrerenderErrorHandler
  * @typedef {import('types/config').PrerenderOnErrorValue} OnError
@@ -151,16 +230,27 @@ async function prerender({ cwd, out, log, config, build_data, fallback, all }) {
 		return path;
 	}
 
+	const q = queue(config.kit.prerender.concurrency);
+
 	/**
 	 * @param {string} decoded_path
 	 * @param {string?} referrer
 	 */
-	async function visit(decoded_path, referrer) {
+	function enqueue(decoded_path, referrer) {
 		const path = encodeURI(normalize(decoded_path));
 
 		if (seen.has(path)) return;
 		seen.add(path);
 
+		return q.add(() => visit(path, decoded_path, referrer));
+	}
+
+	/**
+	 * @param {string} path
+	 * @param {string} decoded_path
+	 * @param {string?} referrer
+	 */
+	async function visit(path, decoded_path, referrer) {
 		/** @type {Map<string, import('types/hooks').ServerResponse>} */
 		const dependencies = new Map();
 
@@ -205,7 +295,7 @@ async function prerender({ cwd, out, log, config, build_data, fallback, all }) {
 
 					const resolved = resolve$1(path, location);
 					if (is_root_relative(resolved)) {
-						await visit(resolved, path);
+						enqueue(resolved, path);
 					}
 				} else {
 					log.warn(`location header missing on redirect received from ${decoded_path}`);
@@ -290,7 +380,7 @@ async function prerender({ cwd, out, log, config, build_data, fallback, all }) {
 
 					if (parsed.search) ;
 
-					await visit(pathname, path);
+					enqueue(pathname, path);
 				}
 			}
 		}
@@ -300,12 +390,14 @@ async function prerender({ cwd, out, log, config, build_data, fallback, all }) {
 		for (const entry of config.kit.prerender.entries) {
 			if (entry === '*') {
 				for (const entry of build_data.entries) {
-					await visit(entry, null);
+					enqueue(entry, null);
 				}
 			} else {
-				await visit(entry, null);
+				enqueue(entry, null);
 			}
 		}
+
+		await q.done();
 	}
 
 	if (fallback) {

package/dist/cli.js

@@ -471,6 +471,7 @@ const options = object(
 			}),
 
 			prerender: object({
+				concurrency: number(1),
 				crawl: boolean(true),
 				enabled: boolean(true),
 				entries: validate(['*'], (input, keypath) => {
@@ -617,6 +618,19 @@ function string(fallback, allow_empty = true) {
 	});
 }
 
+/**
+ * @param {number} fallback
+ * @returns {Validator}
+ */
+function number(fallback) {
+	return validate(fallback, (input, keypath) => {
+		if (typeof input !== 'number') {
+			throw new Error(`${keypath} should be a number, if specified`);
+		}
+		return input;
+	});
+}
+
 /**
  * @param {boolean} fallback
  * @returns {Validator}
@@ -822,7 +836,7 @@ async function launch(port, https) {
 	exec(`${cmd} ${https ? 'https' : 'http'}://localhost:${port}`);
 }
 
-const prog = sade('svelte-kit').version('1.0.0-next.202');
+const prog = sade('svelte-kit').version('1.0.0-next.206');
 
 prog
 	.command('dev')
@@ -987,7 +1001,7 @@ async function check_port(port) {
 function welcome({ port, host, https, open, loose, allow, cwd }) {
 	if (open) launch(port, https);
 
-	console.log($.bold().cyan(`\n  SvelteKit v${'1.0.0-next.202'}\n`));
+	console.log($.bold().cyan(`\n  SvelteKit v${'1.0.0-next.206'}\n`));
 
 	const protocol = https ? 'https:' : 'http:';
 	const exposed = typeof host !== 'undefined' && host !== 'localhost' && host !== '127.0.0.1';

package/dist/ssr.js

@@ -627,10 +627,8 @@ async function render_response({
 		</script>`;
 	}
 
-	if (options.service_worker) {
-		init += options.amp
-			? `<amp-install-serviceworker src="${options.service_worker}" layout="nodisplay"></amp-install-serviceworker>`
-			: `<script>
+	if (options.service_worker && !options.amp) {
+		init += `<script>
 			if ('serviceWorker' in navigator) {
 				navigator.serviceWorker.register('${options.service_worker}');
 			}
@@ -646,21 +644,23 @@ async function render_response({
 		init
 	].join('\n\n\t\t');
 
-	const body = options.amp
-		? rendered.html
-		: `${rendered.html}
-
-			${serialized_data
-				.map(({ url, body, json }) => {
-					let attributes = `type="application/json" data-type="svelte-data" data-url=${escape_html_attr(
-						url
-					)}`;
-					if (body) attributes += ` data-body="${hash(body)}"`;
-
-					return `<script ${attributes}>${json}</script>`;
-				})
-				.join('\n\n\t')}
-		`;
+	let body = rendered.html;
+	if (options.amp) {
+		if (options.service_worker) {
+			body += `<amp-install-serviceworker src="${options.service_worker}" layout="nodisplay"></amp-install-serviceworker>`;
+		}
+	} else {
+		body += serialized_data
+			.map(({ url, body, json }) => {
+				let attributes = `type="application/json" data-type="svelte-data" data-url=${escape_html_attr(
+					url
+				)}`;
+				if (body) attributes += ` data-body="${hash(body)}"`;
+
+				return `<script ${attributes}>${json}</script>`;
+			})
+			.join('\n\n\t');
+	}
 
 	/** @type {import('types/helper').ResponseHeaders} */
 	const headers = {
@@ -875,6 +875,8 @@ async function load_node({
 					};
 				}
 
+				opts.headers = new Headers(opts.headers);
+
 				const resolved = resolve(request.path, url.split('?')[0]);
 
 				let response;
@@ -903,18 +905,16 @@ async function load_node({
 				} else if (is_root_relative(resolved)) {
 					const relative = resolved;
 
-					const headers = /** @type {import('types/helper').RequestHeaders} */ ({
-						...opts.headers
-					});
-
 					// TODO: fix type https://github.com/node-fetch/node-fetch/issues/1113
 					if (opts.credentials !== 'omit') {
 						uses_credentials = true;
 
-						headers.cookie = request.headers.cookie;
+						if (request.headers.cookie) {
+							opts.headers.set('cookie', request.headers.cookie);
+						}
 
-						if (!headers.authorization) {
-							headers.authorization = request.headers.authorization;
+						if (request.headers.authorization && !opts.headers.has('authorization')) {
+							opts.headers.set('authorization', request.headers.authorization);
 						}
 					}
 
@@ -932,7 +932,7 @@ async function load_node({
 						{
 							host: request.host,
 							method: opts.method || 'GET',
-							headers,
+							headers: Object.fromEntries(opts.headers),
 							path: relative,
 							rawBody: opts.body == null ? null : new TextEncoder().encode(opts.body),
 							query: new URLSearchParams(search)
@@ -981,11 +981,7 @@ async function load_node({
 							opts.credentials !== 'omit'
 						) {
 							uses_credentials = true;
-
-							opts.headers = {
-								...opts.headers,
-								cookie: request.headers.cookie
-							};
+							opts.headers.set('cookie', request.headers.cookie);
 						}
 					}
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sveltejs/kit",
-  "version": "1.0.0-next.202",
+  "version": "1.0.0-next.206",
   "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.30",
+    "@sveltejs/vite-plugin-svelte": "^1.0.0-next.32",
     "cheap-watch": "^1.0.4",
     "sade": "^1.7.4",
     "vite": "^2.7.2"
@@ -87,5 +87,6 @@
     "test:unit": "uvu src \"(spec\\.js|test[\\\\/]index\\.js)\" -i packaging",
     "test:packaging": "uvu src/packaging \"(spec\\.js|test[\\\\/]index\\.js)\"",
     "test:integration": "uvu test test.js"
-  }
+  },
+  "readme": "# The fastest way to build Svelte apps\n\nThis is the [SvelteKit](https://kit.svelte.dev) framework and CLI.\n\nThe quickest way to get started is via the [create-svelte](https://github.com/sveltejs/kit/tree/master/packages/create-svelte) package:\n\n```bash\nnpm init svelte@next my-app\ncd my-app\nnpm install\nnpm run dev\n```\n\nSee the [documentation](https://kit.svelte.dev/docs) to learn more.\n\n## Changelog\n\n[The Changelog for this package is available on GitHub](https://github.com/sveltejs/kit/blob/master/packages/kit/CHANGELOG.md).\n"
 }

package/types/config.d.ts

@@ -76,6 +76,7 @@ export interface Config {
 			base?: string;
 		};
 		prerender?: {
+			concurrency?: number;
 			crawl?: boolean;
 			enabled?: boolean;
 			entries?: string[];