Fix RSC link navigation #32303

huozhi · 2021-12-08T21:23:37Z

Bug

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

packages/next/client/index.tsx

test/integration/react-streaming-and-server-components/test/index.test.js

Co-authored-by: JJ Kasper <jj@jjsweb.site>

ijjk · 2021-12-09T00:18:37Z

Failing test suites

Commit: f0cf63f

test/integration/amp-export-validation/test/index.test.js

AMP Validation on Export > should have shown errors during build
AMP Validation on Export > throws error on AMP error
AMP Validation on Export > shows warning and error when throwing error

Expand output

● AMP Validation on Export › should have shown errors during build

expect(received).toMatch(expected)

Expected pattern: /error.*The parent tag of tag 'img' is 'div', but it can only be 'i-amphtml-sizer-intrinsic'\./
Received string:  "info  - Checking validity of types...
info  - Creating an optimized production build...
info  - Compiled successfully
info  - Collecting page data...
info  - Generating static pages (0/8)
info  - Generating static pages (2/8)
info  - Generating static pages (4/8)
info  - Generating static pages (6/8)
info  - Generating static pages (8/8)
Amp Validation·
/cat  error  The mandatory attribute 'height' is missing in tag 'amp-video'.  https://amp.dev/documentation/components/amp-video/·
warn  - Detected next.config.js, no exported configuration found. https://nextjs.org/docs/messages/empty-configuration
warn  - The Next.js plugin was not detected in your ESLint configuration. See https://nextjs.org/docs/basic-features/eslint#migrating-existing-config·
> Build error occurred
Error: AMP Validation caused the export to fail. https://nextjs.org/docs/messages/amp-export-validation

  495 |         }
  496 |         if (hadValidationError) {
> 497 |             throw new Error(`AMP Validation caused the export to fail. https://nextjs.org/docs/messages/amp-export-validation`);
      |                   ^
  498 |         }
  499 |         if (renderError) {
  500 |             throw new Error(`Export encountered errors on following paths:\n\t${errorPaths.sort().join('\n\t')}`);

  at ../packages/next/dist/export/index.js:497:19
  at async Span.traceAsyncFn (../packages/next/dist/trace/trace.js:74:20)
  at ../async /home/runner/work/next.js/next.js/packages/next/dist/build/index.js:997:17
  at async Span.traceAsyncFn (../packages/next/dist/trace/trace.js:74:20)
  at ../async /home/runner/work/next.js/next.js/packages/next/dist/build/index.js:871:13
  at async Span.traceAsyncFn (../packages/next/dist/trace/trace.js:74:20)
  at async Object.build [as default] (../packages/next/dist/build/index.js:82:25)
  "
  at Object.<anonymous> (integration/amp-export-validation/test/index.test.js:25:29)

● AMP Validation on Export › throws error on AMP error

expect(received).toMatch(expected)

Expected pattern: /error.*The parent tag of tag 'img' is 'div', but it can only be 'i-amphtml-sizer-intrinsic'\./
Received string:  "info  - using build directory: /home/runner/work/next.js/next.js/test/integration/amp-export-validation/.next
info  - Copying \"static build\" directory
info  - Launching 1 workers
info  - Exporting (0/3)
info  - Exporting (3/3)
Export successful. Files written to /home/runner/work/next.js/next.js/test/integration/amp-export-validation/out
"

  71 |       `exportPathMap: function(defaultMap) {
  72 |       return {
> 73 |         '/dog': { page: '/dog' },
     |                            ^
  74 |       }
  75 |     },`
  76 |     )

  at Object.<anonymous> (integration/amp-export-validation/test/index.test.js:73:28)
      at runMicrotasks (<anonymous>)

● AMP Validation on Export › shows warning and error when throwing error

expect(received).toMatch(expected)

Expected pattern: /error.*The parent tag of tag 'img' is 'div', but it can only be 'i-amphtml-sizer-intrinsic'\./
Received string:  "info  - using build directory: /home/runner/work/next.js/next.js/test/integration/amp-export-validation/.next
info  - Copying \"static build\" directory
info  - Launching 1 workers
info  - Exporting (0/3)
info  - Exporting (3/3)
Export successful. Files written to /home/runner/work/next.js/next.js/test/integration/amp-export-validation/out
"

  92 |     }
  93 |   })
