@sveltejs/kit 1.0.0-next.203 → 1.0.0-next.208

package/dist/chunks/index.js

@@ -12,7 +12,7 @@ import require$$0$3 from 'domain';
 import 'querystring';
 import require$$10 from 'vm';
 import CheapWatch from 'cheap-watch';
-import { r as rimraf, c as copy_assets, p as print_config_conflicts, a as resolve_entry, $ } from '../cli.js';
+import { r as rimraf, c as copy_assets, p as print_config_conflicts, g as get_mime_lookup, a as resolve_entry, $ } from '../cli.js';
 import vite from 'vite';
 import { respond } from '../ssr.js';
 import { d as deep_merge, c as create_manifest_data, a as create_app } from './index2.js';
@@ -23,6 +23,7 @@ import { c as coalesce_to_error } from './error.js';
 import 'sade';
 import 'net';
 import './url.js';
+import './misc.js';
 import 'node:http';
 import 'node:https';
 import 'node:zlib';
@@ -4277,7 +4278,7 @@ class Watcher extends EventEmitter {
 				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, SVELTE_KIT),
 				path__default.resolve(this.cwd, 'node_modules'),
 				path__default.resolve(vite.searchForWorkspaceRoot(this.cwd), 'node_modules')
 			])
@@ -4302,7 +4303,7 @@ class Watcher extends EventEmitter {
 		// don't warn on overriding defaults
 		const [modified_vite_config] = deep_merge(default_config, vite_config);
 
-		const kit_plugin = await create_plugin(this.config, this.dir, this.cwd, () => {
+		const kit_plugin = await create_plugin(this.config, this.dir, this.https, () => {
 			if (!this.manifest) {
 				throw new Error('Manifest is not available');
 			}
@@ -4358,7 +4359,6 @@ class Watcher extends EventEmitter {
 		}
 
 		this.vite = await vite.createServer(merged_config);
-		remove_html_middlewares(this.vite.middlewares);
 		await this.vite.listen(this.port);
 	}
 
@@ -4375,33 +4375,85 @@ class Watcher extends EventEmitter {
 			cwd: this.cwd
 		});
 
-		/** @type {import('types/internal').SSRManifest} */
+		/** @type {import('types/app').SSRManifest} */
 		this.manifest = {
-			assets: manifest_data.assets,
-			layout: manifest_data.layout,
-			error: manifest_data.error,
-			routes: manifest_data.routes.map((route) => {
-				if (route.type === 'page') {
+			appDir: this.config.kit.appDir,
+			assets: new Set(manifest_data.assets.map((asset) => asset.file)),
+			_: {
+				mime: get_mime_lookup(manifest_data),
+				entry: {
+					file: `/${SVELTE_KIT}/dev/runtime/internal/start.js`,
+					css: [],
+					js: []
+				},
+				nodes: manifest_data.components.map((id) => {
+					return async () => {
+						const url = `/${id}`;
+
+						if (!this.vite) throw new Error('Vite server has not been initialized');
+
+						const module = /** @type {SSRComponent} */ (await this.vite.ssrLoadModule(url));
+						const node = await this.vite.moduleGraph.getModuleByUrl(url);
+
+						if (!node) throw new Error(`Could not find node for ${url}`);
+
+						const deps = new Set();
+						find_deps(node, deps);
+
+						const styles = new Set();
+
+						for (const dep of deps) {
+							const parsed = new URL(dep.url, 'http://localhost/');
+							const query = parsed.searchParams;
+
+							// TODO what about .scss files, etc?
+							if (
+								dep.file.endsWith('.css') ||
+								(query.has('svelte') && query.get('type') === 'style')
+							) {
+								try {
+									const mod = await this.vite.ssrLoadModule(dep.url);
+									styles.add(mod.default);
+								} catch {
+									// this can happen with dynamically imported modules, I think
+									// because the Vite module graph doesn't distinguish between
+									// static and dynamic imports? TODO investigate, submit fix
+								}
+							}
+						}
+
+						return {
+							module,
+							entry: url.endsWith('.svelte') ? url : url + '?import',
+							css: [],
+							js: [],
+							styles: Array.from(styles)
+						};
+					};
+				}),
+				routes: manifest_data.routes.map((route) => {
+					if (route.type === 'page') {
+						return {
+							type: 'page',
+							pattern: route.pattern,
+							params: get_params(route.params),
+							a: route.a.map((id) => manifest_data.components.indexOf(id)),
+							b: route.b.map((id) => manifest_data.components.indexOf(id))
+						};
+					}
+
 					return {
-						type: 'page',
+						type: 'endpoint',
 						pattern: route.pattern,
 						params: get_params(route.params),
-						a: route.a,
-						b: route.b
+						load: async () => {
+							if (!this.vite) throw new Error('Vite server has not been initialized');
+							const url = path__default.resolve(this.cwd, route.file);
+							return await this.vite.ssrLoadModule(url);
+						}
 					};
-				}
-
-				return {
-					type: 'endpoint',
-					pattern: route.pattern,
-					params: get_params(route.params),
-					load: async () => {
-						if (!this.vite) throw new Error('Vite server has not been initialized');
-						const url = path__default.resolve(this.cwd, route.file);
-						return await this.vite.ssrLoadModule(url);
-					}
-				};
-			})
+				})
+			}
 		};
 	}
 
@@ -4424,31 +4476,15 @@ function get_params(array) {
 	// src/routes/[x]/[y]/[z]/svelte, create a function
 	// that turns a RegExpExecArray into ({ x, y, z })
 
-	// input has already been decoded by decodeURI
-	// now handle the rest that decodeURIComponent would do
-	const d = /** @param {string} s */ (s) =>
-		s
-			.replace(/%23/g, '#')
-			.replace(/%3[Bb]/g, ';')
-			.replace(/%2[Cc]/g, ',')
-			.replace(/%2[Ff]/g, '/')
-			.replace(/%3[Ff]/g, '?')
-			.replace(/%3[Aa]/g, ':')
-			.replace(/%40/g, '@')
-			.replace(/%26/g, '&')
-			.replace(/%3[Dd]/g, '=')
-			.replace(/%2[Bb]/g, '+')
-			.replace(/%24/g, '$');
-
 	/** @param {RegExpExecArray} match */
 	const fn = (match) => {
 		/** @type {Record<string, string>} */
 		const params = {};
 		array.forEach((key, i) => {
 			if (key.startsWith('...')) {
-				params[key.slice(3)] = d(match[i + 1] || '');
+				params[key.slice(3)] = match[i + 1] || '';
 			} else {
-				params[key] = d(match[i + 1]);
+				params[key] = match[i + 1];
 			}
 		});
 		return params;
@@ -4460,28 +4496,15 @@ function get_params(array) {
 /**
  * @param {import('types/config').ValidatedConfig} config
  * @param {string} dir
- * @param {string} cwd
- * @param {() => import('types/internal').SSRManifest} get_manifest
+ * @param {boolean} https
+ * @param {() => import('types/app').SSRManifest} get_manifest
  */
-async function create_plugin(config, dir, cwd, get_manifest) {
+async function create_plugin(config, dir, https, get_manifest) {
 	/**
 	 * @type {amp_validator.Validator?}
 	 */
 	const validator = config.kit.amp ? await amphtmlValidator.getInstance() : null;
 
-	/**
-	 * @param {import('vite').ModuleNode} node
-	 * @param {Set<import('vite').ModuleNode>} deps
-	 */
-	const find_deps = (node, deps) => {
-		for (const dep of node.importedModules) {
-			if (!deps.has(dep)) {
-				deps.add(dep);
-				find_deps(dep, deps);
-			}
-		}
-	};
-
 	/**
 	 * @param {vite.ViteDevServer} vite
 	 */
@@ -4551,27 +4574,16 @@ async function create_plugin(config, dir, cwd, get_manifest) {
 					return res.end(err.reason || 'Invalid request body');
 				}
 
-				const host = /** @type {string} */ (
-					config.kit.host || req.headers[config.kit.hostHeader || 'host']
-				);
-
 				const rendered = await respond(
 					{
+						url: new URL(`${https ? 'https' : 'http'}://${req.headers.host}${req.url}`),
 						headers: /** @type {import('types/helper').RequestHeaders} */ (req.headers),
 						method: req.method,
-						host,
-						path: parsed.pathname.replace(config.kit.paths.base, ''),
-						query: parsed.searchParams,
 						rawBody: body
 					},
 					{
 						amp: config.kit.amp,
 						dev: true,
-						entry: {
-							file: `/${SVELTE_KIT}/dev/runtime/internal/start.js`,
-							css: [],
-							js: []
-						},
 						floc: config.kit.floc,
 						get_stack: (error) => {
 							vite.ssrFixStacktrace(error);
@@ -4583,52 +4595,12 @@ async function create_plugin(config, dir, cwd, get_manifest) {
 						},
 						hooks,
 						hydrate: config.kit.hydrate,
+						manifest: get_manifest(),
 						paths: {
 							base: config.kit.paths.base,
 							assets: config.kit.paths.assets ? SVELTE_KIT_ASSETS : config.kit.paths.base
 						},
-						load_component: async (id) => {
-							const url = `/${id}`;
-
-							const module = /** @type {SSRComponent} */ (await vite.ssrLoadModule(url));
-							const node = await vite.moduleGraph.getModuleByUrl(url);
-
-							if (!node) throw new Error(`Could not find node for ${url}`);
-
-							const deps = new Set();
-							find_deps(node, deps);
-
-							const styles = new Set();
-
-							for (const dep of deps) {
-								const parsed = new URL(dep.url, 'http://localhost/');
-								const query = parsed.searchParams;
-
-								// TODO what about .scss files, etc?
-								if (
-									dep.file.endsWith('.css') ||
-									(query.has('svelte') && query.get('type') === 'style')
-								) {
-									try {
-										const mod = await vite.ssrLoadModule(dep.url);
-										styles.add(mod.default);
-									} catch {
-										// this can happen with dynamically imported modules, I think
-										// because the Vite module graph doesn't distinguish between
-										// static and dynamic imports? TODO investigate, submit fix
-									}
-								}
-							}
-
-							return {
-								module,
-								entry: url.endsWith('.svelte') ? url : url + '?import',
-								css: [],
-								js: [],
-								styles: Array.from(styles)
-							};
-						},
-						manifest: get_manifest(),
+						prefix: '',
 						prerender: config.kit.prerender.enabled,
 						read: (file) => fs__default.readFileSync(path__default.join(config.kit.files.assets, file)),
 						root,
@@ -4714,6 +4686,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));
 			};
 		}
@@ -4743,4 +4716,17 @@ function remove_html_middlewares(server) {
 	}
 }
 
+/**
+ * @param {import('vite').ModuleNode} node
+ * @param {Set<import('vite').ModuleNode>} deps
+ */
+function find_deps(node, deps) {
+	for (const dep of node.importedModules) {
+		if (!deps.has(dep)) {
+			deps.add(dep);
+			find_deps(dep, deps);
+		}
+	}
+}
+
 export { dev };

package/dist/chunks/index2.js

@@ -1,5 +1,6 @@
 import fs__default from 'fs';
 import path__default from 'path';
+import { s } from './misc.js';
 import { m as mkdirp, b as posixify } from '../cli.js';
 
 /**
@@ -99,8 +100,6 @@ function write_if_changed(file, code) {
 	}
 }
 
-const s = JSON.stringify;
-
 /** @typedef {import('types/internal').ManifestData} ManifestData */
 
 /**
@@ -212,11 +211,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();
@@ -391,7 +392,7 @@ var mime = new Mime(standard, other);
  * @typedef {{
  *   content: string;
  *   dynamic: boolean;
- *   spread: boolean;
+ *   rest: boolean;
  * }} Part
  * @typedef {{
  *   basename: string;
@@ -519,13 +520,13 @@ function create_manifest_data({ config, output, cwd = process.cwd() }) {
 						if (last_part.dynamic) {
 							last_segment.push({
 								dynamic: false,
-								spread: false,
+								rest: false,
 								content: item.route_suffix
 							});
 						} else {
 							last_segment[last_segment.length - 1] = {
 								dynamic: false,
-								spread: false,
+								rest: false,
 								content: `${last_part.content}${item.route_suffix}`
 							};
 						}
@@ -542,6 +543,18 @@ function create_manifest_data({ config, output, cwd = process.cwd() }) {
 			const params = parent_params.slice();
 			params.push(...item.parts.filter((p) => p.dynamic).map((p) => p.content));
 
+			// TODO seems slightly backwards to derive the simple segment representation
+			// from the more complex form, rather than vice versa — maybe swap it round
+			const simple_segments = segments.map((segment) => {
+				return {
+					dynamic: segment.some((part) => part.dynamic),
+					rest: segment.some((part) => part.rest),
+					content: segment
+						.map((part) => (part.dynamic ? `[${part.content}]` : part.content))
+						.join('')
+				};
+			});
+
 			if (item.is_dir) {
 				const layout_reset = find_layout('__layout.reset', item.file);
 				const layout = find_layout('__layout', item.file);
@@ -591,6 +604,7 @@ function create_manifest_data({ config, output, cwd = process.cwd() }) {
 
 				routes.push({
 					type: 'page',
+					segments: simple_segments,
 					pattern,
 					params,
 					path,
@@ -602,6 +616,7 @@ function create_manifest_data({ config, output, cwd = process.cwd() }) {
 
 				routes.push({
 					type: 'endpoint',
+					segments: simple_segments,
 					pattern,
 					file: item.file,
 					params
@@ -670,14 +685,13 @@ 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, order later
-		if (a_sub_part.spread && b_sub_part.spread) {
+		if (a_sub_part.rest && b_sub_part.rest) {
 			// sort alphabetically
 			return a_sub_part.content < b_sub_part.content ? -1 : 1;
 		}
 
-		// If one is ...spread order it later
-		if (a_sub_part.spread !== b_sub_part.spread) return a_sub_part.spread ? 1 : -1;
+		// If one is ...rest order it later
+		if (a_sub_part.rest !== b_sub_part.rest) return a_sub_part.rest ? 1 : -1;
 
 		if (a_sub_part.dynamic !== b_sub_part.dynamic) {
 			return a_sub_part.dynamic ? 1 : -1;
@@ -719,7 +733,7 @@ function get_parts(part, file) {
 		result.push({
 			content,
 			dynamic,
-			spread: dynamic && /^\.{3}.+$/.test(content)
+			rest: dynamic && /^\.{3}.+$/.test(content)
 		});
 	});
 
@@ -733,7 +747,7 @@ function get_parts(part, file) {
 function get_pattern(segments, add_trailing_slash) {
 	const path = segments
 		.map((segment) => {
-			return segment[0].spread
+			return segment[0].rest
 				? '(?:\\/(.*))?'
 				: '\\/' +
 						segment