parallel routes: fix catch-all slots being treated as optional catch-all

[ztanner]

What

Catch-all parallel slots were being incorrectly matched to the root of their segment. For example, @foo/[...catchAll]/page as a parallel route on /page.tsx should not match on /, but it should match on /foo, /bar, ...etc

Why

The catch-all route normalization logic doesn't treat optional catch-all routes differently from catch-all routes. The assumption was if any catch-all route was found, that it should match the path that shared its prefix.

How

This updates the normalization logic to handle optional-catchall as it was in the original implementation. For regular catch-all, we ensure that the catch-all base path (for /[...slug] that'd be /) isn't identical to the path we'd match it to.

Fixes #60613
Closes NEXT-2243

[ztanner]

• canary
  • parallel routes: fix catch-all slots being treated as optional catch-all #61174 👈

This stack of pull requests is managed by Graphite. Learn more about stacking.

Join @ztanner and the rest of your teammates on Graphite

[ijjk]

Tests Passed

[ijjk]

Stats from current PR

Default Build

General Overall increase ⚠️

	vercel/next.js canary	vercel/next.js 01-25-parallel_routes_catch-all_slots_shouldn_t_be_treated_as_optional_catchall	Change
buildDuration	15.8s	15.9s	⚠️ +122ms
buildDurationCached	9.2s	7.5s	N/A
nodeModulesSize	200 MB	200 MB	⚠️ +4.65 kB
nextStartRea..uration (ms)	510ms	509ms	N/A

Client Bundles (main, webpack)

	vercel/next.js canary	vercel/next.js 01-25-parallel_routes_catch-all_slots_shouldn_t_be_treated_as_optional_catchall	Change
3f784ff6-HASH.js gzip	53.4 kB	53.4 kB	✓
423.HASH.js gzip	185 B	181 B	N/A
68-HASH.js gzip	29.8 kB	29.8 kB	N/A
framework-HASH.js gzip	45.2 kB	45.2 kB	✓
main-app-HASH.js gzip	240 B	240 B	✓
main-HASH.js gzip	31.8 kB	31.8 kB	N/A
webpack-HASH.js gzip	1.7 kB	1.7 kB	✓
Overall change	101 kB	101 kB	✓

Legacy Client Bundles (polyfills)

	vercel/next.js canary	vercel/next.js 01-25-parallel_routes_catch-all_slots_shouldn_t_be_treated_as_optional_catchall	Change
polyfills-HASH.js gzip	31 kB	31 kB	✓
Overall change	31 kB	31 kB	✓

Client Pages

	vercel/next.js canary	vercel/next.js 01-25-parallel_routes_catch-all_slots_shouldn_t_be_treated_as_optional_catchall	Change
_app-HASH.js gzip	194 B	195 B	N/A
_error-HASH.js gzip	182 B	181 B	N/A
amp-HASH.js gzip	502 B	502 B	✓
css-HASH.js gzip	320 B	322 B	N/A
dynamic-HASH.js gzip	2.5 kB	2.5 kB	N/A
edge-ssr-HASH.js gzip	255 B	256 B	N/A
head-HASH.js gzip	350 B	349 B	N/A
hooks-HASH.js gzip	368 B	369 B	N/A
image-HASH.js gzip	4.18 kB	4.18 kB	N/A
index-HASH.js gzip	257 B	256 B	N/A
link-HASH.js gzip	2.61 kB	2.61 kB	N/A
routerDirect..HASH.js gzip	310 B	311 B	N/A
script-HASH.js gzip	384 B	383 B	N/A
withRouter-HASH.js gzip	306 B	308 B	N/A
1afbb74e6ecf..834.css gzip	106 B	106 B	✓
Overall change	608 B	608 B	✓

Client Build Manifests

	vercel/next.js canary	vercel/next.js 01-25-parallel_routes_catch-all_slots_shouldn_t_be_treated_as_optional_catchall	Change
_buildManifest.js gzip	484 B	484 B	✓
Overall change	484 B	484 B	✓

Rendered Page Sizes

	vercel/next.js canary	vercel/next.js 01-25-parallel_routes_catch-all_slots_shouldn_t_be_treated_as_optional_catchall	Change
index.html gzip	527 B	526 B	N/A
link.html gzip	540 B	540 B	✓
withRouter.html gzip	522 B	522 B	✓
Overall change	1.06 kB	1.06 kB	✓

Edge SSR bundle Size

	vercel/next.js canary	vercel/next.js 01-25-parallel_routes_catch-all_slots_shouldn_t_be_treated_as_optional_catchall	Change
edge-ssr.js gzip	94 kB	94 kB	N/A
page.js gzip	149 kB	149 kB	N/A
Overall change	0 B	0 B	✓

Middleware size

	vercel/next.js canary	vercel/next.js 01-25-parallel_routes_catch-all_slots_shouldn_t_be_treated_as_optional_catchall	Change
middleware-b..fest.js gzip	622 B	622 B	✓
middleware-r..fest.js gzip	151 B	149 B	N/A
middleware.js gzip	37.6 kB	37.6 kB	N/A
edge-runtime..pack.js gzip	1.92 kB	1.92 kB	✓
Overall change	2.54 kB	2.54 kB	✓

Next Runtimes

	vercel/next.js canary	vercel/next.js 01-25-parallel_routes_catch-all_slots_shouldn_t_be_treated_as_optional_catchall	Change
app-page-exp...dev.js gzip	170 kB	170 kB	✓
app-page-exp..prod.js gzip	95.6 kB	95.6 kB	✓
app-page-tur..prod.js gzip	96.3 kB	96.3 kB	✓
app-page-tur..prod.js gzip	90.9 kB	90.9 kB	✓
app-page.run...dev.js gzip	142 kB	142 kB	✓
app-page.run..prod.js gzip	90.2 kB	90.2 kB	✓
app-route-ex...dev.js gzip	22.2 kB	22.2 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.5 kB	14.5 kB	✓
app-route.ru...dev.js gzip	21.6 kB	21.6 kB	✓
app-route.ru..prod.js gzip	14.5 kB	14.5 kB	✓
pages-api-tu..prod.js gzip	9.42 kB	9.42 kB	✓
pages-api.ru...dev.js gzip	9.69 kB	9.69 kB	✓
pages-api.ru..prod.js gzip	9.42 kB	9.42 kB	✓
pages-turbo...prod.js gzip	22 kB	22 kB	✓
pages.runtim...dev.js gzip	22.6 kB	22.6 kB	✓
pages.runtim..prod.js gzip	22 kB	22 kB	✓
server.runti..prod.js gzip	49.7 kB	49.7 kB	✓
Overall change	932 kB	932 kB	✓

Commit: 30df52e