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.

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

Stop overriding the user's TS config with defaults during next build #45670

Merged
merged 13 commits into from
Feb 15, 2023
Merged

Stop overriding the user's TS config with defaults during next build #45670

merged 13 commits into from
Feb 15, 2023

Conversation

qrohlf
Copy link
Contributor

@qrohlf qrohlf commented Feb 7, 2023

Bug

The next build command is silently overriding the user's tsconfig when it shouldn't be; this results in mismatched behavior between tsc --noEmit and yarn build and user confusion.

For example, a configuration option like "moduleResolution": "nodenext", which is preserved and respected by next dev, will be silently overridden to "moduleResolution": "node" during next build.

This change:

Details

Next has a concept of both defaults and permitted options when modifying/validating the user's tsconfig. The user's config is only modified if it does not match the permitted options. This means that if the user has specified a permitted value like "moduleResolution": "nodenext", it will not be overwritten in the user's config file.

However, there was some logic in runTypeCheck.ts that did not adequately capture this nuance – instead, it spread all of the defaults into the tsconfig it was building before running typecheck, which meant that if a user had specified an option that was permitted but non-default, it would be overwritten, silently, during yarn build only.

Because Next is already (1) rewriting the TSconfig in writeConfigurationDefaults when the user's config doesn't line up with what we're expecting and (2) verifying the user's TSConfig remains correct (in verifyTypeScriptSetup) during a next build, I believe that it is safe to remove this config-steamrolling behavior.

Documentation / Examples

I believe this is strictly a bugfix; it updates the behavior of next build to conform to the same configuration behavior exhibited by tsc --noEmit and next dev. Since this is already the user expectation, it should not require documentation changes.

@ijjk ijjk added the type: next label Feb 7, 2023
@qrohlf qrohlf changed the title Stop overwriting the user's TS config when doing a typecheck Stop overriding the user's TS config with defaults during next build Feb 7, 2023
@jankaifer
Copy link
Contributor

Thanks for the PR.

@ijjk
Copy link
Member

ijjk commented Feb 9, 2023

Failing test suites

Commit: b4c57fc

pnpm testheadless test/integration/build-trace-extra-entries-turbo/test/index.test.js

  • build trace with extra entries > should build and trace correctly
Expand output

● build trace with extra entries › should build and trace correctly

