i18n Improvements #47174

wyattjoh · 2023-03-15T19:01:27Z

This serves to correct a specific issue related to multiple locales being specified in the pathname as well as some general i18n improvements.

Multiple locales are now parsed correctly (only taking the first locale, treating the rest of the string as the pathname)
LocaleRouteNormalizer has been split into I18NProvider and LocaleRouteNormalizer (tests added)
Adjusted the I18NProvider.analyze method (previously LocaleRouteNormalizer.match) to require the defaultLocale: string | undefined to ensure consistent behaviour
Added more comments around i18n

ijjk · 2023-03-15T19:13:29Z

Failing test suites

Commit: 68347b6

pnpm testheadless test/e2e/i18n-disallow-multiple-locales/i18n-disallow-multiple-locales.test.ts

i18n-disallow-multiple-locales > should not accept multiple locales in path

Expand output

● i18n-disallow-multiple-locales › should not accept multiple locales in path

expect(received).toBe(expected) // Object.is equality

Expected: 404
Received: 200

  42 |           })
  43 |
> 44 |           expect(res.status).toBe(404)
     |                              ^
  45 |         }
  46 |       }
  47 |     })

  at Object.<anonymous> (e2e/i18n-disallow-multiple-locales/i18n-disallow-multiple-locales.test.ts:44:30)

Read more about building and testing Next.js in contributing.md.

ijjk · 2023-03-15T19:32:13Z

Stats from current PR

Default Build (Increase detected ⚠️)

General Overall increase ⚠️

	vercel/next.js canary	vercel/next.js wyattjoh/i18n-improvements	Change
buildDuration	45.4s	46s	⚠️ +606ms
buildDurationCached	11.3s	11.4s	⚠️ +79ms
nodeModulesSize	113 MB	113 MB	⚠️ +47.2 kB
nextStartRea..uration (ms)	336ms	326ms	-10ms

Client Bundles (main, webpack) Overall increase ⚠️

	vercel/next.js canary	vercel/next.js wyattjoh/i18n-improvements	Change
869.HASH.js gzip	181 B	180 B	-1 B
887-HASH.js gzip	19.9 kB	19.9 kB	-28 B
974ec2d0-HASH.js gzip	48.4 kB	48.4 kB	-2 B
main-app-HASH.js gzip	218 B	217 B	-1 B
main-HASH.js gzip	82.1 kB	82.1 kB	⚠️ +57 B
webpack-HASH.js gzip	1.7 kB	1.7 kB	-2 B
Overall change	153 kB	153 kB	⚠️ +23 B

Legacy Client Bundles (polyfills)

	vercel/next.js canary	vercel/next.js wyattjoh/i18n-improvements	Change
polyfills-HASH.js gzip	31 kB	31 kB	✓
Overall change	31 kB	31 kB	✓

Client Pages Overall decrease ✓

	vercel/next.js canary	vercel/next.js wyattjoh/i18n-improvements	Change
_app-HASH.js gzip	192 B	192 B	✓
_error-HASH.js gzip	180 B	179 B	-1 B
amp-HASH.js gzip	483 B	481 B	-2 B
css-HASH.js gzip	801 B	799 B	-2 B
dynamic-HASH.js gzip	2.27 kB	2.27 kB	-4 B
edge-ssr-HASH.js gzip	259 B	259 B	✓
head-HASH.js gzip	828 B	827 B	-1 B
hooks-HASH.js gzip	849 B	847 B	-2 B
image-HASH.js gzip	4.34 kB	4.33 kB	-5 B
index-HASH.js gzip	252 B	254 B	⚠️ +2 B
link-HASH.js gzip	2.76 kB	2.76 kB	✓
routerDirect..HASH.js gzip	781 B	782 B	⚠️ +1 B
script-HASH.js gzip	858 B	856 B	-2 B
withRouter-HASH.js gzip	782 B	779 B	-3 B
85e02e95b279..7e3.css gzip	107 B	107 B	✓
Overall change	15.7 kB	15.7 kB	-19 B

Client Build Manifests Overall increase ⚠️

	vercel/next.js canary	vercel/next.js wyattjoh/i18n-improvements	Change
_buildManifest.js gzip	483 B	484 B	⚠️ +1 B
Overall change	483 B	484 B	⚠️ +1 B

Rendered Page Sizes Overall increase ⚠️

	vercel/next.js canary	vercel/next.js wyattjoh/i18n-improvements	Change
index.html gzip	547 B	547 B	✓
link.html gzip	557 B	558 B	⚠️ +1 B
withRouter.html gzip	544 B	544 B	✓
Overall change	1.65 kB	1.65 kB	⚠️ +1 B

Edge SSR bundle Size Overall increase ⚠️

	vercel/next.js canary	vercel/next.js wyattjoh/i18n-improvements	Change
edge-ssr.js gzip	129 kB	129 kB	⚠️ +239 B
page.js gzip	114 kB	114 kB	⚠️ +275 B
Overall change	243 kB	243 kB	⚠️ +514 B

Middleware size Overall increase ⚠️

	vercel/next.js canary	vercel/next.js wyattjoh/i18n-improvements	Change
middleware-b..fest.js gzip	601 B	606 B	⚠️ +5 B
middleware-r..fest.js gzip	145 B	144 B	-1 B
middleware.js gzip	26.5 kB	27 kB	⚠️ +480 B
edge-runtime..pack.js gzip	1.83 kB	1.83 kB	✓
Overall change	29.1 kB	29.6 kB	⚠️ +484 B

Diffs

Diff for page.js

Diff too large to display

Diff for middleware-b..-manifest.js

@@ -7,82 +7,82 @@ self.__BUILD_MANIFEST = {
     "static/BUILD_ID/_ssgManifest.js",
   ],
   rootMainFiles: [
-    "static/chunks/webpack-d9965445ebce461e.js",
-    "static/chunks/974ec2d0-0526f62b43c0903e.js",
-    "static/chunks/887-32340bfbe6f480fa.js",
-    "static/chunks/main-app-b39526c570939c1a.js",
+    "static/chunks/webpack-c61449b956bd4ddc.js",
+    "static/chunks/39549b6b-264d45c0b06c4bc7.js",
+    "static/chunks/828-b421072a99a2adf1.js",
+    "static/chunks/main-app-ac5a4239faf8f8ab.js",
   ],
   pages: {
     "/": [
-      "static/chunks/webpack-d9965445ebce461e.js",
-      "static/chunks/main-3c8a80faf1451448.js",
-      "static/chunks/pages/index-96b4df8f97c0f01a.js",
+      "static/chunks/webpack-c61449b956bd4ddc.js",
+      "static/chunks/main-8090323be3dc3e14.js",
+      "static/chunks/pages/index-b21e2d2005e858d6.js",
     ],
     "/_app": [
-      "static/chunks/webpack-d9965445ebce461e.js",
-      "static/chunks/main-3c8a80faf1451448.js",
-      "static/chunks/pages/_app-39c49a32fdfb4902.js",
+      "static/chunks/webpack-c61449b956bd4ddc.js",
+      "static/chunks/main-8090323be3dc3e14.js",
+      "static/chunks/pages/_app-fd2fd11c0153c1f4.js",
     ],
     "/_error": [
-      "static/chunks/webpack-d9965445ebce461e.js",
-      "static/chunks/main-3c8a80faf1451448.js",
-      "static/chunks/pages/_error-d79135b4d7090152.js",
+      "static/chunks/webpack-c61449b956bd4ddc.js",
+      "static/chunks/main-8090323be3dc3e14.js",
+      "static/chunks/pages/_error-65d572d29e2548b7.js",
     ],
     "/amp": [
-      "static/chunks/webpack-d9965445ebce461e.js",
-      "static/chunks/main-3c8a80faf1451448.js",
-      "static/chunks/pages/amp-3e73e98c5f333ae8.js",
+      "static/chunks/webpack-c61449b956bd4ddc.js",
+      "static/chunks/main-8090323be3dc3e14.js",
+      "static/chunks/pages/amp-62aee2a49812a08f.js",
     ],
     "/css": [
-      "static/chunks/webpack-d9965445ebce461e.js",
-      "static/chunks/main-3c8a80faf1451448.js",
+      "static/chunks/webpack-c61449b956bd4ddc.js",
+      "static/chunks/main-8090323be3dc3e14.js",
       "static/css/94fdbc56eafa2039.css",
-      "static/chunks/pages/css-5e256e56d8e26951.js",
+      "static/chunks/pages/css-90c3ee39f7bca7ef.js",
     ],
     "/dynamic": [
-      "static/chunks/webpack-d9965445ebce461e.js",
-      "static/chunks/main-3c8a80faf1451448.js",
-      "static/chunks/pages/dynamic-c81f7204b8a7f946.js",
+      "static/chunks/webpack-c61449b956bd4ddc.js",
+      "static/chunks/main-8090323be3dc3e14.js",
+      "static/chunks/pages/dynamic-b2fe956bab12dbce.js",
     ],
     "/edge-ssr": [
-      "static/chunks/webpack-d9965445ebce461e.js",
-      "static/chunks/main-3c8a80faf1451448.js",
-      "static/chunks/pages/edge-ssr-36372aa7b0810cd4.js",
+      "static/chunks/webpack-c61449b956bd4ddc.js",
+      "static/chunks/main-8090323be3dc3e14.js",
+      "static/chunks/pages/edge-ssr-53842fa626eeba30.js",
     ],
     "/head": [
-      "static/chunks/webpack-d9965445ebce461e.js",
-      "static/chunks/main-3c8a80faf1451448.js",
-      "static/chunks/pages/head-bba3641f74516a0d.js",
+      "static/chunks/webpack-c61449b956bd4ddc.js",
+      "static/chunks/main-8090323be3dc3e14.js",
+      "static/chunks/pages/head-0b621999ef90df87.js",
     ],
     "/hooks": [
-      "static/chunks/webpack-d9965445ebce461e.js",
-      "static/chunks/main-3c8a80faf1451448.js",
-      "static/chunks/pages/hooks-5bc49a85e3a1ebb1.js",
+      "static/chunks/webpack-c61449b956bd4ddc.js",
+      "static/chunks/main-8090323be3dc3e14.js",
+      "static/chunks/pages/hooks-15f80158bf268b44.js",
     ],
     "/image": [
-      "static/chunks/webpack-d9965445ebce461e.js",
-      "static/chunks/main-3c8a80faf1451448.js",
-      "static/chunks/pages/image-288008ada0cbe815.js",
+      "static/chunks/webpack-c61449b956bd4ddc.js",
+      "static/chunks/main-8090323be3dc3e14.js",
+      "static/chunks/pages/image-ca3fd4962231504f.js",
     ],
     "/link": [
-      "static/chunks/webpack-d9965445ebce461e.js",
-      "static/chunks/main-3c8a80faf1451448.js",
-      "static/chunks/pages/link-ee4f7deeb8112e61.js",
+      "static/chunks/webpack-c61449b956bd4ddc.js",
+      "static/chunks/main-8090323be3dc3e14.js",
+      "static/chunks/pages/link-6af118e4c6f497bb.js",
     ],
     "/routerDirect": [
-      "static/chunks/webpack-d9965445ebce461e.js",
-      "static/chunks/main-3c8a80faf1451448.js",
-      "static/chunks/pages/routerDirect-5d7d47d901e3719c.js",
+      "static/chunks/webpack-c61449b956bd4ddc.js",
+      "static/chunks/main-8090323be3dc3e14.js",
+      "static/chunks/pages/routerDirect-99b080df5d4700e8.js",
     ],
     "/script": [
-      "static/chunks/webpack-d9965445ebce461e.js",
-      "static/chunks/main-3c8a80faf1451448.js",
-      "static/chunks/pages/script-7181948a834b7ae4.js",
+      "static/chunks/webpack-c61449b956bd4ddc.js",
+      "static/chunks/main-8090323be3dc3e14.js",
+      "static/chunks/pages/script-1cb960fab1da586d.js",
     ],
     "/withRouter": [
-      "static/chunks/webpack-d9965445ebce461e.js",
-      "static/chunks/main-3c8a80faf1451448.js",
-      "static/chunks/pages/withRouter-ebac16c2d9b51247.js",
+      "static/chunks/webpack-c61449b956bd4ddc.js",
+      "static/chunks/main-8090323be3dc3e14.js",
+      "static/chunks/pages/withRouter-00f6845c2afd30e2.js",
     ],
   },
   ampFirstPages: [],

Diff for middleware-r..-manifest.js

@@ -1,6 +1,6 @@
 self.__REACT_LOADABLE_MANIFEST = {
   "dynamic.js -> ../components/hello": {
-    id: 4869,
-    files: ["static/chunks/869.cb3f1602da3175db.js"],
+    id: 959,
+    files: ["static/chunks/959.34508e89b1d2d329.js"],
   },
 };

Diff for middleware.js

Diff too large to display

Diff for edge-ssr.js

Diff too large to display

Diff for _buildManifest.js

@@ -1,28 +1,28 @@
 self.__BUILD_MANIFEST = {
   __rewrites: { beforeFiles: [], afterFiles: [], fallback: [] },
-  "/": ["static\u002Fchunks\u002Fpages\u002Findex-96b4df8f97c0f01a.js"],
-  "/_error": ["static\u002Fchunks\u002Fpages\u002F_error-d79135b4d7090152.js"],
-  "/amp": ["static\u002Fchunks\u002Fpages\u002Famp-3e73e98c5f333ae8.js"],
+  "/": ["static\u002Fchunks\u002Fpages\u002Findex-b21e2d2005e858d6.js"],
+  "/_error": ["static\u002Fchunks\u002Fpages\u002F_error-65d572d29e2548b7.js"],
+  "/amp": ["static\u002Fchunks\u002Fpages\u002Famp-62aee2a49812a08f.js"],
   "/css": [
     "static\u002Fcss\u002F94fdbc56eafa2039.css",
-    "static\u002Fchunks\u002Fpages\u002Fcss-5e256e56d8e26951.js",
+    "static\u002Fchunks\u002Fpages\u002Fcss-90c3ee39f7bca7ef.js",
   ],
   "/dynamic": [
-    "static\u002Fchunks\u002Fpages\u002Fdynamic-c81f7204b8a7f946.js",
+    "static\u002Fchunks\u002Fpages\u002Fdynamic-b2fe956bab12dbce.js",
   ],
   "/edge-ssr": [
-    "static\u002Fchunks\u002Fpages\u002Fedge-ssr-36372aa7b0810cd4.js",
+    "static\u002Fchunks\u002Fpages\u002Fedge-ssr-53842fa626eeba30.js",
   ],
-  "/head": ["static\u002Fchunks\u002Fpages\u002Fhead-bba3641f74516a0d.js"],
-  "/hooks": ["static\u002Fchunks\u002Fpages\u002Fhooks-5bc49a85e3a1ebb1.js"],
-  "/image": ["static\u002Fchunks\u002Fpages\u002Fimage-288008ada0cbe815.js"],
-  "/link": ["static\u002Fchunks\u002Fpages\u002Flink-ee4f7deeb8112e61.js"],
+  "/head": ["static\u002Fchunks\u002Fpages\u002Fhead-0b621999ef90df87.js"],
+  "/hooks": ["static\u002Fchunks\u002Fpages\u002Fhooks-15f80158bf268b44.js"],
+  "/image": ["static\u002Fchunks\u002Fpages\u002Fimage-ca3fd4962231504f.js"],
+  "/link": ["static\u002Fchunks\u002Fpages\u002Flink-6af118e4c6f497bb.js"],
   "/routerDirect": [
-    "static\u002Fchunks\u002Fpages\u002FrouterDirect-5d7d47d901e3719c.js",
+    "static\u002Fchunks\u002Fpages\u002FrouterDirect-99b080df5d4700e8.js",
   ],
-  "/script": ["static\u002Fchunks\u002Fpages\u002Fscript-7181948a834b7ae4.js"],
+  "/script": ["static\u002Fchunks\u002Fpages\u002Fscript-1cb960fab1da586d.js"],
   "/withRouter": [
-    "static\u002Fchunks\u002Fpages\u002FwithRouter-ebac16c2d9b51247.js",
+    "static\u002Fchunks\u002Fpages\u002FwithRouter-00f6845c2afd30e2.js",
   ],
   sortedPages: [
     "\u002F",

Diff for _app-HASH.js

@@ -1,7 +1,7 @@
 (self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
   [888],
   {
-    /***/ 3115: /***/ function (
+    /***/ 1113: /***/ function (
       __unused_webpack_module,
       __unused_webpack_exports,
       __webpack_require__
@@ -9,7 +9,7 @@
       (window.__NEXT_P = window.__NEXT_P || []).push([
         "/_app",
         function () {
-          return __webpack_require__(9618);
+          return __webpack_require__(6822);
         },
       ]);
       if (false) {
@@ -24,7 +24,7 @@
       return __webpack_require__((__webpack_require__.s = moduleId));
     };
     /******/ __webpack_require__.O(0, [179], function () {
-      return __webpack_exec__(3115), __webpack_exec__(5038);
+      return __webpack_exec__(1113), __webpack_exec__(1556);
     });
     /******/ var __webpack_exports__ = __webpack_require__.O();
     /******/ _N_E = __webpack_exports__;

Diff for _error-HASH.js

@@ -1,7 +1,7 @@
 (self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
   [820],
   {
-    /***/ 5374: /***/ function (
+    /***/ 3363: /***/ function (
       __unused_webpack_module,
       __unused_webpack_exports,
       __webpack_require__
@@ -9,7 +9,7 @@
       (window.__NEXT_P = window.__NEXT_P || []).push([
         "/_error",
         function () {
-          return __webpack_require__(1261);
+          return __webpack_require__(3972);
         },
       ]);
       if (false) {
@@ -24,7 +24,7 @@
       return __webpack_require__((__webpack_require__.s = moduleId));
     };
     /******/ __webpack_require__.O(0, [888, 179], function () {
-      return __webpack_exec__(5374);
+      return __webpack_exec__(3363);
     });
     /******/ var __webpack_exports__ = __webpack_require__.O();
     /******/ _N_E = __webpack_exports__;

Diff for amp-HASH.js

@@ -1,17 +1,17 @@
 (self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
   [216],
   {
-    /***/ 8510: /***/ function (
+    /***/ 8753: /***/ function (
       module,
       __unused_webpack_exports,
       __webpack_require__
     ) {
-      module.exports = __webpack_require__(6863);
+      module.exports = __webpack_require__(1088);
 
       /***/
     },
 
-    /***/ 7010: /***/ function (
+    /***/ 5348: /***/ function (
       __unused_webpack_module,
       __unused_webpack_exports,
       __webpack_require__
@@ -19,7 +19,7 @@
       (window.__NEXT_P = window.__NEXT_P || []).push([
         "/amp",
         function () {
-          return __webpack_require__(8381);
+          return __webpack_require__(1458);
         },
       ]);
       if (false) {
@@ -28,7 +28,7 @@
       /***/
     },
 
-    /***/ 6863: /***/ function (module, exports, __webpack_require__) {
+    /***/ 1088: /***/ function (module, exports, __webpack_require__) {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -37,9 +37,9 @@
       exports.useAmp = useAmp;
       var _interop_require_default =
         __webpack_require__(1322) /* ["default"] */.Z;
-      var _react = _interop_require_default(__webpack_require__(2947));
-      var _ampContext = __webpack_require__(7218);
-      var _ampMode = __webpack_require__(9569);
+      var _react = _interop_require_default(__webpack_require__(465));
+      var _ampContext = __webpack_require__(583);
+      var _ampMode = __webpack_require__(8881);
       function useAmp() {
         // Don't assign the context value to a variable to save bytes
         return (0, _ampMode).isInAmpMode(
@@ -61,7 +61,7 @@
       /***/
     },
 
-    /***/ 8381: /***/ function (
+    /***/ 1458: /***/ function (
       __unused_webpack_module,
       __webpack_exports__,
       __webpack_require__
@@ -78,7 +78,7 @@
         /* harmony export */
       });
       /* harmony import */ var next_amp__WEBPACK_IMPORTED_MODULE_0__ =
-        __webpack_require__(8510);
+        __webpack_require__(8753);
       /* harmony import */ var next_amp__WEBPACK_IMPORTED_MODULE_0___default =
         /*#__PURE__*/ __webpack_require__.n(
           next_amp__WEBPACK_IMPORTED_MODULE_0__
@@ -102,7 +102,7 @@
       return __webpack_require__((__webpack_require__.s = moduleId));
     };
     /******/ __webpack_require__.O(0, [888, 179], function () {
-      return __webpack_exec__(7010);
+      return __webpack_exec__(5348);
     });
     /******/ var __webpack_exports__ = __webpack_require__.O();
     /******/ _N_E = __webpack_exports__;

Diff for css-HASH.js

@@ -1,7 +1,7 @@
 (self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
   [706],
   {
-    /***/ 860: /***/ function (
+    /***/ 6437: /***/ function (
       __unused_webpack_module,
       __unused_webpack_exports,
       __webpack_require__
@@ -9,7 +9,7 @@
       (window.__NEXT_P = window.__NEXT_P || []).push([
         "/css",
         function () {
-          return __webpack_require__(3215);
+          return __webpack_require__(5701);
         },
       ]);
       if (false) {
@@ -18,7 +18,7 @@
       /***/
     },
 
-    /***/ 3215: /***/ function (
+    /***/ 5701: /***/ function (
       __unused_webpack_module,
       __webpack_exports__,
       __webpack_require__
@@ -26,9 +26,9 @@
       "use strict";
       __webpack_require__.r(__webpack_exports__);
       /* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__ =
-        __webpack_require__(3268);
+        __webpack_require__(9701);
       /* harmony import */ var _css_module_css__WEBPACK_IMPORTED_MODULE_1__ =
-        __webpack_require__(4294);
+        __webpack_require__(5725);
       /* harmony import */ var _css_module_css__WEBPACK_IMPORTED_MODULE_1___default =
         /*#__PURE__*/ __webpack_require__.n(
           _css_module_css__WEBPACK_IMPORTED_MODULE_1__
@@ -48,14 +48,14 @@
       /***/
     },
 
-    /***/ 4294: /***/ function (module) {
+    /***/ 5725: /***/ function (module) {
       // extracted by mini-css-extract-plugin
       module.exports = { helloWorld: "css_helloWorld__qqNwY" };
 
       /***/
     },
 
-    /***/ 6205: /***/ function (
+    /***/ 1963: /***/ function (
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -70,7 +70,7 @@
        * This source code is licensed under the MIT license found in the
        * LICENSE file in the root directory of this source tree.
        */
-      var f = __webpack_require__(2947),
+      var f = __webpack_require__(465),
         k = Symbol.for("react.element"),
         l = Symbol.for("react.fragment"),
         m = Object.prototype.hasOwnProperty,
@@ -105,7 +105,7 @@
       /***/
     },
 
-    /***/ 3268: /***/ function (
+    /***/ 9701: /***/ function (
       module,
       __unused_webpack_exports,
       __webpack_require__
@@ -113,7 +113,7 @@
       "use strict";
 
       if (true) {
-        module.exports = __webpack_require__(6205);
+        module.exports = __webpack_require__(1963);
       } else {
       }
 
@@ -126,7 +126,7 @@
       return __webpack_require__((__webpack_require__.s = moduleId));
     };
     /******/ __webpack_require__.O(0, [888, 179], function () {
-      return __webpack_exec__(860);
+      return __webpack_exec__(6437);
     });
     /******/ var __webpack_exports__ = __webpack_require__.O();
     /******/ _N_E = __webpack_exports__;

Diff for dynamic-HASH.js

@@ -1,7 +1,7 @@
 (self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
   [739],
   {
-    /***/ 3995: /***/ function (
+    /***/ 7753: /***/ function (
       __unused_webpack_module,
       __unused_webpack_exports,
       __webpack_require__
@@ -9,7 +9,7 @@
       (window.__NEXT_P = window.__NEXT_P || []).push([
         "/dynamic",
         function () {
-          return __webpack_require__(8267);
+          return __webpack_require__(825);
         },
       ]);
       if (false) {
@@ -18,7 +18,7 @@
       /***/
     },
 
-    /***/ 6854: /***/ function (module, exports, __webpack_require__) {
+    /***/ 1678: /***/ function (module, exports, __webpack_require__) {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -29,8 +29,8 @@
       var _extends = __webpack_require__(5321) /* ["default"] */.Z;
       var _interop_require_default =
         __webpack_require__(1322) /* ["default"] */.Z;
-      var _react = _interop_require_default(__webpack_require__(2947));
-      var _loadable = _interop_require_default(__webpack_require__(8673));
+      var _react = _interop_require_default(__webpack_require__(465));
+      var _loadable = _interop_require_default(__webpack_require__(899));
       function dynamic(dynamicOptions, options) {
         let loadableFn = _loadable.default;
         let loadableOptions = {
@@ -127,7 +127,7 @@
       /***/
     },
 
-    /***/ 3611: /***/ function (
+    /***/ 6601: /***/ function (
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -140,7 +140,7 @@
       exports.LoadableContext = void 0;
       var _interop_require_default =
         __webpack_require__(1322) /* ["default"] */.Z;
-      var _react = _interop_require_default(__webpack_require__(2947));
+      var _react = _interop_require_default(__webpack_require__(465));
       const LoadableContext = _react.default.createContext(null);
       exports.LoadableContext = LoadableContext;
       if (false) {
@@ -149,7 +149,7 @@
       /***/
     },
 
-    /***/ 8673: /***/ function (
+    /***/ 899: /***/ function (
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -163,8 +163,8 @@
       var _extends = __webpack_require__(5321) /* ["default"] */.Z;
       var _interop_require_default =
         __webpack_require__(1322) /* ["default"] */.Z;
-      var _react = _interop_require_default(__webpack_require__(2947));
-      var _loadableContext = __webpack_require__(3611);
+      var _react = _interop_require_default(__webpack_require__(465));
+      var _loadableContext = __webpack_require__(6601);
       function resolve(obj) {
         return obj && obj.default ? obj.default : obj;
       }
@@ -404,7 +404,7 @@
       /***/
     },
 
-    /***/ 8267: /***/ function (
+    /***/ 825: /***/ function (
       __unused_webpack_module,
       __webpack_exports__,
       __webpack_require__
@@ -418,9 +418,9 @@
         /* harmony export */
       });
       /* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__ =
-        __webpack_require__(3268);
+        __webpack_require__(9701);
       /* harmony import */ var next_dynamic__WEBPACK_IMPORTED_MODULE_1__ =
-        __webpack_require__(6113);
+        __webpack_require__(2677);
       /* harmony import */ var next_dynamic__WEBPACK_IMPORTED_MODULE_1___default =
         /*#__PURE__*/ __webpack_require__.n(
           next_dynamic__WEBPACK_IMPORTED_MODULE_1__
@@ -429,11 +429,11 @@
       const DynamicHello = next_dynamic__WEBPACK_IMPORTED_MODULE_1___default()(
         () =>
           __webpack_require__
-            .e(/* import() */ 869)
-            .then(__webpack_require__.bind(__webpack_require__, 4869)),
+            .e(/* import() */ 959)
+            .then(__webpack_require__.bind(__webpack_require__, 959)),
         {
           loadableGenerated: {
-            webpack: () => [/*require.resolve*/ 4869],
+            webpack: () => [/*require.resolve*/ 959],
           },
         }
       );
@@ -460,7 +460,7 @@
       /***/
     },
 
-    /***/ 6205: /***/ function (
+    /***/ 1963: /***/ function (
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -475,7 +475,7 @@
        * This source code is licensed under the MIT license found in the
        * LICENSE file in the root directory of this source tree.
        */
-      var f = __webpack_require__(2947),
+      var f = __webpack_require__(465),
         k = Symbol.for("react.element"),
         l = Symbol.for("react.fragment"),
         m = Object.prototype.hasOwnProperty,
@@ -510,7 +510,7 @@
       /***/
     },
 
-    /***/ 3268: /***/ function (
+    /***/ 9701: /***/ function (
       module,
       __unused_webpack_exports,
       __webpack_require__
@@ -518,19 +518,19 @@
       "use strict";
 
       if (true) {
-        module.exports = __webpack_require__(6205);
+        module.exports = __webpack_require__(1963);
       } else {
       }
 
       /***/
     },
 
-    /***/ 6113: /***/ function (
+    /***/ 2677: /***/ function (
       module,
       __unused_webpack_exports,
       __webpack_require__
     ) {
-      module.exports = __webpack_require__(6854);
+      module.exports = __webpack_require__(1678);
 
       /***/
     },
@@ -541,7 +541,7 @@
       return __webpack_require__((__webpack_require__.s = moduleId));
     };
     /******/ __webpack_require__.O(0, [888, 179], function () {
-      return __webpack_exec__(3995);
+      return __webpack_exec__(7753);
     });
     /******/ var __webpack_exports__ = __webpack_require__.O();
     /******/ _N_E = __webpack_exports__;

Diff for edge-ssr-HASH.js

@@ -1,7 +1,7 @@
 (self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
   [800],
   {
-    /***/ 6219: /***/ function (
+    /***/ 6027: /***/ function (
       __unused_webpack_module,
       __unused_webpack_exports,
       __webpack_require__
@@ -9,7 +9,7 @@
       (window.__NEXT_P = window.__NEXT_P || []).push([
         "/edge-ssr",
         function () {
-          return __webpack_require__(7322);
+          return __webpack_require__(9526);
         },
       ]);
       if (false) {
@@ -18,7 +18,7 @@
       /***/
     },
 
-    /***/ 7322: /***/ function (
+    /***/ 9526: /***/ function (
       __unused_webpack_module,
       __webpack_exports__,
       __webpack_require__
@@ -50,7 +50,7 @@
       return __webpack_require__((__webpack_require__.s = moduleId));
     };
     /******/ __webpack_require__.O(0, [888, 179], function () {
-      return __webpack_exec__(6219);
+      return __webpack_exec__(6027);
     });
     /******/ var __webpack_exports__ = __webpack_require__.O();
     /******/ _N_E = __webpack_exports__;

Diff for head-HASH.js

@@ -1,7 +1,7 @@
 (self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
   [645],
   {
-    /***/ 2899: /***/ function (
+    /***/ 6955: /***/ function (
       __unused_webpack_module,
       __unused_webpack_exports,
       __webpack_require__
@@ -9,7 +9,7 @@
       (window.__NEXT_P = window.__NEXT_P || []).push([
         "/head",
         function () {
-          return __webpack_require__(4463);
+          return __webpack_require__(157);
         },
       ]);
       if (false) {
@@ -18,7 +18,7 @@
       /***/
     },
 
-    /***/ 4463: /***/ function (
+    /***/ 157: /***/ function (
       __unused_webpack_module,
       __webpack_exports__,
       __webpack_require__
@@ -32,9 +32,9 @@
         /* harmony export */
       });
       /* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__ =
-        __webpack_require__(3268);
+        __webpack_require__(9701);
       /* harmony import */ var next_head__WEBPACK_IMPORTED_MODULE_1__ =
-        __webpack_require__(8412);
+        __webpack_require__(9046);
       /* harmony import */ var next_head__WEBPACK_IMPORTED_MODULE_1___default =
         /*#__PURE__*/ __webpack_require__.n(
           next_head__WEBPACK_IMPORTED_MODULE_1__
@@ -68,7 +68,7 @@
       /***/
     },
 
-    /***/ 6205: /***/ function (
+    /***/ 1963: /***/ function (
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -83,7 +83,7 @@
        * This source code is licensed under the MIT license found in the
        * LICENSE file in the root directory of this source tree.
        */
-      var f = __webpack_require__(2947),
+      var f = __webpack_require__(465),
         k = Symbol.for("react.element"),
         l = Symbol.for("react.fragment"),
         m = Object.prototype.hasOwnProperty,
@@ -118,7 +118,7 @@
       /***/
     },
 
-    /***/ 3268: /***/ function (
+    /***/ 9701: /***/ function (
       module,
       __unused_webpack_exports,
       __webpack_require__
@@ -126,19 +126,19 @@
       "use strict";
 
       if (true) {
-        module.exports = __webpack_require__(6205);
+        module.exports = __webpack_require__(1963);
       } else {
       }
 
       /***/
     },
 
-    /***/ 8412: /***/ function (
+    /***/ 9046: /***/ function (
       module,
       __unused_webpack_exports,
       __webpack_require__
     ) {
-      module.exports = __webpack_require__(6593);
+      module.exports = __webpack_require__(6732);
 
       /***/
     },
@@ -149,7 +149,7 @@
       return __webpack_require__((__webpack_require__.s = moduleId));
     };
     /******/ __webpack_require__.O(0, [888, 179], function () {
-      return __webpack_exec__(2899);
+      return __webpack_exec__(6955);
     });
     /******/ var __webpack_exports__ = __webpack_require__.O();
     /******/ _N_E = __webpack_exports__;

Diff for hooks-HASH.js

@@ -1,7 +1,7 @@
 (self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
   [757],
   {
-    /***/ 2304: /***/ function (
+    /***/ 3038: /***/ function (
       __unused_webpack_module,
       __unused_webpack_exports,
       __webpack_require__
@@ -9,7 +9,7 @@
       (window.__NEXT_P = window.__NEXT_P || []).push([
         "/hooks",
         function () {
-          return __webpack_require__(59);
+          return __webpack_require__(58);
         },
       ]);
       if (false) {
@@ -18,7 +18,7 @@
       /***/
     },
 
-    /***/ 59: /***/ function (
+    /***/ 58: /***/ function (
       __unused_webpack_module,
       __webpack_exports__,
       __webpack_require__
@@ -26,9 +26,9 @@
       "use strict";
       __webpack_require__.r(__webpack_exports__);
       /* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__ =
-        __webpack_require__(3268);
+        __webpack_require__(9701);
       /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_1__ =
-        __webpack_require__(2947);
+        __webpack_require__(465);
 
       /* harmony default export */ __webpack_exports__["default"] = () => {
         const [clicks1, setClicks1] =
@@ -73,7 +73,7 @@
       /***/
     },
 
-    /***/ 6205: /***/ function (
+    /***/ 1963: /***/ function (
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -88,7 +88,7 @@
        * This source code is licensed under the MIT license found in the
        * LICENSE file in the root directory of this source tree.
        */
-      var f = __webpack_require__(2947),
+      var f = __webpack_require__(465),
         k = Symbol.for("react.element"),
         l = Symbol.for("react.fragment"),
         m = Object.prototype.hasOwnProperty,
@@ -123,7 +123,7 @@
       /***/
     },
 
-    /***/ 3268: /***/ function (
+    /***/ 9701: /***/ function (
       module,
       __unused_webpack_exports,
       __webpack_require__
@@ -131,7 +131,7 @@
       "use strict";
 
       if (true) {
-        module.exports = __webpack_require__(6205);
+        module.exports = __webpack_require__(1963);
       } else {
       }
 
@@ -144,7 +144,7 @@
       return __webpack_require__((__webpack_require__.s = moduleId));
     };
     /******/ __webpack_require__.O(0, [888, 179], function () {
-      return __webpack_exec__(2304);
+      return __webpack_exec__(3038);
     });
     /******/ var __webpack_exports__ = __webpack_require__.O();
     /******/ _N_E = __webpack_exports__;

Diff for image-HASH.js

@@ -1,7 +1,7 @@
 (self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
   [358],
   {
-    /***/ 5885: /***/ function (
+    /***/ 801: /***/ function (
       __unused_webpack_module,
       __unused_webpack_exports,
       __webpack_require__
@@ -9,7 +9,7 @@
       (window.__NEXT_P = window.__NEXT_P || []).push([
         "/image",
         function () {
-          return __webpack_require__(3428);
+          return __webpack_require__(2018);
         },
       ]);
       if (false) {
@@ -18,7 +18,7 @@
       /***/
     },
 
-    /***/ 2957: /***/ function (module, exports, __webpack_require__) {
+    /***/ 1568: /***/ function (module, exports, __webpack_require__) {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -32,13 +32,13 @@
         __webpack_require__(6687) /* ["default"] */.Z;
       var _object_without_properties_loose =
         __webpack_require__(6239) /* ["default"] */.Z;
-      var _react = _interop_require_wildcard(__webpack_require__(2947));
-      var _head = _interop_require_default(__webpack_require__(6593));
-      var _imageBlurSvg = __webpack_require__(3811);
-      var _imageConfig = __webpack_require__(8419);
-      var _imageConfigContext = __webpack_require__(8147);
-      var _warnOnce = __webpack_require__(5664);
-      var _imageLoader = _interop_require_default(__webpack_require__(5324));
+      var _react = _interop_require_wildcard(__webpack_require__(465));
+      var _head = _interop_require_default(__webpack_require__(6732));
+      var _imageBlurSvg = __webpack_require__(3681);
+      var _imageConfig = __webpack_require__(8394);
+      var _imageConfigContext = __webpack_require__(11);
+      var _warnOnce = __webpack_require__(2485);
+      var _imageLoader = _interop_require_default(__webpack_require__(4439));
       const configEnv = {
         deviceSizes: [640, 750, 828, 1080, 1200, 1920, 2048, 3840],
         imageSizes: [16, 32, 48, 64, 96, 128, 256, 384],
@@ -707,7 +707,7 @@
       /***/
     },
 
-    /***/ 3811: /***/ function (__unused_webpack_module, exports) {
+    /***/ 3681: /***/ function (__unused_webpack_module, exports) {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -760,7 +760,7 @@
       /***/
     },
 
-    /***/ 5324: /***/ function (__unused_webpack_module, exports) {
+    /***/ 4439: /***/ function (__unused_webpack_module, exports) {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -786,7 +786,7 @@
       /***/
     },
 
-    /***/ 3428: /***/ function (
+    /***/ 2018: /***/ function (
       __unused_webpack_module,
       __webpack_exports__,
       __webpack_require__
@@ -805,10 +805,10 @@
         },
       });
 
-      // EXTERNAL MODULE: ./node_modules/.pnpm/file+..+main-repo+packages+next+next-packed.tgz_biqbaboplfbrettd7655fr4n2y/node_modules/next/dist/compiled/react/jsx-runtime.js
-      var jsx_runtime = __webpack_require__(3268);
-      // EXTERNAL MODULE: ./node_modules/.pnpm/file+..+main-repo+packages+next+next-packed.tgz_biqbaboplfbrettd7655fr4n2y/node_modules/next/image.js
-      var next_image = __webpack_require__(3960);
+      // EXTERNAL MODULE: ./node_modules/.pnpm/file+..+diff-repo+packages+next+next-packed.tgz_biqbaboplfbrettd7655fr4n2y/node_modules/next/dist/compiled/react/jsx-runtime.js
+      var jsx_runtime = __webpack_require__(9701);
+      // EXTERNAL MODULE: ./node_modules/.pnpm/file+..+diff-repo+packages+next+next-packed.tgz_biqbaboplfbrettd7655fr4n2y/node_modules/next/image.js
+      var next_image = __webpack_require__(8249);
       var image_default = /*#__PURE__*/ __webpack_require__.n(next_image); // CONCATENATED MODULE: ./pages/nextjs.png
       /* harmony default export */ var nextjs = {
         src: "/_next/static/media/nextjs.cae0b805.png",
@@ -838,7 +838,7 @@
       /***/
     },
 
-    /***/ 6205: /***/ function (
+    /***/ 1963: /***/ function (
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -853,7 +853,7 @@
        * This source code is licensed under the MIT license found in the
        * LICENSE file in the root directory of this source tree.
        */
-      var f = __webpack_require__(2947),
+      var f = __webpack_require__(465),
         k = Symbol.for("react.element"),
         l = Symbol.for("react.fragment"),
         m = Object.prototype.hasOwnProperty,
@@ -888,7 +888,7 @@
       /***/
     },
 
-    /***/ 3268: /***/ function (
+    /***/ 9701: /***/ function (
       module,
       __unused_webpack_exports,
       __webpack_require__
@@ -896,19 +896,19 @@
       "use strict";
 
       if (true) {
-        module.exports = __webpack_require__(6205);
+        module.exports = __webpack_require__(1963);
       } else {
       }
 
       /***/
     },
 
-    /***/ 3960: /***/ function (
+    /***/ 8249: /***/ function (
       module,
       __unused_webpack_exports,
       __webpack_require__
     ) {
-      module.exports = __webpack_require__(2957);
+      module.exports = __webpack_require__(1568);
 
       /***/
     },
@@ -919,7 +919,7 @@
       return __webpack_require__((__webpack_require__.s = moduleId));
     };
     /******/ __webpack_require__.O(0, [888, 179], function () {
-      return __webpack_exec__(5885);
+      return __webpack_exec__(801);
     });
     /******/ var __webpack_exports__ = __webpack_require__.O();
     /******/ _N_E = __webpack_exports__;

Diff for index-HASH.js

@@ -1,7 +1,7 @@
 (self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
   [405],
   {
-    /***/ 3558: /***/ function (
+    /***/ 6481: /***/ function (
       __unused_webpack_module,
       __unused_webpack_exports,
       __webpack_require__
@@ -9,7 +9,7 @@
       (window.__NEXT_P = window.__NEXT_P || []).push([
         "/",
         function () {
-          return __webpack_require__(580);
+          return __webpack_require__(7126);
         },
       ]);
       if (false) {
@@ -18,7 +18,7 @@
       /***/
     },
 
-    /***/ 580: /***/ function (
+    /***/ 7126: /***/ function (
       __unused_webpack_module,
       __webpack_exports__,
       __webpack_require__
@@ -44,7 +44,7 @@
       return __webpack_require__((__webpack_require__.s = moduleId));
     };
     /******/ __webpack_require__.O(0, [888, 179], function () {
-      return __webpack_exec__(3558);
+      return __webpack_exec__(6481);
     });
     /******/ var __webpack_exports__ = __webpack_require__.O();
     /******/ _N_E = __webpack_exports__;

Diff for link-HASH.js

@@ -1,7 +1,7 @@
 (self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
   [644],
   {
-    /***/ 8662: /***/ function (
+    /***/ 7014: /***/ function (
       __unused_webpack_module,
       __unused_webpack_exports,
       __webpack_require__
@@ -9,7 +9,7 @@
       (window.__NEXT_P = window.__NEXT_P || []).push([
         "/link",
         function () {
-          return __webpack_require__(2592);
+          return __webpack_require__(4920);
         },
       ]);
       if (false) {
@@ -18,7 +18,7 @@
       /***/
     },
 
-    /***/ 8651: /***/ function (module, exports) {
+    /***/ 9147: /***/ function (module, exports) {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -48,7 +48,7 @@
       /***/
     },
 
-    /***/ 681: /***/ function (module, exports, __webpack_require__) {
+    /***/ 3051: /***/ function (module, exports, __webpack_require__) {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -59,17 +59,17 @@
         __webpack_require__(1322) /* ["default"] */.Z;
       var _object_without_properties_loose =
         __webpack_require__(6239) /* ["default"] */.Z;
-      var _react = _interop_require_default(__webpack_require__(2947));
-      var _resolveHref = __webpack_require__(9560);
-      var _isLocalUrl = __webpack_require__(2790);
-      var _formatUrl = __webpack_require__(8782);
-      var _utils = __webpack_require__(1205);
-      var _addLocale = __webpack_require__(31);
-      var _routerContext = __webpack_require__(562);
-      var _appRouterContext = __webpack_require__(8557);
-      var _useIntersection = __webpack_require__(4723);
-      var _getDomainLocale = __webpack_require__(8651);
-      var _addBasePath = __webpack_require__(695);
+      var _react = _interop_require_default(__webpack_require__(465));
+      var _resolveHref = __webpack_require__(7247);
+      var _isLocalUrl = __webpack_require__(4552);
+      var _formatUrl = __webpack_require__(7090);
+      var _utils = __webpack_require__(9452);
+      var _addLocale = __webpack_require__(5899);
+      var _routerContext = __webpack_require__(9718);
+      var _appRouterContext = __webpack_require__(3651);
+      var _useIntersection = __webpack_require__(3882);
+      var _getDomainLocale = __webpack_require__(9147);
+      var _addBasePath = __webpack_require__(3852);
       const prefetched = new Set();
       function prefetch(router, href, as, options, isAppRouter) {
         if (false) {
@@ -475,15 +475,15 @@
       /***/
     },
 
-    /***/ 4723: /***/ function (module, exports, __webpack_require__) {
+    /***/ 3882: /***/ function (module, exports, __webpack_require__) {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
         value: true,
       });
       exports.useIntersection = useIntersection;
-      var _react = __webpack_require__(2947);
-      var _requestIdleCallback = __webpack_require__(235);
+      var _react = __webpack_require__(465);
+      var _requestIdleCallback = __webpack_require__(5426);
       const hasIntersectionObserver =
         typeof IntersectionObserver === "function";
       const observers = new Map();
@@ -596,7 +596,7 @@
       /***/
     },
 
-    /***/ 2592: /***/ function (
+    /***/ 4920: /***/ function (
       __unused_webpack_module,
       __webpack_exports__,
       __webpack_require__
@@ -610,9 +610,9 @@
         /* harmony export */
       });
       /* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__ =
-        __webpack_require__(3268);
+        __webpack_require__(9701);
       /* harmony import */ var next_link__WEBPACK_IMPORTED_MODULE_1__ =
-        __webpack_require__(4595);
+        __webpack_require__(9495);
       /* harmony import */ var next_link__WEBPACK_IMPORTED_MODULE_1___default =
         /*#__PURE__*/ __webpack_require__.n(
           next_link__WEBPACK_IMPORTED_MODULE_1__
@@ -643,7 +643,7 @@
       /***/
     },
 
-    /***/ 6205: /***/ function (
+    /***/ 1963: /***/ function (
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -658,7 +658,7 @@
        * This source code is licensed under the MIT license found in the
        * LICENSE file in the root directory of this source tree.
        */
-      var f = __webpack_require__(2947),
+      var f = __webpack_require__(465),
         k = Symbol.for("react.element"),
         l = Symbol.for("react.fragment"),
         m = Object.prototype.hasOwnProperty,
@@ -693,7 +693,7 @@
       /***/
     },
 
-    /***/ 3268: /***/ function (
+    /***/ 9701: /***/ function (
       module,
       __unused_webpack_exports,
       __webpack_require__
@@ -701,19 +701,19 @@
       "use strict";
 
       if (true) {
-        module.exports = __webpack_require__(6205);
+        module.exports = __webpack_require__(1963);
       } else {
       }
 
       /***/
     },
 
-    /***/ 4595: /***/ function (
+    /***/ 9495: /***/ function (
       module,
       __unused_webpack_exports,
       __webpack_require__
     ) {
-      module.exports = __webpack_require__(681);
+      module.exports = __webpack_require__(3051);
 
       /***/
     },
@@ -724,7 +724,7 @@
       return __webpack_require__((__webpack_require__.s = moduleId));
     };
     /******/ __webpack_require__.O(0, [888, 179], function () {
-      return __webpack_exec__(8662);
+      return __webpack_exec__(7014);
     });
     /******/ var __webpack_exports__ = __webpack_require__.O();
     /******/ _N_E = __webpack_exports__;

Diff for routerDirect-HASH.js

@@ -1,7 +1,7 @@
 (self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
   [58],
   {
-    /***/ 2188: /***/ function (
+    /***/ 7288: /***/ function (
       __unused_webpack_module,
       __unused_webpack_exports,
       __webpack_require__
@@ -9,7 +9,7 @@
       (window.__NEXT_P = window.__NEXT_P || []).push([
         "/routerDirect",
         function () {
-          return __webpack_require__(2453);
+          return __webpack_require__(3223);
         },
       ]);
       if (false) {
@@ -18,7 +18,7 @@
       /***/
     },
 
-    /***/ 2453: /***/ function (
+    /***/ 3223: /***/ function (
       __unused_webpack_module,
       __webpack_exports__,
       __webpack_require__
@@ -32,9 +32,9 @@
         /* harmony export */
       });
       /* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__ =
-        __webpack_require__(3268);
+        __webpack_require__(9701);
       /* harmony import */ var next_router__WEBPACK_IMPORTED_MODULE_1__ =
-        __webpack_require__(5866);
+        __webpack_require__(5664);
       /* harmony import */ var next_router__WEBPACK_IMPORTED_MODULE_1___default =
         /*#__PURE__*/ __webpack_require__.n(
           next_router__WEBPACK_IMPORTED_MODULE_1__
@@ -54,7 +54,7 @@
       /***/
     },
 
-    /***/ 6205: /***/ function (
+    /***/ 1963: /***/ function (
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -69,7 +69,7 @@
        * This source code is licensed under the MIT license found in the
        * LICENSE file in the root directory of this source tree.
        */
-      var f = __webpack_require__(2947),
+      var f = __webpack_require__(465),
         k = Symbol.for("react.element"),
         l = Symbol.for("react.fragment"),
         m = Object.prototype.hasOwnProperty,
@@ -104,7 +104,7 @@
       /***/
     },
 
-    /***/ 3268: /***/ function (
+    /***/ 9701: /***/ function (
       module,
       __unused_webpack_exports,
       __webpack_require__
@@ -112,19 +112,19 @@
       "use strict";
 
       if (true) {
-        module.exports = __webpack_require__(6205);
+        module.exports = __webpack_require__(1963);
       } else {
       }
 
       /***/
     },
 
-    /***/ 5866: /***/ function (
+    /***/ 5664: /***/ function (
       module,
       __unused_webpack_exports,
       __webpack_require__
     ) {
-      module.exports = __webpack_require__(5038);
+      module.exports = __webpack_require__(1556);
 
       /***/
     },
@@ -135,7 +135,7 @@
       return __webpack_require__((__webpack_require__.s = moduleId));
     };
     /******/ __webpack_require__.O(0, [888, 179], function () {
-      return __webpack_exec__(2188);
+      return __webpack_exec__(7288);
     });
     /******/ var __webpack_exports__ = __webpack_require__.O();
     /******/ _N_E = __webpack_exports__;

Diff for script-HASH.js

@@ -1,7 +1,7 @@
 (self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
   [797],
   {
-    /***/ 1136: /***/ function (
+    /***/ 6695: /***/ function (
       __unused_webpack_module,
       __unused_webpack_exports,
       __webpack_require__
@@ -9,7 +9,7 @@
       (window.__NEXT_P = window.__NEXT_P || []).push([
         "/script",
         function () {
-          return __webpack_require__(6159);
+          return __webpack_require__(3323);
         },
       ]);
       if (false) {
@@ -18,7 +18,7 @@
       /***/
     },
 
-    /***/ 6159: /***/ function (
+    /***/ 3323: /***/ function (
       __unused_webpack_module,
       __webpack_exports__,
       __webpack_require__
@@ -32,9 +32,9 @@
         /* harmony export */
       });
       /* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__ =
-        __webpack_require__(3268);
+        __webpack_require__(9701);
       /* harmony import */ var next_script__WEBPACK_IMPORTED_MODULE_1__ =
-        __webpack_require__(9096);
+        __webpack_require__(6071);
       /* harmony import */ var next_script__WEBPACK_IMPORTED_MODULE_1___default =
         /*#__PURE__*/ __webpack_require__.n(
           next_script__WEBPACK_IMPORTED_MODULE_1__
@@ -67,7 +67,7 @@
       /***/
     },
 
-    /***/ 6205: /***/ function (
+    /***/ 1963: /***/ function (
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -82,7 +82,7 @@
        * This source code is licensed under the MIT license found in the
        * LICENSE file in the root directory of this source tree.
        */
-      var f = __webpack_require__(2947),
+      var f = __webpack_require__(465),
         k = Symbol.for("react.element"),
         l = Symbol.for("react.fragment"),
         m = Object.prototype.hasOwnProperty,
@@ -117,7 +117,7 @@
       /***/
     },
 
-    /***/ 3268: /***/ function (
+    /***/ 9701: /***/ function (
       module,
       __unused_webpack_exports,
       __webpack_require__
@@ -125,19 +125,19 @@
       "use strict";
 
       if (true) {
-        module.exports = __webpack_require__(6205);
+        module.exports = __webpack_require__(1963);
       } else {
       }
 
       /***/
     },
 
-    /***/ 9096: /***/ function (
+    /***/ 6071: /***/ function (
       module,
       __unused_webpack_exports,
       __webpack_require__
     ) {
-      module.exports = __webpack_require__(550);
+      module.exports = __webpack_require__(1787);
 
       /***/
     },
@@ -148,7 +148,7 @@
       return __webpack_require__((__webpack_require__.s = moduleId));
     };
     /******/ __webpack_require__.O(0, [888, 179], function () {
-      return __webpack_exec__(1136);
+      return __webpack_exec__(6695);
     });
     /******/ var __webpack_exports__ = __webpack_require__.O();
     /******/ _N_E = __webpack_exports__;

Diff for withRouter-HASH.js

@@ -1,7 +1,7 @@
 (self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
   [807],
   {
-    /***/ 3551: /***/ function (
+    /***/ 8118: /***/ function (
       __unused_webpack_module,
       __unused_webpack_exports,
       __webpack_require__
@@ -9,7 +9,7 @@
       (window.__NEXT_P = window.__NEXT_P || []).push([
         "/withRouter",
         function () {
-          return __webpack_require__(1459);
+          return __webpack_require__(7107);
         },
       ]);
       if (false) {
@@ -18,7 +18,7 @@
       /***/
     },
 
-    /***/ 1459: /***/ function (
+    /***/ 7107: /***/ function (
       __unused_webpack_module,
       __webpack_exports__,
       __webpack_require__
@@ -32,9 +32,9 @@
         /* harmony export */
       });
       /* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__ =
-        __webpack_require__(3268);
+        __webpack_require__(9701);
       /* harmony import */ var next_router__WEBPACK_IMPORTED_MODULE_1__ =
-        __webpack_require__(5866);
+        __webpack_require__(5664);
       /* harmony import */ var next_router__WEBPACK_IMPORTED_MODULE_1___default =
         /*#__PURE__*/ __webpack_require__.n(
           next_router__WEBPACK_IMPORTED_MODULE_1__
@@ -53,7 +53,7 @@
       /***/
     },
 
-    /***/ 6205: /***/ function (
+    /***/ 1963: /***/ function (
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -68,7 +68,7 @@
        * This source code is licensed under the MIT license found in the
        * LICENSE file in the root directory of this source tree.
        */
-      var f = __webpack_require__(2947),
+      var f = __webpack_require__(465),
         k = Symbol.for("react.element"),
         l = Symbol.for("react.fragment"),
         m = Object.prototype.hasOwnProperty,
@@ -103,7 +103,7 @@
       /***/
     },
 
-    /***/ 3268: /***/ function (
+    /***/ 9701: /***/ function (
       module,
       __unused_webpack_exports,
       __webpack_require__
@@ -111,19 +111,19 @@
       "use strict";
 
       if (true) {
-        module.exports = __webpack_require__(6205);
+        module.exports = __webpack_require__(1963);
       } else {
       }
 
       /***/
     },
 
-    /***/ 5866: /***/ function (
+    /***/ 5664: /***/ function (
       module,
       __unused_webpack_exports,
       __webpack_require__
     ) {
-      module.exports = __webpack_require__(5038);
+      module.exports = __webpack_require__(1556);
 
       /***/
     },
@@ -134,7 +134,7 @@
       return __webpack_require__((__webpack_require__.s = moduleId));
     };
     /******/ __webpack_require__.O(0, [888, 179], function () {
-      return __webpack_exec__(3551);
+      return __webpack_exec__(8118);
     });
     /******/ var __webpack_exports__ = __webpack_require__.O();
     /******/ _N_E = __webpack_exports__;

Diff for 869.HASH.js

@@ -1,8 +1,8 @@
 "use strict";
 (self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
-  [869],
+  [959],
   {
-    /***/ 4869: /***/ function (
+    /***/ 959: /***/ function (
       __unused_webpack_module,
       __webpack_exports__,
       __webpack_require__
@@ -15,7 +15,7 @@
         /* harmony export */
       });
       /* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__ =
-        __webpack_require__(3268);
+        __webpack_require__(9701);
 
       const Hello = () => {
         return /*#__PURE__*/ (0,

Diff for 887-HASH.js

Diff too large to display

Diff for 974ec2d0-HASH.js

@@ -1,8 +1,8 @@
 "use strict";
 (self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
-  [961],
+  [972],
   {
-    /***/ 4776: /***/ function (
+    /***/ 8133: /***/ function (
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -18,8 +18,8 @@
        */ /*
  Modernizr 3.0.0pre (Custom Build) | MIT
 */
-      var aa = __webpack_require__(9754),
-        ca = __webpack_require__(4270),
+      var aa = __webpack_require__(5710),
+        ca = __webpack_require__(5289),
         da = {
           usingClientEntryPoint: !1,
           Events: null,

Diff for page-6d66fef2836d0da5.js

@@ -1,7 +1,7 @@
 (self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
   [760, 185, 952],
   {
-    /***/ 8372: /***/ function () {
+    /***/ 7746: /***/ function () {
       /***/
     },
   },
@@ -10,8 +10,8 @@
     /******/ var __webpack_exec__ = function (moduleId) {
       return __webpack_require__((__webpack_require__.s = moduleId));
     };
-    /******/ __webpack_require__.O(0, [961, 887, 744], function () {
-      return __webpack_exec__(8372);
+    /******/ __webpack_require__.O(0, [972, 828, 744], function () {
+      return __webpack_exec__(7746);
     });
     /******/ var __webpack_exports__ = __webpack_require__.O();
     /******/ _N_E = __webpack_exports__;

Diff for page-039588e345417fb3.js

@@ -1,7 +1,7 @@
 (self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
   [952, 185, 760],
   {
-    /***/ 8372: /***/ function () {
+    /***/ 7746: /***/ function () {
       /***/
     },
   },
@@ -10,8 +10,8 @@
     /******/ var __webpack_exec__ = function (moduleId) {
       return __webpack_require__((__webpack_require__.s = moduleId));
     };
-    /******/ __webpack_require__.O(0, [961, 887, 744], function () {
-      return __webpack_exec__(8372);
+    /******/ __webpack_require__.O(0, [972, 828, 744], function () {
+      return __webpack_exec__(7746);
     });
     /******/ var __webpack_exports__ = __webpack_require__.O();
     /******/ _N_E = __webpack_exports__;

Diff for layout-28347..944a10846.js

@@ -1,7 +1,7 @@
 (self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
   [185, 952, 760],
   {
-    /***/ 8372: /***/ function () {
+    /***/ 7746: /***/ function () {
       /***/
     },
   },
@@ -10,8 +10,8 @@
     /******/ var __webpack_exec__ = function (moduleId) {
       return __webpack_require__((__webpack_require__.s = moduleId));
     };
-    /******/ __webpack_require__.O(0, [961, 887, 744], function () {
-      return __webpack_exec__(8372);
+    /******/ __webpack_require__.O(0, [972, 828, 744], function () {
+      return __webpack_exec__(7746);
     });
     /******/ var __webpack_exports__ = __webpack_require__.O();
     /******/ _N_E = __webpack_exports__;

Diff for main-HASH.js

Diff too large to display

Diff for main-app-HASH.js

@@ -1,25 +1,25 @@
 (self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
   [744],
   {
-    /***/ 1086: /***/ function (
+    /***/ 7892: /***/ function (
       __unused_webpack_module,
       __unused_webpack_exports,
       __webpack_require__
     ) {
       Promise.resolve(/* import() eager */).then(
-        __webpack_require__.t.bind(__webpack_require__, 8579, 23)
+        __webpack_require__.t.bind(__webpack_require__, 3762, 23)
       );
       Promise.resolve(/* import() eager */).then(
-        __webpack_require__.t.bind(__webpack_require__, 265, 23)
+        __webpack_require__.t.bind(__webpack_require__, 9349, 23)
       );
       Promise.resolve(/* import() eager */).then(
-        __webpack_require__.t.bind(__webpack_require__, 5708, 23)
+        __webpack_require__.t.bind(__webpack_require__, 4309, 23)
       );
       Promise.resolve(/* import() eager */).then(
-        __webpack_require__.t.bind(__webpack_require__, 1687, 23)
+        __webpack_require__.t.bind(__webpack_require__, 1233, 23)
       );
       Promise.resolve(/* import() eager */).then(
-        __webpack_require__.t.bind(__webpack_require__, 3900, 23)
+        __webpack_require__.t.bind(__webpack_require__, 8478, 23)
       );
 
       /***/
@@ -30,8 +30,8 @@
     /******/ var __webpack_exec__ = function (moduleId) {
       return __webpack_require__((__webpack_require__.s = moduleId));
     };
-    /******/ __webpack_require__.O(0, [961, 887], function () {
-      return __webpack_exec__(1843), __webpack_exec__(1086);
+    /******/ __webpack_require__.O(0, [972, 828], function () {
+      return __webpack_exec__(7756), __webpack_exec__(7892);
     });
     /******/ var __webpack_exports__ = __webpack_require__.O();
     /******/ _N_E = __webpack_exports__;

Diff for webpack-HASH.js

@@ -219,7 +219,7 @@
     /******/ __webpack_require__.u = function (chunkId) {
       /******/ // return url for filenames based on template
       /******/ return (
-        "static/chunks/" + chunkId + "." + "cb3f1602da3175db" + ".js"
+        "static/chunks/" + chunkId + "." + "34508e89b1d2d329" + ".js"
       );
       /******/
     };

Diff for index.html

@@ -5,22 +5,22 @@
     <link
       rel="preload"
       as="script"
-      href="/_next/static/chunks/webpack-d9965445ebce461e.js"
+      href="/_next/static/chunks/webpack-c61449b956bd4ddc.js"
     />
     <link
       rel="preload"
       as="script"
-      href="/_next/static/chunks/main-3c8a80faf1451448.js"
+      href="/_next/static/chunks/main-8090323be3dc3e14.js"
     />
     <link
       rel="preload"
       as="script"
-      href="/_next/static/chunks/pages/_app-39c49a32fdfb4902.js"
+      href="/_next/static/chunks/pages/_app-fd2fd11c0153c1f4.js"
     />
     <link
       rel="preload"
       as="script"
-      href="/_next/static/chunks/pages/index-96b4df8f97c0f01a.js"
+      href="/_next/static/chunks/pages/index-b21e2d2005e858d6.js"
     />
     <link
       rel="preload"
@@ -41,19 +41,19 @@
       src="/_next/static/chunks/polyfills-c67a75d1b6f99dc8.js"
     ></script>
     <script
-      src="/_next/static/chunks/webpack-d9965445ebce461e.js"
+      src="/_next/static/chunks/webpack-c61449b956bd4ddc.js"
       defer=""
     ></script>
     <script
-      src="/_next/static/chunks/main-3c8a80faf1451448.js"
+      src="/_next/static/chunks/main-8090323be3dc3e14.js"
       defer=""
     ></script>
     <script
-      src="/_next/static/chunks/pages/_app-39c49a32fdfb4902.js"
+      src="/_next/static/chunks/pages/_app-fd2fd11c0153c1f4.js"
       defer=""
     ></script>
     <script
-      src="/_next/static/chunks/pages/index-96b4df8f97c0f01a.js"
+      src="/_next/static/chunks/pages/index-b21e2d2005e858d6.js"
       defer=""
     ></script>
     <script src="/_next/static/BUILD_ID/_buildManifest.js" defer=""></script>

Diff for link.html

@@ -5,22 +5,22 @@
     <link
       rel="preload"
       as="script"
-      href="/_next/static/chunks/webpack-d9965445ebce461e.js"
+      href="/_next/static/chunks/webpack-c61449b956bd4ddc.js"
     />
     <link
       rel="preload"
       as="script"
-      href="/_next/static/chunks/main-3c8a80faf1451448.js"
+      href="/_next/static/chunks/main-8090323be3dc3e14.js"
     />
     <link
       rel="preload"
       as="script"
-      href="/_next/static/chunks/pages/_app-39c49a32fdfb4902.js"
+      href="/_next/static/chunks/pages/_app-fd2fd11c0153c1f4.js"
     />
     <link
       rel="preload"
       as="script"
-      href="/_next/static/chunks/pages/link-ee4f7deeb8112e61.js"
+      href="/_next/static/chunks/pages/link-6af118e4c6f497bb.js"
     />
     <link
       rel="preload"
@@ -41,19 +41,19 @@
       src="/_next/static/chunks/polyfills-c67a75d1b6f99dc8.js"
     ></script>
     <script
-      src="/_next/static/chunks/webpack-d9965445ebce461e.js"
+      src="/_next/static/chunks/webpack-c61449b956bd4ddc.js"
       defer=""
     ></script>
     <script
-      src="/_next/static/chunks/main-3c8a80faf1451448.js"
+      src="/_next/static/chunks/main-8090323be3dc3e14.js"
       defer=""
     ></script>
     <script
-      src="/_next/static/chunks/pages/_app-39c49a32fdfb4902.js"
+      src="/_next/static/chunks/pages/_app-fd2fd11c0153c1f4.js"
       defer=""
     ></script>
     <script
-      src="/_next/static/chunks/pages/link-ee4f7deeb8112e61.js"
+      src="/_next/static/chunks/pages/link-6af118e4c6f497bb.js"
       defer=""
     ></script>
     <script src="/_next/static/BUILD_ID/_buildManifest.js" defer=""></script>

Diff for withRouter.html

@@ -5,22 +5,22 @@
     <link
       rel="preload"
       as="script"
-      href="/_next/static/chunks/webpack-d9965445ebce461e.js"
+      href="/_next/static/chunks/webpack-c61449b956bd4ddc.js"
     />
     <link
       rel="preload"
       as="script"
-      href="/_next/static/chunks/main-3c8a80faf1451448.js"
+      href="/_next/static/chunks/main-8090323be3dc3e14.js"
     />
     <link
       rel="preload"
       as="script"
-      href="/_next/static/chunks/pages/_app-39c49a32fdfb4902.js"
+      href="/_next/static/chunks/pages/_app-fd2fd11c0153c1f4.js"
     />
     <link
       rel="preload"
       as="script"
-      href="/_next/static/chunks/pages/withRouter-ebac16c2d9b51247.js"
+      href="/_next/static/chunks/pages/withRouter-00f6845c2afd30e2.js"
     />
     <link
       rel="preload"
@@ -41,19 +41,19 @@
       src="/_next/static/chunks/polyfills-c67a75d1b6f99dc8.js"
     ></script>
     <script
-      src="/_next/static/chunks/webpack-d9965445ebce461e.js"
+      src="/_next/static/chunks/webpack-c61449b956bd4ddc.js"
       defer=""
     ></script>
     <script
-      src="/_next/static/chunks/main-3c8a80faf1451448.js"
+      src="/_next/static/chunks/main-8090323be3dc3e14.js"
       defer=""
     ></script>
     <script
-      src="/_next/static/chunks/pages/_app-39c49a32fdfb4902.js"
+      src="/_next/static/chunks/pages/_app-fd2fd11c0153c1f4.js"
       defer=""
     ></script>
     <script
-      src="/_next/static/chunks/pages/withRouter-ebac16c2d9b51247.js"
+      src="/_next/static/chunks/pages/withRouter-00f6845c2afd30e2.js"
       defer=""
     ></script>
     <script src="/_next/static/BUILD_ID/_buildManifest.js" defer=""></script>

Commit: d2d1a27

wyattjoh added 7 commits March 9, 2023 11:02

feat: improve locale support for domains and pathname matching

55fb2bf

tests: added test case for multiple locales in pathname

0f5ef3e

refactor: separate provider and normalizer

7049cc8

feat: improved i18n provider coverage

9843302

fix: fixed bug with i18n provider

9fb204a

tests: added another test case

cf947ab

fix: locale domain detection fixes

68347b6

cleanup: removed dead code

0ba4c1a

wyattjoh added 2 commits March 15, 2023 13:44

fix: enable page checker to be locale matching

3cf6b48

Merge branch 'canary' into wyattjoh/i18n-improvements

7be1eaf

wyattjoh marked this pull request as ready for review March 15, 2023 21:44

wyattjoh requested review from timneutkens, ijjk, shuding, huozhi and feedthejim as code owners March 15, 2023 21:44

Merge branch 'canary' into wyattjoh/i18n-improvements

c5437fd

ijjk approved these changes Mar 17, 2023

View reviewed changes

Merge branch 'canary' into wyattjoh/i18n-improvements

3a737e3

ijjk added area: tests created-by: Next.js team PRs by the Next.js team type: next labels Mar 17, 2023

kodiakhq bot added 2 commits March 17, 2023 18:07

Merge branch 'canary' into wyattjoh/i18n-improvements

c3a1374

Merge branch 'canary' into wyattjoh/i18n-improvements

d2d1a27

kodiakhq bot merged commit e29bd49 into canary Mar 17, 2023
105 checks passed

kodiakhq bot deleted the wyattjoh/i18n-improvements branch March 17, 2023 18:48

github-actions bot locked as resolved and limited conversation to collaborators Apr 17, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

i18n Improvements #47174

i18n Improvements #47174

wyattjoh commented Mar 15, 2023 •

edited

ijjk commented Mar 15, 2023

ijjk commented Mar 15, 2023 •

edited

Diffs

i18n Improvements #47174

i18n Improvements #47174

Conversation

wyattjoh commented Mar 15, 2023 • edited

ijjk commented Mar 15, 2023

Failing test suites

ijjk commented Mar 15, 2023 • edited

Stats from current PR

Diffs

wyattjoh commented Mar 15, 2023 •

edited

ijjk commented Mar 15, 2023 •

edited