Don't add locale to client side redirects from data fetching #36944

hanneslund · 2022-05-16T11:48:44Z

Bug

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

ijjk · 2022-05-16T12:13:14Z

Stats from current PR

Default Build (Increase detected ⚠️)

General Overall increase ⚠️

	vercel/next.js canary	hanneslund/next.js issue-36169	Change
buildDuration	14.8s	14.7s	-114ms
buildDurationCached	5.6s	5.5s	-6ms
nodeModulesSize	478 MB	478 MB	⚠️ +187 B

Page Load Tests Overall increase ✓

	vercel/next.js canary	hanneslund/next.js issue-36169	Change
/ failed reqs	0	0	✓
/ total time (seconds)	3.233	3.272	⚠️ +0.04
/ avg req/sec	773.21	764.12	⚠️ -9.09
/error-in-render failed reqs	0	0	✓
/error-in-render total time (seconds)	1.091	1.086	0
/error-in-render avg req/sec	2290.55	2302.53	+11.98

Client Bundles (main, webpack) Overall increase ⚠️

	vercel/next.js canary	hanneslund/next.js issue-36169	Change
925.HASH.js gzip	179 B	179 B	✓
framework-HASH.js gzip	42 kB	42 kB	✓
main-HASH.js gzip	28.8 kB	28.8 kB	⚠️ +8 B
webpack-HASH.js gzip	1.44 kB	1.44 kB	✓
Overall change	72.4 kB	72.4 kB	⚠️ +8 B

Legacy Client Bundles (polyfills)

	vercel/next.js canary	hanneslund/next.js issue-36169	Change
polyfills-HASH.js gzip	31 kB	31 kB	✓
Overall change	31 kB	31 kB	✓

Client Pages

	vercel/next.js canary	hanneslund/next.js issue-36169	Change
_app-HASH.js gzip	1.36 kB	1.36 kB	✓
_error-HASH.js gzip	193 B	193 B	✓
amp-HASH.js gzip	308 B	308 B	✓
css-HASH.js gzip	327 B	327 B	✓
dynamic-HASH.js gzip	2.71 kB	2.71 kB	✓
head-HASH.js gzip	359 B	359 B	✓
hooks-HASH.js gzip	920 B	920 B	✓
image-HASH.js gzip	5.73 kB	5.73 kB	✓
index-HASH.js gzip	263 B	263 B	✓
link-HASH.js gzip	2.65 kB	2.65 kB	✓
routerDirect..HASH.js gzip	320 B	320 B	✓
script-HASH.js gzip	391 B	391 B	✓
withRouter-HASH.js gzip	318 B	318 B	✓
85e02e95b279..7e3.css gzip	107 B	107 B	✓
Overall change	16 kB	16 kB	✓

Client Build Manifests

	vercel/next.js canary	hanneslund/next.js issue-36169	Change
_buildManifest.js gzip	458 B	458 B	✓
Overall change	458 B	458 B	✓

Rendered Page Sizes Overall decrease ✓

	vercel/next.js canary	hanneslund/next.js issue-36169	Change
index.html gzip	531 B	531 B	✓
link.html gzip	545 B	545 B	✓
withRouter.html gzip	528 B	526 B	-2 B
Overall change	1.6 kB	1.6 kB	-2 B

Diffs

Diff for main-HASH.js

@@ -5746,15 +5746,17 @@
                               });
                             }
                             if (!((__N_SSG || __N_SSP) && props)) {
-                              _ctx.next = 146;
+                              _ctx.next = 147;
                               break;
                             }
                             if (
                               !(props.pageProps && props.pageProps.__N_REDIRECT)
                             ) {
-                              _ctx.next = 131;
+                              _ctx.next = 132;
                               break;
                             }
+                            // Use the destination from redirect without adding locale
+                            options.locale = false;
                             destination = props.pageProps.__N_REDIRECT;
                             if (
                               !(
@@ -5762,7 +5764,7 @@
                                 props.pageProps.__N_REDIRECT_BASE_PATH !== false
                               )
                             ) {
-                              _ctx.next = 129;
+                              _ctx.next = 130;
                               break;
                             }
                             parsedHref = (0,
@@ -5782,31 +5784,31 @@
                               "return",
                               _this.change(method, newUrl, newAs, options)
                             );
-                          case 129:
+                          case 130:
                             window.location.href = destination;
                             return _ctx.abrupt(
                               "return",
                               new Promise(function() {})
                             );
