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

Add default not found to loader tree of group routes root layer #54228

Merged
merged 6 commits into from
Aug 18, 2023
Merged

Add default not found to loader tree of group routes root layer #54228

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0543614
Add default not found to loader tree of group routes root layer
huozhi Aug 18, 2023
2ef179d
fix detection for group routes root layout
huozhi Aug 18, 2023
ab4ba70
fix test
huozhi Aug 18, 2023
0c0b2f2
fix test
huozhi Aug 18, 2023
61f5508
rm
huozhi Aug 18, 2023
540aeba
Merge branch 'canary' into fix/group-routes-default-404
kodiakhq[bot] Aug 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions packages/next/src/build/webpack/loaders/next-app-loader.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,10 @@ export type ComponentsType = {
readonly defaultPage?: ModuleReference
}

function isGroupSegment(segment: string) {
return segment.startsWith('(') && segment.endsWith(')')
}

async function createAppRouteCode({
name,
page,
Expand Down Expand Up @@ -225,6 +229,7 @@ async function createTreeCodeFromPath(

// Existing tree are the children of the current segment
const props: Record<string, string> = {}
// Root layer could be 1st layer of normal routes
const isRootLayer = segments.length === 0
const isRootLayoutOrRootPage = segments.length <= 1

Expand Down Expand Up @@ -314,10 +319,14 @@ async function createTreeCodeFromPath(
)

// Add default not found error as root not found if not present
const hasNotFound = definedFilePaths.some(
const hasRootNotFound = definedFilePaths.some(
([type]) => type === 'not-found'
)
if (isRootLayer && !hasNotFound) {
// If the first layer is a group route, we treat it as root layer
const isFirstLayerGroupRoute =
segments.length === 1 &&
subSegmentPath.filter((seg) => isGroupSegment(seg)).length === 1
if ((isRootLayer || isFirstLayerGroupRoute) && !hasRootNotFound) {
definedFilePaths.push(['not-found', defaultNotFoundPath])
}

Expand Down
9 changes: 9 additions & 0 deletions test/e2e/app-dir/not-found-default/app/(group)/group-dynamic/[id]/page.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
import { notFound } from 'next/navigation'

export default function Page({ params }) {
if (params.id === '404') {
notFound()
}

return <p id="page">{`group-dynamic [id]`}</p>
}
7 changes: 7 additions & 0 deletions test/e2e/app-dir/not-found-default/app/(group)/layout.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
export default function RootLayout({ children }) {
return (
<html className="group-root-layout">
<body>{children}</body>
</html>
)
}
13 changes: 13 additions & 0 deletions test/e2e/app-dir/not-found-default/index.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,5 +72,18 @@ createNextDescribe(
'This page could not be found.'
)
})

it('should render default not found for group routes if not found is not defined', async () => {
const browser = await next.browser('/group-dynamic/123')
expect(await browser.elementByCss('#page').text()).toBe(
'group-dynamic [id]'
)

await browser.loadPage(next.url + '/group-dynamic/404')
expect(await browser.elementByCss('.next-error-h1').text()).toBe('404')
expect(await browser.elementByCss('html').getAttribute('class')).toBe(
'group-root-layout'
)
})
}
)