parallel routes: support multi-slot layouts #61115
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ijjk
added
area: tests
created-by: Next.js team
|
This stack of pull requests is managed by Graphite. Learn more about stacking. |
ztanner
force-pushed
the
01-24-parallel_routes_support_multi-slot_layouts
branch
from
e1aa924
to
64c6baa
Compare
Stats from current PRDefault BuildGeneral Overall increase
|
| vercel/next.js canary | vercel/next.js 01-24-parallel_routes_support_multi-slot_layouts | Change | |
|---|---|---|---|
| buildDuration | 11.6s | 11.8s | |
| buildDurationCached | 6.1s | 4.8s | N/A |
| nodeModulesSize | 200 MB | 200 MB | |
| nextStartRea..uration (ms) | 426ms | 427ms | N/A |
Client Bundles (main, webpack)
| vercel/next.js canary | vercel/next.js 01-24-parallel_routes_support_multi-slot_layouts | 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 | 238 B | 239 B | N/A |
| main-HASH.js gzip | 31.8 kB | 31.8 kB | N/A |
| webpack-HASH.js gzip | 1.7 kB | 1.7 kB | ✓ |
| Overall change | 100 kB | 100 kB | ✓ |
Legacy Client Bundles (polyfills)
| vercel/next.js canary | vercel/next.js 01-24-parallel_routes_support_multi-slot_layouts | 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-24-parallel_routes_support_multi-slot_layouts | 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-24-parallel_routes_support_multi-slot_layouts | 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-24-parallel_routes_support_multi-slot_layouts | Change | |
|---|---|---|---|
| index.html gzip | 527 B | 529 B | N/A |
| link.html gzip | 539 B | 541 B | N/A |
| withRouter.html gzip | 521 B | 524 B | N/A |
| Overall change | 0 B | 0 B | ✓ |
Edge SSR bundle Size
| vercel/next.js canary | vercel/next.js 01-24-parallel_routes_support_multi-slot_layouts | 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-24-parallel_routes_support_multi-slot_layouts | Change | |
|---|---|---|---|
| middleware-b..fest.js gzip | 625 B | 622 B | N/A |
| 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 | 1.92 kB | 1.92 kB | ✓ |
Next Runtimes
| vercel/next.js canary | vercel/next.js 01-24-parallel_routes_support_multi-slot_layouts | Change | |
|---|---|---|---|
| app-page-exp...dev.js gzip | 170 kB | 170 kB | ✓ |
| app-page-exp..prod.js gzip | 95.7 kB | 95.7 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 | ✓ |
ztanner
commented
Jan 25, 2024
Comment on lines
301
to
310
| const normalizedParallelSegments = Array.isArray(parallelSegment) | ||
| ? parallelSegment.slice(0, 1) | ||
| : [parallelSegment] | ||
| // if `parallelSegment` is an array, we grab | ||
| const normalizedParallelSegment = Array.isArray(parallelSegment) | ||
| ? parallelSegment[0] | ||
| : parallelSegment | ||
|
|
||
| subSegmentPath.push( | ||
| ...normalizedParallelSegments.filter( | ||
| (segment) => | ||
| segment !== PAGE_SEGMENT && segment !== PARALLEL_CHILDREN_SEGMENT | ||
| ) | ||
| ) |
There was a problem hiding this comment.
afaict this was always operating on a single element and I'm not sure why it was being normalized into an array, so I refactored this.
ztanner
requested review from
timneutkens,
ijjk,
shuding,
huozhi,
feedthejim,
a team and
wyattjoh
as code owners
1 task
test/e2e/app-dir/parallel-routes-layouts/parallel-routes-layouts.test.ts
Outdated
Show resolved
Hide resolved
test/e2e/app-dir/parallel-routes-layouts/parallel-routes-layouts.test.ts
Outdated
Show resolved
Hide resolved
ztanner
force-pushed
the
01-24-parallel_routes_support_multi-slot_layouts
branch
from
64c6baa
to
99ac667
Compare
Tests Passed |
ztanner
force-pushed
the
01-24-parallel_routes_support_multi-slot_layouts
branch
from
99ac667
to
770a36b
Compare
acdlite
approved these changes
Jan 26, 2024
1 task
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What?
When using layouts in multiple parallel route slots, only 1 of the layouts would render.
Why?
The
resolveParallelSegmentslogic responsible for populating the loader tree was incorrectly bailing if it found another parallel route that matched a page component.How?
I did my best to update this loader code with some more comments to make it a bit easier to reason about, and also made some slight refactors. But the gist of the fix is just ensuring that each parallel route (that isn't a direct match on the
childrenslot) is resolved as an array, so that when the subtree is created, it doesn't skip over the slot.Fixes #58506
Fixes #59463
Closes NEXT-2222