> 94 |
     | ^
  95 |   it('shows warning and error when throwing error', async () => {
  96 |     nextConfig.replace(
  97 |       '// exportPathMap',

  at Object.<anonymous> (integration/amp-export-validation/test/index.test.js:94:28)
      at runMicrotasks (<anonymous>)

ijjk · 2021-12-09T00:25:28Z

Stats from current PR

Default Build (Increase detected ⚠️)

General Overall increase ⚠️

	vercel/next.js canary	huozhi/next.js fix/link	Change
buildDuration	20.8s	20.9s	⚠️ +98ms
buildDurationCached	3.8s	4s	⚠️ +132ms
nodeModulesSize	351 MB	351 MB	⚠️ +123 B

Page Load Tests Overall decrease ⚠️

	vercel/next.js canary	huozhi/next.js fix/link	Change
/ failed reqs	0	0	✓
/ total time (seconds)	3.487	3.456	-0.03
/ avg req/sec	716.89	723.33	+6.44
/error-in-render failed reqs	0	0	✓
/error-in-render total time (seconds)	1.535	1.584	⚠️ +0.05
/error-in-render avg req/sec	1628.58	1578.25	⚠️ -50.33

Client Bundles (main, webpack, commons) Overall increase ⚠️

	vercel/next.js canary	huozhi/next.js fix/link	Change
450.HASH.js gzip	179 B	179 B	✓
framework-HASH.js gzip	42.2 kB	42.2 kB	✓
main-HASH.js gzip	28.8 kB	28.8 kB	⚠️ +12 B
webpack-HASH.js gzip	1.45 kB	1.45 kB	✓
Overall change	72.6 kB	72.7 kB	⚠️ +12 B

Legacy Client Bundles (polyfills)

	vercel/next.js canary	huozhi/next.js fix/link	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/link	Change
_app-HASH.js gzip	1.37 kB	1.37 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.39 kB	2.39 kB	✓
head-HASH.js gzip	350 B	350 B	✓
hooks-HASH.js gzip	919 B	919 B	✓
image-HASH.js gzip	4.73 kB	4.73 kB	✓
index-HASH.js gzip	263 B	263 B	✓
link-HASH.js gzip	2.13 kB	2.13 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.1 kB	14.1 kB	✓

Client Build Manifests

	vercel/next.js canary	huozhi/next.js fix/link	Change
_buildManifest.js gzip	459 B	459 B	✓
Overall change	459 B	459 B	✓

Rendered Page Sizes Overall decrease ✓

	vercel/next.js canary	huozhi/next.js fix/link	Change
index.html gzip	531 B	531 B	✓
link.html gzip	545 B	544 B	-1 B
withRouter.html gzip	526 B	525 B	-1 B
Overall change	1.6 kB	1.6 kB	-2 B

Diffs

Diff for main-HASH.js

@@ -1617,7 +1617,9 @@
                 asPathname = ref1.pathname;
               var route = normalizeRoute(hrefPathname);
               var getHrefForSlug = function(path) {
-                if (rsc) return path + "?__flight__";
+                if (rsc) {
+                  return path + search + (search ? "&" : "?") + "__flight__";
+                }
                 var dataRoute = (0, _getAssetPathFromRoute).default(
                   (0, _normalizeTrailingSlash).removePathTrailingSlash(
                     (0, _router).addLocale(path, locale)

Diff for index.html

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

Diff for link.html

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

Diff for withRouter.html

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

Default Build with SWC (Increase detected ⚠️)

General Overall increase ⚠️

	vercel/next.js canary	huozhi/next.js fix/link	Change
buildDuration	21.9s	21.6s	-321ms
buildDurationCached	3.7s	3.9s	⚠️ +176ms
nodeModulesSize	351 MB	351 MB	⚠️ +123 B

Page Load Tests Overall decrease ⚠️

	vercel/next.js canary	huozhi/next.js fix/link	Change
/ failed reqs	0	0	✓
/ total time (seconds)	3.315	3.37	⚠️ +0.06
/ avg req/sec	754.24	741.77	⚠️ -12.47
/error-in-render failed reqs	0	0	✓
/error-in-render total time (seconds)	1.533	1.557	⚠️ +0.02
/error-in-render avg req/sec	1630.38	1605.82	⚠️ -24.56

Client Bundles (main, webpack, commons) Overall increase ⚠️

	vercel/next.js canary	huozhi/next.js fix/link	Change
450.HASH.js gzip	179 B	179 B	✓
framework-HASH.js gzip	42.3 kB	42.3 kB	✓
main-HASH.js gzip	29 kB	29 kB	⚠️ +10 B
webpack-HASH.js gzip	1.44 kB	1.44 kB	✓
Overall change	73 kB	73 kB	⚠️ +10 B

Legacy Client Bundles (polyfills)

	vercel/next.js canary	huozhi/next.js fix/link	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/link	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.39 kB	2.39 kB	✓
head-HASH.js gzip	342 B	342 B	✓
hooks-HASH.js gzip	906 B	906 B	✓
image-HASH.js gzip	4.75 kB	4.75 kB	✓
index-HASH.js gzip	256 B	256 B	✓
link-HASH.js gzip	2.19 kB	2.19 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.1 kB	14.1 kB	✓

Client Build Manifests

	vercel/next.js canary	huozhi/next.js fix/link	Change
_buildManifest.js gzip	458 B	458 B	✓
Overall change	458 B	458 B	✓

Rendered Page Sizes Overall decrease ✓

	vercel/next.js canary	huozhi/next.js fix/link	Change
index.html gzip	533 B	531 B	-2 B
link.html gzip	546 B	544 B	-2 B
withRouter.html gzip	527 B	525 B	-2 B
Overall change	1.61 kB	1.6 kB	-6 B

Diffs

Diff for main-HASH.js

@@ -1617,7 +1617,9 @@
                 asPathname = ref1.pathname;
               var route = normalizeRoute(hrefPathname);
               var getHrefForSlug = function(path) {
-                if (rsc) return path + "?__flight__";
+                if (rsc) {
+                  return path + search + (search ? "&" : "?") + "__flight__";
+                }
                 var dataRoute = (0, _getAssetPathFromRoute).default(
                   (0, _normalizeTrailingSlash).removePathTrailingSlash(
                     (0, _router).addLocale(path, locale)

Diff for index.html

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

Diff for link.html

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

Diff for withRouter.html

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

Commit: f0cf63f

huozhi · 2021-12-09T11:16:39Z

@ijjk seems the browserlist upgration breaks the test test/integration/amp-export-validation/test/index.test.js?

ijjk · 2021-12-09T15:56:30Z

@huozhi seems the AMP validation rules might have changed, the rules aren't guaranteed by semver unfortunately as it downloads them during install.

Fix RSC link navigation

35593f6

huozhi requested review from ijjk, shuding and timneutkens as code owners December 8, 2021 21:23

ijjk added created-by: Next.js team PRs by the Next.js team type: next labels Dec 8, 2021

shuding reviewed Dec 8, 2021

View reviewed changes

packages/next/client/index.tsx Show resolved Hide resolved

shuding previously approved these changes Dec 8, 2021

View reviewed changes

revert browser interface change

cfdcf47

huozhi dismissed shuding’s stale review via cfdcf47 December 8, 2021 21:44

This comment has been minimized.

Sign in to view

huozhi requested a review from shuding December 8, 2021 21:59

This comment has been minimized.

Sign in to view

ijjk reviewed Dec 8, 2021

View reviewed changes

test/integration/react-streaming-and-server-components/test/index.test.js Outdated Show resolved Hide resolved

Apply suggestions from code review

9599b19

Co-authored-by: JJ Kasper <jj@jjsweb.site>

huozhi requested a review from ijjk December 8, 2021 22:29

ijjk approved these changes Dec 8, 2021

View reviewed changes

This comment has been minimized.

Sign in to view

Merge branch 'canary' into fix/link

cdaf372

This comment has been minimized.

Sign in to view

shuding approved these changes Dec 8, 2021

View reviewed changes

Merge branch 'canary' into fix/link

f0cf63f

timneutkens merged commit b044f42 into vercel:canary Dec 9, 2021

huozhi deleted the fix/link branch December 9, 2021 14:02

vercel locked as resolved and limited conversation to collaborators Jan 27, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix RSC link navigation #32303

Fix RSC link navigation #32303

huozhi commented Dec 8, 2021

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

ijjk commented Dec 9, 2021

ijjk commented Dec 9, 2021

Diffs

Diffs

huozhi commented Dec 9, 2021

ijjk commented Dec 9, 2021

Fix RSC link navigation #32303

Fix RSC link navigation #32303

Conversation

huozhi commented Dec 8, 2021

Bug

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

ijjk commented Dec 9, 2021

Failing test suites

ijjk commented Dec 9, 2021

Stats from current PR

Diffs

Diffs

huozhi commented Dec 9, 2021

ijjk commented Dec 9, 2021