[fix] Import fallback components when they are actually required

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

@@ -102,7 +102,7 @@ function generate_client_manifest(manifest_data, base) {
 
 		export const routes = ${routes};
 
-		export const fallback = [c[0](), c[1]()];
+		export const fallback = [c[0], c[1]];
 	`);
 }
 

packages/kit/src/runtime/client/renderer.js

@@ -60,7 +60,7 @@ function initial_fetch(resource, opts) {
 export class Renderer {
 	/** @param {{
 	 *   Root: CSRComponent;
-	 *   fallback: [CSRComponent, CSRComponent];
+	 *   fallback: [() => CSRComponent, () => CSRComponent];
 	 *   target: Node;
 	 *   session: any;
 	 *   host: string;
@@ -708,7 +708,7 @@ export class Renderer {
 		};
 
 		const node = await this._load_node({
-			module: await this.fallback[0],
+			module: await this.fallback[0](),
 			page,
 			context: {}
 		});
@@ -718,7 +718,7 @@ export class Renderer {
 			await this._load_node({
 				status,
 				error,
-				module: await this.fallback[1],
+				module: await this.fallback[1](),
 				page,
 				context: (node && node.loaded && node.loaded.context) || {}
 			})

packages/kit/test/apps/basics/src/routes/__layout.svelte

@@ -1,4 +1,6 @@
 <script context="module">
+	import { browser } from '$app/env';
+
 	/** @type {import('@sveltejs/kit').Load} */
 	export async function load() {
 		return {
@@ -9,6 +11,16 @@
 			}
 		};
 	}
+
+	if (browser) {
+		const h3 = document.createElement('h3');
+		const text = document.createTextNode('I should not be rendered');
+		h3.appendChild(text);
+		const parentDiv = document.getElementById('nested-layout-reset-test');
+		if (parentDiv) {
+			parentDiv.appendChild(h3);
+		}
+	}
 </script>
 
 <script>
@@ -22,7 +34,7 @@
 	export let foo;
 </script>
 
-<slot></slot>
+<slot />
 
 <footer>{foo.bar}</footer>
 

packages/kit/test/apps/basics/src/routes/nested-layout/reset/_tests.js

@@ -8,4 +8,8 @@ export default function (test) {
 		assert.equal(await page.textContent('h1'), 'Layout reset');
 		assert.equal(await page.textContent('h2'), 'Hello');
 	});
+
+	test('context script reset', '/nested-layout/reset', async ({ page }) => {
+		assert.ok(await page.evaluate(() => !document.querySelector('h3')));
+	});
 }

packages/kit/test/apps/basics/src/routes/nested-layout/reset/index.svelte

@@ -1 +1,2 @@
-<h2>Hello</h2>
+<h2>Hello</h2>
+<div id="nested-layout-reset-test" />