thrown: "Exceeded timeout of 90000 ms for a test.
Use jest.setTimeout(newTimeout) to increase the timeout value, if this is a long-running test."

   8 |
   9 | describe('build trace with extra entries', () => {
> 10 |   it('should build and trace correctly', async () => {
     |   ^
  11 |     const result = await nextBuild(appDir, undefined, {
  12 |       cwd: appDir,
  13 |       stderr: true,

  at integration/build-trace-extra-entries-turbo/test/index.test.js:10:3
  at Object.<anonymous> (integration/build-trace-extra-entries-turbo/test/index.test.js:9:1)

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

pnpm testheadless test/integration/turbotrace-with-webpack-worker/test/index.test.js

  • build trace with extra entries > should build and trace correctly
Expand output

● build trace with extra entries › should build and trace correctly

thrown: "Exceeded timeout of 90000 ms for a test.
Use jest.setTimeout(newTimeout) to increase the timeout value, if this is a long-running test."

   8 |
   9 | describe('build trace with extra entries', () => {
> 10 |   it('should build and trace correctly', async () => {
     |   ^
  11 |     const result = await nextBuild(appDir, undefined, {
  12 |       cwd: appDir,
  13 |       stderr: true,

  at integration/turbotrace-with-webpack-worker/test/index.test.js:10:3
  at Object.<anonymous> (integration/turbotrace-with-webpack-worker/test/index.test.js:9:1)

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

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

  • basic HMR, basePath: "/docs" > Error Recovery > should recover after webpack parse error in an imported file
Expand output

● basic HMR, basePath: "/docs" › Error Recovery › should recover after webpack parse error in an imported file

expect(received).toMatchInlineSnapshot(snapshot)

Snapshot name: `basic HMR, basePath: "/docs" Error Recovery should recover after webpack parse error in an imported file 2`

- Snapshot  - 3
+ Received  + 0

@@ -4,8 +4,5 @@
  | This
  | is
  > }}}
  | invalid
  | js
-
- Import trace for requested module:
- ./components/parse-error.xyz

  756 |             `"Failed to compile"`
  757 |           )
> 758 |           expect(await getRedboxSource(browser)).toMatchInlineSnapshot(`
      |                                                  ^
  759 |           "./components/parse-error.xyz
  760 |           Module parse failed: Unexpected token (3:0)
  761 |           You may need an appropriate loader to handle this file type, currently no loaders are configured to process this file. See https://webpack.js.org/concepts#loaders

  at Object.<anonymous> (development/basic/hmr.test.ts:758:50)

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

pnpm testheadless test/integration/telemetry/test/index.test.js

  • Telemetry CLI > emits telemetry for usage of swc
Expand output

● Telemetry CLI › emits telemetry for usage of swc

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

Expected: ArrayContaining [{"featureName": "swcLoader", "invocationCount": 1}, {"featureName": "swcMinify", "invocationCount": 1}, {"featureName": "swcRelay", "invocationCount": 1}, {"featureName": "swcStyledComponents", "invocationCount": 1}, {"featureName": "swcReactRemoveProperties", "invocationCount": 1}, {"featureName": "swcExperimentalDecorators", "invocationCount": 1}, {"featureName": "swcRemoveConsole", "invocationCount": 1}, {"featureName": "swcImportSource", "invocationCount": 0}]
Received: [{"featureName": "build-lint", "invocationCount": 1}, {"featureName": "vercelImageGeneration", "invocationCount": 1}, {"featureName": "vercelImageGeneration", "invocationCount": 0}]

  925 |       'NEXT_BUILD_FEATURE_USAGE'
  926 |     )
> 927 |     expect(featureUsageEvents).toEqual(
      |                                ^
  928 |       expect.arrayContaining([
  929 |         {
  930 |           featureName: 'swcLoader',

  at Object.<anonymous> (integration/telemetry/test/index.test.js:927:32)

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

@ijjk
Copy link
Member

ijjk commented Feb 9, 2023

Stats from current PR

Default Build (Increase detected ⚠️)
General Overall decrease ✓
vercel/next.js canary qrohlf/next.js qr/fix-build-module-resolution Change
buildDuration 36.6s 36.7s ⚠️ +107ms
buildDurationCached 9.8s 9.7s -61ms
nodeModulesSize 105 MB 105 MB
nextStartRea..uration (ms) 288ms 282ms -6ms
Client Bundles (main, webpack) Overall decrease ✓
vercel/next.js canary qrohlf/next.js qr/fix-build-module-resolution Change
246.HASH.js gzip 181 B 181 B
843-HASH.js gzip 65.8 kB 65.8 kB -2 B
main-app-HASH.js gzip 205 B 204 B -1 B
main-HASH.js gzip 79 kB 79 kB -1 B
webpack-HASH.js gzip 1.7 kB 1.7 kB ⚠️ +1 B
Overall change 147 kB 147 kB -3 B
Legacy Client Bundles (polyfills)
vercel/next.js canary qrohlf/next.js qr/fix-build-module-resolution Change
polyfills-HASH.js gzip 31 kB 31 kB
Overall change 31 kB 31 kB
Client Pages Overall decrease ✓
vercel/next.js canary qrohlf/next.js qr/fix-build-module-resolution Change
_app-HASH.js gzip 192 B 192 B
_error-HASH.js gzip 179 B 178 B -1 B
amp-HASH.js gzip 482 B 483 B ⚠️ +1 B
css-HASH.js gzip 801 B 804 B ⚠️ +3 B
dynamic-HASH.js gzip 2.27 kB 2.27 kB -2 B
edge-ssr-HASH.js gzip 259 B 258 B -1 B
head-HASH.js gzip 830 B 828 B -2 B
hooks-HASH.js gzip 850 B 848 B -2 B
image-HASH.js gzip 4.33 kB 4.32 kB -2 B
index-HASH.js gzip 253 B 253 B
link-HASH.js gzip 2.73 kB 2.73 kB -4 B
routerDirect..HASH.js gzip 781 B 781 B
script-HASH.js gzip 859 B 856 B -3 B
withRouter-HASH.js gzip 781 B 781 B
85e02e95b279..7e3.css gzip 107 B 107 B
Overall change 15.7 kB 15.7 kB -13 B
Client Build Manifests Overall decrease ✓
vercel/next.js canary qrohlf/next.js qr/fix-build-module-resolution Change
_buildManifest.js gzip 485 B 484 B -1 B
Overall change 485 B 484 B -1 B
Rendered Page Sizes Overall increase ⚠️
vercel/next.js canary qrohlf/next.js qr/fix-build-module-resolution Change
index.html gzip 489 B 489 B
link.html gzip 505 B 505 B
withRouter.html gzip 484 B 485 B ⚠️ +1 B
Overall change 1.48 kB 1.48 kB ⚠️ +1 B
Edge SSR bundle Size Overall increase ⚠️
vercel/next.js canary qrohlf/next.js qr/fix-build-module-resolution Change
edge-ssr.js gzip 114 kB 114 kB ⚠️ +1 B
page.js gzip 81.7 kB 81.7 kB ⚠️ +9 B
Overall change 195 kB 195 kB ⚠️ +10 B
Middleware size Overall decrease ✓
vercel/next.js canary qrohlf/next.js qr/fix-build-module-resolution Change
middleware-b..fest.js gzip 589 B 585 B -4 B
middleware-r..fest.js gzip 145 B 144 B -1 B
middleware.js gzip 27.3 kB 27.3 kB ⚠️ +2 B
edge-runtime..pack.js gzip 1.83 kB 1.83 kB
Overall change 29.9 kB 29.9 kB -3 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-778ee737b42dbd09.js",
-    "static/chunks/843-b24ac64ba39febde.js",
-    "static/chunks/main-app-0561313b575e1704.js"
+    "static/chunks/webpack-078d588fd47873c4.js",
+    "static/chunks/983-787ca3ff0afe6578.js",
+    "static/chunks/main-app-851862c20544c698.js"
   ],
   pages: {
     "/": [
-      "static/chunks/webpack-778ee737b42dbd09.js",
-      "static/chunks/main-d8a838f274d4c255.js",
-      "static/chunks/pages/index-72f4ed6964652f6a.js"
+      "static/chunks/webpack-078d588fd47873c4.js",
+      "static/chunks/main-29f9a96175890b2e.js",
+      "static/chunks/pages/index-a1c4d9d8497dbefb.js"
     ],
     "/_app": [
-      "static/chunks/webpack-778ee737b42dbd09.js",
-      "static/chunks/main-d8a838f274d4c255.js",
-      "static/chunks/pages/_app-02fdba2e11c62c3b.js"
+      "static/chunks/webpack-078d588fd47873c4.js",
+      "static/chunks/main-29f9a96175890b2e.js",
+      "static/chunks/pages/_app-b68f71a961b48916.js"
     ],
     "/_error": [
-      "static/chunks/webpack-778ee737b42dbd09.js",
-      "static/chunks/main-d8a838f274d4c255.js",
-      "static/chunks/pages/_error-c6d6c7c386122218.js"
+      "static/chunks/webpack-078d588fd47873c4.js",
+      "static/chunks/main-29f9a96175890b2e.js",
+      "static/chunks/pages/_error-a22ef5f48ba8184b.js"
     ],
     "/amp": [
-      "static/chunks/webpack-778ee737b42dbd09.js",
-      "static/chunks/main-d8a838f274d4c255.js",
-      "static/chunks/pages/amp-b62e7c28809c13e0.js"
+      "static/chunks/webpack-078d588fd47873c4.js",
+      "static/chunks/main-29f9a96175890b2e.js",
+      "static/chunks/pages/amp-eaaa44ffdc03cc2c.js"
     ],
     "/css": [
-      "static/chunks/webpack-778ee737b42dbd09.js",
-      "static/chunks/main-d8a838f274d4c255.js",
+      "static/chunks/webpack-078d588fd47873c4.js",
+      "static/chunks/main-29f9a96175890b2e.js",
       "static/css/94fdbc56eafa2039.css",
-      "static/chunks/pages/css-b240b12762431318.js"
+      "static/chunks/pages/css-92fbf8fdda39f165.js"
     ],
     "/dynamic": [
-      "static/chunks/webpack-778ee737b42dbd09.js",
-      "static/chunks/main-d8a838f274d4c255.js",
-      "static/chunks/pages/dynamic-dbb2ff3d32b913f9.js"
+      "static/chunks/webpack-078d588fd47873c4.js",
+      "static/chunks/main-29f9a96175890b2e.js",
+      "static/chunks/pages/dynamic-e47195a0fa3d3ead.js"
     ],
     "/edge-ssr": [
-      "static/chunks/webpack-778ee737b42dbd09.js",
-      "static/chunks/main-d8a838f274d4c255.js",
-      "static/chunks/pages/edge-ssr-a57e88de1ff426bd.js"
+      "static/chunks/webpack-078d588fd47873c4.js",
+      "static/chunks/main-29f9a96175890b2e.js",
+      "static/chunks/pages/edge-ssr-18640e2c6cb99ab4.js"
     ],
     "/head": [
-      "static/chunks/webpack-778ee737b42dbd09.js",
-      "static/chunks/main-d8a838f274d4c255.js",
-      "static/chunks/pages/head-b5894c626904a778.js"
+      "static/chunks/webpack-078d588fd47873c4.js",
+      "static/chunks/main-29f9a96175890b2e.js",
+      "static/chunks/pages/head-f756eefe15b9eed2.js"
     ],
     "/hooks": [
-      "static/chunks/webpack-778ee737b42dbd09.js",
-      "static/chunks/main-d8a838f274d4c255.js",
-      "static/chunks/pages/hooks-874b5779f127e436.js"
+      "static/chunks/webpack-078d588fd47873c4.js",
+      "static/chunks/main-29f9a96175890b2e.js",
+      "static/chunks/pages/hooks-74323ca92508884f.js"
     ],
     "/image": [
-      "static/chunks/webpack-778ee737b42dbd09.js",
-      "static/chunks/main-d8a838f274d4c255.js",
-      "static/chunks/pages/image-4a7835c4e7d52fda.js"
+      "static/chunks/webpack-078d588fd47873c4.js",
+      "static/chunks/main-29f9a96175890b2e.js",
+      "static/chunks/pages/image-00185e15271bf249.js"
     ],
     "/link": [
-      "static/chunks/webpack-778ee737b42dbd09.js",
-      "static/chunks/main-d8a838f274d4c255.js",
-      "static/chunks/pages/link-f0e271d62794b8d3.js"
+      "static/chunks/webpack-078d588fd47873c4.js",
+      "static/chunks/main-29f9a96175890b2e.js",
+      "static/chunks/pages/link-5c2ead90a4609e08.js"
     ],
     "/routerDirect": [
-      "static/chunks/webpack-778ee737b42dbd09.js",
-      "static/chunks/main-d8a838f274d4c255.js",
-      "static/chunks/pages/routerDirect-0be908911bf83c00.js"
+      "static/chunks/webpack-078d588fd47873c4.js",
+      "static/chunks/main-29f9a96175890b2e.js",
+      "static/chunks/pages/routerDirect-cdbb1d3e934b20a6.js"
     ],
     "/script": [
-      "static/chunks/webpack-778ee737b42dbd09.js",
-      "static/chunks/main-d8a838f274d4c255.js",
-      "static/chunks/pages/script-fa22c9b29b4b53ec.js"
+      "static/chunks/webpack-078d588fd47873c4.js",
+      "static/chunks/main-29f9a96175890b2e.js",
+      "static/chunks/pages/script-58920c0195960d69.js"
     ],
     "/withRouter": [
-      "static/chunks/webpack-778ee737b42dbd09.js",
-      "static/chunks/main-d8a838f274d4c255.js",
-      "static/chunks/pages/withRouter-9bdea6c06adf2771.js"
+      "static/chunks/webpack-078d588fd47873c4.js",
+      "static/chunks/main-29f9a96175890b2e.js",
+      "static/chunks/pages/withRouter-7121e5a8488cd783.js"
     ]
   },
   ampFirstPages: []
Diff for middleware-r..-manifest.js
@@ -1,6 +1,6 @@
 self.__REACT_LOADABLE_MANIFEST = {
   "dynamic.js -> ../components/hello": {
-    id: 1246,
-    files: ["static/chunks/246.a0afad3905ddc3ff.js"]
+    id: 7363,
+    files: ["static/chunks/363.ab0825baf290f32b.js"]
   }
 };
Diff for middleware.js
@@ -1,7 +1,7 @@
 (self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
   [826],
   {
-    /***/ 5046: /***/ (
+    /***/ 1479: /***/ (
       __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_statsfpzdDL_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) {
@@ -655,7 +655,7 @@
         clone() {
           return new NextURL(String(this), this[Internal].options);
         }
-      } // CONCATENATED MODULE: ./node_modules/.pnpm/file+..+main-repo+packages+next+next-packed.tgz_biqbaboplfbrettd7655fr4n2y/node_modules/next/dist/esm/server/web/spec-extension/cookies/serialize.js
+      } // CONCATENATED MODULE: ./node_modules/.pnpm/file+..+diff-repo+packages+next+next-packed.tgz_biqbaboplfbrettd7655fr4n2y/node_modules/next/dist/esm/server/web/spec-extension/cookies/serialize.js
 
       //# sourceMappingURL=next-url.js.map
       const SAME_SITE = ["strict", "lax", "none"];
@@ -739,7 +739,7 @@
           })
         };
         return compact(cookie);
-      } // CONCATENATED MODULE: ./node_modules/.pnpm/file+..+main-repo+packages+next+next-packed.tgz_biqbaboplfbrettd7655fr4n2y/node_modules/next/dist/esm/server/web/spec-extension/cookies/request-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/cookies/request-cookies.js
 
       //# sourceMappingURL=serialize.js.map
       /**
@@ -832,7 +832,7 @@
             Object.fromEntries(this._parsed)
           )}`;
         }
-      } // CONCATENATED MODULE: ./node_modules/.pnpm/file+..+main-repo+packages+next+next-packed.tgz_biqbaboplfbrettd7655fr4n2y/node_modules/next/dist/esm/server/web/spec-extension/cookies/response-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/cookies/response-cookies.js
 
       //# sourceMappingURL=request-cookies.js.map
       function replace(bag, headers) {
@@ -927,7 +927,7 @@
             Object.fromEntries(this._parsed)
           )}`;
         }
-      } // CONCATENATED MODULE: ./node_modules/.pnpm/file+..+main-repo+packages+next+next-packed.tgz_biqbaboplfbrettd7655fr4n2y/node_modules/next/dist/esm/server/web/spec-extension/cookies/index.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
+      } // CONCATENATED MODULE: ./node_modules/.pnpm/file+..+diff-repo+packages+next+next-packed.tgz_biqbaboplfbrettd7655fr4n2y/node_modules/next/dist/esm/server/web/spec-extension/cookies/index.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=response-cookies.js.map
       //# sourceMappingURL=index.js.map
@@ -1002,7 +1002,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");
@@ -1102,7 +1102,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
       /**
@@ -1116,7 +1116,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",
@@ -1140,7 +1140,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
       /**
@@ -1189,7 +1189,7 @@
       }
       function normalizeRscPath(pathname, enabled) {
         return enabled ? pathname.replace(/\.rsc($|\?)/, "") : 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";
@@ -1202,7 +1202,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) {
@@ -1403,12 +1403,12 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
           enumerable: false,
           configurable: false
         });
-      } // 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-statsfpzdDL%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-statsfpzdDL%2Fstats-app&matchers=!
 
       //# sourceMappingURL=adapter.js.map
       enhanceGlobals();
 
-      var mod = __webpack_require__(1085);
+      var mod = __webpack_require__(8775);
       var handler = mod.middleware || mod.default;
 
       if (typeof handler !== "function") {
@@ -1430,7 +1430,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
       /***/
     },
 
-    /***/ 1085: /***/ (
+    /***/ 8775: /***/ (
       __unused_webpack_module,
       __webpack_exports__,
       __webpack_require__
@@ -1442,7 +1442,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__
@@ -1455,7 +1455,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
       /***/
     },
 
-    /***/ 4989: /***/ (__unused_webpack_module, exports) => {
+    /***/ 8239: /***/ (__unused_webpack_module, exports) => {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -1475,7 +1475,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
       /***/
     },
 
-    /***/ 1962: /***/ (__unused_webpack_module, exports) => {
+    /***/ 7034: /***/ (__unused_webpack_module, exports) => {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -1513,7 +1513,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
       /***/
     },
 
-    /***/ 6450: /***/ (__unused_webpack_module, exports) => {
+    /***/ 4375: /***/ (__unused_webpack_module, exports) => {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -1545,15 +1545,19 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
       /***/
     },
 
-    /***/ 12: /***/ (__unused_webpack_module, exports, __webpack_require__) => {
+    /***/ 9312: /***/ (
+      __unused_webpack_module,
+      exports,
+      __webpack_require__
+    ) => {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
         value: true
       });
       exports.addLocale = addLocale;
-      var _addPathPrefix = __webpack_require__(3120);
-      var _pathHasPrefix = __webpack_require__(3245);
+      var _addPathPrefix = __webpack_require__(623);
+      var _pathHasPrefix = __webpack_require__(3002);
       function addLocale(path, locale, defaultLocale, ignorePrefix) {
         if (
           locale &&
@@ -1573,7 +1577,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
       /***/
     },
 
-    /***/ 3120: /***/ (
+    /***/ 623: /***/ (
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -1584,7 +1588,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
         value: true
       });
       exports.addPathPrefix = addPathPrefix;
-      var _parsePath = __webpack_require__(7718);
+      var _parsePath = __webpack_require__(5655);
       function addPathPrefix(path, prefix) {
         if (!path.startsWith("/") || !prefix) {
           return path;
@@ -1596,7 +1600,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
       /***/
     },
 
-    /***/ 5839: /***/ (
+    /***/ 7928: /***/ (
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -1607,7 +1611,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
         value: true
       });
       exports.addPathSuffix = addPathSuffix;
-      var _parsePath = __webpack_require__(7718);
+      var _parsePath = __webpack_require__(5655);
       function addPathSuffix(path, suffix) {
         if (!path.startsWith("/") || !suffix) {
           return path;
@@ -1619,7 +1623,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
       /***/
     },
 
-    /***/ 9364: /***/ (
+    /***/ 3580: /***/ (
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -1630,10 +1634,10 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
         value: true
       });
       exports.formatNextPathnameInfo = formatNextPathnameInfo;
-      var _removeTrailingSlash = __webpack_require__(9944);
-      var _addPathPrefix = __webpack_require__(3120);
-      var _addPathSuffix = __webpack_require__(5839);
-      var _addLocale = __webpack_require__(12);
+      var _removeTrailingSlash = __webpack_require__(7088);
+      var _addPathPrefix = __webpack_require__(623);
+      var _addPathSuffix = __webpack_require__(7928);
+      var _addLocale = __webpack_require__(9312);
       function formatNextPathnameInfo(info) {
         let pathname = (0, _addLocale).addLocale(
           info.pathname,
@@ -1664,7 +1668,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
       /***/
     },
 
-    /***/ 9551: /***/ (
+    /***/ 1547: /***/ (
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -1675,9 +1679,9 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
         value: true
       });
       exports.getNextPathnameInfo = getNextPathnameInfo;
-      var _normalizeLocalePath = __webpack_require__(6450);
-      var _removePathPrefix = __webpack_require__(4933);
-      var _pathHasPrefix = __webpack_require__(3245);
+      var _normalizeLocalePath = __webpack_require__(4375);
+      var _removePathPrefix = __webpack_require__(5620);
+      var _pathHasPrefix = __webpack_require__(3002);
       function getNextPathnameInfo(pathname, options) {
         var _nextConfig;
         const { basePath, i18n, trailingSlash } =
@@ -1727,7 +1731,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
       /***/
     },
 
-    /***/ 7718: /***/ (__unused_webpack_module, exports) => {
+    /***/ 5655: /***/ (__unused_webpack_module, exports) => {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -1761,7 +1765,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
       /***/
     },
 
-    /***/ 3245: /***/ (
+    /***/ 3002: /***/ (
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -1772,7 +1776,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
         value: true
       });
       exports.pathHasPrefix = pathHasPrefix;
-      var _parsePath = __webpack_require__(7718);
+      var _parsePath = __webpack_require__(5655);
       function pathHasPrefix(path, prefix) {
         if (typeof path !== "string") {
           return false;
@@ -1784,7 +1788,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
       /***/
     },
 
-    /***/ 4933: /***/ (
+    /***/ 5620: /***/ (
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -1795,7 +1799,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
         value: true
       });
       exports.removePathPrefix = removePathPrefix;
-      var _pathHasPrefix = __webpack_require__(3245);
+      var _pathHasPrefix = __webpack_require__(3002);
       function removePathPrefix(path, prefix) {
         if ((0, _pathHasPrefix).pathHasPrefix(path, prefix)) {
           const withoutPrefix = path.slice(prefix.length);
@@ -1809,7 +1813,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
       /***/
     },
 
-    /***/ 9944: /***/ (__unused_webpack_module, exports) => {
+    /***/ 7088: /***/ (__unused_webpack_module, exports) => {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -1823,7 +1827,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__;
       (() => {
@@ -2665,7 +2669,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", {
@@ -2706,7 +2710,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
       /***/
     },
 
-    /***/ 3062: /***/ (
+    /***/ 4901: /***/ (
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -2716,10 +2720,10 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
       Object.defineProperty(exports, "__esModule", {
         value: true
       });
-      var _detectDomainLocale = __webpack_require__(1962);
-      var _formatNextPathnameInfo = __webpack_require__(9364);
-      var _getHostname = __webpack_require__(4989);
-      var _getNextPathnameInfo = __webpack_require__(9551);
+      var _detectDomainLocale = __webpack_require__(7034);
+      var _formatNextPathnameInfo = __webpack_require__(3580);
+      var _getHostname = __webpack_require__(8239);
+      var _getNextPathnameInfo = __webpack_require__(1547);
       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(
@@ -2939,7 +2943,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
       /***/
     },
 
-    /***/ 6915: /***/ (
+    /***/ 4580: /***/ (
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -2961,15 +2965,15 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
           return _responseCookies.ResponseCookies;
         }
       });
-      var _requestCookies = __webpack_require__(6079);
-      var _responseCookies = __webpack_require__(9442);
+      var _requestCookies = __webpack_require__(7205);
+      var _responseCookies = __webpack_require__(9618);
 
       //# sourceMappingURL=index.js.map
 
       /***/
     },
 
-    /***/ 6079: /***/ (
+    /***/ 7205: /***/ (
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -2979,7 +2983,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
       Object.defineProperty(exports, "__esModule", {
         value: true
       });
-      var _serialize = __webpack_require__(8213);
+      var _serialize = __webpack_require__(8477);
       class RequestCookies {
         _parsed = new Map();
         constructor(requestHeaders) {
@@ -3076,7 +3080,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
       /***/
     },
 
-    /***/ 9442: /***/ (
+    /***/ 9618: /***/ (
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -3086,7 +3090,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
       Object.defineProperty(exports, "__esModule", {
         value: true
       });
-      var _serialize = __webpack_require__(8213);
+      var _serialize = __webpack_require__(8477);
       function replace(bag, headers) {
         headers.delete("set-cookie");
         for (const [, value] of bag) {
@@ -3183,7 +3187,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
       /***/
     },
 
-    /***/ 8213: /***/ (__unused_webpack_module, exports) => {
+    /***/ 8477: /***/ (__unused_webpack_module, exports) => {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -3276,7 +3280,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
       /***/
     },
 
-    /***/ 5829: /***/ (
+    /***/ 5985: /***/ (
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -3288,10 +3292,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__(6915);
+      var _nextUrl = __webpack_require__(4901);
+      var _utils = __webpack_require__(30);
+      var _error = __webpack_require__(8666);
+      var _cookies = __webpack_require__(4580);
       const INTERNALS = Symbol("internal request");
       __webpack_unused_export__ = INTERNALS;
       class NextRequest extends Request {
@@ -3372,7 +3376,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
       /***/
     },
 
-    /***/ 5277: /***/ (
+    /***/ 5165: /***/ (
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -3383,9 +3387,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__(6915);
+      var _nextUrl = __webpack_require__(4901);
+      var _utils = __webpack_require__(30);
+      var _cookies = __webpack_require__(4580);
       const INTERNALS = Symbol("internal response");
       const REDIRECTS = new Set([301, 302, 303, 307, 308]);
       function handleMiddlewareField(init, headers) {
@@ -3494,7 +3498,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
       /***/
     },
 
-    /***/ 7873: /***/ (
+    /***/ 9132: /***/ (
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -3508,7 +3512,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
@@ -3536,7 +3540,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", {
@@ -3653,14 +3657,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") {
@@ -3686,7 +3690,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__(5046);
+    /******/ var __webpack_exports__ = __webpack_exec__(1479);
     /******/ (_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-72f4ed6964652f6a.js"],
-  "/_error": ["static\u002Fchunks\u002Fpages\u002F_error-c6d6c7c386122218.js"],
-  "/amp": ["static\u002Fchunks\u002Fpages\u002Famp-b62e7c28809c13e0.js"],
+  "/": ["static\u002Fchunks\u002Fpages\u002Findex-a1c4d9d8497dbefb.js"],
+  "/_error": ["static\u002Fchunks\u002Fpages\u002F_error-a22ef5f48ba8184b.js"],
+  "/amp": ["static\u002Fchunks\u002Fpages\u002Famp-eaaa44ffdc03cc2c.js"],
   "/css": [
     "static\u002Fcss\u002F94fdbc56eafa2039.css",
-    "static\u002Fchunks\u002Fpages\u002Fcss-b240b12762431318.js"
+    "static\u002Fchunks\u002Fpages\u002Fcss-92fbf8fdda39f165.js"
   ],
   "/dynamic": [
-    "static\u002Fchunks\u002Fpages\u002Fdynamic-dbb2ff3d32b913f9.js"
+    "static\u002Fchunks\u002Fpages\u002Fdynamic-e47195a0fa3d3ead.js"
   ],
   "/edge-ssr": [
-    "static\u002Fchunks\u002Fpages\u002Fedge-ssr-a57e88de1ff426bd.js"
+    "static\u002Fchunks\u002Fpages\u002Fedge-ssr-18640e2c6cb99ab4.js"
   ],
-  "/head": ["static\u002Fchunks\u002Fpages\u002Fhead-b5894c626904a778.js"],
-  "/hooks": ["static\u002Fchunks\u002Fpages\u002Fhooks-874b5779f127e436.js"],
-  "/image": ["static\u002Fchunks\u002Fpages\u002Fimage-4a7835c4e7d52fda.js"],
-  "/link": ["static\u002Fchunks\u002Fpages\u002Flink-f0e271d62794b8d3.js"],
+  "/head": ["static\u002Fchunks\u002Fpages\u002Fhead-f756eefe15b9eed2.js"],
+  "/hooks": ["static\u002Fchunks\u002Fpages\u002Fhooks-74323ca92508884f.js"],
+  "/image": ["static\u002Fchunks\u002Fpages\u002Fimage-00185e15271bf249.js"],
+  "/link": ["static\u002Fchunks\u002Fpages\u002Flink-5c2ead90a4609e08.js"],
   "/routerDirect": [
-    "static\u002Fchunks\u002Fpages\u002FrouterDirect-0be908911bf83c00.js"
+    "static\u002Fchunks\u002Fpages\u002FrouterDirect-cdbb1d3e934b20a6.js"
   ],
-  "/script": ["static\u002Fchunks\u002Fpages\u002Fscript-fa22c9b29b4b53ec.js"],
+  "/script": ["static\u002Fchunks\u002Fpages\u002Fscript-58920c0195960d69.js"],
   "/withRouter": [
-    "static\u002Fchunks\u002Fpages\u002FwithRouter-9bdea6c06adf2771.js"
+    "static\u002Fchunks\u002Fpages\u002FwithRouter-7121e5a8488cd783.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__(5791);
+          return __webpack_require__(9203);
         }
       ]);
       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__(8995);
+      return __webpack_exec__(1113), __webpack_exec__(2830);
     });
     /******/ 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__(9437);
+          return __webpack_require__(169);
         }
       ]);
       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__(6146);
+      module.exports = __webpack_require__(893);
 
       /***/
     },
 
-    /***/ 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__(2725);
+          return __webpack_require__(1542);
         }
       ]);
       if (false) {
@@ -28,7 +28,7 @@
       /***/
     },
 
-    /***/ 6146: /***/ function(module, exports, __webpack_require__) {
+    /***/ 893: /***/ 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__(7298);
-      var _ampMode = __webpack_require__(3798);
+      var _react = _interop_require_default(__webpack_require__(465));
+      var _ampContext = __webpack_require__(2218);
+      var _ampMode = __webpack_require__(3734);
       function useAmp() {
         // Don't assign the context value to a variable to save bytes
         return (0, _ampMode).isInAmpMode(
@@ -61,7 +61,7 @@
       /***/
     },
 
-    /***/ 2725: /***/ function(
+    /***/ 1542: /***/ 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__(2998);
+          return __webpack_require__(5892);
         }
       ]);
       if (false) {
@@ -18,7 +18,7 @@
       /***/
     },
 
-    /***/ 2998: /***/ function(
+    /***/ 5892: /***/ 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__(
-        979
+        9993
       );
       /* 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 @@
       /***/
     },
 
-    /***/ 979: /***/ function(module) {
+    /***/ 9993: /***/ 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__(9780);
+          return __webpack_require__(685);
         }
       ]);
       if (false) {
@@ -18,7 +18,7 @@
       /***/
     },
 
-    /***/ 4648: /***/ function(module, exports, __webpack_require__) {
+    /***/ 9809: /***/ 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__(7007));
+      var _react = _interop_require_default(__webpack_require__(465));
+      var _loadable = _interop_require_default(__webpack_require__(7936));
       function dynamic(dynamicOptions, options) {
         let loadableFn = _loadable.default;
         let loadableOptions = {
@@ -127,7 +127,7 @@
       /***/
     },
 
-    /***/ 1446: /***/ function(
+    /***/ 9851: /***/ 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 @@
       /***/
     },
 
-    /***/ 7007: /***/ function(
+    /***/ 7936: /***/ 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__(1446);
+      var _react = _interop_require_default(__webpack_require__(465));
+      var _loadableContext = __webpack_require__(9851);
       function resolve(obj) {
         return obj && obj.default ? obj.default : obj;
       }
@@ -404,7 +404,7 @@
       /***/
     },
 
-    /***/ 9780: /***/ function(
+    /***/ 685: /***/ 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() */ 246)
-            .then(__webpack_require__.bind(__webpack_require__, 1246)),
+            .e(/* import() */ 363)
+            .then(__webpack_require__.bind(__webpack_require__, 7363)),
         {
           loadableGenerated: {
-            webpack: () => [/*require.resolve*/ 1246]
+            webpack: () => [/*require.resolve*/ 7363]
           }
         }
       );
@@ -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__(4648);
+      module.exports = __webpack_require__(9809);
 
       /***/
     }
@@ -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__(5260);
+          return __webpack_require__(699);
         }
       ]);
       if (false) {
@@ -18,7 +18,7 @@
       /***/
     },
 
-    /***/ 5260: /***/ function(
+    /***/ 699: /***/ 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__(6603);
+          return __webpack_require__(8620);
         }
       ]);
       if (false) {
@@ -18,7 +18,7 @@
       /***/
     },
 
-    /***/ 6603: /***/ function(
+    /***/ 8620: /***/ 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__(9461);
+      module.exports = __webpack_require__(2483);
 
       /***/
     }
@@ -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__(8586);
+          return __webpack_require__(708);
         }
       ]);
       if (false) {
@@ -18,7 +18,7 @@
       /***/
     },
 
-    /***/ 8586: /***/ function(
+    /***/ 708: /***/ 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(
      
Post job cleanup.
[command]/usr/bin/git version
git version 2.39.1
Temporarily overriding HOME='/home/runner/work/_temp/03913e11-69ea-4eb8-8baf-222fa865873e' 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: 3c9e01914c8f1ddedcf270698df7084b7e996231

@shuding
Copy link
Member

shuding commented Feb 9, 2023

Do you mind adding a test case for it?

@qrohlf
Copy link
Contributor Author

qrohlf commented Feb 9, 2023

@shuding - sure, this should go in the production tests, right?

@shuding
Copy link
Member

shuding commented Feb 9, 2023

@qrohlf Yes this should be in production test 👍

@qrohlf
Copy link
Contributor Author

qrohlf commented Feb 9, 2023

I'm bumping into microsoft/TypeScript#49083 when I'm trying to fix that failing test/integration/tsconfig-verifier test here.

Basically, NextJS and TS module resolution semantics are incompatible when {module: true} is set in package.json and moduleResolution: "node16" or moduleResolution: "nodeNext" is set in the TSconfig. This incompatibility was previously being masked in the test suite due to #38854. The TS design meeting notes around bundlers is another good look at this problem

I'm not really sure how best to handle this, would love advice? Right now I'm just steamrolling it with @ts-expect-error since as far as I know, there's actually no combination of {module: true} in package.json and {moduleResolution: "node16"} in tsconfig.json that will allow for both typechecking and bundling to succeed. With this combination of options:

const blah2 = import('../value').then((r) => r.default)

will fail typechecking with "Type error: Relative import paths need explicit file extensions in EcmaScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean '../value.js'?"

const blah2 = import('../value.ts').then((r) => r.default)

will fail typechecking with "An import path cannot end with a '.ts' extension. Consider importing '../value.js' instead."

and

const blah2 = import('../value.js').then((r) => r.default)

will fail compilation due to file not found

@qrohlf
Copy link
Contributor Author

qrohlf commented Feb 9, 2023

Note that the real fix for the above is moduleResolution: 'bundler', but that isn't available in TS versions below 5.0: https://devblogs.microsoft.com/typescript/announcing-typescript-5-0-beta/#moduleresolution-bundler

@shuding
Copy link
Member

shuding commented Feb 9, 2023

Yeah I can't think of a good work around for that either. We can't upgrade to TS 5.0 yet so I guess this test looks good for now. Thank you!

shuding
shuding previously approved these changes Feb 9, 2023
@shuding
Copy link
Member

shuding commented Feb 9, 2023

The test case ran into this error:

Failed to create next instance [Error: ENOENT: no such file or directory, stat '/work/test/production/does-not-override-tsconfig-during-build/tsconfig.json'] {
  errno: -2,
  code: 'ENOENT',
  syscall: 'stat',
  path: '/work/test/production/does-not-override-tsconfig-during-build/tsconfig.json'
}

@qrohlf
Copy link
Contributor Author

qrohlf commented Feb 11, 2023

@shuding thanks for the ✅ - I'm aware of the failing test; I want to get a proper regression test for #38854 added to the repo before this merges but it's still a work in progress. Headed out for a long weekend but I'll come back to this on Tuesday and wrap things up.

@qrohlf
Copy link
Contributor Author

qrohlf commented Feb 12, 2023

Got the regression test working, I've confirmed that the test fails (with a TS error during build due to runTypeCheck steamrolling) on the canary branch @ fe8c432, and passes on this branch due to the fixed runTypeCheck.

@qrohlf qrohlf requested a review from shuding February 12, 2023 19:46
@socket-security
Copy link

socket-security bot commented Feb 12, 2023

Socket Security Pull Request Report

👍 No new dependency issues detected in pull request

Pull request report summary
Issue Status
Install scripts ✅ 0 issues
Native code ✅ 0 issues
Bin script confusion ✅ 0 issues
Bin script shell injection ✅ 0 issues
Unresolved require ✅ 0 issues
Invalid package.json ✅ 0 issues
HTTP dependency ✅ 0 issues
Git dependency ✅ 0 issues
Potential typo squat ✅ 0 issues
Known Malware ✅ 0 issues
Telemetry ✅ 0 issues
Protestware/Troll package ✅ 0 issues
Bot Commands

To ignore an alert, reply with a comment starting with @SocketSecurity ignore followed by a space separated list of package-name@version specifiers. e.g. @SocketSecurity ignore foo@1.0.0 bar@2.4.2

Powered by socket.dev

@qrohlf
Copy link
Contributor Author

qrohlf commented Feb 12, 2023

Also; closing the loop on the weird test failures I was seeing locally – they were due to yarn version mismatches. The nextjs repo integration test system uses the globally-installed yarn version on the developer's machine when running yarn next build, which only works correctly if they have Yarn Classic installed and configured as the system default.

Because I have Yarn v3 installed as my default yarn version via corepack, I was getting weird test failures that didn't match up with CI. corepack prepare yarn@v1.22.19 --activate worked to fix, but it might be worth updating your testing docs with a note about this?

I also noticed there was some kind of .devcontainer setup, so the answer might just be "use the devcontainer", but I'm unfamiliar with devcontainers and wasn't sure how to set it up and run tests inside of it.

@qrohlf
Copy link
Contributor Author

qrohlf commented Feb 13, 2023

@shuding I believe the socket security errors are unrelated to the changes in this PR. Would you mind dismissing them if this is the case, and approving another CI run for this branch?

@shuding
Copy link
Member

shuding commented Feb 13, 2023

Hey! Was this happening on the latest canary branch? We are not using yarn but pnpm now:

The nextjs repo integration test system uses the globally-installed yarn version on the developer's machine when running yarn next build

@qrohlf
Copy link
Contributor Author

qrohlf commented Feb 13, 2023

@shuding yes, I started this branch after you folks migrated to pnpm, and also rebased it yesterday. For whatever reason, in my environment the integration tests were running yarn next build in the /tmp/foobar directories they created rather than using pnpm to invoke yarn build.

@qrohlf
Copy link
Contributor Author

qrohlf commented Feb 13, 2023

@shuding looks like your CI is also still using Yarn Classic:

Screenshot 2023-02-13 at 1 37 56 PM

@qrohlf
Copy link
Contributor Author

qrohlf commented Feb 13, 2023

Also, I figured out the other reason tests were failing - your .gitignore is set up to suppress all tsconfig.json files that are a part of tests: 82f28f0

Not sure if that's intentional since it's listed under # test output and tsconfig.json definitely isn't a test output file... maybe someone got tsconfig.json and .tsbuildinfo confused at some point?

Update: It looks like the .gitignore rule for test tsconfigs was introduced in this PR, which doesn't mention a reason for it.

@shuding
Copy link
Member

shuding commented Feb 13, 2023

@qrohlf Thanks for those, very helpful! We'll revert that tsconfig.json change (#45879) and fix yarn usage (#45878).

@shuding shuding mentioned this pull request Feb 13, 2023
11 tasks
@jankaifer
Copy link
Contributor

jankaifer commented Feb 14, 2023

@shuding yes, I started this branch after you folks migrated to pnpm, and also rebased it yesterday. For whatever reason, in my environment the integration tests were running yarn next build in the /tmp/foobar directories they created rather than using pnpm to invoke yarn build.

We actually migrated to pnpm, reverted, and migrated to pnpm again. Will link the relevant PR later.

EDIT: Oh, there was another yarn usage that I have missed.

@qrohlf
Copy link
Contributor Author

qrohlf commented Feb 14, 2023

I looked at the test failures and they all appear unrelated - swc telemetry mismatches and turbotrace timeouts. I'll pull in the latest changes from canary, see if that improves the situation at all?

ijjk pushed a commit that referenced this pull request Feb 15, 2023
As per
#45670 (comment),
it's very necessary to include `tsconfig.json` in our tests as we need
to test specific TS configurations sometimes.

## 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)
@qrohlf
Copy link
Contributor Author

qrohlf commented Feb 15, 2023

@shuding just resolved the merge conflicts now that you merged that .gitignore fix; tests were passing last time they ran – anything else I need to do to get this merged? Or will you folks take it from here?

@shuding
Copy link
Member

shuding commented Feb 15, 2023

@qrohlf Nope I can get it merged, thank you for working on this PR 👍

@shuding shuding merged commit af6c26c into vercel:canary Feb 15, 2023
@qrohlf qrohlf deleted the qr/fix-build-module-resolution branch February 17, 2023 21:37
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Mar 20, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Permitted TypeScript moduleResolution field is silently ignored during build step
4 participants