Skip to content

Commit 946424e

Browse files
feedthejimwyattjoh
andauthored
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: Wyatt Johnson <[email protected]>
1 parent bd8d7c6 commit 946424e

File tree

3 files changed

+27
-1
lines changed

3 files changed

+27
-1
lines changed
Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import { notFound } from './not-found'
2+
13
export default function NoopParallelRouteDefault() {
2-
return null
4+
notFound()
35
}
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
export default function Page({ params }) {
2+
return <div>default modal slot</div>
3+
}

test/e2e/app-dir/parallel-routes-and-interception/parallel-routes-and-interception.test.ts

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,27 @@ createNextDescribe(
185185
expect(html).toContain('parallel/(new)/layout')
186186
expect(html).toContain('parallel/(new)/@baz/nested/page')
187187
})
188+
189+
it('should throw a 404 when no matching parallel route is found', async () => {
190+
const browser = await next.browser('/parallel-tab-bar')
191+
// we make sure the page is available through navigating
192+
await check(
193+
() => browser.waitForElementByCss('#home').text(),
194+
'Tab bar page (@children)'
195+
)
196+
await browser.elementByCss('#view-duration-link').click()
197+
await check(
198+
() => browser.waitForElementByCss('#view-duration').text(),
199+
'View duration'
200+
)
201+
202+
// fetch /parallel-tab-bar/view-duration
203+
const res = await next.fetch(
204+
`${next.url}/parallel-tab-bar/view-duration`
205+
)
206+
const html = await res.text()
207+
expect(html).toContain('page could not be found')
208+
})
188209
})
189210

190211
describe('route intercepting', () => {

0 commit comments

Comments
 (0)