-
-
Notifications
You must be signed in to change notification settings - Fork 1.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[fix] deeply-nested error components render right
Under some circumstances, a deeply-nested error component could render with a layout from a parent folder instead of the layout from the error component's own folder. This commit fixes that bug, so that error components are correctly matched up with layout components in the same folder even when deeply nested.
- Loading branch information
Showing
8 changed files
with
70 additions
and
6 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
--- | ||
'@sveltejs/kit': patch | ||
--- | ||
|
||
[fix] deeply-nested error components render with correct layout |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 2 additions & 0 deletions
2
packages/kit/test/apps/basics/src/routes/nested-layout/foo/__layout.svelte
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
<slot></slot> | ||
<p id="nested-foo">Nested layout foo</p> |
34 changes: 34 additions & 0 deletions
34
packages/kit/test/apps/basics/src/routes/nested-layout/foo/bar/__error.svelte
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
<script context="module"> | ||
/** @type {import('@sveltejs/kit').ErrorLoad} */ | ||
export async function load({ status, error }) { | ||
return { | ||
props: { | ||
answer: 42, | ||
status, | ||
error | ||
} | ||
}; | ||
} | ||
</script> | ||
|
||
<script> | ||
/** @type {number} */ | ||
export let status; | ||
/** @type {Error} */ | ||
export let error; | ||
/** @type {number} */ | ||
export let answer; | ||
</script> | ||
|
||
<h1>Nested error page</h1> | ||
<p id="nested-error-status">status: {status}</p> | ||
<p id="nested-error-message">error.message: {error && error.message}</p> | ||
<p id="nested-error-loaded">answer: {answer}</p> | ||
|
||
<style> | ||
h1 { | ||
color: blue; | ||
} | ||
</style> |
2 changes: 2 additions & 0 deletions
2
packages/kit/test/apps/basics/src/routes/nested-layout/foo/bar/__layout.svelte
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
<slot></slot> | ||
<p id="nested-bar">Nested layout bar</p> |
7 changes: 7 additions & 0 deletions
7
packages/kit/test/apps/basics/src/routes/nested-layout/foo/bar/nope.svelte
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
<script context="module"> | ||
export async function load() { | ||
throw new Error('nope'); | ||
} | ||
</script> | ||
|
||
<h1>should not see this</h1> |
1 change: 1 addition & 0 deletions
1
packages/kit/test/apps/basics/src/routes/nested-layout/foo/baz.svelte
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
<p id="baz">baz</p> |