-                          case 131:
+                          case 132:
                             nextState.isPreview = !!props.__N_PREVIEW;
                             if (!(props.notFound === SSG_DATA_NOT_FOUND)) {
-                              _ctx.next = 146;
+                              _ctx.next = 147;
                               break;
                             }
-                            _ctx.prev = 134;
-                            _ctx.next = 137;
+                            _ctx.prev = 135;
+                            _ctx.next = 138;
                             return _this.fetchComponent("/404");
-                          case 137:
+                          case 138:
                             notFoundRoute = "/404";
-                            _ctx.next = 143;
+                            _ctx.next = 144;
                             break;
-                          case 140:
-                            _ctx.prev = 140;
-                            _ctx.t3 = _ctx["catch"](134);
+                          case 141:
+                            _ctx.prev = 141;
+                            _ctx.t3 = _ctx["catch"](135);
                             notFoundRoute = "/_error";
-                          case 143:
-                            _ctx.next = 145;
+                          case 144:
+                            _ctx.next = 146;
                             return _this.getRouteInfo(
                               notFoundRoute,
                               notFoundRoute,
@@ -5819,9 +5821,9 @@
                               nextState.locale,
                               nextState.isPreview
                             );
-                          case 145:
-                            routeInfo = _ctx.sent;
                           case 146:
+                            routeInfo = _ctx.sent;
+                          case 147:
                             Router.events.emit(
                               "beforeHistoryChange",
                               as,
@@ -5859,7 +5861,7 @@
                                   y: 0
                                 }
                               : null;
-                            _ctx.next = 155;
+                            _ctx.next = 156;
                             return _this
                               .set(
                                 _objectSpread({}, nextState, {
@@ -5878,9 +5880,9 @@
                                 if (e.cancelled) error = error || e;
                                 else throw e;
                               });
-                          case 155:
+                          case 156:
                             if (!error) {
-                              _ctx.next = 158;
+                              _ctx.next = 159;
                               break;
                             }
                             Router.events.emit(
@@ -5890,7 +5892,7 @@
                               routeProps
                             );
                             throw error;
-                          case 158:
+                          case 159:
                             if (false) {
                             }
                             Router.events.emit(
@@ -5899,8 +5901,8 @@
                               routeProps
                             );
                             return _ctx.abrupt("return", true);
-                          case 163:
-                            _ctx.prev = 163;
+                          case 164:
+                            _ctx.prev = 164;
                             _ctx.t4 = _ctx["catch"](113);
                             if (
                               !(
@@ -5908,13 +5910,13 @@
                                 _ctx.t4.cancelled
                               )
                             ) {
-                              _ctx.next = 167;
+                              _ctx.next = 168;
                               break;
                             }
                             return _ctx.abrupt("return", false);
-                          case 167:
-                            throw _ctx.t4;
                           case 168:
+                            throw _ctx.t4;
+                          case 169:
                           case "end":
                             return _ctx.stop();
                         }
@@ -5923,8 +5925,8 @@
                     null,
                     [
                       [39, 51],
-                      [113, 163],
-                      [134, 140]
+                      [113, 164],
+                      [135, 141]
                     ]
                   );
                 })

Diff for index.html

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

Diff for link.html

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

Diff for withRouter.html

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

Default Build with SWC (Increase detected ⚠️)

General Overall increase ⚠️

	vercel/next.js canary	hanneslund/next.js issue-36169	Change
buildDuration	17.4s	17.2s	-180ms
buildDurationCached	5.5s	5.5s	-17ms
nodeModulesSize	478 MB	478 MB	⚠️ +187 B

Page Load Tests Overall increase ✓

	vercel/next.js canary	hanneslund/next.js issue-36169	Change
/ failed reqs	0	0	✓
/ total time (seconds)	3.28	3.2	-0.08
/ avg req/sec	762.18	781.24	+19.06
/error-in-render failed reqs	0	0	✓
/error-in-render total time (seconds)	1.08	1.064	-0.02
/error-in-render avg req/sec	2314.82	2348.74	+33.92

Client Bundles (main, webpack) Overall increase ⚠️

	vercel/next.js canary	hanneslund/next.js issue-36169	Change
925.HASH.js gzip	178 B	178 B	✓
framework-HASH.js gzip	42.7 kB	42.7 kB	✓
main-HASH.js gzip	29.2 kB	29.2 kB	⚠️ +6 B
webpack-HASH.js gzip	1.45 kB	1.45 kB	✓
Overall change	73.5 kB	73.5 kB	⚠️ +6 B

