Skip to content
New issue

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

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add unique search query for RSC requests to be cacable on CDN #50970

Merged
merged 6 commits into from
Jun 12, 2023
Merged

Add unique search query for RSC requests to be cacable on CDN #50970

merged 6 commits into from
Jun 12, 2023
+110 −22

Conversation

huozhi
Copy link
Member

@huozhi huozhi commented Jun 8, 2023 •
edited
Loading

Adding a _rsc query for RSC payload requests so that they can be differentiated on resources level for CDN cache for the ones that didn't fully respect to VARY header.

Also stripped them for node/edge servers so that they won't show up in the url

x-ref: #49140 (comment)

Closes #49140
Closes NEXT-1268

@ijjk
Copy link
Member

ijjk commented Jun 8, 2023 •
edited
Loading

Failing test suites

Commit: 65220a3

pnpm testheadless test/e2e/app-dir/app-prefetch/prefetching.test.ts

Expand output

● Test suite failed to run

Cannot find module 'next/dist/src/client/components/app-router-headers' from 'e2e/app-dir/app-prefetch/prefetching.test.ts'

   5 | import { NEXT_RSC_UNION_QUERY } from 'next/dist/src/client/components/app-router-headers'
   6 |
>  7 | const browserConfigWithFixedTime = {
     |                           ^
   8 |   beforePageLoad: (page) => {
   9 |     page.addInitScript(() => {
  10 |       const startTime = new Date()

  at Resolver.resolveModule (../node_modules/.pnpm/jest-resolve@27.5.1/node_modules/jest-resolve/build/resolver.js:324:11)
  at Object.<anonymous> (e2e/app-dir/app-prefetch/prefetching.test.ts:7:27)

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

pnpm testheadless test/e2e/app-dir/actions/app-action.test.ts

  • app-dir action handling > fetch actions > should invalidate client cache when path is revalidate
Expand output

● app-dir action handling › fetch actions › should invalidate client cache when path is revalidate

TIMED OUT: success

failure

undefined

  569 |
  570 |   if (hardError) {
> 571 |     throw new Error('TIMED OUT: ' + regex + '\n\n' + content + '\n\n' + lastErr)
      |           ^
  572 |   }
  573 |   return false
  574 | }

  at check (lib/next-test-utils.js:571:11)
  at e2e/app-dir/actions/app-action.test.ts:538:11

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

@ijjk
Copy link
Member

ijjk commented Jun 8, 2023 •
edited
Loading

Stats from current PR

Default Build (Increase detected ⚠️)
General Overall increase ⚠️
vercel/next.js canary vercel/next.js rsc/state-hash-query Change
buildDuration 41.3s 40.8s -476ms
buildDurationCached 14.6s 14.3s -305ms
nodeModulesSize 133 MB 133 MB ⚠️ +12.1 kB
nextStartRea..uration (ms) 526ms 510ms -16ms
Client Bundles (main, webpack) Overall increase ⚠️
vercel/next.js canary vercel/next.js rsc/state-hash-query Change
0d536507-HASH.js gzip 50.5 kB 50.5 kB ⚠️ +1 B
606-HASH.js gzip 24.9 kB 25.1 kB ⚠️ +191 B
9.HASH.js gzip 180 B 181 B ⚠️ +1 B
framework-HASH.js gzip 45.2 kB 45.2 kB ✓
main-app-HASH.js gzip 215 B 210 B -5 B
main-HASH.js gzip 27.7 kB 27.6 kB -25 B
webpack-HASH.js gzip 1.7 kB 1.7 kB ✓
Overall change 150 kB 151 kB ⚠️ +163 B
Legacy Client Bundles (polyfills)
vercel/next.js canary vercel/next.js rsc/state-hash-query Change
polyfills-HASH.js gzip 31 kB 31 kB ✓
Overall change 31 kB 31 kB ✓
Client Pages Overall decrease ✓
vercel/next.js canary vercel/next.js rsc/state-hash-query Change
_app-HASH.js gzip 195 B 194 B -1 B
_error-HASH.js gzip 182 B 182 B ✓
amp-HASH.js gzip 504 B 507 B ⚠️ +3 B
css-HASH.js gzip 320 B 321 B ⚠️ +1 B
dynamic-HASH.js gzip 1.82 kB 1.82 kB -1 B
edge-ssr-HASH.js gzip 256 B 255 B -1 B
head-HASH.js gzip 350 B 351 B ⚠️ +1 B
hooks-HASH.js gzip 369 B 368 B -1 B
image-HASH.js gzip 3.83 kB 3.83 kB -1 B
index-HASH.js gzip 256 B 256 B ✓
link-HASH.js gzip 2.61 kB 2.61 kB -2 B
routerDirect..HASH.js gzip 311 B 311 B ✓
script-HASH.js gzip 385 B 385 B ✓
withRouter-HASH.js gzip 309 B 307 B -2 B
85e02e95b279..7e3.css gzip 107 B 107 B ✓
Overall change 11.8 kB 11.8 kB -4 B
Client Build Manifests Overall increase ⚠️
vercel/next.js canary vercel/next.js rsc/state-hash-query Change
_buildManifest.js gzip 483 B 484 B ⚠️ +1 B
Overall change 483 B 484 B ⚠️ +1 B
Rendered Page Sizes Overall increase ⚠️
vercel/next.js canary vercel/next.js rsc/state-hash-query Change
index.html gzip 510 B 512 B ⚠️ +2 B
link.html gzip 524 B 527 B ⚠️ +3 B
withRouter.html gzip 505 B 507 B ⚠️ +2 B
Overall change 1.54 kB 1.55 kB ⚠️ +7 B
Edge SSR bundle Size Overall increase ⚠️
vercel/next.js canary vercel/next.js rsc/state-hash-query Change
edge-ssr.js gzip 88.5 kB 88.6 kB ⚠️ +46 B
page.js gzip 144 kB 144 kB ⚠️ +148 B
Overall change 233 kB 233 kB ⚠️ +194 B
Middleware size Overall increase ⚠️
vercel/next.js canary vercel/next.js rsc/state-hash-query Change
middleware-b..fest.js gzip 626 B 624 B -2 B
middleware-r..fest.js gzip 150 B 150 B ✓
middleware.js gzip 16.4 kB 16.5 kB ⚠️ +82 B
edge-runtime..pack.js gzip 1.83 kB 1.83 kB ✓
Overall change 19 kB 19.1 kB ⚠️ +80 B

Diffs

Diff for page.js

Diff too large to display

Diff for middleware-b..-manifest.js 
@@ -7,96 +7,96 @@ self.__BUILD_MANIFEST = {
     "static/BUILD_ID/_ssgManifest.js",
   ],
   rootMainFiles: [
-    "static/chunks/webpack-0685181c713574e3.js",
-    "static/chunks/0d536507-6a06815f8ff7065f.js",
-    "static/chunks/606-8d679da8bd5b24fc.js",
-    "static/chunks/main-app-e58e06ec9140a505.js",
+    "static/chunks/webpack-3b60e7fe340eef48.js",
+    "static/chunks/c9a40420-b5d5716af1af5f3f.js",
+    "static/chunks/7-da8fcff7d192a752.js",
+    "static/chunks/main-app-06194fc3fcfda2fd.js",
   ],
   pages: {
     "/": [
-      "static/chunks/webpack-0685181c713574e3.js",
+      "static/chunks/webpack-3b60e7fe340eef48.js",
       "static/chunks/framework-114cbddc60b679b8.js",
-      "static/chunks/main-74d487e15247feb8.js",
-      "static/chunks/pages/index-73e61f551f6942fb.js",
+      "static/chunks/main-c63b6ca6324c9266.js",
+      "static/chunks/pages/index-b27e261de6a98233.js",
     ],
     "/_app": [
-      "static/chunks/webpack-0685181c713574e3.js",
+      "static/chunks/webpack-3b60e7fe340eef48.js",
       "static/chunks/framework-114cbddc60b679b8.js",
-      "static/chunks/main-74d487e15247feb8.js",
-      "static/chunks/pages/_app-4ce47ffa64d5cee5.js",
+      "static/chunks/main-c63b6ca6324c9266.js",
+      "static/chunks/pages/_app-9b05656d2c01065f.js",
     ],
     "/_error": [
-      "static/chunks/webpack-0685181c713574e3.js",
+      "static/chunks/webpack-3b60e7fe340eef48.js",
       "static/chunks/framework-114cbddc60b679b8.js",
-      "static/chunks/main-74d487e15247feb8.js",
-      "static/chunks/pages/_error-dc5dba09656e585f.js",
+      "static/chunks/main-c63b6ca6324c9266.js",
+      "static/chunks/pages/_error-07e6ce9646113e18.js",
     ],
     "/amp": [
-      "static/chunks/webpack-0685181c713574e3.js",
+      "static/chunks/webpack-3b60e7fe340eef48.js",
       "static/chunks/framework-114cbddc60b679b8.js",
-      "static/chunks/main-74d487e15247feb8.js",
-      "static/chunks/pages/amp-adb784fc8419e472.js",
+      "static/chunks/main-c63b6ca6324c9266.js",
+      "static/chunks/pages/amp-5b13834f1a6185c5.js",
     ],
     "/css": [
-      "static/chunks/webpack-0685181c713574e3.js",
+      "static/chunks/webpack-3b60e7fe340eef48.js",
       "static/chunks/framework-114cbddc60b679b8.js",
-      "static/chunks/main-74d487e15247feb8.js",
+      "static/chunks/main-c63b6ca6324c9266.js",
       "static/css/94fdbc56eafa2039.css",
-      "static/chunks/pages/css-9c2929f80dffa841.js",
+      "static/chunks/pages/css-a954fe90a591d776.js",
     ],
     "/dynamic": [
-      "static/chunks/webpack-0685181c713574e3.js",
+      "static/chunks/webpack-3b60e7fe340eef48.js",
       "static/chunks/framework-114cbddc60b679b8.js",
-      "static/chunks/main-74d487e15247feb8.js",
-      "static/chunks/pages/dynamic-b04ed3837db75eab.js",
+      "static/chunks/main-c63b6ca6324c9266.js",
+      "static/chunks/pages/dynamic-5ec40dd0bfe5c9fe.js",
     ],
     "/edge-ssr": [
-      "static/chunks/webpack-0685181c713574e3.js",
+      "static/chunks/webpack-3b60e7fe340eef48.js",
       "static/chunks/framework-114cbddc60b679b8.js",
-      "static/chunks/main-74d487e15247feb8.js",
-      "static/chunks/pages/edge-ssr-f2aa541ccbb5616e.js",
+      "static/chunks/main-c63b6ca6324c9266.js",
+      "static/chunks/pages/edge-ssr-d05e0e6c4b0f8c3c.js",
     ],
     "/head": [
-      "static/chunks/webpack-0685181c713574e3.js",
+      "static/chunks/webpack-3b60e7fe340eef48.js",
       "static/chunks/framework-114cbddc60b679b8.js",
-      "static/chunks/main-74d487e15247feb8.js",
-      "static/chunks/pages/head-e84a0745b30d7800.js",
+      "static/chunks/main-c63b6ca6324c9266.js",
+      "static/chunks/pages/head-84516712a41e8774.js",
     ],
     "/hooks": [
-      "static/chunks/webpack-0685181c713574e3.js",
+      "static/chunks/webpack-3b60e7fe340eef48.js",
       "static/chunks/framework-114cbddc60b679b8.js",
-      "static/chunks/main-74d487e15247feb8.js",
-      "static/chunks/pages/hooks-67dc3793196997cf.js",
+      "static/chunks/main-c63b6ca6324c9266.js",
+      "static/chunks/pages/hooks-098f77b3140ecce8.js",
     ],
     "/image": [
-      "static/chunks/webpack-0685181c713574e3.js",
+      "static/chunks/webpack-3b60e7fe340eef48.js",
       "static/chunks/framework-114cbddc60b679b8.js",
-      "static/chunks/main-74d487e15247feb8.js",
-      "static/chunks/pages/image-d5d3076375c94897.js",
+      "static/chunks/main-c63b6ca6324c9266.js",
+      "static/chunks/pages/image-b01799bff392c04a.js",
     ],
     "/link": [
-      "static/chunks/webpack-0685181c713574e3.js",
+      "static/chunks/webpack-3b60e7fe340eef48.js",
       "static/chunks/framework-114cbddc60b679b8.js",
-      "static/chunks/main-74d487e15247feb8.js",
-      "static/chunks/pages/link-7bb5ea1a5a178db7.js",
+      "static/chunks/main-c63b6ca6324c9266.js",
+      "static/chunks/pages/link-313bef9650226604.js",
     ],
     "/routerDirect": [
-      "static/chunks/webpack-0685181c713574e3.js",
+      "static/chunks/webpack-3b60e7fe340eef48.js",
       "static/chunks/framework-114cbddc60b679b8.js",
-      "static/chunks/main-74d487e15247feb8.js",
-      "static/chunks/pages/routerDirect-35dcdb6a65d3b21f.js",
+      "static/chunks/main-c63b6ca6324c9266.js",
+      "static/chunks/pages/routerDirect-a4371e7bca96e027.js",
     ],
     "/script": [
-      "static/chunks/webpack-0685181c713574e3.js",
+      "static/chunks/webpack-3b60e7fe340eef48.js",
       "static/chunks/framework-114cbddc60b679b8.js",
-      "static/chunks/main-74d487e15247feb8.js",
-      "static/chunks/pages/script-57c7854259c205b6.js",
+      "static/chunks/main-c63b6ca6324c9266.js",
+      "static/chunks/pages/script-eca1edb18604fceb.js",
     ],
     "/withRouter": [
-      "static/chunks/webpack-0685181c713574e3.js",
+      "static/chunks/webpack-3b60e7fe340eef48.js",
       "static/chunks/framework-114cbddc60b679b8.js",
-      "static/chunks/main-74d487e15247feb8.js",
-      "static/chunks/pages/withRouter-f375949da3842a3a.js",
+      "static/chunks/main-c63b6ca6324c9266.js",
+      "static/chunks/pages/withRouter-05b7dc75b1131bd3.js",
     ],
   },
   ampFirstPages: [],
Diff for middleware-r..-manifest.js 
@@ -1,2 +1,2 @@
 self.__REACT_LOADABLE_MANIFEST =
-  '{"dynamic.js -> ../components/hello":{"id":3009,"files":["static/chunks/9.22a9c2a60e684ce9.js"]}}';
+  '{"dynamic.js -> ../components/hello":{"id":3270,"files":["static/chunks/270.30103dece44e845b.js"]}}';
Diff for middleware.js 
@@ -2,7 +2,7 @@
 (self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
   [826],
   {
-    /***/ 2804: /***/ (
+    /***/ 1230: /***/ (
       __unused_webpack_module,
       __webpack_exports__,
       __webpack_require__
@@ -22,7 +22,7 @@
       __webpack_require__.r(middleware_namespaceObject);
       __webpack_require__.d(middleware_namespaceObject, {
         Z: () => middleware,
-      }); // CONCATENATED MODULE: ./node_modules/.pnpm/file+..+main-repo+packages+next+next-packed.tgz_biqbaboplfbrettd7655fr4n2y/node_modules/next/dist/esm/server/web/globals.js
+      }); // CONCATENATED MODULE: ./node_modules/.pnpm/file+..+diff-repo+packages+next+next-packed.tgz_biqbaboplfbrettd7655fr4n2y/node_modules/next/dist/esm/server/web/globals.js
 
       async function registerInstrumentation() {
         if (
@@ -92,7 +92,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
         // Eagerly fire instrumentation hook to make the startup faster.
         void ensureInstrumentationRegistered();
       }
-      enhanceGlobals(); //# sourceMappingURL=globals.js.map // CONCATENATED MODULE: ./node_modules/.pnpm/file+..+main-repo+packages+next+next-packed.tgz_biqbaboplfbrettd7655fr4n2y/node_modules/next/dist/esm/server/web/error.js
+      enhanceGlobals(); //# sourceMappingURL=globals.js.map // 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 }) {
@@ -119,7 +119,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
   Read more: https://nextjs.org/docs/messages/middleware-parse-user-agent
   `);
         }
-      } //# sourceMappingURL=error.js.map // CONCATENATED MODULE: ./node_modules/.pnpm/file+..+main-repo+packages+next+next-packed.tgz_biqbaboplfbrettd7655fr4n2y/node_modules/next/dist/esm/server/web/utils.js
+      } //# sourceMappingURL=error.js.map // CONCATENATED MODULE: ./node_modules/.pnpm/file+..+diff-repo+packages+next+next-packed.tgz_biqbaboplfbrettd7655fr4n2y/node_modules/next/dist/esm/server/web/utils.js
 
       /**
        * Converts a Node.js IncomingHttpHeaders object to a Headers object. Any
@@ -254,7 +254,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
             }
           );
         }
-      } //# sourceMappingURL=utils.js.map // 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
+      } //# sourceMappingURL=utils.js.map // 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
 
       const responseSymbol = Symbol("response");
       const passThroughSymbol = Symbol("passThrough");
@@ -300,7 +300,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
             page: this.sourcePage,
           });
         }
-      } //# sourceMappingURL=fetch-event.js.map // 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
+      } //# sourceMappingURL=fetch-event.js.map // 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
 
       function detectDomainLocale(domainItems, hostname, detectedLocale) {
         if (!domainItems) return;
@@ -326,7 +326,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
             return item;
           }
         }
-      } //# sourceMappingURL=detect-domain-locale.js.map // CONCATENATED MODULE: ./node_modules/.pnpm/file+..+main-repo+packages+next+next-packed.tgz_biqbaboplfbrettd7655fr4n2y/node_modules/next/dist/esm/shared/lib/router/utils/remove-trailing-slash.js
+      } //# sourceMappingURL=detect-domain-locale.js.map // CONCATENATED MODULE: ./node_modules/.pnpm/file+..+diff-repo+packages+next+next-packed.tgz_biqbaboplfbrettd7655fr4n2y/node_modules/next/dist/esm/shared/lib/router/utils/remove-trailing-slash.js
 
       /**
        * Removes the trailing slash for a given route or page path. Preserves the
@@ -336,7 +336,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
        *   - `/` -> `/`
        */ 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
@@ -364,7 +364,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
           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
@@ -375,7 +375,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
         }
         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
@@ -387,7 +387,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
         }
         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
@@ -401,7 +401,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
         }
         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
@@ -420,7 +420,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
         }
         // Add the locale prefix to the path.
         return addPathPrefix(path, "/" + locale);
-      } //# sourceMappingURL=add-locale.js.map // CONCATENATED MODULE: ./node_modules/.pnpm/file+..+main-repo+packages+next+next-packed.tgz_biqbaboplfbrettd7655fr4n2y/node_modules/next/dist/esm/shared/lib/router/utils/format-next-pathname-info.js
+      } //# sourceMappingURL=add-locale.js.map // CONCATENATED MODULE: ./node_modules/.pnpm/file+..+diff-repo+packages+next+next-packed.tgz_biqbaboplfbrettd7655fr4n2y/node_modules/next/dist/esm/shared/lib/router/utils/format-next-pathname-info.js
 
       function formatNextPathnameInfo(info) {
         let pathname = addLocale(
@@ -444,7 +444,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
             ? 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
@@ -464,7 +464,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
           hostname = parsed.hostname;
         } else return;
         return hostname.toLowerCase();
-      } //# sourceMappingURL=get-hostname.js.map // CONCATENATED MODULE: ./node_modules/.pnpm/file+..+main-repo+packages+next+next-packed.tgz_biqbaboplfbrettd7655fr4n2y/node_modules/next/dist/esm/shared/lib/i18n/normalize-locale-path.js
+      } //# sourceMappingURL=get-hostname.js.map // CONCATENATED MODULE: ./node_modules/.pnpm/file+..+diff-repo+packages+next+next-packed.tgz_biqbaboplfbrettd7655fr4n2y/node_modules/next/dist/esm/shared/lib/i18n/normalize-locale-path.js
 
       /**
        * For a pathname that may include a locale from a list of locales, it
@@ -494,7 +494,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
           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
@@ -528,7 +528,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
         // If the path without the prefix doesn't start with a `/` we need to add it
         // back to the path to make sure it's a valid path.
         return "/" + withoutPrefix;
-      } //# sourceMappingURL=remove-path-prefix.js.map // CONCATENATED MODULE: ./node_modules/.pnpm/file+..+main-repo+packages+next+next-packed.tgz_biqbaboplfbrettd7655fr4n2y/node_modules/next/dist/esm/shared/lib/router/utils/get-next-pathname-info.js
+      } //# sourceMappingURL=remove-path-prefix.js.map // CONCATENATED MODULE: ./node_modules/.pnpm/file+..+diff-repo+packages+next+next-packed.tgz_biqbaboplfbrettd7655fr4n2y/node_modules/next/dist/esm/shared/lib/router/utils/get-next-pathname-info.js
 
       function getNextPathnameInfo(pathname, options) {
         var _options_nextConfig;
@@ -579,7 +579,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
               : 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)/;
@@ -806,8 +806,8 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
         }
       } //# 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__(2537); // 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__(1960); // 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");
@@ -883,7 +883,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
         get url() {
           return this[INTERNALS].url;
         }
-      } //# sourceMappingURL=request.js.map // 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
+      } //# sourceMappingURL=request.js.map // 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
 
       const response_INTERNALS = Symbol("internal response");
       const REDIRECTS = new Set([301, 302, 303, 307, 308]);
@@ -982,7 +982,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
             headers,
           });
         }
-      } //# sourceMappingURL=response.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/relativize-url.js
+      } //# sourceMappingURL=response.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/relativize-url.js
 
       /**
        * Given a URL as a string and a base URL it will make the URL relative
@@ -995,7 +995,23 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
         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/client/components/app-router-headers.js
+
+      const RSC = "RSC";
+      const ACTION = "Next-Action";
+      const NEXT_ROUTER_STATE_TREE = "Next-Router-State-Tree";
+      const NEXT_ROUTER_PREFETCH = "Next-Router-Prefetch";
+      const NEXT_URL = "Next-Url";
+      const FETCH_CACHE_HEADER = "x-vercel-sc-headers";
+      const RSC_CONTENT_TYPE_HEADER = "text/x-component";
+      const RSC_VARY_HEADER =
+        RSC + ", " + NEXT_ROUTER_STATE_TREE + ", " + NEXT_ROUTER_PREFETCH;
+      const FLIGHT_PARAMETERS = [
+        [RSC],
+        [NEXT_ROUTER_STATE_TREE],
+        [NEXT_ROUTER_PREFETCH],
+      ];
+      const NEXT_RSC_UNION_QUERY = "_rsc"; //# 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/internal-utils.js
 
       const INTERNAL_QUERY_NAMES = [
         "__nextFallback",
@@ -1003,24 +1019,27 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
         "__nextInferredLocaleFromDefault",
         "__nextDefaultLocale",
         "__nextIsNotFound",
+        NEXT_RSC_UNION_QUERY,
       ];
-      const EXTENDED_INTERNAL_QUERY_NAMES = ["__nextDataReq"];
+      const EDGE_EXTENDED_INTERNAL_QUERY_NAMES = ["__nextDataReq"];
       function stripInternalQueries(query) {
         for (const name of INTERNAL_QUERY_NAMES) {
           delete query[name];
         }
       }
-      function stripInternalSearchParams(searchParams, extended) {
+      function stripInternalSearchParams(url, isEdge) {
+        const isStringUrl = typeof url === "string";
+        const instance = isStringUrl ? new URL(url) : url;
         for (const name of INTERNAL_QUERY_NAMES) {
-          searchParams.delete(name);
+          instance.searchParams.delete(name);
         }
-        if (extended) {
-          for (const name of EXTENDED_INTERNAL_QUERY_NAMES) {
-            searchParams.delete(name);
+        if (isEdge) {
+          for (const name of EDGE_EXTENDED_INTERNAL_QUERY_NAMES) {
+            instance.searchParams.delete(name);
           }
         }
-        return searchParams;
-      } //# sourceMappingURL=internal-utils.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/app-paths.js
+        return isStringUrl ? instance.toString() : instance;
+      } //# sourceMappingURL=internal-utils.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/app-paths.js
 
       /**
        * Normalizes an app route so it represents the actual request path. Essentially
@@ -1071,22 +1090,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
        * 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
-
-      const RSC = "RSC";
-      const ACTION = "Next-Action";
-      const NEXT_ROUTER_STATE_TREE = "Next-Router-State-Tree";
-      const NEXT_ROUTER_PREFETCH = "Next-Router-Prefetch";
-      const NEXT_URL = "Next-Url";
-      const FETCH_CACHE_HEADER = "x-vercel-sc-headers";
-      const RSC_CONTENT_TYPE_HEADER = "text/x-component";
-      const RSC_VARY_HEADER =
-        RSC + ", " + NEXT_ROUTER_STATE_TREE + ", " + NEXT_ROUTER_PREFETCH;
-      const FLIGHT_PARAMETERS = [
-        [RSC],
-        [NEXT_ROUTER_STATE_TREE],
-        [NEXT_ROUTER_PREFETCH],
-      ]; //# sourceMappingURL=app-router-headers.js.map // CONCATENATED MODULE: ./node_modules/.pnpm/file+..+main-repo+packages+next+next-packed.tgz_biqbaboplfbrettd7655fr4n2y/node_modules/next/dist/esm/lib/constants.js
+      } //# sourceMappingURL=app-paths.js.map // CONCATENATED MODULE: ./node_modules/.pnpm/file+..+diff-repo+packages+next+next-packed.tgz_biqbaboplfbrettd7655fr4n2y/node_modules/next/dist/esm/lib/constants.js
 
       const NEXT_QUERY_PARAM_PREFIX = "nxtP";
       const PRERENDER_REVALIDATE_HEADER = "x-prerender-revalidate";
@@ -1190,7 +1194,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
       const WEBPACK_RESOURCE_QUERIES = {
         edgeSSREntry: "__next_edge_ssr_entry__",
         metadata: "__next_metadata__",
-      }; //# sourceMappingURL=constants.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=constants.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) {
@@ -1267,11 +1271,11 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
             }
           }
         }
-        // Strip internal query parameters off the request.
-        stripInternalSearchParams(requestUrl.searchParams, true);
+        const normalizeUrl = false ? 0 : requestUrl;
         const request = new NextRequestHint({
           page: params.page,
-          input: false ? 0 : String(requestUrl),
+          // Strip internal query parameters off the request.
+          input: stripInternalSearchParams(normalizeUrl, true).toString(),
           init: {
             body: params.request.body,
             geo: params.request.geo,
@@ -1418,14 +1422,14 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
           response: finalResponse,
           waitUntil: Promise.all(event[waitUntilSymbol]),
         };
-      } //# sourceMappingURL=adapter.js.map // CONCATENATED MODULE: ./node_modules/.pnpm/file+..+main-repo+packages+next+next-packed.tgz_biqbaboplfbrettd7655fr4n2y/node_modules/next/dist/esm/server/web/exports/next-response.js // CONCATENATED MODULE: ./middleware.js
+      } //# sourceMappingURL=adapter.js.map // CONCATENATED MODULE: ./node_modules/.pnpm/file+..+diff-repo+packages+next+next-packed.tgz_biqbaboplfbrettd7655fr4n2y/node_modules/next/dist/esm/server/web/exports/next-response.js // CONCATENATED MODULE: ./middleware.js
 
       // This file is for modularized imports for next/server to get fully-treeshaking.
       //# sourceMappingURL=next-response.js.map
 
       async function middleware() {
         return NextResponse.next();
-      } // 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-statsiNiGQn%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-statsiNiGQn%2Fstats-app&matchers=!
 
       const handler = middleware_namespaceObject.middleware || middleware;
 
@@ -1448,7 +1452,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
       /***/
     },
 
-    /***/ 2537: /***/ (module) => {
+    /***/ 1960: /***/ (module) => {
       "use strict";
 
       var __defProp = Object.defineProperty;
@@ -1845,7 +1849,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__(2804);
+    /******/ var __webpack_exports__ = __webpack_exec__(1230);
     /******/ (_ENTRIES =
       typeof _ENTRIES === "undefined" ? {} : _ENTRIES).middleware_middleware =
       __webpack_exports__;
Diff for edge-ssr.js

Diff too large to display

Diff for _buildManifest.js 
@@ -1,28 +1,28 @@
 self.__BUILD_MANIFEST = {
   __rewrites: { beforeFiles: [], afterFiles: [], fallback: [] },
-  "/": ["static\u002Fchunks\u002Fpages\u002Findex-73e61f551f6942fb.js"],
-  "/_error": ["static\u002Fchunks\u002Fpages\u002F_error-dc5dba09656e585f.js"],
-  "/amp": ["static\u002Fchunks\u002Fpages\u002Famp-adb784fc8419e472.js"],
+  "/": ["static\u002Fchunks\u002Fpages\u002Findex-b27e261de6a98233.js"],
+  "/_error": ["static\u002Fchunks\u002Fpages\u002F_error-07e6ce9646113e18.js"],
+  "/amp": ["static\u002Fchunks\u002Fpages\u002Famp-5b13834f1a6185c5.js"],
   "/css": [
     "static\u002Fcss\u002F94fdbc56eafa2039.css",
-    "static\u002Fchunks\u002Fpages\u002Fcss-9c2929f80dffa841.js",
+    "static\u002Fchunks\u002Fpages\u002Fcss-a954fe90a591d776.js",
   ],
   "/dynamic": [
-    "static\u002Fchunks\u002Fpages\u002Fdynamic-b04ed3837db75eab.js",
+    "static\u002Fchunks\u002Fpages\u002Fdynamic-5ec40dd0bfe5c9fe.js",
   ],
   "/edge-ssr": [
-    "static\u002Fchunks\u002Fpages\u002Fedge-ssr-f2aa541ccbb5616e.js",
+    "static\u002Fchunks\u002Fpages\u002Fedge-ssr-d05e0e6c4b0f8c3c.js",
   ],
-  "/head": ["static\u002Fchunks\u002Fpages\u002Fhead-e84a0745b30d7800.js"],
-  "/hooks": ["static\u002Fchunks\u002Fpages\u002Fhooks-67dc3793196997cf.js"],
-  "/image": ["static\u002Fchunks\u002Fpages\u002Fimage-d5d3076375c94897.js"],
-  "/link": ["static\u002Fchunks\u002Fpages\u002Flink-7bb5ea1a5a178db7.js"],
+  "/head": ["static\u002Fchunks\u002Fpages\u002Fhead-84516712a41e8774.js"],
+  "/hooks": ["static\u002Fchunks\u002Fpages\u002Fhooks-098f77b3140ecce8.js"],
+  "/image": ["static\u002Fchunks\u002Fpages\u002Fimage-b01799bff392c04a.js"],
+  "/link": ["static\u002Fchunks\u002Fpages\u002Flink-313bef9650226604.js"],
   "/routerDirect": [
-    "static\u002Fchunks\u002Fpages\u002FrouterDirect-35dcdb6a65d3b21f.js",
+    "static\u002Fchunks\u002Fpages\u002FrouterDirect-a4371e7bca96e027.js",
   ],
-  "/script": ["static\u002Fchunks\u002Fpages\u002Fscript-57c7854259c205b6.js"],
+  "/script": ["static\u002Fchunks\u002Fpages\u002Fscript-eca1edb18604fceb.js"],
   "/withRouter": [
-    "static\u002Fchunks\u002Fpages\u002FwithRouter-f375949da3842a3a.js",
+    "static\u002Fchunks\u002Fpages\u002FwithRouter-05b7dc75b1131bd3.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__(4943);
+          return __webpack_require__(7174);
         },
       ]);
       if (false) {
@@ -24,7 +24,7 @@
       return __webpack_require__((__webpack_require__.s = moduleId));
     };
     /******/ __webpack_require__.O(0, [774, 179], function () {
-      return __webpack_exec__(3115), __webpack_exec__(3985);
+      return __webpack_exec__(1113), __webpack_exec__(688);
     });
     /******/ 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__(8567);
+          return __webpack_require__(9911);
         },
       ]);
       if (false) {
@@ -24,7 +24,7 @@
       return __webpack_require__((__webpack_require__.s = moduleId));
     };
     /******/ __webpack_require__.O(0, [888, 774, 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__(4660);
+      module.exports = __webpack_require__(4487);
 
       /***/
     },
 
-    /***/ 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__(6624);
+          return __webpack_require__(6539);
         },
       ]);
       if (false) {
@@ -28,7 +28,7 @@
       /***/
     },
 
-    /***/ 4660: /***/ function (module, exports, __webpack_require__) {
+    /***/ 4487: /***/ function (module, exports, __webpack_require__) {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -44,8 +44,8 @@
       const _react = /*#__PURE__*/ _interop_require_default._(
         __webpack_require__(959)
       );
-      const _ampcontext = __webpack_require__(382);
-      const _ampmode = __webpack_require__(2961);
+      const _ampcontext = __webpack_require__(2882);
+      const _ampmode = __webpack_require__(7069);
       function useAmp() {
         // Don't assign the context value to a variable to save bytes
         return (0, _ampmode.isInAmpMode)(
@@ -67,7 +67,7 @@
       /***/
     },
 
-    /***/ 6624: /***/ function (
+    /***/ 6539: /***/ function (
       __unused_webpack_module,
       __webpack_exports__,
       __webpack_require__
@@ -84,7 +84,7 @@
         /* harmony export */
       });
       /* harmony import */ var next_amp__WEBPACK_IMPORTED_MODULE_0__ =
-        __webpack_require__(8510);
+        __webpack_require__(8753);
       /* harmony import */ var next_amp__WEBPACK_IMPORTED_MODULE_0___default =
         /*#__PURE__*/ __webpack_require__.n(
           next_amp__WEBPACK_IMPORTED_MODULE_0__
@@ -108,7 +108,7 @@
       return __webpack_require__((__webpack_require__.s = moduleId));
     };
     /******/ __webpack_require__.O(0, [888, 774, 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__(1234);
+          return __webpack_require__(8045);
         },
       ]);
       if (false) {
@@ -18,7 +18,7 @@
       /***/
     },
 
-    /***/ 1234: /***/ function (
+    /***/ 8045: /***/ function (
       __unused_webpack_module,
       __webpack_exports__,
       __webpack_require__
@@ -28,7 +28,7 @@
       /* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__ =
         __webpack_require__(1527);
       /* harmony import */ var _css_module_css__WEBPACK_IMPORTED_MODULE_1__ =
-        __webpack_require__(1355);
+        __webpack_require__(1044);
       /* harmony import */ var _css_module_css__WEBPACK_IMPORTED_MODULE_1___default =
         /*#__PURE__*/ __webpack_require__.n(
           _css_module_css__WEBPACK_IMPORTED_MODULE_1__
@@ -48,7 +48,7 @@
       /***/
     },
 
-    /***/ 1355: /***/ function (module) {
+    /***/ 1044: /***/ function (module) {
       // extracted by mini-css-extract-plugin
       module.exports = { helloWorld: "css_helloWorld__qqNwY" };
 
@@ -61,7 +61,7 @@
       return __webpack_require__((__webpack_require__.s = moduleId));
     };
     /******/ __webpack_require__.O(0, [774, 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__(3660);
+          return __webpack_require__(1802);
         },
       ]);
       if (false) {
@@ -18,7 +18,7 @@
       /***/
     },
 
-    /***/ 8988: /***/ function (module, exports, __webpack_require__) {
+    /***/ 2406: /***/ function (module, exports, __webpack_require__) {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -45,7 +45,7 @@
         __webpack_require__(959)
       );
       const _loadable = /*#__PURE__*/ _interop_require_default._(
-        __webpack_require__(3262)
+        __webpack_require__(4114)
       );
       const isServerSide = "object" === "undefined";
       // Normalize loader to return the module as form { default: Component } for `React.lazy`.
@@ -146,7 +146,7 @@
       /***/
     },
 
-    /***/ 1343: /***/ function (
+    /***/ 795: /***/ function (
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -173,7 +173,7 @@
       /***/
     },
 
-    /***/ 3262: /***/ function (
+    /***/ 4114: /***/ function (
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -215,7 +215,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE
       const _react = /*#__PURE__*/ _interop_require_default._(
         __webpack_require__(959)
       );
-      const _loadablecontext = __webpack_require__(1343);
+      const _loadablecontext = __webpack_require__(795);
       function resolve(obj) {
         return obj && obj.default ? obj.default : obj;
       }
@@ -450,7 +450,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE
       /***/
     },
 
-    /***/ 3660: /***/ function (
+    /***/ 1802: /***/ function (
       __unused_webpack_module,
       __webpack_exports__,
       __webpack_require__
@@ -466,7 +466,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE
       /* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__ =
         __webpack_require__(1527);
       /* harmony import */ var next_dynamic__WEBPACK_IMPORTED_MODULE_1__ =
-        __webpack_require__(6113);
+        __webpack_require__(2677);
       /* harmony import */ var next_dynamic__WEBPACK_IMPORTED_MODULE_1___default =
         /*#__PURE__*/ __webpack_require__.n(
           next_dynamic__WEBPACK_IMPORTED_MODULE_1__
@@ -475,11 +475,11 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE
       const DynamicHello = next_dynamic__WEBPACK_IMPORTED_MODULE_1___default()(
         () =>
           __webpack_require__
-            .e(/* import() */ 9)
-            .then(__webpack_require__.bind(__webpack_require__, 3009)),
+            .e(/* import() */ 270)
+            .then(__webpack_require__.bind(__webpack_require__, 3270)),
         {
           loadableGenerated: {
-            webpack: () => [/*require.resolve*/ 3009],
+            webpack: () => [/*require.resolve*/ 3270],
           },
         }
       );
@@ -506,12 +506,12 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE
       /***/
     },
 
-    /***/ 6113: /***/ function (
+    /***/ 2677: /***/ function (
       module,
       __unused_webpack_exports,
       __webpack_require__
     ) {
-      module.exports = __webpack_require__(8988);
+      module.exports = __webpack_require__(2406);
 
       /***/
     },
@@ -522,7 +522,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE
       return __webpack_require__((__webpack_require__.s = moduleId));
     };
     /******/ __webpack_require__.O(0, [774, 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__(3114);
+          return __webpack_require__(7338);
         },
       ]);
       if (false) {
@@ -18,7 +18,7 @@
       /***/
     },
 
-    /***/ 3114: /***/ function (
+    /***/ 7338: /***/ function (
       __unused_webpack_module,
       __webpack_exports__,
       __webpack_require__
@@ -48,7 +48,7 @@
       return __webpack_require__((__webpack_require__.s = moduleId));
     };
     /******/ __webpack_require__.O(0, [888, 774, 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__(6279);
+          return __webpack_require__(9343);
         },
       ]);
       if (false) {
@@ -18,7 +18,7 @@
       /***/
     },
 
-    /***/ 6279: /***/ function (
+    /***/ 9343: /***/ function (
       __unused_webpack_module,
       __webpack_exports__,
       __webpack_require__
@@ -34,7 +34,7 @@
       /* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__ =
         __webpack_require__(1527);
       /* harmony import */ var next_head__WEBPACK_IMPORTED_MODULE_1__ =
-        __webpack_require__(8412);
+        __webpack_require__(9046);
       /* harmony import */ var next_head__WEBPACK_IMPORTED_MODULE_1___default =
         /*#__PURE__*/ __webpack_require__.n(
           next_head__WEBPACK_IMPORTED_MODULE_1__
@@ -68,12 +68,12 @@
       /***/
     },
 
-    /***/ 8412: /***/ function (
+    /***/ 9046: /***/ function (
       module,
       __unused_webpack_exports,
       __webpack_require__
     ) {
-      module.exports = __webpack_require__(7305);
+      module.exports = __webpack_require__(3590);
 
       /***/
     },
@@ -84,7 +84,7 @@
       return __webpack_require__((__webpack_require__.s = moduleId));
     };
     /******/ __webpack_require__.O(0, [774, 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__(8313);
+          return __webpack_require__(1780);
         },
       ]);
       if (false) {
@@ -18,7 +18,7 @@
       /***/
     },
 
-    /***/ 8313: /***/ function (
+    /***/ 1780: /***/ function (
       __unused_webpack_module,
       __webpack_exports__,
       __webpack_require__
@@ -79,7 +79,7 @@
       return __webpack_require__((__webpack_require__.s = moduleId));
     };
     /******/ __webpack_require__.O(0, [774, 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__(8931);
+          return __webpack_require__(974);
         },
       ]);
       if (false) {
@@ -18,7 +18,7 @@
       /***/
     },
 
-    /***/ 3655: /***/ function (module, exports, __webpack_require__) {
+    /***/ 997: /***/ function (module, exports, __webpack_require__) {
       "use strict";
       /* __next_internal_client_entry_do_not_use__  cjs */
       Object.defineProperty(exports, "__esModule", {
@@ -36,14 +36,14 @@
         __webpack_require__(959)
       );
       const _head = /*#__PURE__*/ _interop_require_default._(
-        __webpack_require__(7305)
+        __webpack_require__(3590)
       );
-      const _imageblursvg = __webpack_require__(8700);
-      const _imageconfig = __webpack_require__(2975);
-      const _imageconfigcontext = __webpack_require__(8415);
-      const _warnonce = __webpack_require__(717);
+      const _imageblursvg = __webpack_require__(2185);
+      const _imageconfig = __webpack_require__(4115);
+      const _imageconfigcontext = __webpack_require__(2111);
+      const _warnonce = __webpack_require__(6941);
       const _imageloader = /*#__PURE__*/ _interop_require_default._(
-        __webpack_require__(2019)
+        __webpack_require__(3719)
       );
       const configEnv = {
         deviceSizes: [640, 750, 828, 1080, 1200, 1920, 2048, 3840],
@@ -669,7 +669,7 @@
       /***/
     },
 
-    /***/ 8700: /***/ function (__unused_webpack_module, exports) {
+    /***/ 2185: /***/ function (__unused_webpack_module, exports) {
       "use strict";
       /**
        * A shared function, used on both client and server, to generate a SVG blur placeholder.
@@ -731,7 +731,7 @@
       /***/
     },
 
-    /***/ 2019: /***/ function (__unused_webpack_module, exports) {
+    /***/ 3719: /***/ function (__unused_webpack_module, exports) {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -766,7 +766,7 @@
       /***/
     },
 
-    /***/ 8931: /***/ function (
+    /***/ 974: /***/ function (
       __unused_webpack_module,
       __webpack_exports__,
       __webpack_require__
@@ -787,8 +787,8 @@
 
       // EXTERNAL MODULE: ./node_modules/.pnpm/react@18.2.0/node_modules/react/jsx-runtime.js
       var jsx_runtime = __webpack_require__(1527);
-      // EXTERNAL MODULE: ./node_modules/.pnpm/file+..+main-repo+packages+next+next-packed.tgz_biqbaboplfbrettd7655fr4n2y/node_modules/next/image.js
-      var next_image = __webpack_require__(3960);
+      // EXTERNAL MODULE: ./node_modules/.pnpm/file+..+diff-repo+packages+next+next-packed.tgz_biqbaboplfbrettd7655fr4n2y/node_modules/next/image.js
+      var next_image = __webpack_require__(8249);
       var image_default = /*#__PURE__*/ __webpack_require__.n(next_image); // CONCATENATED MODULE: ./pages/nextjs.png
       /* harmony default export */ var nextjs = {
         src: "/_next/static/media/nextjs.cae0b805.png",
@@ -818,12 +818,12 @@
       /***/
     },
 
-    /***/ 3960: /***/ function (
+    /***/ 8249: /***/ function (
       module,
       __unused_webpack_exports,
       __webpack_require__
     ) {
-      module.exports = __webpack_require__(3655);
+      module.exports = __webpack_require__(997);
 
       /***/
     },
@@ -834,7 +834,7 @@
       return __webpack_require__((__webpack_require__.s = moduleId));
     };
     /******/ __webpack_require__.O(0, [774, 888, 179], function () {
-      return __webpack_exec__(5885);
+      return __webpack_exec__(801);
     });
     /******/ var __webpack_exports__ = __webpack_require__.O();
     /******/ _N_E = __webpack_exports__;
Diff for index-HASH.js 
@@ -1,7 +1,7 @@
 (self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
   [405],
   {
-    /***/ 3558: /***/ function (
+    /***/ 6481: /***/ function (
       __unused_webpack_module,
       __unused_webpack_exports,
       __webpack_require__
@@ -9,7 +9,7 @@
       (window.__NEXT_P = window.__NEXT_P || []).push([
         "/",
         function () {
-          return __webpack_require__(5241);
+          return __webpack_require__(853);
         },
       ]);
       if (false) {
@@ -18,7 +18,7 @@
       /***/
     },
 
-    /***/ 5241: /***/ function (
+    /***/ 853: /***/ function (
       __unused_webpack_module,
       __webpack_exports__,
       __webpack_require__
@@ -44,7 +44,7 @@
       return __webpack_require__((__webpack_require__.s = moduleId));
     };
     /******/ __webpack_require__.O(0, [888, 774, 179], function () {
-      return __webpack_exec__(3558);
+      return __webpack_exec__(6481);
     });
     /******/ var __webpack_exports__ = __webpack_require__.O();
     /******/ _N_E = __webpack_exports__;
Diff for link-HASH.js 
@@ -1,7 +1,7 @@
 (self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
   [644],
   {
-    /***/ 8662: /***/ function (
+    /***/ 7014: /***/ function (
       __unused_webpack_module,
       __unused_webpack_exports,
       __webpack_require__
@@ -9,7 +9,7 @@
       (window.__NEXT_P = window.__NEXT_P || []).push([
         "/link",
         function () {
-          return __webpack_require__(1488);
+          return __webpack_require__(1509);
         },
       ]);
       if (false) {
@@ -18,7 +18,7 @@
       /***/
     },
 
-    /***/ 6994: /***/ function (module, exports) {
+    /***/ 7191: /***/ function (module, exports) {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -86,7 +86,7 @@
       /***/
     },
 
-    /***/ 1310: /***/ function (module, exports) {
+    /***/ 5578: /***/ function (module, exports) {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -121,7 +121,7 @@
       /***/
     },
 
-    /***/ 9213: /***/ function (module, exports, __webpack_require__) {
+    /***/ 3416: /***/ function (module, exports, __webpack_require__) {
       "use strict";
       /* __next_internal_client_entry_do_not_use__  cjs */
       Object.defineProperty(exports, "__esModule", {
@@ -137,17 +137,17 @@
       const _react = /*#__PURE__*/ _interop_require_default._(
         __webpack_require__(959)
       );
-      const _resolvehref = __webpack_require__(5453);
-      const _islocalurl = __webpack_require__(8293);
-      const _formaturl = __webpack_require__(9064);
-      const _utils = __webpack_require__(800);
-      const _addlocale = __webpack_require__(2621);
-      const _routercontext = __webpack_require__(3490);
-      const _approutercontext = __webpack_require__(4822);
-      const _useintersection = __webpack_require__(3261);
-      const _getdomainlocale = __webpack_require__(1310);
-      const _addbasepath = __webpack_require__(9747);
-      const _routerreducertypes = __webpack_require__(6994);
+      const _resolvehref = __webpack_require__(6336);
+      const _islocalurl = __webpack_require__(1087);
+      const _formaturl = __webpack_require__(4574);
+      const _utils = __webpack_require__(161);
+      const _addlocale = __webpack_require__(3144);
+      const _routercontext = __webpack_require__(5113);
+      const _approutercontext = __webpack_require__(8585);
+      const _useintersection = __webpack_require__(3922);
+      const _getdomainlocale = __webpack_require__(5578);
+      const _addbasepath = __webpack_require__(6376);
+      const _routerreducertypes = __webpack_require__(7191);
       const prefetched = new Set();
       function prefetch(router, href, as, options, appOptions, isAppRouter) {
         if (false) {
@@ -561,7 +561,7 @@
       /***/
     },
 
-    /***/ 3261: /***/ function (module, exports, __webpack_require__) {
+    /***/ 3922: /***/ function (module, exports, __webpack_require__) {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -574,7 +574,7 @@
         },
       });
       const _react = __webpack_require__(959);
-      const _requestidlecallback = __webpack_require__(9839);
+      const _requestidlecallback = __webpack_require__(4124);
       const hasIntersectionObserver =
         typeof IntersectionObserver === "function";
       const observers = new Map();
@@ -687,7 +687,7 @@
       /***/
     },
 
-    /***/ 1488: /***/ function (
+    /***/ 1509: /***/ function (
       __unused_webpack_module,
       __webpack_exports__,
       __webpack_require__
@@ -703,7 +703,7 @@
       /* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__ =
         __webpack_require__(1527);
       /* harmony import */ var next_link__WEBPACK_IMPORTED_MODULE_1__ =
-        __webpack_require__(4595);
+        __webpack_require__(9495);
       /* harmony import */ var next_link__WEBPACK_IMPORTED_MODULE_1___default =
         /*#__PURE__*/ __webpack_require__.n(
           next_link__WEBPACK_IMPORTED_MODULE_1__
@@ -734,12 +734,12 @@
       /***/
     },
 
-    /***/ 4595: /***/ function (
+    /***/ 9495: /***/ function (
       module,
       __unused_webpack_exports,
       __webpack_require__
     ) {
-      module.exports = __webpack_require__(9213);
+      module.exports = __webpack_require__(3416);
 
       /***/
     },
@@ -750,7 +750,7 @@
       return __webpack_require__((__webpack_require__.s = moduleId));
     };
     /******/ __webpack_require__.O(0, [774, 888, 179], function () {
-      return __webpack_exec__(8662);
+      return __webpack_exec__(7014);
     });
     /******/ var __webpack_exports__ = __webpack_require__.O();
     /******/ _N_E = __webpack_exports__;
Diff for routerDirect-HASH.js 
@@ -1,7 +1,7 @@
 (self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
   [58],
   {
-    /***/ 2188: /***/ function (
+    /***/ 7288: /***/ function (
       __unused_webpack_module,
       __unused_webpack_exports,
       __webpack_require__
@@ -9,7 +9,7 @@
       (window.__NEXT_P = window.__NEXT_P || []).push([
         "/routerDirect",
         function () {
-          return __webpack_require__(3961);
+          return __webpack_require__(9003);
         },
       ]);
       if (false) {
@@ -18,7 +18,7 @@
       /***/
     },
 
-    /***/ 3961: /***/ function (
+    /***/ 9003: /***/ function (
       __unused_webpack_module,
       __webpack_exports__,
       __webpack_require__
@@ -34,7 +34,7 @@
       /* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__ =
         __webpack_require__(1527);
       /* harmony import */ var next_router__WEBPACK_IMPORTED_MODULE_1__ =
-        __webpack_require__(5866);
+        __webpack_require__(5664);
       /* harmony import */ var next_router__WEBPACK_IMPORTED_MODULE_1___default =
         /*#__PURE__*/ __webpack_require__.n(
           next_router__WEBPACK_IMPORTED_MODULE_1__
@@ -54,12 +54,12 @@
       /***/
     },
 
-    /***/ 5866: /***/ function (
+    /***/ 5664: /***/ function (
       module,
       __unused_webpack_exports,
       __webpack_require__
     ) {
-      module.exports = __webpack_require__(3985);
+      module.exports = __webpack_require__(688);
 
       /***/
     },
@@ -70,7 +70,7 @@
       return __webpack_require__((__webpack_require__.s = moduleId));
     };
     /******/ __webpack_require__.O(0, [774, 888, 179], function () {
-      return __webpack_exec__(2188);
+      return __webpack_exec__(7288);
     });
     /******/ var __webpack_exports__ = __webpack_require__.O();
     /******/ _N_E = __webpack_exports__;
Diff for script-HASH.js 
@@ -1,7 +1,7 @@
 (self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
   [797],
   {
-    /***/ 1136: /***/ function (
+    /***/ 6695: /***/ function (
       __unused_webpack_module,
       __unused_webpack_exports,
       __webpack_require__
@@ -9,7 +9,7 @@
       (wi
Post job cleanup.
[command]/usr/bin/git version
git version 2.40.1
Temporarily overriding HOME='/home/runner/work/_temp/06715713-b305-45f8-acf4-f70aca48897f' 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: 600c013d0ef1ea5cab74f9fd75ef36d3d375808d

@Livog
Copy link

Livog commented Jun 8, 2023

A small question: With the addition of a hash to the RSC request for CDN caching, is it possible to include dynamic elements like cookies or query parameters into when this hash is generated? To provide some context, imagine a page that renders in two different states based on a 'logged in' cookie. Would customizing the hash handle this scenario, or is that where parallel routing would be applied?

@huozhi huozhi force-pushed the rsc/state-hash-query branch from 9638c14 to bc239bc Compare June 8, 2023 16:26
@huozhi
Copy link
Member Author

huozhi commented Jun 8, 2023

@Livog there's a tree state in the header/query, if you logged in differently that value will be different. So it should be covered already

@huozhi huozhi marked this pull request as ready for review June 8, 2023 17:01
@timneutkens
Copy link
Member

imagine a page that renders in two different states based on a 'logged in' cookie. Would customizing the hash handle this scenario, or is that where parallel routing would be applied?

The hash being generated here is for what is rendered on screen at the time the request happens, this ensures CDNs like that don't respect Vary handle it as a unique url. Adding cookies wouldn't work as we can't get all cookies (i.e. httpOnly is the default), this is a concern that the CDN has to solve by having dynamic caching. searchParams are already part of the url as we request the url you provide in next/link with a special header.

timneutkens
timneutkens requested changes Jun 9, 2023
View reviewed changes
Copy link
Member

@timneutkens timneutkens left a comment

Choose a reason for hiding this comment

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

Could you add some tests making sure that you can't read the searchParam in middleware, page.js, and route.js

@huozhi huozhi requested a review from timneutkens June 9, 2023 10:12
huozhi added 4 commits June 9, 2023 14:46
@huozhi
Add unique search query for RSC requests to be cacable on CDN
16cc8e8
@huozhi
lint
38fca8c
@huozhi
strip query
8ea3055
@huozhi
refactor and add more tests

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
GPG key ID: B5690EEEBB952194
Verified
Learn about vigilant mode
2baa005
@huozhi huozhi force-pushed the rsc/state-hash-query branch from d121414 to 2baa005 Compare June 9, 2023 12:47
@timneutkens timneutkens merged commit aa3e043 into canary Jun 12, 2023
@timneutkens timneutkens deleted the rsc/state-hash-query branch June 12, 2023 09:52
@huozhi huozhi mentioned this pull request Jun 12, 2023
Merged
kodiakhq bot pushed a commit that referenced this pull request Jun 12, 2023
@huozhi
Strip _rsc query for navigation between app and page (#51195)
8a11835 
Fix a missing case from #50970

When navigating from app to page, the `_rsc` query should still be stripped
@l-you l-you mentioned this pull request Jul 1, 2023
Closed
1 task
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jul 12, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@shuding shuding

@timneutkens timneutkens

@wyattjoh wyattjoh

@ijjk ijjk

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

Successfully merging this pull request may close these issues.

None yet
5 participants
@huozhi @ijjk @Livog @timneutkens @shuding