Fix resolving href with query and matching as

[ijjk]

This ensures we attempt resolving the href if the href pathname matches the as pathname so that client-transitions still succeed correctly when using hidden href query params.

Bug

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

Fixes: #26169
Fixes: #26508

[ijjk]

Stats from current PR

Default Build (Increase detected ⚠️)

General Overall increase ⚠️

	vercel/next.js canary	ijjk/next.js fix/href-query-as-resolve	Change
buildDuration	14.3s	14.3s	-22ms
buildDurationCached	3.6s	3.7s	⚠️ +141ms
nodeModulesSize	182 MB	182 MB	⚠️ +55 B

Page Load Tests Overall increase ✓

	vercel/next.js canary	ijjk/next.js fix/href-query-as-resolve	Change
/ failed reqs	0	0	✓
/ total time (seconds)	3.066	2.964	-0.1
/ avg req/sec	815.43	843.43	+28
/error-in-render failed reqs	0	0	✓
/error-in-render total time (seconds)	1.555	1.49	-0.06
/error-in-render avg req/sec	1607.61	1677.39	+69.78

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

	vercel/next.js canary	ijjk/next.js fix/href-query-as-resolve	Change
779.HASH.js gzip	179 B	179 B	✓
framework-HASH.js gzip	42.2 kB	42.2 kB	✓
main-HASH.js gzip	26.7 kB	26.7 kB	⚠️ +7 B
webpack-HASH.js gzip	1.45 kB	1.45 kB	✓
Overall change	70.6 kB	70.6 kB	⚠️ +7 B

Legacy Client Bundles (polyfills)

	vercel/next.js canary	ijjk/next.js fix/href-query-as-resolve	Change
polyfills-a4..dd70.js gzip	31 kB	31 kB	✓
Overall change	31 kB	31 kB	✓

Client Pages

	vercel/next.js canary	ijjk/next.js fix/href-query-as-resolve	Change
_app-HASH.js gzip	977 B	977 B	✓
_error-HASH.js gzip	194 B	194 B	✓
amp-HASH.js gzip	311 B	311 B	✓
css-HASH.js gzip	328 B	328 B	✓
dynamic-HASH.js gzip	2.67 kB	2.67 kB	✓
head-HASH.js gzip	351 B	351 B	✓
hooks-HASH.js gzip	918 B	918 B	✓
image-HASH.js gzip	4.14 kB	4.14 kB	✓
index-HASH.js gzip	260 B	260 B	✓
link-HASH.js gzip	1.66 kB	1.66 kB	✓
routerDirect..HASH.js gzip	320 B	320 B	✓
script-HASH.js gzip	386 B	386 B	✓
withRouter-HASH.js gzip	319 B	319 B	✓
bb14e60e810b..30f.css gzip	125 B	125 B	✓
Overall change	13 kB	13 kB	✓

Client Build Manifests

	vercel/next.js canary	ijjk/next.js fix/href-query-as-resolve	Change
_buildManifest.js gzip	493 B	493 B	✓
Overall change	493 B	493 B	✓

Rendered Page Sizes Overall decrease ✓

	vercel/next.js canary	ijjk/next.js fix/href-query-as-resolve	Change
index.html gzip	540 B	539 B	-1 B
link.html gzip	552 B	550 B	-2 B
withRouter.html gzip	534 B	532 B	-2 B
Overall change	1.63 kB	1.62 kB	-5 B

Diffs

Diff for main-HASH.js

@@ -5049,9 +5049,9 @@
 
                           case 3:
                             shouldResolveHref =
-                              url === as ||
                               options._h ||
