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 reuse of inline flight response and 404 for RSC in node runtime #34202

Merged
merged 2 commits into from
Feb 10, 2022

Conversation

huozhi
Copy link
Member

@huozhi huozhi commented Feb 10, 2022

Fixes

  • We need give value for __flight__ query or it will lost in node runtime
  • Match the cache key of flight response (path + search, route, id`)
  • Flight response should return 200 instead of 404 for 404 page

Tests

  • Run rsc for node runtime test suite
  • Add more cases for 404

@ijjk
Copy link
Member

ijjk commented Feb 10, 2022

Stats from current PR

Default Build (Decrease detected ✓)
General Overall increase ⚠️
vercel/next.js canary huozhi/next.js fix/rsc-nrt-1 Change
buildDuration 15.7s 15.7s ⚠️ +11ms
buildDurationCached 6.1s 6.1s -14ms
nodeModulesSize 359 MB 359 MB ⚠️ +513 B
Page Load Tests Overall decrease ⚠️
vercel/next.js canary huozhi/next.js fix/rsc-nrt-1 Change
/ failed reqs 0 0
/ total time (seconds) 3.145 3.174 ⚠️ +0.03
/ avg req/sec 794.88 787.64 ⚠️ -7.24
/error-in-render failed reqs 0 0
/error-in-render total time (seconds) 1.379 1.407 ⚠️ +0.03
/error-in-render avg req/sec 1813.08 1776.68 ⚠️ -36.4
Client Bundles (main, webpack, commons) Overall increase ⚠️
vercel/next.js canary huozhi/next.js fix/rsc-nrt-1 Change
450.HASH.js gzip 179 B 179 B
framework-HASH.js gzip 42 kB 42 kB
main-HASH.js gzip 27.9 kB 27.9 kB ⚠️ +1 B
webpack-HASH.js gzip 1.44 kB 1.44 kB
Overall change 71.5 kB 71.5 kB ⚠️ +1 B
Legacy Client Bundles (polyfills)
vercel/next.js canary huozhi/next.js fix/rsc-nrt-1 Change
polyfills-HASH.js gzip 31 kB 31 kB
Overall change 31 kB 31 kB
Client Pages
vercel/next.js canary huozhi/next.js fix/rsc-nrt-1 Change
_app-HASH.js gzip 1.36 kB 1.36 kB
_error-HASH.js gzip 194 B 194 B
amp-HASH.js gzip 312 B 312 B
css-HASH.js gzip 326 B 326 B
dynamic-HASH.js gzip 2.57 kB 2.57 kB
head-HASH.js gzip 350 B 350 B
hooks-HASH.js gzip 919 B 919 B
image-HASH.js gzip 5.01 kB 5.01 kB
index-HASH.js gzip 263 B 263 B
link-HASH.js gzip 2.26 kB 2.26 kB
routerDirect..HASH.js gzip 321 B 321 B
script-HASH.js gzip 383 B 383 B
withRouter-HASH.js gzip 318 B 318 B
85e02e95b279..7e3.css gzip 107 B 107 B
Overall change 14.7 kB 14.7 kB
Client Build Manifests
vercel/next.js canary huozhi/next.js fix/rsc-nrt-1 Change
_buildManifest.js gzip 459 B 459 B
Overall change 459 B 459 B
Rendered Page Sizes Overall increase ⚠️
vercel/next.js canary huozhi/next.js fix/rsc-nrt-1 Change
index.html gzip 532 B 532 B
link.html gzip 544 B 545 B ⚠️ +1 B
withRouter.html gzip 526 B 526 B
Overall change 1.6 kB 1.6 kB ⚠️ +1 B

Diffs

Diff for main-HASH.js
@@ -1651,7 +1651,7 @@
               var route = normalizeRoute(hrefPathname);
               var getHrefForSlug = function(path) {
                 if (rsc) {
-                  return path + search + (search ? "&" : "?") + "__flight__";
+                  return path + search + (search ? "&" : "?") + "__flight__=1";
                 }
                 var dataRoute = (0, _getAssetPathFromRoute).default(
                   (0, _normalizeTrailingSlash).removePathTrailingSlash(
Diff for index.html
@@ -19,7 +19,7 @@
       defer=""
     ></script>
     <script
-      src="/_next/static/chunks/main-fe08ec2c3ac3c4b1.js"
+      src="/_next/static/chunks/main-38a66fde880a06a9.js"
       defer=""
     ></script>
     <script
Diff for link.html
@@ -19,7 +19,7 @@
       defer=""
     ></script>
     <script
-      src="/_next/static/chunks/main-fe08ec2c3ac3c4b1.js"
+      src="/_next/static/chunks/main-38a66fde880a06a9.js"
       defer=""
     ></script>
     <script
Diff for withRouter.html
@@ -19,7 +19,7 @@
       defer=""
     ></script>
     <script
-      src="/_next/static/chunks/main-fe08ec2c3ac3c4b1.js"
+      src="/_next/static/chunks/main-38a66fde880a06a9.js"
       defer=""
     ></script>
     <script

Default Build with SWC (Decrease detected ✓)
General Overall increase ⚠️
vercel/next.js canary huozhi/next.js fix/rsc-nrt-1 Change
buildDuration 19.2s 19.4s ⚠️ +189ms
buildDurationCached 6.1s 6.1s ⚠️ +56ms
nodeModulesSize 359 MB 359 MB ⚠️ +513 B
Page Load Tests Overall decrease ⚠️
vercel/next.js canary huozhi/next.js fix/rsc-nrt-1 Change
/ failed reqs 0 0
/ total time (seconds) 3.159 3.203 ⚠️ +0.04
/ avg req/sec 791.44 780.52 ⚠️ -10.92
/error-in-render failed reqs 0 0
/error-in-render total time (seconds) 1.39 1.402 ⚠️ +0.01
/error-in-render avg req/sec 1798.65 1783.64 ⚠️ -15.01
Client Bundles (main, webpack, commons) Overall increase ⚠️
vercel/next.js canary huozhi/next.js fix/rsc-nrt-1 Change
450.HASH.js gzip 179 B 179 B
framework-HASH.js gzip 42.1 kB 42.1 kB
main-HASH.js gzip 27.9 kB 27.9 kB ⚠️ +3 B
webpack-HASH.js gzip 1.44 kB 1.44 kB
Overall change 71.6 kB 71.7 kB ⚠️ +3 B
Legacy Client Bundles (polyfills)
vercel/next.js canary huozhi/next.js fix/rsc-nrt-1 Change
polyfills-HASH.js gzip 31 kB 31 kB
Overall change 31 kB 31 kB
Client Pages
vercel/next.js canary huozhi/next.js fix/rsc-nrt-1 Change
_app-HASH.js gzip 1.35 kB 1.35 kB
_error-HASH.js gzip 180 B 180 B
amp-HASH.js gzip 305 B 305 B
css-HASH.js gzip 321 B 321 B
dynamic-HASH.js gzip 2.56 kB 2.56 kB
head-HASH.js gzip 342 B 342 B
hooks-HASH.js gzip 911 B 911 B
image-HASH.js gzip 5.05 kB 5.05 kB
index-HASH.js gzip 256 B 256 B
link-HASH.js gzip 2.28 kB 2.28 kB
routerDirect..HASH.js gzip 314 B 314 B
script-HASH.js gzip 375 B 375 B
withRouter-HASH.js gzip 309 B 309 B
85e02e95b279..7e3.css gzip 107 B 107 B
Overall change 14.7 kB 14.7 kB
Client Build Manifests
vercel/next.js canary huozhi/next.js fix/rsc-nrt-1 Change
_buildManifest.js gzip 458 B 458 B
Overall change 458 B 458 B
Rendered Page Sizes
vercel/next.js canary huozhi/next.js fix/rsc-nrt-1 Change
index.html gzip 533 B 533 B
link.html gzip 547 B 547 B
withRouter.html gzip 527 B 527 B
Overall change 1.61 kB 1.61 kB

Diffs

Diff for main-HASH.js
@@ -1651,7 +1651,7 @@
               var route = normalizeRoute(hrefPathname);
               var getHrefForSlug = function(path) {
                 if (rsc) {
-                  return path + search + (search ? "&" : "?") + "__flight__";
+                  return path + search + (search ? "&" : "?") + "__flight__=1";
                 }
                 var dataRoute = (0, _getAssetPathFromRoute).default(
                   (0, _normalizeTrailingSlash).removePathTrailingSlash(
Diff for index.html
@@ -19,7 +19,7 @@
       defer=""
     ></script>
     <script
-      src="/_next/static/chunks/main-fe08ec2c3ac3c4b1.js"
+      src="/_next/static/chunks/main-38a66fde880a06a9.js"
       defer=""
     ></script>
     <script
Diff for link.html
@@ -19,7 +19,7 @@
       defer=""
     ></script>
     <script
-      src="/_next/static/chunks/main-fe08ec2c3ac3c4b1.js"
+      src="/_next/static/chunks/main-38a66fde880a06a9.js"
       defer=""
     ></script>
     <script
Diff for withRouter.html
@@ -19,7 +19,7 @@
       defer=""
     ></script>
     <script
-      src="/_next/static/chunks/main-fe08ec2c3ac3c4b1.js"
+      src="/_next/static/chunks/main-38a66fde880a06a9.js"
       defer=""
     ></script>
     <script
Commit: 4c9ff37

@kodiakhq kodiakhq bot merged commit 4f8ffed into vercel:canary Feb 10, 2022
@huozhi huozhi deleted the fix/rsc-nrt-1 branch February 10, 2022 21:29
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Mar 13, 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.

2 participants