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): catchall route matching #62114

Merged
merged 7 commits into from
Feb 19, 2024
Merged

fix(turbopack): catchall route matching #62114

merged 7 commits into from
Feb 19, 2024

Conversation

ForsakenHarmony
Copy link
Member

@ForsakenHarmony ForsakenHarmony commented Feb 15, 2024 •
edited by ztanner

This PR adds catch-all matching support to Turbopack. This allows you to have catch-all parallel slots.

Closes NEXT-2038
Closes PACK-2518

Fixes #59502

@ijjk ijjk added area: tests Turbopack Related to Turbopack with Next.js. created-by: Turbopack team PRs by the turbopack team type: next labels Feb 15, 2024
@ijjk
Copy link
Member

ijjk commented Feb 15, 2024 •
edited

Stats from current PR

Default Build (Increase detected ⚠️)
General
vercel/next.js canary vercel/next.js hrmny/next-2038-turbopack-catchall-routes Change
buildDuration 20s 20.4s ⚠️ +445ms
buildDurationCached 7.8s 6.9s N/A
nodeModulesSize 196 MB 196 MB ✓
nextStartRea..uration (ms) 428ms 448ms N/A
Client Bundles (main, webpack)
vercel/next.js canary vercel/next.js hrmny/next-2038-turbopack-catchall-routes Change
1068-HASH.js gzip 30.3 kB 30.3 kB N/A
3f784ff6-HASH.js gzip 53.5 kB 53.5 kB N/A
4944-HASH.js gzip 5.04 kB 5.03 kB N/A
8423.HASH.js gzip 181 B 181 B ✓
framework-HASH.js gzip 45.2 kB 45.2 kB ✓
main-app-HASH.js gzip 241 B 243 B N/A
main-HASH.js gzip 32.1 kB 32.1 kB N/A
webpack-HASH.js gzip 1.7 kB 1.7 kB ✓
Overall change 47.1 kB 47.1 kB ✓
Legacy Client Bundles (polyfills)
vercel/next.js canary vercel/next.js hrmny/next-2038-turbopack-catchall-routes Change
polyfills-HASH.js gzip 31 kB 31 kB ✓
Overall change 31 kB 31 kB ✓
Client Pages
vercel/next.js canary vercel/next.js hrmny/next-2038-turbopack-catchall-routes Change
_app-HASH.js gzip 196 B 196 B ✓
_error-HASH.js gzip 184 B 183 B N/A
amp-HASH.js gzip 503 B 504 B N/A
css-HASH.js gzip 323 B 324 B N/A
dynamic-HASH.js gzip 2.5 kB 2.51 kB N/A
edge-ssr-HASH.js gzip 258 B 259 B N/A
head-HASH.js gzip 353 B 351 B N/A
hooks-HASH.js gzip 370 B 370 B ✓
image-HASH.js gzip 4.21 kB 4.2 kB N/A
index-HASH.js gzip 259 B 259 B ✓
link-HASH.js gzip 2.68 kB 2.67 kB N/A
routerDirect..HASH.js gzip 313 B 314 B N/A
script-HASH.js gzip 386 B 385 B N/A
withRouter-HASH.js gzip 309 B 311 B N/A
1afbb74e6ecf..834.css gzip 106 B 106 B ✓
Overall change 931 B 931 B ✓
Client Build Manifests
vercel/next.js canary vercel/next.js hrmny/next-2038-turbopack-catchall-routes Change
_buildManifest.js gzip 485 B 484 B N/A
Overall change 0 B 0 B ✓
Rendered Page Sizes
vercel/next.js canary vercel/next.js hrmny/next-2038-turbopack-catchall-routes Change
index.html gzip 528 B 528 B ✓
link.html gzip 540 B 541 B N/A
withRouter.html gzip 524 B 523 B N/A
Overall change 528 B 528 B ✓
Edge SSR bundle Size
vercel/next.js canary vercel/next.js hrmny/next-2038-turbopack-catchall-routes Change
edge-ssr.js gzip 94.5 kB 94.5 kB N/A
page.js gzip 151 kB 151 kB N/A
Overall change 0 B 0 B ✓
Middleware size
vercel/next.js canary vercel/next.js hrmny/next-2038-turbopack-catchall-routes Change
middleware-b..fest.js gzip 626 B 626 B ✓
middleware-r..fest.js gzip 151 B 151 B ✓
middleware.js gzip 44.6 kB 44.6 kB N/A
edge-runtime..pack.js gzip 1.94 kB 1.94 kB ✓
Overall change 2.72 kB 2.72 kB ✓
Next Runtimes
vercel/next.js canary vercel/next.js hrmny/next-2038-turbopack-catchall-routes Change
app-page-exp...dev.js gzip 166 kB 166 kB ✓
app-page-exp..prod.js gzip 95.9 kB 95.9 kB ✓
app-page-tur..prod.js gzip 97.6 kB 97.6 kB ✓
app-page-tur..prod.js gzip 92 kB 92 kB ✓
app-page.run...dev.js gzip 136 kB 136 kB ✓
app-page.run..prod.js gzip 90.6 kB 90.6 kB ✓
app-route-ex...dev.js gzip 22 kB 22 kB ✓
app-route-ex..prod.js gzip 14.9 kB 14.9 kB ✓
app-route-tu..prod.js gzip 14.9 kB 14.9 kB ✓
app-route-tu..prod.js gzip 14.6 kB 14.6 kB ✓
app-route.ru...dev.js gzip 21.7 kB 21.7 kB ✓
app-route.ru..prod.js gzip 14.6 kB 14.6 kB ✓
pages-api-tu..prod.js gzip 9.47 kB 9.47 kB ✓
pages-api.ru...dev.js gzip 9.74 kB 9.74 kB ✓
pages-api.ru..prod.js gzip 9.47 kB 9.47 kB ✓
pages-turbo...prod.js gzip 22.1 kB 22.1 kB ✓
pages.runtim...dev.js gzip 22.7 kB 22.7 kB ✓
pages.runtim..prod.js gzip 22.1 kB 22.1 kB ✓
server.runti..prod.js gzip 50.1 kB 50.1 kB ✓
Overall change 927 kB 927 kB ✓
build cache Overall increase ⚠️
vercel/next.js canary vercel/next.js hrmny/next-2038-turbopack-catchall-routes Change
0.pack gzip 1.55 MB 1.55 MB N/A
index.pack gzip 104 kB 104 kB ⚠️ +149 B
Overall change 104 kB 104 kB ⚠️ +149 B
Commit: 8614618