-                              options._shouldResolveHref; // for static pages with query params in the URL we delay
+                              options._shouldResolveHref ||
+                              pathNoQueryHash(url) === pathNoQueryHash(as); // for static pages with query params in the URL we delay
                             // marking the router ready until after the query is updated
 
                             if (options._h) {

Diff for index.html

@@ -19,7 +19,7 @@
       defer=""
     ></script>
     <script
-      src="/_next/static/chunks/main-246559ad3afd7ab81626.js"
+      src="/_next/static/chunks/main-2aa8490323515a9803d7.js"
       defer=""
     ></script>
     <script

Diff for link.html

@@ -19,7 +19,7 @@
       defer=""
     ></script>
     <script
-      src="/_next/static/chunks/main-246559ad3afd7ab81626.js"
+      src="/_next/static/chunks/main-2aa8490323515a9803d7.js"
       defer=""
     ></script>
     <script

Diff for withRouter.html

@@ -19,7 +19,7 @@
       defer=""
     ></script>
     <script
-      src="/_next/static/chunks/main-246559ad3afd7ab81626.js"
+      src="/_next/static/chunks/main-2aa8490323515a9803d7.js"
       defer=""
     ></script>
     <script

---

Default Build with SWC (Increase detected ⚠️)

General Overall increase ⚠️

	vercel/next.js canary	ijjk/next.js fix/href-query-as-resolve	Change
buildDuration	7.4s	7.3s	-60ms
buildDurationCached	3.6s	3.6s	⚠️ +30ms
nodeModulesSize	182 MB	182 MB	⚠️ +55 B

Page Load Tests Overall decrease ⚠️

	vercel/next.js canary	ijjk/next.js fix/href-query-as-resolve	Change
/ failed reqs	0	0	✓
/ total time (seconds)	3.043	3.132	⚠️ +0.09
/ avg req/sec	821.6	798.34	⚠️ -23.26
/error-in-render failed reqs	0	0	✓
/error-in-render total time (seconds)	1.438	1.558	⚠️ +0.12
/error-in-render avg req/sec	1738.32	1604.52	⚠️ -133.8

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

	vercel/next.js canary	ijjk/next.js fix/href-query-as-resolve	Change
675-HASH.js gzip	13.8 kB	13.8 kB	✓
770.HASH.js gzip	178 B	178 B	✓
framework-HASH.js gzip	50.7 kB	50.7 kB	✓
main-HASH.js gzip	34.6 kB	34.6 kB	⚠️ +6 B
webpack-HASH.js gzip	1.65 kB	1.65 kB	✓
Overall change	101 kB	101 kB	⚠️ +6 B

Legacy Client Bundles (polyfills)

	vercel/next.js canary	ijjk/next.js fix/href-query-as-resolve	Change
polyfills-a4..dd70.js gzip	31 kB	31 kB	✓
Overall change	31 kB	31 kB	✓

Client Pages

	vercel/next.js canary	ijjk/next.js fix/href-query-as-resolve	Change
_app-HASH.js gzip	1.32 kB	1.32 kB	✓
_error-HASH.js gzip	180 B	180 B	✓
amp-HASH.js gzip	315 B	315 B	✓
css-HASH.js gzip	331 B	331 B	✓
dynamic-HASH.js gzip	2.8 kB	2.8 kB	✓
head-HASH.js gzip	356 B	356 B	✓
hooks-HASH.js gzip	637 B	637 B	✓
image-HASH.js gzip	573 B	573 B	✓
index-HASH.js gzip	262 B	262 B	✓
link-HASH.js gzip	2.2 kB	2.2 kB	✓
routerDirect..HASH.js gzip	326 B	326 B	✓
script-HASH.js gzip	393 B	393 B	✓
withRouter-HASH.js gzip	322 B	322 B	✓
bb14e60e810b..30f.css gzip	125 B	125 B	✓
Overall change	10.1 kB	10.1 kB	✓

Client Build Manifests

	vercel/next.js canary	ijjk/next.js fix/href-query-as-resolve	Change
_buildManifest.js gzip	511 B	511 B	✓
Overall change	511 B	511 B	✓

Rendered Page Sizes Overall decrease ✓

	vercel/next.js canary	ijjk/next.js fix/href-query-as-resolve	Change
index.html gzip	539 B	538 B	-1 B
link.html gzip	551 B	551 B	✓
withRouter.html gzip	532 B	531 B	-1 B
Overall change	1.62 kB	1.62 kB	-2 B

Diffs

Diff for main-HASH.js

@@ -4325,9 +4325,9 @@
                               return _ctx.abrupt("return", false);
                             case 3:
                               shouldResolveHref =
-                                url === as ||
                                 options._h ||
-                                options._shouldResolveHref;
+                                options._shouldResolveHref ||
+                                pathNoQueryHash(url) === pathNoQueryHash(as);
                               // for static pages with query params in the URL we delay
                               // marking the router ready until after the query is updated
                               if (options._h) {

Diff for index.html

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

Diff for link.html

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

Diff for withRouter.html

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

Commit: d72b880