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: add locale prefix to middleware preflight url #35911

Merged

Conversation

nkzawa
Copy link
Contributor

@nkzawa nkzawa commented Apr 5, 2022

Fixes part of #34274

Navigating to / causes to redirect preflight request to a url of browser language like /en.
This PR fixes to add the locale prefix always so that the redirect does not happen anymore and middleware can get a correct locale.

Bug

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

Feature

  • Implements an existing feature request or RFC. Make sure the feature request has been accepted for implementation before opening a PR.
  • Related issues linked using fixes #number
  • Integration tests added
  • Documentation added
  • Telemetry added. In case of a feature if it's used or not.
  • Errors have helpful link attached, see contributing.md

Documentation / Examples

  • Make sure the linting passes by running yarn lint

@ijjk

This comment has been minimized.

@ijjk

This comment has been minimized.

@ijjk
Copy link
Member

ijjk commented Apr 7, 2022

Stats from current PR

Default Build (Increase detected ⚠️)
General Overall increase ⚠️
vercel/next.js canary nkzawa/next.js next-middleware-preflight-locale-prefix Change
buildDuration 17.8s 16.4s -1.4s
buildDurationCached 6.7s 6.4s -293ms
nodeModulesSize 477 MB 477 MB ⚠️ +114 B
Page Load Tests Overall increase ✓
vercel/next.js canary nkzawa/next.js next-middleware-preflight-locale-prefix Change
/ failed reqs 0 0
/ total time (seconds) 3.536 3.219 -0.32
/ avg req/sec 706.98 776.52 +69.54
/error-in-render failed reqs 0 0
/error-in-render total time (seconds) 1.492 1.424 -0.07
/error-in-render avg req/sec 1675.07 1755.79 +80.72
Client Bundles (main, webpack) Overall increase ⚠️
vercel/next.js canary nkzawa/next.js next-middleware-preflight-locale-prefix Change
925.HASH.js gzip 179 B 179 B
framework-HASH.js gzip 42 kB 42 kB
main-HASH.js gzip 28 kB 28 kB ⚠️ +13 B
webpack-HASH.js gzip 1.44 kB 1.44 kB
Overall change 71.7 kB 71.7 kB ⚠️ +13 B
Legacy Client Bundles (polyfills)
vercel/next.js canary nkzawa/next.js next-middleware-preflight-locale-prefix Change
polyfills-HASH.js gzip 31 kB 31 kB
Overall change 31 kB 31 kB
Client Pages
vercel/next.js canary nkzawa/next.js next-middleware-preflight-locale-prefix Change
_app-HASH.js gzip 1.36 kB 1.36 kB
_error-HASH.js gzip 192 B 192 B
amp-HASH.js gzip 309 B 309 B
css-HASH.js gzip 327 B 327 B
dynamic-HASH.js gzip 3.05 kB 3.05 kB
head-HASH.js gzip 351 B 351 B
hooks-HASH.js gzip 920 B 920 B
image-HASH.js gzip 5.64 kB 5.64 kB
index-HASH.js gzip 263 B 263 B
link-HASH.js gzip 2.32 kB 2.32 kB
routerDirect..HASH.js gzip 320 B 320 B
script-HASH.js gzip 387 B 387 B
withRouter-HASH.js gzip 319 B 319 B
85e02e95b279..7e3.css gzip 107 B 107 B
Overall change 15.9 kB 15.9 kB
Client Build Manifests
vercel/next.js canary nkzawa/next.js next-middleware-preflight-locale-prefix Change
_buildManifest.js gzip 459 B 459 B
Overall change 459 B 459 B
Rendered Page Sizes Overall decrease ✓
vercel/next.js canary nkzawa/next.js next-middleware-preflight-locale-prefix Change
index.html gzip 532 B 530 B -2 B
link.html gzip 545 B 544 B -1 B
withRouter.html gzip 525 B 524 B -1 B
Overall change 1.6 kB 1.6 kB -4 B

Diffs

Diff for main-HASH.js
@@ -6397,6 +6397,7 @@
                     cleanedAs,
                     fns,
                     requiresPreflight,
+                    preflightHref,
                     preflight,
                     parsed,
                     fsPathname,