@ijjk
Copy link
Member

ijjk commented Feb 16, 2024 •
edited

Tests Passed

@ztanner ztanner marked this pull request as ready for review February 16, 2024 20:30
ForsakenHarmony
ForsakenHarmony commented Feb 17, 2024
View reviewed changes
packages/next-swc/crates/next-core/src/app_structure.rs
.cell(),
severity: IssueSeverity::Error.cell(),
if let Some(current_tree) = tree.parallel_routes.get("children") {
if is_current_directory_catchall && *subtree.has_only_catchall().await? {
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
if is_current_directory_catchall && *subtree.has_only_catchall().await? {
if *subtree.has_only_catchall().await? {

Or is there a reason this is necessary?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A handful of tests fail if I remove this, but I'll need to dig in a bit more to understand why.

@timneutkens timneutkens merged commit 031cf70 into canary Feb 19, 2024
70 checks passed
@timneutkens timneutkens deleted the hrmny/next-2038-turbopack-catchall-routes branch February 19, 2024 09:44
@github-actions github-actions bot added the locked label Mar 4, 2024
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Mar 4, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@ztanner ztanner ztanner left review comments

@timneutkens timneutkens timneutkens approved these changes

@ijjk ijjk Awaiting requested review from ijjk ijjk is a code owner

@shuding shuding Awaiting requested review from shuding shuding is a code owner

@huozhi huozhi Awaiting requested review from huozhi huozhi is a code owner

Assignees
No one assigned
Labels
created-by: Turbopack team PRs by the turbopack team locked Turbopack Related to Turbopack with Next.js. type: next
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[...catchall] routes do not work with turbopack
4 participants
@ForsakenHarmony @ijjk @ztanner @timneutkens