Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

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

Jump to bottom

Add initial separated route resolving #47208

Merged
merged 75 commits into from
Apr 2, 2023
Merged

Add initial separated route resolving #47208

merged 75 commits into from
Apr 2, 2023

Conversation

ijjk
Copy link
Member

@ijjk ijjk commented Mar 16, 2023 •
edited
Loading

This updates to have a separate routing process and separate rendering processes for pages and app so that we can properly isolate the two since they rely on different react versions.

Besides allowing the above mentioned isolation this also helps us control recovering from process crashes easier as pieces are more isolated from one another e.g. an infinite loop during rendering will no longer block the compiler and can be stopped/restarted as needed.

In follow-up PRs we will continue to separate out the routing logic from the rendering logic so that each process only loads what is relevant to it helping simplify the flow for requests regardless of type.

@ijjk ijjk force-pushed the update/separate-route-resolving branch from bfbd15c to 04aa052 Compare March 16, 2023 17:06
@ijjk
Copy link
Member Author

ijjk commented Mar 16, 2023 •
edited
Loading

Stats from current PR

Default Build (Increase detected ⚠️)
General Overall decrease ✓
vercel/next.js canary ijjk/next.js update/separate-route-resolving Change
buildDuration 37s 46.1s ⚠️ +9.2s
buildDurationCached 15s 10.2s -4.8s
nodeModulesSize 120 MB 115 MB -5.21 MB
nextStartRea..uration (ms) 287ms 259ms -28ms
Client Bundles (main, webpack) Overall decrease ✓
vercel/next.js canary ijjk/next.js update/separate-route-resolving Change
182-HASH.js gzip 20.7 kB 20.7 kB -29 B
869.HASH.js gzip 181 B 180 B -1 B
974ec2d0-HASH.js gzip 50.2 kB 50.2 kB ✓
main-app-HASH.js gzip 213 B 215 B ⚠️ +2 B
main-HASH.js gzip 83.9 kB 83.9 kB ⚠️ +10 B
webpack-HASH.js gzip 1.7 kB 1.7 kB -2 B
Overall change 157 kB 157 kB -20 B
Legacy Client Bundles (polyfills)
vercel/next.js canary ijjk/next.js update/separate-route-resolving Change
polyfills-HASH.js gzip 31 kB 31 kB ✓
Overall change 31 kB 31 kB ✓
Client Pages Overall decrease ✓
vercel/next.js canary ijjk/next.js update/separate-route-resolving Change
_app-HASH.js gzip 192 B 192 B ✓
_error-HASH.js gzip 180 B 179 B -1 B
amp-HASH.js gzip 483 B 481 B -2 B
css-HASH.js gzip 801 B 799 B -2 B
dynamic-HASH.js gzip 2.27 kB 2.27 kB -4 B
edge-ssr-HASH.js gzip 259 B 259 B ✓
head-HASH.js gzip 828 B 827 B -1 B
hooks-HASH.js gzip 849 B 847 B -2 B
image-HASH.js gzip 4.44 kB 4.43 kB -6 B
index-HASH.js gzip 252 B 254 B ⚠️ +2 B
link-HASH.js gzip 2.76 kB 2.76 kB ✓
routerDirect..HASH.js gzip 781 B 782 B ⚠️ +1 B
script-HASH.js gzip 858 B 856 B -2 B
withRouter-HASH.js gzip 782 B 779 B -3 B
85e02e95b279..7e3.css gzip 107 B 107 B ✓
Overall change 15.8 kB 15.8 kB -20 B
Client Build Manifests Overall decrease ✓
vercel/next.js canary ijjk/next.js update/separate-route-resolving Change
_buildManifest.js gzip 483 B 482 B -1 B
Overall change 483 B 482 B -1 B
Rendered Page Sizes Overall increase ⚠️
vercel/next.js canary ijjk/next.js update/separate-route-resolving Change
index.html gzip 547 B 548 B ⚠️ +1 B
link.html gzip 558 B 559 B ⚠️ +1 B
withRouter.html gzip 544 B 544 B ✓
Overall change 1.65 kB 1.65 kB ⚠️ +2 B
Edge SSR bundle Size Overall increase ⚠️
vercel/next.js canary ijjk/next.js update/separate-route-resolving Change
edge-ssr.js gzip 132 kB 132 kB ⚠️ +43 B
page.js gzip 117 kB 117 kB ⚠️ +53 B
Overall change 249 kB 249 kB ⚠️ +96 B
Middleware size Overall increase ⚠️
vercel/next.js canary ijjk/next.js update/separate-route-resolving Change
middleware-b..fest.js gzip 604 B 603 B -1 B
middleware-r..fest.js gzip 145 B 144 B -1 B
middleware.js gzip 18.7 kB 18.7 kB ⚠️ +10 B
edge-runtime..pack.js gzip 1.83 kB 1.83 kB ✓
Overall change 21.2 kB 21.3 kB ⚠️ +8 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-4c2565133a55f6e5.js",
-    "static/chunks/182-3043f9114752a427.js",
-    "static/chunks/main-app-b5404249639e1897.js",
+    "static/chunks/webpack-c61449b956bd4ddc.js",
+    "static/chunks/39549b6b-3b590f20ccacdf78.js",
+    "static/chunks/120-0bc5e2becd5b5eee.js",
+    "static/chunks/main-app-675094f768f3fd92.js",
   ],
   pages: {
     "/": [
-      "static/chunks/webpack-d9965445ebce461e.js",
-      "static/chunks/main-7e684fc3e096f13d.js",
-      "static/chunks/pages/index-96b4df8f97c0f01a.js",
+      "static/chunks/webpack-c61449b956bd4ddc.js",
+      "static/chunks/main-5e0541ba0f6b871d.js",
+      "static/chunks/pages/index-b21e2d2005e858d6.js",
     ],
     "/_app": [
-      "static/chunks/webpack-d9965445ebce461e.js",
-      "static/chunks/main-7e684fc3e096f13d.js",
-      "static/chunks/pages/_app-39c49a32fdfb4902.js",
+      "static/chunks/webpack-c61449b956bd4ddc.js",
+      "static/chunks/main-5e0541ba0f6b871d.js",
+      "static/chunks/pages/_app-fd2fd11c0153c1f4.js",
     ],
     "/_error": [
-      "static/chunks/webpack-d9965445ebce461e.js",
-      "static/chunks/main-7e684fc3e096f13d.js",
-      "static/chunks/pages/_error-d79135b4d7090152.js",
+      "static/chunks/webpack-c61449b956bd4ddc.js",
+      "static/chunks/main-5e0541ba0f6b871d.js",
+      "static/chunks/pages/_error-65d572d29e2548b7.js",
     ],
     "/amp": [
-      "static/chunks/webpack-d9965445ebce461e.js",
-      "static/chunks/main-7e684fc3e096f13d.js",
-      "static/chunks/pages/amp-3e73e98c5f333ae8.js",
+      "static/chunks/webpack-c61449b956bd4ddc.js",
+      "static/chunks/main-5e0541ba0f6b871d.js",
+      "static/chunks/pages/amp-62aee2a49812a08f.js",
     ],
     "/css": [
-      "static/chunks/webpack-d9965445ebce461e.js",
-      "static/chunks/main-7e684fc3e096f13d.js",
+      "static/chunks/webpack-c61449b956bd4ddc.js",
+      "static/chunks/main-5e0541ba0f6b871d.js",
       "static/css/94fdbc56eafa2039.css",
-      "static/chunks/pages/css-5e256e56d8e26951.js",
+      "static/chunks/pages/css-90c3ee39f7bca7ef.js",
     ],
     "/dynamic": [
-      "static/chunks/webpack-d9965445ebce461e.js",
-      "static/chunks/main-7e684fc3e096f13d.js",
-      "static/chunks/pages/dynamic-c81f7204b8a7f946.js",
+      "static/chunks/webpack-c61449b956bd4ddc.js",
+      "static/chunks/main-5e0541ba0f6b871d.js",
+      "static/chunks/pages/dynamic-b2fe956bab12dbce.js",
     ],
     "/edge-ssr": [
-      "static/chunks/webpack-d9965445ebce461e.js",
-      "static/chunks/main-7e684fc3e096f13d.js",
-      "static/chunks/pages/edge-ssr-36372aa7b0810cd4.js",
+      "static/chunks/webpack-c61449b956bd4ddc.js",
+      "static/chunks/main-5e0541ba0f6b871d.js",
+      "static/chunks/pages/edge-ssr-53842fa626eeba30.js",
     ],
     "/head": [
-      "static/chunks/webpack-d9965445ebce461e.js",
-      "static/chunks/main-7e684fc3e096f13d.js",
-      "static/chunks/pages/head-bba3641f74516a0d.js",
+      "static/chunks/webpack-c61449b956bd4ddc.js",
+      "static/chunks/main-5e0541ba0f6b871d.js",
+      "static/chunks/pages/head-0b621999ef90df87.js",
     ],
     "/hooks": [
-      "static/chunks/webpack-d9965445ebce461e.js",
-      "static/chunks/main-7e684fc3e096f13d.js",
-      "static/chunks/pages/hooks-5bc49a85e3a1ebb1.js",
+      "static/chunks/webpack-c61449b956bd4ddc.js",
+      "static/chunks/main-5e0541ba0f6b871d.js",
+      "static/chunks/pages/hooks-2b5b04fc08660760.js",
     ],
     "/image": [
-      "static/chunks/webpack-d9965445ebce461e.js",
-      "static/chunks/main-7e684fc3e096f13d.js",
-      "static/chunks/pages/image-e4e98b3ddd87094f.js",
+      "static/chunks/webpack-c61449b956bd4ddc.js",
+      "static/chunks/main-5e0541ba0f6b871d.js",
+      "static/chunks/pages/image-6db07879815ef52b.js",
     ],
     "/link": [
-      "static/chunks/webpack-d9965445ebce461e.js",
-      "static/chunks/main-7e684fc3e096f13d.js",
-      "static/chunks/pages/link-ee4f7deeb8112e61.js",
+      "static/chunks/webpack-c61449b956bd4ddc.js",
+      "static/chunks/main-5e0541ba0f6b871d.js",
+      "static/chunks/pages/link-6af118e4c6f497bb.js",
     ],
     "/routerDirect": [
-      "static/chunks/webpack-d9965445ebce461e.js",
-      "static/chunks/main-7e684fc3e096f13d.js",
-      "static/chunks/pages/routerDirect-5d7d47d901e3719c.js",
+      "static/chunks/webpack-c61449b956bd4ddc.js",
+      "static/chunks/main-5e0541ba0f6b871d.js",
+      "static/chunks/pages/routerDirect-99b080df5d4700e8.js",
     ],
     "/script": [
-      "static/chunks/webpack-d9965445ebce461e.js",
-      "static/chunks/main-7e684fc3e096f13d.js",
-      "static/chunks/pages/script-7181948a834b7ae4.js",
+      "static/chunks/webpack-c61449b956bd4ddc.js",
+      "static/chunks/main-5e0541ba0f6b871d.js",
+      "static/chunks/pages/script-1cb960fab1da586d.js",
     ],
     "/withRouter": [
-      "static/chunks/webpack-d9965445ebce461e.js",
-      "static/chunks/main-7e684fc3e096f13d.js",
-      "static/chunks/pages/withRouter-ebac16c2d9b51247.js",
+      "static/chunks/webpack-c61449b956bd4ddc.js",
+      "static/chunks/main-5e0541ba0f6b871d.js",
+      "static/chunks/pages/withRouter-00f6845c2afd30e2.js",
     ],
   },
   ampFirstPages: [],
Diff for middleware-r..-manifest.js 
@@ -1,6 +1,6 @@
 self.__REACT_LOADABLE_MANIFEST = {
   "dynamic.js -> ../components/hello": {
-    id: 4869,
-    files: ["static/chunks/869.cb3f1602da3175db.js"],
+    id: 959,
+    files: ["static/chunks/959.34508e89b1d2d329.js"],
   },
 };
Diff for middleware.js 
@@ -2,7 +2,7 @@
 (self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
   [826],
   {
-    /***/ 8364: /***/ (
+    /***/ 4846: /***/ (
       __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_statsDC9XYM_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");
@@ -210,7 +210,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) {
@@ -235,7 +235,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
@@ -245,7 +245,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
@@ -273,7 +273,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
@@ -284,7 +284,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
@@ -296,7 +296,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
@@ -310,7 +310,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
@@ -329,7 +329,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(
@@ -353,7 +353,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
@@ -368,7 +368,7 @@
           parsed.hostname) == null
           ? void 0
           : ref.toString().split(":")[0].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
@@ -398,7 +398,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
@@ -432,7 +432,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 _nextConfig;
@@ -479,7 +479,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)/;
@@ -696,8 +696,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 {
@@ -772,7 +772,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");
@@ -872,7 +872,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
       /**
@@ -886,7 +886,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",
@@ -911,7 +911,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
       /**
@@ -963,7 +963,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";
@@ -976,7 +976,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/server/web/adapter.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/server/web/adapter.js
 
       class NextRequestHint extends NextRequest {
         constructor(params) {
@@ -1219,12 +1219,12 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
             throw err;
           }
         }
-      } // 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-statsDC9XYM%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-statsDC9XYM%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") {
@@ -1246,7 +1246,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
       /***/
     },
 
-    /***/ 7917: /***/ (
+    /***/ 619: /***/ (
       __unused_webpack_module,
       __webpack_exports__,
       __webpack_require__
@@ -1258,7 +1258,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();
@@ -1267,7 +1267,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", {
@@ -1287,7 +1287,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", {
@@ -1321,7 +1321,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", {
@@ -1353,7 +1353,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
       /***/
     },
 
-    /***/ 7139: /***/ (
+    /***/ 5259: /***/ (
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -1364,8 +1364,8 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
         value: true,
       });
       exports.addLocale = addLocale;
-      var _addPathPrefix = __webpack_require__(1330);
-      var _pathHasPrefix = __webpack_require__(4434);
+      var _addPathPrefix = __webpack_require__(4208);
+      var _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.
@@ -1387,7 +1387,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
       /***/
     },
 
-    /***/ 1330: /***/ (
+    /***/ 4208: /***/ (
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -1398,7 +1398,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
         value: true,
       });
       exports.addPathPrefix = addPathPrefix;
-      var _parsePath = __webpack_require__(211);
+      var _parsePath = __webpack_require__(2929);
       function addPathPrefix(path, prefix) {
         if (!path.startsWith("/") || !prefix) {
           return path;
@@ -1410,7 +1410,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
       /***/
     },
 
-    /***/ 8756: /***/ (
+    /***/ 9670: /***/ (
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -1421,7 +1421,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
         value: true,
       });
       exports.addPathSuffix = addPathSuffix;
-      var _parsePath = __webpack_require__(211);
+      var _parsePath = __webpack_require__(2929);
       function addPathSuffix(path, suffix) {
         if (!path.startsWith("/") || !suffix) {
           return path;
@@ -1433,7 +1433,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
       /***/
     },
 
-    /***/ 1442: /***/ (
+    /***/ 8265: /***/ (
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -1444,10 +1444,10 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
         value: true,
       });
       exports.formatNextPathnameInfo = formatNextPathnameInfo;
-      var _removeTrailingSlash = __webpack_require__(4877);
-      var _addPathPrefix = __webpack_require__(1330);
-      var _addPathSuffix = __webpack_require__(8756);
-      var _addLocale = __webpack_require__(7139);
+      var _removeTrailingSlash = __webpack_require__(7876);
+      var _addPathPrefix = __webpack_require__(4208);
+      var _addPathSuffix = __webpack_require__(9670);
+      var _addLocale = __webpack_require__(5259);
       function formatNextPathnameInfo(info) {
         let pathname = (0, _addLocale).addLocale(
           info.pathname,
@@ -1478,7 +1478,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
       /***/
     },
 
-    /***/ 4132: /***/ (
+    /***/ 4751: /***/ (
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -1489,9 +1489,9 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
         value: true,
       });
       exports.getNextPathnameInfo = getNextPathnameInfo;
-      var _normalizeLocalePath = __webpack_require__(6567);
-      var _removePathPrefix = __webpack_require__(6881);
-      var _pathHasPrefix = __webpack_require__(4434);
+      var _normalizeLocalePath = __webpack_require__(1425);
+      var _removePathPrefix = __webpack_require__(2576);
+      var _pathHasPrefix = __webpack_require__(9301);
       function getNextPathnameInfo(pathname, options) {
         var _nextConfig;
         const { basePath, i18n, trailingSlash } =
@@ -1551,7 +1551,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";
 
       Object.defineProperty(exports, "__esModule", {
@@ -1585,7 +1585,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
       /***/
     },
 
-    /***/ 4434: /***/ (
+    /***/ 9301: /***/ (
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -1596,7 +1596,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
         value: true,
       });
       exports.pathHasPrefix = pathHasPrefix;
-      var _parsePath = __webpack_require__(211);
+      var _parsePath = __webpack_require__(2929);
       function pathHasPrefix(path, prefix) {
         if (typeof path !== "string") {
           return false;
@@ -1608,7 +1608,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
       /***/
     },
 
-    /***/ 6881: /***/ (
+    /***/ 2576: /***/ (
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -1619,7 +1619,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
         value: true,
       });
       exports.removePathPrefix = removePathPrefix;
-      var _pathHasPrefix = __webpack_require__(4434);
+      var _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
@@ -1650,7 +1650,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";
 
       Object.defineProperty(exports, "__esModule", {
@@ -1664,7 +1664,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
       /***/
     },
 
-    /***/ 29: /***/ (module) => {
+    /***/ 8432: /***/ (module) => {
       "use strict";
 
       var __defProp = Object.defineProperty;
@@ -1986,7 +1986,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
       /***/
     },
 
-    /***/ 7721: /***/ (
+    /***/ 4716: /***/ (
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -2003,14 +2003,14 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
           return _response.NextResponse;
         },
       });
-      var _response = __webpack_require__(5277);
+      var _response = __webpack_require__(5165);
 
       //# sourceMappingURL=next-response.js.map
 
       /***/
     },
 
-    /***/ 3062: /***/ (
+    /***/ 4901: /***/ (
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -2020,10 +2020,10 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
       Object.defineProperty(exports, "__esModule", {
         value: true,
       });
-      var _detectDomainLocale = __webpack_require__(8771);
-      var _formatNextPathnameInfo = __webpack_require__(1442);
-      var _getHostname = __webpack_require__(1710);
-      var _getNextPathnameInfo = __webpack_require__(4132);
+      var _detectDomainLocale = __webpack_require__(5253);
+      var _formatNextPathnameInfo = __webpack_require__(8265);
+      var _getHostname = __webpack_require__(3426);
+      var _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) {
@@ -2247,7 +2247,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
       /***/
     },
 
-    /***/ 3868: /***/ (
+    /***/ 4570: /***/ (
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -2257,7 +2257,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
       Object.defineProperty(exports, "__esModule", {
         value: true,
       });
-      var _cookies = _interopRequireWildcard(__webpack_require__(29));
+      var _cookies = _interopRequireWildcard(__webpack_require__(8432));
       Object.keys(_cookies).forEach(function (key) {
         if (key === "default" || key === "__esModule") return;
         if (key in exports && exports[key] === _cookies[key]) return;
@@ -2319,7 +2319,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
       /***/
     },
 
-    /***/ 5277: /***/ (
+    /***/ 5165: /***/ (
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -2329,9 +2329,9 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
       Object.defineProperty(exports, "__esModule", {
         value: true,
       });
-      var _nextUrl = __webpack_require__(3062);
-      var _utils = __webpack_require__(88);
-      var _cookies = __webpack_require__(3868);
+      var _nextUrl = __webpack_require__(4901);
+      var _utils = __webpack_require__(30);
+      var _cookies = __webpack_require__(4570);
       const INTERNALS = Symbol("internal response");
       const REDIRECTS = new Set([301, 302, 303, 307, 308]);
       function handleMiddlewareField(init, headers) {
@@ -2440,7 +2440,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", {
@@ -2569,7 +2569,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__(8364);
+    /******/ var __webpack_exports__ = __webpack_exec__(4846);
     /******/ (_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-3e73e98c5f333ae8.js"],
+  "/": ["static\u002Fchunks\u002Fpages\u002Findex-b21e2d2005e858d6.js"],
+  "/_error": ["static\u002Fchunks\u002Fpages\u002F_error-65d572d29e2548b7.js"],
+  "/amp": ["static\u002Fchunks\u002Fpages\u002Famp-62aee2a49812a08f.js"],
   "/css": [
     "static\u002Fcss\u002F94fdbc56eafa2039.css",
-    "static\u002Fchunks\u002Fpages\u002Fcss-5e256e56d8e26951.js",
+    "static\u002Fchunks\u002Fpages\u002Fcss-90c3ee39f7bca7ef.js",
   ],
   "/dynamic": [
-    "static\u002Fchunks\u002Fpages\u002Fdynamic-c81f7204b8a7f946.js",
+    "static\u002Fchunks\u002Fpages\u002Fdynamic-b2fe956bab12dbce.js",
   ],
   "/edge-ssr": [
-    "static\u002Fchunks\u002Fpages\u002Fedge-ssr-36372aa7b0810cd4.js",
+    "static\u002Fchunks\u002Fpages\u002Fedge-ssr-53842fa626eeba30.js",
   ],
-  "/head": ["static\u002Fchunks\u002Fpages\u002Fhead-bba3641f74516a0d.js"],
-  "/hooks": ["static\u002Fchunks\u002Fpages\u002Fhooks-5bc49a85e3a1ebb1.js"],
-  "/image": ["static\u002Fchunks\u002Fpages\u002Fimage-e4e98b3ddd87094f.js"],
-  "/link": ["static\u002Fchunks\u002Fpages\u002Flink-ee4f7deeb8112e61.js"],
+  "/head": ["static\u002Fchunks\u002Fpages\u002Fhead-0b621999ef90df87.js"],
+  "/hooks": ["static\u002Fchunks\u002Fpages\u002Fhooks-2b5b04fc08660760.js"],
+  "/image": ["static\u002Fchunks\u002Fpages\u002Fimage-6db07879815ef52b.js"],
+  "/link": ["static\u002Fchunks\u002Fpages\u002Flink-6af118e4c6f497bb.js"],
   "/routerDirect": [
-    "static\u002Fchunks\u002Fpages\u002FrouterDirect-5d7d47d901e3719c.js",
+    "static\u002Fchunks\u002Fpages\u002FrouterDirect-99b080df5d4700e8.js",
   ],
-  "/script": ["static\u002Fchunks\u002Fpages\u002Fscript-7181948a834b7ae4.js"],
+  "/script": ["static\u002Fchunks\u002Fpages\u002Fscript-1cb960fab1da586d.js"],
   "/withRouter": [
-    "static\u002Fchunks\u002Fpages\u002FwithRouter-ebac16c2d9b51247.js",
+    "static\u002Fchunks\u002Fpages\u002FwithRouter-00f6845c2afd30e2.js",
   ],
   sortedPages: [
     "\u002F",
Diff for _app-HASH.js 
@@ -1,7 +1,7 @@
 (self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
   [888],
   {
-    /***/ 3115: /***/ function (
+    /***/ 1113: /***/ function (
       __unused_webpack_module,
       __unused_webpack_exports,
       __webpack_require__
@@ -9,7 +9,7 @@
       (window.__NEXT_P = window.__NEXT_P || []).push([
         "/_app",
         function () {
-          return __webpack_require__(9618);
+          return __webpack_require__(6822);
         },
       ]);
       if (false) {
@@ -24,7 +24,7 @@
       return __webpack_require__((__webpack_require__.s = moduleId));
     };
     /******/ __webpack_require__.O(0, [179], function () {
-      return __webpack_exec__(3115), __webpack_exec__(5038);
+      return __webpack_exec__(1113), __webpack_exec__(1556);
     });
     /******/ var __webpack_exports__ = __webpack_require__.O();
     /******/ _N_E = __webpack_exports__;
Diff for _error-HASH.js 
@@ -1,7 +1,7 @@
 (self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
   [820],
   {
-    /***/ 5374: /***/ function (
+    /***/ 3363: /***/ function (
       __unused_webpack_module,
       __unused_webpack_exports,
       __webpack_require__
@@ -9,7 +9,7 @@
       (window.__NEXT_P = window.__NEXT_P || []).push([
         "/_error",
         function () {
-          return __webpack_require__(1261);
+          return __webpack_require__(3972);
         },
       ]);
       if (false) {
@@ -24,7 +24,7 @@
       return __webpack_require__((__webpack_require__.s = moduleId));
     };
     /******/ __webpack_require__.O(0, [888, 179], function () {
-      return __webpack_exec__(5374);
+      return __webpack_exec__(3363);
     });
     /******/ var __webpack_exports__ = __webpack_require__.O();
     /******/ _N_E = __webpack_exports__;
Diff for amp-HASH.js 
@@ -1,17 +1,17 @@
 (self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
   [216],
   {
-    /***/ 8510: /***/ function (
+    /***/ 8753: /***/ function (
       module,
       __unused_webpack_exports,
       __webpack_require__
     ) {
-      module.exports = __webpack_require__(6863);
+      module.exports = __webpack_require__(1088);
 
       /***/
     },
 
-    /***/ 7010: /***/ function (
+    /***/ 5348: /***/ function (
       __unused_webpack_module,
       __unused_webpack_exports,
       __webpack_require__
@@ -19,7 +19,7 @@
       (window.__NEXT_P = window.__NEXT_P || []).push([
         "/amp",
         function () {
-          return __webpack_require__(8381);
+          return __webpack_require__(1458);
         },
       ]);
       if (false) {
@@ -28,7 +28,7 @@
       /***/
     },
 
-    /***/ 6863: /***/ function (module, exports, __webpack_require__) {
+    /***/ 1088: /***/ function (module, exports, __webpack_require__) {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -37,9 +37,9 @@
       exports.useAmp = useAmp;
       var _interop_require_default =
         __webpack_require__(1322) /* ["default"] */.Z;
-      var _react = _interop_require_default(__webpack_require__(2947));
-      var _ampContext = __webpack_require__(7218);
-      var _ampMode = __webpack_require__(9569);
+      var _react = _interop_require_default(__webpack_require__(465));
+      var _ampContext = __webpack_require__(583);
+      var _ampMode = __webpack_require__(8881);
       function useAmp() {
         // Don't assign the context value to a variable to save bytes
         return (0, _ampMode).isInAmpMode(
@@ -61,7 +61,7 @@
       /***/
     },
 
-    /***/ 8381: /***/ function (
+    /***/ 1458: /***/ function (
       __unused_webpack_module,
       __webpack_exports__,
       __webpack_require__
@@ -78,7 +78,7 @@
         /* harmony export */
       });
       /* harmony import */ var next_amp__WEBPACK_IMPORTED_MODULE_0__ =
-        __webpack_require__(8510);
+        __webpack_require__(8753);
       /* harmony import */ var next_amp__WEBPACK_IMPORTED_MODULE_0___default =
         /*#__PURE__*/ __webpack_require__.n(
           next_amp__WEBPACK_IMPORTED_MODULE_0__
@@ -102,7 +102,7 @@
       return __webpack_require__((__webpack_require__.s = moduleId));
     };
     /******/ __webpack_require__.O(0, [888, 179], function () {
-      return __webpack_exec__(7010);
+      return __webpack_exec__(5348);
     });
     /******/ var __webpack_exports__ = __webpack_require__.O();
     /******/ _N_E = __webpack_exports__;
Diff for css-HASH.js 
@@ -1,7 +1,7 @@
 (self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
   [706],
   {
-    /***/ 860: /***/ function (
+    /***/ 6437: /***/ function (
       __unused_webpack_module,
       __unused_webpack_exports,
       __webpack_require__
@@ -9,7 +9,7 @@
       (window.__NEXT_P = window.__NEXT_P || []).push([
         "/css",
         function () {
-          return __webpack_require__(3215);
+          return __webpack_require__(5701);
         },
       ]);
       if (false) {
@@ -18,7 +18,7 @@
       /***/
     },
 
-    /***/ 3215: /***/ function (
+    /***/ 5701: /***/ function (
       __unused_webpack_module,
       __webpack_exports__,
       __webpack_require__
@@ -26,9 +26,9 @@
       "use strict";
       __webpack_require__.r(__webpack_exports__);
       /* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__ =
-        __webpack_require__(3268);
+        __webpack_require__(9701);
       /* harmony import */ var _css_module_css__WEBPACK_IMPORTED_MODULE_1__ =
-        __webpack_require__(4294);
+        __webpack_require__(5725);
       /* harmony import */ var _css_module_css__WEBPACK_IMPORTED_MODULE_1___default =
         /*#__PURE__*/ __webpack_require__.n(
           _css_module_css__WEBPACK_IMPORTED_MODULE_1__
@@ -48,14 +48,14 @@
       /***/
     },
 
-    /***/ 4294: /***/ function (module) {
+    /***/ 5725: /***/ function (module) {
       // extracted by mini-css-extract-plugin
       module.exports = { helloWorld: "css_helloWorld__qqNwY" };
 
       /***/
     },
 
-    /***/ 6205: /***/ function (
+    /***/ 1963: /***/ function (
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -70,7 +70,7 @@
        * This source code is licensed under the MIT license found in the
        * LICENSE file in the root directory of this source tree.
        */
-      var f = __webpack_require__(2947),
+      var f = __webpack_require__(465),
         k = Symbol.for("react.element"),
         l = Symbol.for("react.fragment"),
         m = Object.prototype.hasOwnProperty,
@@ -105,7 +105,7 @@
       /***/
     },
 
-    /***/ 3268: /***/ function (
+    /***/ 9701: /***/ function (
       module,
       __unused_webpack_exports,
       __webpack_require__
@@ -113,7 +113,7 @@
       "use strict";
 
       if (true) {
-        module.exports = __webpack_require__(6205);
+        module.exports = __webpack_require__(1963);
       } else {
       }
 
@@ -126,7 +126,7 @@
       return __webpack_require__((__webpack_require__.s = moduleId));
     };
     /******/ __webpack_require__.O(0, [888, 179], function () {
-      return __webpack_exec__(860);
+      return __webpack_exec__(6437);
     });
     /******/ var __webpack_exports__ = __webpack_require__.O();
     /******/ _N_E = __webpack_exports__;
Diff for dynamic-HASH.js 
@@ -1,7 +1,7 @@
 (self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
   [739],
   {
-    /***/ 3995: /***/ function (
+    /***/ 7753: /***/ function (
       __unused_webpack_module,
       __unused_webpack_exports,
       __webpack_require__
@@ -9,7 +9,7 @@
       (window.__NEXT_P = window.__NEXT_P || []).push([
         "/dynamic",
         function () {
-          return __webpack_require__(8267);
+          return __webpack_require__(825);
         },
       ]);
       if (false) {
@@ -18,7 +18,7 @@
       /***/
     },
 
-    /***/ 6854: /***/ function (module, exports, __webpack_require__) {
+    /***/ 1678: /***/ function (module, exports, __webpack_require__) {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -29,8 +29,8 @@
       var _extends = __webpack_require__(5321) /* ["default"] */.Z;
       var _interop_require_default =
         __webpack_require__(1322) /* ["default"] */.Z;
-      var _react = _interop_require_default(__webpack_require__(2947));
-      var _loadable = _interop_require_default(__webpack_require__(8673));
+      var _react = _interop_require_default(__webpack_require__(465));
+      var _loadable = _interop_require_default(__webpack_require__(899));
       function dynamic(dynamicOptions, options) {
         let loadableFn = _loadable.default;
         let loadableOptions = {
@@ -127,7 +127,7 @@
       /***/
     },
 
-    /***/ 3611: /***/ function (
+    /***/ 6601: /***/ function (
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -140,7 +140,7 @@
       exports.LoadableContext = void 0;
       var _interop_require_default =
         __webpack_require__(1322) /* ["default"] */.Z;
-      var _react = _interop_require_default(__webpack_require__(2947));
+      var _react = _interop_require_default(__webpack_require__(465));
       const LoadableContext = _react.default.createContext(null);
       exports.LoadableContext = LoadableContext;
       if (false) {
@@ -149,7 +149,7 @@
       /***/
     },
 
-    /***/ 8673: /***/ function (
+    /***/ 899: /***/ function (
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -163,8 +163,8 @@
       var _extends = __webpack_require__(5321) /* ["default"] */.Z;
       var _interop_require_default =
         __webpack_require__(1322) /* ["default"] */.Z;
-      var _react = _interop_require_default(__webpack_require__(2947));
-      var _loadableContext = __webpack_require__(3611);
+      var _react = _interop_require_default(__webpack_require__(465));
+      var _loadableContext = __webpack_require__(6601);
       function resolve(obj) {
         return obj && obj.default ? obj.default : obj;
       }
@@ -404,7 +404,7 @@
       /***/
     },
 
-    /***/ 8267: /***/ function (
+    /***/ 825: /***/ function (
       __unused_webpack_module,
       __webpack_exports__,
       __webpack_require__
@@ -418,9 +418,9 @@
         /* harmony export */
       });
       /* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__ =
-        __webpack_require__(3268);
+        __webpack_require__(9701);
       /* harmony import */ var next_dynamic__WEBPACK_IMPORTED_MODULE_1__ =
-        __webpack_require__(6113);
+        __webpack_require__(2677);
       /* harmony import */ var next_dynamic__WEBPACK_IMPORTED_MODULE_1___default =
         /*#__PURE__*/ __webpack_require__.n(
           next_dynamic__WEBPACK_IMPORTED_MODULE_1__
@@ -429,11 +429,11 @@
       const DynamicHello = next_dynamic__WEBPACK_IMPORTED_MODULE_1___default()(
         () =>
           __webpack_require__
-            .e(/* import() */ 869)
-            .then(__webpack_require__.bind(__webpack_require__, 4869)),
+            .e(/* import() */ 959)
+            .then(__webpack_require__.bind(__webpack_require__, 959)),
         {
           loadableGenerated: {
-            webpack: () => [/*require.resolve*/ 4869],
+            webpack: () => [/*require.resolve*/ 959],
           },
         }
       );
@@ -460,7 +460,7 @@
       /***/
     },
 
-    /***/ 6205: /***/ function (
+    /***/ 1963: /***/ function (
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -475,7 +475,7 @@
        * This source code is licensed under the MIT license found in the
        * LICENSE file in the root directory of this source tree.
        */
-      var f = __webpack_require__(2947),
+      var f = __webpack_require__(465),
         k = Symbol.for("react.element"),
         l = Symbol.for("react.fragment"),
         m = Object.prototype.hasOwnProperty,
@@ -510,7 +510,7 @@
       /***/
     },
 
-    /***/ 3268: /***/ function (
+    /***/ 9701: /***/ function (
       module,
       __unused_webpack_exports,
       __webpack_require__
@@ -518,19 +518,19 @@
       "use strict";
 
       if (true) {
-        module.exports = __webpack_require__(6205);
+        module.exports = __webpack_require__(1963);
       } else {
       }
 
       /***/
     },
 
-    /***/ 6113: /***/ function (
+    /***/ 2677: /***/ function (
       module,
       __unused_webpack_exports,
       __webpack_require__
     ) {
-      module.exports = __webpack_require__(6854);
+      module.exports = __webpack_require__(1678);
 
       /***/
     },
@@ -541,7 +541,7 @@
       return __webpack_require__((__webpack_require__.s = moduleId));
     };
     /******/ __webpack_require__.O(0, [888, 179], function () {
-      return __webpack_exec__(3995);
+      return __webpack_exec__(7753);
     });
     /******/ var __webpack_exports__ = __webpack_require__.O();
     /******/ _N_E = __webpack_exports__;
Diff for edge-ssr-HASH.js 
@@ -1,7 +1,7 @@
 (self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
   [800],
   {
-    /***/ 6219: /***/ function (
+    /***/ 6027: /***/ function (
       __unused_webpack_module,
       __unused_webpack_exports,
       __webpack_require__
@@ -9,7 +9,7 @@
       (window.__NEXT_P = window.__NEXT_P || []).push([
         "/edge-ssr",
         function () {
-          return __webpack_require__(7322);
+          return __webpack_require__(9526);
         },
       ]);
       if (false) {
@@ -18,7 +18,7 @@
       /***/
     },
 
-    /***/ 7322: /***/ function (
+    /***/ 9526: /***/ function (
       __unused_webpack_module,
       __webpack_exports__,
       __webpack_require__
@@ -50,7 +50,7 @@
       return __webpack_require__((__webpack_require__.s = moduleId));
     };
     /******/ __webpack_require__.O(0, [888, 179], function () {
-      return __webpack_exec__(6219);
+      return __webpack_exec__(6027);
     });
     /******/ var __webpack_exports__ = __webpack_require__.O();
     /******/ _N_E = __webpack_exports__;
Diff for head-HASH.js 
@@ -1,7 +1,7 @@
 (self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
   [645],
   {
-    /***/ 2899: /***/ function (
+    /***/ 6955: /***/ function (
       __unused_webpack_module,
       __unused_webpack_exports,
       __webpack_require__
@@ -9,7 +9,7 @@
       (window.__NEXT_P = window.__NEXT_P || []).push([
         "/head",
         function () {
-          return __webpack_require__(4463);
+          return __webpack_require__(157);
         },
       ]);
       if (false) {
@@ -18,7 +18,7 @@
       /***/
     },
 
-    /***/ 4463: /***/ function (
+    /***/ 157: /***/ function (
       __unused_webpack_module,
       __webpack_exports__,
       __webpack_require__
@@ -32,9 +32,9 @@
         /* harmony export */
       });
       /* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__ =
-        __webpack_require__(3268);
+        __webpack_require__(9701);
       /* harmony import */ var next_head__WEBPACK_IMPORTED_MODULE_1__ =
-        __webpack_require__(8412);
+        __webpack_require__(9046);
       /* harmony import */ var next_head__WEBPACK_IMPORTED_MODULE_1___default =
         /*#__PURE__*/ __webpack_require__.n(
           next_head__WEBPACK_IMPORTED_MODULE_1__
@@ -68,7 +68,7 @@
       /***/
     },
 
-    /***/ 6205: /***/ function (
+    /***/ 1963: /***/ function (
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -83,7 +83,7 @@
        * This source code is licensed under the MIT license found in the
        * LICENSE file in the root directory of this source tree.
        */
-      var f = __webpack_require__(2947),
+      var f = __webpack_require__(465),
         k = Symbol.for("react.element"),
         l = Symbol.for("react.fragment"),
         m = Object.prototype.hasOwnProperty,
@@ -118,7 +118,7 @@
       /***/
     },
 
-    /***/ 3268: /***/ function (
+    /***/ 9701: /***/ function (
       module,
       __unused_webpack_exports,
       __webpack_require__
@@ -126,19 +126,19 @@
       "use strict";
 
       if (true) {
-        module.exports = __webpack_require__(6205);
+        module.exports = __webpack_require__(1963);
       } else {
       }
 
       /***/
     },
 
-    /***/ 8412: /***/ function (
+    /***/ 9046: /***/ function (
       module,
       __unused_webpack_exports,
       __webpack_require__
     ) {
-      module.exports = __webpack_require__(6593);
+      module.exports = __webpack_require__(6732);
 
       /***/
     },
@@ -149,7 +149,7 @@
       return __webpack_require__((__webpack_require__.s = moduleId));
     };
     /******/ __webpack_require__.O(0, [888, 179], function () {
-      return __webpack_exec__(2899);
+      return __webpack_exec__(6955);
     });
     /******/ var __webpack_exports__ = __webpack_require__.O();
     /******/ _N_E = __webpack_exports__;
Diff for hooks-HASH.js 
@@ -1,7 +1,7 @@
 (self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
   [757],
   {
-    /***/ 2304: /***/ function (
+    /***/ 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";
 
       Object.defineProperty(exports, "__esModule", {
@@ -32,13 +32,13 @@
         __webpack_require__(6687) /* ["default"] */.Z;
       var _object_without_properties_loose =
         __webpack_require__(6239) /* ["default"] */.Z;
-      var _react = _interop_require_wildcard(__webpack_require__(2947));
-      var _head = _interop_require_default(__webpack_require__(6593));
-      var _imageBlurSvg = __webpack_require__(3811);
-      var _imageConfig = __webpack_require__(8419);
-      var _imageConfigContext = __webpack_require__(8147);
-      var _warnOnce = __webpack_require__(5664);
-      var _imageLoader = _interop_require_default(__webpack_require__(5324));
+      var _react = _interop_require_wildcard(__webpack_require__(465));
+      var _head = _interop_require_default(__webpack_require__(6732));
+      var _imageBlurSvg = __webpack_require__(3681);
+      var _imageConfig = __webpack_require__(8394);
+      var _imageConfigContext = __webpack_require__(11);
+      var _warnOnce = __webpack_require__(2485);
+      var _imageLoader = _interop_require_default(__webpack_require__(4439));
       const configEnv = {
         deviceSizes: [640, 750, 828, 1080, 1200, 1920, 2048, 3840],
         imageSizes: [16, 32, 48, 64, 96, 128, 256, 384],
@@ -732,7 +732,7 @@
       /***/
     },
 
-    /***/ 3811: /***/ function (__unused_webpack_module, exports) {
+    /***/ 3681: /***/ function (__unused_webpack_module, exports) {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -785,7 +785,7 @@
       /***/
     },
 
-    /***/ 5324: /***/ function (__unused_webpack_module, exports) {
+    /***/ 4439: /***/ function (__unused_webpack_module, exports) {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -811,7 +811,7 @@
       /***/
     },
 
-    /***/ 3428: /***/ function (
+    /***/ 2018: /***/ function (
       __unused_webpack_module,
       __webpack_exports__,
       __webpack_require__
@@ -830,10 +830,10 @@
         },
       });
 
-      // EXTERNAL MODULE: ./node_modules/.pnpm/file+..+main-repo+packages+next+next-packed.tgz_biqbaboplfbrettd7655fr4n2y/node_modules/next/dist/compiled/react/jsx-runtime.js
-      var jsx_runtime = __webpack_require__(3268);
-      // EXTERNAL MODULE: ./node_modules/.pnpm/file+..+main-repo+packages+next+next-packed.tgz_biqbaboplfbrettd7655fr4n2y/node_modules/next/image.js
-      var next_image = __webpack_require__(3960);
+      // EXTERNAL MODULE: ./node_modules/.pnpm/file+..+diff-repo+packages+next+next-packed.tgz_biqbaboplfbrettd7655fr4n2y/node_modules/next/dist/compiled/react/jsx-runtime.js
+      var jsx_runtime = __webpack_require__(9701);
+      // EXTERNAL MODULE: ./node_modules/.pnpm/file+..+diff-repo+packages+next+next-packed.tgz_biqbaboplfbrettd7655fr4n2y/node_modules/next/image.js
+      var next_image = __webpack_require__(8249);
       var image_default = /*#__PURE__*/ __webpack_require__.n(ne
Post job cleanup.
[command]/usr/bin/git version
git version 2.40.0
Temporarily overriding HOME='/home/runner/work/_temp/3da8657f-1270-46ee-a456-2b69b6dd478c' 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: 38f738b35de35649ab0c6debac71b7713d873c63

ijjk added 13 commits March 20, 2023 15:44
@ijjk ijjk marked this pull request as ready for review April 2, 2023 06:46
@ijjk ijjk requested review from timneutkens, shuding, a team, huozhi and feedthejim as code owners April 2, 2023 06:46
shuding
shuding approved these changes Apr 2, 2023
View reviewed changes
Copy link
Member

@shuding shuding left a comment

Choose a reason for hiding this comment

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

:happy-cry:

@ijjk
Copy link
Member Author

ijjk commented Apr 2, 2023

Failing test suites

Commit: 38f738b

pnpm testheadless test/development/acceptance-app/ReactRefreshLogBox.test.ts

  • ReactRefreshLogBox app default > Unhandled errors and rejections opens up in the minimized state
Expand output

● ReactRefreshLogBox app default › Unhandled errors and rejections opens up in the minimized state

page.waitForSelector: Timeout 30000ms exceeded.
=========================== logs ===========================
waiting for locator('.nextjs-toast-errors')
============================================================

  329 |     return this.chain(() => {
  330 |       return page
> 331 |         .waitForSelector(selector, { timeout, state: 'attached' })
      |          ^
  332 |         .then(async (el) => {
  333 |           // it seems selenium waits longer and tests rely on this behavior
  334 |           // so we wait for the load event fire before returning

  at lib/browsers/playwright.ts:331:10

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

@shuding shuding merged commit fdacca8 into vercel:canary Apr 2, 2023
jankaifer
jankaifer reviewed Apr 2, 2023
View reviewed changes
test/e2e/opentelemetry/opentelemetry.test.ts
Comment on lines +26 to +28
return rootSpans.length >= numberOfRootTraces
? String(numberOfRootTraces)
: rootSpans.length
Copy link
Contributor

Choose a reason for hiding this comment

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

@ijjk Why exactly was this needed?
I think that this should never happen: rootSpans.length > numberOfRootTraces.

Copy link
Contributor

Choose a reason for hiding this comment

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

It seems that requests are fired multiple times but only in dev mode.
I'll create a new PR that enforces it can be > only in dev mode. I will also make this more explicit.

Copy link
Contributor

Choose a reason for hiding this comment

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

Followup pr: #47822

jankaifer added a commit that referenced this pull request Apr 2, 2023
@jankaifer
revert changes made to otel testing in #47208
16a8661
@jankaifer jankaifer mentioned this pull request Apr 2, 2023
Merged
@ijjk ijjk deleted the update/separate-route-resolving branch April 2, 2023 18:28
wyattjoh
wyattjoh reviewed Apr 2, 2023
View reviewed changes
packages/next/src/server/next-server.ts
Comment on lines +1346 to +1352
if (!(await this.hasPage(page))) {
for (const route of this.dynamicRoutes || []) {
if (route.match(pathname)) {
page = route.page
}
}
}
Copy link
Member

Choose a reason for hiding this comment

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

Is there a reason this couldn't use the RouteMatchers? They should already be conifgured with the dynamic routes that are available.

Additionally, this for loop (even when it finds a match) will go through every route, shouldn't there be a break here?

packages/next/src/server/next-server.ts
Comment on lines +1474 to +1490
if (key === 'set-cookie') {
const curValue = res.getHeader(key)
const newValue: string[] = [] as string[]
for (const cookie of splitCookiesString(curValue || '')) {
newValue.push(cookie)
}
for (const val of (Array.isArray(value)
? value
: value
? [value]
: []) as string[]) {
newValue.push(val)
}
res.setHeader(key, newValue)
} else {
res.setHeader(key, value as string)
}
Copy link
Member

Choose a reason for hiding this comment

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

This beheviour is actually already handled by the toNodeHeaders function.

next.js/packages/next/src/server/web/utils.ts

Lines 95 to 112 in 400ccf7

export function toNodeHeaders(headers?: Headers): OutgoingHttpHeaders {
const result: OutgoingHttpHeaders = {}
const cookies: string[] = []
if (headers) {
for (const [key, value] of headers.entries()) {
if (key.toLowerCase() === 'set-cookie') {
// We may have gotten a comma joined string of cookies, or multiple
// set-cookie headers. We need to merge them into one header array
// to represent all the cookies.
cookies.push(...splitCookiesString(value))
result[key] = cookies
} else {
result[key] = value
}
}
}
return result
}

Copy link
Member Author

Choose a reason for hiding this comment

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

This needs to merge new headers with the existing res headers which the toNodeHelpers does not currently do, could be adapted to though.

Cow258
Cow258 reviewed Apr 6, 2023
View reviewed changes
packages/next/src/server/lib/worker-utils.ts
@@ -0,0 +1,47 @@
import * as Log from '../../build/output/log'

export const genRenderExecArgv = () => {
Copy link
Contributor

Choose a reason for hiding this comment

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

You moved all the debugging codes into this file, but i didn't find anywhere else to call it.
This prevents us from putting the server into debug mode via NODE_OPTIONS.
Issues: #47561 #47083
Also discarded previous corrections: #46757

image

Copy link
Contributor

Choose a reason for hiding this comment

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

Follow up PR: #48019

packages/next/src/server/lib/server-ipc.ts
__NEXT_PRIVATE_ROUTER_IPC_PORT: ipcPort + '',
NODE_ENV: process.env.NODE_ENV,
},
execArgv: genExecArgv(
Copy link
Contributor

Choose a reason for hiding this comment

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

It maybe change to genRenderExecArgv

Cow258
Cow258 reviewed Apr 6, 2023
View reviewed changes
packages/next/src/server/lib/start-server.ts
...process.env,
// we don't pass down NODE_OPTIONS as it can
// extra memory usage
NODE_OPTIONS: getNodeOptionsWithoutInspect()
Copy link
Contributor

Choose a reason for hiding this comment

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

We need NODE_OPTIONS here for render-server

packages/next/src/server/lib/server-ipc.ts
export const createWorker = (
serverPort: number,
ipcPort: number,
isNodeDebugging: boolean | 'brk' | undefined,
Copy link
Contributor

@Cow258 Cow258 Apr 6, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

isNodeDebugging Only working when process.env.__NEXT_DISABLE_MEMORY_WATCHER was set

@Cow258 Cow258 mentioned this pull request Apr 6, 2023
Merged
1 task
@jmartin4563 jmartin4563 mentioned this pull request Apr 7, 2023
Closed
@DuCanhGH DuCanhGH mentioned this pull request Apr 18, 2023
Merged
ijjk pushed a commit that referenced this pull request Apr 18, 2023
@DuCanhGH
Fixed image-optimizer crashing when using outputFileTracing (#48513)
12472b4 
<!-- Thanks for opening a PR! Your contribution is much appreciated.
To make sure your PR is handled as smoothly as possible we request that
you follow the checklist sections below.
Choose the right checklist for the change(s) that you're making:

## For Contributors

### Improving Documentation or adding/fixing Examples

- The "examples guidelines" are followed from our contributing doc
https://github.com/vercel/next.js/blob/canary/contributing/examples/adding-examples.md
- Make sure the linting passes by running `pnpm build && pnpm lint`. See
https://github.com/vercel/next.js/blob/canary/contributing/repository/linting.md

### Fixing a bug

- Related issues linked using `fixes #number`
- Tests added. See:
https://github.com/vercel/next.js/blob/canary/contributing/core/testing.md#writing-tests-for-nextjs
- Errors have a helpful link attached, see
https://github.com/vercel/next.js/blob/canary/contributing.md

### Adding a feature

- Implements an existing feature request or RFC. Make sure the feature
request has been accepted for implementation before opening a PR. (A
discussion must be opened, see
https://github.com/vercel/next.js/discussions/new?category=ideas)
- Related issues/discussions are linked using `fixes #number`
- e2e tests added
(https://github.com/vercel/next.js/blob/canary/contributing/core/testing.md#writing-tests-for-nextjs
- Documentation added
- Telemetry added. In case of a feature if it's used or not.
- Errors have a helpful link attached, see
https://github.com/vercel/next.js/blob/canary/contributing.md



## For Maintainers

- Minimal description (aim for explaining to someone not on the team to
understand the PR)
- When linking to a Slack thread, you might want to share details of the
conclusion
- Link both the Linear (Fixes NEXT-xxx) and the GitHub issues
- Add review comments if necessary to explain to the reviewer the logic
behind a change
-->

### What?
This PR fixes the issue where using `output: "standalone"` breaks
`next/image`, `opengraph-image.tsx`,... (those that use
`image-optimizer`), which was introduced by #47208 as it added
`next/dist/compiled/jest-worker` to `ignores`.

### How?
Dynamically import `squoosh` so that it does not throw.

Fixes #48077
Fixes #48173
@Xetoxyc Xetoxyc mentioned this pull request Apr 21, 2023
Closed
1 task
@saicharan-gevme
Copy link

@ijjk This PR has broken Socket.IO Integration in Next.js
Ref - #48422
Ref - #48510

With all due respect and love toward Next.js, it would be very much helpful if you could once look into this issue.
Thank you.

@balazsorban44
Copy link
Member

@saicharan-gevme could you open a bug report with a reproduction attached, making sure you use the latest canary (as of writing v13.3.2-canary.9). 🙏 Thanks!

@Xetoxyc Xetoxyc mentioned this pull request May 5, 2023
Closed
@saicharan-gevme saicharan-gevme mentioned this pull request May 5, 2023
Closed
1 task
ijjk added a commit that referenced this pull request May 23, 2023
@Cow258 @ijjk
fix: NODE_OPTIONS='--inspect' in next dev for debugging (#48019)
90331f3 
## Bug

This fix closes #47083 issue 
This fix closes #47561 issue
This fix closes #48376 issue
**Invalid repetition PRs:** #47671 (this PR changing expired code)
(This issue still exist on
[v13.4.3-canary.1](https://github.com/vercel/next.js/releases/tag/v13.4.3-canary.1)

- [x] Related issues linked using `fixes #number`

### What?
When running `NODE_OPTIONS='--inspect' next dev`, 
the render server didn't start with `--inspect`. 
In some cases, 
the `--inspect` flag will be passed when `__NEXT_DISABLE_MEMORY_WATCHER`
was set.

### Why?
Since #47208 revamped some startup processes, the `NODE_OPTIONS`
environment parameter is not passed down to the render server worker.

### How?
Just add back the original startup process.


![image](https://user-images.githubusercontent.com/14261588/230398898-791e6909-6f4c-493b-937d-058a7b788849.png)


link NEXT-1176

---------

Co-authored-by: JJ Kasper <[email protected]>
@github-actions github-actions bot locked as resolved and limited conversation to collaborators May 27, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@wyattjoh wyattjoh wyattjoh left review comments

@jankaifer jankaifer jankaifer left review comments

@Cow258 Cow258 Cow258 left review comments

@shuding shuding shuding approved these changes

@huozhi huozhi huozhi approved these changes

@timneutkens timneutkens Awaiting requested review from timneutkens

@feedthejim feedthejim Awaiting requested review from feedthejim

Assignees
No one assigned
Labels
created-by: Next.js team PRs by the Next.js team. type: next
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@ijjk @saicharan-gevme @balazsorban44 @wyattjoh @shuding @huozhi @jankaifer @Cow258