@sveltejs/kit 1.0.0-next.217 → 1.0.0-next.220

package/dist/chunks/index2.js

@@ -486,10 +486,6 @@ function create_manifest_data({ config, output, cwd = process.cwd() }) {
 				throw new Error(`Invalid route ${file} — brackets are unbalanced`);
 			}
 
-			if (/.+\[\.\.\.[^\]]+\]/.test(segment) || /\[\.\.\.[^\]]+\].+/.test(segment)) {
-				throw new Error(`Invalid route ${file} — rest parameter must be a standalone segment`);
-			}
-
 			const parts = get_parts(segment, file);
 			const is_index = is_dir ? false : basename.startsWith('index.');
 			const is_page = config.extensions.indexOf(ext) !== -1;
@@ -750,31 +746,37 @@ function get_parts(part, file) {
 function get_pattern(segments, add_trailing_slash) {
 	const path = segments
 		.map((segment) => {
-			return segment[0].rest
-				? '(?:\\/(.*))?'
-				: '\\/' +
-						segment
-							.map((part) => {
-								return part.dynamic
-									? '([^/]+?)'
-									: // allow users to specify characters on the file system in an encoded manner
-									  part.content
-											.normalize()
-											// We use [ and ] to denote parameters, so users must encode these on the file
-											// system to match against them. We don't decode all characters since others
-											// can already be epressed and so that '%' can be easily used directly in filenames
-											.replace(/%5[Bb]/g, '[')
-											.replace(/%5[Dd]/g, ']')
-											// '#', '/', and '?' can only appear in URL path segments in an encoded manner.
-											// They will not be touched by decodeURI so need to be encoded here, so
-											// that we can match against them.
-											// We skip '/' since you can't create a file with it on any OS
-											.replace(/#/g, '%23')
-											.replace(/\?/g, '%3F')
-											// escape characters that have special meaning in regex
-											.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
-							})
-							.join('');
+			if (segment.length === 1 && segment[0].rest) {
+				// special case — `src/routes/foo/[...bar]/baz` matches `/foo/baz`
+				// so we need to make the leading slash optional
+				return '(?:\\/(.*))?';
+			}
+
+			const parts = segment.map((part) => {
+				if (part.rest) return '(.*?)';
+				if (part.dynamic) return '([^/]+?)';
+
+				return (
+					part.content
+						// allow users to specify characters on the file system in an encoded manner
+						.normalize()
+						// We use [ and ] to denote parameters, so users must encode these on the file
+						// system to match against them. We don't decode all characters since others
+						// can already be epressed and so that '%' can be easily used directly in filenames
+						.replace(/%5[Bb]/g, '[')
+						.replace(/%5[Dd]/g, ']')
+						// '#', '/', and '?' can only appear in URL path segments in an encoded manner.
+						// They will not be touched by decodeURI so need to be encoded here, so
+						// that we can match against them.
+						// We skip '/' since you can't create a file with it on any OS
+						.replace(/#/g, '%23')
+						.replace(/\?/g, '%3F')
+						// escape characters that have special meaning in regex
+						.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')
+				);
+			});
+
+			return '\\/' + parts.join('');
 		})
 		.join('');
 

package/dist/chunks/index3.js

@@ -262,9 +262,10 @@ import { set_paths, assets, base } from './runtime/paths.js';
 import { set_prerendering } from './runtime/env.js';
 import * as user_hooks from ${s(hooks)};
 
-const template = ({ head, body }) => ${s(load_template(cwd, config))
+const template = ({ head, body, assets }) => ${s(load_template(cwd, config))
 	.replace('%svelte.head%', '" + head + "')
-	.replace('%svelte.body%', '" + body + "')};
+	.replace('%svelte.body%', '" + body + "')
+	.replace(/%svelte\.assets%/g, '" + assets + "')};
 
 let read = null;
 

package/dist/chunks/index5.js

@@ -371,7 +371,12 @@ async function prerender({ cwd, out, log, config, build_data, fallback, all }) {
 					if (element === 'a' || element === 'link') {
 						if (is_rel_external(attrs)) continue;
 
-						hrefs.push(get_href(attrs));
+						let href = get_href(attrs);
+						if (!href) continue;
+
+						const i = href.indexOf('#');
+						href = i < 0 ? href : href.substring(0, i);
+						hrefs.push(href);
 					} else {
 						if (element === 'img') {
 							hrefs.push(get_src(attrs));
@@ -470,6 +475,8 @@ function create_builder({ cwd, config, build_data, log }) {
 		mkdirp,
 		copy,
 
+		appDir: config.kit.appDir,
+
 		createEntries(fn) {
 			generated_manifest = true;
 

package/dist/chunks/index6.js

@@ -1,9 +1,9 @@
 import * as fs from 'fs';
 import fs__default, { readdirSync, statSync } from 'fs';
-import require$$2 from 'http';
-import require$$3 from 'https';
+import http from 'http';
+import https from 'https';
 import { resolve, join, normalize } from 'path';
-import * as require$$7 from 'querystring';
+import * as qs from 'querystring';
 import { pathToFileURL } from 'url';
 import { getRawBody } from '../node.js';
 import { __fetch_polyfill } from '../install-fetch.js';
@@ -16,6 +16,19 @@ import 'node:util';
 import 'node:url';
 import 'net';
 
+function totalist(dir, callback, pre='') {
+	dir = resolve('.', dir);
+	let arr = readdirSync(dir);
+	let i=0, abs, stats;
+	for (; i < arr.length; i++) {
+		abs = join(dir, arr[i]);
+		stats = statSync(abs);
+		stats.isDirectory()
+			? totalist(abs, callback, join(pre, arr[i]))
+			: callback(join(pre, arr[i]), abs, stats);
+	}
+}
+
 /**
  * @typedef ParsedURL
  * @type {import('.').ParsedURL}
@@ -47,7 +60,7 @@ function parse(req) {
 			search = raw.substring(idx);
 			pathname = raw.substring(0, idx);
 			if (search.length > 1) {
-				query = require$$7.parse(search.substring(1));
+				query = qs.parse(search.substring(1));
 			}
 		}
 	}
@@ -55,19 +68,6 @@ function parse(req) {
 	return req._parsedUrl = { pathname, search, query, raw };
 }
 
-function list(dir, callback, pre='') {
-	dir = resolve('.', dir);
-	let arr = readdirSync(dir);
-	let i=0, abs, stats;
-	for (; i < arr.length; i++) {
-		abs = join(dir, arr[i]);
-		stats = statSync(abs);
-		stats.isDirectory()
-			? list(abs, callback, join(pre, arr[i]))
-			: callback(join(pre, arr[i]), abs, stats);
-	}
-}
-
 const mimes = {
   "ez": "application/andrew-inset",
   "aw": "application/applixware",
@@ -625,7 +625,7 @@ function sirv (dir, opts={}) {
 	else if (cc && opts.maxAge === 0) cc += ',must-revalidate';
 
 	if (!opts.dev) {
-		list(dir, (name, abs, stats) => {
+		totalist(dir, (name, abs, stats) => {
 			if (/\.well-known[\\+\/]/.test(name)) ; // keep
 			else if (!opts.dotfiles && /(^\.|[\\+|\/+]\.)/.test(name)) return;
 
@@ -819,8 +819,8 @@ async function get_server(use_https, user_config, handler) {
 
 	return Promise.resolve(
 		use_https
-			? require$$3.createServer(/** @type {https.ServerOptions} */ (https_options), handler)
-			: require$$2.createServer(handler)
+			? https.createServer(/** @type {https.ServerOptions} */ (https_options), handler)
+			: http.createServer(handler)
 	);
 }