Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Don't show error overlay for not found and redirect #41438

Merged
merged 7 commits into from Oct 15, 2022
Merged

Don't show error overlay for not found and redirect #41438

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7f2a41d
Don't bubble up NEXT_REDIRECT and NEXT_NOT_FOUND to error overlay
timneutkens Oct 14, 2022
57c9935
Add test for meta tag
timneutkens Oct 15, 2022
70b76f0
Add meta robots
timneutkens Oct 15, 2022
4b13e7b
Merge branch 'canary' into dont-show-error-overlay-for-not-found
kodiakhq[bot] Oct 15, 2022
ffaee68
Run redirect in useEffect of error boundary
timneutkens Oct 15, 2022
83958cb
Merge branch 'dont-show-error-overlay-for-not-found' of github.com:ti…
timneutkens Oct 15, 2022
c0b352a
Fix check for error.digest
timneutkens Oct 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 6 additions & 1 deletion packages/next/client/components/layout-router.tsx
View file
Open in desktop
Expand Up @@ -348,7 +348,12 @@ class NotFoundErrorBoundary extends React.Component<

render() {
if (this.state.notFoundTriggered) {
return this.props.notFound
return (
<>
<meta name="robots" content="noindex" />
{this.props.notFound}
</>
)
}

return this.props.children
Expand Down
7 changes: 7 additions & 0 deletions packages/next/client/components/react-dev-overlay/hot-reloader.tsx
View file
Open in desktop
Expand Up @@ -432,6 +432,13 @@ export default function HotReload({
})

const handleOnUnhandledError = useCallback((ev) => {
if (
ev?.error?.digest.startsWith('NEXT_REDIRECT') ||
ev?.error?.digest === 'NEXT_NOT_FOUND'
) {
ev.preventDefault()
return
}
hadRuntimeError = true
onUnhandledError(dispatch, ev)
}, [])
Expand Down
15 changes: 15 additions & 0 deletions test/e2e/app-dir/index.test.ts
View file
Open in desktop
Expand Up @@ -1693,13 +1693,23 @@ describe('app dir', () => {
expect(
await browser.waitForElementByCss('#not-found-component').text()
).toBe('Not Found!')
expect(
await browser
.waitForElementByCss('meta[name="robots"]')
.getAttribute('content')
).toBe('noindex')
})

it.skip('should trigger not-found in a client component', async () => {
const browser = await webdriver(next.url, '/not-found/clientcomponent')
expect(
await browser.waitForElementByCss('#not-found-component').text()
).toBe('Not Found!')
expect(
await browser
.waitForElementByCss('meta[name="robots"]')
.getAttribute('content')
).toBe('noindex')
})
;(isDev ? it.skip : it)(
'should trigger not-found client-side',
Expand All @@ -1712,6 +1722,11 @@ describe('app dir', () => {
expect(
await browser.elementByCss('#not-found-component').text()
).toBe('Not Found!')
expect(
await browser
.waitForElementByCss('meta[name="robots"]')
.getAttribute('content')
).toBe('noindex')
}
)
})
Expand Down