@sveltejs/kit 1.0.0-next.338 → 1.0.0-next.340

package/assets/client/start.js

@@ -64,19 +64,13 @@ function normalize(loaded) {
 
 	if (loaded.redirect) {
 		if (!loaded.status || Math.floor(loaded.status / 100) !== 3) {
-			return {
-				status: 500,
-				error: new Error(
-					'"redirect" property returned from load() must be accompanied by a 3xx status code'
-				)
-			};
+			throw new Error(
+				'"redirect" property returned from load() must be accompanied by a 3xx status code'
+			);
 		}
 
 		if (typeof loaded.redirect !== 'string') {
-			return {
-				status: 500,
-				error: new Error('"redirect" property returned from load() must be a string')
-			};
+			throw new Error('"redirect" property returned from load() must be a string');
 		}
 	}
 
@@ -85,10 +79,7 @@ function normalize(loaded) {
 			!Array.isArray(loaded.dependencies) ||
 			loaded.dependencies.some((dep) => typeof dep !== 'string')
 		) {
-			return {
-				status: 500,
-				error: new Error('"dependencies" property returned from load() must be of type string[]')
-			};
+			throw new Error('"dependencies" property returned from load() must be of type string[]');
 		}
 	}
 
@@ -616,8 +607,9 @@ function create_client({ target, session, base, trailing_slash }) {
 	 * @param {string[]} redirect_chain
 	 * @param {boolean} no_cache
 	 * @param {{hash?: string, scroll: { x: number, y: number } | null, keepfocus: boolean, details: { replaceState: boolean, state: any } | null}} [opts]
+	 * @param {() => void} [callback]
 	 */
-	async function update(url, redirect_chain, no_cache, opts) {
+	async function update(url, redirect_chain, no_cache, opts, callback) {
 		const intent = get_navigation_intent(url);
 
 		const current_token = (token = {});
@@ -744,7 +736,6 @@ function create_client({ target, session, base, trailing_slash }) {
 		load_cache.promise = null;
 		load_cache.id = null;
 		autoscroll = true;
-		updating = false;
 
 		if (navigation_result.props.page) {
 			page = navigation_result.props.page;
@@ -753,7 +744,9 @@ function create_client({ target, session, base, trailing_slash }) {
 		const leaf_node = navigation_result.state.branch[navigation_result.state.branch.length - 1];
 		router_enabled = leaf_node?.module.router !== false;
 
-		return true;
+		if (callback) callback();
+
+		updating = false;
 	}
 
 	/** @param {import('./types').NavigationResult} result */
@@ -771,12 +764,12 @@ function create_client({ target, session, base, trailing_slash }) {
 			hydrate: true
 		});
 
-		started = true;
-
 		if (router_enabled) {
 			const navigation = { from: null, to: new URL(location.href) };
 			callbacks.after_navigate.forEach((fn) => fn(navigation));
 		}
+
+		started = true;
 	}
 
 	/**
@@ -934,7 +927,7 @@ function create_client({ target, session, base, trailing_slash }) {
 		const session = $session;
 
 		if (module.load) {
-			/** @type {import('types').LoadInput} */
+			/** @type {import('types').LoadEvent} */
 			const load_input = {
 				routeId,
 				params: uses_params,
@@ -962,11 +955,44 @@ function create_client({ target, session, base, trailing_slash }) {
 					node.uses.stuff = true;
 					return { ...stuff };
 				},
-				fetch(resource, info) {
-					const requested = typeof resource === 'string' ? resource : resource.url;
-					add_dependency(requested);
+				async fetch(resource, init) {
+					let requested;
+
+					if (typeof resource === 'string') {
+						requested = resource;
+					} else {
+						requested = resource.url;
+
+						// we're not allowed to modify the received `Request` object, so in order
+						// to fixup relative urls we create a new equivalent `init` object instead
+						init = {
+							// the request body must be consumed in memory until browsers
+							// implement streaming request bodies and/or the body getter
+							body:
+								resource.method === 'GET' || resource.method === 'HEAD'
+									? undefined
+									: await resource.blob(),
+							cache: resource.cache,
+							credentials: resource.credentials,
+							headers: resource.headers,
+							integrity: resource.integrity,
+							keepalive: resource.keepalive,
+							method: resource.method,
+							mode: resource.mode,
+							redirect: resource.redirect,
+							referrer: resource.referrer,
+							referrerPolicy: resource.referrerPolicy,
+							signal: resource.signal,
+							...init
+						};
+					}
+
+					// we must fixup relative urls so they are resolved from the target page
+					const normalized = new URL(requested, url).href;
+					add_dependency(normalized);
 
-					return started ? fetch$1(resource, info) : initial_fetch(resource, info);
+					// prerendered pages may be served from any origin, so `initial_fetch` urls shouldn't be normalized
+					return started ? fetch$1(normalized, init) : initial_fetch(requested, init);
 				},
 				status: status ?? null,
 				error: error ?? null
@@ -1329,18 +1355,22 @@ function create_client({ target, session, base, trailing_slash }) {
 			});
 		}
 
-		const completed = await update(normalized, redirect_chain, false, {
-			scroll,
-			keepfocus,
-			details
-		});
-
-		if (completed) {
-			const navigation = { from, to: normalized };
-			callbacks.after_navigate.forEach((fn) => fn(navigation));
+		await update(
+			normalized,
+			redirect_chain,
+			false,
+			{
+				scroll,
+				keepfocus,
+				details
+			},
+			() => {
+				const navigation = { from, to: normalized };
+				callbacks.after_navigate.forEach((fn) => fn(navigation));
 
-			stores.navigating.set(null);
-		}
+				stores.navigating.set(null);
+			}
+		);
 	}
 
 	/**

package/assets/server/index.js

@@ -1124,13 +1124,13 @@ async function render_response({
 	resolve_opts,
 	stuff
 }) {
-	if (state.prerender) {
+	if (state.prerendering) {
 		if (options.csp.mode === 'nonce') {
 			throw new Error('Cannot use prerendering if config.kit.csp.mode === "nonce"');
 		}
 
 		if (options.template_contains_nonce) {
-			throw new Error('Cannot use prerendering if page template contains %svelte.nonce%');
+			throw new Error('Cannot use prerendering if page template contains %sveltekit.nonce%');
 		}
 	}
 
@@ -1192,7 +1192,7 @@ async function render_response({
 				routeId: event.routeId,
 				status,
 				stuff,
-				url: state.prerender ? create_prerendering_url_proxy(event.url) : event.url
+				url: state.prerendering ? create_prerendering_url_proxy(event.url) : event.url
 			},
 			components: branch.map(({ node }) => node.module.default)
 		};
@@ -1232,7 +1232,7 @@ async function render_response({
 	await csp_ready;
 	const csp = new Csp(options.csp, {
 		dev: options.dev,
-		prerender: !!state.prerender,
+		prerender: !!state.prerendering,
 		needs_nonce: options.template_contains_nonce
 	});
 
@@ -1341,7 +1341,7 @@ async function render_response({
 			<script${csp.script_needs_nonce ? ` nonce="${csp.nonce}"` : ''}>${init_service_worker}</script>`;
 	}
 
-	if (state.prerender) {
+	if (state.prerendering) {
 		const http_equiv = [];
 
 		const csp_headers = csp.get_meta();
@@ -1379,7 +1379,7 @@ async function render_response({
 		headers.set('permissions-policy', 'interest-cohort=()');
 	}
 
-	if (!state.prerender) {
+	if (!state.prerendering) {
 		const csp_header = csp.get_header();
 		if (csp_header) {
 			headers.set('content-security-policy', csp_header);
@@ -1941,19 +1941,13 @@ function normalize(loaded) {
 
 	if (loaded.redirect) {
 		if (!loaded.status || Math.floor(loaded.status / 100) !== 3) {
-			return {
-				status: 500,
-				error: new Error(
-					'"redirect" property returned from load() must be accompanied by a 3xx status code'
-				)
-			};
+			throw new Error(
+				'"redirect" property returned from load() must be accompanied by a 3xx status code'
+			);
 		}
 
 		if (typeof loaded.redirect !== 'string') {
-			return {
-				status: 500,
-				error: new Error('"redirect" property returned from load() must be a string')
-			};
+			throw new Error('"redirect" property returned from load() must be a string');
 		}
 	}
 
@@ -1962,10 +1956,7 @@ function normalize(loaded) {
 			!Array.isArray(loaded.dependencies) ||
 			loaded.dependencies.some((dep) => typeof dep !== 'string')
 		) {
-			return {
-				status: 500,
-				error: new Error('"dependencies" property returned from load() must be of type string[]')
-			};
+			throw new Error('"dependencies" property returned from load() must be of type string[]');
 		}
 	}
 
@@ -2105,13 +2096,15 @@ async function load_node({
 	/** @type {import('types').LoadOutput} */
 	let loaded;
 
+	const should_prerender = node.module.prerender ?? options.prerender.default;
+
 	/** @type {import('types').ShadowData} */
 	const shadow = is_leaf
 		? await load_shadow_data(
 				/** @type {import('types').SSRPage} */ (route),
 				event,
 				options,
-				!!state.prerender
+				should_prerender
 		  )
 		: {};
 
@@ -2132,9 +2125,9 @@ async function load_node({
 			redirect: shadow.redirect
 		};
 	} else if (module.load) {
-		/** @type {import('types').LoadInput} */
+		/** @type {import('types').LoadEvent} */
 		const load_input = {
-			url: state.prerender ? create_prerendering_url_proxy(event.url) : event.url,
+			url: state.prerendering ? create_prerendering_url_proxy(event.url) : event.url,
 			params: event.params,
 			props: shadow.body || {},
 			routeId: event.routeId,
@@ -2270,9 +2263,9 @@ async function load_node({
 						}
 					);
 
-					if (state.prerender) {
+					if (state.prerendering) {
 						dependency = { response, body: null };
-						state.prerender.dependencies.set(resolved, dependency);
+						state.prerendering.dependencies.set(resolved, dependency);
 					}
 				} else {
 					// external
@@ -2416,7 +2409,7 @@ async function load_node({
 	}
 
 	// generate __data.json files when prerendering
-	if (shadow.body && state.prerender) {
+	if (shadow.body && state.prerendering) {
 		const pathname = `${event.url.pathname.replace(/\/$/, '')}/__data.json`;
 
 		const dependency = {
@@ -2424,7 +2417,7 @@ async function load_node({
 			body: JSON.stringify(shadow.body)
 		};
 
-		state.prerender.dependencies.set(pathname, dependency);
+		state.prerendering.dependencies.set(pathname, dependency);
 	}
 
 	return {
@@ -2749,11 +2742,11 @@ async function respond$1(opts) {
 
 	let page_config = get_page_config(leaf, options);
 
-	if (state.prerender) {
+	if (state.prerendering) {
 		// if the page isn't marked as prerenderable (or is explicitly
 		// marked NOT prerenderable, if `prerender.default` is `true`),
 		// then bail out at this point
-		const should_prerender = leaf.prerender ?? state.prerender.default;
+		const should_prerender = leaf.prerender ?? options.prerender.default;
 		if (!should_prerender) {
 			return new Response(undefined, {
 				status: 204
@@ -3114,7 +3107,7 @@ async function respond(request, options, state) {
 	/** @type {Record<string, string>} */
 	let params = {};
 
-	if (options.paths.base && !state.prerender?.fallback) {
+	if (options.paths.base && !state.prerendering?.fallback) {
 		if (!decoded.startsWith(options.paths.base)) {
 			return new Response(undefined, { status: 404 });
 		}
@@ -3128,7 +3121,7 @@ async function respond(request, options, state) {
 		url = new URL(url.origin + url.pathname.slice(0, -DATA_SUFFIX.length) + url.search);
 	}
 
-	if (!state.prerender || !state.prerender.fallback) {
+	if (!state.prerendering?.fallback) {
 		const matchers = await options.manifest._.matchers();
 
 		for (const candidate of options.manifest._.routes) {
@@ -3147,7 +3140,7 @@ 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) {
+		if (normalized !== url.pathname && !state.prerendering?.fallback) {
 			return new Response(undefined, {
 				status: 301,
 				headers: {
@@ -3238,7 +3231,7 @@ async function respond(request, options, state) {
 					};
 				}
 
-				if (state.prerender && state.prerender.fallback) {
+				if (state.prerendering?.fallback) {
 					return await render_response({
 						event,
 						options,
@@ -3340,7 +3333,7 @@ async function respond(request, options, state) {
 					});
 				}
 
-				if (state.prerender) {
+				if (state.prerendering) {
 					return new Response('not found', { status: 404 });
 				}
 

package/dist/chunks/index.js

@@ -1,6 +1,6 @@
 import path__default from 'path';
 import { svelte } from '@sveltejs/vite-plugin-svelte';
-import vite from 'vite';
+import * as vite from 'vite';
 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';
@@ -328,21 +328,24 @@ async function create_plugin(config, cwd) {
 									assets
 								},
 								prefix: '',
-								prerender: config.kit.prerender.enabled,
+								prerender: {
+									default: config.kit.prerender.default,
+									enabled: config.kit.prerender.enabled
+								},
 								read: (file) => fs__default.readFileSync(path__default.join(config.kit.files.assets, file)),
 								root,
 								router: config.kit.browser.router,
 								template: ({ head, body, assets, nonce }) => {
 									return (
 										template
-											.replace(/%svelte\.assets%/g, assets)
-											.replace(/%svelte\.nonce%/g, nonce)
-											// head and body must be replaced last, in case someone tries to sneak in %svelte.assets% etc
-											.replace('%svelte.head%', () => head)
-											.replace('%svelte.body%', () => body)
+											.replace(/%sveltekit\.assets%/g, assets)
+											.replace(/%sveltekit\.nonce%/g, nonce)
+											// head and body must be replaced last, in case someone tries to sneak in %sveltekit.assets% etc
+											.replace('%sveltekit.head%', () => head)
+											.replace('%sveltekit.body%', () => body)
 									);
 								},
-								template_contains_nonce: template.includes('%svelte.nonce%'),
+								template_contains_nonce: template.includes('%sveltekit.nonce%'),
 								trailing_slash: config.kit.trailingSlash
 							},
 							{

package/dist/chunks/index2.js

@@ -4,7 +4,7 @@ import { p as posixify, m as mkdirp, r as rimraf } from './filesystem.js';
 import { all } from './sync.js';
 import { p as print_config_conflicts, b as get_aliases, r as resolve_entry, g as get_runtime_path, l as load_template } from '../cli.js';
 import { g as generate_manifest } from './index3.js';
-import vite from 'vite';
+import * as vite from 'vite';
 import { s } from './misc.js';
 import { d as deep_merge } from './object.js';
 import { svelte } from '@sveltejs/vite-plugin-svelte';
@@ -342,10 +342,10 @@ import { set_paths, assets, base } from '${runtime}/paths.js';
 import { set_prerendering } from '${runtime}/env.js';
 
 const template = ({ head, body, assets, nonce }) => ${s(template)
-	.replace('%svelte.head%', '" + head + "')
-	.replace('%svelte.body%', '" + body + "')
-	.replace(/%svelte\.assets%/g, '" + assets + "')
-	.replace(/%svelte\.nonce%/g, '" + nonce + "')};
+	.replace('%sveltekit.head%', '" + head + "')
+	.replace('%sveltekit.body%', '" + body + "')
+	.replace(/%sveltekit\.assets%/g, '" + assets + "')
+	.replace(/%sveltekit\.nonce%/g, '" + nonce + "')};
 
 let read = null;
 
@@ -388,13 +388,16 @@ export class Server {
 			method_override: ${s(config.kit.methodOverride)},
 			paths: { base, assets },
 			prefix: assets + '/${config.kit.appDir}/',
-			prerender: ${config.kit.prerender.enabled},
+			prerender: {
+				default: ${config.kit.prerender.default},
+				enabled: ${config.kit.prerender.enabled}
+			},
 			read,
 			root,
 			service_worker: ${has_service_worker ? "base + '/service-worker.js'" : 'null'},
 			router: ${s(config.kit.browser.router)},
 			template,
-			template_contains_nonce: ${template.includes('%svelte.nonce%')},
+			template_contains_nonce: ${template.includes('%sveltekit.nonce%')},
 			trailing_slash: ${s(config.kit.trailingSlash)}
 		};
 	}
@@ -1137,8 +1140,7 @@ async function prerender({ config, entries, files, log }) {
 
 		const response = await server.respond(new Request(`http://sveltekit-prerender${encoded}`), {
 			getClientAddress,
-			prerender: {
-				default: config.kit.prerender.default,
+			prerendering: {
 				dependencies
 			}
 		});
@@ -1274,9 +1276,8 @@ async function prerender({ config, entries, files, log }) {
 
 	const rendered = await server.respond(new Request('http://sveltekit-prerender/[fallback]'), {
 		getClientAddress,
-		prerender: {
+		prerendering: {
 			fallback: true,
-			default: false,
 			dependencies: new Map()
 		}
 	});

package/dist/chunks/index6.js

@@ -5950,14 +5950,14 @@ const flatten_properties = (array, target) => {
  * @param {any[]} nodes
  * @param {any[]} target
  */
-const flatten = (nodes, target) => {
+const flatten$1 = (nodes, target) => {
 	for (let i = 0; i < nodes.length; i += 1) {
 		const node = nodes[i];
 
 		if (node === EMPTY) continue;
 
 		if (Array.isArray(node)) {
-			flatten(node, target);
+			flatten$1(node, target);
 			continue;
 		}
 
@@ -6076,7 +6076,7 @@ const inject = (raw, node, values, comments) => {
 			}
 
 			if (node.type === 'ArrayExpression' || node.type === 'ArrayPattern') {
-				node.elements = flatten(node.elements, []);
+				node.elements = flatten$1(node.elements, []);
 			}
 
 			if (
@@ -6084,18 +6084,18 @@ const inject = (raw, node, values, comments) => {
 				node.type === 'FunctionDeclaration' ||
 				node.type === 'ArrowFunctionExpression'
 			) {
-				node.params = flatten(node.params, []);
+				node.params = flatten$1(node.params, []);
 			}
 
 			if (node.type === 'CallExpression' || node.type === 'NewExpression') {
-				node.arguments = flatten(node.arguments, []);
+				node.arguments = flatten$1(node.arguments, []);
 			}
 
 			if (
 				node.type === 'ImportDeclaration' ||
 				node.type === 'ExportNamedDeclaration'
 			) {
-				node.specifiers = flatten(node.specifiers, []);
+				node.specifiers = flatten$1(node.specifiers, []);
 			}
 
 			if (node.type === 'ForStatement') {
@@ -13813,7 +13813,7 @@ const meta_tags = new Map([
     ['svelte:window', 'Window'],
     ['svelte:body', 'Body']
 ]);
-Array.from(meta_tags.keys()).concat('svelte:self', 'svelte:component', 'svelte:fragment');
+Array.from(meta_tags.keys()).concat('svelte:self', 'svelte:component', 'svelte:fragment', 'svelte:element');
 
 function getLocator(source, options) {
     if (options === void 0) { options = {}; }
@@ -13850,6 +13850,19 @@ function getLocator(source, options) {
     return locate;
 }
 
+/**
+ * Pushes all `items` into `array` using `push`, therefore mutating the array.
+ * We do this for memory and perf reasons, and because `array.push(...items)` would
+ * run into a "max call stack size exceeded" error with too many items (~65k).
+ * @param array
+ * @param items
+ */
+function push_array$1(array, items) {
+    for (let i = 0; i < items.length; i++) {
+        array.push(items[i]);
+    }
+}
+
 x `true`;
 x `false`;
 
@@ -14744,13 +14757,6 @@ function merge_tables(this_table, other_table) {
     }
     return [new_table, idx_map, val_changed, idx_changed];
 }
-function pushArray(_this, other) {
-    // We use push to mutate in place for memory and perf reasons
-    // We use the for loop instead of _this.push(...other) to avoid the JS engine's function argument limit (65,535 in JavascriptCore)
-    for (let i = 0; i < other.length; i++) {
-        _this.push(other[i]);
-    }
-}
 class MappedCode {
     constructor(string = '', map = null) {
         this.string = string;
@@ -14838,9 +14844,9 @@ class MappedCode {
             }
         }
         // combine last line + first line
-        pushArray(m1.mappings[m1.mappings.length - 1], m2.mappings.shift());
+        push_array$1(m1.mappings[m1.mappings.length - 1], m2.mappings.shift());
         // append other lines
-        pushArray(m1.mappings, m2.mappings);
+        push_array$1(m1.mappings, m2.mappings);
         return this;
     }
     static from_processed(string, map) {

package/dist/chunks/sync.js

@@ -193,118 +193,120 @@ function create_manifest_data({
 	const routes_base = posixify(path__default.relative(cwd, config.kit.files.routes));
 	const valid_extensions = [...config.extensions, ...config.kit.endpointExtensions];
 
-	list_files(config.kit.files.routes).forEach((file) => {
-		const extension = valid_extensions.find((ext) => file.endsWith(ext));
-		if (!extension) return;
+	if (fs__default.existsSync(config.kit.files.routes)) {
+		list_files(config.kit.files.routes).forEach((file) => {
+			const extension = valid_extensions.find((ext) => file.endsWith(ext));
+			if (!extension) return;
 
-		const id = file
-			.slice(0, -extension.length)
-			.replace(/(?:^|\/)index((?:@[a-zA-Z0-9_-]+)?(?:\.[a-z]+)?)?$/, '$1');
-		const project_relative = `${routes_base}/${file}`;
+			const id = file
+				.slice(0, -extension.length)
+				.replace(/(?:^|\/)index((?:@[a-zA-Z0-9_-]+)?(?:\.[a-z]+)?)?$/, '$1');
+			const project_relative = `${routes_base}/${file}`;
 
-		const segments = id.split('/');
-		const name = /** @type {string} */ (segments.pop());
+			const segments = id.split('/');
+			const name = /** @type {string} */ (segments.pop());
 
-		if (name === '__layout.reset') {
-			throw new Error(
-				'__layout.reset has been removed in favour of named layouts: https://kit.svelte.dev/docs/layouts#named-layouts'
-			);
-		}
+			if (name === '__layout.reset') {
+				throw new Error(
+					'__layout.reset has been removed in favour of named layouts: https://kit.svelte.dev/docs/layouts#named-layouts'
+				);
+			}
 
-		if (name === '__error' || layout_pattern.test(name)) {
-			const dir = segments.join('/');
+			if (name === '__error' || layout_pattern.test(name)) {
+				const dir = segments.join('/');
 
-			if (!tree.has(dir)) {
-				tree.set(dir, {
-					error: undefined,
-					layouts: {}
-				});
-			}
+				if (!tree.has(dir)) {
+					tree.set(dir, {
+						error: undefined,
+						layouts: {}
+					});
+				}
 
-			const group = /** @type {Node} */ (tree.get(dir));
+				const group = /** @type {Node} */ (tree.get(dir));
 
-			if (name === '__error') {
-				group.error = project_relative;
-			} else {
-				const match = /** @type {RegExpMatchArray} */ (layout_pattern.exec(name));
+				if (name === '__error') {
+					group.error = project_relative;
+				} else {
+					const match = /** @type {RegExpMatchArray} */ (layout_pattern.exec(name));
 
-				if (match[1] === DEFAULT) {
-					throw new Error(`${project_relative} cannot use reserved "${DEFAULT}" name`);
-				}
+					if (match[1] === DEFAULT) {
+						throw new Error(`${project_relative} cannot use reserved "${DEFAULT}" name`);
+					}
+
+					const layout_id = match[1] || DEFAULT;
 
-				const layout_id = match[1] || DEFAULT;
+					const defined = group.layouts[layout_id];
+					if (defined && defined !== default_layout) {
+						throw new Error(
+							`Duplicate layout ${project_relative} already defined at ${defined.file}`
+						);
+					}
 
-				const defined = group.layouts[layout_id];
-				if (defined && defined !== default_layout) {
-					throw new Error(
-						`Duplicate layout ${project_relative} already defined at ${defined.file}`
-					);
+					group.layouts[layout_id] = {
+						file: project_relative,
+						name
+					};
 				}
 
-				group.layouts[layout_id] = {
-					file: project_relative,
-					name
-				};
+				return;
+			} else if (dunder_pattern.test(file)) {
+				throw new Error(
+					`Files and directories prefixed with __ are reserved (saw ${project_relative})`
+				);
 			}
 
-			return;
-		} else if (dunder_pattern.test(file)) {
-			throw new Error(
-				`Files and directories prefixed with __ are reserved (saw ${project_relative})`
-			);
-		}
+			if (!config.kit.routes(file)) return;
 
-		if (!config.kit.routes(file)) return;
-
-		if (/\]\[/.test(id)) {
-			throw new Error(`Invalid route ${project_relative} — parameters must be separated`);
-		}
+			if (/\]\[/.test(id)) {
+				throw new Error(`Invalid route ${project_relative} — parameters must be separated`);
+			}
 
-		if (count_occurrences('[', id) !== count_occurrences(']', id)) {
-			throw new Error(`Invalid route ${project_relative} — brackets are unbalanced`);
-		}
+			if (count_occurrences('[', id) !== count_occurrences(']', id)) {
+				throw new Error(`Invalid route ${project_relative} — brackets are unbalanced`);
+			}
 
-		if (!units.has(id)) {
-			units.set(id, {
-				id,
-				pattern: parse_route_id(id).pattern,
-				segments: id
-					.split('/')
-					.filter(Boolean)
-					.map((segment) => {
-						/** @type {Part[]} */
-						const parts = [];
-						segment.split(/\[(.+?)\]/).map((content, i) => {
-							const dynamic = !!(i % 2);
-
-							if (!content) return;
-
-							parts.push({
-								content,
-								dynamic,
-								rest: dynamic && content.startsWith('...'),
-								type: (dynamic && content.split('=')[1]) || null
+			if (!units.has(id)) {
+				units.set(id, {
+					id,
+					pattern: parse_route_id(id).pattern,
+					segments: id
+						.split('/')
+						.filter(Boolean)
+						.map((segment) => {
+							/** @type {Part[]} */
+							const parts = [];
+							segment.split(/\[(.+?)\]/).map((content, i) => {
+								const dynamic = !!(i % 2);
+
+								if (!content) return;
+
+								parts.push({
+									content,
+									dynamic,
+									rest: dynamic && content.startsWith('...'),
+									type: (dynamic && content.split('=')[1]) || null
+								});
 							});
-						});
-						return parts;
-					}),
-				page: undefined,
-				endpoint: undefined
-			});
-		}
+							return parts;
+						}),
+					page: undefined,
+					endpoint: undefined
+				});
+			}
 
-		const unit = /** @type {Unit} */ (units.get(id));
+			const unit = /** @type {Unit} */ (units.get(id));
 
-		if (config.extensions.find((ext) => file.endsWith(ext))) {
-			const { layouts, errors } = trace(project_relative, file, tree, config.extensions);
-			unit.page = {
-				a: layouts.concat(project_relative),
-				b: errors
-			};
-		} else {
-			unit.endpoint = project_relative;
-		}
-	});
+			if (config.extensions.find((ext) => file.endsWith(ext))) {
+				const { layouts, errors } = trace(project_relative, file, tree, config.extensions);
+				unit.page = {
+					a: layouts.concat(project_relative),
+					b: errors
+				};
+			} else {
+				unit.endpoint = project_relative;
+			}
+		});
+	}
 
 	/** @type {string[]} */
 	const components = [];
@@ -533,8 +535,8 @@ function count_occurrences(needle, haystack) {
  * @param {string[]} [files]
  */
 function list_files(dir, path = '', files = []) {
-	fs__default.readdirSync(dir, { withFileTypes: true })
-		.sort(({ name: a }, { name: b }) => {
+	fs__default.readdirSync(dir)
+		.sort((a, b) => {
 			// sort each directory in (__layout, __error, everything else) order
 			// so that we can trace layouts/errors immediately
 
@@ -551,10 +553,12 @@ function list_files(dir, path = '', files = []) {
 			return a < b ? -1 : 1;
 		})
 		.forEach((file) => {
-			const joined = path ? `${path}/${file.name}` : file.name;
+			const full = `${dir}/${file}`;
+			const stats = fs__default.statSync(full);
+			const joined = path ? `${path}/${file}` : file;
 
-			if (file.isDirectory()) {
-				list_files(`${dir}/${file.name}`, joined, files);
+			if (stats.isDirectory()) {
+				list_files(full, joined, files);
 			} else {
 				files.push(joined);
 			}

package/dist/chunks/write_tsconfig.js

@@ -55,6 +55,19 @@ function write_tsconfig(config, cwd = process.cwd()) {
 		include.push(config_relative(`${dir}/**/*.svelte`));
 	});
 
+	/** @type {Record<string, string[]>} */
+	const paths = {};
+	const alias = {
+		$lib: project_relative(config.kit.files.lib),
+		...config.kit.alias
+	};
+	for (const [key, value] of Object.entries(alias)) {
+		if (fs__default.existsSync(project_relative(value))) {
+			paths[key] = [project_relative(value)];
+			paths[key + '/*'] = [project_relative(value) + '/*'];
+		}
+	}
+
 	write_if_changed(
 		out,
 		JSON.stringify(
@@ -62,12 +75,7 @@ function write_tsconfig(config, cwd = process.cwd()) {
 				compilerOptions: {
 					// generated options
 					baseUrl: config_relative('.'),
-					paths: fs__default.existsSync(config.kit.files.lib)
-						? {
-								$lib: [project_relative(config.kit.files.lib)],
-								'$lib/*': [project_relative(config.kit.files.lib + '/*')]
-						  }
-						: {},
+					paths,
 					rootDirs: [config_relative('.'), './types'],
 
 					// essential options

package/dist/cli.js

@@ -290,12 +290,20 @@ function get_mime_lookup(manifest_data) {
 
 /** @param {import('types').ValidatedConfig} config */
 function get_aliases(config) {
+	/** @type {Record<string, string>} */
 	const alias = {
 		__GENERATED__: path__default.posix.join(config.kit.outDir, 'generated'),
 		$app: `${get_runtime_path(config)}/app`,
+
+		// For now, we handle `$lib` specially here rather than make it a default value for
+		// `config.kit.alias` since it has special meaning for packaging, etc.
 		$lib: config.kit.files.lib
 	};
 
+	for (const [key, value] of Object.entries(config.kit.alias)) {
+		alias[key] = path__default.resolve(value);
+	}
+
 	return alias;
 }
 
@@ -338,6 +346,18 @@ const options = object(
 				return input;
 			}),
 
+			alias: validate({}, (input, keypath) => {
+				if (typeof input !== 'object') {
+					throw new Error(`${keypath} should be an object`);
+				}
+
+				for (const key in input) {
+					assert_string(input[key], `${keypath}.${key}`);
+				}
+
+				return input;
+			}),
+
 			// TODO: remove this for the 1.0 release
 			amp: error(
 				(keypath) =>
@@ -765,7 +785,16 @@ function load_template(cwd, config) {
 
 	if (fs__default.existsSync(template)) {
 		const contents = fs__default.readFileSync(template, 'utf8');
-		const expected_tags = ['%svelte.head%', '%svelte.body%'];
+
+		// TODO remove this for 1.0
+		const match = /%svelte\.([a-z]+)%/.exec(contents);
+		if (match) {
+			throw new Error(
+				`%svelte.${match[1]}% in ${relative} should be replaced with %sveltekit.${match[1]}%`
+			);
+		}
+
+		const expected_tags = ['%sveltekit.head%', '%sveltekit.body%'];
 		expected_tags.forEach((tag) => {
 			if (contents.indexOf(tag) === -1) {
 				throw new Error(`${relative} is missing ${tag}`);
@@ -875,7 +904,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.338');
+const prog = sade('svelte-kit').version('1.0.0-next.340');
 
 prog
 	.command('dev')
@@ -1097,7 +1126,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.338'}\n`));
+	console.log($.bold().cyan(`\n  SvelteKit v${'1.0.0-next.340'}\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.338",
+  "version": "1.0.0-next.340",
   "repository": {
     "type": "git",
     "url": "https://github.com/sveltejs/kit",
@@ -16,36 +16,21 @@
     "vite": "^2.9.9"
   },
   "devDependencies": {
-    "@playwright/test": "^1.21.0",
-    "@rollup/plugin-replace": "^4.0.0",
     "@types/connect": "^3.4.35",
     "@types/cookie": "^0.5.0",
     "@types/marked": "^4.0.1",
     "@types/mime": "^2.0.3",
-    "@types/node": "^16.11.11",
     "@types/sade": "^1.7.3",
     "@types/set-cookie-parser": "^2.4.2",
     "cookie": "^0.5.0",
-    "cross-env": "^7.0.3",
     "devalue": "^2.0.1",
-    "eslint": "^8.3.0",
     "kleur": "^4.1.4",
     "locate-character": "^2.0.5",
-    "marked": "^4.0.5",
     "mime": "^3.0.0",
     "node-fetch": "^3.1.0",
-    "port-authority": "^1.1.2",
-    "rollup": "^2.60.2",
     "selfsigned": "^2.0.0",
     "set-cookie-parser": "^2.4.8",
-    "sirv": "^2.0.0",
-    "svelte": "^3.44.2",
-    "svelte-check": "^2.5.0",
-    "svelte-preprocess": "^4.9.8",
-    "svelte2tsx": "~0.5.0",
-    "tiny-glob": "^0.2.9",
-    "typescript": "^4.6.4",
-    "uvu": "^0.5.2"
+    "svelte": "^3.48.0"
   },
   "peerDependencies": {
     "svelte": "^3.44.0"

package/types/ambient.d.ts

@@ -88,7 +88,7 @@ declare module '$app/env' {
  */
 declare module '$app/navigation' {
 	/**
-	 * If called when the page is being updated following a navigation (in `onMount` or an action, for example), this disables SvelteKit's built-in scroll handling.
+	 * If called when the page is being updated following a navigation (in `onMount` or `afterNavigate` or an action, for example), this disables SvelteKit's built-in scroll handling.
 	 * This is generally discouraged, since it breaks user expectations.
 	 */
 	export function disableScrollHandling(): void;

package/types/index.d.ts

@@ -93,6 +93,7 @@ export interface Config {
 	extensions?: string[];
 	kit?: {
 		adapter?: Adapter;
+		alias?: Record<string, string>;
 		appDir?: string;
 		browser?: {
 			hydrate?: boolean;
@@ -172,7 +173,7 @@ export interface HandleError {
 }
 
 /**
- * The `(input: LoadInput) => LoadOutput` `load` function exported from `<script context="module">` in a page or layout.
+ * The `(event: LoadEvent) => LoadOutput` `load` function exported from `<script context="module">` in a page or layout.
  *
  * Note that you can use [generated types](/docs/types#generated-types) instead of manually specifying the Params generic argument.
  */
@@ -181,10 +182,10 @@ export interface Load<
 	InputProps extends Record<string, any> = Record<string, any>,
 	OutputProps extends Record<string, any> = InputProps
 > {
-	(input: LoadInput<Params, InputProps>): MaybePromise<LoadOutput<OutputProps>>;
+	(event: LoadEvent<Params, InputProps>): MaybePromise<LoadOutput<OutputProps>>;
 }
 
-export interface LoadInput<
+export interface LoadEvent<
 	Params extends Record<string, string> = Record<string, string>,
 	Props extends Record<string, any> = Record<string, any>
 > {

package/types/internal.d.ts

@@ -94,7 +94,7 @@ export class InternalServer extends Server {
 	respond(
 		request: Request,
 		options: RequestOptions & {
-			prerender?: PrerenderOptions;
+			prerendering?: PrerenderOptions;
 		}
 	): Promise<Response>;
 }
@@ -147,7 +147,6 @@ export interface PrerenderDependency {
 
 export interface PrerenderOptions {
 	fallback?: boolean;
-	default: boolean;
 	dependencies: Map<string, PrerenderDependency>;
 }
 
@@ -254,7 +253,10 @@ export interface SSROptions {
 		assets: string;
 	};
 	prefix: string;
-	prerender: boolean;
+	prerender: {
+		default: boolean;
+		enabled: boolean;
+	};
 	read(file: string): Buffer;
 	root: SSRComponent['default'];
 	router: boolean;
@@ -308,7 +310,7 @@ export interface SSRState {
 	getClientAddress: () => string;
 	initiator?: SSRPage | null;
 	platform?: any;
-	prerender?: PrerenderOptions;
+	prerendering?: PrerenderOptions;
 }
 
 export type StrictBody = string | Uint8Array;