Fix basePath: false not being honored for client-side redirect

[ijjk]

This ensures we don't automatically prefix the redirect with the configured basePath with basePath: false is set for a getStaticProps/getServerSideProps redirect on the client. This also fixes a flakey test in test/integration/config-promise-error

Bug

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

Fixes: #28425

[ijjk]

Stats from current PR

Default Build (Increase detected ⚠️)

General Overall increase ⚠️

	vercel/next.js canary	ijjk/next.js fix/client-basepath-redirect	Change
buildDuration	16.8s	17s	⚠️ +239ms
buildDurationCached	4.3s	4.4s	⚠️ +169ms
nodeModulesSize	182 MB	182 MB	⚠️ +120 B

Page Load Tests Overall increase ✓

	vercel/next.js canary	ijjk/next.js fix/client-basepath-redirect	Change
/ failed reqs	0	0	✓
/ total time (seconds)	3.649	3.66	⚠️ +0.01
/ avg req/sec	685.16	683.1	⚠️ -2.06
/error-in-render failed reqs	0	0	✓
/error-in-render total time (seconds)	2.309	2.141	-0.17
/error-in-render avg req/sec	1082.5	1167.87	+85.37

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

	vercel/next.js canary	ijjk/next.js fix/client-basepath-redirect	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.8 kB	⚠️ +16 B
webpack-HASH.js gzip	1.45 kB	1.45 kB	✓
Overall change	70.6 kB	70.6 kB	⚠️ +16 B

Legacy Client Bundles (polyfills)

	vercel/next.js canary	ijjk/next.js fix/client-basepath-redirect	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/client-basepath-redirect	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/client-basepath-redirect	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/client-basepath-redirect	Change
index.html gzip	540 B	539 B	-1 B
link.html gzip	552 B	551 B	-1 B
withRouter.html gzip	534 B	533 B	-1 B
Overall change	1.63 kB	1.62 kB	-3 B

Diffs

Diff for main-HASH.js

@@ -5430,7 +5430,12 @@
                             // client-navigation if it is falling back to hard navigation if
                             // it's not
 
-                            if (!destination.startsWith("/")) {
+                            if (
+                              !(
+                                destination.startsWith("/") &&
+                                props.pageProps.__N_REDIRECT_BASE_PATH !== false
+                              )
+                            ) {
                               _context.next = 91;
                               break;
                             }

Diff for index.html

@@ -19,7 +19,7 @@
       defer=""
     ></script>
     <script
-      src="/_next/static/chunks/main-246559ad3afd7ab81626.js"
+      src="/_next/static/chunks/main-eb89692d9796901932d5.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-eb89692d9796901932d5.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-eb89692d9796901932d5.js"
       defer=""
     ></script>
     <script

---

Default Build with SWC (Increase detected ⚠️)

General Overall increase ⚠️

	vercel/next.js canary	ijjk/next.js fix/client-basepath-redirect	Change
buildDuration	8.4s	8.6s	⚠️ +149ms
buildDurationCached	4.1s	4.2s	⚠️ +56ms
nodeModulesSize	182 MB	182 MB	⚠️ +120 B

Page Load Tests Overall increase ✓

	vercel/next.js canary	ijjk/next.js fix/client-basepath-redirect	Change
/ failed reqs	0	0	✓
/ total time (seconds)	3.811	3.715	-0.1
/ avg req/sec	656.07	672.96	+16.89
/error-in-render failed reqs	0	0	✓
/error-in-render total time (seconds)	2.35	2.169	-0.18
/error-in-render avg req/sec	1064.02	1152.63	+88.61

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

	vercel/next.js canary	ijjk/next.js fix/client-basepath-redirect	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	⚠️ +24 B
webpack-HASH.js gzip	1.65 kB	1.65 kB	✓
Overall change	101 kB	101 kB	⚠️ +24 B

Legacy Client Bundles (polyfills)

	vercel/next.js canary	ijjk/next.js fix/client-basepath-redirect	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/client-basepath-redirect	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/client-basepath-redirect	Change
_buildManifest.js gzip	511 B	511 B	✓
Overall change	511 B	511 B	✓

Rendered Page Sizes Overall increase ⚠️

	vercel/next.js canary	ijjk/next.js fix/client-basepath-redirect	Change
index.html gzip	539 B	539 B	✓
link.html gzip	551 B	552 B	⚠️ +1 B
withRouter.html gzip	532 B	532 B	✓
Overall change	1.62 kB	1.62 kB	⚠️ +1 B

Diffs

Diff for main-HASH.js

@@ -4662,7 +4662,13 @@
                                 break;
                               }
                               destination = props.pageProps.__N_REDIRECT;
-                              if (!destination.startsWith("/")) {
+                              if (
+                                !(
+                                  destination.startsWith("/") &&
+                                  props.pageProps.__N_REDIRECT_BASE_PATH !==
+                                    false
+                                )
+                              ) {
                                 _ctx.next = 92;
                                 break;
                               }

Diff for index.html

@@ -19,7 +19,7 @@
       defer=""
     ></script>
     <script
-      src="/_next/static/chunks/main-7f59a1afca5e51109152.js"
+      src="/_next/static/chunks/main-2e5d7e1981b4d98b86d7.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-2e5d7e1981b4d98b86d7.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-2e5d7e1981b4d98b86d7.js"
       defer=""
     ></script>
     <script

Commit: 8197c08