Make router able to navigate between rsc pages #35344

huozhi · 2022-03-15T22:02:37Z

Bugfix

Made some changes for the data register buffer flushing in #34631 and #34475 that tried to delete the buffer or flush them only once. But turns out it will break the navigation between RSC pages.

Enhancements

Simplify the inline response writer and inline response data for the initial render. Since they're only for the initial render, navigations will leverage the serialized data fetched from router and construct the react tree.

Bug

Fixes #35135

Related issues linked using fixes #number
Integration tests added
Errors have helpful link attached, see contributing.md

ijjk · 2022-03-16T22:04:35Z

Stats from current PR

Default Build (Decrease detected ✓)

General Overall decrease ✓

	vercel/next.js canary	huozhi/next.js rsc-routing	Change
buildDuration	19.1s	19.2s	⚠️ +92ms
buildDurationCached	7.6s	7.7s	⚠️ +148ms
nodeModulesSize	456 MB	456 MB	-949 B

Page Load Tests Overall increase ✓

	vercel/next.js canary	huozhi/next.js rsc-routing	Change
/ failed reqs	0	0	✓
/ total time (seconds)	3.854	3.851	0
/ avg req/sec	648.68	649.26	+0.58
/error-in-render failed reqs	0	0	✓
/error-in-render total time (seconds)	1.659	1.659	✓
/error-in-render avg req/sec	1506.53	1506.95	+0.42

Client Bundles (main, webpack)

	vercel/next.js canary	huozhi/next.js rsc-routing	Change
925.HASH.js gzip	179 B	179 B	✓
framework-HASH.js gzip	42 kB	42 kB	✓
main-HASH.js gzip	28 kB	28 kB	✓
webpack-HASH.js gzip	1.44 kB	1.44 kB	✓
Overall change	71.6 kB	71.6 kB	✓

Legacy Client Bundles (polyfills)

	vercel/next.js canary	huozhi/next.js rsc-routing	Change
polyfills-HASH.js gzip	31 kB	31 kB	✓
Overall change	31 kB	31 kB	✓

Client Pages

	vercel/next.js canary	huozhi/next.js rsc-routing	Change
_app-HASH.js gzip	1.36 kB	1.36 kB	✓
_error-HASH.js gzip	192 B	192 B	✓
amp-HASH.js gzip	309 B	309 B	✓
css-HASH.js gzip	327 B	327 B	✓
dynamic-HASH.js gzip	2.57 kB	2.57 kB	✓
head-HASH.js gzip	351 B	351 B	✓
hooks-HASH.js gzip	920 B	920 B	✓
image-HASH.js gzip	5.48 kB	5.48 kB	✓
index-HASH.js gzip	263 B	263 B	✓
link-HASH.js gzip	2.26 kB	2.26 kB	✓
routerDirect..HASH.js gzip	320 B	320 B	✓
script-HASH.js gzip	387 B	387 B	✓
withRouter-HASH.js gzip	319 B	319 B	✓
85e02e95b279..7e3.css gzip	107 B	107 B	✓
Overall change	15.2 kB	15.2 kB	✓

Client Build Manifests

	vercel/next.js canary	huozhi/next.js rsc-routing	Change
_buildManifest.js gzip	460 B	460 B	✓
Overall change	460 B	460 B	✓

Rendered Page Sizes

	vercel/next.js canary	huozhi/next.js rsc-routing	Change
index.html gzip	530 B	530 B	✓
link.html gzip	545 B	545 B	✓
withRouter.html gzip	524 B	524 B	✓
Overall change	1.6 kB	1.6 kB	✓

Diffs

Diff for main-HASH.js

@@ -1312,9 +1312,8 @@
         var ServerRoot,
           rscCache,
           nextServerDataLoadingGlobal,
-          serverDataCacheKey,
-          serverDataWriter,
-          serverDataBuffer,
+          initialServerDataWriter,
+          initialServerDataBuffer,
           encoder,
           createFromFetch,
           getCacheKey,

Diff for index.html

@@ -19,7 +19,7 @@
       defer=""
     ></script>
     <script
-      src="/_next/static/chunks/main-237761413e54a4b7.js"
+      src="/_next/static/chunks/main-a8fd59d88b77865e.js"
       defer=""
     ></script>
     <script

Diff for link.html

@@ -19,7 +19,7 @@
       defer=""
     ></script>
     <script
-      src="/_next/static/chunks/main-237761413e54a4b7.js"
+      src="/_next/static/chunks/main-a8fd59d88b77865e.js"
       defer=""
     ></script>
     <script

Diff for withRouter.html

@@ -19,7 +19,7 @@
       defer=""
     ></script>
     <script
-      src="/_next/static/chunks/main-237761413e54a4b7.js"
+      src="/_next/static/chunks/main-a8fd59d88b77865e.js"
       defer=""
     ></script>
     <script

Default Build with SWC (Decrease detected ✓)

General Overall decrease ✓

	vercel/next.js canary	huozhi/next.js rsc-routing	Change
buildDuration	22.5s	23.1s	⚠️ +590ms
buildDurationCached	7.5s	7.6s	⚠️ +74ms
nodeModulesSize	456 MB	456 MB	-949 B

Page Load Tests Overall decrease ⚠️

	vercel/next.js canary	huozhi/next.js rsc-routing	Change
/ failed reqs	0	0	✓
/ total time (seconds)	3.742	3.857	⚠️ +0.12
/ avg req/sec	668.17	648.1	⚠️ -20.07
/error-in-render failed reqs	0	0	✓
/error-in-render total time (seconds)	1.614	1.64	⚠️ +0.03
/error-in-render avg req/sec	1548.95	1524	⚠️ -24.95

