@sveltejs/kit 1.0.0-next.264 → 1.0.0-next.265

package/dist/chunks/index5.js

@@ -391,21 +391,21 @@ function escape_html_attr(str) {
  * @typedef {import('types/internal').Logger} Logger
  */
 
-/** @type {(errorDetails: Parameters<PrerenderErrorHandler>[0] ) => string} */
-function errorDetailsToString({ status, path, referrer, referenceType }) {
+/** @type {(details: Parameters<PrerenderErrorHandler>[0] ) => string} */
+function format_error({ status, path, referrer, referenceType }) {
 	return `${status} ${path}${referrer ? ` (${referenceType} from ${referrer})` : ''}`;
 }
 
 /** @type {(log: Logger, onError: OnError) => PrerenderErrorHandler} */
-function chooseErrorHandler(log, onError) {
+function normalise_error_handler(log, onError) {
 	switch (onError) {
 		case 'continue':
-			return (errorDetails) => {
-				log.error(errorDetailsToString(errorDetails));
+			return (details) => {
+				log.error(format_error(details));
 			};
 		case 'fail':
-			return (errorDetails) => {
-				throw new Error(errorDetailsToString(errorDetails));
+			return (details) => {
+				throw new Error(format_error(details));
 			};
 		default:
 			return onError;
@@ -455,7 +455,7 @@ async function prerender({ cwd, out, log, config, build_data, fallback, all }) {
 
 	const app = new App(manifest);
 
-	const error = chooseErrorHandler(log, config.kit.prerender.onError);
+	const error = normalise_error_handler(log, config.kit.prerender.onError);
 
 	const files = new Set([
 		...build_data.static,
@@ -492,12 +492,15 @@ async function prerender({ cwd, out, log, config, build_data, fallback, all }) {
 	 * @param {boolean} is_html
 	 */
 	function output_filename(path, is_html) {
+		path = path.slice(config.kit.paths.base.length) || '/';
+
 		if (path === '/') {
 			return '/index.html';
 		}
+
 		const parts = path.split('/');
 		if (is_html && parts[parts.length - 1] !== 'index.html') {
-			if (config.kit.prerender.createIndexFiles) {
+			if (config.kit.trailingSlash === 'always') {
 				parts.push('index.html');
 			} else {
 				parts[parts.length - 1] += '.html';
@@ -525,114 +528,113 @@ async function prerender({ cwd, out, log, config, build_data, fallback, all }) {
 	 * @param {string?} referrer
 	 */
 	async function visit(path, decoded_path, referrer) {
+		if (!path.startsWith(config.kit.paths.base)) {
+			error({ status: 404, path, referrer, referenceType: 'linked' });
+			return;
+		}
+
 		/** @type {Map<string, import('types/internal').PrerenderDependency>} */
 		const dependencies = new Map();
 
-		const render_path = config.kit.paths?.base
-			? `http://sveltekit-prerender${config.kit.paths.base}${path === '/' ? '' : path}`
-			: `http://sveltekit-prerender${path}`;
-
-		const rendered = await app.render(new Request(render_path), {
+		const rendered = await app.render(new Request(`http://sveltekit-prerender${path}`), {
 			prerender: {
 				all,
 				dependencies
 			}
 		});
 
-		if (rendered) {
-			const response_type = Math.floor(rendered.status / 100);
-			const type = rendered.headers.get('content-type');
-			const is_html = response_type === REDIRECT || type === 'text/html';
+		const response_type = Math.floor(rendered.status / 100);
+		const type = rendered.headers.get('content-type');
+		const is_html = response_type === REDIRECT || type === 'text/html';
 
-			const file = `${out}${output_filename(decoded_path, is_html)}`;
+		const file = `${out}${output_filename(decoded_path, is_html)}`;
 
-			if (response_type === REDIRECT) {
-				const location = rendered.headers.get('location');
+		if (response_type === REDIRECT) {
+			const location = rendered.headers.get('location');
 
-				if (location) {
-					mkdirp(dirname(file));
+			if (location) {
+				mkdirp(dirname(file));
 
-					log.warn(`${rendered.status} ${decoded_path} -> ${location}`);
+				log.warn(`${rendered.status} ${decoded_path} -> ${location}`);
 
-					writeFileSync(
-						file,
-						`<meta http-equiv="refresh" content=${escape_html_attr(`0;url=${location}`)}>`
-					);
+				writeFileSync(
+					file,
+					`<meta http-equiv="refresh" content=${escape_html_attr(`0;url=${location}`)}>`
+				);
 
-					const resolved = resolve(path, location);
-					if (is_root_relative(resolved)) {
-						enqueue(resolved, path);
-					}
-				} else {
-					log.warn(`location header missing on redirect received from ${decoded_path}`);
+				const resolved = resolve(path, location);
+				if (is_root_relative(resolved)) {
+					enqueue(resolved, path);
 				}
-
-				return;
+			} else {
+				log.warn(`location header missing on redirect received from ${decoded_path}`);
 			}
 
-			const text = await rendered.text();
+			return;
+		}
 
-			if (rendered.status === 200) {
-				mkdirp(dirname(file));
+		const text = await rendered.text();
 
-				log.info(`${rendered.status} ${decoded_path}`);
-				writeFileSync(file, text);
-				paths.push(normalize(decoded_path));
-			} else if (response_type !== OK) {
-				error({ status: rendered.status, path, referrer, referenceType: 'linked' });
-			}
+		if (rendered.status === 200) {
+			mkdirp(dirname(file));
 
-			for (const [dependency_path, result] of dependencies) {
-				const { status, headers } = result.response;
+			log.info(`${rendered.status} ${decoded_path}`);
+			writeFileSync(file, text);
+			paths.push(normalize(decoded_path));
+		} else if (response_type !== OK) {
+			error({ status: rendered.status, path, referrer, referenceType: 'linked' });
+		}
 
-				const response_type = Math.floor(status / 100);
+		for (const [dependency_path, result] of dependencies) {
+			const { status, headers } = result.response;
 
-				const is_html = headers.get('content-type') === 'text/html';
+			const response_type = Math.floor(status / 100);
 
-				const file = `${out}${output_filename(dependency_path, is_html)}`;
-				mkdirp(dirname(file));
+			const is_html = headers.get('content-type') === 'text/html';
 
-				writeFileSync(
-					file,
-					result.body === null ? new Uint8Array(await result.response.arrayBuffer()) : result.body
-				);
-				paths.push(dependency_path);
-
-				if (response_type === OK) {
-					log.info(`${status} ${dependency_path}`);
-				} else {
-					error({
-						status,
-						path: dependency_path,
-						referrer: path,
-						referenceType: 'fetched'
-					});
-				}
+			const file = `${out}${output_filename(dependency_path, is_html)}`;
+			mkdirp(dirname(file));
+
+			writeFileSync(
+				file,
+				result.body === null ? new Uint8Array(await result.response.arrayBuffer()) : result.body
+			);
+			paths.push(dependency_path);
+
+			if (response_type === OK) {
+				log.info(`${status} ${dependency_path}`);
+			} else {
+				error({
+					status,
+					path: dependency_path,
+					referrer: path,
+					referenceType: 'fetched'
+				});
 			}
+		}
 
-			if (is_html && config.kit.prerender.crawl) {
-				for (const href of crawl(text)) {
-					if (href.startsWith('data:') || href.startsWith('#')) continue;
+		if (is_html && config.kit.prerender.crawl) {
+			for (const href of crawl(text)) {
+				if (href.startsWith('data:') || href.startsWith('#')) continue;
 
-					const resolved = resolve(path, href);
-					if (!is_root_relative(resolved)) continue;
+				const resolved = resolve(path, href);
+				if (!is_root_relative(resolved)) continue;
 
-					const parsed = new URL(resolved, 'http://localhost');
+				const parsed = new URL(resolved, 'http://localhost');
 
-					let pathname = decodeURI(parsed.pathname);
+				let pathname = decodeURI(parsed.pathname);
 
-					if (config.kit.paths.base) {
-						if (!pathname.startsWith(config.kit.paths.base)) continue;
-						pathname = pathname.slice(config.kit.paths.base.length) || '/';
-					}
+				if (config.kit.paths.base) {
+					if (!pathname.startsWith(config.kit.paths.base)) continue;
+					pathname = pathname.slice(config.kit.paths.base.length) || '/';
+				}
 
-					const file = pathname.slice(1);
-					if (files.has(file)) continue;
+				const file = pathname.slice(1);
+				if (files.has(file)) continue;
 
-					if (parsed.search) ;
+				if (parsed.search) ;
 
-					enqueue(pathname, path);
-				}
+				enqueue(pathname, path);
 			}
 		}
 	}
@@ -641,10 +643,10 @@ 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) {
-					enqueue(entry, null);
+					enqueue(config.kit.paths.base + entry, null);
 				}
 			} else {
-				enqueue(entry, null);
+				enqueue(config.kit.paths.base + entry, null);
 			}
 		}
 
@@ -700,6 +702,7 @@ function create_builder({ cwd, config, build_data, log }) {
 		copy,
 
 		appDir: config.kit.appDir,
+		trailingSlash: config.kit.trailingSlash,
 
 		createEntries(fn) {
 			generated_manifest = true;

package/dist/cli.js

@@ -619,7 +619,9 @@ const options = object(
 			prerender: object({
 				concurrency: number(1),
 				crawl: boolean(true),
-				createIndexFiles: boolean(true),
+				createIndexFiles: error(
+					(keypath) => `${keypath} has been removed — it is now controlled by the trailingSlash option. See https://kit.svelte.dev/docs/configuration#trailingslash`
+				),
 				enabled: boolean(true),
 				entries: validate(['*'], (input, keypath) => {
 					if (!Array.isArray(input) || !input.every((page) => typeof page === 'string')) {
@@ -995,7 +997,7 @@ async function launch(port, https) {
 	exec(`${cmd} ${https ? 'https' : 'http'}://localhost:${port}`);
 }
 
-const prog = sade('svelte-kit').version('1.0.0-next.264');
+const prog = sade('svelte-kit').version('1.0.0-next.265');
 
 prog
 	.command('dev')
@@ -1153,7 +1155,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.264'}\n`));
+	console.log($.bold().cyan(`\n  SvelteKit v${'1.0.0-next.265'}\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.264",
+  "version": "1.0.0-next.265",
   "repository": {
     "type": "git",
     "url": "https://github.com/sveltejs/kit",
@@ -84,8 +84,9 @@
     "check-format": "prettier --check . --config ../../.prettierrc --ignore-path .gitignore",
     "test": "npm run test:unit && npm run test:packaging && npm run test:prerendering && npm run test:integration",
     "test:unit": "uvu src \"(spec\\.js|test[\\\\/]index\\.js)\" -i packaging",
-    "test:prerendering": "pnpm test:prerendering:basics",
+    "test:prerendering": "pnpm test:prerendering:basics && pnpm test:prerendering:options",
     "test:prerendering:basics": "cd test/prerendering/basics && pnpm test",
+    "test:prerendering:options": "cd test/prerendering/options && pnpm test",
     "test:packaging": "uvu src/packaging \"(spec\\.js|test[\\\\/]index\\.js)\"",
     "test:integration": "pnpm test:integration:amp && pnpm test:integration:basics && pnpm test:integration:options && pnpm test:integration:options-2",
     "test:integration:amp": "cd test/apps/amp && pnpm test",

package/types/config.d.ts

@@ -41,6 +41,7 @@ export interface Builder {
 	mkdirp(dir: string): void;
 
 	appDir: string;
+	trailingSlash: 'always' | 'never' | 'ignore';
 
 	/**
 	 * Create entry points that map to individual functions
@@ -153,7 +154,6 @@ export interface Config {
 		prerender?: {
 			concurrency?: number;
 			crawl?: boolean;
-			createIndexFiles?: boolean;
 			enabled?: boolean;
 			entries?: string[];
 			onError?: PrerenderOnErrorValue;