Legacy Client Bundles (polyfills)

	vercel/next.js canary	hanneslund/next.js issue-36169	Change
polyfills-HASH.js gzip	31 kB	31 kB	✓
Overall change	31 kB	31 kB	✓

Client Pages

	vercel/next.js canary	hanneslund/next.js issue-36169	Change
_app-HASH.js gzip	1.35 kB	1.35 kB	✓
_error-HASH.js gzip	179 B	179 B	✓
amp-HASH.js gzip	311 B	311 B	✓
css-HASH.js gzip	324 B	324 B	✓
dynamic-HASH.js gzip	2.89 kB	2.89 kB	✓
head-HASH.js gzip	357 B	357 B	✓
hooks-HASH.js gzip	920 B	920 B	✓
image-HASH.js gzip	5.82 kB	5.82 kB	✓
index-HASH.js gzip	261 B	261 B	✓
link-HASH.js gzip	2.78 kB	2.78 kB	✓
routerDirect..HASH.js gzip	322 B	322 B	✓
script-HASH.js gzip	392 B	392 B	✓
withRouter-HASH.js gzip	317 B	317 B	✓
85e02e95b279..7e3.css gzip	107 B	107 B	✓
Overall change	16.3 kB	16.3 kB	✓

Client Build Manifests

	vercel/next.js canary	hanneslund/next.js issue-36169	Change
_buildManifest.js gzip	457 B	457 B	✓
Overall change	457 B	457 B	✓

Rendered Page Sizes

	vercel/next.js canary	hanneslund/next.js issue-36169	Change
index.html gzip	531 B	531 B	✓
link.html gzip	546 B	546 B	✓
withRouter.html gzip	528 B	528 B	✓
Overall change	1.6 kB	1.6 kB	✓

Diffs

Diff for main-HASH.js

@@ -5746,15 +5746,17 @@
                               });
                             }
                             if (!((__N_SSG || __N_SSP) && props)) {
-                              _ctx.next = 146;
+                              _ctx.next = 147;
                               break;
                             }
                             if (
                               !(props.pageProps && props.pageProps.__N_REDIRECT)
                             ) {
-                              _ctx.next = 131;
+                              _ctx.next = 132;
                               break;
                             }
+                            // Use the destination from redirect without adding locale
+                            options.locale = false;
                             destination = props.pageProps.__N_REDIRECT;
                             if (
                               !(
@@ -5762,7 +5764,7 @@
                                 props.pageProps.__N_REDIRECT_BASE_PATH !== false
                               )
                             ) {
-                              _ctx.next = 129;
+                              _ctx.next = 130;
                               break;
                             }
                             parsedHref = (0,
@@ -5782,31 +5784,31 @@
                               "return",
                               _this.change(method, newUrl, newAs, options)
                             );
-                          case 129:
+                          case 130:
                             window.location.href = destination;
                             return _ctx.abrupt(
                               "return",
                               new Promise(function() {})
                             );
-                          case 131:
+                          case 132:
                             nextState.isPreview = !!props.__N_PREVIEW;
                             if (!(props.notFound === SSG_DATA_NOT_FOUND)) {
-                              _ctx.next = 146;
+                              _ctx.next = 147;
                               break;
                             }
-                            _ctx.prev = 134;
-                            _ctx.next = 137;
+                            _ctx.prev = 135;
+                            _ctx.next = 138;
                             return _this.fetchComponent("/404");
-                          case 137:
+                          case 138:
                             notFoundRoute = "/404";
-                            _ctx.next = 143;
+                            _ctx.next = 144;
                             break;
-                          case 140:
-                            _ctx.prev = 140;
-                            _ctx.t3 = _ctx["catch"](134);
+                          case 141:
+                            _ctx.prev = 141;
+                            _ctx.t3 = _ctx["catch"](135);
                             notFoundRoute = "/_error";
-                          case 143:
-                            _ctx.next = 145;
+                          case 144:
+                            _ctx.next = 146;
                             return _this.getRouteInfo(
                               notFoundRoute,
                               notFoundRoute,
@@ -5819,9 +5821,9 @@
                               nextState.locale,
                               nextState.isPreview
                             );
-                          case 145:
-                            routeInfo = _ctx.sent;
                           case 146:
+                            routeInfo = _ctx.sent;
+                          case 147:
                             Router.events.emit(
                               "beforeHistoryChange",
                               as,
@@ -5859,7 +5861,7 @@
                                   y: 0
                                 }
                               : null;
-                            _ctx.next = 155;
+                            _ctx.next = 156;
                             return _this
                               .set(
                                 _objectSpread({}, nextState, {
@@ -5878,9 +5880,9 @@
                                 if (e.cancelled) error = error || e;
                                 else throw e;
                               });
-                          case 155:
+                          case 156:
                             if (!error) {
-                              _ctx.next = 158;
+                              _ctx.next = 159;
                               break;
                             }
                             Router.events.emit(
@@ -5890,7 +5892,7 @@
                               routeProps
                             );
                             throw error;
-                          case 158:
+                          case 159:
                             if (false) {
                             }
                             Router.events.emit(
@@ -5899,8 +5901,8 @@
                               routeProps
                             );
                             return _ctx.abrupt("return", true);
-                          case 163:
-                            _ctx.prev = 163;
+                          case 164:
+                            _ctx.prev = 164;
                             _ctx.t4 = _ctx["catch"](113);
                             if (
                               !(
@@ -5908,13 +5910,13 @@
                                 _ctx.t4.cancelled
                               )
                             ) {
-                              _ctx.next = 167;
+                              _ctx.next = 168;
                               break;
                             }
                             return _ctx.abrupt("return", false);
-                          case 167:
-                            throw _ctx.t4;
                           case 168:
+                            throw _ctx.t4;
+                          case 169:
                           case "end":
                             return _ctx.stop();
                         }
@@ -5923,8 +5925,8 @@
                     null,
                     [
                       [39, 51],
-                      [113, 163],
-                      [134, 140]
+                      [113, 164],
+                      [135, 141]
                     ]
                   );
                 })

Diff for index.html

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

Diff for link.html

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

Diff for withRouter.html

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

Commit: 7482cd9

test/e2e/i18n-data-fetching-redirect/app/pages/gsp-fallback-redirect/[param].js

test/e2e/i18n-data-fetching-redirect/index.test.ts

ijjk

Change and added tests look good, thanks!

Don't add locale to getStaticProps redirect in fallback

2c5a563

hanneslund requested review from timneutkens, ijjk, shuding and huozhi as code owners May 16, 2022 11:48

ijjk added the type: next label May 16, 2022

ijjk reviewed May 16, 2022

View reviewed changes

test/e2e/i18n-data-fetching-redirect/app/pages/gsp-fallback-redirect/[param].js Outdated Show resolved Hide resolved

ijjk reviewed May 16, 2022

View reviewed changes

test/e2e/i18n-data-fetching-redirect/index.test.ts Outdated Show resolved Hide resolved

Hannes Bornö added 2 commits May 18, 2022 09:43

Testsa added: Redirect to default locale & get locale from context

9fa58d4

Never add locale when being redirected from data fetching functions

66d28f4

hanneslund changed the title ~~Don't add locale to getStaticProps redirect in fallback~~ Don't add locale to client side redirects from data fetching May 18, 2022

hanneslund requested a review from ijjk May 18, 2022 10:04

ijjk approved these changes May 19, 2022

View reviewed changes

Merge branch 'canary' into issue-36169

7482cd9

kodiakhq bot merged commit e3382e6 into vercel:canary May 19, 2022

hanneslund mentioned this pull request May 19, 2022

Redirection to other locales from gsp and gssp fail #35105

Closed

1 task

github-actions bot locked as resolved and limited conversation to collaborators Jun 18, 2022

hanneslund deleted the issue-36169 branch September 8, 2022 06:40

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Don't add locale to client side redirects from data fetching #36944

Don't add locale to client side redirects from data fetching #36944

hanneslund commented May 16, 2022 •

edited by ijjk

Loading

ijjk commented May 16, 2022 •

edited

Loading

Diffs

Diffs

ijjk left a comment

Don't add locale to client side redirects from data fetching #36944

Don't add locale to client side redirects from data fetching #36944

Conversation

hanneslund commented May 16, 2022 • edited by ijjk Loading

Bug

ijjk commented May 16, 2022 • edited Loading

Stats from current PR

Diffs

Diffs

ijjk left a comment

Choose a reason for hiding this comment

hanneslund commented May 16, 2022 •

edited by ijjk

Loading

ijjk commented May 16, 2022 •

edited

Loading