@sveltejs/kit 1.0.0-next.321 → 1.0.0-next.324

package/assets/client/start.js

@@ -112,7 +112,7 @@ function normalize_path(path, trailing_slash) {
 
 	if (trailing_slash === 'never') {
 		return path.endsWith('/') ? path.slice(0, -1) : path;
-	} else if (trailing_slash === 'always' && /\/[^./]+$/.test(path)) {
+	} else if (trailing_slash === 'always' && !path.endsWith('/')) {
 		return path + '/';
 	}
 

package/assets/server/index.js

@@ -2045,7 +2045,7 @@ function normalize_path(path, trailing_slash) {
 
 	if (trailing_slash === 'never') {
 		return path.endsWith('/') ? path.slice(0, -1) : path;
-	} else if (trailing_slash === 'always' && /\/[^./]+$/.test(path)) {
+	} else if (trailing_slash === 'always' && !path.endsWith('/')) {
 		return path + '/';
 	}
 
@@ -2792,7 +2792,7 @@ async function respond$1(opts) {
 
 	let stuff = {};
 
-	ssr: if (resolve_opts.ssr) {
+	ssr: {
 		for (let i = 0; i < nodes.length; i += 1) {
 			const node = nodes[i];
 
@@ -3098,20 +3098,6 @@ const default_transform = ({ html }) => html;
 async function respond(request, options, state) {
 	let url = new URL(request.url);
 
-	const normalized = normalize_path(url.pathname, options.trailing_slash);
-
-	if (normalized !== url.pathname && !state.prerender?.fallback) {
-		return new Response(undefined, {
-			status: 301,
-			headers: {
-				location:
-					// ensure paths starting with '//' are not treated as protocol-relative
-					(normalized.startsWith('//') ? url.origin + normalized : normalized) +
-					(url.search === '?' ? '' : url.search)
-			}
-		});
-	}
-
 	const { parameter, allowed } = options.method_override;
 	const method_override = url.searchParams.get(parameter)?.toUpperCase();
 
@@ -3181,6 +3167,22 @@ async function respond(request, options, state) {
 		}
 	}
 
+	if (route?.type === 'page') {
+		const normalized = normalize_path(url.pathname, options.trailing_slash);
+
+		if (normalized !== url.pathname && !state.prerender?.fallback) {
+			return new Response(undefined, {
+				status: 301,
+				headers: {
+					location:
+						// ensure paths starting with '//' are not treated as protocol-relative
+						(normalized.startsWith('//') ? url.origin + normalized : normalized) +
+						(url.search === '?' ? '' : url.search)
+				}
+			});
+		}
+	}
+
 	/** @type {import('types').RequestEvent} */
 	const event = {
 		get clientAddress() {

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 { d as deep_merge } from './object.js';
+import { n as normalize_path, d as deep_merge } from './url.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';
@@ -12,7 +12,6 @@ import { getRequest, setResponse } from '../node.js';
 import { sequence } from '../hooks.js';
 import { p as posixify } from './filesystem.js';
 import { p as parse_route_id } from './misc.js';
-import { n as normalize_path } from './url.js';
 import 'sade';
 import 'child_process';
 import 'net';

package/dist/chunks/index2.js

@@ -6,8 +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 { d as deep_merge } from './object.js';
-import { n as normalize_path, r as resolve, i as is_root_relative } from './url.js';
+import { n as normalize_path, d as deep_merge, r as resolve, i as is_root_relative } from './url.js';
 import { svelte } from '@sveltejs/vite-plugin-svelte';
 import { pathToFileURL, URL as URL$1 } from 'url';
 import { installFetch } from '../install-fetch.js';
@@ -39,16 +38,12 @@ async function build_service_worker(
 	prerendered,
 	client_manifest
 ) {
-	// TODO add any assets referenced in template .html file, e.g. favicon?
-	const app_files = new Set();
+	const build = new Set();
 	for (const key in client_manifest) {
-		const { file, css } = client_manifest[key];
-		app_files.add(file);
-		if (css) {
-			css.forEach((file) => {
-				app_files.add(file);
-			});
-		}
+		const { file, css = [], assets = [] } = client_manifest[key];
+		build.add(file);
+		css.forEach((file) => build.add(file));
+		assets.forEach((file) => build.add(file));
 	}
 
 	const service_worker = `${config.kit.outDir}/generated/service-worker.js`;
@@ -64,7 +59,7 @@ async function build_service_worker(
 			};
 
 			export const build = [
-				${Array.from(app_files)
+				${Array.from(build)
 					.map((file) => `${s(`${config.kit.paths.base}/${config.kit.appDir}/${file}`)}`)
 					.join(',\n\t\t\t\t')}
 			];
@@ -461,7 +456,7 @@ async function build_server(
 
 	const default_config = {
 		build: {
-			target: 'es2020'
+			target: 'node14.8'
 		},
 		ssr: {
 			// when developing against the Kit src code, we want to ensure that

package/dist/chunks/index4.js

@@ -130,9 +130,7 @@ function create_builder({ config, build_data, prerendered, log }) {
 		},
 
 		writeClient(dest) {
-			return copy(`${config.kit.outDir}/output/client`, dest, {
-				filter: (file) => file[0] !== '.'
-			});
+			return copy(`${config.kit.outDir}/output/client`, dest);
 		},
 
 		writePrerendered(dest, { fallback } = {}) {
@@ -148,9 +146,7 @@ function create_builder({ config, build_data, prerendered, log }) {
 		},
 
 		writeServer(dest) {
-			return copy(`${config.kit.outDir}/output/server`, dest, {
-				filter: (file) => file[0] !== '.'
-			});
+			return copy(`${config.kit.outDir}/output/server`, dest);
 		},
 
 		writeStatic(dest) {

package/dist/chunks/index5.js

@@ -6,7 +6,6 @@ import { S as SVELTE_KIT_ASSETS, s as sirv } from './constants.js';
 import { pathToFileURL } from 'url';
 import { getRequest, setResponse } from '../node.js';
 import { installFetch } from '../install-fetch.js';
-import { n as normalize_path } from './url.js';
 import 'querystring';
 import 'stream';
 import 'node:http';
@@ -98,17 +97,7 @@ async function preview({ port, host, config, https: use_https = false }) {
 				return;
 			}
 
-			const { pathname, search } = new URL(/** @type {string} */ (req.url), 'http://dummy');
-
-			const normalized = normalize_path(pathname, config.kit.trailingSlash);
-
-			if (normalized !== pathname) {
-				res.writeHead(307, {
-					location: base + normalized + search
-				});
-				res.end();
-				return;
-			}
+			const { pathname } = new URL(/** @type {string} */ (req.url), 'http://dummy');
 
 			// only treat this as a page if it doesn't include an extension
 			if (pathname === '/' || /\/[^./]+\/?$/.test(pathname)) {

package/dist/chunks/sync.js

@@ -412,6 +412,10 @@ function trace(file, path, tree, extensions) {
 
 	let layout_id = base.includes('@') ? base.split('@')[1] : DEFAULT;
 
+	if (parts.findIndex((part) => part.indexOf('@') > -1) > -1) {
+		throw new Error(`Invalid route ${file} - named layouts are not allowed in directories`);
+	}
+
 	// walk up the tree, find which __layout and __error components
 	// apply to this page
 	// eslint-disable-next-line
@@ -795,10 +799,12 @@ function write_tsconfig(config) {
 				compilerOptions: {
 					// generated options
 					baseUrl: config_relative('.'),
-					paths: {
-						$lib: [project_relative(config.kit.files.lib)],
-						'$lib/*': [project_relative(config.kit.files.lib + '/*')]
-					},
+					paths: fs__default.existsSync(config.kit.files.lib)
+						? {
+								$lib: [project_relative(config.kit.files.lib)],
+								'$lib/*': [project_relative(config.kit.files.lib + '/*')]
+						  }
+						: {},
 					rootDirs: [config_relative('.'), './types'],
 
 					// essential options
@@ -837,7 +843,7 @@ function validate(config, out, user_file) {
 	if (extends_framework_config) {
 		const { paths: user_paths } = user_tsconfig.compilerOptions || {};
 
-		if (user_paths) {
+		if (user_paths && fs__default.existsSync(config.kit.files.lib)) {
 			/** @type {string[]} */
 			const lib = user_paths['$lib'] || [];
 			/** @type {string[]} */

package/dist/chunks/url.js

@@ -1,3 +1,85 @@
+/**
+ * Takes zero or more objects and returns a new object that has all the values
+ * deeply merged together. None of the original objects will be mutated at any
+ * level, and the returned object will have no references to the original
+ * objects at any depth. If there's a conflict the last one wins, except for
+ * arrays which will be combined.
+ * @param {...Object} objects
+ * @returns {[Record<string, any>, string[]]} a 2-tuple with the merged object,
+ *     and a list of merge conflicts if there were any, in dotted notation
+ */
+function deep_merge(...objects) {
+	const result = {};
+	/** @type {string[]} */
+	const conflicts = [];
+	objects.forEach((o) => merge_into(result, o, conflicts));
+	return [result, conflicts];
+}
+
+/**
+ * normalize kit.vite.resolve.alias as an array
+ * @param {import('vite').AliasOptions} o
+ * @returns {import('vite').Alias[]}
+ */
+function normalize_alias(o) {
+	if (Array.isArray(o)) return o;
+	return Object.entries(o).map(([find, replacement]) => ({ find, replacement }));
+}
+
+/**
+ * Merges b into a, recursively, mutating a.
+ * @param {Record<string, any>} a
+ * @param {Record<string, any>} b
+ * @param {string[]} conflicts array to accumulate conflicts in
+ * @param {string[]} path array of property names representing the current
+ *     location in the tree
+ */
+function merge_into(a, b, conflicts = [], path = []) {
+	/**
+	 * Checks for "plain old Javascript object", typically made as an object
+	 * literal. Excludes Arrays and built-in types like Buffer.
+	 * @param {any} x
+	 */
+	const is_plain_object = (x) => typeof x === 'object' && x.constructor === Object;
+
+	for (const prop in b) {
+		// normalize alias objects to array
+		if (prop === 'alias' && path[path.length - 1] === 'resolve') {
+			if (a[prop]) a[prop] = normalize_alias(a[prop]);
+			if (b[prop]) b[prop] = normalize_alias(b[prop]);
+		}
+
+		if (is_plain_object(b[prop])) {
+			if (!is_plain_object(a[prop])) {
+				if (a[prop] !== undefined) {
+					conflicts.push([...path, prop].join('.'));
+				}
+				a[prop] = {};
+			}
+			merge_into(a[prop], b[prop], conflicts, [...path, prop]);
+		} else if (Array.isArray(b[prop])) {
+			if (!Array.isArray(a[prop])) {
+				if (a[prop] !== undefined) {
+					conflicts.push([...path, prop].join('.'));
+				}
+				a[prop] = [];
+			}
+			a[prop].push(...b[prop]);
+		} else {
+			// Since we're inside a for/in loop which loops over enumerable
+			// properties only, we want parity here and to check if 'a' has
+			// enumerable-only property 'prop'. Using 'hasOwnProperty' to
+			// exclude inherited properties is close enough. It is possible
+			// that someone uses Object.defineProperty to create a direct,
+			// non-enumerable property but let's not worry about that.
+			if (Object.prototype.hasOwnProperty.call(a, prop)) {
+				conflicts.push([...path, prop].join('.'));
+			}
+			a[prop] = b[prop];
+		}
+	}
+}
+
 const absolute = /^([a-z]+:)?\/?\//;
 const scheme = /^[a-z]+:/;
 
@@ -46,11 +128,11 @@ function normalize_path(path, trailing_slash) {
 
 	if (trailing_slash === 'never') {
 		return path.endsWith('/') ? path.slice(0, -1) : path;
-	} else if (trailing_slash === 'always' && /\/[^./]+$/.test(path)) {
+	} else if (trailing_slash === 'always' && !path.endsWith('/')) {
 		return path + '/';
 	}
 
 	return path;
 }
 
-export { is_root_relative as i, normalize_path as n, resolve as r };
+export { deep_merge as d, is_root_relative as i, normalize_path as n, resolve as r };

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.321');
+const prog = sade('svelte-kit').version('1.0.0-next.324');
 
 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.321'}\n`));
+	console.log($.bold().cyan(`\n  SvelteKit v${'1.0.0-next.324'}\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.321",
+  "version": "1.0.0-next.324",
   "repository": {
     "type": "git",
     "url": "https://github.com/sveltejs/kit",

package/dist/chunks/object.js

@@ -1,83 +0,0 @@
-/**
- * Takes zero or more objects and returns a new object that has all the values
- * deeply merged together. None of the original objects will be mutated at any
- * level, and the returned object will have no references to the original
- * objects at any depth. If there's a conflict the last one wins, except for
- * arrays which will be combined.
- * @param {...Object} objects
- * @returns {[Record<string, any>, string[]]} a 2-tuple with the merged object,
- *     and a list of merge conflicts if there were any, in dotted notation
- */
-function deep_merge(...objects) {
-	const result = {};
-	/** @type {string[]} */
-	const conflicts = [];
-	objects.forEach((o) => merge_into(result, o, conflicts));
-	return [result, conflicts];
-}
-
-/**
- * normalize kit.vite.resolve.alias as an array
- * @param {import('vite').AliasOptions} o
- * @returns {import('vite').Alias[]}
- */
-function normalize_alias(o) {
-	if (Array.isArray(o)) return o;
-	return Object.entries(o).map(([find, replacement]) => ({ find, replacement }));
-}
-
-/**
- * Merges b into a, recursively, mutating a.
- * @param {Record<string, any>} a
- * @param {Record<string, any>} b
- * @param {string[]} conflicts array to accumulate conflicts in
- * @param {string[]} path array of property names representing the current
- *     location in the tree
- */
-function merge_into(a, b, conflicts = [], path = []) {
-	/**
-	 * Checks for "plain old Javascript object", typically made as an object
-	 * literal. Excludes Arrays and built-in types like Buffer.
-	 * @param {any} x
-	 */
-	const is_plain_object = (x) => typeof x === 'object' && x.constructor === Object;
-
-	for (const prop in b) {
-		// normalize alias objects to array
-		if (prop === 'alias' && path[path.length - 1] === 'resolve') {
-			if (a[prop]) a[prop] = normalize_alias(a[prop]);
-			if (b[prop]) b[prop] = normalize_alias(b[prop]);
-		}
-
-		if (is_plain_object(b[prop])) {
-			if (!is_plain_object(a[prop])) {
-				if (a[prop] !== undefined) {
-					conflicts.push([...path, prop].join('.'));
-				}
-				a[prop] = {};
-			}
-			merge_into(a[prop], b[prop], conflicts, [...path, prop]);
-		} else if (Array.isArray(b[prop])) {
-			if (!Array.isArray(a[prop])) {
-				if (a[prop] !== undefined) {
-					conflicts.push([...path, prop].join('.'));
-				}
-				a[prop] = [];
-			}
-			a[prop].push(...b[prop]);
-		} else {
-			// Since we're inside a for/in loop which loops over enumerable
-			// properties only, we want parity here and to check if 'a' has
-			// enumerable-only property 'prop'. Using 'hasOwnProperty' to
-			// exclude inherited properties is close enough. It is possible
-			// that someone uses Object.defineProperty to create a direct,
-			// non-enumerable property but let's not worry about that.
-			if (Object.prototype.hasOwnProperty.call(a, prop)) {
-				conflicts.push([...path, prop].join('.'));
-			}
-			a[prop] = b[prop];
-		}
-	}
-}
-
-export { deep_merge as d };