Client Bundles (main, webpack)

	vercel/next.js canary	huozhi/next.js rsc-routing	Change
925.HASH.js gzip	178 B	178 B	✓
framework-HASH.js gzip	42.3 kB	42.3 kB	✓
main-HASH.js gzip	28.2 kB	28.2 kB	✓
webpack-HASH.js gzip	1.45 kB	1.45 kB	✓
Overall change	72.1 kB	72.1 kB	✓

Legacy Client Bundles (polyfills)

	vercel/next.js canary	huozhi/next.js rsc-routing	Change
polyfills-HASH.js gzip	31 kB	31 kB	✓
Overall change	31 kB	31 kB	✓

Client Pages

	vercel/next.js canary	huozhi/next.js rsc-routing	Change
_app-HASH.js gzip	1.35 kB	1.35 kB	✓
_error-HASH.js gzip	179 B	179 B	✓
amp-HASH.js gzip	313 B	313 B	✓
css-HASH.js gzip	324 B	324 B	✓
dynamic-HASH.js gzip	2.56 kB	2.56 kB	✓
head-HASH.js gzip	351 B	351 B	✓
hooks-HASH.js gzip	921 B	921 B	✓
image-HASH.js gzip	5.59 kB	5.59 kB	✓
index-HASH.js gzip	261 B	261 B	✓
link-HASH.js gzip	2.33 kB	2.33 kB	✓
routerDirect..HASH.js gzip	322 B	322 B	✓
script-HASH.js gzip	388 B	388 B	✓
withRouter-HASH.js gzip	317 B	317 B	✓
85e02e95b279..7e3.css gzip	107 B	107 B	✓
Overall change	15.3 kB	15.3 kB	✓

Client Build Manifests

	vercel/next.js canary	huozhi/next.js rsc-routing	Change
_buildManifest.js gzip	458 B	458 B	✓
Overall change	458 B	458 B	✓

Rendered Page Sizes

	vercel/next.js canary	huozhi/next.js rsc-routing	Change
index.html gzip	530 B	530 B	✓
link.html gzip	545 B	545 B	✓
withRouter.html gzip	525 B	525 B	✓
Overall change	1.6 kB	1.6 kB	✓

Diffs

Diff for main-HASH.js

@@ -1312,9 +1312,8 @@
         var ServerRoot,
           rscCache,
           nextServerDataLoadingGlobal,
-          serverDataCacheKey,
-          serverDataWriter,
-          serverDataBuffer,
+          initialServerDataWriter,
+          initialServerDataBuffer,
           encoder,
           createFromFetch,
           getCacheKey,

Diff for index.html

@@ -19,7 +19,7 @@
       defer=""
     ></script>
     <script
-      src="/_next/static/chunks/main-237761413e54a4b7.js"
+      src="/_next/static/chunks/main-a8fd59d88b77865e.js"
       defer=""
     ></script>
     <script

Diff for link.html

@@ -19,7 +19,7 @@
       defer=""
     ></script>
     <script
-      src="/_next/static/chunks/main-237761413e54a4b7.js"
+      src="/_next/static/chunks/main-a8fd59d88b77865e.js"
       defer=""
     ></script>
     <script

Diff for withRouter.html

@@ -19,7 +19,7 @@
       defer=""
     ></script>
     <script
-      src="/_next/static/chunks/main-237761413e54a4b7.js"
+      src="/_next/static/chunks/main-a8fd59d88b77865e.js"
       defer=""
     ></script>
     <script

Commit: 0c9964b

Fix error of `Unexpected server data: missing bootstrap script` when the initial rendering is streaming rsc. Introduced in #35344, the buffer might still keep flushing after on mount. Co-authored-by: Shu Ding <3676859+shuding@users.noreply.github.com>

ijjk added created-by: Next.js team PRs by the Next.js team. type: next labels Mar 15, 2022

huozhi marked this pull request as ready for review March 15, 2022 22:22

huozhi requested review from timneutkens, ijjk and shuding as code owners March 15, 2022 22:22

This comment has been minimized.

Sign in to view

huozhi marked this pull request as draft March 16, 2022 14:39

huozhi added 2 commits March 16, 2022 16:21

Make router able to navigate between rsc pages

4dc9aed

use single data buffer and writer

8bd29de

huozhi force-pushed the rsc-routing branch from 771019f to 8bd29de Compare March 16, 2022 15:40

huozhi marked this pull request as ready for review March 16, 2022 15:45

This comment has been minimized.

Sign in to view

shuding approved these changes Mar 16, 2022

View reviewed changes

Merge branch 'canary' into rsc-routing

f6c9d4e

ijjk approved these changes Mar 16, 2022

View reviewed changes

Merge branch 'canary' into rsc-routing

0c9964b

kodiakhq bot merged commit 60ad1de into vercel:canary Mar 16, 2022

huozhi deleted the rsc-routing branch March 16, 2022 22:45

This was referenced Mar 17, 2022

Fix: change the timing for clearing the inlined data buffer #35413

Merged

Fix: change the timing for clearing the inlined data buffer #35419

Closed

github-actions bot locked as resolved and limited conversation to collaborators Apr 17, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Make router able to navigate between rsc pages #35344

Make router able to navigate between rsc pages #35344

huozhi commented Mar 15, 2022 •

edited

Loading

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

ijjk commented Mar 16, 2022

Diffs

Diffs

Make router able to navigate between rsc pages #35344

Make router able to navigate between rsc pages #35344

Conversation

huozhi commented Mar 15, 2022 • edited Loading

Bugfix

Enhancements

Bug

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

ijjk commented Mar 16, 2022

Stats from current PR

Diffs

Diffs

huozhi commented Mar 15, 2022 •

edited

Loading