@@ -6441,38 +6442,42 @@
                               type: "next"
                             });
                           case 8:
-                            _ctx.prev = 9;
-                            _ctx.next = 12;
+                            preflightHref = addLocale(
+                              options.as,
+                              options.locale
+                            );
+                            _ctx.prev = 10;
+                            _ctx.next = 13;
                             return _this._getPreflightData({
-                              preflightHref: options.as,
+                              preflightHref: preflightHref,
                               shouldCache: options.cache,
                               isPreview: options.isPreview
                             });
-                          case 12:
+                          case 13:
                             preflight = _ctx.sent;
-                            _ctx.next = 18;
+                            _ctx.next = 19;
                             break;
-                          case 15:
-                            _ctx.prev = 15;
-                            _ctx.t0 = _ctx["catch"](9);
+                          case 16:
+                            _ctx.prev = 16;
+                            _ctx.t0 = _ctx["catch"](10);
                             return _ctx.abrupt("return", {
                               type: "redirect",
                               destination: options.as
                             });
-                          case 18:
+                          case 19:
                             if (!preflight.rewrite) {
-                              _ctx.next = 27;
+                              _ctx.next = 28;
                               break;
                             }
                             if (preflight.rewrite.startsWith("/")) {
-                              _ctx.next = 21;
+                              _ctx.next = 22;
                               break;
                             }
                             return _ctx.abrupt("return", {
                               type: "redirect",
                               destination: options.as
                             });
-                          case 21:
+                          case 22:
                             parsed = (0, _parseRelativeUrl).parseRelativeUrl(
                               (0, _normalizeLocalePath).normalizeLocalePath(
                                 hasBasePath(preflight.rewrite)
@@ -6507,13 +6512,13 @@
                               matchedPage: matchedPage,
                               resolvedHref: resolvedHref
                             });
-                          case 27:
+                          case 28:
                             if (!preflight.redirect) {
-                              _ctx.next = 33;
+                              _ctx.next = 34;
                               break;
                             }
                             if (!preflight.redirect.startsWith("/")) {
-                              _ctx.next = 32;
+                              _ctx.next = 33;
                               break;
                             }
                             cleanRedirect = (0,
@@ -6537,31 +6542,31 @@
                               newUrl: newUrl,
                               newAs: newAs
                             });
-                          case 32:
+                          case 33:
                             return _ctx.abrupt("return", {
                               type: "redirect",
                               destination: preflight.redirect
                             });
-                          case 33:
+                          case 34:
                             if (!(preflight.refresh && !preflight.ssr)) {
-                              _ctx.next = 35;
+                              _ctx.next = 36;
                               break;
                             }
                             return _ctx.abrupt("return", {
                               type: "refresh"
                             });
-                          case 35:
+                          case 36:
                             return _ctx.abrupt("return", {
                               type: "next"
                             });
-                          case 36:
+                          case 37:
                           case "end":
                             return _ctx.stop();
                         }
                     },
                     _callee,
                     null,
-                    [[9, 15]]
+                    [[10, 16]]
                   );
                 })
               )();
Diff for index.html
@@ -19,7 +19,7 @@
       defer=""
     ></script>
     <script
-      src="/_next/static/chunks/main-75aa0c6099ddb4e5.js"
+      src="/_next/static/chunks/main-47d6ccedfaedb33e.js"
       defer=""
     ></script>
     <script
Diff for link.html
@@ -19,7 +19,7 @@
       defer=""
     ></script>
     <script
-      src="/_next/static/chunks/main-75aa0c6099ddb4e5.js"
+      src="/_next/static/chunks/main-47d6ccedfaedb33e.js"
       defer=""
     ></script>
     <script
Diff for withRouter.html
@@ -19,7 +19,7 @@
       defer=""
     ></script>
     <script
-      src="/_next/static/chunks/main-75aa0c6099ddb4e5.js"
+      src="/_next/static/chunks/main-47d6ccedfaedb33e.js"
       defer=""
     ></script>
     <script

