@sveltejs/kit 1.0.0-next.248 → 1.0.0-next.251

package/assets/server/index.js

@@ -175,7 +175,7 @@ function is_pojo(body) {
 		if (body._readableState && body._writableState && body._events) return false;
 
 		// similarly, it could be a web ReadableStream
-		if (body[Symbol.toStringTag] === 'ReadableStream') return false;
+		if (typeof ReadableStream !== 'undefined' && body instanceof ReadableStream) return false;
 	}
 
 	return true;

package/dist/chunks/index.js

@@ -201,7 +201,7 @@ function is_pojo(body) {
 		if (body._readableState && body._writableState && body._events) return false;
 
 		// similarly, it could be a web ReadableStream
-		if (body[Symbol.toStringTag] === 'ReadableStream') return false;
+		if (typeof ReadableStream !== 'undefined' && body instanceof ReadableStream) return false;
 	}
 
 	return true;
@@ -2488,7 +2488,7 @@ async function create_plugin(config, cwd) {
 								});
 							},
 							hooks,
-							hydrate: config.kit.hydrate,
+							hydrate: config.kit.browser.hydrate,
 							manifest,
 							method_override: config.kit.methodOverride,
 							paths: {
@@ -2499,7 +2499,7 @@ async function create_plugin(config, cwd) {
 							prerender: config.kit.prerender.enabled,
 							read: (file) => fs__default.readFileSync(path__default.join(config.kit.files.assets, file)),
 							root,
-							router: config.kit.router,
+							router: config.kit.browser.router,
 							target: config.kit.target,
 							template: ({ head, body, assets, nonce }) => {
 								return (
@@ -2647,7 +2647,7 @@ async function dev({ cwd, port, host, https, config }) {
 				extensions: config.extensions,
 				emitCss: !config.kit.amp,
 				compilerOptions: {
-					hydratable: !!config.kit.hydrate
+					hydratable: !!config.kit.browser.hydrate
 				}
 			}),
 			await create_plugin(config, cwd)

package/dist/chunks/index2.js

@@ -455,17 +455,16 @@ function create_manifest_data({
 				}
 			});
 
-			if (name[0] === '_') {
-				if (name[1] === '_' && !specials.has(name)) {
-					throw new Error(`Files and directories prefixed with __ are reserved (saw ${file})`);
-				}
-
-				return;
+			if (basename.startsWith('__') && !specials.has(name)) {
+				throw new Error(`Files and directories prefixed with __ are reserved (saw ${file})`);
 			}
 
-			if (basename[0] === '.' && basename !== '.well-known') return null;
 			if (!is_dir && !/^(\.[a-z0-9]+)+$/i.test(ext)) return null; // filter out tmp files etc
 
+			if (!config.kit.routes(file)) {
+				return;
+			}
+
 			const segment = is_dir ? basename : name;
 
 			if (/\]\[/.test(segment)) {

package/dist/chunks/index3.js

@@ -209,7 +209,7 @@ async function build_client({
 				extensions: config.extensions,
 				emitCss: !config.kit.amp,
 				compilerOptions: {
-					hydratable: !!config.kit.hydrate
+					hydratable: !!config.kit.browser.hydrate
 				}
 			})
 		]
@@ -309,7 +309,7 @@ export class App {
 				error.stack = this.options.get_stack(error);
 			},
 			hooks,
-			hydrate: ${s(config.kit.hydrate)},
+			hydrate: ${s(config.kit.browser.hydrate)},
 			manifest,
 			method_override: ${s(config.kit.methodOverride)},
 			paths: { base, assets },
@@ -318,7 +318,7 @@ export class App {
 			read,
 			root,
 			service_worker: ${has_service_worker ? "base + '/service-worker.js'" : 'null'},
-			router: ${s(config.kit.router)},
+			router: ${s(config.kit.browser.router)},
 			target: ${s(config.kit.target)},
 			template,
 			template_contains_nonce: ${template.includes('%svelte.nonce%')},
@@ -447,7 +447,7 @@ async function build_server(
 			svelte({
 				extensions: config.extensions,
 				compilerOptions: {
-					hydratable: !!config.kit.hydrate
+					hydratable: !!config.kit.browser.hydrate
 				}
 			})
 		],
@@ -626,6 +626,7 @@ async function build(config) {
 	const build_data = {
 		app_dir: config.kit.appDir,
 		manifest_data: options.manifest_data,
+		service_worker: options.service_worker_entry_file ? 'service_worker.js' : null, // TODO make file configurable?
 		client,
 		server,
 		static: options.manifest_data.assets.map((asset) => posixify(asset.file)),

package/dist/chunks/index4.js

@@ -47,10 +47,15 @@ function generate_manifest(
 			? (path) => `() => import('${path}')`
 			: (path) => `() => Promise.resolve().then(() => require('${path}'))`;
 
+	const assets = build_data.manifest_data.assets.map((asset) => asset.file);
+	if (build_data.service_worker) {
+		assets.push(build_data.service_worker);
+	}
+
 	// prettier-ignore
 	return `{
 		appDir: ${s(build_data.app_dir)},
-		assets: new Set(${s(build_data.manifest_data.assets.map(asset => asset.file))}),
+		assets: new Set(${s(assets)}),
 		_: {
 			mime: ${s(get_mime_lookup(build_data.manifest_data))},
 			entry: ${s(build_data.client.entry)},

package/dist/chunks/index5.js

@@ -393,6 +393,25 @@ async function prerender({ cwd, out, log, config, build_data, fallback, all }) {
 
 	const q = queue(config.kit.prerender.concurrency);
 
+	/**
+	 * @param {string} path
+	 * @param {boolean} is_html
+	 */
+	function output_filename(path, is_html) {
+		if (path === '/') {
+			return '/index.html';
+		}
+		const parts = path.split('/');
+		if (is_html && parts[parts.length - 1] !== 'index.html') {
+			if (config.kit.prerender.createIndexFiles) {
+				parts.push('index.html');
+			} else {
+				parts[parts.length - 1] += '.html';
+			}
+		}
+		return parts.join('/');
+	}
+
 	/**
 	 * @param {string} decoded_path
 	 * @param {string?} referrer
@@ -431,12 +450,7 @@ async function prerender({ cwd, out, log, config, build_data, fallback, all }) {
 			const type = rendered.headers.get('content-type');
 			const is_html = response_type === REDIRECT || type === 'text/html';
 
-			const parts = decoded_path.split('/');
-			if (is_html && parts[parts.length - 1] !== 'index.html') {
-				parts.push('index.html');
-			}
-
-			const file = `${out}${parts.join('/')}`;
+			const file = `${out}${output_filename(decoded_path, is_html)}`;
 
 			if (response_type === REDIRECT) {
 				const location = rendered.headers.get('location');
@@ -481,12 +495,7 @@ async function prerender({ cwd, out, log, config, build_data, fallback, all }) {
 
 				const is_html = headers.get('content-type') === 'text/html';
 
-				const parts = dependency_path.split('/');
-				if (is_html && parts[parts.length - 1] !== 'index.html') {
-					parts.push('index.html');
-				}
-
-				const file = `${out}${parts.join('/')}`;
+				const file = `${out}${output_filename(dependency_path, is_html)}`;
 				mkdirp(dirname(file));
 
 				writeFileSync(

package/dist/cli.js

@@ -490,6 +490,11 @@ const options = object(
 				return input;
 			}),
 
+			browser: object({
+				hydrate: boolean(true),
+				router: boolean(true)
+			}),
+
 			csp: object({
 				mode: list(['auto', 'hash', 'nonce']),
 				directives: object({
@@ -539,24 +544,19 @@ const options = object(
 			floc: boolean(false),
 
 			// TODO: remove this for the 1.0 release
-			headers: validate(undefined, (input, keypath) => {
-				if (typeof input !== undefined) {
-					throw new Error(
-						`${keypath} has been removed. See https://github.com/sveltejs/kit/pull/3384 for details`
-					);
-				}
-			}),
+			headers: error(
+				(keypath) =>
+					`${keypath} has been removed. See https://github.com/sveltejs/kit/pull/3384 for details`
+			),
 
 			// TODO: remove this for the 1.0 release
-			host: validate(undefined, (input, keypath) => {
-				if (typeof input !== undefined) {
-					throw new Error(
-						`${keypath} has been removed. See https://github.com/sveltejs/kit/pull/3384 for details`
-					);
-				}
-			}),
+			host: error(
+				(keypath) =>
+					`${keypath} has been removed. See https://github.com/sveltejs/kit/pull/3384 for details`
+			),
 
-			hydrate: boolean(true),
+			// TODO remove for 1.0
+			hydrate: error((keypath) => `${keypath} has been moved to config.kit.browser.hydrate`),
 
 			inlineStyleThreshold: number(0),
 
@@ -619,6 +619,7 @@ const options = object(
 			prerender: object({
 				concurrency: number(1),
 				crawl: boolean(true),
+				createIndexFiles: boolean(true),
 				enabled: boolean(true),
 				entries: validate(['*'], (input, keypath) => {
 					if (!Array.isArray(input) || !input.every((page) => typeof page === 'string')) {
@@ -658,23 +659,19 @@ const options = object(
 				}),
 
 				// TODO: remove this for the 1.0 release
-				pages: validate(undefined, (input, keypath) => {
-					if (typeof input !== undefined) {
-						throw new Error(`${keypath} has been renamed to \`entries\`.`);
-					}
-				})
+				pages: error((keypath) => `${keypath} has been renamed to \`entries\`.`)
 			}),
 
 			// TODO: remove this for the 1.0 release
-			protocol: validate(undefined, (input, keypath) => {
-				if (typeof input !== undefined) {
-					throw new Error(
-						`${keypath} has been removed. See https://github.com/sveltejs/kit/pull/3384 for details`
-					);
-				}
-			}),
+			protocol: error(
+				(keypath) =>
+					`${keypath} has been removed. See https://github.com/sveltejs/kit/pull/3384 for details`
+			),
 
-			router: boolean(true),
+			// TODO remove for 1.0
+			router: error((keypath) => `${keypath} has been moved to config.kit.browser.router`),
+
+			routes: fun((filepath) => !/(?:(?:^_|\/_)|(?:^\.|\/\.)(?!well-known))/.test(filepath)),
 
 			serviceWorker: object({
 				register: boolean(true),
@@ -682,13 +679,10 @@ const options = object(
 			}),
 
 			// TODO remove this for 1.0
-			ssr: validate(null, (input) => {
-				if (input !== undefined) {
-					throw new Error(
-						'config.kit.ssr has been removed — use the handle hook instead: https://kit.svelte.dev/docs#hooks-handle'
-					);
-				}
-			}),
+			ssr: error(
+				(keypath) =>
+					`${keypath} has been removed — use the handle hook instead: https://kit.svelte.dev/docs#hooks-handle'`
+			),
 
 			target: string(null),
 
@@ -867,6 +861,15 @@ function assert_string(input, keypath) {
 	}
 }
 
+/** @param {(keypath?: string) => string} fn */
+function error(fn) {
+	return validate(undefined, (input, keypath) => {
+		if (input !== undefined) {
+			throw new Error(fn(keypath));
+		}
+	});
+}
+
 /**
  * @param {string} cwd
  * @param {import('types/config').ValidatedConfig} config
@@ -986,7 +989,7 @@ async function launch(port, https) {
 	exec(`${cmd} ${https ? 'https' : 'http'}://localhost:${port}`);
 }
 
-const prog = sade('svelte-kit').version('1.0.0-next.248');
+const prog = sade('svelte-kit').version('1.0.0-next.251');
 
 prog
 	.command('dev')
@@ -1144,7 +1147,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.248'}\n`));
+	console.log($.bold().cyan(`\n  SvelteKit v${'1.0.0-next.251'}\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.248",
+  "version": "1.0.0-next.251",
   "repository": {
     "type": "git",
     "url": "https://github.com/sveltejs/kit",

package/types/config.d.ts

@@ -118,6 +118,10 @@ export interface Config {
 		adapter?: Adapter;
 		amp?: boolean;
 		appDir?: string;
+		browser?: {
+			hydrate?: boolean;
+			router?: boolean;
+		};
 		csp?: {
 			mode?: 'hash' | 'nonce' | 'auto';
 			directives?: CspDirectives;
@@ -131,7 +135,6 @@ export interface Config {
 			template?: string;
 		};
 		floc?: boolean;
-		hydrate?: boolean;
 		inlineStyleThreshold?: number;
 		methodOverride?: {
 			parameter?: string;
@@ -150,11 +153,12 @@ export interface Config {
 		prerender?: {
 			concurrency?: number;
 			crawl?: boolean;
+			createIndexFiles?: boolean;
 			enabled?: boolean;
 			entries?: string[];
 			onError?: PrerenderOnErrorValue;
 		};
-		router?: boolean;
+		routes?: (filepath: string) => boolean;
 		serviceWorker?: {
 			register?: boolean;
 			files?: (filepath: string) => boolean;

package/types/internal.d.ts

@@ -209,6 +209,7 @@ export interface ManifestData {
 export interface BuildData {
 	app_dir: string;
 	manifest_data: ManifestData;
+	service_worker: string | null;
 	client: {
 		assets: OutputAsset[];
 		chunks: OutputChunk[];