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

fix(turbopack): allow page segments that don't alter the path after catchall #67713

Merged
merged 1 commit into from
Jul 13, 2024
Merged

fix(turbopack): allow page segments that don't alter the path after catchall #67713

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 17 additions & 5 deletions packages/next-swc/crates/next-core/src/next_app/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,13 +170,25 @@ impl AppPage {
}

pub fn push(&mut self, segment: PageSegment) -> Result<()> {
if matches!(
self.0.last(),
Some(PageSegment::CatchAll(..) | PageSegment::OptionalCatchAll(..))
) && !matches!(segment, PageSegment::PageType(..))
let has_catchall = self.0.iter().any(|segment| {
matches!(
segment,
PageSegment::CatchAll(..) | PageSegment::OptionalCatchAll(..)
)
});

if has_catchall
&& matches!(
segment,
PageSegment::Static(..)
| PageSegment::Dynamic(..)
| PageSegment::CatchAll(..)
| PageSegment::OptionalCatchAll(..)
)
{
bail!(
"Invalid segment {:?}, catch all segment must be the last segment (segments: {:?})",
"Invalid segment {:?}, catch all segment must be the last segment modifying the \
path (segments: {:?})",
segment,
self.0
)
Expand Down
3 changes: 3 additions & 0 deletions test/e2e/app-dir/catchall-parallel-routes-group/app/[...catchAll]/@slot/(group)/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
export default function Page() {
return <h4 id="catch-all-slot-group-page">Catch-all Slot Group Page</h4>
}
10 changes: 10 additions & 0 deletions test/e2e/app-dir/catchall-parallel-routes-group/app/[...catchAll]/@slot/layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import { ReactNode } from 'react'

export default function Layout({ children }: { children: ReactNode }) {
return (
<div>
<h3 id="catch-all-slot-layout">Catch-all Slot Layout</h3>
{children}
</div>
)
}
17 changes: 17 additions & 0 deletions test/e2e/app-dir/catchall-parallel-routes-group/app/[...catchAll]/layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
import { ReactNode } from 'react'

export default function Layout({
children,
slot,
}: {
children: ReactNode
slot: ReactNode
}) {
return (
<div id="catch-all-layout">
<h2>Catch-all Layout</h2>
{slot}
{children}
</div>
)
}
3 changes: 3 additions & 0 deletions test/e2e/app-dir/catchall-parallel-routes-group/app/[...catchAll]/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
export default function Page() {
return <h3 id="catch-all-page">Catch-all Page</h3>
}
14 changes: 14 additions & 0 deletions test/e2e/app-dir/catchall-parallel-routes-group/app/layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
import { ReactNode } from 'react'

export default function Root({ children }: { children: ReactNode }) {
return (
<html>
<body>
<div id="root-layout">
<h1>Root Layout</h1>
{children}
</div>
</body>
</html>
)
}
12 changes: 12 additions & 0 deletions test/e2e/app-dir/catchall-parallel-routes-group/app/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import Link from 'next/link'

export default function Page() {
return (
<div id="root-page">
<h2>Root Page</h2>
<div>
<Link href="/foobar">To /foobar (catchall)</Link>
</div>
</div>
)
}
22 changes: 22 additions & 0 deletions test/e2e/app-dir/catchall-parallel-routes-group/catchall-parallel-routes-group.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
import { nextTestSetup } from 'e2e-utils'
import { check } from 'next-test-utils'

describe('catchall-parallel-routes-group', () => {
const { next } = nextTestSetup({
files: __dirname,
})

it('should work without throwing any errors about invalid pages', async () => {
const browser = await next.browser('/')

await check(() => browser.elementByCss('body').text(), /Root Page/)
await browser.elementByCss('[href="/foobar"]').click()

// catch all matches page, but also slot with layout and group
await check(() => browser.elementByCss('body').text(), /Catch-all Page/)
await check(
() => browser.elementByCss('body').text(),
/Catch-all Slot Group Page/
)
})
})
6 changes: 6 additions & 0 deletions test/e2e/app-dir/catchall-parallel-routes-group/next.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
/**
* @type {import('next').NextConfig}
*/
const nextConfig = {}

module.exports = nextConfig
Loading