Ensure correct default locale is detected for domain locale #18046

ijjk · 2020-10-20T09:16:11Z

This makes sure that we detect the correct default locale for domain specific locales since a domain can have a different default locale residing at the root and we need to check this on the client for prerendered/auto-static pages. This also makes sure we disable the built-in redirect handling when on Vercel since it's handled already.

Tests for this are tricky since we need to load the browser with a custom domain which requires editing the host file. Existing tests should ensure this doesn't break non-domain specific locale behavior though. This was also tested manually while testing vercel/vercel#5298

x-ref: #17370

ijjk · 2020-10-20T09:27:23Z

Stats from current PR

Default Server Mode (Decrease detected ✓)

General Overall increase ⚠️

	vercel/next.js canary	ijjk/next.js i18n/detect-domain-default	Change
buildDuration	12.6s	12.8s	⚠️ +206ms
nodeModulesSize	64.5 MB	64.5 MB	⚠️ +2.4 kB

Page Load Tests Overall decrease ⚠️

	vercel/next.js canary	ijjk/next.js i18n/detect-domain-default	Change
/ failed reqs	0	0	✓
/ total time (seconds)	2.434	2.475	⚠️ +0.04
/ avg req/sec	1026.98	1010.28	⚠️ -16.7
/error-in-render failed reqs	0	0	✓
/error-in-render total time (seconds)	1.462	1.493	⚠️ +0.03
/error-in-render avg req/sec	1709.52	1674.64	⚠️ -34.88

Client Bundles (main, webpack, commons)

	vercel/next.js canary	ijjk/next.js i18n/detect-domain-default	Change
677f882d2ed8..7765.js gzip	11.1 kB	11.1 kB	✓
framework.HASH.js gzip	39 kB	39 kB	✓
main-6eb5911..0b37.js gzip	7.34 kB	7.34 kB	✓
webpack-e067..f178.js gzip	751 B	751 B	✓
Overall change	58.1 kB	58.1 kB	✓

Client Bundles (main, webpack, commons) Modern

	vercel/next.js canary	ijjk/next.js i18n/detect-domain-default	Change
677f882d2ed8..dule.js gzip	6.94 kB	6.94 kB	✓
framework.HA..dule.js gzip	39 kB	39 kB	✓
main-83a1cea..dule.js gzip	6.32 kB	6.32 kB	✓
webpack-07c5..dule.js gzip	751 B	751 B	✓
Overall change	53 kB	53 kB	✓

Legacy Client Bundles (polyfills)

	vercel/next.js canary	ijjk/next.js i18n/detect-domain-default	Change
polyfills-4b..e242.js gzip	31 kB	31 kB	✓
Overall change	31 kB	31 kB	✓

Client Pages

	vercel/next.js canary	ijjk/next.js i18n/detect-domain-default	Change
_app-9a0b9e1..b37e.js gzip	1.28 kB	1.28 kB	✓
_error-ed1b0..8fbd.js gzip	3.44 kB	3.44 kB	✓
hooks-89731c..c609.js gzip	887 B	887 B	✓
index-17468f..5d83.js gzip	227 B	227 B	✓
link-89ad9e7..25bb.js gzip	1.34 kB	1.34 kB	✓
routerDirect..924c.js gzip	284 B	284 B	✓
withRouter-7..c13d.js gzip	284 B	284 B	✓
Overall change	7.74 kB	7.74 kB	✓

Client Pages Modern

	vercel/next.js canary	ijjk/next.js i18n/detect-domain-default	Change
_app-75d3a82..dule.js gzip	625 B	625 B	✓
_error-4469a..dule.js gzip	2.29 kB	2.29 kB	✓
hooks-cbf13f..dule.js gzip	387 B	387 B	✓
index-b9a643..dule.js gzip	226 B	226 B	✓
link-aeb707b..dule.js gzip	1.29 kB	1.29 kB	✓
routerDirect..dule.js gzip	284 B	284 B	✓
withRouter-f..dule.js gzip	282 B	282 B	✓
Overall change	5.39 kB	5.39 kB	✓

Client Build Manifests

	vercel/next.js canary	ijjk/next.js i18n/detect-domain-default	Change
_buildManifest.js gzip	322 B	322 B	✓
_buildManife..dule.js gzip	329 B	329 B	✓
Overall change	651 B	651 B	✓

Rendered Page Sizes

	vercel/next.js canary	ijjk/next.js i18n/detect-domain-default	Change
index.html gzip	1 kB	1 kB	-1 B
link.html gzip	1.01 kB	1.01 kB	⚠️ +1 B
withRouter.html gzip	995 B	995 B	✓
Overall change	3.01 kB	3.01 kB	✓

Diffs

Diff for main-481dc33..eec06e881.js

@@ -373,7 +373,12 @@ _N_E = (window["webpackJsonp_N_E"] = window["webpackJsonp_N_E"] || []).push([
       }
 
       if (false) {
-        var localePathResult, _require, normalizeLocalePath;
+        var detectedDomain,
+          localePathResult,
+          _require2,
+          detectDomainLocale,
+          _require,
+          normalizeLocalePath;
       }
 
       var pageLoader = new _pageLoader["default"](buildId, prefix, page);
@@ -500,7 +505,7 @@ _N_E = (window["webpackJsonp_N_E"] = window["webpackJsonp_N_E"] || []).push([
               if (true) {
                 return this.props.children;
               } else {
-                var _require2, ReactDevOverlay;
+                var _require3, ReactDevOverlay;
               }
             }
           }
@@ -521,9 +526,9 @@ _N_E = (window["webpackJsonp_N_E"] = window["webpackJsonp_N_E"] || []).push([
               mod,
               initialErr,
               _yield$pageLoader$loa2,
-              _require3,
-              isValidElementType,
               _require4,
+              isValidElementType,
+              _require5,
               getNodeError,
               renderCtx,
               _args = arguments;
@@ -600,14 +605,14 @@ _N_E = (window["webpackJsonp_N_E"] = window["webpackJsonp_N_E"] || []).push([
                         break;
                       }
 
-                      (_require3 = __webpack_require__(
+                      (_require4 = __webpack_require__(
                         !(function webpackMissingModule() {
                           var e = new Error("Cannot find module 'react-is'");
                           e.code = "MODULE_NOT_FOUND";
                           throw e;
                         })()
                       )),
-                        (isValidElementType = _require3.isValidElementType);
+                        (isValidElementType = _require4.isValidElementType);
 
                       if (isValidElementType(CachedComponent)) {
                         _context.next = 21;

Diff for main-80542e9..e6.module.js

@@ -291,7 +291,10 @@
       }
 
       if (false) {
-        var localePathResult, normalizeLocalePath;
+        var detectedDomain,
+          localePathResult,
+          detectDomainLocale,
+          normalizeLocalePath;
       }
 
       var pageLoader = new _pageLoader.default(buildId, prefix, page);

Diff for index.html

@@ -6,7 +6,7 @@
     <noscript data-n-css="true"></noscript>
     <link
       rel="preload"
-      href="/_next/static/chunks/main-80542e9265fdd4b091e6.module.js"
+      href="/_next/static/chunks/main-a6be1adb5572a7c05f5b.module.js"
       as="script"
       crossorigin="anonymous"
     />
@@ -24,7 +24,7 @@
     />
     <link
       rel="preload"
-      href="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.4d03b2fcf4a85bf0625c.module.js"
+      href="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.15d98acc7b022abf75d3.module.js"
       as="script"
       crossorigin="anonymous"
     />
@@ -85,13 +85,13 @@
       src="/_next/static/chunks/polyfills-f73ba3fc145972ef83e9.js"
     ></script>
     <script
-      src="/_next/static/chunks/main-481dc33c8eeeec06e881.js"
+      src="/_next/static/chunks/main-462e7c47b83422fa17ff.js"
       async=""
       crossorigin="anonymous"
       nomodule=""
     ></script>
     <script
-      src="/_next/static/chunks/main-80542e9265fdd4b091e6.module.js"
+      src="/_next/static/chunks/main-a6be1adb5572a7c05f5b.module.js"
       async=""
       crossorigin="anonymous"
       type="module"
@@ -121,13 +121,13 @@
       type="module"
     ></script>
     <script
-      src="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.94598d613cfc5076e47f.js"
+      src="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.1f665b9cff05b45de20a.js"
       async=""
       crossorigin="anonymous"
       nomodule=""
     ></script>
     <script
-      src="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.4d03b2fcf4a85bf0625c.module.js"
+      src="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.15d98acc7b022abf75d3.module.js"
       async=""
       crossorigin="anonymous"
       type="module"

Diff for link.html

@@ -6,7 +6,7 @@
     <noscript data-n-css="true"></noscript>
     <link
       rel="preload"
-      href="/_next/static/chunks/main-80542e9265fdd4b091e6.module.js"
+      href="/_next/static/chunks/main-a6be1adb5572a7c05f5b.module.js"
       as="script"
       crossorigin="anonymous"
     />
@@ -24,7 +24,7 @@
     />
     <link
       rel="preload"
-      href="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.4d03b2fcf4a85bf0625c.module.js"
+      href="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.15d98acc7b022abf75d3.module.js"
       as="script"
       crossorigin="anonymous"
     />
@@ -90,13 +90,13 @@
       src="/_next/static/chunks/polyfills-f73ba3fc145972ef83e9.js"
     ></script>
     <script
-      src="/_next/static/chunks/main-481dc33c8eeeec06e881.js"
+      src="/_next/static/chunks/main-462e7c47b83422fa17ff.js"
       async=""
       crossorigin="anonymous"
       nomodule=""
     ></script>
     <script
-      src="/_next/static/chunks/main-80542e9265fdd4b091e6.module.js"
+      src="/_next/static/chunks/main-a6be1adb5572a7c05f5b.module.js"
       async=""
       crossorigin="anonymous"
       type="module"
@@ -126,13 +126,13 @@
       type="module"
     ></script>
     <script
-      src="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.94598d613cfc5076e47f.js"
+      src="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.1f665b9cff05b45de20a.js"
       async=""
       crossorigin="anonymous"
       nomodule=""
     ></script>
     <script
-      src="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.4d03b2fcf4a85bf0625c.module.js"
+      src="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.15d98acc7b022abf75d3.module.js"
       async=""
       crossorigin="anonymous"
       type="module"

Diff for withRouter.html

@@ -6,7 +6,7 @@
     <noscript data-n-css="true"></noscript>
     <link
       rel="preload"
-      href="/_next/static/chunks/main-80542e9265fdd4b091e6.module.js"
+      href="/_next/static/chunks/main-a6be1adb5572a7c05f5b.module.js"
       as="script"
       crossorigin="anonymous"
     />
@@ -24,7 +24,7 @@
     />
     <link
       rel="preload"
-      href="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.4d03b2fcf4a85bf0625c.module.js"
+      href="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.15d98acc7b022abf75d3.module.js"
       as="script"
       crossorigin="anonymous"
     />
@@ -85,13 +85,13 @@
       src="/_next/static/chunks/polyfills-f73ba3fc145972ef83e9.js"
     ></script>
     <script
-      src="/_next/static/chunks/main-481dc33c8eeeec06e881.js"
+      src="/_next/static/chunks/main-462e7c47b83422fa17ff.js"
       async=""
       crossorigin="anonymous"
       nomodule=""
     ></script>
     <script
-      src="/_next/static/chunks/main-80542e9265fdd4b091e6.module.js"
+      src="/_next/static/chunks/main-a6be1adb5572a7c05f5b.module.js"
       async=""
       crossorigin="anonymous"
       type="module"
@@ -121,13 +121,13 @@
       type="module"
     ></script>
     <script
-      src="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.94598d613cfc5076e47f.js"
+      src="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.1f665b9cff05b45de20a.js"
       async=""
       crossorigin="anonymous"
       nomodule=""
     ></script>
     <script
-      src="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.4d03b2fcf4a85bf0625c.module.js"
+      src="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.15d98acc7b022abf75d3.module.js"
       async=""
       crossorigin="anonymous"
       type="module"

Serverless Mode

General Overall increase ⚠️

	vercel/next.js canary	ijjk/next.js i18n/detect-domain-default	Change
buildDuration	14.2s	14.4s	⚠️ +242ms
nodeModulesSize	64.5 MB	64.5 MB	⚠️ +2.4 kB

Client Bundles (main, webpack, commons)

	vercel/next.js canary	ijjk/next.js i18n/detect-domain-default	Change
677f882d2ed8..7765.js gzip	11.1 kB	N/A	N/A
framework.HASH.js gzip	39 kB	39 kB	✓
main-6eb5911..0b37.js gzip	7.34 kB	N/A	N/A
webpack-e067..f178.js gzip	751 B	751 B	✓
677f882d2ed8..35e7.js gzip	N/A	11.1 kB	N/A
main-14e2178..1b93.js gzip	N/A	7.34 kB	N/A
Overall change	58.1 kB	58.1 kB	✓

Client Bundles (main, webpack, commons) Modern

	vercel/next.js canary	ijjk/next.js i18n/detect-domain-default	Change
677f882d2ed8..dule.js gzip	6.94 kB	N/A	N/A
framework.HA..dule.js gzip	39 kB	39 kB	✓
main-83a1cea..dule.js gzip	6.32 kB	N/A	N/A
webpack-07c5..dule.js gzip	751 B	751 B	✓
677f882d2ed8..dule.js gzip	N/A	6.94 kB	N/A
main-36e597a..dule.js gzip	N/A	6.32 kB	N/A
Overall change	53 kB	53 kB	✓

Legacy Client Bundles (polyfills)

	vercel/next.js canary	ijjk/next.js i18n/detect-domain-default	Change
polyfills-4b..e242.js gzip	31 kB	31 kB	✓
Overall change	31 kB	31 kB	✓

Client Pages

	vercel/next.js canary	ijjk/next.js i18n/detect-domain-default	Change
_app-9a0b9e1..b37e.js gzip	1.28 kB	1.28 kB	✓
_error-ed1b0..8fbd.js gzip	3.44 kB	3.44 kB	✓
hooks-89731c..c609.js gzip	887 B	887 B	✓
index-17468f..5d83.js gzip	227 B	227 B	✓
link-89ad9e7..25bb.js gzip	1.34 kB	1.34 kB	✓
routerDirect..924c.js gzip	284 B	284 B	✓
withRouter-7..c13d.js gzip	284 B	284 B	✓
Overall change	7.74 kB	7.74 kB	✓

Client Pages Modern

	vercel/next.js canary	ijjk/next.js i18n/detect-domain-default	Change
_app-75d3a82..dule.js gzip	625 B	625 B	✓
_error-4469a..dule.js gzip	2.29 kB	2.29 kB	✓
hooks-cbf13f..dule.js gzip	387 B	387 B	✓
index-b9a643..dule.js gzip	226 B	226 B	✓
link-aeb707b..dule.js gzip	1.29 kB	1.29 kB	✓
routerDirect..dule.js gzip	284 B	284 B	✓
withRouter-f..dule.js gzip	282 B	282 B	✓
Overall change	5.39 kB	5.39 kB	✓

Client Build Manifests

	vercel/next.js canary	ijjk/next.js i18n/detect-domain-default	Change
_buildManifest.js gzip	322 B	322 B	✓
_buildManife..dule.js gzip	329 B	329 B	✓
Overall change	651 B	651 B	✓

Serverless bundles

	vercel/next.js canary	ijjk/next.js i18n/detect-domain-default	Change
_error.js	1.06 MB	1.06 MB	✓
404.html	4.34 kB	4.34 kB	✓
hooks.html	3.92 kB	3.92 kB	✓
index.js	1.06 MB	1.06 MB	✓
link.js	1.1 MB	1.1 MB	✓
routerDirect.js	1.1 MB	1.1 MB	✓
withRouter.js	1.1 MB	1.1 MB	✓
Overall change	5.42 MB	5.42 MB	✓

Commit: 92b2b90

Ensure correct default locale is detected for domain locale

92b2b90

ijjk added the type: next label Oct 20, 2020

ijjk marked this pull request as ready for review October 20, 2020 09:42

ijjk requested review from lfades, Timer and timneutkens as code owners October 20, 2020 09:42

timneutkens approved these changes Oct 20, 2020

View reviewed changes

kodiakhq bot merged commit 8be3562 into vercel:canary Oct 20, 2020

ijjk deleted the i18n/detect-domain-default branch October 20, 2020 10:23

timneutkens added the hacktoberfest-accepted label Oct 23, 2020

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Ensure correct default locale is detected for domain locale #18046

Ensure correct default locale is detected for domain locale #18046

ijjk commented Oct 20, 2020 •

edited

ijjk commented Oct 20, 2020

Diffs

Ensure correct default locale is detected for domain locale #18046

Ensure correct default locale is detected for domain locale #18046

Conversation

ijjk commented Oct 20, 2020 • edited

ijjk commented Oct 20, 2020

Stats from current PR

Diffs

ijjk commented Oct 20, 2020 •

edited