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

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

Merged
merged 4 commits into from
Mar 18, 2022

Conversation

huozhi
Copy link
Member

@huozhi huozhi commented Mar 17, 2022

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.

@ijjk ijjk added created-by: Next.js team PRs by the Next.js team. type: next labels Mar 17, 2022
@huozhi huozhi changed the title change the timing for clearing the inlined data buffer Fix: change the timing for clearing the inlined data buffer Mar 17, 2022
shuding
shuding previously approved these changes Mar 17, 2022
ijjk
ijjk previously approved these changes Mar 17, 2022
@ijjk

This comment has been minimized.

@shuding shuding dismissed stale reviews from ijjk and themself via 31a1a69 March 17, 2022 21:43
shuding
shuding previously approved these changes Mar 17, 2022
@ijjk

This comment has been minimized.

@ijjk

This comment has been minimized.

@ijjk
Copy link
Member

ijjk commented Mar 18, 2022

Stats from current PR

Default Build (Decrease detected ✓)
General Overall increase ⚠️
vercel/next.js canary shuding/next.js shu/0612 Change
buildDuration 15.8s 15.8s ⚠️ +45ms
buildDurationCached 6.2s 6.3s ⚠️ +98ms
nodeModulesSize 456 MB 456 MB ⚠️ +1.73 kB
Page Load Tests Overall decrease ⚠️
vercel/next.js canary shuding/next.js shu/0612 Change
/ failed reqs 0 0
/ total time (seconds) 3.128 3.194 ⚠️ +0.07
/ avg req/sec 799.17 782.8 ⚠️ -16.37
/error-in-render failed reqs 0 0
/error-in-render total time (seconds) 1.349 1.404 ⚠️ +0.05
/error-in-render avg req/sec 1852.98 1780.46 ⚠️ -72.52
Client Bundles (main, webpack)
vercel/next.js canary shuding/next.js shu/0612 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 shuding/next.js shu/0612 Change
polyfills-HASH.js gzip 31 kB 31 kB
Overall change 31 kB 31 kB
Client Pages
vercel/next.js canary shuding/next.js shu/0612 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 shuding/next.js shu/0612 Change
_buildManifest.js gzip 460 B 460 B
Overall change 460 B 460 B
Rendered Page Sizes
vercel/next.js canary shuding/next.js shu/0612 Change
index.html gzip 531 B 531 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,6 +1312,9 @@
         var ServerRoot,
           rscCache,
           nextServerDataLoadingGlobal,
+          DOMContentLoaded,
+          initialServerDataFlushed,
+          initialServerDataLoaded,
           initialServerDataWriter,
           initialServerDataBuffer,
           encoder,
Diff for index.html
@@ -19,7 +19,7 @@
       defer=""
     ></script>
     <script
-      src="/_next/static/chunks/main-fb3e61118240274c.js"
+      src="/_next/static/chunks/main-f0211c30f9415997.js"
       defer=""
     ></script>
     <script
Diff for link.html
@@ -19,7 +19,7 @@
       defer=""
     ></script>
     <script
-      src="/_next/static/chunks/main-fb3e61118240274c.js"
+      src="/_next/static/chunks/main-f0211c30f9415997.js"
       defer=""
     ></script>
     <script
Diff for withRouter.html
@@ -19,7 +19,7 @@
       defer=""
     ></script>
     <script
-      src="/_next/static/chunks/main-fb3e61118240274c.js"
+      src="/_next/static/chunks/main-f0211c30f9415997.js"
       defer=""
     ></script>
     <script

Default Build with SWC (Decrease detected ✓)
General Overall increase ⚠️
vercel/next.js canary shuding/next.js shu/0612 Change
buildDuration 19.2s 19.8s ⚠️ +563ms
buildDurationCached 6.1s 6.2s ⚠️ +87ms
nodeModulesSize 456 MB 456 MB ⚠️ +1.73 kB
Page Load Tests Overall decrease ⚠️
vercel/next.js canary shuding/next.js shu/0612 Change
/ failed reqs 0 0
/ total time (seconds) 3.171 3.178 ⚠️ +0.01
/ avg req/sec 788.31 786.66 ⚠️ -1.65
/error-in-render failed reqs 0 0
/error-in-render total time (seconds) 1.351 1.356 ⚠️ +0.01
/error-in-render avg req/sec 1850.25 1844.08 ⚠️ -6.17
Client Bundles (main, webpack)
vercel/next.js canary shuding/next.js shu/0612 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 shuding/next.js shu/0612 Change
polyfills-HASH.js gzip 31 kB 31 kB
Overall change 31 kB 31 kB
Client Pages
vercel/next.js canary shuding/next.js shu/0612 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 shuding/next.js shu/0612 Change
_buildManifest.js gzip 458 B 458 B
Overall change 458 B 458 B
Rendered Page Sizes
vercel/next.js canary shuding/next.js shu/0612 Change
index.html gzip 531 B 531 B
link.html gzip 546 B 546 B
withRouter.html gzip 527 B 527 B
Overall change 1.6 kB 1.6 kB

Diffs

Diff for main-HASH.js
@@ -1312,6 +1312,9 @@
         var ServerRoot,
           rscCache,
           nextServerDataLoadingGlobal,
+          DOMContentLoaded,
+          initialServerDataFlushed,
+          initialServerDataLoaded,
           initialServerDataWriter,
           initialServerDataBuffer,
           encoder,
Diff for index.html
@@ -19,7 +19,7 @@
       defer=""
     ></script>
     <script
-      src="/_next/static/chunks/main-fb3e61118240274c.js"
+      src="/_next/static/chunks/main-f0211c30f9415997.js"
       defer=""
     ></script>
     <script
Diff for link.html
@@ -19,7 +19,7 @@
       defer=""
     ></script>
     <script
-      src="/_next/static/chunks/main-fb3e61118240274c.js"
+      src="/_next/static/chunks/main-f0211c30f9415997.js"
       defer=""
     ></script>
     <script
Diff for withRouter.html
@@ -19,7 +19,7 @@
       defer=""
     ></script>
     <script
-      src="/_next/static/chunks/main-fb3e61118240274c.js"
+      src="/_next/static/chunks/main-f0211c30f9415997.js"
       defer=""
     ></script>
     <script
Commit: bff1880

@kodiakhq kodiakhq bot merged commit f2fee3d into vercel:canary Mar 18, 2022
@shuding shuding deleted the shu/0612 branch March 18, 2022 01:56
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Apr 17, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants