-
Notifications
You must be signed in to change notification settings - Fork 27.2k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
propagate notFound errors past a segment's error boundary #60567
Merged
huozhi
merged 1 commit into
canary
from
01-12-propagate_notFound_errors_past_a_segment_s_error_boundary
Jan 12, 2024
+81
−14
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
'use client' | ||
export default function Error() { | ||
return <div>There was an error</div> | ||
} |
10 changes: 10 additions & 0 deletions
10
test/e2e/app-dir/not-found/basic/app/error-boundary/nested/[dynamic]/page.js
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,10 @@ | ||
import { notFound } from 'next/navigation' | ||
import React from 'react' | ||
|
||
export default function Page({ params }) { | ||
if (params.dynamic === 'trigger-not-found') { | ||
notFound() | ||
} | ||
|
||
return <div>Hello World</div> | ||
} |
4 changes: 4 additions & 0 deletions
4
test/e2e/app-dir/not-found/basic/app/error-boundary/nested/nested-2/error.js
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,4 @@ | ||
'use client' | ||
export default function Error() { | ||
return <div>There was an error</div> | ||
} |
18 changes: 18 additions & 0 deletions
18
test/e2e/app-dir/not-found/basic/app/error-boundary/nested/nested-2/page.js
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,18 @@ | ||
'use client' | ||
import { notFound } from 'next/navigation' | ||
import React from 'react' | ||
export default function Page() { | ||
const [shouldError, setShouldError] = React.useState(false) | ||
if (shouldError) { | ||
notFound() | ||
} | ||
return ( | ||
<button | ||
onClick={() => { | ||
setShouldError(true) | ||
}} | ||
> | ||
Trigger Not Found | ||
</button> | ||
) | ||
} |
3 changes: 3 additions & 0 deletions
3
test/e2e/app-dir/not-found/basic/app/error-boundary/nested/not-found.js
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,3 @@ | ||
export default function Page() { | ||
return <h1>Not Found (error-boundary/nested)</h1> | ||
} |
18 changes: 18 additions & 0 deletions
18
test/e2e/app-dir/not-found/basic/app/error-boundary/page.js
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,18 @@ | ||
'use client' | ||
import { notFound } from 'next/navigation' | ||
import React from 'react' | ||
export default function Page() { | ||
const [shouldError, setShouldError] = React.useState(false) | ||
if (shouldError) { | ||
notFound() | ||
} | ||
return ( | ||
<button | ||
onClick={() => { | ||
setShouldError(true) | ||
}} | ||
> | ||
Trigger Not Found | ||
</button> | ||
) | ||
} |
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
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Throwing an exception and leaking an internal digest does not seem like the right way to handle this. If a root not found boundary isn't detected, we should handle with a fallback 404 or fail the build if that's not possible. I think this can be done in a separate PR. For now this will simply render nothing on the screen, which seems like more reasonable interim behavior. We'll still show an error in dev.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can we show the same default 404 page we should for non-existing routes
Cc @ijjk