Default Build with SWC (Increase detected ⚠️)
General Overall increase ⚠️
vercel/next.js canary nkzawa/next.js next-middleware-preflight-locale-prefix Change
buildDuration 18.4s 19.2s ⚠️ +790ms
buildDurationCached 6.3s 6s -292ms
nodeModulesSize 477 MB 477 MB ⚠️ +114 B
Page Load Tests Overall decrease ⚠️
vercel/next.js canary nkzawa/next.js next-middleware-preflight-locale-prefix Change
/ failed reqs 0 0
/ total time (seconds) 3.203 3.355 ⚠️ +0.15
/ avg req/sec 780.52 745.25 ⚠️ -35.27
/error-in-render failed reqs 0 0
/error-in-render total time (seconds) 1.45 1.456 ⚠️ +0.01
/error-in-render avg req/sec 1723.91 1716.82 ⚠️ -7.09
Client Bundles (main, webpack) Overall increase ⚠️
vercel/next.js canary nkzawa/next.js next-middleware-preflight-locale-prefix Change
925.HASH.js gzip 178 B 178 B
framework-HASH.js gzip 42.3 kB 42.3 kB
main-HASH.js gzip 28.3 kB 28.3 kB ⚠️ +17 B
webpack-HASH.js gzip 1.45 kB 1.45 kB
Overall change 72.2 kB 72.2 kB ⚠️ +17 B
Legacy Client Bundles (polyfills)
vercel/next.js canary nkzawa/next.js next-middleware-preflight-locale-prefix Change
polyfills-HASH.js gzip 31 kB 31 kB
Overall change 31 kB 31 kB
Client Pages
vercel/next.js canary nkzawa/next.js next-middleware-preflight-locale-prefix Change
_app-HASH.js gzip 1.35 kB 1.35 kB
_error-HASH.js gzip 179 B 179 B
amp-HASH.js gzip 313 B 313 B
css-HASH.js gzip 325 B 325 B
dynamic-HASH.js gzip 3.03 kB 3.03 kB
head-HASH.js gzip 351 B 351 B
hooks-HASH.js gzip 921 B 921 B
image-HASH.js gzip 5.7 kB 5.7 kB
index-HASH.js gzip 261 B 261 B
link-HASH.js gzip 2.38 kB 2.38 kB
routerDirect..HASH.js gzip 322 B 322 B
script-HASH.js gzip 388 B 388 B
withRouter-HASH.js gzip 317 B 317 B
85e02e95b279..7e3.css gzip 107 B 107 B
Overall change 15.9 kB 15.9 kB
Client Build Manifests
vercel/next.js canary nkzawa/next.js next-middleware-preflight-locale-prefix Change
_buildManifest.js gzip 459 B 459 B
Overall change 459 B 459 B
Rendered Page Sizes Overall increase ⚠️
vercel/next.js canary nkzawa/next.js next-middleware-preflight-locale-prefix Change
index.html gzip 532 B 532 B
link.html gzip 544 B 545 B ⚠️ +1 B
withRouter.html gzip 525 B 527 B ⚠️ +2 B
Overall change 1.6 kB 1.6 kB ⚠️ +3 B

Diffs

Diff for main-HASH.js
@@ -6397,6 +6397,7 @@
                     cleanedAs,
                     fns,
                     requiresPreflight,
+                    preflightHref,
                     preflight,
                     parsed,
                     fsPathname,
@@ -6441,38 +6442,42 @@
                               type: "next"
                             });
                           case 8:
-                            _ctx.prev = 9;
-                            _ctx.next = 12;
+                            preflightHref = addLocale(
+                              options.as,
+                              options.locale
+                            );
+                            _ctx.prev = 10;
+                            _ctx.next = 13;
                             return _this._getPreflightData({
-                              preflightHref: options.as,
+                              preflightHref: preflightHref,
                               shouldCache: options.cache,
                               isPreview: options.isPreview
                             });
-                          case 12:
+                          case 13:
                             preflight = _ctx.sent;
-                            _ctx.next = 18;
+                            _ctx.next = 19;
                             break;
-                          case 15:
-                            _ctx.prev = 15;
-                            _ctx.t0 = _ctx["catch"](9);
+                          case 16:
+                            _ctx.prev = 16;
+                            _ctx.t0 = _ctx["catch"](10);
                             return _ctx.abrupt("return", {
                               type: "redirect",
                               destination: options.as
                             });
-                          case 18:
+                          case 19:
                             if (!preflight.rewrite) {
-                              _ctx.next = 27;
+                              _ctx.next = 28;
                               break;
                             }
                             if (preflight.rewrite.startsWith("/")) {
-                              _ctx.next = 21;
+                              _ctx.next = 22;
                               break;
                             }
                             return _ctx.abrupt("return", {
                               type: "redirect",
                               destination: options.as
                             });
-                          case 21:
+                          case 22:
                             parsed = (0, _parseRelativeUrl).parseRelativeUrl(
                               (0, _normalizeLocalePath).normalizeLocalePath(
                                 hasBasePath(preflight.rewrite)
@@ -6507,13 +6512,13 @@
                               matchedPage: matchedPage,
                               resolvedHref: resolvedHref
                             });
-                          case 27:
+                          case 28:
                             if (!preflight.redirect) {
-                              _ctx.next = 33;
+                              _ctx.next = 34;
                               break;
                             }
                             if (!preflight.redirect.startsWith("/")) {
-                              _ctx.next = 32;
+                              _ctx.next = 33;
                               break;
                             }
                             cleanRedirect = (0,
@@ -6537,31 +6542,31 @@
                               newUrl: newUrl,
                               newAs: newAs
                             });
-                          case 32:
+                          case 33:
                             return _ctx.abrupt("return", {
                               type: "redirect",
                               destination: preflight.redirect
                             });
-                          case 33:
+                          case 34:
                             if (!(preflight.refresh && !preflight.ssr)) {
-                              _ctx.next = 35;
+                              _ctx.next = 36;
                               break;
                             }
                             return _ctx.abrupt("return", {
                               type: "refresh"
                             });
-                          case 35:
+                          case 36:
                             return _ctx.abrupt("return", {
                               type: "next"
                             });
-                          case 36:
+                          case 37:
                           case "end":
                             return _ctx.stop();
                         }
                     },
                     _callee,
                     null,
-                    [[9, 15]]
+                    [[10, 16]]
                   );
                 })
               )();
Diff for index.html
@@ -19,7 +19,7 @@
       defer=""
     ></script>
     <script
-      src="/_next/static/chunks/main-75aa0c6099ddb4e5.js"
+      src="/_next/static/chunks/main-47d6ccedfaedb33e.js"
       defer=""
     ></script>
     <script
Diff for link.html
@@ -19,7 +19,7 @@
       defer=""
     ></script>
     <script
-      src="/_next/static/chunks/main-75aa0c6099ddb4e5.js"
+      src="/_next/static/chunks/main-47d6ccedfaedb33e.js"
       defer=""
     ></script>
     <script
Diff for withRouter.html
@@ -19,7 +19,7 @@
       defer=""
     ></script>
     <script
-      src="/_next/static/chunks/main-75aa0c6099ddb4e5.js"
+      src="/_next/static/chunks/main-47d6ccedfaedb33e.js"
       defer=""
     ></script>
     <script
Commit: 4a9d9e3

@kodiakhq kodiakhq bot merged commit 6330504 into vercel:canary Apr 7, 2022
@nkzawa nkzawa deleted the next-middleware-preflight-locale-prefix branch April 7, 2022 13:53
colinhacks pushed a commit to colinhacks/next.js that referenced this pull request Apr 14, 2022
Fixes part of vercel#34274

Navigating to `/` causes to redirect preflight request to a url of browser language like `/en`. 
This PR fixes to add the locale prefix always so that the redirect does not happen anymore and middleware can get a correct locale.

## Bug

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

## Feature

- [ ] Implements an existing feature request or RFC. Make sure the feature request has been accepted for implementation before opening a PR.
- [ ] Related issues linked using `fixes #number`
- [ ] Integration tests added
- [ ] Documentation added
- [ ] Telemetry added. In case of a feature if it's used or not.
- [ ] Errors have helpful link attached, see `contributing.md`

## Documentation / Examples

- [ ] Make sure the linting passes by running `yarn lint`
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jun 5, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants