layout resets - closes #626

.changeset/modern-donkeys-invite.md

@@ -0,0 +1,5 @@
+---
+'@sveltejs/kit': patch
+---
+
+Implement layout resets

packages/kit/src/core/build/index.js

@@ -340,9 +340,6 @@ async function build_server(
 			const metadata_lookup = ${s(metadata_lookup)};
 
 			async function load_component(file) {
-				if (!module_lookup[file]) {
-					console.log({ file });
-				}
 				return {
 					module: await module_lookup[file](),
 					...metadata_lookup[file]

packages/kit/src/core/create_manifest_data/index.js

@@ -140,18 +140,24 @@ export default function create_manifest_data({ config, output, cwd = process.cwd
 			params.push(...item.parts.filter((p) => p.dynamic).map((p) => p.content));
 
 			if (item.is_dir) {
+				const layout_reset = find_layout('$layout.reset', item.file);
 				const layout = find_layout('$layout', item.file);
 				const error = find_layout('$error', item.file);
 
+				if (layout_reset && layout) {
+					throw new Error(`Cannot have $layout next to $layout.reset: ${layout_reset}`);
+				}
+
+				if (layout_reset) components.push(layout_reset);
 				if (layout) components.push(layout);
 				if (error) components.push(error);
 
 				walk(
 					path.join(dir, item.basename),
 					segments,
 					params,
-					layout_stack.concat(layout),
-					error_stack.concat(error)
+					layout_reset ? [layout_reset] : layout_stack.concat(layout),
+					layout_reset ? [error] : error_stack.concat(error)
 				);
 			} else if (item.is_page) {
 				components.push(item.file);

packages/kit/src/core/create_manifest_data/index.spec.js

@@ -357,4 +357,42 @@ test('includes nested error components', () => {
 	]);
 });
 
+test('resets layout', () => {
+	const { routes } = create('samples/layout-reset');
+
+	assert.equal(routes, [
+		{
+			type: 'page',
+			pattern: /^\/$/,
+			params: [],
+			path: '/',
+			a: [layout, 'samples/layout-reset/index.svelte'],
+			b: [error]
+		},
+		{
+			type: 'page',
+			pattern: /^\/foo\/?$/,
+			params: [],
+			path: '/foo',
+			a: [
+				layout,
+				'samples/layout-reset/foo/$layout.svelte',
+				'samples/layout-reset/foo/index.svelte'
+			],
+			b: [error]
+		},
+		{
+			type: 'page',
+			pattern: /^\/foo\/bar\/?$/,
+			params: [],
+			path: '/foo/bar',
+			a: [
+				'samples/layout-reset/foo/bar/$layout.reset.svelte',
+				'samples/layout-reset/foo/bar/index.svelte'
+			],
+			b: ['samples/layout-reset/foo/bar/$error.svelte']
+		}
+	]);
+});
+
 test.run();