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

package/assets/client/start.js

@@ -21,6 +21,19 @@ function coalesce_to_error(err) {
  * @returns {import('types').NormalizedLoadOutput}
  */
 function normalize(loaded) {
+	// TODO remove for 1.0
+	// @ts-expect-error
+	if (loaded.fallthrough) {
+		throw new Error(
+			'fallthrough is no longer supported. Use matchers instead: https://kit.svelte.dev/docs/routing#advanced-routing-matching'
+		);
+	}
+
+	// TODO remove for 1.0
+	if ('maxage' in loaded) {
+		throw new Error('maxage should be replaced with cache: { maxage }');
+	}
+
 	const has_error_status =
 		loaded.status && loaded.status >= 400 && loaded.status <= 599 && !loaded.redirect;
 	if (loaded.error || has_error_status) {
@@ -812,9 +825,9 @@ function create_client({ target, session, base, trailing_slash }) {
 		}
 
 		const leaf = filtered[filtered.length - 1];
-		const maxage = leaf.loaded && leaf.loaded.maxage;
+		const load_cache = leaf?.loaded?.cache;
 
-		if (maxage) {
+		if (load_cache) {
 			const key = url.pathname + url.search; // omit hash
 			let ready = false;
 
@@ -827,7 +840,7 @@ function create_client({ target, session, base, trailing_slash }) {
 				clearTimeout(timeout);
 			};
 
-			const timeout = setTimeout(clear, maxage * 1000);
+			const timeout = setTimeout(clear, load_cache.maxage * 1000);
 
 			const unsubscribe = stores.session.subscribe(() => {
 				if (ready) clear();
@@ -1056,14 +1069,6 @@ function create_client({ target, session, base, trailing_slash }) {
 						}
 
 						if (node.loaded) {
-							// TODO remove for 1.0
-							// @ts-expect-error
-							if (node.loaded.fallthrough) {
-								throw new Error(
-									'fallthrough is no longer supported. Use matchers instead: https://kit.svelte.dev/docs/routing#advanced-routing-matching'
-								);
-							}
-
 							if (node.loaded.error) {
 								status = node.loaded.status;
 								error = node.loaded.error;

package/assets/server/index.js

@@ -1147,7 +1147,8 @@ async function render_response({
 	let rendered;
 
 	let is_private = false;
-	let maxage;
+	/** @type {import('types').NormalizedLoadOutputCache | undefined} */
+	let cache;
 
 	if (error) {
 		error.stack = options.get_stack(error);
@@ -1163,9 +1164,8 @@ async function render_response({
 			if (fetched && page_config.hydrate) serialized_data.push(...fetched);
 			if (props) shadow_props = props;
 
-			if (uses_credentials) is_private = true;
-
-			maxage = loaded.maxage;
+			cache = loaded?.cache;
+			is_private = cache?.private ?? uses_credentials;
 		});
 
 		const session = writable($session);
@@ -1179,7 +1179,7 @@ async function render_response({
 				session: {
 					...session,
 					subscribe: (fn) => {
-						is_private = true;
+						is_private = cache?.private ?? true;
 						return session.subscribe(fn);
 					}
 				},
@@ -1366,8 +1366,8 @@ async function render_response({
 			http_equiv.push(csp_headers);
 		}
 
-		if (maxage) {
-			http_equiv.push(`<meta http-equiv="cache-control" content="max-age=${maxage}">`);
+		if (cache) {
+			http_equiv.push(`<meta http-equiv="cache-control" content="max-age=${cache.maxage}">`);
 		}
 
 		if (http_equiv.length > 0) {
@@ -1388,8 +1388,8 @@ async function render_response({
 		etag: `"${hash(html)}"`
 	});
 
-	if (maxage) {
-		headers.set('cache-control', `${is_private ? 'private' : 'public'}, max-age=${maxage}`);
+	if (cache) {
+		headers.set('cache-control', `${is_private ? 'private' : 'public'}, max-age=${cache.maxage}`);
 	}
 
 	if (!options.floc) {
@@ -1915,6 +1915,19 @@ var splitCookiesString_1 = setCookie.exports.splitCookiesString = splitCookiesSt
  * @returns {import('types').NormalizedLoadOutput}
  */
 function normalize(loaded) {
+	// TODO remove for 1.0
+	// @ts-expect-error
+	if (loaded.fallthrough) {
+		throw new Error(
+			'fallthrough is no longer supported. Use matchers instead: https://kit.svelte.dev/docs/routing#advanced-routing-matching'
+		);
+	}
+
+	// TODO remove for 1.0
+	if ('maxage' in loaded) {
+		throw new Error('maxage should be replaced with cache: { maxage }');
+	}
+
 	const has_error_status =
 		loaded.status && loaded.status >= 400 && loaded.status <= 599 && !loaded.redirect;
 	if (loaded.error || has_error_status) {
@@ -2411,14 +2424,6 @@ async function load_node({
 			// TODO do we still want to enforce this now that there's no fallthrough?
 			throw new Error(`load function must return a value${options.dev ? ` (${node.entry})` : ''}`);
 		}
-
-		// TODO remove for 1.0
-		// @ts-expect-error
-		if (loaded.fallthrough) {
-			throw new Error(
-				'fallthrough is no longer supported. Use matchers instead: https://kit.svelte.dev/docs/routing#advanced-routing-matching'
-			);
-		}
 	} else if (shadow.body) {
 		loaded = {
 			props: shadow.body

package/dist/chunks/index5.js

@@ -169,7 +169,7 @@ async function preview({ port, host, config, https: use_https = false }) {
 	});
 
 	return new Promise((fulfil) => {
-		http_server.listen(port, host || '0.0.0.0', () => {
+		http_server.listen(port, host, () => {
 			fulfil(http_server);
 		});
 	});

package/dist/chunks/sync.js

@@ -419,6 +419,10 @@ function trace(file, path, tree, extensions) {
 		const node = tree.get(parts.join('/'));
 		const layout = node?.layouts[layout_id];
 
+		if (layout?.file && layouts.indexOf(layout.file) > -1) {
+			throw new Error(`Recursive layout detected: ${layout.file} -> ${layouts.join(' -> ')}`);
+		}
+
 		// any segment that has neither a __layout nor an __error can be discarded.
 		// in other words these...
 		//  layouts: [a, , b, c]

package/dist/cli.js

@@ -459,7 +459,7 @@ const options = object(
 
 					if (input !== '' && (input.endsWith('/') || !input.startsWith('/'))) {
 						throw new Error(
-							`${keypath} option must be a root-relative path that starts but doesn't end with '/'. See https://kit.svelte.dev/docs/configuration#paths`
+							`${keypath} option must either be the empty string or a root-relative path that starts but doesn't end with '/'. See https://kit.svelte.dev/docs/configuration#paths`
 						);
 					}
 
@@ -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.319');
+const prog = sade('svelte-kit').version('1.0.0-next.321');
 
 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.319'}\n`));
+	console.log($.bold().cyan(`\n  SvelteKit v${'1.0.0-next.321'}\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.319",
+  "version": "1.0.0-next.321",
   "repository": {
     "type": "git",
     "url": "https://github.com/sveltejs/kit",

package/types/index.d.ts

@@ -207,10 +207,15 @@ export interface LoadOutput<Props extends Record<string, any> = Record<string, a
 	redirect?: string;
 	props?: Props;
 	stuff?: Partial<App.Stuff>;
-	maxage?: number;
+	cache?: LoadOutputCache;
 	dependencies?: string[];
 }
 
+export interface LoadOutputCache {
+	maxage: number;
+	private?: boolean;
+}
+
 export interface Navigation {
 	from: URL;
 	to: URL;

package/types/internal.d.ts

@@ -117,10 +117,15 @@ export type NormalizedLoadOutput = {
 	redirect?: string;
 	props?: Record<string, any> | Promise<Record<string, any>>;
 	stuff?: Record<string, any>;
-	maxage?: number;
+	cache?: NormalizedLoadOutputCache;
 	dependencies?: string[];
 };
 
+export interface NormalizedLoadOutputCache {
+	maxage: number;
+	private?: boolean;
+}
+
 export interface PageData {
 	type: 'page';
 	id: string;