Unverified Commit 946424ef authored by Jimmy Lai's avatar Jimmy Lai Committed by GitHub

parallel routes: return a 404 when a parallel route does not have a default…

parallel routes: return a 404 when a parallel route does not have a default page/do not match (#47872)

<!-- Thanks for opening a PR! Your contribution is much appreciated.
To make sure your PR is handled as smoothly as possible we request that
you follow the checklist sections below.
Choose the right checklist for the change(s) that you're making:

## For Contributors

### Improving Documentation or adding/fixing Examples

- The "examples guidelines" are followed from our contributing doc
https://github.com/vercel/next.js/blob/canary/contributing/examples/adding-examples.md
- Make sure the linting passes by running `pnpm build && pnpm lint`. See
https://github.com/vercel/next.js/blob/canary/contributing/repository/linting.md

### Fixing a bug

- Related issues linked using `fixes #number`
- Tests added. See:
https://github.com/vercel/next.js/blob/canary/contributing/core/testing.md#writing-tests-for-nextjs
- Errors have a helpful link attached, see
https://github.com/vercel/next.js/blob/canary/contributing.md

### Adding a feature

- Implements an existing feature request or RFC. Make sure the feature
request has been accepted for implementation before opening a PR. (A
discussion must be opened, see
https://github.com/vercel/next.js/discussions/new?category=ideas)
- Related issues/discussions are linked using `fixes #number`
- e2e tests added
(https://github.com/vercel/next.js/blob/canary/contributing/core/testing.md#writing-tests-for-nextjs
- Documentation added
- Telemetry added. In case of a feature if it's used or not.
- Errors have a helpful link attached, see
https://github.com/vercel/next.js/blob/canary/contributing.md



## For Maintainers

- Minimal description (aim for explaining to someone not on the team to
understand the PR)
- When linking to a Slack thread, you might want to share details of the
conclusion
- Link both the Linear (Fixes NEXT-xxx) and the GitHub issues
- Add review comments if necessary to explain to the reviewer the logic
behind a change

### What?

### Why?

### How?

Closes NEXT-
Fixes #

-->

fix NEXT-918

---------
Co-authored-by: 's avatarWyatt Johnson <accounts+github@wyattjoh.ca>
parent bd8d7c61
import { notFound } from './not-found'
export default function NoopParallelRouteDefault() { export default function NoopParallelRouteDefault() {
return null notFound()
} }
export default function Page({ params }) {
return <div>default modal slot</div>
}
...@@ -185,6 +185,27 @@ createNextDescribe( ...@@ -185,6 +185,27 @@ createNextDescribe(
expect(html).toContain('parallel/(new)/layout') expect(html).toContain('parallel/(new)/layout')
expect(html).toContain('parallel/(new)/@baz/nested/page') expect(html).toContain('parallel/(new)/@baz/nested/page')
}) })
it('should throw a 404 when no matching parallel route is found', async () => {
const browser = await next.browser('/parallel-tab-bar')
// we make sure the page is available through navigating
await check(
() => browser.waitForElementByCss('#home').text(),
'Tab bar page (@children)'
)
await browser.elementByCss('#view-duration-link').click()
await check(
() => browser.waitForElementByCss('#view-duration').text(),
'View duration'
)
// fetch /parallel-tab-bar/view-duration
const res = await next.fetch(
`${next.url}/parallel-tab-bar/view-duration`
)
const html = await res.text()
expect(html).toContain('page could not be found')
})
}) })
describe('route intercepting', () => { describe('route intercepting', () => {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment