diff --git a/packages/kit/src/core/create_app/index.js b/packages/kit/src/core/create_app/index.js index ea84e02392c0..b5a1137c8784 100644 --- a/packages/kit/src/core/create_app/index.js +++ b/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]]; `); } diff --git a/packages/kit/src/runtime/client/renderer.js b/packages/kit/src/runtime/client/renderer.js index 4b1fdd10b783..7d9cbfb1f840 100644 --- a/packages/kit/src/runtime/client/renderer.js +++ b/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) || {} }) diff --git a/packages/kit/test/apps/basics/src/routes/__layout.svelte b/packages/kit/test/apps/basics/src/routes/__layout.svelte index 070de74c9f47..2c37c1263bab 100644 --- a/packages/kit/test/apps/basics/src/routes/__layout.svelte +++ b/packages/kit/test/apps/basics/src/routes/__layout.svelte @@ -1,4 +1,6 @@ - + diff --git a/packages/kit/test/apps/basics/src/routes/nested-layout/reset/_tests.js b/packages/kit/test/apps/basics/src/routes/nested-layout/reset/_tests.js index d8ff63e0df28..dc530b5a5b61 100644 --- a/packages/kit/test/apps/basics/src/routes/nested-layout/reset/_tests.js +++ b/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'))); + }); } diff --git a/packages/kit/test/apps/basics/src/routes/nested-layout/reset/index.svelte b/packages/kit/test/apps/basics/src/routes/nested-layout/reset/index.svelte index 2efa530aedf8..c136003fcd58 100644 --- a/packages/kit/test/apps/basics/src/routes/nested-layout/reset/index.svelte +++ b/packages/kit/test/apps/basics/src/routes/nested-layout/reset/index.svelte @@ -1 +1,2 @@ -

Hello

\ No newline at end of file +

Hello

+