Skip to content

fix(Turbopack): Fix duplicated layout rendering in edge cases #81948

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

Conversation

Cy-Tek
Copy link
Contributor

@Cy-Tek Cy-Tek commented Jul 22, 2025

Fix module reference handling in app_structure.rs

What?

Fixed a bug in the check_and_update_module_references function by making the code always overrides the not-found, unauthorized, etc files at the top level group route layer.

Why?

The previous implementation had a bug that when a directory was setup like the added test case where the layouts from a lower directory would render when only the layouts at the level of the not-found page should have rendered.

How?

  • Added the ability to force overriding of the module when running check_and_update_module_references

Fixes #PACK-5081

@ijjk ijjk added created-by: Turbopack team PRs by the Turbopack team. Turbopack Related to Turbopack with Next.js. labels Jul 22, 2025
Copy link
Contributor Author

Cy-Tek commented Jul 22, 2025

This stack of pull requests is managed by Graphite. Learn more about stacking.

@ijjk
Copy link
Member

ijjk commented Jul 22, 2025

Tests Passed

@ijjk
Copy link
Member

ijjk commented Jul 22, 2025

Stats from current PR

Default Build (Increase detected ⚠️)
General
vercel/next.js canary vercel/next.js joshhannaford/pack-5081-fix-double-rendering-of-defaultlayout-on-404-page Change
buildDuration 22.7s 22.2s N/A
buildDurationCached 17.4s 15.1s N/A
nodeModulesSize 443 MB 442 MB N/A
nextStartRea..uration (ms) 426ms 447ms N/A
Client Bundles (main, webpack) Overall increase ⚠️
vercel/next.js canary vercel/next.js joshhannaford/pack-5081-fix-double-rendering-of-defaultlayout-on-404-page Change
194b18f3-HASH.js gzip 54.1 kB 54.1 kB N/A
5177.HASH.js gzip 169 B 169 B
5226-HASH.js gzip 44.4 kB 44.6 kB ⚠️ +245 B
9952-HASH.js gzip 5.27 kB 5.27 kB
framework-HASH.js gzip 57.4 kB 57.4 kB N/A
main-app-HASH.js gzip 256 B 258 B N/A
main-HASH.js gzip 36.8 kB 36.1 kB N/A
webpack-HASH.js gzip 1.71 kB 1.71 kB N/A
Overall change 49.8 kB 50.1 kB ⚠️ +245 B
Legacy Client Bundles (polyfills)
vercel/next.js canary vercel/next.js joshhannaford/pack-5081-fix-double-rendering-of-defaultlayout-on-404-page Change
polyfills-HASH.js gzip 39.4 kB 39.4 kB
Overall change 39.4 kB 39.4 kB
Client Pages
vercel/next.js canary vercel/next.js joshhannaford/pack-5081-fix-double-rendering-of-defaultlayout-on-404-page Change
_app-HASH.js gzip 193 B 193 B
_error-HASH.js gzip 182 B 182 B
amp-HASH.js gzip 504 B 500 B N/A
css-HASH.js gzip 335 B 333 B N/A
dynamic-HASH.js gzip 1.83 kB 1.83 kB N/A
edge-ssr-HASH.js gzip 255 B 255 B
head-HASH.js gzip 349 B 351 B N/A
hooks-HASH.js gzip 382 B 382 B
image-HASH.js gzip 4.65 kB 4.66 kB N/A
index-HASH.js gzip 259 B 259 B
link-HASH.js gzip 2.52 kB 2.52 kB N/A
routerDirect..HASH.js gzip 320 B 316 B N/A
script-HASH.js gzip 385 B 386 B N/A
withRouter-HASH.js gzip 316 B 315 B N/A
1afbb74e6ecf..834.css gzip 106 B 106 B
Overall change 1.38 kB 1.38 kB
Client Build Manifests
vercel/next.js canary vercel/next.js joshhannaford/pack-5081-fix-double-rendering-of-defaultlayout-on-404-page Change
_buildManifest.js gzip 751 B 752 B N/A
Overall change 0 B 0 B
Rendered Page Sizes
vercel/next.js canary vercel/next.js joshhannaford/pack-5081-fix-double-rendering-of-defaultlayout-on-404-page Change
index.html gzip 525 B 524 B N/A
link.html gzip 539 B 538 B N/A
withRouter.html gzip 520 B 519 B N/A
Overall change 0 B 0 B
Edge SSR bundle Size Overall increase ⚠️
vercel/next.js canary vercel/next.js joshhannaford/pack-5081-fix-double-rendering-of-defaultlayout-on-404-page Change
edge-ssr.js gzip 120 kB 120 kB ⚠️ +112 B
page.js gzip 221 kB 215 kB N/A
Overall change 120 kB 120 kB ⚠️ +112 B
Middleware size
vercel/next.js canary vercel/next.js joshhannaford/pack-5081-fix-double-rendering-of-defaultlayout-on-404-page Change
middleware-b..fest.js gzip 675 B 673 B N/A
middleware-r..fest.js gzip 155 B 157 B N/A
middleware.js gzip 32.6 kB 32.2 kB N/A
edge-runtime..pack.js gzip 853 B 853 B
Overall change 853 B 853 B
Next Runtimes
vercel/next.js canary vercel/next.js joshhannaford/pack-5081-fix-double-rendering-of-defaultlayout-on-404-page Change
app-page-exp...dev.js gzip 280 kB 279 kB N/A
app-page-exp..prod.js gzip 154 kB 154 kB N/A
app-page-tur...dev.js gzip 280 kB 279 kB N/A
app-page-tur..prod.js gzip 154 kB 154 kB N/A
app-page-tur...dev.js gzip 268 kB 264 kB N/A
app-page-tur..prod.js gzip 148 kB 148 kB N/A
app-page.run...dev.js gzip 268 kB 264 kB N/A
app-page.run..prod.js gzip 148 kB 148 kB N/A
app-route-ex...dev.js gzip 69.1 kB 69.1 kB N/A
app-route-ex..prod.js gzip 48.6 kB 48.6 kB N/A
app-route-tu...dev.js gzip 69.1 kB 69.2 kB N/A
app-route-tu..prod.js gzip 48.6 kB 48.6 kB N/A
app-route-tu...dev.js gzip 68.5 kB 68.5 kB N/A
app-route-tu..prod.js gzip 48.2 kB 48.2 kB N/A
app-route.ru...dev.js gzip 68.4 kB 68.5 kB N/A
app-route.ru..prod.js gzip 48.2 kB 48.2 kB N/A
dist_client_...dev.js gzip 326 B 326 B
dist_client_...dev.js gzip 328 B 328 B
dist_client_...dev.js gzip 320 B 320 B
dist_client_...dev.js gzip 318 B 318 B
pages-api-tu...dev.js gzip 42.3 kB 42.2 kB N/A
pages-api-tu..prod.js gzip 32.5 kB 32.5 kB N/A
pages-api.ru...dev.js gzip 42.2 kB 42.2 kB N/A
pages-api.ru..prod.js gzip 32.5 kB 32.5 kB N/A
pages-turbo....dev.js gzip 52.3 kB 52.3 kB N/A
pages-turbo...prod.js gzip 39.9 kB 39.9 kB N/A
pages.runtim...dev.js gzip 52.4 kB 52.4 kB N/A
pages.runtim..prod.js gzip 40 kB 40 kB N/A
server.runti..prod.js gzip 59.6 kB 59.5 kB N/A
Overall change 1.29 kB 1.29 kB
build cache
vercel/next.js canary vercel/next.js joshhannaford/pack-5081-fix-double-rendering-of-defaultlayout-on-404-page Change
0.pack gzip 2.82 MB 2.81 MB N/A
index.pack gzip 92.1 kB 92.2 kB N/A
Overall change 0 B 0 B
Diff details
Diff for page.js

Diff too large to display

Diff for middleware.js

Diff too large to display

Diff for edge-ssr.js

Diff too large to display

Diff for amp-HASH.js
@@ -1,17 +1,56 @@
 (self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
   [5034],
   {
-    /***/ 3960: /***/ (
+    /***/ 3870: /***/ (
       module,
       __unused_webpack_exports,
       __webpack_require__
     ) => {
-      module.exports = __webpack_require__(9034);
+      module.exports = __webpack_require__(5973);
 
       /***/
     },
 
-    /***/ 4891: /***/ (
+    /***/ 5973: /***/ (module, exports, __webpack_require__) => {
+      "use strict";
+
+      Object.defineProperty(exports, "__esModule", {
+        value: true,
+      });
+      Object.defineProperty(exports, "useAmp", {
+        enumerable: true,
+        get: function () {
+          return useAmp;
+        },
+      });
+      const _interop_require_default = __webpack_require__(1532);
+      const _react = /*#__PURE__*/ _interop_require_default._(
+        __webpack_require__(148)
+      );
+      const _ampcontextsharedruntime = __webpack_require__(4363);
+      const _ampmode = __webpack_require__(931);
+      function useAmp() {
+        // Don't assign the context value to a variable to save bytes
+        return (0, _ampmode.isInAmpMode)(
+          _react.default.useContext(_ampcontextsharedruntime.AmpStateContext)
+        );
+      }
+      if (
+        (typeof exports.default === "function" ||
+          (typeof exports.default === "object" && exports.default !== null)) &&
+        typeof exports.default.__esModule === "undefined"
+      ) {
+        Object.defineProperty(exports.default, "__esModule", {
+          value: true,
+        });
+        Object.assign(exports.default, exports);
+        module.exports = exports.default;
+      } //# sourceMappingURL=amp.js.map
+
+      /***/
+    },
+
+    /***/ 6638: /***/ (
       __unused_webpack_module,
       __webpack_exports__,
       __webpack_require__
@@ -24,7 +63,7 @@
         /* harmony export */
       });
       /* harmony import */ var next_amp__WEBPACK_IMPORTED_MODULE_0__ =
-        __webpack_require__(3960);
+        __webpack_require__(3870);
       /* harmony import */ var next_amp__WEBPACK_IMPORTED_MODULE_0___default =
         /*#__PURE__*/ __webpack_require__.n(
           next_amp__WEBPACK_IMPORTED_MODULE_0__
@@ -42,7 +81,7 @@
       /***/
     },
 
-    /***/ 7252: /***/ (
+    /***/ 8318: /***/ (
       __unused_webpack_module,
       __unused_webpack_exports,
       __webpack_require__
@@ -50,7 +89,7 @@
       (window.__NEXT_P = window.__NEXT_P || []).push([
         "/amp",
         function () {
-          return __webpack_require__(4891);
+          return __webpack_require__(6638);
         },
       ]);
       if (false) {
@@ -58,52 +97,13 @@
 
       /***/
     },
-
-    /***/ 9034: /***/ (module, exports, __webpack_require__) => {
-      "use strict";
-
-      Object.defineProperty(exports, "__esModule", {
-        value: true,
-      });
-      Object.defineProperty(exports, "useAmp", {
-        enumerable: true,
-        get: function () {
-          return useAmp;
-        },
-      });
-      const _interop_require_default = __webpack_require__(1532);
-      const _react = /*#__PURE__*/ _interop_require_default._(
-        __webpack_require__(148)
-      );
-      const _ampcontextsharedruntime = __webpack_require__(5134);
-      const _ampmode = __webpack_require__(8314);
-      function useAmp() {
-        // Don't assign the context value to a variable to save bytes
-        return (0, _ampmode.isInAmpMode)(
-          _react.default.useContext(_ampcontextsharedruntime.AmpStateContext)
-        );
-      }
-      if (
-        (typeof exports.default === "function" ||
-          (typeof exports.default === "object" && exports.default !== null)) &&
-        typeof exports.default.__esModule === "undefined"
-      ) {
-        Object.defineProperty(exports.default, "__esModule", {
-          value: true,
-        });
-        Object.assign(exports.default, exports);
-        module.exports = exports.default;
-      } //# sourceMappingURL=amp.js.map
-
-      /***/
-    },
   },
   /******/ (__webpack_require__) => {
     // webpackRuntimeModules
     /******/ var __webpack_exec__ = (moduleId) =>
       __webpack_require__((__webpack_require__.s = moduleId));
     /******/ __webpack_require__.O(0, [636, 6593, 8792], () =>
-      __webpack_exec__(7252)
+      __webpack_exec__(8318)
     );
     /******/ 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([
   [9813],
   {
-    /***/ 1586: /***/ (
+    /***/ 2628: /***/ (
       __unused_webpack_module,
       __unused_webpack_exports,
       __webpack_require__
@@ -9,7 +9,7 @@
       (window.__NEXT_P = window.__NEXT_P || []).push([
         "/css",
         function () {
-          return __webpack_require__(9570);
+          return __webpack_require__(8707);
         },
       ]);
       if (false) {
@@ -18,14 +18,7 @@
       /***/
     },
 
-    /***/ 6499: /***/ (module) => {
-      // extracted by mini-css-extract-plugin
-      module.exports = { helloWorld: "css_helloWorld__aUdUq" };
-
-      /***/
-    },
-
-    /***/ 9570: /***/ (
+    /***/ 8707: /***/ (
       __unused_webpack_module,
       __webpack_exports__,
       __webpack_require__
@@ -39,7 +32,7 @@
       /* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__ =
         __webpack_require__(5640);
       /* harmony import */ var _css_module_css__WEBPACK_IMPORTED_MODULE_1__ =
-        __webpack_require__(6499);
+        __webpack_require__(9080);
       /* harmony import */ var _css_module_css__WEBPACK_IMPORTED_MODULE_1___default =
         /*#__PURE__*/ __webpack_require__.n(
           _css_module_css__WEBPACK_IMPORTED_MODULE_1__
@@ -58,13 +51,20 @@
 
       /***/
     },
+
+    /***/ 9080: /***/ (module) => {
+      // extracted by mini-css-extract-plugin
+      module.exports = { helloWorld: "css_helloWorld__aUdUq" };
+
+      /***/
+    },
   },
   /******/ (__webpack_require__) => {
     // webpackRuntimeModules
     /******/ var __webpack_exec__ = (moduleId) =>
       __webpack_require__((__webpack_require__.s = moduleId));
     /******/ __webpack_require__.O(0, [636, 6593, 8792], () =>
-      __webpack_exec__(1586)
+      __webpack_exec__(2628)
     );
     /******/ var __webpack_exports__ = __webpack_require__.O();
     /******/ _N_E = __webpack_exports__;
Diff for dynamic-HASH.js
@@ -1,17 +1,80 @@
 (self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
   [2291],
   {
-    /***/ 283: /***/ (
-      module,
+    /***/ 2001: /***/ (
+      __unused_webpack_module,
+      __webpack_exports__,
+      __webpack_require__
+    ) => {
+      "use strict";
+      __webpack_require__.r(__webpack_exports__);
+      /* harmony export */ __webpack_require__.d(__webpack_exports__, {
+        /* harmony export */ __N_SSP: () => /* binding */ __N_SSP,
+        /* harmony export */ default: () => __WEBPACK_DEFAULT_EXPORT__,
+        /* harmony export */
+      });
+      /* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__ =
+        __webpack_require__(5640);
+      /* harmony import */ var next_dynamic__WEBPACK_IMPORTED_MODULE_1__ =
+        __webpack_require__(9553);
+      /* harmony import */ var next_dynamic__WEBPACK_IMPORTED_MODULE_1___default =
+        /*#__PURE__*/ __webpack_require__.n(
+          next_dynamic__WEBPACK_IMPORTED_MODULE_1__
+        );
+
+      const DynamicHello = next_dynamic__WEBPACK_IMPORTED_MODULE_1___default()(
+        () =>
+          __webpack_require__
+            .e(/* import() */ 8042)
+            .then(__webpack_require__.bind(__webpack_require__, 8042))
+            .then((mod) => mod.Hello),
+        {
+          loadableGenerated: {
+            webpack: () => [/*require.resolve*/ 8042],
+          },
+        }
+      );
+      const Page = () =>
+        /*#__PURE__*/ (0, react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__.jsxs)(
+          react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__.Fragment,
+          {
+            children: [
+              /*#__PURE__*/ (0,
+              react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__.jsx)("p", {
+                children: "testing next/dynamic size",
+              }),
+              /*#__PURE__*/ (0,
+              react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__.jsx)(
+                DynamicHello,
+                {}
+              ),
+            ],
+          }
+        );
+      var __N_SSP = true;
+      /* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = Page;
+
+      /***/
+    },
+
+    /***/ 2976: /***/ (
+      __unused_webpack_module,
       __unused_webpack_exports,
       __webpack_require__
     ) => {
-      module.exports = __webpack_require__(9757);
+      (window.__NEXT_P = window.__NEXT_P || []).push([
+        "/dynamic",
+        function () {
+          return __webpack_require__(2001);
+        },
+      ]);
+      if (false) {
+      }
 
       /***/
     },
 
-    /***/ 4604: /***/ (
+    /***/ 7807: /***/ (
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -38,7 +101,17 @@
       /***/
     },
 
-    /***/ 5162: /***/ (
+    /***/ 9553: /***/ (
+      module,
+      __unused_webpack_exports,
+      __webpack_require__
+    ) => {
+      module.exports = __webpack_require__(9986);
+
+      /***/
+    },
+
+    /***/ 9829: /***/ (
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -80,7 +153,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE
       const _react = /*#__PURE__*/ _interop_require_default._(
         __webpack_require__(148)
       );
-      const _loadablecontextsharedruntime = __webpack_require__(4604);
+      const _loadablecontextsharedruntime = __webpack_require__(7807);
       function resolve(obj) {
         return obj && obj.default ? obj.default : obj;
       }
@@ -315,80 +388,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE
       /***/
     },
 
-    /***/ 7216: /***/ (
-      __unused_webpack_module,
-      __webpack_exports__,
-      __webpack_require__
-    ) => {
-      "use strict";
-      __webpack_require__.r(__webpack_exports__);
-      /* harmony export */ __webpack_require__.d(__webpack_exports__, {
-        /* harmony export */ __N_SSP: () => /* binding */ __N_SSP,
-        /* harmony export */ default: () => __WEBPACK_DEFAULT_EXPORT__,
-        /* harmony export */
-      });
-      /* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__ =
-        __webpack_require__(5640);
-      /* harmony import */ var next_dynamic__WEBPACK_IMPORTED_MODULE_1__ =
-        __webpack_require__(283);
-      /* harmony import */ var next_dynamic__WEBPACK_IMPORTED_MODULE_1___default =
-        /*#__PURE__*/ __webpack_require__.n(
-          next_dynamic__WEBPACK_IMPORTED_MODULE_1__
-        );
-
-      const DynamicHello = next_dynamic__WEBPACK_IMPORTED_MODULE_1___default()(
-        () =>
-          __webpack_require__
-            .e(/* import() */ 5177)
-            .then(__webpack_require__.bind(__webpack_require__, 5177))
-            .then((mod) => mod.Hello),
-        {
-          loadableGenerated: {
-            webpack: () => [/*require.resolve*/ 5177],
-          },
-        }
-      );
-      const Page = () =>
-        /*#__PURE__*/ (0, react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__.jsxs)(
-          react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__.Fragment,
-          {
-            children: [
-              /*#__PURE__*/ (0,
-              react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__.jsx)("p", {
-                children: "testing next/dynamic size",
-              }),
-              /*#__PURE__*/ (0,
-              react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__.jsx)(
-                DynamicHello,
-                {}
-              ),
-            ],
-          }
-        );
-      var __N_SSP = true;
-      /* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = Page;
-
-      /***/
-    },
-
-    /***/ 9254: /***/ (
-      __unused_webpack_module,
-      __unused_webpack_exports,
-      __webpack_require__
-    ) => {
-      (window.__NEXT_P = window.__NEXT_P || []).push([
-        "/dynamic",
-        function () {
-          return __webpack_require__(7216);
-        },
-      ]);
-      if (false) {
-      }
-
-      /***/
-    },
-
-    /***/ 9757: /***/ (module, exports, __webpack_require__) => {
+    /***/ 9986: /***/ (module, exports, __webpack_require__) => {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -421,7 +421,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE
         __webpack_require__(148)
       );
       const _loadablesharedruntime = /*#__PURE__*/ _interop_require_default._(
-        __webpack_require__(5162)
+        __webpack_require__(9829)
       );
       const isServerSide = "object" === "undefined";
       // Normalize loader to return the module as form { default: Component } for `React.lazy`.
@@ -527,7 +527,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE
     /******/ var __webpack_exec__ = (moduleId) =>
       __webpack_require__((__webpack_require__.s = moduleId));
     /******/ __webpack_require__.O(0, [636, 6593, 8792], () =>
-      __webpack_exec__(9254)
+      __webpack_exec__(2976)
     );
     /******/ var __webpack_exports__ = __webpack_require__.O();
     /******/ _N_E = __webpack_exports__;
Diff for hooks-HASH.js
@@ -1,24 +1,7 @@
 (self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
   [9804],
   {
-    /***/ 1664: /***/ (
-      __unused_webpack_module,
-      __unused_webpack_exports,
-      __webpack_require__
-    ) => {
-      (window.__NEXT_P = window.__NEXT_P || []).push([
-        "/hooks",
-        function () {
-          return __webpack_require__(8437);
-        },
-      ]);
-      if (false) {
-      }
-
-      /***/
-    },
-
-    /***/ 8437: /***/ (
+    /***/ 4756: /***/ (
       __unused_webpack_module,
       __webpack_exports__,
       __webpack_require__
@@ -76,13 +59,30 @@
 
       /***/
     },
+
+    /***/ 5426: /***/ (
+      __unused_webpack_module,
+      __unused_webpack_exports,
+      __webpack_require__
+    ) => {
+      (window.__NEXT_P = window.__NEXT_P || []).push([
+        "/hooks",
+        function () {
+          return __webpack_require__(4756);
+        },
+      ]);
+      if (false) {
+      }
+
+      /***/
+    },
   },
   /******/ (__webpack_require__) => {
     // webpackRuntimeModules
     /******/ var __webpack_exec__ = (moduleId) =>
       __webpack_require__((__webpack_require__.s = moduleId));
     /******/ __webpack_require__.O(0, [636, 6593, 8792], () =>
-      __webpack_exec__(1664)
+      __webpack_exec__(5426)
     );
     /******/ var __webpack_exports__ = __webpack_require__.O();
     /******/ _N_E = __webpack_exports__;
Diff for image-HASH.js

Diff too large to display

Diff for index-HASH.js
@@ -1,7 +1,24 @@
 (self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
   [3332],
   {
-    /***/ 7309: /***/ (
+    /***/ 8230: /***/ (
+      __unused_webpack_module,
+      __unused_webpack_exports,
+      __webpack_require__
+    ) => {
+      (window.__NEXT_P = window.__NEXT_P || []).push([
+        "/",
+        function () {
+          return __webpack_require__(8696);
+        },
+      ]);
+      if (false) {
+      }
+
+      /***/
+    },
+
+    /***/ 8696: /***/ (
       __unused_webpack_module,
       __webpack_exports__,
       __webpack_require__
@@ -19,30 +36,13 @@
 
       /***/
     },
-
-    /***/ 9532: /***/ (
-      __unused_webpack_module,
-      __unused_webpack_exports,
-      __webpack_require__
-    ) => {
-      (window.__NEXT_P = window.__NEXT_P || []).push([
-        "/",
-        function () {
-          return __webpack_require__(7309);
-        },
-      ]);
-      if (false) {
-      }
-
-      /***/
-    },
   },
   /******/ (__webpack_require__) => {
     // webpackRuntimeModules
     /******/ var __webpack_exec__ = (moduleId) =>
       __webpack_require__((__webpack_require__.s = moduleId));
     /******/ __webpack_require__.O(0, [636, 6593, 8792], () =>
-      __webpack_exec__(9532)
+      __webpack_exec__(8230)
     );
     /******/ var __webpack_exports__ = __webpack_require__.O();
     /******/ _N_E = __webpack_exports__;
Diff for link-HASH.js
@@ -1,310 +1,7 @@
 (self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
   [4672],
   {
-    /***/ 1225: /***/ (module, exports, __webpack_require__) => {
-      "use strict";
-
-      Object.defineProperty(exports, "__esModule", {
-        value: true,
-      });
-      Object.defineProperty(exports, "useIntersection", {
-        enumerable: true,
-        get: function () {
-          return useIntersection;
-        },
-      });
-      const _react = __webpack_require__(148);
-      const _requestidlecallback = __webpack_require__(524);
-      const hasIntersectionObserver =
-        typeof IntersectionObserver === "function";
-      const observers = new Map();
-      const idList = [];
-      function createObserver(options) {
-        const id = {
-          root: options.root || null,
-          margin: options.rootMargin || "",
-        };
-        const existing = idList.find(
-          (obj) => obj.root === id.root && obj.margin === id.margin
-        );
-        let instance;
-        if (existing) {
-          instance = observers.get(existing);
-          if (instance) {
-            return instance;
-          }
-        }
-        const elements = new Map();
-        const observer = new IntersectionObserver((entries) => {
-          entries.forEach((entry) => {
-            const callback = elements.get(entry.target);
-            const isVisible =
-              entry.isIntersecting || entry.intersectionRatio > 0;
-            if (callback && isVisible) {
-              callback(isVisible);
-            }
-          });
-        }, options);
-        instance = {
-          id,
-          observer,
-          elements,
-        };
-        idList.push(id);
-        observers.set(id, instance);
-        return instance;
-      }
-      function observe(element, callback, options) {
-        const { id, observer, elements } = createObserver(options);
-        elements.set(element, callback);
-        observer.observe(element);
-        return function unobserve() {
-          elements.delete(element);
-          observer.unobserve(element);
-          // Destroy observer when there's nothing left to watch:
-          if (elements.size === 0) {
-            observer.disconnect();
-            observers.delete(id);
-            const index = idList.findIndex(
-              (obj) => obj.root === id.root && obj.margin === id.margin
-            );
-            if (index > -1) {
-              idList.splice(index, 1);
-            }
-          }
-        };
-      }
-      function useIntersection(param) {
-        let { rootRef, rootMargin, disabled } = param;
-        const isDisabled = disabled || !hasIntersectionObserver;
-        const [visible, setVisible] = (0, _react.useState)(false);
-        const elementRef = (0, _react.useRef)(null);
-        const setElement = (0, _react.useCallback)((element) => {
-          elementRef.current = element;
-        }, []);
-        (0, _react.useEffect)(() => {
-          if (hasIntersectionObserver) {
-            if (isDisabled || visible) return;
-            const element = elementRef.current;
-            if (element && element.tagName) {
-              const unobserve = observe(
-                element,
-                (isVisible) => isVisible && setVisible(isVisible),
-                {
-                  root: rootRef == null ? void 0 : rootRef.current,
-                  rootMargin,
-                }
-              );
-              return unobserve;
-            }
-          } else {
-            if (!visible) {
-              const idleCallback = (0,
-              _requestidlecallback.requestIdleCallback)(() => setVisible(true));
-              return () =>
-                (0, _requestidlecallback.cancelIdleCallback)(idleCallback);
-            }
-          }
-          // eslint-disable-next-line react-hooks/exhaustive-deps
-        }, [isDisabled, rootMargin, rootRef, visible, elementRef.current]);
-        const resetVisible = (0, _react.useCallback)(() => {
-          setVisible(false);
-        }, []);
-        return [setElement, visible, resetVisible];
-      }
-      if (
-        (typeof exports.default === "function" ||
-          (typeof exports.default === "object" && exports.default !== null)) &&
-        typeof exports.default.__esModule === "undefined"
-      ) {
-        Object.defineProperty(exports.default, "__esModule", {
-          value: true,
-        });
-        Object.assign(exports.default, exports);
-        module.exports = exports.default;
-      } //# sourceMappingURL=use-intersection.js.map
-
-      /***/
-    },
-
-    /***/ 1243: /***/ (
-      __unused_webpack_module,
-      __webpack_exports__,
-      __webpack_require__
-    ) => {
-      "use strict";
-      __webpack_require__.r(__webpack_exports__);
-      /* harmony export */ __webpack_require__.d(__webpack_exports__, {
-        /* harmony export */ __N_SSP: () => /* binding */ __N_SSP,
-        /* harmony export */ default: () => __WEBPACK_DEFAULT_EXPORT__,
-        /* harmony export */
-      });
-      /* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__ =
-        __webpack_require__(5640);
-      /* harmony import */ var next_link__WEBPACK_IMPORTED_MODULE_1__ =
-        __webpack_require__(8770);
-      /* harmony import */ var next_link__WEBPACK_IMPORTED_MODULE_1___default =
-        /*#__PURE__*/ __webpack_require__.n(
-          next_link__WEBPACK_IMPORTED_MODULE_1__
-        );
-
-      function aLink(props) {
-        return /*#__PURE__*/ (0,
-        react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__.jsxs)("div", {
-          children: [
-            /*#__PURE__*/ (0,
-            react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__.jsx)("h3", {
-              children: "A Link page!",
-            }),
-            /*#__PURE__*/ (0,
-            react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__.jsx)(
-              next_link__WEBPACK_IMPORTED_MODULE_1___default(),
-              {
-                href: "/",
-                children: "Go to /",
-              }
-            ),
-          ],
-        });
-      }
-      var __N_SSP = true;
-      /* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = aLink;
-
-      /***/
-    },
-
-    /***/ 1994: /***/ (module, exports, __webpack_require__) => {
-      "use strict";
-
-      Object.defineProperty(exports, "__esModule", {
-        value: true,
-      });
-      Object.defineProperty(exports, "getDomainLocale", {
-        enumerable: true,
-        get: function () {
-          return getDomainLocale;
-        },
-      });
-      const _normalizetrailingslash = __webpack_require__(8332);
-      const basePath =
-        /* unused pure expression or super */ null && (false || "");
-      function getDomainLocale(path, locale, locales, domainLocales) {
-        if (false) {
-        } else {
-          return false;
-        }
-      }
-      if (
-        (typeof exports.default === "function" ||
-          (typeof exports.default === "object" && exports.default !== null)) &&
-        typeof exports.default.__esModule === "undefined"
-      ) {
-        Object.defineProperty(exports.default, "__esModule", {
-          value: true,
-        });
-        Object.assign(exports.default, exports);
-        module.exports = exports.default;
-      } //# sourceMappingURL=get-domain-locale.js.map
-
-      /***/
-    },
-
-    /***/ 3568: /***/ (
-      __unused_webpack_module,
-      __unused_webpack_exports,
-      __webpack_require__
-    ) => {
-      (window.__NEXT_P = window.__NEXT_P || []).push([
-        "/link",
-        function () {
-          return __webpack_require__(1243);
-        },
-      ]);
-      if (false) {
-      }
-
-      /***/
-    },
-
-    /***/ 3636: /***/ (module, exports, __webpack_require__) => {
-      "use strict";
-
-      Object.defineProperty(exports, "__esModule", {
-        value: true,
-      });
-      Object.defineProperty(exports, "useMergedRef", {
-        enumerable: true,
-        get: function () {
-          return useMergedRef;
-        },
-      });
-      const _react = __webpack_require__(148);
-      function useMergedRef(refA, refB) {
-        const cleanupA = (0, _react.useRef)(null);
-        const cleanupB = (0, _react.useRef)(null);
-        // NOTE: In theory, we could skip the wrapping if only one of the refs is non-null.
-        // (this happens often if the user doesn't pass a ref to Link/Form/Image)
-        // But this can cause us to leak a cleanup-ref into user code (e.g. via `<Link legacyBehavior>`),
-        // and the user might pass that ref into ref-merging library that doesn't support cleanup refs
-        // (because it hasn't been updated for React 19)
-        // which can then cause things to blow up, because a cleanup-returning ref gets called with `null`.
-        // So in practice, it's safer to be defensive and always wrap the ref, even on React 19.
-        return (0, _react.useCallback)(
-          (current) => {
-            if (current === null) {
-              const cleanupFnA = cleanupA.current;
-              if (cleanupFnA) {
-                cleanupA.current = null;
-                cleanupFnA();
-              }
-              const cleanupFnB = cleanupB.current;
-              if (cleanupFnB) {
-                cleanupB.current = null;
-                cleanupFnB();
-              }
-            } else {
-              if (refA) {
-                cleanupA.current = applyRef(refA, current);
-              }
-              if (refB) {
-                cleanupB.current = applyRef(refB, current);
-              }
-            }
-          },
-          [refA, refB]
-        );
-      }
-      function applyRef(refA, current) {
-        if (typeof refA === "function") {
-          const cleanup = refA(current);
-          if (typeof cleanup === "function") {
-            return cleanup;
-          } else {
-            return () => refA(null);
-          }
-        } else {
-          refA.current = current;
-          return () => {
-            refA.current = null;
-          };
-        }
-      }
-      if (
-        (typeof exports.default === "function" ||
-          (typeof exports.default === "object" && exports.default !== null)) &&
-        typeof exports.default.__esModule === "undefined"
-      ) {
-        Object.defineProperty(exports.default, "__esModule", {
-          value: true,
-        });
-        Object.assign(exports.default, exports);
-        module.exports = exports.default;
-      } //# sourceMappingURL=use-merged-ref.js.map
-
-      /***/
-    },
-
-    /***/ 3994: /***/ (module, exports, __webpack_require__) => {
+    /***/ 591: /***/ (module, exports, __webpack_require__) => {
       "use strict";
       /* __next_internal_client_entry_do_not_use__  cjs */
       Object.defineProperty(exports, "__esModule", {
@@ -331,17 +28,17 @@
       const _react = /*#__PURE__*/ _interop_require_wildcard._(
         __webpack_require__(148)
       );
-      const _resolvehref = __webpack_require__(3048);
-      const _islocalurl = __webpack_require__(346);
-      const _formaturl = __webpack_require__(5043);
-      const _utils = __webpack_require__(8317);
-      const _addlocale = __webpack_require__(3294);
-      const _routercontextsharedruntime = __webpack_require__(8855);
-      const _useintersection = __webpack_require__(1225);
-      const _getdomainlocale = __webpack_require__(1994);
-      const _addbasepath = __webpack_require__(6415);
-      const _usemergedref = __webpack_require__(3636);
-      const _erroronce = __webpack_require__(7790);
+      const _resolvehref = __webpack_require__(5837);
+      const _islocalurl = __webpack_require__(5953);
+      const _formaturl = __webpack_require__(6212);
+      const _utils = __webpack_require__(6950);
+      const _addlocale = __webpack_require__(6467);
+      const _routercontextsharedruntime = __webpack_require__(6712);
+      const _useintersection = __webpack_require__(9692);
+      const _getdomainlocale = __webpack_require__(6850);
+      const _addbasepath = __webpack_require__(4928);
+      const _usemergedref = __webpack_require__(1765);
+      const _erroronce = __webpack_require__(8659);
       const prefetched = new Set();
       function prefetch(router, href, as, options) {
         if (false) {
@@ -730,7 +427,177 @@
       /***/
     },
 
-    /***/ 7790: /***/ (__unused_webpack_module, exports) => {
+    /***/ 1148: /***/ (
+      module,
+      __unused_webpack_exports,
+      __webpack_require__
+    ) => {
+      module.exports = __webpack_require__(591);
+
+      /***/
+    },
+
+    /***/ 1765: /***/ (module, exports, __webpack_require__) => {
+      "use strict";
+
+      Object.defineProperty(exports, "__esModule", {
+        value: true,
+      });
+      Object.defineProperty(exports, "useMergedRef", {
+        enumerable: true,
+        get: function () {
+          return useMergedRef;
+        },
+      });
+      const _react = __webpack_require__(148);
+      function useMergedRef(refA, refB) {
+        const cleanupA = (0, _react.useRef)(null);
+        const cleanupB = (0, _react.useRef)(null);
+        // NOTE: In theory, we could skip the wrapping if only one of the refs is non-null.
+        // (this happens often if the user doesn't pass a ref to Link/Form/Image)
+        // But this can cause us to leak a cleanup-ref into user code (e.g. via `<Link legacyBehavior>`),
+        // and the user might pass that ref into ref-merging library that doesn't support cleanup refs
+        // (because it hasn't been updated for React 19)
+        // which can then cause things to blow up, because a cleanup-returning ref gets called with `null`.
+        // So in practice, it's safer to be defensive and always wrap the ref, even on React 19.
+        return (0, _react.useCallback)(
+          (current) => {
+            if (current === null) {
+              const cleanupFnA = cleanupA.current;
+              if (cleanupFnA) {
+                cleanupA.current = null;
+                cleanupFnA();
+              }
+              const cleanupFnB = cleanupB.current;
+              if (cleanupFnB) {
+                cleanupB.current = null;
+                cleanupFnB();
+              }
+            } else {
+              if (refA) {
+                cleanupA.current = applyRef(refA, current);
+              }
+              if (refB) {
+                cleanupB.current = applyRef(refB, current);
+              }
+            }
+          },
+          [refA, refB]
+        );
+      }
+      function applyRef(refA, current) {
+        if (typeof refA === "function") {
+          const cleanup = refA(current);
+          if (typeof cleanup === "function") {
+            return cleanup;
+          } else {
+            return () => refA(null);
+          }
+        } else {
+          refA.current = current;
+          return () => {
+            refA.current = null;
+          };
+        }
+      }
+      if (
+        (typeof exports.default === "function" ||
+          (typeof exports.default === "object" && exports.default !== null)) &&
+        typeof exports.default.__esModule === "undefined"
+      ) {
+        Object.defineProperty(exports.default, "__esModule", {
+          value: true,
+        });
+        Object.assign(exports.default, exports);
+        module.exports = exports.default;
+      } //# sourceMappingURL=use-merged-ref.js.map
+
+      /***/
+    },
+
+    /***/ 5436: /***/ (
+      __unused_webpack_module,
+      __webpack_exports__,
+      __webpack_require__
+    ) => {
+      "use strict";
+      __webpack_require__.r(__webpack_exports__);
+      /* harmony export */ __webpack_require__.d(__webpack_exports__, {
+        /* harmony export */ __N_SSP: () => /* binding */ __N_SSP,
+        /* harmony export */ default: () => __WEBPACK_DEFAULT_EXPORT__,
+        /* harmony export */
+      });
+      /* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__ =
+        __webpack_require__(5640);
+      /* harmony import */ var next_link__WEBPACK_IMPORTED_MODULE_1__ =
+        __webpack_require__(1148);
+      /* harmony import */ var next_link__WEBPACK_IMPORTED_MODULE_1___default =
+        /*#__PURE__*/ __webpack_require__.n(
+          next_link__WEBPACK_IMPORTED_MODULE_1__
+        );
+
+      function aLink(props) {
+        return /*#__PURE__*/ (0,
+        react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__.jsxs)("div", {
+          children: [
+            /*#__PURE__*/ (0,
+            react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__.jsx)("h3", {
+              children: "A Link page!",
+            }),
+            /*#__PURE__*/ (0,
+            react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__.jsx)(
+              next_link__WEBPACK_IMPORTED_MODULE_1___default(),
+              {
+                href: "/",
+                children: "Go to /",
+              }
+            ),
+          ],
+        });
+      }
+      var __N_SSP = true;
+      /* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = aLink;
+
+      /***/
+    },
+
+    /***/ 6850: /***/ (module, exports, __webpack_require__) => {
+      "use strict";
+
+      Object.defineProperty(exports, "__esModule", {
+        value: true,
+      });
+      Object.defineProperty(exports, "getDomainLocale", {
+        enumerable: true,
+        get: function () {
+          return getDomainLocale;
+        },
+      });
+      const _normalizetrailingslash = __webpack_require__(6457);
+      const basePath =
+        /* unused pure expression or super */ null && (false || "");
+      function getDomainLocale(path, locale, locales, domainLocales) {
+        if (false) {
+        } else {
+          return false;
+        }
+      }
+      if (
+        (typeof exports.default === "function" ||
+          (typeof exports.default === "object" && exports.default !== null)) &&
+        typeof exports.default.__esModule === "undefined"
+      ) {
+        Object.defineProperty(exports.default, "__esModule", {
+          value: true,
+        });
+        Object.assign(exports.default, exports);
+        module.exports = exports.default;
+      } //# sourceMappingURL=get-domain-locale.js.map
+
+      /***/
+    },
+
+    /***/ 8659: /***/ (__unused_webpack_module, exports) => {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -749,12 +616,145 @@
       /***/
     },
 
-    /***/ 8770: /***/ (
-      module,
+    /***/ 9666: /***/ (
+      __unused_webpack_module,
       __unused_webpack_exports,
       __webpack_require__
     ) => {
-      module.exports = __webpack_require__(3994);
+      (window.__NEXT_P = window.__NEXT_P || []).push([
+        "/link",
+        function () {
+          return __webpack_require__(5436);
+        },
+      ]);
+      if (false) {
+      }
+
+      /***/
+    },
+
+    /***/ 9692: /***/ (module, exports, __webpack_require__) => {
+      "use strict";
+
+      Object.defineProperty(exports, "__esModule", {
+        value: true,
+      });
+      Object.defineProperty(exports, "useIntersection", {
+        enumerable: true,
+        get: function () {
+          return useIntersection;
+        },
+      });
+      const _react = __webpack_require__(148);
+      const _requestidlecallback = __webpack_require__(315);
+      const hasIntersectionObserver =
+        typeof IntersectionObserver === "function";
+      const observers = new Map();
+      const idList = [];
+      function createObserver(options) {
+        const id = {
+          root: options.root || null,
+          margin: options.rootMargin || "",
+        };
+        const existing = idList.find(
+          (obj) => obj.root === id.root && obj.margin === id.margin
+        );
+        let instance;
+        if (existing) {
+          instance = observers.get(existing);
+          if (instance) {
+            return instance;
+          }
+        }
+        const elements = new Map();
+        const observer = new IntersectionObserver((entries) => {
+          entries.forEach((entry) => {
+            const callback = elements.get(entry.target);
+            const isVisible =
+              entry.isIntersecting || entry.intersectionRatio > 0;
+            if (callback && isVisible) {
+              callback(isVisible);
+            }
+          });
+        }, options);
+        instance = {
+          id,
+          observer,
+          elements,
+        };
+        idList.push(id);
+        observers.set(id, instance);
+        return instance;
+      }
+      function observe(element, callback, options) {
+        const { id, observer, elements } = createObserver(options);
+        elements.set(element, callback);
+        observer.observe(element);
+        return function unobserve() {
+          elements.delete(element);
+          observer.unobserve(element);
+          // Destroy observer when there's nothing left to watch:
+          if (elements.size === 0) {
+            observer.disconnect();
+            observers.delete(id);
+            const index = idList.findIndex(
+              (obj) => obj.root === id.root && obj.margin === id.margin
+            );
+            if (index > -1) {
+              idList.splice(index, 1);
+            }
+          }
+        };
+      }
+      function useIntersection(param) {
+        let { rootRef, rootMargin, disabled } = param;
+        const isDisabled = disabled || !hasIntersectionObserver;
+        const [visible, setVisible] = (0, _react.useState)(false);
+        const elementRef = (0, _react.useRef)(null);
+        const setElement = (0, _react.useCallback)((element) => {
+          elementRef.current = element;
+        }, []);
+        (0, _react.useEffect)(() => {
+          if (hasIntersectionObserver) {
+            if (isDisabled || visible) return;
+            const element = elementRef.current;
+            if (element && element.tagName) {
+              const unobserve = observe(
+                element,
+                (isVisible) => isVisible && setVisible(isVisible),
+                {
+                  root: rootRef == null ? void 0 : rootRef.current,
+                  rootMargin,
+                }
+              );
+              return unobserve;
+            }
+          } else {
+            if (!visible) {
+              const idleCallback = (0,
+              _requestidlecallback.requestIdleCallback)(() => setVisible(true));
+              return () =>
+                (0, _requestidlecallback.cancelIdleCallback)(idleCallback);
+            }
+          }
+          // eslint-disable-next-line react-hooks/exhaustive-deps
+        }, [isDisabled, rootMargin, rootRef, visible, elementRef.current]);
+        const resetVisible = (0, _react.useCallback)(() => {
+          setVisible(false);
+        }, []);
+        return [setElement, visible, resetVisible];
+      }
+      if (
+        (typeof exports.default === "function" ||
+          (typeof exports.default === "object" && exports.default !== null)) &&
+        typeof exports.default.__esModule === "undefined"
+      ) {
+        Object.defineProperty(exports.default, "__esModule", {
+          value: true,
+        });
+        Object.assign(exports.default, exports);
+        module.exports = exports.default;
+      } //# sourceMappingURL=use-intersection.js.map
 
       /***/
     },
@@ -764,7 +764,7 @@
     /******/ var __webpack_exec__ = (moduleId) =>
       __webpack_require__((__webpack_require__.s = moduleId));
     /******/ __webpack_require__.O(0, [636, 6593, 8792], () =>
-      __webpack_exec__(3568)
+      __webpack_exec__(9666)
     );
     /******/ var __webpack_exports__ = __webpack_require__.O();
     /******/ _N_E = __webpack_exports__;
Diff for routerDirect-HASH.js
@@ -1,17 +1,7 @@
 (self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
   [188],
   {
-    /***/ 4631: /***/ (
-      module,
-      __unused_webpack_exports,
-      __webpack_require__
-    ) => {
-      module.exports = __webpack_require__(7263);
-
-      /***/
-    },
-
-    /***/ 5703: /***/ (
+    /***/ 76: /***/ (
       __unused_webpack_module,
       __webpack_exports__,
       __webpack_require__
@@ -26,7 +16,7 @@
       /* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__ =
         __webpack_require__(5640);
       /* harmony import */ var next_router__WEBPACK_IMPORTED_MODULE_1__ =
-        __webpack_require__(4631);
+        __webpack_require__(9413);
       /* harmony import */ var next_router__WEBPACK_IMPORTED_MODULE_1___default =
         /*#__PURE__*/ __webpack_require__.n(
           next_router__WEBPACK_IMPORTED_MODULE_1__
@@ -46,7 +36,7 @@
       /***/
     },
 
-    /***/ 7824: /***/ (
+    /***/ 1810: /***/ (
       __unused_webpack_module,
       __unused_webpack_exports,
       __webpack_require__
@@ -54,7 +44,7 @@
       (window.__NEXT_P = window.__NEXT_P || []).push([
         "/routerDirect",
         function () {
-          return __webpack_require__(5703);
+          return __webpack_require__(76);
         },
       ]);
       if (false) {
@@ -62,13 +52,23 @@
 
       /***/
     },
+
+    /***/ 9413: /***/ (
+      module,
+      __unused_webpack_exports,
+      __webpack_require__
+    ) => {
+      module.exports = __webpack_require__(5282);
+
+      /***/
+    },
   },
   /******/ (__webpack_require__) => {
     // webpackRuntimeModules
     /******/ var __webpack_exec__ = (moduleId) =>
       __webpack_require__((__webpack_require__.s = moduleId));
     /******/ __webpack_require__.O(0, [636, 6593, 8792], () =>
-      __webpack_exec__(7824)
+      __webpack_exec__(1810)
     );
     /******/ var __webpack_exports__ = __webpack_require__.O();
     /******/ _N_E = __webpack_exports__;
Diff for script-HASH.js
@@ -1,7 +1,17 @@
 (self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
   [1209],
   {
-    /***/ 692: /***/ (
+    /***/ 2227: /***/ (
+      module,
+      __unused_webpack_exports,
+      __webpack_require__
+    ) => {
+      module.exports = __webpack_require__(5984);
+
+      /***/
+    },
+
+    /***/ 3043: /***/ (
       __unused_webpack_module,
       __webpack_exports__,
       __webpack_require__
@@ -16,7 +26,7 @@
       /* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__ =
         __webpack_require__(5640);
       /* harmony import */ var next_script__WEBPACK_IMPORTED_MODULE_1__ =
-        __webpack_require__(8293);
+        __webpack_require__(2227);
       /* harmony import */ var next_script__WEBPACK_IMPORTED_MODULE_1___default =
         /*#__PURE__*/ __webpack_require__.n(
           next_script__WEBPACK_IMPORTED_MODULE_1__
@@ -49,7 +59,7 @@
       /***/
     },
 
-    /***/ 1984: /***/ (
+    /***/ 3642: /***/ (
       __unused_webpack_module,
       __unused_webpack_exports,
       __webpack_require__
@@ -57,7 +67,7 @@
       (window.__NEXT_P = window.__NEXT_P || []).push([
         "/script",
         function () {
-          return __webpack_require__(692);
+          return __webpack_require__(3043);
         },
       ]);
       if (false) {
@@ -65,23 +75,13 @@
 
       /***/
     },
-
-    /***/ 8293: /***/ (
-      module,
-      __unused_webpack_exports,
-      __webpack_require__
-    ) => {
-      module.exports = __webpack_require__(5837);
-
-      /***/
-    },
   },
   /******/ (__webpack_require__) => {
     // webpackRuntimeModules
     /******/ var __webpack_exec__ = (moduleId) =>
       __webpack_require__((__webpack_require__.s = moduleId));
     /******/ __webpack_require__.O(0, [636, 6593, 8792], () =>
-      __webpack_exec__(1984)
+      __webpack_exec__(3642)
     );
     /******/ var __webpack_exports__ = __webpack_require__.O();
     /******/ _N_E = __webpack_exports__;
Diff for withRouter-HASH.js
@@ -1,17 +1,7 @@
 (self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
   [3263],
   {
-    /***/ 4631: /***/ (
-      module,
-      __unused_webpack_exports,
-      __webpack_require__
-    ) => {
-      module.exports = __webpack_require__(7263);
-
-      /***/
-    },
-
-    /***/ 4882: /***/ (
+    /***/ 1089: /***/ (
       __unused_webpack_module,
       __webpack_exports__,
       __webpack_require__
@@ -26,7 +16,7 @@
       /* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__ =
         __webpack_require__(5640);
       /* harmony import */ var next_router__WEBPACK_IMPORTED_MODULE_1__ =
-        __webpack_require__(4631);
+        __webpack_require__(9413);
       /* harmony import */ var next_router__WEBPACK_IMPORTED_MODULE_1___default =
         /*#__PURE__*/ __webpack_require__.n(
           next_router__WEBPACK_IMPORTED_MODULE_1__
@@ -45,7 +35,7 @@
       /***/
     },
 
-    /***/ 9216: /***/ (
+    /***/ 3962: /***/ (
       __unused_webpack_module,
       __unused_webpack_exports,
       __webpack_require__
@@ -53,7 +43,7 @@
       (window.__NEXT_P = window.__NEXT_P || []).push([
         "/withRouter",
         function () {
-          return __webpack_require__(4882);
+          return __webpack_require__(1089);
         },
       ]);
       if (false) {
@@ -61,13 +51,23 @@
 
       /***/
     },
+
+    /***/ 9413: /***/ (
+      module,
+      __unused_webpack_exports,
+      __webpack_require__
+    ) => {
+      module.exports = __webpack_require__(5282);
+
+      /***/
+    },
   },
   /******/ (__webpack_require__) => {
     // webpackRuntimeModules
     /******/ var __webpack_exec__ = (moduleId) =>
       __webpack_require__((__webpack_require__.s = moduleId));
     /******/ __webpack_require__.O(0, [636, 6593, 8792], () =>
-      __webpack_exec__(9216)
+      __webpack_exec__(3962)
     );
     /******/ var __webpack_exports__ = __webpack_require__.O();
     /******/ _N_E = __webpack_exports__;
Diff for 194b18f3-HASH.js
@@ -1,13 +1,13 @@
 "use strict";
 (self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
-  [1305],
+  [9910],
   {
-    /***/ 2292: /***/ (
+    /***/ 5294: /***/ (
       __unused_webpack_module,
       exports,
       __webpack_require__
     ) => {
-      /* provided dependency */ var process = __webpack_require__(4836);
+      /* provided dependency */ var process = __webpack_require__(6367);
       /**
        * @license React
        * react-dom-client.production.js
@@ -22,9 +22,9 @@
  Modernizr 3.0.0pre (Custom Build) | MIT
 */
 
-      var Scheduler = __webpack_require__(9373),
-        React = __webpack_require__(2663),
-        ReactDOM = __webpack_require__(6806);
+      var Scheduler = __webpack_require__(5499),
+        React = __webpack_require__(2253),
+        ReactDOM = __webpack_require__(1440);
       function formatProdErrorMessage(code) {
         var url = "https://react.dev/errors/" + code;
         if (1 < arguments.length) {
@@ -3380,20 +3380,6 @@
             throw SuspenseException;
         }
       }
-      function resolveLazy(lazyType) {
-        try {
-          var init = lazyType._init;
-          return init(lazyType._payload);
-        } catch (x) {
-          if (
-            null !== x &&
-            "object" === typeof x &&
-            "function" === typeof x.then
-          )
-            throw ((suspendedThenable = x), SuspenseException);
-          throw x;
-        }
-      }
       var suspendedThenable = null;
       function getSuspendedThenable() {
         if (null === suspendedThenable)
@@ -3434,6 +3420,10 @@
           )
         );
       }
+      function resolveLazy(lazyType) {
+        var init = lazyType._init;
+        return init(lazyType._payload);
+      }
       function createChildReconciler(shouldTrackSideEffects) {
         function deleteChild(returnFiber, childToDelete) {
           if (shouldTrackSideEffects) {
@@ -3618,10 +3608,9 @@
                   newChild
                 );
               case REACT_LAZY_TYPE:
-                return (
-                  (newChild = resolveLazy(newChild)),
-                  createChild(returnFiber, newChild, lanes)
-                );
+                var init = newChild._init;
+                newChild = init(newChild._payload);
+                return createChild(returnFiber, newChild, lanes);
             }
             if (isArrayImpl(newChild) || getIteratorFn(newChild))
               return (
@@ -3668,7 +3657,8 @@
                   : null;
               case REACT_LAZY_TYPE:
                 return (
-                  (newChild = resolveLazy(newChild)),
+                  (key = newChild._init),
+                  (newChild = key(newChild._payload)),
                   updateSlot(returnFiber, oldFiber, newChild, lanes)
                 );
             }
@@ -3734,15 +3724,14 @@
                   updatePortal(returnFiber, existingChildren, newChild, lanes)
                 );
               case REACT_LAZY_TYPE:
-                return (
-                  (newChild = resolveLazy(newChild)),
-                  updateFromMap(
-                    existingChildren,
-                    returnFiber,
-                    newIdx,
-                    newChild,
-                    lanes
-                  )
+                var init = newChild._init;
+                newChild = init(newChild._payload);
+                return updateFromMap(
+                  existingChildren,
+                  returnFiber,
+                  newIdx,
+                  newChild,
+                  lanes
                 );
             }
             if (isArrayImpl(newChild) || getIteratorFn(newChild))
@@ -4077,7 +4066,8 @@
                 return placeSingleChild(returnFiber);
               case REACT_LAZY_TYPE:
                 return (
-                  (newChild = resolveLazy(newChild)),
+                  (key = newChild._init),
+                  (newChild = key(newChild._payload)),
                   reconcileChildFibersImpl(
                     returnFiber,
                     currentFirstChild,
@@ -7683,54 +7673,61 @@
         switch (workInProgress.tag) {
           case 16:
             a: {
-              var props = workInProgress.pendingProps;
-              current = resolveLazy(workInProgress.elementType);
-              workInProgress.type = current;
-              if ("function" === typeof current)
-                shouldConstruct(current)
-                  ? ((props = resolveClassComponentProps(current, props)),
+              current = workInProgress.pendingProps;
+              var lazyComponent = workInProgress.elementType,
+                init = lazyComponent._init;
+              lazyComponent = init(lazyComponent._payload);
+              workInProgress.type = lazyComponent;
+              if ("function" === typeof lazyComponent)
+                shouldConstruct(lazyComponent)
+                  ? ((current = resolveClassComponentProps(
+                      lazyComponent,
+                      current
+                    )),
                     (workInProgress.tag = 1),
                     (workInProgress = updateClassComponent(
                       null,
                       workInProgress,
+                      lazyComponent,
                       current,
-                      props,
                       renderLanes
                     )))
                   : ((workInProgress.tag = 0),
                     (workInProgress = updateFunctionComponent(
                       null,
                       workInProgress,
+                      lazyComponent,
                       current,
-                      props,
                       renderLanes
                     )));
               else {
-                if (void 0 !== current && null !== current) {
-                  var $$typeof = current.$$typeof;
-                  if ($$typeof === REACT_FORWARD_REF_TYPE) {
+                if (void 0 !== lazyComponent && null !== lazyComponent)
+                  if (
+                    ((init = lazyComponent.$$typeof),
+                    init === REACT_FORWARD_REF_TYPE)
+                  ) {
                     workInProgress.tag = 11;
                     workInProgress = updateForwardRef(
                       null,
                       workInProgress,
+                      lazyComponent,
                       current,
-                      props,
                       renderLanes
                     );
                     break a;
-                  } else if ($$typeof === REACT_MEMO_TYPE) {
+                  } else if (init === REACT_MEMO_TYPE) {
                     workInProgress.tag = 14;
                     workInProgress = updateMemoComponent(
                       null,
                       workInProgress,
+                      lazyComponent,
                       current,
-                      props,
                       renderLanes
                     );
                     break a;
                   }
-                }
-                workInProgress = getComponentNameFromType(current) || current;
+                workInProgress =
+                  getComponentNameFromType(lazyComponent) || lazyComponent;
                 throw Error(formatProdErrorMessage(306, workInProgress, ""));
               }
             }
@@ -7745,16 +7742,16 @@
             );
           case 1:
             return (
-              (props = workInProgress.type),
-              ($$typeof = resolveClassComponentProps(
-                props,
+              (lazyComponent = workInProgress.type),
+              (init = resolveClassComponentProps(
+                lazyComponent,
                 workInProgress.pendingProps
               )),
               updateClassComponent(
                 current,
                 workInProgress,
-                props,
-                $$typeof,
+                lazyComponent,
+                init,
                 renderLanes
               )
             );
@@ -7765,15 +7762,20 @@
                 workInProgress.stateNode.containerInfo
               );
               if (null === current) throw Error(formatProdErrorMessage(387));
-              props = workInProgress.pendingProps;
+              lazyComponent = workInProgress.pendingProps;
               var prevState = workInProgress.memoizedState;
-              $$typeof = prevState.element;
+              init = prevState.element;
               cloneUpdateQueue(current, workInProgress);
-              processUpdateQueue(workInProgress, props, null, renderLanes);
+              processUpdateQueue(
+                workInProgress,
+                lazyComponent,
+                null,
+                renderLanes
+              );
               var nextState = workInProgress.memoizedState;
-              props = nextState.cache;
-              pushProvider(workInProgress, CacheContext, props);
-              props !== prevState.cache &&
+              lazyComponent = nextState.cache;
+              pushProvider(workInProgress, CacheContext, lazyComponent);
+              lazyComponent !== prevState.cache &&
                 propagateContextChanges(
                   workInProgress,
                   [CacheContext],
@@ -7781,11 +7783,11 @@
                   !0
                 );
               suspendIfUpdateReadFromEntangledAsyncAction();
-              props = nextState.element;
+              lazyComponent = nextState.element;
               if (prevState.isDehydrated)
                 if (
                   ((prevState = {
-                    element: props,
+                    element: lazyComponent,
                     isDehydrated: !1,
                     cache: nextState.cache,
                   }),
@@ -7796,20 +7798,20 @@
                   workInProgress = mountHostRootWithoutHydrating(
                     current,
                     workInProgress,
-                    props,
+                    lazyComponent,
                     renderLanes
                   );
                   break a;
-                } else if (props !== $$typeof) {
-                  $$typeof = createCapturedValueAtFiber(
+                } else if (lazyComponent !== init) {
+                  init = createCapturedValueAtFiber(
                     Error(formatProdErrorMessage(424)),
                     workInProgress
                   );
-                  queueHydrationError($$typeof);
+                  queueHydrationError(init);
                   workInProgress = mountHostRootWithoutHydrating(
                     current,
                     workInProgress,
-                    props,
+                    lazyComponent,
                     renderLanes
                   );
                   break a;
@@ -7835,7 +7837,7 @@
                   renderLanes = mountChildFibers(
                     workInProgress,
                     null,
-                    props,
+                    lazyComponent,
                     renderLanes
                   );
                   for (workInProgress.child = renderLanes; renderLanes; )
@@ -7844,7 +7846,7 @@
                 }
               else {
                 resetHydrationState();
-                if (props === $$typeof) {
+                if (lazyComponent === init) {
                   workInProgress = bailoutOnAlreadyFinishedWork(
                     current,
                     workInProgress,
@@ -7852,7 +7854,12 @@
                   );
                   break a;
                 }
-                reconcileChildren(current, workInProgress, props, renderLanes);
+                reconcileChildren(
+                  current,
+                  workInProgress,
+                  lazyComponent,
+                  renderLanes
+                );
               }
               workInProgress = workInProgress.child;
             }
@@ -7871,14 +7878,14 @@
                   : isHydrating ||
                     ((renderLanes = workInProgress.type),
                     (current = workInProgress.pendingProps),
-                    (props = getOwnerDocumentFromRootContainer(
+                    (lazyComponent = getOwnerDocumentFromRootContainer(
                       rootInstanceStackCursor.current
                     ).createElement(renderLanes)),
-                    (props[internalInstanceKey] = workInProgress),
-                    (props[internalPropsKey] = current),
-                    setInitialProperties(props, renderLanes, current),
-                    markNodeAsHoistable(props),
-                    (workInProgress.stateNode = props))
+                    (lazyComponent[internalInstanceKey] = workInProgress),
+                    (lazyComponent[internalPropsKey] = current),
+                    setInitialProperties(lazyComponent, renderLanes, current),
+                    markNodeAsHoistable(lazyComponent),
+                    (workInProgress.stateNode = lazyComponent))
                 : (workInProgress.memoizedState = getResource(
                     workInProgress.type,
                     current.memoizedProps,
@@ -7892,7 +7899,7 @@
               pushHostContext(workInProgress),
               null === current &&
                 isHydrating &&
-                ((props = workInProgress.stateNode =
+                ((lazyComponent = workInProgress.stateNode =
                   resolveSingletonInstance(
                     workInProgress.type,
                     workInProgress.pendingProps,
@@ -7900,13 +7907,13 @@
                   )),
                 (hydrationParentFiber = workInProgress),
                 (rootOrSingletonContext = !0),
-                ($$typeof = nextHydratableInstance),
+                (init = nextHydratableInstance),
                 isSingletonScope(workInProgress.type)
-                  ? ((previousHydratableOnEnteringScopedSingleton = $$typeof),
+                  ? ((previousHydratableOnEnteringScopedSingleton = init),
                     (nextHydratableInstance = getNextHydratable(
-                      props.firstChild
+                      lazyComponent.firstChild
                     )))
-                  : (nextHydratableInstance = $$typeof)),
+                  : (nextHydratableInstance = init)),
               reconcileChildren(
                 current,
                 workInProgress,
@@ -7919,36 +7926,36 @@
             );
           case 5:
             if (null === current && isHydrating) {
-              if (($$typeof = props = nextHydratableInstance))
-                (props = canHydrateInstance(
-                  props,
+              if ((init = lazyComponent = nextHydratableInstance))
+                (lazyComponent = canHydrateInstance(
+                  lazyComponent,
                   workInProgress.type,
                   workInProgress.pendingProps,
                   rootOrSingletonContext
                 )),
-                  null !== props
-                    ? ((workInProgress.stateNode = props),
+                  null !== lazyComponent
+                    ? ((workInProgress.stateNode = lazyComponent),
                       (hydrationParentFiber = workInProgress),
                       (nextHydratableInstance = getNextHydratable(
-                        props.firstChild
+                        lazyComponent.firstChild
                       )),
                       (rootOrSingletonContext = !1),
-                      ($$typeof = !0))
-                    : ($$typeof = !1);
-              $$typeof || throwOnHydrationMismatch(workInProgress);
+                      (init = !0))
+                    : (init = !1);
+              init || throwOnHydrationMismatch(workInProgress);
             }
             pushHostContext(workInProgress);
-            $$typeof = workInProgress.type;
+            init = workInProgress.type;
             prevState = workInProgress.pendingProps;
             nextState = null !== current ? current.memoizedProps : null;
-            props = prevState.children;
-            shouldSetTextContent($$typeof, prevState)
-              ? (props = null)
+            lazyComponent = prevState.children;
+            shouldSetTextContent(init, prevState)
+              ? (lazyComponent = null)
               : null !== nextState &&
-                shouldSetTextContent($$typeof, nextState) &&
+                shouldSetTextContent(init, nextState) &&
                 (workInProgress.flags |= 32);
             null !== workInProgress.memoizedState &&
-              (($$typeof = renderWithHooks(
+              ((init = renderWithHooks(
                 current,
                 workInProgress,
                 TransitionAwareHostComponent,
@@ -7956,9 +7963,14 @@
                 null,
                 renderLanes
               )),
-              (HostTransitionContext._currentValue = $$typeof));
+              (HostTransitionContext._currentValue = init));
             markRef(current, workInProgress);
-            reconcileChildren(current, workInProgress, props, renderLanes);
+            reconcileChildren(
+              current,
+              workInProgress,
+              lazyComponent,
+              renderLanes
+            );
             return workInProgress.child;
           case 6:
             if (null === current && isHydrating) {
@@ -7989,18 +8001,18 @@
                 workInProgress,
                 workInProgress.stateNode.containerInfo
               ),
-              (props = workInProgress.pendingProps),
+              (lazyComponent = workInProgress.pendingProps),
               null === current
                 ? (workInProgress.child = reconcileChildFibers(
                     workInProgress,
                     null,
-                    props,
+                    lazyComponent,
                     renderLanes
                   ))
                 : reconcileChildren(
                     current,
                     workInProgress,
-                    props,
+                    lazyComponent,
                     renderLanes
                   ),
               workInProgress.child
@@ -8045,25 +8057,34 @@
             );
           case 10:
             return (
-              (props = workInProgress.pendingProps),
-              pushProvider(workInProgress, workInProgress.type, props.value),
+              (lazyComponent = workInProgress.pendingProps),
+              pushProvider(
+                workInProgress,
+                workInProgress.type,
+                lazyComponent.value
+              ),
               reconcileChildren(
                 current,
                 workInProgress,
-                props.children,
+                lazyComponent.children,
                 renderLanes
               ),
               workInProgress.child
             );
           case 9:
             return (
-              ($$typeof = workInProgress.type._context),
-              (props = workInProgress.pendingProps.children),
+              (init = workInProgress.type._context),
+              (lazyComponent = workInProgress.pendingProps.children),
               prepareToReadContext(workInProgress),
-              ($$typeof = readContext($$typeof)),
-              (props = props($$typeof)),
+              (init = readContext(init)),
+              (lazyComponent = lazyComponent(init)),
               (workInProgress.flags |= 1),
-              reconcileChildren(current, workInProgress, props, renderLanes),
+              reconcileChildren(
+                current,
+                workInProgress,
+                lazyComponent,
+                renderLanes
+              ),
               workInProgress.child
             );
           case 14:
@@ -8089,13 +8110,13 @@
               renderLanes
             );
           case 31:
-            $$typeof = workInProgress.pendingProps;
+            init = workInProgress.pendingProps;
             nextState = 0 !== (workInProgress.flags & 128);
             workInProgress.flags &= -129;
             if (null === current)
               if (isHydrating) {
-                if ("hidden" === $$typeof.mode)
-                  mountActivityChildren(workInProgress, $$typeof);
+                if ("hidden" === init.mode)
+                  mountActivityChildren(workInProgress, init);
                 else if (
                   (pushDehydratedActivitySuspenseHandler(workInProgress),
                   (renderLanes = nextHydratableInstance)
@@ -8133,13 +8154,12 @@
                 workInProgress.lanes = 536870912;
                 workInProgress = null;
               } else
-                workInProgress = mountActivityChildren(
-                  workInProgress,
-                  $$typeof
-                );
-            else if (((props = current.memoizedState), null !== props))
+                workInProgress = mountActivityChildren(workInProgress, init);
+            else if (
+              ((lazyComponent = current.memoizedState), null !== lazyComponent)
+            )
               if (
-                ((prevState = props.dehydrated),
+                ((prevState = lazyComponent.dehydrated),
                 pushDehydratedActivitySuspenseHandler(workInProgress),
                 nextState)
               )
@@ -8166,19 +8186,16 @@
                 (nextState = 0 !== (renderLanes & current.childLanes)),
                 didReceiveUpdate || nextState)
               ) {
-                $$typeof = workInProgressRoot;
+                init = workInProgressRoot;
                 if (
-                  null !== $$typeof &&
-                  ((prevState = getBumpedLaneForHydration(
-                    $$typeof,
-                    renderLanes
-                  )),
-                  0 !== prevState && prevState !== props.retryLane)
+                  null !== init &&
+                  ((prevState = getBumpedLaneForHydration(init, renderLanes)),
+                  0 !== prevState && prevState !== lazyComponent.retryLane)
                 )
                   throw (
-                    ((props.retryLane = prevState),
+                    ((lazyComponent.retryLane = prevState),
                     enqueueConcurrentRenderForLane(current, prevState),
-                    scheduleUpdateOnFiber($$typeof, current, prevState),
+                    scheduleUpdateOnFiber(init, current, prevState),
                     SelectiveHydrationException)
                   );
                 renderDidSuspendDelayIfPossible();
@@ -8188,7 +8205,7 @@
                   renderLanes
                 );
               } else
-                (renderLanes = props.treeContext),
+                (renderLanes = lazyComponent.treeContext),
                   (nextHydratableInstance = getNextHydratable(
                     prevState.nextSibling
                   )),
@@ -8200,13 +8217,13 @@
                     restoreSuspendedTreeContext(workInProgress, renderLanes),
                   (workInProgress = mountActivityChildren(
                     workInProgress,
-                    $$typeof
+                    init
                   )),
                   (workInProgress.flags |= 4096);
             else
               (renderLanes = createWorkInProgress(current.child, {
-                mode: $$typeof.mode,
-                children: $$typeof.children,
+                mode: init.mode,
+                children: init.children,
               })),
                 (renderLanes.ref = workInProgress.ref),
                 (workInProgress.child = renderLanes),
@@ -8223,40 +8240,40 @@
           case 24:
             return (
               prepareToReadContext(workInProgress),
-              (props = readContext(CacheContext)),
+              (lazyComponent = readContext(CacheContext)),
               null === current
-                ? (($$typeof = peekCacheFromPool()),
-                  null === $$typeof &&
-                    (($$typeof = workInProgressRoot),
+                ? ((init = peekCacheFromPool()),
+                  null === init &&
+                    ((init = workInProgressRoot),
                     (prevState = createCache()),
-                    ($$typeof.pooledCache = prevState),
+                    (init.pooledCache = prevState),
                     prevState.refCount++,
                     null !== prevState &&
-                      ($$typeof.pooledCacheLanes |= renderLanes),
-                    ($$typeof = prevState)),
+                      (init.pooledCacheLanes |= renderLanes),
+                    (init = prevState)),
                   (workInProgress.memoizedState = {
-                    parent: props,
-                    cache: $$typeof,
+                    parent: lazyComponent,
+                    cache: init,
                   }),
                   initializeUpdateQueue(workInProgress),
-                  pushProvider(workInProgress, CacheContext, $$typeof))
+                  pushProvider(workInProgress, CacheContext, init))
                 : (0 !== (current.lanes & renderLanes) &&
                     (cloneUpdateQueue(current, workInProgress),
                     processUpdateQueue(workInProgress, null, null, renderLanes),
                     suspendIfUpdateReadFromEntangledAsyncAction()),
-                  ($$typeof = current.memoizedState),
+                  (init = current.memoizedState),
                   (prevState = workInProgress.memoizedState),
-                  $$typeof.parent !== props
-                    ? (($$typeof = { parent: props, cache: props }),
-                      (workInProgress.memoizedState = $$typeof),
+                  init.parent !== lazyComponent
+                    ? ((init = { parent: lazyComponent, cache: lazyComponent }),
+                      (workInProgress.memoizedState = init),
                       0 === workInProgress.lanes &&
                         (workInProgress.memoizedState =
                           workInProgress.updateQueue.baseState =
-                            $$typeof),
-                      pushProvider(workInProgress, CacheContext, props))
-                    : ((props = prevState.cache),
-                      pushProvider(workInProgress, CacheContext, props),
-                      props !== $$typeof.cache &&
+                            init),
+                      pushProvider(workInProgress, CacheContext, lazyComponent))
+                    : ((lazyComponent = prevState.cache),
+                      pushProvider(workInProgress, CacheContext, lazyComponent),
+                      lazyComponent !== init.cache &&
                         propagateContextChanges(
                           workInProgress,
                           [CacheContext],
@@ -12832,20 +12849,20 @@
         }
       }
       for (
-        var i$jscomp$inline_1576 = 0;
-        i$jscomp$inline_1576 < simpleEventPluginEvents.length;
-        i$jscomp$inline_1576++
+        var i$jscomp$inline_1578 = 0;
+        i$jscomp$inline_1578 < simpleEventPluginEvents.length;
+        i$jscomp$inline_1578++
       ) {
-        var eventName$jscomp$inline_1577 =
-            simpleEventPluginEvents[i$jscomp$inline_1576],
-          domEventName$jscomp$inline_1578 =
-            eventName$jscomp$inline_1577.toLowerCase(),
-          capitalizedEvent$jscomp$inline_1579 =
-            eventName$jscomp$inline_1577[0].toUpperCase() +
-            eventName$jscomp$inline_1577.slice(1);
+        var eventName$jscomp$inline_1579 =
+            simpleEventPluginEvents[i$jscomp$inline_1578],
+          domEventName$jscomp$inline_1580 =
+            eventName$jscomp$inline_1579.toLowerCase(),
+          capitalizedEvent$jscomp$inline_1581 =
+            eventName$jscomp$inline_1579[0].toUpperCase() +
+            eventName$jscomp$inline_1579.slice(1);
         registerSimpleEvent(
-          domEventName$jscomp$inline_1578,
-          "on" + capitalizedEvent$jscomp$inline_1579
+          domEventName$jscomp$inline_1580,
+          "on" + capitalizedEvent$jscomp$inline_1581
         );
       }
       registerSimpleEvent(ANIMATION_END, "onAnimationEnd");
@@ -16712,16 +16729,16 @@
           0 === i && attemptExplicitHydrationTarget(target);
         }
       };
-      var isomorphicReactPackageVersion$jscomp$inline_1836 = React.version;
+      var isomorphicReactPackageVersion$jscomp$inline_1838 = React.version;
       if (
-        "19.2.0-canary-9784cb37-20250730" !==
-        isomorphicReactPackageVersion$jscomp$inline_1836
+        "19.2.0-canary-edac0dde-20250723" !==
+        isomorphicReactPackageVersion$jscomp$inline_1838
       )
         throw Error(
           formatProdErrorMessage(
             527,
-            isomorphicReactPackageVersion$jscomp$inline_1836,
-            "19.2.0-canary-9784cb37-20250730"
+            isomorphicReactPackageVersion$jscomp$inline_1838,
+            "19.2.0-canary-edac0dde-20250723"
           )
         );
       ReactDOMSharedInternals.findDOMNode = function (componentOrElement) {
@@ -16741,24 +16758,24 @@
           null === componentOrElement ? null : componentOrElement.stateNode;
         return componentOrElement;
       };
-      var internals$jscomp$inline_2329 = {
+      var internals$jscomp$inline_2331 = {
         bundleType: 0,
-        version: "19.2.0-canary-9784cb37-20250730",
+        version: "19.2.0-canary-edac0dde-20250723",
         rendererPackageName: "react-dom",
         currentDispatcherRef: ReactSharedInternals,
-        reconcilerVersion: "19.2.0-canary-9784cb37-20250730",
+        reconcilerVersion: "19.2.0-canary-edac0dde-20250723",
       };
       if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
-        var hook$jscomp$inline_2330 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
+        var hook$jscomp$inline_2332 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
         if (
-          !hook$jscomp$inline_2330.isDisabled &&
-          hook$jscomp$inline_2330.supportsFiber
+          !hook$jscomp$inline_2332.isDisabled &&
+          hook$jscomp$inline_2332.supportsFiber
         )
           try {
-            (rendererID = hook$jscomp$inline_2330.inject(
-              internals$jscomp$inline_2329
+            (rendererID = hook$jscomp$inline_2332.inject(
+              internals$jscomp$inline_2331
             )),
-              (injectedHook = hook$jscomp$inline_2330);
+              (injectedHook = hook$jscomp$inline_2332);
           } catch (err) {}
       }
       exports.createRoot = function (container, options) {
@@ -16848,7 +16865,7 @@
         listenToAllSupportedEvents(container);
         return new ReactDOMHydrationRoot(initialChildren);
       };
-      exports.version = "19.2.0-canary-9784cb37-20250730";
+      exports.version = "19.2.0-canary-edac0dde-20250723";
 
       /***/
     },
Diff for 5226-HASH.js

Diff too large to display

Diff for 9952-HASH.js

Diff too large to display

Diff for main-HASH.js

Diff too large to display

Diff for main-app-HASH.js
@@ -1,64 +1,64 @@
 (self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
   [4977],
   {
-    /***/ 2352: /***/ (
+    /***/ 3579: /***/ () => {
+      /* (ignored) */
+      /***/
+    },
+
+    /***/ 5780: /***/ (
       __unused_webpack_module,
       __unused_webpack_exports,
       __webpack_require__
     ) => {
       Promise.resolve(/* import() eager */).then(
-        __webpack_require__.t.bind(__webpack_require__, 5413, 23)
+        __webpack_require__.t.bind(__webpack_require__, 5356, 23)
       );
       Promise.resolve(/* import() eager */).then(
-        __webpack_require__.t.bind(__webpack_require__, 4362, 23)
+        __webpack_require__.t.bind(__webpack_require__, 1099, 23)
       );
       Promise.resolve(/* import() eager */).then(
-        __webpack_require__.t.bind(__webpack_require__, 2195, 23)
+        __webpack_require__.t.bind(__webpack_require__, 4304, 23)
       );
       Promise.resolve(/* import() eager */).then(
-        __webpack_require__.t.bind(__webpack_require__, 5305, 23)
+        __webpack_require__.t.bind(__webpack_require__, 3152, 23)
       );
       Promise.resolve(/* import() eager */).then(
-        __webpack_require__.t.bind(__webpack_require__, 8066, 23)
+        __webpack_require__.t.bind(__webpack_require__, 7601, 23)
       );
       Promise.resolve(/* import() eager */).then(
-        __webpack_require__.t.bind(__webpack_require__, 3538, 23)
+        __webpack_require__.t.bind(__webpack_require__, 2553, 23)
       );
       Promise.resolve(/* import() eager */).then(
-        __webpack_require__.t.bind(__webpack_require__, 7514, 23)
+        __webpack_require__.t.bind(__webpack_require__, 1925, 23)
       );
       Promise.resolve(/* import() eager */).then(
-        __webpack_require__.t.bind(__webpack_require__, 2650, 23)
+        __webpack_require__.t.bind(__webpack_require__, 959, 23)
       );
       Promise.resolve(/* import() eager */).then(
-        __webpack_require__.t.bind(__webpack_require__, 9299, 23)
+        __webpack_require__.t.bind(__webpack_require__, 9389, 23)
       );
       Promise.resolve(/* import() eager */).then(
-        __webpack_require__.t.bind(__webpack_require__, 8205, 23)
+        __webpack_require__.t.bind(__webpack_require__, 8628, 23)
       );
       Promise.resolve(/* import() eager */).then(
-        __webpack_require__.t.bind(__webpack_require__, 1960, 23)
+        __webpack_require__.t.bind(__webpack_require__, 5439, 23)
       );
       Promise.resolve(/* import() eager */).then(
-        __webpack_require__.bind(__webpack_require__, 4770)
+        __webpack_require__.bind(__webpack_require__, 8685)
       );
       Promise.resolve(/* import() eager */).then(
-        __webpack_require__.t.bind(__webpack_require__, 8988, 23)
+        __webpack_require__.t.bind(__webpack_require__, 3077, 23)
       );
       Promise.resolve(/* import() eager */).then(
-        __webpack_require__.t.bind(__webpack_require__, 5573, 23)
+        __webpack_require__.t.bind(__webpack_require__, 7812, 23)
       );
       Promise.resolve(/* import() eager */).then(
-        __webpack_require__.t.bind(__webpack_require__, 6371, 23)
+        __webpack_require__.t.bind(__webpack_require__, 5774, 23)
       );
 
       /***/
     },
-
-    /***/ 3505: /***/ () => {
-      /* (ignored) */
-      /***/
-    },
   },
   /******/ (__webpack_require__) => {
     // webpackRuntimeModules
@@ -66,8 +66,8 @@
       __webpack_require__((__webpack_require__.s = moduleId));
     /******/ __webpack_require__.O(
       0,
-      [1305, 5226],
-      () => (__webpack_exec__(1958), __webpack_exec__(2352))
+      [9910, 4860],
+      () => (__webpack_exec__(1389), __webpack_exec__(5780))
     );
     /******/ var __webpack_exports__ = __webpack_require__.O();
     /******/ _N_E = __webpack_exports__;
Diff for app-page-exp..ntime.dev.js
failed to diff
Diff for app-page-exp..time.prod.js

Diff too large to display

Diff for app-page-tur..ntime.dev.js
failed to diff
Diff for app-page-tur..time.prod.js

Diff too large to display

Diff for app-page-tur..ntime.dev.js
failed to diff
Diff for app-page-tur..time.prod.js

Diff too large to display

Diff for app-page.runtime.dev.js
failed to diff
Diff for app-page.runtime.prod.js

Diff too large to display

Diff for app-route-ex..ntime.dev.js

Diff too large to display

Diff for app-route-ex..time.prod.js

Diff too large to display

Diff for app-route-tu..ntime.dev.js

Diff too large to display

Diff for app-route-tu..time.prod.js

Diff too large to display

Diff for app-route-tu..ntime.dev.js

Diff too large to display

Diff for app-route-tu..time.prod.js

Diff too large to display

Diff for app-route.runtime.dev.js

Diff too large to display

Diff for app-route.ru..time.prod.js

Diff too large to display

Diff for pages-api-tu..ntime.dev.js

Diff too large to display

Diff for pages-api-tu..time.prod.js

Diff too large to display

Diff for pages-api.runtime.dev.js

Diff too large to display

Diff for pages-api.ru..time.prod.js

Diff too large to display

Diff for pages-turbo...ntime.dev.js

Diff too large to display

Diff for pages-turbo...time.prod.js

Diff too large to display

Diff for pages.runtime.dev.js

Diff too large to display

Diff for pages.runtime.prod.js

Diff too large to display

Diff for server.runtime.prod.js

Diff too large to display

Commit: 7d74980

Copy link

codspeed-hq bot commented Jul 22, 2025

CodSpeed Performance Report

Merging #81948 will improve performances by 7.2%

Comparing joshhannaford/pack-5081-fix-double-rendering-of-defaultlayout-on-404-page (7d74980) with canary (e2b6a50)

Summary

⚡ 1 improvements
✅ 8 untouched benchmarks

Benchmarks breakdown

Benchmark BASE HEAD Change
build[framer-motion-single] 2.3 s 2.2 s +7.2%

@Cy-Tek Cy-Tek force-pushed the joshhannaford/pack-5081-fix-double-rendering-of-defaultlayout-on-404-page branch from dcde151 to cae52e2 Compare July 23, 2025 20:29
Copy link
Contributor Author

@Cy-Tek Cy-Tek left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll be adding an e2e test case, but I've already seen this logic I have here works to fix the duplication bug.

@Cy-Tek Cy-Tek force-pushed the joshhannaford/pack-5081-fix-double-rendering-of-defaultlayout-on-404-page branch 2 times, most recently from 8cd0d5f to 6424a7a Compare July 24, 2025 14:12
@ijjk ijjk added the tests label Jul 24, 2025
@Cy-Tek Cy-Tek force-pushed the joshhannaford/pack-5081-fix-double-rendering-of-defaultlayout-on-404-page branch from 6424a7a to c1e31cd Compare July 24, 2025 14:14
@Cy-Tek Cy-Tek marked this pull request as ready for review July 24, 2025 14:14
@Cy-Tek Cy-Tek force-pushed the joshhannaford/pack-5081-fix-double-rendering-of-defaultlayout-on-404-page branch from c1e31cd to 64d9984 Compare July 24, 2025 14:15
@Cy-Tek Cy-Tek requested a review from lukesandberg July 24, 2025 15:58
@Cy-Tek Cy-Tek changed the title Remove the code that adds the additional modules for every single route and child fix(Turbopack): Fix duplicated layout rendering in edge cases Jul 24, 2025
@Cy-Tek Cy-Tek force-pushed the joshhannaford/pack-5081-fix-double-rendering-of-defaultlayout-on-404-page branch 4 times, most recently from 741aeb8 to 15ab27c Compare July 31, 2025 14:57
Comment on lines 985 to 992
// check_and_update_module_references(
// app_dir.clone(),
// &mut modules.global_error,
// &mut parent_modules.global_error,
// "dist/client/components/builtin/global-error.js",
// false,
// )
// .await?;
Copy link

@vercel vercel bot Jul 31, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There's commented-out code that appears to be leftover from refactoring and should be removed for code cleanliness.

View Details

Analysis

Lines 985-992 contain commented-out code that calls check_and_update_module_references for global_error. This appears to be leftover code from the refactoring where the global_error handling was moved to a separate if is_root_directory block (lines 995-1002) using a different function check_and_update_global_module_references. The commented code is no longer needed since the functionality has been properly implemented elsewhere in the same function.

The commented code block includes:

// check_and_update_module_references(
//     app_dir.clone(),
//     &mut modules.global_error,
//     &mut parent_modules.global_error,
//     "dist/client/components/builtin/global-error.js",
//     false,
// )
// .await?;

This doesn't affect functionality but leaves the codebase with confusing commented code that serves no purpose.


Recommendation

Remove the commented-out code block from lines 985-992. The global_error handling is already properly implemented in the if is_root_directory block that follows (lines 995-1002).

@Cy-Tek Cy-Tek force-pushed the joshhannaford/pack-5081-fix-double-rendering-of-defaultlayout-on-404-page branch from 15ab27c to 7d74980 Compare July 31, 2025 16:36
@Cy-Tek Cy-Tek enabled auto-merge (squash) July 31, 2025 16:44
@Cy-Tek Cy-Tek merged commit c6cefce into canary Jul 31, 2025
166 checks passed
@Cy-Tek Cy-Tek deleted the joshhannaford/pack-5081-fix-double-rendering-of-defaultlayout-on-404-page branch July 31, 2025 17:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
created-by: Turbopack team PRs by the Turbopack team. tests Turbopack Related to Turbopack with Next.js.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants