Fix(typedRoutes): replaced `readFile` + `replaceAll`, hid utils types, fixed duplication in type `Route`, fixed route groups on Windows #46378

DuCanhGH · 2023-02-24T17:23:42Z

This PR fixes route groups not working with Windows by handling slashes properly by replacing RegEx expressions with ensureLeadingSlash, getPageFromPath (which uses normalizePathSep),... It also adds a test that ensures typedRoutes works with route groups to app-types.test.js.

It also replaces fs.readFile and String's replaceAll that were used to augment next in PR 46332 (which were rather overkill and inefficient in my opinion) with a export * from "next/types/index.d.ts".

I've also converted edgeRouteTypes and nodeRouteTypes to 2 Sets so as to avoid duplications. When we write type Route, we also check if a route in nodeRouteTypes is already defined in edgeRouteTypes.

Types like SearchOrHash, Suffix, SafeSlug,... have also been made private to module "next" (before this PR users could access to these types anywhere in their workspace, which doesn't seem like an expected behaviour in my opinion).

Bug

Related issues linked using fixes #number
Integration tests added
Errors have a helpful link attached, see contributing.md

Feature

Implements an existing feature request or RFC. Make sure the feature request has been accepted for implementation before opening a PR.
Related issues linked using fixes #number
e2e tests added
Documentation added
Telemetry added. In case of a feature if it's used or not.
Errors have a helpful link attached, see contributing.md

Documentation / Examples

Make sure the linting passes by running pnpm build && pnpm lint
The "examples guidelines" are followed from our contributing doc

…de typedRoutes' utils types

ijjk · 2023-02-24T17:32:25Z

Failing test suites

Commit: 75ac3a3

pnpm testheadless test/development/basic/hmr.test.ts

Error overlay - RSC build errors > should throw an error when error file is a server component with empty error file

Expand output

● Error overlay - RSC build errors › should throw an error when error file is a server component with empty error file

expect(received).toMatchInlineSnapshot(snapshot)

Snapshot name: `Error overlay - RSC build errors should throw an error when error file is a server component with empty error file 1`

- Snapshot  - 1
+ Received  + 1

@@ -7,6 +7,6 @@
   1 |  
     : ^
     `----

  Import path:
- app/server-with-errors/error-file/error.js
+   app/server-with-errors/error-file/error.js

  303 |       expect(await session.hasRedbox(true)).toBe(true)
  304 |       await check(() => session.getRedboxSource(), /must be a Client Component/)
> 305 |       expect(await session.getRedboxSource()).toMatchInlineSnapshot(`
      |                                               ^
  306 |         "./app/server-with-errors/error-file/error.js
  307 |         ReactServerComponentsError:
  308 |

  at Object.<anonymous> (development/acceptance-app/rsc-build-errors.test.ts:305:47)

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

ijjk · 2023-02-24T17:58:07Z

Stats from current PR

Default Build (Increase detected ⚠️)

General Overall increase ⚠️

	vercel/next.js canary	DuCanhGH/next.js ducanhgh-perf-typed-routes	Change
buildDuration	38.6s	38.4s	-146ms
buildDurationCached	14.8s	9.8s	-5s
nodeModulesSize	111 MB	111 MB	⚠️ +1.48 kB
nextStartRea..uration (ms)	294ms	290ms	-4ms

Client Bundles (main, webpack) Overall increase ⚠️

	vercel/next.js canary	DuCanhGH/next.js ducanhgh-perf-typed-routes	Change
296.HASH.js gzip	181 B	180 B	-1 B
68-HASH.js gzip	65.8 kB	65.8 kB	⚠️ +4 B
main-app-HASH.js gzip	204 B	205 B	⚠️ +1 B
main-HASH.js gzip	88.8 kB	88.9 kB	⚠️ +12 B
webpack-HASH.js gzip	1.7 kB	1.7 kB	-4 B
Overall change	157 kB	157 kB	⚠️ +12 B

Legacy Client Bundles (polyfills)

	vercel/next.js canary	DuCanhGH/next.js ducanhgh-perf-typed-routes	Change
polyfills-HASH.js gzip	31 kB	31 kB	✓
Overall change	31 kB	31 kB	✓

Client Pages Overall decrease ✓

	vercel/next.js canary	DuCanhGH/next.js ducanhgh-perf-typed-routes	Change
_app-HASH.js gzip	192 B	191 B	-1 B
_error-HASH.js gzip	180 B	179 B	-1 B
amp-HASH.js gzip	482 B	483 B	⚠️ +1 B
css-HASH.js gzip	804 B	803 B	-1 B
dynamic-HASH.js gzip	2.27 kB	2.27 kB	✓
edge-ssr-HASH.js gzip	259 B	259 B	✓
head-HASH.js gzip	827 B	826 B	-1 B
hooks-HASH.js gzip	850 B	849 B	-1 B
image-HASH.js gzip	4.33 kB	4.32 kB	-3 B
index-HASH.js gzip	253 B	252 B	-1 B
link-HASH.js gzip	2.76 kB	2.75 kB	-4 B
routerDirect..HASH.js gzip	783 B	781 B	-2 B
script-HASH.js gzip	859 B	854 B	-5 B
withRouter-HASH.js gzip	782 B	778 B	-4 B
85e02e95b279..7e3.css gzip	107 B	107 B	✓
Overall change	15.7 kB	15.7 kB	-23 B

Client Build Manifests Overall increase ⚠️

	vercel/next.js canary	DuCanhGH/next.js ducanhgh-perf-typed-routes	Change
_buildManifest.js gzip	482 B	484 B	⚠️ +2 B
Overall change	482 B	484 B	⚠️ +2 B

Rendered Page Sizes Overall increase ⚠️

	vercel/next.js canary	DuCanhGH/next.js ducanhgh-perf-typed-routes	Change
index.html gzip	487 B	490 B	⚠️ +3 B
link.html gzip	502 B	505 B	⚠️ +3 B
withRouter.html gzip	482 B	484 B	⚠️ +2 B
Overall change	1.47 kB	1.48 kB	⚠️ +8 B

Edge SSR bundle Size Overall increase ⚠️

	vercel/next.js canary	DuCanhGH/next.js ducanhgh-perf-typed-routes	Change
edge-ssr.js gzip	129 kB	129 kB	-3 B
page.js gzip	95.4 kB	95.5 kB	⚠️ +23 B
Overall change	225 kB	225 kB	⚠️ +20 B

Middleware size Overall increase ⚠️

	vercel/next.js canary	DuCanhGH/next.js ducanhgh-perf-typed-routes	Change
middleware-b..fest.js gzip	584 B	586 B	⚠️ +2 B
middleware-r..fest.js gzip	145 B	144 B	-1 B
middleware.js gzip	26.5 kB	26.5 kB	⚠️ +1 B
edge-runtime..pack.js gzip	1.83 kB	1.83 kB	✓
Overall change	29 kB	29 kB	⚠️ +2 B

Diffs

Diff for page.js

Diff too large to display

Diff for middleware-b..-manifest.js

@@ -7,81 +7,81 @@ self.__BUILD_MANIFEST = {
     "static/BUILD_ID/_ssgManifest.js"
   ],
   rootMainFiles: [
-    "static/chunks/webpack-1fb2bf13b5824dd0.js",
-    "static/chunks/68-750f9c365cd1eba4.js",
-    "static/chunks/main-app-300395850247fc8e.js"
+    "static/chunks/webpack-18ba22fbfdc26df1.js",
+    "static/chunks/337-eb31b3244e54322b.js",
+    "static/chunks/main-app-5dd10254d250a130.js"
   ],
   pages: {
     "/": [
-      "static/chunks/webpack-1fb2bf13b5824dd0.js",
-      "static/chunks/main-e31a5c79bfe93aaf.js",
-      "static/chunks/pages/index-9aa09486c441da7a.js"
+      "static/chunks/webpack-18ba22fbfdc26df1.js",
+      "static/chunks/main-963c5e67cf5dcec0.js",
+      "static/chunks/pages/index-d30a580d3c17f4d9.js"
     ],
     "/_app": [
-      "static/chunks/webpack-1fb2bf13b5824dd0.js",
-      "static/chunks/main-e31a5c79bfe93aaf.js",
-      "static/chunks/pages/_app-7371eef299aa9dbf.js"
+      "static/chunks/webpack-18ba22fbfdc26df1.js",
+      "static/chunks/main-963c5e67cf5dcec0.js",
+      "static/chunks/pages/_app-3a8e7c7946c2bd53.js"
     ],
     "/_error": [
-      "static/chunks/webpack-1fb2bf13b5824dd0.js",
-      "static/chunks/main-e31a5c79bfe93aaf.js",
-      "static/chunks/pages/_error-6c7c229e8db01b88.js"
+      "static/chunks/webpack-18ba22fbfdc26df1.js",
+      "static/chunks/main-963c5e67cf5dcec0.js",
+      "static/chunks/pages/_error-a9ef5f835b494eed.js"
     ],
     "/amp": [
-      "static/chunks/webpack-1fb2bf13b5824dd0.js",
-      "static/chunks/main-e31a5c79bfe93aaf.js",
-      "static/chunks/pages/amp-69f4e2ab5f900eeb.js"
+      "static/chunks/webpack-18ba22fbfdc26df1.js",
+      "static/chunks/main-963c5e67cf5dcec0.js",
+      "static/chunks/pages/amp-0caeab3cd7ed5bbd.js"
     ],
     "/css": [
-      "static/chunks/webpack-1fb2bf13b5824dd0.js",
-      "static/chunks/main-e31a5c79bfe93aaf.js",
+      "static/chunks/webpack-18ba22fbfdc26df1.js",
+      "static/chunks/main-963c5e67cf5dcec0.js",
       "static/css/94fdbc56eafa2039.css",
-      "static/chunks/pages/css-58ed6e8a496a11ae.js"
+      "static/chunks/pages/css-9ee41d03543021b4.js"
     ],
     "/dynamic": [
-      "static/chunks/webpack-1fb2bf13b5824dd0.js",
-      "static/chunks/main-e31a5c79bfe93aaf.js",
-      "static/chunks/pages/dynamic-6a3d4560553c65c8.js"
+      "static/chunks/webpack-18ba22fbfdc26df1.js",
+      "static/chunks/main-963c5e67cf5dcec0.js",
+      "static/chunks/pages/dynamic-56836b82a5676b9a.js"
     ],
     "/edge-ssr": [
-      "static/chunks/webpack-1fb2bf13b5824dd0.js",
-      "static/chunks/main-e31a5c79bfe93aaf.js",
-      "static/chunks/pages/edge-ssr-f41404e93ffdc0de.js"
+      "static/chunks/webpack-18ba22fbfdc26df1.js",
+      "static/chunks/main-963c5e67cf5dcec0.js",
+      "static/chunks/pages/edge-ssr-5d2cdb3b4a9fabd5.js"
     ],
     "/head": [
-      "static/chunks/webpack-1fb2bf13b5824dd0.js",
-      "static/chunks/main-e31a5c79bfe93aaf.js",
-      "static/chunks/pages/head-dd42bd14722e3b87.js"
+      "static/chunks/webpack-18ba22fbfdc26df1.js",
+      "static/chunks/main-963c5e67cf5dcec0.js",
+      "static/chunks/pages/head-248ef55290815b7c.js"
     ],
     "/hooks": [
-      "static/chunks/webpack-1fb2bf13b5824dd0.js",
-      "static/chunks/main-e31a5c79bfe93aaf.js",
-      "static/chunks/pages/hooks-29ca2115d483e3f7.js"
+      "static/chunks/webpack-18ba22fbfdc26df1.js",
+      "static/chunks/main-963c5e67cf5dcec0.js",
+      "static/chunks/pages/hooks-624e3ee1c369c918.js"
     ],
     "/image": [
-      "static/chunks/webpack-1fb2bf13b5824dd0.js",
-      "static/chunks/main-e31a5c79bfe93aaf.js",
-      "static/chunks/pages/image-156bb27d90116b58.js"
+      "static/chunks/webpack-18ba22fbfdc26df1.js",
+      "static/chunks/main-963c5e67cf5dcec0.js",
+      "static/chunks/pages/image-e6910d22a1d38d27.js"
     ],
     "/link": [
-      "static/chunks/webpack-1fb2bf13b5824dd0.js",
-      "static/chunks/main-e31a5c79bfe93aaf.js",
-      "static/chunks/pages/link-d855e7210058f596.js"
+      "static/chunks/webpack-18ba22fbfdc26df1.js",
+      "static/chunks/main-963c5e67cf5dcec0.js",
+      "static/chunks/pages/link-2089ce728117e224.js"
     ],
     "/routerDirect": [
-      "static/chunks/webpack-1fb2bf13b5824dd0.js",
-      "static/chunks/main-e31a5c79bfe93aaf.js",
-      "static/chunks/pages/routerDirect-3f7b8ebe2866d49e.js"
+      "static/chunks/webpack-18ba22fbfdc26df1.js",
+      "static/chunks/main-963c5e67cf5dcec0.js",
+      "static/chunks/pages/routerDirect-5c05820a2fc8ec29.js"
     ],
     "/script": [
-      "static/chunks/webpack-1fb2bf13b5824dd0.js",
-      "static/chunks/main-e31a5c79bfe93aaf.js",
-      "static/chunks/pages/script-91e45d56ed7a0a44.js"
+      "static/chunks/webpack-18ba22fbfdc26df1.js",
+      "static/chunks/main-963c5e67cf5dcec0.js",
+      "static/chunks/pages/script-20414a8a58346938.js"
     ],
     "/withRouter": [
-      "static/chunks/webpack-1fb2bf13b5824dd0.js",
-      "static/chunks/main-e31a5c79bfe93aaf.js",
-      "static/chunks/pages/withRouter-dc4cb10af8bf3877.js"
+      "static/chunks/webpack-18ba22fbfdc26df1.js",
+      "static/chunks/main-963c5e67cf5dcec0.js",
+      "static/chunks/pages/withRouter-edc4e76b107d965e.js"
     ]
   },
   ampFirstPages: []

Diff for middleware-r..-manifest.js

@@ -1,6 +1,6 @@
 self.__REACT_LOADABLE_MANIFEST = {
   "dynamic.js -> ../components/hello": {
-    id: 5296,
-    files: ["static/chunks/296.c2a2a2052e2e3567.js"]
+    id: 753,
+    files: ["static/chunks/753.d8039168a3bcc2bf.js"]
   }
 };

Diff for middleware.js

@@ -1,7 +1,7 @@
 (self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
   [826],
   {
-    /***/ 2633: /***/ (
+    /***/ 3381: /***/ (
       __unused_webpack_module,
       __webpack_exports__,
       __webpack_require__
@@ -14,7 +14,7 @@
       __webpack_require__.d(__webpack_exports__, {
         default: () =>
           /* binding */ next_middleware_loaderabsolutePagePath_private_next_root_dir_2Fmiddleware_js_page_2Fmiddleware_rootDir_2Ftmp_2Fnext_statsk6D8UO_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 }) {
@@ -41,7 +41,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) {
@@ -157,7 +157,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");
@@ -203,7 +203,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) {
@@ -232,7 +232,7 @@
           }
         }
         return domainItem;
-      } //# 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
@@ -242,7 +242,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
@@ -270,7 +270,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
@@ -281,7 +281,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
@@ -293,7 +293,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
@@ -307,7 +307,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
@@ -324,7 +324,7 @@
           return addPathPrefix(path, `/${locale}`);
         }
         return path;
-      } //# 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(
@@ -348,7 +348,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
@@ -363,7 +363,7 @@
           parsed.hostname) == null
           ? void 0
           : ref.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
@@ -393,7 +393,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
@@ -409,7 +409,7 @@
             : `/${withoutPrefix}`;
         }
         return path;
-      } //# 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;
@@ -446,7 +446,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)/;
       function parseURL(url, base) {
@@ -658,8 +658,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 {
@@ -732,7 +732,7 @@
         get url() {
           return this[INTERNALS].url.toString();
         }
-      } // 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");
@@ -832,7 +832,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
       /**
@@ -846,7 +846,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",
@@ -870,7 +870,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
       /**
@@ -922,7 +922,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 = "Action";
@@ -935,7 +935,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) {
@@ -1172,12 +1172,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-statsk6D8UO%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-statsk6D8UO%2Fstats-app&matchers=!
 
       //# sourceMappingURL=adapter.js.map
       enhanceGlobals();
 
-      var mod = __webpack_require__(8974);
+      var mod = __webpack_require__(3578);
       var handler = mod.middleware || mod.default;
 
       if (typeof handler !== "function") {
@@ -1199,7 +1199,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
       /***/
     },
 
-    /***/ 8974: /***/ (
+    /***/ 3578: /***/ (
       __unused_webpack_module,
       __webpack_exports__,
       __webpack_require__
@@ -1211,7 +1211,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
         /* harmony export */
       });
       /* harmony import */ var next_server__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(
-        8352
+        9541
       );
       /* harmony import */ var next_server__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/ __webpack_require__.n(
         next_server__WEBPACK_IMPORTED_MODULE_0__
@@ -1224,7 +1224,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
       /***/
     },
 
-    /***/ 2558: /***/ (__unused_webpack_module, exports) => {
+    /***/ 5230: /***/ (__unused_webpack_module, exports) => {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -1244,7 +1244,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
       /***/
     },
 
-    /***/ 1772: /***/ (__unused_webpack_module, exports) => {
+    /***/ 2546: /***/ (__unused_webpack_module, exports) => {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -1282,7 +1282,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
       /***/
     },
 
-    /***/ 5037: /***/ (__unused_webpack_module, exports) => {
+    /***/ 9248: /***/ (__unused_webpack_module, exports) => {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -1314,7 +1314,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
       /***/
     },
 
-    /***/ 2700: /***/ (
+    /***/ 540: /***/ (
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -1325,8 +1325,8 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
         value: true
       });
       exports.addLocale = addLocale;
-      var _addPathPrefix = __webpack_require__(5734);
-      var _pathHasPrefix = __webpack_require__(3613);
+      var _addPathPrefix = __webpack_require__(553);
+      var _pathHasPrefix = __webpack_require__(7699);
       function addLocale(path, locale, defaultLocale, ignorePrefix) {
         if (
           locale &&
@@ -1346,7 +1346,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
       /***/
     },
 
-    /***/ 5734: /***/ (
+    /***/ 553: /***/ (
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -1357,7 +1357,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
         value: true
       });
       exports.addPathPrefix = addPathPrefix;
-      var _parsePath = __webpack_require__(210);
+      var _parsePath = __webpack_require__(4746);
       function addPathPrefix(path, prefix) {
         if (!path.startsWith("/") || !prefix) {
           return path;
@@ -1369,7 +1369,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
       /***/
     },
 
-    /***/ 4138: /***/ (
+    /***/ 9740: /***/ (
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -1380,7 +1380,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
         value: true
       });
       exports.addPathSuffix = addPathSuffix;
-      var _parsePath = __webpack_require__(210);
+      var _parsePath = __webpack_require__(4746);
       function addPathSuffix(path, suffix) {
         if (!path.startsWith("/") || !suffix) {
           return path;
@@ -1392,7 +1392,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
       /***/
     },
 
-    /***/ 5694: /***/ (
+    /***/ 856: /***/ (
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -1403,10 +1403,10 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
         value: true
       });
       exports.formatNextPathnameInfo = formatNextPathnameInfo;
-      var _removeTrailingSlash = __webpack_require__(390);
-      var _addPathPrefix = __webpack_require__(5734);
-      var _addPathSuffix = __webpack_require__(4138);
-      var _addLocale = __webpack_require__(2700);
+      var _removeTrailingSlash = __webpack_require__(8735);
+      var _addPathPrefix = __webpack_require__(553);
+      var _addPathSuffix = __webpack_require__(9740);
+      var _addLocale = __webpack_require__(540);
       function formatNextPathnameInfo(info) {
         let pathname = (0, _addLocale).addLocale(
           info.pathname,
@@ -1437,7 +1437,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
       /***/
     },
 
-    /***/ 885: /***/ (
+    /***/ 4835: /***/ (
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -1448,9 +1448,9 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
         value: true
       });
       exports.getNextPathnameInfo = getNextPathnameInfo;
-      var _normalizeLocalePath = __webpack_require__(5037);
-      var _removePathPrefix = __webpack_require__(1742);
-      var _pathHasPrefix = __webpack_require__(3613);
+      var _normalizeLocalePath = __webpack_require__(9248);
+      var _removePathPrefix = __webpack_require__(5627);
+      var _pathHasPrefix = __webpack_require__(7699);
       function getNextPathnameInfo(pathname, options) {
         var _nextConfig;
         const { basePath, i18n, trailingSlash } =
@@ -1500,7 +1500,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
       /***/
     },
 
-    /***/ 210: /***/ (__unused_webpack_module, exports) => {
+    /***/ 4746: /***/ (__unused_webpack_module, exports) => {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -1534,7 +1534,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
       /***/
     },
 
-    /***/ 3613: /***/ (
+    /***/ 7699: /***/ (
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -1545,7 +1545,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
         value: true
       });
       exports.pathHasPrefix = pathHasPrefix;
-      var _parsePath = __webpack_require__(210);
+      var _parsePath = __webpack_require__(4746);
       function pathHasPrefix(path, prefix) {
         if (typeof path !== "string") {
           return false;
@@ -1557,7 +1557,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
       /***/
     },
 
-    /***/ 1742: /***/ (
+    /***/ 5627: /***/ (
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -1568,7 +1568,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
         value: true
       });
       exports.removePathPrefix = removePathPrefix;
-      var _pathHasPrefix = __webpack_require__(3613);
+      var _pathHasPrefix = __webpack_require__(7699);
       function removePathPrefix(path, prefix) {
         if ((0, _pathHasPrefix).pathHasPrefix(path, prefix)) {
           const withoutPrefix = path.slice(prefix.length);
@@ -1582,7 +1582,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
       /***/
     },
 
-    /***/ 390: /***/ (__unused_webpack_module, exports) => {
+    /***/ 8735: /***/ (__unused_webpack_module, exports) => {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -1596,7 +1596,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
       /***/
     },
 
-    /***/ 29: /***/ module => {
+    /***/ 8432: /***/ module => {
       "use strict";
 
       var __defProp = Object.defineProperty;
@@ -1925,7 +1925,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
       /***/
     },
 
-    /***/ 6166: /***/ (module, exports, __webpack_require__) => {
+    /***/ 6204: /***/ (module, exports, __webpack_require__) => {
       var __dirname = "/";
       var __WEBPACK_AMD_DEFINE_RESULT__;
       (() => {
@@ -2767,7 +2767,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
       /***/
     },
 
-    /***/ 4524: /***/ (__unused_webpack_module, exports) => {
+    /***/ 8666: /***/ (__unused_webpack_module, exports) => {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -2808,7 +2808,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
       /***/
     },
 
-    /***/ 3062: /***/ (
+    /***/ 4901: /***/ (
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -2818,10 +2818,10 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
       Object.defineProperty(exports, "__esModule", {
         value: true
       });
-      var _detectDomainLocale = __webpack_require__(1772);
-      var _formatNextPathnameInfo = __webpack_require__(5694);
-      var _getHostname = __webpack_require__(2558);
-      var _getNextPathnameInfo = __webpack_require__(885);
+      var _detectDomainLocale = __webpack_require__(2546);
+      var _formatNextPathnameInfo = __webpack_require__(856);
+      var _getHostname = __webpack_require__(5230);
+      var _getNextPathnameInfo = __webpack_require__(4835);
       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) {
         return new URL(
@@ -3041,7 +3041,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
       /***/
     },
 
-    /***/ 3868: /***/ (
+    /***/ 4570: /***/ (
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -3051,7 +3051,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;
@@ -3113,7 +3113,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
       /***/
     },
 
-    /***/ 5829: /***/ (
+    /***/ 5985: /***/ (
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -3125,10 +3125,10 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
         value: true
       };
       __webpack_unused_export__ = void 0;
-      var _nextUrl = __webpack_require__(3062);
-      var _utils = __webpack_require__(88);
-      var _error = __webpack_require__(4524);
-      var _cookies = __webpack_require__(3868);
+      var _nextUrl = __webpack_require__(4901);
+      var _utils = __webpack_require__(30);
+      var _error = __webpack_require__(8666);
+      var _cookies = __webpack_require__(4570);
       const INTERNALS = Symbol("internal request");
       __webpack_unused_export__ = INTERNALS;
       class NextRequest extends Request {
@@ -3209,7 +3209,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
       /***/
     },
 
-    /***/ 5277: /***/ (
+    /***/ 5165: /***/ (
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -3220,9 +3220,9 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
       __webpack_unused_export__ = {
         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) {
@@ -3331,7 +3331,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
       /***/
     },
 
-    /***/ 7873: /***/ (
+    /***/ 9132: /***/ (
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -3345,7 +3345,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
       __webpack_unused_export__ = isBot;
       exports.Nf = userAgentFromString;
       exports.WE = userAgent;
-      var _uaParserJs = _interopRequireDefault(__webpack_require__(6166));
+      var _uaParserJs = _interopRequireDefault(__webpack_require__(6204));
       function _interopRequireDefault(obj) {
         return obj && obj.__esModule
           ? obj
@@ -3373,7 +3373,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", {
@@ -3490,14 +3490,14 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
       /***/
     },
 
-    /***/ 8352: /***/ (module, exports, __webpack_require__) => {
+    /***/ 9541: /***/ (module, exports, __webpack_require__) => {
       const serverExports = {
-        NextRequest: __webpack_require__(5829) /* .NextRequest */.Im,
-        NextResponse: __webpack_require__(5277) /* .NextResponse */.x,
+        NextRequest: __webpack_require__(5985) /* .NextRequest */.Im,
+        NextResponse: __webpack_require__(5165) /* .NextResponse */.x,
         userAgentFromString: __webpack_require__(
-          7873
+          9132
         ) /* .userAgentFromString */.Nf,
-        userAgent: __webpack_require__(7873) /* .userAgent */.WE
+        userAgent: __webpack_require__(9132) /* .userAgent */.WE
       };
 
       if (typeof URLPattern !== "undefined") {
@@ -3523,7 +3523,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__(2633);
+    /******/ var __webpack_exports__ = __webpack_exec__(3381);
     /******/ (_ENTRIES =
       typeof _ENTRIES === "undefined"
         ? {}

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-9aa09486c441da7a.js"],
-  "/_error": ["static\u002Fchunks\u002Fpages\u002F_error-6c7c229e8db01b88.js"],
-  "/amp": ["static\u002Fchunks\u002Fpages\u002Famp-69f4e2ab5f900eeb.js"],
+  "/": ["static\u002Fchunks\u002Fpages\u002Findex-d30a580d3c17f4d9.js"],
+  "/_error": ["static\u002Fchunks\u002Fpages\u002F_error-a9ef5f835b494eed.js"],
+  "/amp": ["static\u002Fchunks\u002Fpages\u002Famp-0caeab3cd7ed5bbd.js"],
   "/css": [
     "static\u002Fcss\u002F94fdbc56eafa2039.css",
-    "static\u002Fchunks\u002Fpages\u002Fcss-58ed6e8a496a11ae.js"
+    "static\u002Fchunks\u002Fpages\u002Fcss-9ee41d03543021b4.js"
   ],
   "/dynamic": [
-    "static\u002Fchunks\u002Fpages\u002Fdynamic-6a3d4560553c65c8.js"
+    "static\u002Fchunks\u002Fpages\u002Fdynamic-56836b82a5676b9a.js"
   ],
   "/edge-ssr": [
-    "static\u002Fchunks\u002Fpages\u002Fedge-ssr-f41404e93ffdc0de.js"
+    "static\u002Fchunks\u002Fpages\u002Fedge-ssr-5d2cdb3b4a9fabd5.js"
   ],
-  "/head": ["static\u002Fchunks\u002Fpages\u002Fhead-dd42bd14722e3b87.js"],
-  "/hooks": ["static\u002Fchunks\u002Fpages\u002Fhooks-29ca2115d483e3f7.js"],
-  "/image": ["static\u002Fchunks\u002Fpages\u002Fimage-156bb27d90116b58.js"],
-  "/link": ["static\u002Fchunks\u002Fpages\u002Flink-d855e7210058f596.js"],
+  "/head": ["static\u002Fchunks\u002Fpages\u002Fhead-248ef55290815b7c.js"],
+  "/hooks": ["static\u002Fchunks\u002Fpages\u002Fhooks-624e3ee1c369c918.js"],
+  "/image": ["static\u002Fchunks\u002Fpages\u002Fimage-e6910d22a1d38d27.js"],
+  "/link": ["static\u002Fchunks\u002Fpages\u002Flink-2089ce728117e224.js"],
   "/routerDirect": [
-    "static\u002Fchunks\u002Fpages\u002FrouterDirect-3f7b8ebe2866d49e.js"
+    "static\u002Fchunks\u002Fpages\u002FrouterDirect-5c05820a2fc8ec29.js"
   ],
-  "/script": ["static\u002Fchunks\u002Fpages\u002Fscript-91e45d56ed7a0a44.js"],
+  "/script": ["static\u002Fchunks\u002Fpages\u002Fscript-20414a8a58346938.js"],
   "/withRouter": [
-    "static\u002Fchunks\u002Fpages\u002FwithRouter-dc4cb10af8bf3877.js"
+    "static\u002Fchunks\u002Fpages\u002FwithRouter-edc4e76b107d965e.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__(278);
+          return __webpack_require__(1731);
         }
       ]);
       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__(4568);
+      return __webpack_exec__(1113), __webpack_exec__(4888);
     });
     /******/ 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__(6291);
+          return __webpack_require__(5750);
         }
       ]);
       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__(4011);
+      module.exports = __webpack_require__(8082);
 
       /***/
     },
 
-    /***/ 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__(6151);
+          return __webpack_require__(4749);
         }
       ]);
       if (false) {
@@ -28,7 +28,7 @@
       /***/
     },
 
-    /***/ 4011: /***/ function(module, exports, __webpack_require__) {
+    /***/ 8082: /***/ 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__(6339);
-      var _ampMode = __webpack_require__(5536);
+      var _react = _interop_require_default(__webpack_require__(465));
+      var _ampContext = __webpack_require__(4964);
+      var _ampMode = __webpack_require__(8701);
       function useAmp() {
         // Don't assign the context value to a variable to save bytes
         return (0, _ampMode).isInAmpMode(
@@ -61,7 +61,7 @@
       /***/
     },
 
-    /***/ 6151: /***/ function(
+    /***/ 4749: /***/ 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
+        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__(6161);
+          return __webpack_require__(900);
         }
       ]);
       if (false) {
@@ -18,7 +18,7 @@
       /***/
     },
 
-    /***/ 6161: /***/ function(
+    /***/ 900: /***/ function(
       __unused_webpack_module,
       __webpack_exports__,
       __webpack_require__
@@ -26,10 +26,10 @@
       "use strict";
       __webpack_require__.r(__webpack_exports__);
       /* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(
-        3268
+        9701
       );
       /* harmony import */ var _css_module_css__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(
-        4294
+        5725
       );
       /* harmony import */ var _css_module_css__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/ __webpack_require__.n(
         _css_module_css__WEBPACK_IMPORTED_MODULE_1__
@@ -49,14 +49,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__
@@ -71,7 +71,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,
@@ -106,7 +106,7 @@
       /***/
     },
 
-    /***/ 3268: /***/ function(
+    /***/ 9701: /***/ function(
       module,
       __unused_webpack_exports,
       __webpack_require__
@@ -114,7 +114,7 @@
       "use strict";
 
       if (true) {
-        module.exports = __webpack_require__(6205);
+        module.exports = __webpack_require__(1963);
       } else {
       }
 
@@ -127,7 +127,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__(4928);
+          return __webpack_require__(6834);
         }
       ]);
       if (false) {
@@ -18,7 +18,7 @@
       /***/
     },
 
-    /***/ 8043: /***/ function(module, exports, __webpack_require__) {
+    /***/ 2494: /***/ 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__(8665));
+      var _react = _interop_require_default(__webpack_require__(465));
+      var _loadable = _interop_require_default(__webpack_require__(971));
       function dynamic(dynamicOptions, options) {
         let loadableFn = _loadable.default;
         let loadableOptions = {
@@ -127,7 +127,7 @@
       /***/
     },
 
-    /***/ 6153: /***/ function(
+    /***/ 9605: /***/ 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 @@
       /***/
     },
 
-    /***/ 8665: /***/ function(
+    /***/ 971: /***/ 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__(6153);
+      var _react = _interop_require_default(__webpack_require__(465));
+      var _loadableContext = __webpack_require__(9605);
       function resolve(obj) {
         return obj && obj.default ? obj.default : obj;
       }
@@ -404,7 +404,7 @@
       /***/
     },
 
-    /***/ 4928: /***/ function(
+    /***/ 6834: /***/ function(
       __unused_webpack_module,
       __webpack_exports__,
       __webpack_require__
@@ -418,10 +418,10 @@
         /* harmony export */
       });
       /* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(
-        3268
+        9701
       );
       /* harmony import */ var next_dynamic__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(
-        6113
+        2677
       );
       /* harmony import */ var next_dynamic__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/ __webpack_require__.n(
         next_dynamic__WEBPACK_IMPORTED_MODULE_1__
@@ -430,11 +430,11 @@
       const DynamicHello = next_dynamic__WEBPACK_IMPORTED_MODULE_1___default()(
         () =>
           __webpack_require__
-            .e(/* import() */ 296)
-            .then(__webpack_require__.bind(__webpack_require__, 5296)),
+            .e(/* import() */ 753)
+            .then(__webpack_require__.bind(__webpack_require__, 753)),
         {
           loadableGenerated: {
-            webpack: () => [/*require.resolve*/ 5296]
+            webpack: () => [/*require.resolve*/ 753]
           }
         }
       );
@@ -461,7 +461,7 @@
       /***/
     },
 
-    /***/ 6205: /***/ function(
+    /***/ 1963: /***/ function(
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -476,7 +476,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,
@@ -511,7 +511,7 @@
       /***/
     },
 
-    /***/ 3268: /***/ function(
+    /***/ 9701: /***/ function(
       module,
       __unused_webpack_exports,
       __webpack_require__
@@ -519,19 +519,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__(8043);
+      module.exports = __webpack_require__(2494);
 
       /***/
     }
@@ -542,7 +542,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__(6758);
+          return __webpack_require__(8030);
         }
       ]);
       if (false) {
@@ -18,7 +18,7 @@
       /***/
     },
 
-    /***/ 6758: /***/ function(
+    /***/ 8030: /***/ 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__(739);
+          return __webpack_require__(3551);
         }
       ]);
       if (false) {
@@ -18,7 +18,7 @@
       /***/
     },
 
-    /***/ 739: /***/ function(
+    /***/ 3551: /***/ function(
       __unused_webpack_module,
       __webpack_exports__,
       __webpack_require__
@@ -32,10 +32,10 @@
         /* harmony export */
       });
       /* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(
-        3268
+        9701
       );
       /* harmony import */ var next_head__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(
-        8412
+        9046
       );
       /* harmony import */ var next_head__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/ __webpack_require__.n(
         next_head__WEBPACK_IMPORTED_MODULE_1__
@@ -69,7 +69,7 @@
       /***/
     },
 
-    /***/ 6205: /***/ function(
+    /***/ 1963: /***/ function(
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -84,7 +84,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,
@@ -119,7 +119,7 @@
       /***/
     },
 
-    /***/ 3268: /***/ function(
+    /***/ 9701: /***/ function(
       module,
       __unused_webpack_exports,
       __webpack_require__
@@ -127,19 +127,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__(5555);
+      module.exports = __webpack_require__(585);
 
       /***/
     }
@@ -150,7 +150,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__(3022);
+          return __webpack_require__(5662);
         }
       ]);
       if (false) {
@@ -18,7 +18,7 @@
       /***/
     },
 
-    /***/ 3022: /***/ function(
+    /***/ 5662: /***/ function(
       __unused_webpack_module,
       __webpack_exports__,
       __webpack_require__
@@ -26,10 +26,10 @@
       "use strict";
       __webpack_require__.r(__webpack_exports__);
       /* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(
-        3268
+        9701
       );
       /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(
-        2947
+        465
       );
 
       /* harmony default export */ __webpack_exports__["default"] = () => {
@@ -77,7 +77,7 @@
       /***/
     },
 
-    /***/ 6205: /***/ function(
+    /***/ 1963: /***/ function(
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -92,7 +92,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,
@@ -127,7 +127,7 @@
       /***/
     },
 
-    /***/ 3268: /***/ function(
+    /***/ 9701: /***/ function(
       module,
       __unused_webpack_exports,
       __webpack_require__
@@ -135,7 +135,7 @@
       "use strict";
 
       if (true) {
-        module.exports = __webpack_require__(6205);
+        module.exports = __webpack_require__(1963);
       } else {
       }
 
@@ -148,7 +148,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__(6333);
+          return __webpack_require__(7284);
         }
       ]);
       if (false) {
@@ -18,7 +18,7 @@
       /***/
     },
 
-    /***/ 3643: /***/ function(module, exports, __webpack_require__) {
+    /***/ 3007: /***/ function(module, exports, __webpack_require__) {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -34,13 +34,13 @@
       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__(5555));
-      var _imageBlurSvg = __webpack_require__(3607);
-      var _imageConfig = __webpack_require__(5831);
-      var _imageConfigContext = __webpack_require__(229);
-      var _warnOnce = __webpack_require__(6947);
-      var _imageLoader = _interop_require_default(__webpack_require__(9939));
+      var _react = _interop_require_wildcard(__webpack_require__(465));
+      var _head = _interop_require_default(__webpack_require__(585));
+      var _imageBlurSvg = __webpack_require__(5012);
+      var _imageConfig = __webpack_require__(5443);
+      var _imageConfigContext = __webpack_require__(2525);
+      var _warnOnce = __webpack_require__(5746);
+      var _imageLoader = _interop_require_
Post job cleanup.
[command]/usr/bin/git version
git version 2.39.2
Temporarily overriding HOME='/home/runner/work/_temp/c3d024fa-88d5-43cf-aa8a-bc7006f30162' 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: 37b9b83471c68f726dfc7c2d085f8148a729c680

…gSlash

packages/next/src/build/webpack/plugins/next-types-plugin.ts

shuding

Looking great overall, thank you! You need to update the test here as well:

next.js/test/integration/app-types/app-types.test.js

Line 46 in 8a70c48

expect(errorLines).toEqual([17, 18, 19, 20, 21, 22, 23, 24, 25])

DuCanhGH · 2023-02-25T13:04:06Z

@shuding I've updated the expected errorLines accordingly.

Addresses #46378 (comment). During development we collect pages directly from the dev server's watcher, which tracks pages from both node and edge runtimes. Hence here we can ignore the edge server when generating the asset. For build, pages are instead collected from compilation's modules so we need to separate the logic to run in both runtimes' compiler. ## Bug - [ ] Related issues linked using `fixes #number` - [ ] Integration tests added - [ ] Errors have a helpful link attached, see [`contributing.md`](https://github.com/vercel/next.js/blob/canary/contributing.md) ## Feature - [ ] Implements an existing feature request or RFC. Make sure the feature request has been accepted for implementation before opening a PR. - [ ] Related issues linked using `fixes #number` - [ ] [e2e](https://github.com/vercel/next.js/blob/canary/contributing/core/testing.md#writing-tests-for-nextjs) tests added - [ ] Documentation added - [ ] Telemetry added. In case of a feature if it's used or not. - [ ] Errors have a helpful link attached, see [`contributing.md`](https://github.com/vercel/next.js/blob/canary/contributing.md) ## Documentation / Examples - [ ] Make sure the linting passes by running `pnpm build && pnpm lint` - [ ] The "examples guidelines" are followed from [our contributing doc](https://github.com/vercel/next.js/blob/canary/contributing/examples/adding-examples.md)

…46462) This is a follow-up PR of #46378, which overlooked one thing - I forgot to export `createServer` from `next/types/index.d.ts` in `declare module 'next'`. I've also reformatted that part as well, so that it matches Next's coding style. ## Bug - [ ] Related issues linked using `fixes #number` - [ ] Integration tests added - [ ] Errors have a helpful link attached, see [`contributing.md`](https://github.com/vercel/next.js/blob/canary/contributing.md) ## Feature - [ ] Implements an existing feature request or RFC. Make sure the feature request has been accepted for implementation before opening a PR. - [ ] Related issues linked using `fixes #number` - [ ] [e2e](https://github.com/vercel/next.js/blob/canary/contributing/core/testing.md#writing-tests-for-nextjs) tests added - [ ] Documentation added - [ ] Telemetry added. In case of a feature if it's used or not. - [ ] Errors have a helpful link attached, see [`contributing.md`](https://github.com/vercel/next.js/blob/canary/contributing.md) ## Documentation / Examples - [ ] Make sure the linting passes by running `pnpm build && pnpm lint` - [ ] The "examples guidelines" are followed from [our contributing doc](https://github.com/vercel/next.js/blob/canary/contributing/examples/adding-examples.md)

This is yet another follow-up PR of #46378... In my discussion with the author of PR 46457, I figured out that exporting with the .d.ts extension doesn't work in TS < 5.0, which I didn't really notice because my projects were already using TS 5.0 and Next's tests were passing. This PR just deletes the extension from the export path. ## Bug - [ ] Related issues linked using `fixes #number` - [ ] Integration tests added - [ ] Errors have a helpful link attached, see [`contributing.md`](https://github.com/vercel/next.js/blob/canary/contributing.md) ## Feature - [ ] Implements an existing feature request or RFC. Make sure the feature request has been accepted for implementation before opening a PR. - [ ] Related issues linked using `fixes #number` - [ ] [e2e](https://github.com/vercel/next.js/blob/canary/contributing/core/testing.md#writing-tests-for-nextjs) tests added - [ ] Documentation added - [ ] Telemetry added. In case of a feature if it's used or not. - [ ] Errors have a helpful link attached, see [`contributing.md`](https://github.com/vercel/next.js/blob/canary/contributing.md) ## Documentation / Examples - [ ] Make sure the linting passes by running `pnpm build && pnpm lint` - [ ] The "examples guidelines" are followed from [our contributing doc](https://github.com/vercel/next.js/blob/canary/contributing/examples/adding-examples.md)

perf(typedRoutes): replaced readFile + replaceAll with a export *, hi…

Verified

This commit was signed with the committer’s verified signature.

DuCanhGH Ngô Đức Anh

GPG key ID: B5269D3A0E6B6D11

Verified
Learn about vigilant mode

a252b76

…de typedRoutes' utils types

DuCanhGH requested review from timneutkens, ijjk, shuding, huozhi and feedthejim as code owners February 24, 2023 17:23

ijjk added the type: next label Feb 24, 2023

DuCanhGH changed the title ~~perf(typedRoutes): replaced readFile + replaceAll with a export *, hide typedRoutes' utils types~~ fix(typedRoutes): replaced a readFile + replaceAll call with a export *, hid typedRoutes' utils types, fixed duplicates in type Route Feb 24, 2023

DuCanhGH added 5 commits February 25, 2023 01:44

fix: reverted merging edgeRouteTypes and nodeRouteTypes

Verified

This commit was signed with the committer’s verified signature.

DuCanhGH Ngô Đức Anh

GPG key ID: B5269D3A0E6B6D11

Verified
Learn about vigilant mode

cbe3414

Merge branch 'canary' into ducanhgh-perf-typed-routes

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.

GPG key ID: 4AEE18F83AFDEB23
Expired

Verified
Learn about vigilant mode

7114ff1

force re-run tests

Verified

This commit was signed with the committer’s verified signature.

DuCanhGH Ngô Đức Anh

GPG key ID: B5269D3A0E6B6D11

Verified
Learn about vigilant mode

560293d

Merge branch 'canary' into ducanhgh-perf-typed-routes

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.

GPG key ID: 4AEE18F83AFDEB23
Expired

Verified
Learn about vigilant mode

75ac3a3

fix: fixed route groups with typedRoutes on Windows, reverted trailin…

Verified

This commit was signed with the committer’s verified signature.

DuCanhGH Ngô Đức Anh

GPG key ID: B5269D3A0E6B6D11

Verified
Learn about vigilant mode

8a70c48

…gSlash

shuding reviewed Feb 25, 2023

View reviewed changes

packages/next/src/build/webpack/plugins/next-types-plugin.ts Show resolved Hide resolved

shuding reviewed Feb 25, 2023

View reviewed changes

fix(test): updated expected errorLines

Verified

This commit was signed with the committer’s verified signature.

DuCanhGH Ngô Đức Anh

GPG key ID: B5269D3A0E6B6D11

Verified
Learn about vigilant mode

67a38a0

shuding approved these changes Feb 25, 2023

View reviewed changes

kodiakhq bot added 2 commits February 25, 2023 13:49

Merge branch 'canary' into ducanhgh-perf-typed-routes

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.

GPG key ID: 4AEE18F83AFDEB23
Expired

Verified
Learn about vigilant mode

80e4cdb

Merge branch 'canary' into ducanhgh-perf-typed-routes

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.

GPG key ID: 4AEE18F83AFDEB23
Expired

Verified
Learn about vigilant mode

37b9b83

kodiakhq bot merged commit 821c251 into vercel:canary Feb 25, 2023

shuding mentioned this pull request Feb 25, 2023

Fix duplicate link type asset generation #46421

Merged

11 tasks

DuCanhGH deleted the ducanhgh-perf-typed-routes branch February 25, 2023 20:17

DuCanhGH mentioned this pull request Feb 27, 2023

Fix(typedRoutes): export createServer from 'next/types/index.d.ts' #46462

Merged

11 tasks

DuCanhGH mentioned this pull request Feb 27, 2023

Fix(typedRoutes): fixed 'next' imports on TS < 5.0 #46507

Merged

11 tasks

github-actions bot locked as resolved and limited conversation to collaborators Mar 28, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix(typedRoutes): replaced `readFile` + `replaceAll`, hid utils types, fixed duplication in type `Route`, fixed route groups on Windows #46378

Fix(typedRoutes): replaced `readFile` + `replaceAll`, hid utils types, fixed duplication in type `Route`, fixed route groups on Windows #46378

DuCanhGH commented Feb 24, 2023 •

edited

Loading

ijjk commented Feb 24, 2023 •

edited

Loading

ijjk commented Feb 24, 2023 •

edited

Loading

Diffs

shuding left a comment

DuCanhGH commented Feb 25, 2023

Fix(typedRoutes): replaced readFile + replaceAll, hid utils types, fixed duplication in type Route, fixed route groups on Windows #46378

Fix(typedRoutes): replaced readFile + replaceAll, hid utils types, fixed duplication in type Route, fixed route groups on Windows #46378

Conversation

DuCanhGH commented Feb 24, 2023 • edited Loading

Bug

Feature

Documentation / Examples

ijjk commented Feb 24, 2023 • edited Loading

Failing test suites

ijjk commented Feb 24, 2023 • edited Loading

Stats from current PR

Diffs

shuding left a comment

Choose a reason for hiding this comment

DuCanhGH commented Feb 25, 2023

Fix(typedRoutes): replaced `readFile` + `replaceAll`, hid utils types, fixed duplication in type `Route`, fixed route groups on Windows #46378

Fix(typedRoutes): replaced `readFile` + `replaceAll`, hid utils types, fixed duplication in type `Route`, fixed route groups on Windows #46378

DuCanhGH commented Feb 24, 2023 •

edited

Loading

ijjk commented Feb 24, 2023 •

edited

Loading

ijjk commented Feb 24, 2023 •

edited

Loading