@sveltejs/kit 1.0.0-next.327 → 1.0.0-next.328

package/assets/server/index.js

@@ -3142,13 +3142,7 @@ async function respond(request, options, state) {
 
 	if (is_data_request) {
 		decoded = decoded.slice(0, -DATA_SUFFIX.length) || '/';
-
-		const normalized = normalize_path(
-			url.pathname.slice(0, -DATA_SUFFIX.length),
-			options.trailing_slash
-		);
-
-		url = new URL(url.origin + normalized + url.search);
+		url = new URL(url.origin + url.pathname.slice(0, -DATA_SUFFIX.length) + url.search);
 	}
 
 	if (!state.prerender || !state.prerender.fallback) {
@@ -3174,6 +3168,7 @@ async function respond(request, options, state) {
 			return new Response(undefined, {
 				status: 301,
 				headers: {
+					'x-sveltekit-normalize': '1',
 					location:
 						// ensure paths starting with '//' are not treated as protocol-relative
 						(normalized.startsWith('//') ? url.origin + normalized : normalized) +

package/dist/chunks/index.js

@@ -1,7 +1,7 @@
 import path__default from 'path';
 import { svelte } from '@sveltejs/vite-plugin-svelte';
 import vite from 'vite';
-import { n as normalize_path, d as deep_merge } from './url.js';
+import { d as deep_merge } from './object.js';
 import { g as get_runtime_path, r as resolve_entry, $, l as load_template, c as coalesce_to_error, a as get_mime_lookup, b as get_aliases, p as print_config_conflicts } from '../cli.js';
 import fs__default from 'fs';
 import { URL } from 'url';
@@ -216,11 +216,7 @@ async function create_plugin(config, cwd) {
 						if (req.url === '/favicon.ico') return not_found(res);
 
 						if (!decoded.startsWith(config.kit.paths.base)) {
-							const suggestion = normalize_path(
-								config.kit.paths.base + req.url,
-								config.kit.trailingSlash
-							);
-							return not_found(res, `Not found (did you mean ${suggestion}?)`);
+							return not_found(res, `Not found (did you mean ${config.kit.paths.base + req.url}?)`);
 						}
 
 						/** @type {Partial<import('types').Hooks>} */

package/dist/chunks/index2.js

@@ -6,7 +6,7 @@ import { p as print_config_conflicts, b as get_aliases, r as resolve_entry, g as
 import { g as generate_manifest } from './index3.js';
 import vite from 'vite';
 import { s } from './misc.js';
-import { n as normalize_path, d as deep_merge, r as resolve, i as is_root_relative } from './url.js';
+import { d as deep_merge } from './object.js';
 import { svelte } from '@sveltejs/vite-plugin-svelte';
 import { pathToFileURL, URL as URL$1 } from 'url';
 import { installFetch } from '../install-fetch.js';
@@ -22,6 +22,61 @@ import 'node:stream';
 import 'node:util';
 import 'node:url';
 
+const absolute = /^([a-z]+:)?\/?\//;
+const scheme = /^[a-z]+:/;
+
+/**
+ * @param {string} base
+ * @param {string} path
+ */
+function resolve(base, path) {
+	if (scheme.test(path)) return path;
+
+	const base_match = absolute.exec(base);
+	const path_match = absolute.exec(path);
+
+	if (!base_match) {
+		throw new Error(`bad base path: "${base}"`);
+	}
+
+	const baseparts = path_match ? [] : base.slice(base_match[0].length).split('/');
+	const pathparts = path_match ? path.slice(path_match[0].length).split('/') : path.split('/');
+
+	baseparts.pop();
+
+	for (let i = 0; i < pathparts.length; i += 1) {
+		const part = pathparts[i];
+		if (part === '.') continue;
+		else if (part === '..') baseparts.pop();
+		else baseparts.push(part);
+	}
+
+	const prefix = (path_match && path_match[0]) || (base_match && base_match[0]) || '';
+
+	return `${prefix}${baseparts.join('/')}`;
+}
+
+/** @param {string} path */
+function is_root_relative(path) {
+	return path[0] === '/' && path[1] !== '/';
+}
+
+/**
+ * @param {string} path
+ * @param {import('types').TrailingSlash} trailing_slash
+ */
+function normalize_path(path, trailing_slash) {
+	if (path === '/' || trailing_slash === 'ignore') return path;
+
+	if (trailing_slash === 'never') {
+		return path.endsWith('/') ? path.slice(0, -1) : path;
+	} else if (trailing_slash === 'always' && !path.endsWith('/')) {
+		return path + '/';
+	}
+
+	return path;
+}
+
 /**
  * @param {{
  *   cwd: string;
@@ -1045,7 +1100,7 @@ async function prerender({ config, entries, files, log }) {
 		}
 
 		if (is_html && !file.endsWith('.html')) {
-			return file + (config.kit.trailingSlash === 'always' ? 'index.html' : '.html');
+			return file + (file.endsWith('/') ? 'index.html' : '.html');
 		}
 
 		return file;
@@ -1120,11 +1175,8 @@ async function prerender({ config, entries, files, log }) {
 				const resolved = resolve(encoded, href);
 				if (!is_root_relative(resolved)) continue;
 
-				const parsed = new URL$1(resolved, 'http://localhost');
-
-				if (parsed.search) ;
+				const { pathname, search } = new URL$1(resolved, 'http://localhost');
 
-				const pathname = normalize_path(parsed.pathname, config.kit.trailingSlash);
 				enqueue(decoded, decodeURI(pathname), pathname);
 			}
 		}
@@ -1154,28 +1206,29 @@ async function prerender({ config, entries, files, log }) {
 			const location = response.headers.get('location');
 
 			if (location) {
-				mkdirp(dirname(dest));
-
-				log.warn(`${response.status} ${decoded} -> ${location}`);
-
-				writeFileSync(
-					dest,
-					`<meta http-equiv="refresh" content=${escape_html_attr(`0;url=${location}`)}>`
-				);
-
-				let resolved = resolve(encoded, location);
+				const resolved = resolve(encoded, location);
 				if (is_root_relative(resolved)) {
-					resolved = normalize_path(resolved, config.kit.trailingSlash);
 					enqueue(decoded, decodeURI(resolved), resolved);
 				}
 
-				if (!prerendered.redirects.has(decoded)) {
-					prerendered.redirects.set(decoded, {
-						status: response.status,
-						location: resolved
-					});
+				if (!response.headers.get('x-sveltekit-normalize')) {
+					mkdirp(dirname(dest));
 
-					prerendered.paths.push(normalize_path(decoded, 'never'));
+					log.warn(`${response.status} ${decoded} -> ${location}`);
+
+					writeFileSync(
+						dest,
+						`<meta http-equiv="refresh" content=${escape_html_attr(`0;url=${location}`)}>`
+					);
+
+					if (!prerendered.redirects.has(decoded)) {
+						prerendered.redirects.set(decoded, {
+							status: response.status,
+							location: resolved
+						});
+
+						prerendered.paths.push(normalize_path(decoded, 'never'));
+					}
 				}
 			} else {
 				log.warn(`location header missing on redirect received from ${decoded}`);
@@ -1210,10 +1263,10 @@ async function prerender({ config, entries, files, log }) {
 		for (const entry of config.kit.prerender.entries) {
 			if (entry === '*') {
 				for (const entry of entries) {
-					enqueue(null, normalize_path(config.kit.paths.base + entry, config.kit.trailingSlash)); // TODO can we pre-normalize these?
+					enqueue(null, config.kit.paths.base + entry); // TODO can we pre-normalize these?
 				}
 			} else {
-				enqueue(null, normalize_path(config.kit.paths.base + entry, config.kit.trailingSlash));
+				enqueue(null, config.kit.paths.base + entry);
 			}
 		}
 

package/dist/chunks/index5.js

@@ -79,6 +79,18 @@ async function preview({ port, host, config, https: use_https = false }) {
 			})
 		),
 
+		(req, res, next) => {
+			const original_url = /** @type {string} */ (req.url);
+			const { pathname } = new URL(original_url, 'http://dummy');
+
+			if (pathname.startsWith(base)) {
+				next();
+			} else {
+				res.statusCode = 404;
+				res.end(`Not found (did you mean ${base + pathname}?)`);
+			}
+		},
+
 		// prerendered dependencies
 		scoped(base, mutable(join(config.kit.outDir, 'output/prerendered/dependencies'))),
 

package/dist/chunks/{url.js → object.js}

@@ -80,59 +80,4 @@ function merge_into(a, b, conflicts = [], path = []) {
 	}
 }
 
-const absolute = /^([a-z]+:)?\/?\//;
-const scheme = /^[a-z]+:/;
-
-/**
- * @param {string} base
- * @param {string} path
- */
-function resolve(base, path) {
-	if (scheme.test(path)) return path;
-
-	const base_match = absolute.exec(base);
-	const path_match = absolute.exec(path);
-
-	if (!base_match) {
-		throw new Error(`bad base path: "${base}"`);
-	}
-
-	const baseparts = path_match ? [] : base.slice(base_match[0].length).split('/');
-	const pathparts = path_match ? path.slice(path_match[0].length).split('/') : path.split('/');
-
-	baseparts.pop();
-
-	for (let i = 0; i < pathparts.length; i += 1) {
-		const part = pathparts[i];
-		if (part === '.') continue;
-		else if (part === '..') baseparts.pop();
-		else baseparts.push(part);
-	}
-
-	const prefix = (path_match && path_match[0]) || (base_match && base_match[0]) || '';
-
-	return `${prefix}${baseparts.join('/')}`;
-}
-
-/** @param {string} path */
-function is_root_relative(path) {
-	return path[0] === '/' && path[1] !== '/';
-}
-
-/**
- * @param {string} path
- * @param {import('types').TrailingSlash} trailing_slash
- */
-function normalize_path(path, trailing_slash) {
-	if (path === '/' || trailing_slash === 'ignore') return path;
-
-	if (trailing_slash === 'never') {
-		return path.endsWith('/') ? path.slice(0, -1) : path;
-	} else if (trailing_slash === 'always' && !path.endsWith('/')) {
-		return path + '/';
-	}
-
-	return path;
-}
-
-export { deep_merge as d, is_root_relative as i, normalize_path as n, resolve as r };
+export { deep_merge as d };

package/dist/cli.js

@@ -870,7 +870,7 @@ async function launch(port, https, base) {
 	exec(`${cmd} ${https ? 'https' : 'http'}://localhost:${port}${base}`);
 }
 
-const prog = sade('svelte-kit').version('1.0.0-next.327');
+const prog = sade('svelte-kit').version('1.0.0-next.328');
 
 prog
 	.command('dev')
@@ -1049,7 +1049,7 @@ async function check_port(port) {
 function welcome({ port, host, https, open, base, loose, allow, cwd }) {
 	if (open) launch(port, https, base);
 
-	console.log($.bold().cyan(`\n  SvelteKit v${'1.0.0-next.327'}\n`));
+	console.log($.bold().cyan(`\n  SvelteKit v${'1.0.0-next.328'}\n`));
 
 	const protocol = https ? 'https:' : 'http:';
 	const exposed = typeof host !== 'undefined' && host !== 'localhost' && host !== '127.0.0.1';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sveltejs/kit",
-  "version": "1.0.0-next.327",
+  "version": "1.0.0-next.328",
   "repository": {
     "type": "git",
     "url": "https://github.com/sveltejs/kit",