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.

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

Make CacheNodeSeedData match FlightRouterState more closely #59590

Merged
merged 1 commit into from Dec 13, 2023

Conversation

acdlite
Copy link
Contributor

@acdlite acdlite commented Dec 13, 2023

When PPR is enabled, the CacheNodeSeedData and FlightRouterState contained in an RSC payload (whether it's static or dynamic) should always have the same tree structure.

The only reason the two trees would ever be different is if the server partially renders with loading.tsx, but that behavior doesn't exist when PPR is enabled. (In that case, the CacheNodeSeedData would describe only a subset of FlightRouterState.)

The behavior is already correct but to make the types a bit closer, this changes the parallelRoutes slot of CacheNodeSeedData to be non-nullable; if there are no children, it should be an empty object.

It's not semantically important, I'm only changing it to make the types more consistent, since we typically traverse both trees in parallel.

Eventually we will probably merge these into a single transport type.

Closes NEXT-1868

@ijjk ijjk added created-by: Next.js team PRs by the Next.js team type: next labels Dec 13, 2023
@ijjk
Copy link
Member

ijjk commented Dec 13, 2023

Tests Passed

@ijjk
Copy link
Member

ijjk commented Dec 13, 2023

Stats from current PR

Default Build
General
vercel/next.js canary acdlite/next.js make-cachenodeseeddata-match Change
buildDuration 12.8s 12.8s N/A
buildDurationCached 7.2s 6.1s N/A
nodeModulesSize 200 MB 200 MB N/A
nextStartRea..uration (ms) 433ms 425ms N/A
Client Bundles (main, webpack)
vercel/next.js canary acdlite/next.js make-cachenodeseeddata-match Change
170-HASH.js gzip 28.6 kB 28.7 kB N/A
199.HASH.js gzip 181 B 185 B N/A
3f784ff6-HASH.js gzip 53.3 kB 53.3 kB
framework-HASH.js gzip 45.2 kB 45.2 kB
main-app-HASH.js gzip 240 B 241 B N/A
main-HASH.js gzip 31.7 kB 31.7 kB N/A
webpack-HASH.js gzip 1.7 kB 1.7 kB N/A
Overall change 98.5 kB 98.5 kB
Legacy Client Bundles (polyfills)
vercel/next.js canary acdlite/next.js make-cachenodeseeddata-match Change
polyfills-HASH.js gzip 31 kB 31 kB
Overall change 31 kB 31 kB
Client Pages
vercel/next.js canary acdlite/next.js make-cachenodeseeddata-match Change
_app-HASH.js gzip 195 B 194 B N/A
_error-HASH.js gzip 183 B 182 B N/A
amp-HASH.js gzip 501 B 501 B
css-HASH.js gzip 321 B 321 B
dynamic-HASH.js gzip 2.5 kB 2.5 kB N/A
edge-ssr-HASH.js gzip 255 B 255 B
head-HASH.js gzip 349 B 350 B N/A
hooks-HASH.js gzip 368 B 369 B N/A
image-HASH.js gzip 4.27 kB 4.27 kB N/A
index-HASH.js gzip 255 B 256 B N/A
link-HASH.js gzip 2.61 kB 2.6 kB N/A
routerDirect..HASH.js gzip 311 B 309 B N/A
script-HASH.js gzip 384 B 384 B
withRouter-HASH.js gzip 307 B 306 B N/A
1afbb74e6ecf..834.css gzip 106 B 106 B
Overall change 1.57 kB 1.57 kB
Client Build Manifests
vercel/next.js canary acdlite/next.js make-cachenodeseeddata-match Change
_buildManifest.js gzip 484 B 482 B N/A
Overall change 0 B 0 B
Rendered Page Sizes
vercel/next.js canary acdlite/next.js make-cachenodeseeddata-match Change
index.html gzip 529 B 526 B N/A
link.html gzip 543 B 539 B N/A
withRouter.html gzip 524 B 522 B N/A
Overall change 0 B 0 B
Edge SSR bundle Size
vercel/next.js canary acdlite/next.js make-cachenodeseeddata-match Change
edge-ssr.js gzip 93.7 kB 93.7 kB N/A
page.js gzip 146 kB 146 kB N/A
Overall change 0 B 0 B
Middleware size
vercel/next.js canary acdlite/next.js make-cachenodeseeddata-match Change
middleware-b..fest.js gzip 626 B 620 B N/A
middleware-r..fest.js gzip 151 B 151 B
middleware.js gzip 37.4 kB 37.4 kB N/A
edge-runtime..pack.js gzip 1.92 kB 1.92 kB
Overall change 2.07 kB 2.07 kB
Next Runtimes
vercel/next.js canary acdlite/next.js make-cachenodeseeddata-match Change
app-page-exp...dev.js gzip 168 kB 168 kB N/A
app-page-exp..prod.js gzip 94.1 kB 94.1 kB N/A
app-page-tur..prod.js gzip 94.8 kB 94.8 kB N/A
app-page-tur..prod.js gzip 89.4 kB 89.4 kB N/A
app-page.run...dev.js gzip 138 kB 138 kB N/A
app-page.run..prod.js gzip 88.7 kB 88.7 kB N/A
app-route-ex...dev.js gzip 24 kB 24 kB
app-route-ex..prod.js gzip 16.6 kB 16.6 kB
app-route-tu..prod.js gzip 16.6 kB 16.6 kB
app-route-tu..prod.js gzip 16.2 kB 16.2 kB
app-route.ru...dev.js gzip 23.4 kB 23.4 kB
app-route.ru..prod.js gzip 16.2 kB 16.2 kB
pages-api-tu..prod.js gzip 9.37 kB 9.37 kB
pages-api.ru...dev.js gzip 9.64 kB 9.64 kB
pages-api.ru..prod.js gzip 9.37 kB 9.37 kB
pages-turbo...prod.js gzip 21.9 kB 21.9 kB
pages.runtim...dev.js gzip 22.5 kB 22.5 kB
pages.runtim..prod.js gzip 21.9 kB 21.9 kB
server.runti..prod.js gzip 49.4 kB 49.4 kB
Overall change 257 kB 257 kB
Diff details
Diff for page.js

Diff too large to display

Diff for 170-HASH.js

Diff too large to display

Diff for app-page-exp..ntime.dev.js

Diff too large to display

Diff for app-page-exp..time.prod.js

Diff too large to display

Diff for app-page-tur..time.prod.js

Diff too large to display

Diff for app-page-tur..time.prod.js

Diff too large to display

Diff for app-page.runtime.dev.js

Diff too large to display

Diff for app-page.runtime.prod.js

Diff too large to display

Commit: 1dc40f1

When PPR is enabled, the CacheNodeSeedData and FlightRouterState
contained in an RSC payload (whether it's static or dynamic) should
always have the same tree structure.

The only reason the two trees would ever be different is if the
server partially renders with `loading.tsx`, but that behavior doesn't
exist when PPR is enabled. (In that case, the CacheNodeSeedData would
describe only a subset of FlightRouterState.)

The behavior is already correct but to make the types a bit closer,
this changes the `parallelRoutes` slot of CacheNodeSeedData to be
non-nullable; if there are no children, it should be an empty object.

It's not semantically important, I'm only changing it to make the types
more consistent, since we typically traverse both trees in parallel.

Eventually we will probably merge these into a single transport type.
@acdlite acdlite marked this pull request as ready for review December 13, 2023 17:35
@acdlite acdlite merged commit c964e9a into vercel:canary Dec 13, 2023
68 checks passed
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Dec 28, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants