Don't reset Layout when using dynamic params, don't render Template if there isn't one #49365

remorses · 2023-05-06T11:19:11Z

Now you are using key with the current segment to force Template to rerender but this happens even if the user is not using a Template

ijjk · 2023-05-06T11:32:19Z

Failing test suites

Commit: e06b516

pnpm testheadless test/e2e/next-font/index.test.ts

next/font > app-old > preload > font without size adjust

Expand output

● next/font › app-old › preload › font without size adjust

expect(received).toEqual(expected) // deep equality

- Expected  - 1
+ Received  + 1

  Object {
    "as": "font",
    "crossorigin": "anonymous",
    "data-next-font": "",
-   "href": "/_next/static/media/0812efcfaefec5ea.p.woff2",
+   "href": "/_next/static/media/ab6fdae82d1a8d92.p.woff2",
    "rel": "preload",
    "type": "font/woff2",
  }

  424 |         const $ = cheerio.load(html)
  425 |
> 426 |         expect($('link[as="font"]').get(1).attribs).toEqual({
      |                                                     ^
  427 |           as: 'font',
  428 |           crossorigin: 'anonymous',
  429 |           href: '/_next/static/media/0812efcfaefec5ea.p.woff2',

  at Object.<anonymous> (e2e/next-font/index.test.ts:426:53)

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

ijjk · 2023-05-06T12:00:40Z

Stats from current PR

Default Build (Increase detected ⚠️)

General Overall increase ⚠️

	vercel/next.js canary	remorses/next.js try-fix-layout-resets	Change
buildDuration	44.5s	43.7s	-844ms
buildDurationCached	10.4s	10.5s	⚠️ +107ms
nodeModulesSize	132 MB	132 MB	⚠️ +244 B
nextStartRea..uration (ms)	417ms	409ms	-8ms

Client Bundles (main, webpack) Overall increase ⚠️

	vercel/next.js canary	remorses/next.js try-fix-layout-resets	Change
846-HASH.js gzip	24.4 kB	24.5 kB	⚠️ +25 B
869.HASH.js gzip	181 B	180 B	-1 B
974ec2d0-HASH.js gzip	50.5 kB	50.5 kB	-1 B
main-app-HASH.js gzip	215 B	215 B	✓
main-HASH.js gzip	83.9 kB	84 kB	⚠️ +14 B
webpack-HASH.js gzip	1.7 kB	1.7 kB	-2 B
Overall change	161 kB	161 kB	⚠️ +35 B

Legacy Client Bundles (polyfills)

	vercel/next.js canary	remorses/next.js try-fix-layout-resets	Change
polyfills-HASH.js gzip	31 kB	31 kB	✓
Overall change	31 kB	31 kB	✓

Client Pages Overall decrease ✓

	vercel/next.js canary	remorses/next.js try-fix-layout-resets	Change
_app-HASH.js gzip	192 B	192 B	✓
_error-HASH.js gzip	180 B	179 B	-1 B
amp-HASH.js gzip	503 B	500 B	-3 B
css-HASH.js gzip	801 B	799 B	-2 B
dynamic-HASH.js gzip	2.28 kB	2.28 kB	-5 B
edge-ssr-HASH.js gzip	253 B	253 B	✓
head-HASH.js gzip	828 B	827 B	-1 B
hooks-HASH.js gzip	849 B	847 B	-2 B
image-HASH.js gzip	4.27 kB	4.26 kB	-6 B
index-HASH.js gzip	252 B	254 B	⚠️ +2 B
link-HASH.js gzip	3.04 kB	3.04 kB	-2 B
routerDirect..HASH.js gzip	781 B	782 B	⚠️ +1 B
script-HASH.js gzip	858 B	856 B	-2 B
withRouter-HASH.js gzip	782 B	779 B	-3 B
85e02e95b279..7e3.css gzip	107 B	107 B	✓
Overall change	16 kB	16 kB	-24 B

Client Build Manifests Overall decrease ✓

	vercel/next.js canary	remorses/next.js try-fix-layout-resets	Change
_buildManifest.js gzip	484 B	482 B	-2 B
Overall change	484 B	482 B	-2 B

Rendered Page Sizes Overall increase ⚠️

	vercel/next.js canary	remorses/next.js try-fix-layout-resets	Change
index.html gzip	491 B	491 B	✓
link.html gzip	505 B	506 B	⚠️ +1 B
withRouter.html gzip	486 B	486 B	✓
Overall change	1.48 kB	1.48 kB	⚠️ +1 B

Edge SSR bundle Size Overall decrease ✓

	vercel/next.js canary	remorses/next.js try-fix-layout-resets	Change
edge-ssr.js gzip	78.2 kB	78.1 kB	-6 B
page.js gzip	126 kB	126 kB	⚠️ +2 B
Overall change	204 kB	204 kB	-4 B

Middleware size Overall increase ⚠️

	vercel/next.js canary	remorses/next.js try-fix-layout-resets	Change
middleware-b..fest.js gzip	602 B	605 B	⚠️ +3 B
middleware-r..fest.js gzip	145 B	144 B	-1 B
middleware.js gzip	21.3 kB	21.3 kB	⚠️ +2 B
edge-runtime..pack.js gzip	1.83 kB	1.83 kB	✓
Overall change	23.8 kB	23.8 kB	⚠️ +4 B

Diffs

Diff for page.js

Diff too large to display

Diff for middleware-b..-manifest.js

@@ -7,82 +7,82 @@ self.__BUILD_MANIFEST = {
     "static/BUILD_ID/_ssgManifest.js",
   ],
   rootMainFiles: [
-    "static/chunks/webpack-d9965445ebce461e.js",
-    "static/chunks/974ec2d0-c31ef192eb2072a6.js",
-    "static/chunks/846-a5ccb1774c8e141e.js",
-    "static/chunks/main-app-2ad467c03c7a5537.js",
+    "static/chunks/webpack-c61449b956bd4ddc.js",
+    "static/chunks/39549b6b-d84f1b6a8670acf0.js",
+    "static/chunks/992-2cb9e82440c2ea2f.js",
+    "static/chunks/main-app-0e9da7225c1694b5.js",
   ],
   pages: {
     "/": [
-      "static/chunks/webpack-d9965445ebce461e.js",
-      "static/chunks/main-4615b49e189529a0.js",
-      "static/chunks/pages/index-96b4df8f97c0f01a.js",
+      "static/chunks/webpack-c61449b956bd4ddc.js",
+      "static/chunks/main-06a53000130f704a.js",
+      "static/chunks/pages/index-b21e2d2005e858d6.js",
     ],
     "/_app": [
-      "static/chunks/webpack-d9965445ebce461e.js",
-      "static/chunks/main-4615b49e189529a0.js",
-      "static/chunks/pages/_app-39c49a32fdfb4902.js",
+      "static/chunks/webpack-c61449b956bd4ddc.js",
+      "static/chunks/main-06a53000130f704a.js",
+      "static/chunks/pages/_app-fd2fd11c0153c1f4.js",
     ],
     "/_error": [
-      "static/chunks/webpack-d9965445ebce461e.js",
-      "static/chunks/main-4615b49e189529a0.js",
-      "static/chunks/pages/_error-d79135b4d7090152.js",
+      "static/chunks/webpack-c61449b956bd4ddc.js",
+      "static/chunks/main-06a53000130f704a.js",
+      "static/chunks/pages/_error-65d572d29e2548b7.js",
     ],
     "/amp": [
-      "static/chunks/webpack-d9965445ebce461e.js",
-      "static/chunks/main-4615b49e189529a0.js",
-      "static/chunks/pages/amp-274faba37a339e17.js",
+      "static/chunks/webpack-c61449b956bd4ddc.js",
+      "static/chunks/main-06a53000130f704a.js",
+      "static/chunks/pages/amp-648f2b01fe81161d.js",
     ],
     "/css": [
-      "static/chunks/webpack-d9965445ebce461e.js",
-      "static/chunks/main-4615b49e189529a0.js",
+      "static/chunks/webpack-c61449b956bd4ddc.js",
+      "static/chunks/main-06a53000130f704a.js",
       "static/css/94fdbc56eafa2039.css",
-      "static/chunks/pages/css-dceecca19c67df2f.js",
+      "static/chunks/pages/css-ac86cb27ef341466.js",
     ],
     "/dynamic": [
-      "static/chunks/webpack-d9965445ebce461e.js",
-      "static/chunks/main-4615b49e189529a0.js",
-      "static/chunks/pages/dynamic-1e440c91ed9bf686.js",
+      "static/chunks/webpack-c61449b956bd4ddc.js",
+      "static/chunks/main-06a53000130f704a.js",
+      "static/chunks/pages/dynamic-1b6396304af9a231.js",
     ],
     "/edge-ssr": [
-      "static/chunks/webpack-d9965445ebce461e.js",
-      "static/chunks/main-4615b49e189529a0.js",
-      "static/chunks/pages/edge-ssr-8fc8ab80d42f93e7.js",
+      "static/chunks/webpack-c61449b956bd4ddc.js",
+      "static/chunks/main-06a53000130f704a.js",
+      "static/chunks/pages/edge-ssr-227038c60ef6104e.js",
     ],
     "/head": [
-      "static/chunks/webpack-d9965445ebce461e.js",
-      "static/chunks/main-4615b49e189529a0.js",
-      "static/chunks/pages/head-c50c98836e5e388a.js",
+      "static/chunks/webpack-c61449b956bd4ddc.js",
+      "static/chunks/main-06a53000130f704a.js",
+      "static/chunks/pages/head-80b2a5deecd9aaf0.js",
     ],
     "/hooks": [
-      "static/chunks/webpack-d9965445ebce461e.js",
-      "static/chunks/main-4615b49e189529a0.js",
-      "static/chunks/pages/hooks-2ff3838a24ad32e8.js",
+      "static/chunks/webpack-c61449b956bd4ddc.js",
+      "static/chunks/main-06a53000130f704a.js",
+      "static/chunks/pages/hooks-00630999feaad71f.js",
     ],
     "/image": [
-      "static/chunks/webpack-d9965445ebce461e.js",
-      "static/chunks/main-4615b49e189529a0.js",
-      "static/chunks/pages/image-6e57d53327b7e6ec.js",
+      "static/chunks/webpack-c61449b956bd4ddc.js",
+      "static/chunks/main-06a53000130f704a.js",
+      "static/chunks/pages/image-a9946a9b6f619122.js",
     ],
     "/link": [
-      "static/chunks/webpack-d9965445ebce461e.js",
-      "static/chunks/main-4615b49e189529a0.js",
-      "static/chunks/pages/link-0db2449be8642d3a.js",
+      "static/chunks/webpack-c61449b956bd4ddc.js",
+      "static/chunks/main-06a53000130f704a.js",
+      "static/chunks/pages/link-3a7bb39cf39dd521.js",
     ],
     "/routerDirect": [
-      "static/chunks/webpack-d9965445ebce461e.js",
-      "static/chunks/main-4615b49e189529a0.js",
-      "static/chunks/pages/routerDirect-aab44264666858ac.js",
+      "static/chunks/webpack-c61449b956bd4ddc.js",
+      "static/chunks/main-06a53000130f704a.js",
+      "static/chunks/pages/routerDirect-8e71be3181f26659.js",
     ],
     "/script": [
-      "static/chunks/webpack-d9965445ebce461e.js",
-      "static/chunks/main-4615b49e189529a0.js",
-      "static/chunks/pages/script-e2e495a834a22421.js",
+      "static/chunks/webpack-c61449b956bd4ddc.js",
+      "static/chunks/main-06a53000130f704a.js",
+      "static/chunks/pages/script-4f00101dadfc5ea1.js",
     ],
     "/withRouter": [
-      "static/chunks/webpack-d9965445ebce461e.js",
-      "static/chunks/main-4615b49e189529a0.js",
-      "static/chunks/pages/withRouter-331bb6165873d961.js",
+      "static/chunks/webpack-c61449b956bd4ddc.js",
+      "static/chunks/main-06a53000130f704a.js",
+      "static/chunks/pages/withRouter-829c5d0ec0bf0aa7.js",
     ],
   },
   ampFirstPages: [],

Diff for middleware-r..-manifest.js

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

Diff for middleware.js

@@ -2,7 +2,7 @@
 (self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
   [826],
   {
-    /***/ 5966: /***/ (
+    /***/ 1502: /***/ (
       __unused_webpack_module,
       __webpack_exports__,
       __webpack_require__
@@ -15,7 +15,7 @@
       __webpack_require__.d(__webpack_exports__, {
         default: () =>
           /* binding */ next_middleware_loaderabsolutePagePath_private_next_root_dir_2Fmiddleware_js_page_2Fmiddleware_rootDir_2Ftmp_2Fnext_statsgsOwyJ_2Fstats_app_matchers_,
-      }); // CONCATENATED MODULE: ./node_modules/.pnpm/file+..+main-repo+packages+next+next-packed.tgz_biqbaboplfbrettd7655fr4n2y/node_modules/next/dist/esm/server/web/error.js
+      }); // CONCATENATED MODULE: ./node_modules/.pnpm/file+..+diff-repo+packages+next+next-packed.tgz_biqbaboplfbrettd7655fr4n2y/node_modules/next/dist/esm/server/web/error.js
 
       class PageSignatureError extends Error {
         constructor({ page }) {
@@ -42,7 +42,7 @@
   Read more: https://nextjs.org/docs/messages/middleware-parse-user-agent
   `);
         }
-      } // CONCATENATED MODULE: ./node_modules/.pnpm/file+..+main-repo+packages+next+next-packed.tgz_biqbaboplfbrettd7655fr4n2y/node_modules/next/dist/esm/server/web/utils.js
+      } // CONCATENATED MODULE: ./node_modules/.pnpm/file+..+diff-repo+packages+next+next-packed.tgz_biqbaboplfbrettd7655fr4n2y/node_modules/next/dist/esm/server/web/utils.js
 
       //# sourceMappingURL=error.js.map
       function fromNodeHeaders(object) {
@@ -164,7 +164,7 @@
             }
           );
         }
-      } // CONCATENATED MODULE: ./node_modules/.pnpm/file+..+main-repo+packages+next+next-packed.tgz_biqbaboplfbrettd7655fr4n2y/node_modules/next/dist/esm/server/web/spec-extension/fetch-event.js
+      } // CONCATENATED MODULE: ./node_modules/.pnpm/file+..+diff-repo+packages+next+next-packed.tgz_biqbaboplfbrettd7655fr4n2y/node_modules/next/dist/esm/server/web/spec-extension/fetch-event.js
 
       //# sourceMappingURL=utils.js.map
       const responseSymbol = Symbol("response");
@@ -211,7 +211,7 @@
             page: this.sourcePage,
           });
         }
-      } // CONCATENATED MODULE: ./node_modules/.pnpm/file+..+main-repo+packages+next+next-packed.tgz_biqbaboplfbrettd7655fr4n2y/node_modules/next/dist/esm/shared/lib/i18n/detect-domain-locale.js
+      } // CONCATENATED MODULE: ./node_modules/.pnpm/file+..+diff-repo+packages+next+next-packed.tgz_biqbaboplfbrettd7655fr4n2y/node_modules/next/dist/esm/shared/lib/i18n/detect-domain-locale.js
 
       //# sourceMappingURL=fetch-event.js.map
       function detectDomainLocale(domainItems, hostname, detectedLocale) {
@@ -238,7 +238,7 @@
             return item;
           }
         }
-      } //# sourceMappingURL=detect-domain-locale.js.map // CONCATENATED MODULE: ./node_modules/.pnpm/file+..+main-repo+packages+next+next-packed.tgz_biqbaboplfbrettd7655fr4n2y/node_modules/next/dist/esm/shared/lib/router/utils/remove-trailing-slash.js
+      } //# sourceMappingURL=detect-domain-locale.js.map // CONCATENATED MODULE: ./node_modules/.pnpm/file+..+diff-repo+packages+next+next-packed.tgz_biqbaboplfbrettd7655fr4n2y/node_modules/next/dist/esm/shared/lib/router/utils/remove-trailing-slash.js
 
       /**
        * Removes the trailing slash for a given route or page path. Preserves the
@@ -248,7 +248,7 @@
        *   - `/` -> `/`
        */ function removeTrailingSlash(route) {
         return route.replace(/\/$/, "") || "/";
-      } //# sourceMappingURL=remove-trailing-slash.js.map // CONCATENATED MODULE: ./node_modules/.pnpm/file+..+main-repo+packages+next+next-packed.tgz_biqbaboplfbrettd7655fr4n2y/node_modules/next/dist/esm/shared/lib/router/utils/parse-path.js
+      } //# sourceMappingURL=remove-trailing-slash.js.map // CONCATENATED MODULE: ./node_modules/.pnpm/file+..+diff-repo+packages+next+next-packed.tgz_biqbaboplfbrettd7655fr4n2y/node_modules/next/dist/esm/shared/lib/router/utils/parse-path.js
 
       /**
        * Given a path this function will find the pathname, query and hash and return
@@ -276,7 +276,7 @@
           query: "",
           hash: "",
         };
-      } //# sourceMappingURL=parse-path.js.map // CONCATENATED MODULE: ./node_modules/.pnpm/file+..+main-repo+packages+next+next-packed.tgz_biqbaboplfbrettd7655fr4n2y/node_modules/next/dist/esm/shared/lib/router/utils/add-path-prefix.js
+      } //# sourceMappingURL=parse-path.js.map // CONCATENATED MODULE: ./node_modules/.pnpm/file+..+diff-repo+packages+next+next-packed.tgz_biqbaboplfbrettd7655fr4n2y/node_modules/next/dist/esm/shared/lib/router/utils/add-path-prefix.js
 
       /**
        * Adds the provided prefix to the given path. It first ensures that the path
@@ -287,7 +287,7 @@
         }
         const { pathname, query, hash } = parsePath(path);
         return "" + prefix + pathname + query + hash;
-      } //# sourceMappingURL=add-path-prefix.js.map // CONCATENATED MODULE: ./node_modules/.pnpm/file+..+main-repo+packages+next+next-packed.tgz_biqbaboplfbrettd7655fr4n2y/node_modules/next/dist/esm/shared/lib/router/utils/add-path-suffix.js
+      } //# sourceMappingURL=add-path-prefix.js.map // CONCATENATED MODULE: ./node_modules/.pnpm/file+..+diff-repo+packages+next+next-packed.tgz_biqbaboplfbrettd7655fr4n2y/node_modules/next/dist/esm/shared/lib/router/utils/add-path-suffix.js
 
       /**
        * Similarly to `addPathPrefix`, this function adds a suffix at the end on the
@@ -299,7 +299,7 @@
         }
         const { pathname, query, hash } = parsePath(path);
         return "" + pathname + suffix + query + hash;
-      } //# sourceMappingURL=add-path-suffix.js.map // CONCATENATED MODULE: ./node_modules/.pnpm/file+..+main-repo+packages+next+next-packed.tgz_biqbaboplfbrettd7655fr4n2y/node_modules/next/dist/esm/shared/lib/router/utils/path-has-prefix.js
+      } //# sourceMappingURL=add-path-suffix.js.map // CONCATENATED MODULE: ./node_modules/.pnpm/file+..+diff-repo+packages+next+next-packed.tgz_biqbaboplfbrettd7655fr4n2y/node_modules/next/dist/esm/shared/lib/router/utils/path-has-prefix.js
 
       /**
        * Checks if a given path starts with a given prefix. It ensures it matches
@@ -313,7 +313,7 @@
         }
         const { pathname } = parsePath(path);
         return pathname === prefix || pathname.startsWith(prefix + "/");
-      } //# sourceMappingURL=path-has-prefix.js.map // CONCATENATED MODULE: ./node_modules/.pnpm/file+..+main-repo+packages+next+next-packed.tgz_biqbaboplfbrettd7655fr4n2y/node_modules/next/dist/esm/shared/lib/router/utils/add-locale.js
+      } //# sourceMappingURL=path-has-prefix.js.map // CONCATENATED MODULE: ./node_modules/.pnpm/file+..+diff-repo+packages+next+next-packed.tgz_biqbaboplfbrettd7655fr4n2y/node_modules/next/dist/esm/shared/lib/router/utils/add-locale.js
 
       /**
        * For a given path and a locale, if the locale is given, it will prefix the
@@ -332,7 +332,7 @@
         }
         // Add the locale prefix to the path.
         return addPathPrefix(path, "/" + locale);
-      } //# sourceMappingURL=add-locale.js.map // CONCATENATED MODULE: ./node_modules/.pnpm/file+..+main-repo+packages+next+next-packed.tgz_biqbaboplfbrettd7655fr4n2y/node_modules/next/dist/esm/shared/lib/router/utils/format-next-pathname-info.js
+      } //# sourceMappingURL=add-locale.js.map // CONCATENATED MODULE: ./node_modules/.pnpm/file+..+diff-repo+packages+next+next-packed.tgz_biqbaboplfbrettd7655fr4n2y/node_modules/next/dist/esm/shared/lib/router/utils/format-next-pathname-info.js
 
       function formatNextPathnameInfo(info) {
         let pathname = addLocale(
@@ -356,7 +356,7 @@
             ? addPathSuffix(pathname, "/")
             : pathname
           : removeTrailingSlash(pathname);
-      } //# sourceMappingURL=format-next-pathname-info.js.map // CONCATENATED MODULE: ./node_modules/.pnpm/file+..+main-repo+packages+next+next-packed.tgz_biqbaboplfbrettd7655fr4n2y/node_modules/next/dist/esm/shared/lib/get-hostname.js
+      } //# sourceMappingURL=format-next-pathname-info.js.map // CONCATENATED MODULE: ./node_modules/.pnpm/file+..+diff-repo+packages+next+next-packed.tgz_biqbaboplfbrettd7655fr4n2y/node_modules/next/dist/esm/shared/lib/get-hostname.js
 
       /**
        * Takes an object with a hostname property (like a parsed URL) and some
@@ -376,7 +376,7 @@
           hostname = parsed.hostname;
         } else return;
         return hostname.toLowerCase();
-      } //# sourceMappingURL=get-hostname.js.map // CONCATENATED MODULE: ./node_modules/.pnpm/file+..+main-repo+packages+next+next-packed.tgz_biqbaboplfbrettd7655fr4n2y/node_modules/next/dist/esm/shared/lib/i18n/normalize-locale-path.js
+      } //# sourceMappingURL=get-hostname.js.map // CONCATENATED MODULE: ./node_modules/.pnpm/file+..+diff-repo+packages+next+next-packed.tgz_biqbaboplfbrettd7655fr4n2y/node_modules/next/dist/esm/shared/lib/i18n/normalize-locale-path.js
 
       /**
        * For a pathname that may include a locale from a list of locales, it
@@ -406,7 +406,7 @@
           pathname,
           detectedLocale,
         };
-      } //# sourceMappingURL=normalize-locale-path.js.map // CONCATENATED MODULE: ./node_modules/.pnpm/file+..+main-repo+packages+next+next-packed.tgz_biqbaboplfbrettd7655fr4n2y/node_modules/next/dist/esm/shared/lib/router/utils/remove-path-prefix.js
+      } //# sourceMappingURL=normalize-locale-path.js.map // CONCATENATED MODULE: ./node_modules/.pnpm/file+..+diff-repo+packages+next+next-packed.tgz_biqbaboplfbrettd7655fr4n2y/node_modules/next/dist/esm/shared/lib/router/utils/remove-path-prefix.js
 
       /**
        * Given a path and a prefix it will remove the prefix when it exists in the
@@ -440,7 +440,7 @@
         // If the path without the prefix doesn't start with a `/` we need to add it
         // back to the path to make sure it's a valid path.
         return "/" + withoutPrefix;
-      } //# sourceMappingURL=remove-path-prefix.js.map // CONCATENATED MODULE: ./node_modules/.pnpm/file+..+main-repo+packages+next+next-packed.tgz_biqbaboplfbrettd7655fr4n2y/node_modules/next/dist/esm/shared/lib/router/utils/get-next-pathname-info.js
+      } //# sourceMappingURL=remove-path-prefix.js.map // CONCATENATED MODULE: ./node_modules/.pnpm/file+..+diff-repo+packages+next+next-packed.tgz_biqbaboplfbrettd7655fr4n2y/node_modules/next/dist/esm/shared/lib/router/utils/get-next-pathname-info.js
 
       function getNextPathnameInfo(pathname, options) {
         var _options_nextConfig;
@@ -491,7 +491,7 @@
               : info.pathname;
         }
         return info;
-      } //# sourceMappingURL=get-next-pathname-info.js.map // CONCATENATED MODULE: ./node_modules/.pnpm/file+..+main-repo+packages+next+next-packed.tgz_biqbaboplfbrettd7655fr4n2y/node_modules/next/dist/esm/server/web/next-url.js
+      } //# sourceMappingURL=get-next-pathname-info.js.map // CONCATENATED MODULE: ./node_modules/.pnpm/file+..+diff-repo+packages+next+next-packed.tgz_biqbaboplfbrettd7655fr4n2y/node_modules/next/dist/esm/server/web/next-url.js
 
       const REGEX_LOCALHOST_HOSTNAME =
         /(?!^https?:\/\/)(127(?:\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)){3}|::1|localhost)/;
@@ -719,8 +719,8 @@
       }
 
       //# sourceMappingURL=next-url.js.map
-      // EXTERNAL MODULE: ./node_modules/.pnpm/file+..+main-repo+packages+next+next-packed.tgz_biqbaboplfbrettd7655fr4n2y/node_modules/next/dist/compiled/@edge-runtime/cookies/index.js
-      var cookies = __webpack_require__(29); // CONCATENATED MODULE: ./node_modules/.pnpm/file+..+main-repo+packages+next+next-packed.tgz_biqbaboplfbrettd7655fr4n2y/node_modules/next/dist/esm/server/web/spec-extension/cookies.js // CONCATENATED MODULE: ./node_modules/.pnpm/file+..+main-repo+packages+next+next-packed.tgz_biqbaboplfbrettd7655fr4n2y/node_modules/next/dist/esm/server/web/spec-extension/request.js
+      // EXTERNAL MODULE: ./node_modules/.pnpm/file+..+diff-repo+packages+next+next-packed.tgz_biqbaboplfbrettd7655fr4n2y/node_modules/next/dist/compiled/@edge-runtime/cookies/index.js
+      var cookies = __webpack_require__(8432); // CONCATENATED MODULE: ./node_modules/.pnpm/file+..+diff-repo+packages+next+next-packed.tgz_biqbaboplfbrettd7655fr4n2y/node_modules/next/dist/esm/server/web/spec-extension/cookies.js // CONCATENATED MODULE: ./node_modules/.pnpm/file+..+diff-repo+packages+next+next-packed.tgz_biqbaboplfbrettd7655fr4n2y/node_modules/next/dist/esm/server/web/spec-extension/request.js
       //# sourceMappingURL=cookies.js.map
       const INTERNALS = Symbol("internal request");
       class NextRequest extends Request {
@@ -795,7 +795,7 @@
         get url() {
           return this[INTERNALS].url;
         }
-      } // CONCATENATED MODULE: ./node_modules/.pnpm/file+..+main-repo+packages+next+next-packed.tgz_biqbaboplfbrettd7655fr4n2y/node_modules/next/dist/esm/server/web/spec-extension/response.js
+      } // CONCATENATED MODULE: ./node_modules/.pnpm/file+..+diff-repo+packages+next+next-packed.tgz_biqbaboplfbrettd7655fr4n2y/node_modules/next/dist/esm/server/web/spec-extension/response.js
 
       //# sourceMappingURL=request.js.map
       const response_INTERNALS = Symbol("internal response");
@@ -895,7 +895,7 @@
             headers,
           });
         }
-      } // CONCATENATED MODULE: ./node_modules/.pnpm/file+..+main-repo+packages+next+next-packed.tgz_biqbaboplfbrettd7655fr4n2y/node_modules/next/dist/esm/shared/lib/router/utils/relativize-url.js
+      } // CONCATENATED MODULE: ./node_modules/.pnpm/file+..+diff-repo+packages+next+next-packed.tgz_biqbaboplfbrettd7655fr4n2y/node_modules/next/dist/esm/shared/lib/router/utils/relativize-url.js
 
       //# sourceMappingURL=response.js.map
       /**
@@ -909,7 +909,7 @@
         return relative.protocol + "//" + relative.host === origin
           ? relative.toString().replace(origin, "")
           : relative.toString();
-      } //# sourceMappingURL=relativize-url.js.map // CONCATENATED MODULE: ./node_modules/.pnpm/file+..+main-repo+packages+next+next-packed.tgz_biqbaboplfbrettd7655fr4n2y/node_modules/next/dist/esm/server/internal-utils.js
+      } //# sourceMappingURL=relativize-url.js.map // CONCATENATED MODULE: ./node_modules/.pnpm/file+..+diff-repo+packages+next+next-packed.tgz_biqbaboplfbrettd7655fr4n2y/node_modules/next/dist/esm/server/internal-utils.js
 
       const INTERNAL_QUERY_NAMES = [
         "__nextFallback",
@@ -934,7 +934,7 @@
           }
         }
         return searchParams;
-      } // CONCATENATED MODULE: ./node_modules/.pnpm/file+..+main-repo+packages+next+next-packed.tgz_biqbaboplfbrettd7655fr4n2y/node_modules/next/dist/esm/shared/lib/router/utils/app-paths.js
+      } // CONCATENATED MODULE: ./node_modules/.pnpm/file+..+diff-repo+packages+next+next-packed.tgz_biqbaboplfbrettd7655fr4n2y/node_modules/next/dist/esm/shared/lib/router/utils/app-paths.js
 
       //# sourceMappingURL=internal-utils.js.map
       /**
@@ -986,7 +986,7 @@
        * Since this function is used on full urls it checks `?` for searchParams handling.
        */ function normalizeRscPath(pathname, enabled) {
         return enabled ? pathname.replace(/\.rsc($|\?)/, "$1") : pathname;
-      } //# sourceMappingURL=app-paths.js.map // CONCATENATED MODULE: ./node_modules/.pnpm/file+..+main-repo+packages+next+next-packed.tgz_biqbaboplfbrettd7655fr4n2y/node_modules/next/dist/esm/client/components/app-router-headers.js
+      } //# sourceMappingURL=app-paths.js.map // CONCATENATED MODULE: ./node_modules/.pnpm/file+..+diff-repo+packages+next+next-packed.tgz_biqbaboplfbrettd7655fr4n2y/node_modules/next/dist/esm/client/components/app-router-headers.js
 
       const RSC = "RSC";
       const ACTION = "Next-Action";
@@ -1001,7 +1001,7 @@
         [RSC],
         [NEXT_ROUTER_STATE_TREE],
         [NEXT_ROUTER_PREFETCH],
-      ]; //# sourceMappingURL=app-router-headers.js.map // CONCATENATED MODULE: ./node_modules/.pnpm/file+..+main-repo+packages+next+next-packed.tgz_biqbaboplfbrettd7655fr4n2y/node_modules/next/dist/esm/lib/constants.js
+      ]; //# sourceMappingURL=app-router-headers.js.map // CONCATENATED MODULE: ./node_modules/.pnpm/file+..+diff-repo+packages+next+next-packed.tgz_biqbaboplfbrettd7655fr4n2y/node_modules/next/dist/esm/lib/constants.js
 
       const NEXT_QUERY_PARAM_PREFIX = "nxtP";
       const PRERENDER_REVALIDATE_HEADER = "x-prerender-revalidate";
@@ -1096,7 +1096,7 @@
         middleware: "middleware",
         edgeAsset: "edge-asset",
         appClient: "app-client",
-      }; // CONCATENATED MODULE: ./node_modules/.pnpm/file+..+main-repo+packages+next+next-packed.tgz_biqbaboplfbrettd7655fr4n2y/node_modules/next/dist/esm/server/web/adapter.js
+      }; // CONCATENATED MODULE: ./node_modules/.pnpm/file+..+diff-repo+packages+next+next-packed.tgz_biqbaboplfbrettd7655fr4n2y/node_modules/next/dist/esm/server/web/adapter.js
 
       //# sourceMappingURL=constants.js.map
       class NextRequestHint extends NextRequest {
@@ -1391,12 +1391,12 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
         });
         // Eagerly fire instrumentation hook to make the startup faster.
         void ensureInstrumentationRegistered();
-      } // CONCATENATED MODULE: ./node_modules/.pnpm/file+..+main-repo+packages+next+next-packed.tgz_biqbaboplfbrettd7655fr4n2y/node_modules/next/dist/build/webpack/loaders/next-middleware-loader.js?absolutePagePath=private-next-root-dir%2Fmiddleware.js&page=%2Fmiddleware&rootDir=%2Ftmp%2Fnext-statsgsOwyJ%2Fstats-app&matchers=!
+      } // CONCATENATED MODULE: ./node_modules/.pnpm/file+..+diff-repo+packages+next+next-packed.tgz_biqbaboplfbrettd7655fr4n2y/node_modules/next/dist/build/webpack/loaders/next-middleware-loader.js?absolutePagePath=private-next-root-dir%2Fmiddleware.js&page=%2Fmiddleware&rootDir=%2Ftmp%2Fnext-statsgsOwyJ%2Fstats-app&matchers=!
 
       //# sourceMappingURL=adapter.js.map
       enhanceGlobals();
 
-      var mod = __webpack_require__(7917);
+      var mod = __webpack_require__(619);
       var handler = mod.middleware || mod.default;
 
       if (typeof handler !== "function") {
@@ -1418,7 +1418,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
       /***/
     },
 
-    /***/ 7917: /***/ (
+    /***/ 619: /***/ (
       __unused_webpack_module,
       __webpack_exports__,
       __webpack_require__
@@ -1430,7 +1430,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
         /* harmony export */
       });
       /* harmony import */ var next_dist_server_web_exports_next_response__WEBPACK_IMPORTED_MODULE_0__ =
-        __webpack_require__(7721);
+        __webpack_require__(4716);
 
       async function middleware() {
         return next_dist_server_web_exports_next_response__WEBPACK_IMPORTED_MODULE_0__ /* ["default"].next */.Z.next();
@@ -1439,7 +1439,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
       /***/
     },
 
-    /***/ 1710: /***/ (__unused_webpack_module, exports) => {
+    /***/ 3426: /***/ (__unused_webpack_module, exports) => {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -1469,7 +1469,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
       /***/
     },
 
-    /***/ 8771: /***/ (__unused_webpack_module, exports) => {
+    /***/ 5253: /***/ (__unused_webpack_module, exports) => {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -1510,7 +1510,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
       /***/
     },
 
-    /***/ 6567: /***/ (__unused_webpack_module, exports) => {
+    /***/ 1425: /***/ (__unused_webpack_module, exports) => {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -1547,7 +1547,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
       /***/
     },
 
-    /***/ 7139: /***/ (
+    /***/ 5259: /***/ (
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -1563,8 +1563,8 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
           return addLocale;
         },
       });
-      const _addpathprefix = __webpack_require__(1330);
-      const _pathhasprefix = __webpack_require__(4434);
+      const _addpathprefix = __webpack_require__(4208);
+      const _pathhasprefix = __webpack_require__(9301);
       function addLocale(path, locale, defaultLocale, ignorePrefix) {
         // If no locale was given or the locale is the default locale, we don't need
         // to prefix the path.
@@ -1586,7 +1586,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
       /***/
     },
 
-    /***/ 1330: /***/ (
+    /***/ 4208: /***/ (
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -1602,7 +1602,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
           return addPathPrefix;
         },
       });
-      const _parsepath = __webpack_require__(211);
+      const _parsepath = __webpack_require__(2929);
       function addPathPrefix(path, prefix) {
         if (!path.startsWith("/") || !prefix) {
           return path;
@@ -1614,7 +1614,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
       /***/
     },
 
-    /***/ 8756: /***/ (
+    /***/ 9670: /***/ (
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -1630,7 +1630,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
           return addPathSuffix;
         },
       });
-      const _parsepath = __webpack_require__(211);
+      const _parsepath = __webpack_require__(2929);
       function addPathSuffix(path, suffix) {
         if (!path.startsWith("/") || !suffix) {
           return path;
@@ -1642,7 +1642,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
       /***/
     },
 
-    /***/ 1442: /***/ (
+    /***/ 8265: /***/ (
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -1658,10 +1658,10 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
           return formatNextPathnameInfo;
         },
       });
-      const _removetrailingslash = __webpack_require__(4877);
-      const _addpathprefix = __webpack_require__(1330);
-      const _addpathsuffix = __webpack_require__(8756);
-      const _addlocale = __webpack_require__(7139);
+      const _removetrailingslash = __webpack_require__(7876);
+      const _addpathprefix = __webpack_require__(4208);
+      const _addpathsuffix = __webpack_require__(9670);
+      const _addlocale = __webpack_require__(5259);
       function formatNextPathnameInfo(info) {
         let pathname = (0, _addlocale.addLocale)(
           info.pathname,
@@ -1692,7 +1692,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
       /***/
     },
 
-    /***/ 4132: /***/ (
+    /***/ 4751: /***/ (
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -1708,9 +1708,9 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
           return getNextPathnameInfo;
         },
       });
-      const _normalizelocalepath = __webpack_require__(6567);
-      const _removepathprefix = __webpack_require__(6881);
-      const _pathhasprefix = __webpack_require__(4434);
+      const _normalizelocalepath = __webpack_require__(1425);
+      const _removepathprefix = __webpack_require__(2576);
+      const _pathhasprefix = __webpack_require__(9301);
       function getNextPathnameInfo(pathname, options) {
         var _options_nextConfig;
         const { basePath, i18n, trailingSlash } =
@@ -1774,7 +1774,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
       /***/
     },
 
-    /***/ 211: /***/ (__unused_webpack_module, exports) => {
+    /***/ 2929: /***/ (__unused_webpack_module, exports) => {
       "use strict";
       /**
        * Given a path this function will find the pathname, query and hash and return
@@ -1817,7 +1817,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
       /***/
     },
 
-    /***/ 4434: /***/ (
+    /***/ 9301: /***/ (
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -1833,7 +1833,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
           return pathHasPrefix;
         },
       });
-      const _parsepath = __webpack_require__(211);
+      const _parsepath = __webpack_require__(2929);
       function pathHasPrefix(path, prefix) {
         if (typeof path !== "string") {
           return false;
@@ -1845,7 +1845,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
       /***/
     },
 
-    /***/ 6881: /***/ (
+    /***/ 2576: /***/ (
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -1861,7 +1861,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
           return removePathPrefix;
         },
       });
-      const _pathhasprefix = __webpack_require__(4434);
+      const _pathhasprefix = __webpack_require__(9301);
       function removePathPrefix(path, prefix) {
         // If the path doesn't start with the prefix we can return it as is. This
         // protects us from situations where the prefix is a substring of the path
@@ -1892,7 +1892,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
       /***/
     },
 
-    /***/ 4877: /***/ (__unused_webpack_module, exports) => {
+    /***/ 7876: /***/ (__unused_webpack_module, exports) => {
       "use strict";
       /**
        * Removes the trailing slash for a given route or page path. Preserves the
@@ -1917,7 +1917,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
       /***/
     },
 
-    /***/ 29: /***/ (module) => {
+    /***/ 8432: /***/ (module) => {
       "use strict";
 
       var __defProp = Object.defineProperty;
@@ -2247,7 +2247,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
       /***/
     },
 
-    /***/ 7721: /***/ (
+    /***/ 4716: /***/ (
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -2265,14 +2265,14 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
           return _response.NextResponse;
         },
       });
-      const _response = __webpack_require__(5277);
+      const _response = __webpack_require__(5165);
 
       //# sourceMappingURL=next-response.js.map
 
       /***/
     },
 
-    /***/ 3062: /***/ (
+    /***/ 4901: /***/ (
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -2288,10 +2288,10 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
           return NextURL;
         },
       });
-      const _detectdomainlocale = __webpack_require__(8771);
-      const _formatnextpathnameinfo = __webpack_require__(1442);
-      const _gethostname = __webpack_require__(1710);
-      const _getnextpathnameinfo = __webpack_require__(4132);
+      const _detectdomainlocale = __webpack_require__(5253);
+      const _formatnextpathnameinfo = __webpack_require__(8265);
+      const _gethostname = __webpack_require__(3426);
+      const _getnextpathnameinfo = __webpack_require__(4751);
       const REGEX_LOCALHOST_HOSTNAME =
         /(?!^https?:\/\/)(127(?:\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)){3}|::1|localhost)/;
       function parseURL(url, base) {
@@ -2525,7 +2525,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
       /***/
     },
 
-    /***/ 3868: /***/ (
+    /***/ 4570: /***/ (
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -2536,7 +2536,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
         value: true,
       });
       0 && 0;
-      _export_star(__webpack_require__(29), exports);
+      _export_star(__webpack_require__(8432), exports);
       function _export_star(from, to) {
         Object.keys(from).forEach(function (k) {
           if (k !== "default" && !Object.prototype.hasOwnProperty.call(to, k)) {
@@ -2556,7 +2556,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
       /***/
     },
 
-    /***/ 5277: /***/ (
+    /***/ 5165: /***/ (
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -2572,9 +2572,9 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
           return NextResponse;
         },
       });
-      const _nexturl = __webpack_require__(3062);
-      const _utils = __webpack_require__(88);
-      const _cookies = __webpack_require__(3868);
+      const _nexturl = __webpack_require__(4901);
+      const _utils = __webpack_require__(30);
+      const _cookies = __webpack_require__(4570);
       const INTERNALS = Symbol("internal response");
       const REDIRECTS = new Set([301, 302, 303, 307, 308]);
       function handleMiddlewareField(init, headers) {
@@ -2682,7 +2682,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
       /***/
     },
 
-    /***/ 88: /***/ (__unused_webpack_module, exports) => {
+    /***/ 30: /***/ (__unused_webpack_module, exports) => {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -2829,7 +2829,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
     // webpackRuntimeModules
     /******/ var __webpack_exec__ = (moduleId) =>
       __webpack_require__((__webpack_require__.s = moduleId));
-    /******/ var __webpack_exports__ = __webpack_exec__(5966);
+    /******/ var __webpack_exports__ = __webpack_exec__(1502);
     /******/ (_ENTRIES =
       typeof _ENTRIES === "undefined" ? {} : _ENTRIES).middleware_middleware =
       __webpack_exports__;

Diff for edge-ssr.js

Diff too large to display

Diff for _buildManifest.js

@@ -1,28 +1,28 @@
 self.__BUILD_MANIFEST = {
   __rewrites: { beforeFiles: [], afterFiles: [], fallback: [] },
-  "/": ["static\u002Fchunks\u002Fpages\u002Findex-96b4df8f97c0f01a.js"],
-  "/_error": ["static\u002Fchunks\u002Fpages\u002F_error-d79135b4d7090152.js"],
-  "/amp": ["static\u002Fchunks\u002Fpages\u002Famp-274faba37a339e17.js"],
+  "/": ["static\u002Fchunks\u002Fpages\u002Findex-b21e2d2005e858d6.js"],
+  "/_error": ["static\u002Fchunks\u002Fpages\u002F_error-65d572d29e2548b7.js"],
+  "/amp": ["static\u002Fchunks\u002Fpages\u002Famp-648f2b01fe81161d.js"],
   "/css": [
     "static\u002Fcss\u002F94fdbc56eafa2039.css",
-    "static\u002Fchunks\u002Fpages\u002Fcss-dceecca19c67df2f.js",
+    "static\u002Fchunks\u002Fpages\u002Fcss-ac86cb27ef341466.js",
   ],
   "/dynamic": [
-    "static\u002Fchunks\u002Fpages\u002Fdynamic-1e440c91ed9bf686.js",
+    "static\u002Fchunks\u002Fpages\u002Fdynamic-1b6396304af9a231.js",
   ],
   "/edge-ssr": [
-    "static\u002Fchunks\u002Fpages\u002Fedge-ssr-8fc8ab80d42f93e7.js",
+    "static\u002Fchunks\u002Fpages\u002Fedge-ssr-227038c60ef6104e.js",
   ],
-  "/head": ["static\u002Fchunks\u002Fpages\u002Fhead-c50c98836e5e388a.js"],
-  "/hooks": ["static\u002Fchunks\u002Fpages\u002Fhooks-2ff3838a24ad32e8.js"],
-  "/image": ["static\u002Fchunks\u002Fpages\u002Fimage-6e57d53327b7e6ec.js"],
-  "/link": ["static\u002Fchunks\u002Fpages\u002Flink-0db2449be8642d3a.js"],
+  "/head": ["static\u002Fchunks\u002Fpages\u002Fhead-80b2a5deecd9aaf0.js"],
+  "/hooks": ["static\u002Fchunks\u002Fpages\u002Fhooks-00630999feaad71f.js"],
+  "/image": ["static\u002Fchunks\u002Fpages\u002Fimage-a9946a9b6f619122.js"],
+  "/link": ["static\u002Fchunks\u002Fpages\u002Flink-3a7bb39cf39dd521.js"],
   "/routerDirect": [
-    "static\u002Fchunks\u002Fpages\u002FrouterDirect-aab44264666858ac.js",
+    "static\u002Fchunks\u002Fpages\u002FrouterDirect-8e71be3181f26659.js",
   ],
-  "/script": ["static\u002Fchunks\u002Fpages\u002Fscript-e2e495a834a22421.js"],
+  "/script": ["static\u002Fchunks\u002Fpages\u002Fscript-4f00101dadfc5ea1.js"],
   "/withRouter": [
-    "static\u002Fchunks\u002Fpages\u002FwithRouter-331bb6165873d961.js",
+    "static\u002Fchunks\u002Fpages\u002FwithRouter-829c5d0ec0bf0aa7.js",
   ],
   sortedPages: [
     "\u002F",

Diff for _app-HASH.js

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

Diff for _error-HASH.js

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

Diff for amp-HASH.js

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

Diff for css-HASH.js

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

Diff for dynamic-HASH.js

@@ -1,7 +1,7 @@
 (self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
   [739],
   {
-    /***/ 3995: /***/ function (
+    /***/ 7753: /***/ function (
       __unused_webpack_module,
       __unused_webpack_exports,
       __webpack_require__
@@ -9,7 +9,7 @@
       (window.__NEXT_P = window.__NEXT_P || []).push([
         "/dynamic",
         function () {
-          return __webpack_require__(8267);
+          return __webpack_require__(825);
         },
       ]);
       if (false) {
@@ -18,7 +18,7 @@
       /***/
     },
 
-    /***/ 6854: /***/ function (module, exports, __webpack_require__) {
+    /***/ 1678: /***/ function (module, exports, __webpack_require__) {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -42,10 +42,10 @@
       });
       const _interop_require_default = __webpack_require__(8266);
       const _react = /*#__PURE__*/ _interop_require_default._(
-        __webpack_require__(2947)
+        __webpack_require__(465)
       );
       const _loadable = /*#__PURE__*/ _interop_require_default._(
-        __webpack_require__(8673)
+        __webpack_require__(899)
       );
       const isServerSide = "object" === "undefined";
       // Normalize loader to return the module as form { default: Component } for `React.lazy`.
@@ -146,7 +146,7 @@
       /***/
     },
 
-    /***/ 3611: /***/ function (
+    /***/ 6601: /***/ function (
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -164,7 +164,7 @@
       });
       const _interop_require_default = __webpack_require__(8266);
       const _react = /*#__PURE__*/ _interop_require_default._(
-        __webpack_require__(2947)
+        __webpack_require__(465)
       );
       const LoadableContext = _react.default.createContext(null);
       if (false) {
@@ -173,7 +173,7 @@
       /***/
     },
 
-    /***/ 8673: /***/ function (
+    /***/ 899: /***/ function (
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -213,9 +213,9 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE
       });
       const _interop_require_default = __webpack_require__(8266);
       const _react = /*#__PURE__*/ _interop_require_default._(
-        __webpack_require__(2947)
+        __webpack_require__(465)
       );
-      const _loadablecontext = __webpack_require__(3611);
+      const _loadablecontext = __webpack_require__(6601);
       function resolve(obj) {
         return obj && obj.default ? obj.default : obj;
       }
@@ -450,7 +450,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE
       /***/
     },
 
-    /***/ 8267: /***/ function (
+    /***/ 825: /***/ function (
       __unused_webpack_module,
       __webpack_exports__,
       __webpack_require__
@@ -464,9 +464,9 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE
         /* harmony export */
       });
       /* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__ =
-        __webpack_require__(3268);
+        __webpack_require__(9701);
       /* harmony import */ var next_dynamic__WEBPACK_IMPORTED_MODULE_1__ =
-        __webpack_require__(6113);
+        __webpack_require__(2677);
       /* harmony import */ var next_dynamic__WEBPACK_IMPORTED_MODULE_1___default =
         /*#__PURE__*/ __webpack_require__.n(
           next_dynamic__WEBPACK_IMPORTED_MODULE_1__
@@ -475,11 +475,11 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE
       const DynamicHello = next_dynamic__WEBPACK_IMPORTED_MODULE_1___default()(
         () =>
           __webpack_require__
-            .e(/* import() */ 869)
-            .then(__webpack_require__.bind(__webpack_require__, 4869)),
+            .e(/* import() */ 959)
+            .then(__webpack_require__.bind(__webpack_require__, 959)),
         {
           loadableGenerated: {
-            webpack: () => [/*require.resolve*/ 4869],
+            webpack: () => [/*require.resolve*/ 959],
           },
         }
       );
@@ -506,7 +506,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE
       /***/
     },
 
-    /***/ 6205: /***/ function (
+    /***/ 1963: /***/ function (
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -521,7 +521,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE
        * This source code is licensed under the MIT license found in the
        * LICENSE file in the root directory of this source tree.
        */
-      var f = __webpack_require__(2947),
+      var f = __webpack_require__(465),
         k = Symbol.for("react.element"),
         l = Symbol.for("react.fragment"),
         m = Object.prototype.hasOwnProperty,
@@ -556,7 +556,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE
       /***/
     },
 
-    /***/ 3268: /***/ function (
+    /***/ 9701: /***/ function (
       module,
       __unused_webpack_exports,
       __webpack_require__
@@ -564,19 +564,19 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE
       "use strict";
 
       if (true) {
-        module.exports = __webpack_require__(6205);
+        module.exports = __webpack_require__(1963);
       } else {
       }
 
       /***/
     },
 
-    /***/ 6113: /***/ function (
+    /***/ 2677: /***/ function (
       module,
       __unused_webpack_exports,
       __webpack_require__
     ) {
-      module.exports = __webpack_require__(6854);
+      module.exports = __webpack_require__(1678);
 
       /***/
     },
@@ -587,7 +587,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE
       return __webpack_require__((__webpack_require__.s = moduleId));
     };
     /******/ __webpack_require__.O(0, [888, 179], function () {
-      return __webpack_exec__(3995);
+      return __webpack_exec__(7753);
     });
     /******/ var __webpack_exports__ = __webpack_require__.O();
     /******/ _N_E = __webpack_exports__;

Diff for edge-ssr-HASH.js

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

Diff for head-HASH.js

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

Diff for hooks-HASH.js

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

Diff for image-HASH.js

@@ -1,7 +1,7 @@
 (self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
   [358],
   {
-    /***/ 5885: /***/ function (
+    /***/ 801: /***/ function (
       __unused_webpack_module,
       __unused_webpack_exports,
       __webpack_require__
@@ -9,7 +9,7 @@
       (window.__NEXT_P = window.__NEXT_P || []).push([
         "/image",
         function () {
-          return __webpack_require__(3428);
+          return __webpack_require__(2018);
         },
       ]);
       if (false) {
@@ -18,7 +18,7 @@
       /***/
     },
 
-    /***/ 2957: /***/ function (module, exports, __webpack_require__) {
+    /***/ 1568: /***/ function (module, exports, __webpack_require__) {
       "use strict";
       /* __next_internal_client_entry_do_not_use__  cjs */
       Object.defineProperty(exports, "__esModule", {
@@ -33,17 +33,17 @@
       const _interop_require_default = __webpack_require__(8266);
       const _interop_require_wildcard = __webpack_require__(7144);
       const _react = /*#__PURE__*/ _interop_require_wildcard._(
-        __webpack_require__(2947)
+        __webpack_require__(465)
       );
       const _head = /*#__PURE__*/ _interop_require_default._(
-        __webpack_require__(6593)
+        __webpack_require__(6732)
       );
-      const _imageblursvg = __webpack_require__(3811);
-      const _imageconfig = __webpack_require__(8419);
-      const _imageconfigcontext = __webpack_require__(8147);
-      const _warnonce = __webpack_require__(5664);
+      const _imageblursvg = __webpack_require__(3681);
+      const _imageconfig = __webpack_require__(8394);
+      const _imageconfigcontext = __webpack_require__(11);
+      const _warnonce = __webpack_require__(2485);
       const _imageloader = /*#__PURE__*/ _interop_require_default._(
-        __webpack_require__(5324)
+        __webpack_require__(4439)
       );
       const configEnv = {
         deviceSizes: [640, 750, 828, 1080, 1200, 1920, 2048, 3840],
@@ -668,7 +668,7 @@
       /***/
     },
 
-    /***/ 3811: /***/ function (__unused_webpack_module, exports) {
+    /***/ 3681: /***/ function (__unused_webpack_module, exports) {
       "use strict";
       /**
        * A shared function, used on both client and server, to generate a SVG blur placeholder.
@@ -730,7 +730,7 @@
       /***/
     },
 
-    /***/ 5324: /***/ function (__unused_webpack_module, exports) {
+    /***/ 4439: /***/ function (__unused_webpack_module, exports) {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -764,7 +764,7 @@
       /***/
     },
 
-    /***/ 3428: /***/ function (
+    /***/ 2018: /***/ function (
       __unused_webpack_module,
       __webpack_exports__,
       __webpack_require__
@@ -783,10 +783,10 @@
         },
       });
 
-      // EXTERNAL MODULE: ./node_modules/.pnpm/file+..+main-repo+packages+next+next-packed.tgz_biqbaboplfbrettd7655fr4n2y/node_modules/next/
Post job cleanup.
[command]/usr/bin/git version
git version 2.40.1
Temporarily overriding HOME='/home/runner/work/_temp/3f8dac28-47a4-4f8c-9a01-046b3268c89b' before making global git config changes
Adding repository directory to the temporary git global config as a safe directory
[command]/usr/bin/git config --global --add safe.directory /home/runner/work/next.js/next.js
[command]/usr/bin/git config --local --name-only --get-regexp core\.sshCommand
[command]/usr/bin/git submodule foreach --recursive sh -c "git config --local --name-only --get-regexp 'core\.sshCommand' && git config --local --unset-all 'core.sshCommand' || :"
[command]/usr/bin/git config --local --name-only --get-regexp http\.https\:\/\/github\.com\/\.extraheader
http.https://github.com/.extraheader
[command]/usr/bin/git config --local --unset-all http.https://github.com/.extraheader
[command]/usr/bin/git submodule foreach --recursive sh -c "git config --local --name-only --get-regexp 'http\.https\:\/\/github\.com\/\.extraheader' && git config --local --unset-all 'http.https://github.com/.extraheader' || :"
Cleaning up orphan processes
Commit: f3fadc060902f57c9073dea58e935e62430f34c6

remorses · 2023-05-06T13:18:08Z

test/e2e/app-dir/search-params-react-key/layout-params.test.ts

@@ -10,7 +10,9 @@ createNextDescribe(
    it('should keep the React router instance the same when changing the search params', async () => {
      const browser = await next.browser('/')

-      const searchParams = browser.waitForElementByCss('#search-params').text()
+      const searchParams = await browser


this test didn't actually test anything because the check would run before Next could navigate page

remorses · 2023-05-06T13:20:10Z

packages/next/src/client/components/layout-router.tsx

-                </ErrorBoundary>
-              </ScrollAndFocusHandler>
-            }
+            value={children}


I am not sure why you are using a Context to render the children instead of passing key directly to Template but i kept it the same

This reverts commit 3e1d25c.

feedthejim · 2023-05-06T17:34:39Z

Will review properly on Monday but great investigation.

Do you mind adding tests as well for the other fixed issues you're linking to?

remorses · 2023-05-06T18:25:06Z

I investigated more and #49340 seems to be the same problem, key is first set as __PAGE__ and later as test1, making the Layout component lose state

So the test i added should guard against the same problem

You can debug these issues in the React components panel looking for key props

Screen.Recording.2023-05-06.at.20.24.12.mov

remorses · 2023-05-06T18:35:00Z

Never mind i think i don't fully understand what #49340 is about, probably unrelated

remorses · 2023-05-06T18:35:33Z

So this PR only covers 1 issue

benjaminwaterlot · 2023-05-07T12:45:57Z

At first glance, it seems this PR:

brings back the issue where client components are unmounted when search params are updated (see unmount/remount on search params updates),
but at the same time it seems to fix the current issue where scroll position is reset when search params are updated.

Sorry it's first time I try to build next.js from a fork, so I'm not 100% sure about the methodology to test it 🙂 (I tested it with pnpm dev and linking dependencies)

remorses · 2023-05-07T14:25:45Z

@benjaminwaterlot there is a test for #49047 and it's passing, how did you check that the issue came back? so i can try to change the test or reproduce it

Edit: the test is test/e2e/app-dir/search-params-react-key/layout-params.test.ts

mxmzb · 2023-05-08T18:36:23Z

At first glance, it seems this PR:

brings back the issue where client components are unmounted when search params are updated (see unmount/remount on search params updates),

but at the same time it seems to fix the current issue where scroll position is reset when search params are updated.

Sorry it's first time I try to build next.js from a fork, so I'm not 100% sure about the methodology to test it 🙂 (I tested it with pnpm dev and linking dependencies)

In case this is in next@13.4.2-canary.1 it's not fixing #49087

benjaminwaterlot · 2023-05-08T19:35:18Z

@remorses sorry I can't get to build and test Next.js myself successfully.

I've setup a minimal reproduction for the two possible bugs we're discussing:

Client components unmounting on search param updates (fixed in 13.3.5-canary.2),
Scroll position resetting on search params updates (live bug).

→ https://codesandbox.io/p/sandbox/modest-gould-h4nlvd

It would be amazing if you're able to test your change against this use-case.

Here's the video of the problem on this codesandbox:

235664370-77bc7e4a-daaa-4615-9db7-094640873c33.mp4

timneutkens

These changes don't look right to me. You've removed the key altogether and moved to using i instead, this will cause state to be preserved across routes, which is not the intended behavior.

timneutkens · 2023-05-09T12:50:12Z

Posted an in-depth reply on the issue: #48082 (comment)
This is a misconception about how the keying works.

remorses · 2023-05-09T13:21:09Z

@timneutkens i only added key because of the use of an array.map, it will always be 0 anyway given that the array has always length 1

I don't think the key is needed when Template is not used, state is already reset between routes if the component is not the same (Layout component will be the same, Page will not be), no need to pass a key from what i understand

timneutkens · 2023-05-09T13:38:30Z

Here's the thing, the layout will not be the same, as we have to go to the server to rerender it with different parameters as your parameters change on navigation in the example with a catchall route. This was previously a bug in pages where things did not get keyed correctly and it accidentally kept state between navigations.

remorses added 6 commits May 6, 2023 12:49

added failing test case

383794e

retry quick

cfdfd13

remove params from check

9195657

fix test

75da05f

remove trim

1edc343

add button in body

e3cb835

ijjk added the area: tests label May 6, 2023

try using old key behavior

c73f006

skip rendering Template if there isn't one

3e1d25c

remorses changed the title ~~Fix reset of Layout when using dynamic param~~ Don't reset Layout when using dynamic params, don't render Template if there isn't one May 6, 2023

remorses commented May 6, 2023

View reviewed changes

remorses added 3 commits May 6, 2023 16:49

Revert "skip rendering Template if there isn't one"

9dc24ae

This reverts commit 3e1d25c.

try using index for key, array is always 1 item anyway

df19908

use key again for template

e08436b

remorses marked this pull request as ready for review May 6, 2023 17:15

remorses requested review from timneutkens, ijjk, shuding, huozhi and feedthejim as code owners May 6, 2023 17:15

Merge branch 'canary' into try-fix-layout-resets

f3fadc0

remorses mentioned this pull request May 8, 2023

Whole page component re-renders (unmounts) when route changes in 13.2.5-canary.32 - 13.3.0 #48004

Closed

1 task

Merge branch 'canary' into try-fix-layout-resets

e06b516

Merge branch 'canary' into try-fix-layout-resets

beb7185

ijjk added the type: next label May 9, 2023

timneutkens requested changes May 9, 2023

View reviewed changes

timneutkens closed this May 9, 2023

github-actions bot locked as resolved and limited conversation to collaborators Jun 9, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Don't reset Layout when using dynamic params, don't render Template if there isn't one #49365

Don't reset Layout when using dynamic params, don't render Template if there isn't one #49365

remorses commented May 6, 2023 •

edited

Loading

ijjk commented May 6, 2023 •

edited

Loading

ijjk commented May 6, 2023 •

edited

Loading

Diffs

remorses May 6, 2023 •

edited

Loading

remorses May 6, 2023

feedthejim commented May 6, 2023

remorses commented May 6, 2023 •

edited

Loading

remorses commented May 6, 2023

remorses commented May 6, 2023

benjaminwaterlot commented May 7, 2023

remorses commented May 7, 2023 •

edited

Loading

mxmzb commented May 8, 2023

benjaminwaterlot commented May 8, 2023 •

edited

Loading

timneutkens left a comment

timneutkens commented May 9, 2023

remorses commented May 9, 2023

timneutkens commented May 9, 2023

Don't reset Layout when using dynamic params, don't render Template if there isn't one #49365

Don't reset Layout when using dynamic params, don't render Template if there isn't one #49365

Conversation

remorses commented May 6, 2023 • edited Loading

ijjk commented May 6, 2023 • edited Loading

Failing test suites

ijjk commented May 6, 2023 • edited Loading

Stats from current PR

Diffs

remorses May 6, 2023 • edited Loading

Choose a reason for hiding this comment

remorses May 6, 2023

Choose a reason for hiding this comment

feedthejim commented May 6, 2023

remorses commented May 6, 2023 • edited Loading

remorses commented May 6, 2023

remorses commented May 6, 2023

benjaminwaterlot commented May 7, 2023

remorses commented May 7, 2023 • edited Loading

mxmzb commented May 8, 2023

benjaminwaterlot commented May 8, 2023 • edited Loading

timneutkens left a comment

Choose a reason for hiding this comment

timneutkens commented May 9, 2023

remorses commented May 9, 2023

timneutkens commented May 9, 2023

remorses commented May 6, 2023 •

edited

Loading

ijjk commented May 6, 2023 •

edited

Loading

ijjk commented May 6, 2023 •

edited

Loading

remorses May 6, 2023 •

edited

Loading

remorses commented May 6, 2023 •

edited

Loading

remorses commented May 7, 2023 •

edited

Loading

benjaminwaterlot commented May 8, 2023 •

edited

Loading