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

Implement lazy streaming #51330

Open
wants to merge 7 commits into
base: canary
Choose a base branch
from
Open

Implement lazy streaming #51330

wants to merge 7 commits into from

Conversation

jridgewell
Copy link
Contributor

@jridgewell jridgewell commented Jun 15, 2023

What?

This implements a lazy streaming approach to responses, allowing us to handle back-pressure from the client and cancellations during HMR or other navigations. The current approach to streaming is eager, pulling data from the developer's ReadableStream until completion.

Why?

We want to allow API routes to stream data coming from another server (eg, AI services). The responses from these other servers can be long running and expensive. In the case the browser aborts the connection, it's critical that we stop streaming data as soon as possible.

How?

Essentially, it removes uses of for await (…) in favor of stream piping. We've implemented a lazy pipeBodyStreamToResponse that manually iterates a ReadableStream and pushes data into a Readable (while listening for back-pressure and cancellations). And we've used pipeline to implement Readable -> Writable piping (which also handles everything).

The one catch is our use of http-proxy for worker processes. It does not properly detect a client disconnecting (but does handle back-pressure). In order to fix that, I've manually added event listeners to detect the disconnect and cancel the proxied req/res pair.

Fixes WEB-1185
Fixes #50364
Fixes vercel/ai#90

@ijjk ijjk added created-by: Turbopack team PRs by the Turbopack team. type: next labels Jun 15, 2023
@vercel-spaces vercel-spaces bot requested a review from ijjk June 15, 2023 04:19
@ijjk
Copy link
Member

ijjk commented Jun 15, 2023

Stats from current PR

Default Build (Decrease detected ✓)
General Overall decrease ✓
vercel/next.js canary vercel/next.js jrl-lazy-stream Change
buildDuration 36.5s 37.3s ⚠️ +822ms
buildDurationCached 12.4s 12.3s -48ms
nodeModulesSize 134 MB 134 MB -15.2 kB
nextStartRea..uration (ms) 453ms 451ms -2ms
Client Bundles (main, webpack)
vercel/next.js canary vercel/next.js jrl-lazy-stream Change
0d536507-HASH.js gzip 50.5 kB 50.5 kB
518-HASH.js gzip 25.2 kB 25.2 kB -1 B
834.HASH.js gzip 185 B 181 B -4 B
framework-HASH.js gzip 45.2 kB 45.2 kB
main-app-HASH.js gzip 215 B 216 B ⚠️ +1 B
main-HASH.js gzip 27.7 kB 27.7 kB ⚠️ +3 B
webpack-HASH.js gzip 1.7 kB 1.7 kB ⚠️ +1 B
Overall change 151 kB 151 kB
Legacy Client Bundles (polyfills)
vercel/next.js canary vercel/next.js jrl-lazy-stream Change
polyfills-HASH.js gzip 31 kB 31 kB
Overall change 31 kB 31 kB
Client Pages
vercel/next.js canary vercel/next.js jrl-lazy-stream Change
_app-HASH.js gzip 195 B 195 B
_error-HASH.js gzip 182 B 182 B
amp-HASH.js gzip 505 B 505 B
css-HASH.js gzip 319 B 323 B ⚠️ +4 B
dynamic-HASH.js gzip 1.81 kB 1.82 kB ⚠️ +4 B
edge-ssr-HASH.js gzip 256 B 255 B -1 B
head-HASH.js gzip 350 B 349 B -1 B
hooks-HASH.js gzip 369 B 368 B -1 B
image-HASH.js gzip 3.84 kB 3.84 kB ⚠️ +1 B
index-HASH.js gzip 256 B 256 B
link-HASH.js gzip 2.61 kB 2.6 kB -4 B
routerDirect..HASH.js gzip 312 B 312 B
script-HASH.js gzip 385 B 384 B -1 B
withRouter-HASH.js gzip 309 B 308 B -1 B
85e02e95b279..7e3.css gzip 107 B 107 B
Overall change 11.8 kB 11.8 kB
Client Build Manifests Overall decrease ✓
vercel/next.js canary vercel/next.js jrl-lazy-stream Change
_buildManifest.js gzip 482 B 480 B -2 B
Overall change 482 B 480 B -2 B
Rendered Page Sizes Overall increase ⚠️
vercel/next.js canary vercel/next.js jrl-lazy-stream Change
index.html gzip 512 B 513 B ⚠️ +1 B
link.html gzip 526 B 526 B
withRouter.html gzip 507 B 507 B
Overall change 1.54 kB 1.55 kB ⚠️ +1 B
Edge SSR bundle Size Overall decrease ✓
vercel/next.js canary vercel/next.js jrl-lazy-stream Change
edge-ssr.js gzip 88.6 kB 88.6 kB ⚠️ +10 B
page.js gzip 144 kB 144 kB -11 B
Overall change 233 kB 233 kB -1 B
Middleware size Overall increase ⚠️
vercel/next.js canary vercel/next.js jrl-lazy-stream Change
middleware-b..fest.js gzip 622 B 621 B -1 B
middleware-r..fest.js gzip 151 B 150 B -1 B
middleware.js gzip 16.5 kB 16.5 kB ⚠️ +4 B
edge-runtime..pack.js gzip 1.83 kB 1.83 kB
Overall change 19.1 kB 19.1 kB ⚠️ +2 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-a41b19c37c499620.js",
-    "static/chunks/0d536507-6a06815f8ff7065f.js",
-    "static/chunks/518-b4cd2c4530add646.js",
-    "static/chunks/main-app-790c140081634b25.js",
+    "static/chunks/webpack-321866e22c0de08c.js",
+    "static/chunks/c9a40420-b5d5716af1af5f3f.js",
+    "static/chunks/577-17b00c03fe76d43a.js",
+    "static/chunks/main-app-b11722c9e2464407.js",
   ],
   pages: {
     "/": [
-      "static/chunks/webpack-a41b19c37c499620.js",
+      "static/chunks/webpack-321866e22c0de08c.js",
       "static/chunks/framework-114cbddc60b679b8.js",
-      "static/chunks/main-b0d343f98193d8ea.js",
-      "static/chunks/pages/index-121b4e3a7d4a41b9.js",
+      "static/chunks/main-227116650edb4120.js",
+      "static/chunks/pages/index-8a8d226fb007026f.js",
     ],
     "/_app": [
-      "static/chunks/webpack-a41b19c37c499620.js",
+      "static/chunks/webpack-321866e22c0de08c.js",
       "static/chunks/framework-114cbddc60b679b8.js",
-      "static/chunks/main-b0d343f98193d8ea.js",
-      "static/chunks/pages/_app-e08cfdc8873e0cdf.js",
+      "static/chunks/main-227116650edb4120.js",
+      "static/chunks/pages/_app-95503736a2526620.js",
     ],
     "/_error": [
-      "static/chunks/webpack-a41b19c37c499620.js",
+      "static/chunks/webpack-321866e22c0de08c.js",
       "static/chunks/framework-114cbddc60b679b8.js",
-      "static/chunks/main-b0d343f98193d8ea.js",
-      "static/chunks/pages/_error-052de1a2bbb8070c.js",
+      "static/chunks/main-227116650edb4120.js",
+      "static/chunks/pages/_error-f9395761942903ac.js",
     ],
     "/amp": [
-      "static/chunks/webpack-a41b19c37c499620.js",
+      "static/chunks/webpack-321866e22c0de08c.js",
       "static/chunks/framework-114cbddc60b679b8.js",
-      "static/chunks/main-b0d343f98193d8ea.js",
-      "static/chunks/pages/amp-a439d594924c2da2.js",
+      "static/chunks/main-227116650edb4120.js",
+      "static/chunks/pages/amp-e283d382ef96351c.js",
     ],
     "/css": [
-      "static/chunks/webpack-a41b19c37c499620.js",
+      "static/chunks/webpack-321866e22c0de08c.js",
       "static/chunks/framework-114cbddc60b679b8.js",
-      "static/chunks/main-b0d343f98193d8ea.js",
+      "static/chunks/main-227116650edb4120.js",
       "static/css/94fdbc56eafa2039.css",
-      "static/chunks/pages/css-42ba0129f201a67f.js",
+      "static/chunks/pages/css-b02e216aec66c87a.js",
     ],
     "/dynamic": [
-      "static/chunks/webpack-a41b19c37c499620.js",
+      "static/chunks/webpack-321866e22c0de08c.js",
       "static/chunks/framework-114cbddc60b679b8.js",
-      "static/chunks/main-b0d343f98193d8ea.js",
-      "static/chunks/pages/dynamic-d84e71e3f72e4adc.js",
+      "static/chunks/main-227116650edb4120.js",
+      "static/chunks/pages/dynamic-3e2a7b2acb1cc59b.js",
     ],
     "/edge-ssr": [
-      "static/chunks/webpack-a41b19c37c499620.js",
+      "static/chunks/webpack-321866e22c0de08c.js",
       "static/chunks/framework-114cbddc60b679b8.js",
-      "static/chunks/main-b0d343f98193d8ea.js",
-      "static/chunks/pages/edge-ssr-8a1560e68c0e9ccb.js",
+      "static/chunks/main-227116650edb4120.js",
+      "static/chunks/pages/edge-ssr-105fe7862d39e5c8.js",
     ],
     "/head": [
-      "static/chunks/webpack-a41b19c37c499620.js",
+      "static/chunks/webpack-321866e22c0de08c.js",
       "static/chunks/framework-114cbddc60b679b8.js",
-      "static/chunks/main-b0d343f98193d8ea.js",
-      "static/chunks/pages/head-d63a21023a2150a4.js",
+      "static/chunks/main-227116650edb4120.js",
+      "static/chunks/pages/head-0ab60102a7b2518d.js",
     ],
     "/hooks": [
-      "static/chunks/webpack-a41b19c37c499620.js",
+      "static/chunks/webpack-321866e22c0de08c.js",
       "static/chunks/framework-114cbddc60b679b8.js",
-      "static/chunks/main-b0d343f98193d8ea.js",
-      "static/chunks/pages/hooks-aa14272a8daf5970.js",
+      "static/chunks/main-227116650edb4120.js",
+      "static/chunks/pages/hooks-a65405ee9c6e154d.js",
     ],
     "/image": [
-      "static/chunks/webpack-a41b19c37c499620.js",
+      "static/chunks/webpack-321866e22c0de08c.js",
       "static/chunks/framework-114cbddc60b679b8.js",
-      "static/chunks/main-b0d343f98193d8ea.js",
-      "static/chunks/pages/image-abb0c997ad911150.js",
+      "static/chunks/main-227116650edb4120.js",
+      "static/chunks/pages/image-c9b3f831c6775cac.js",
     ],
     "/link": [
-      "static/chunks/webpack-a41b19c37c499620.js",
+      "static/chunks/webpack-321866e22c0de08c.js",
       "static/chunks/framework-114cbddc60b679b8.js",
-      "static/chunks/main-b0d343f98193d8ea.js",
-      "static/chunks/pages/link-46acba9523b9103d.js",
+      "static/chunks/main-227116650edb4120.js",
+      "static/chunks/pages/link-5be5e37285b91bb5.js",
     ],
     "/routerDirect": [
-      "static/chunks/webpack-a41b19c37c499620.js",
+      "static/chunks/webpack-321866e22c0de08c.js",
       "static/chunks/framework-114cbddc60b679b8.js",
-      "static/chunks/main-b0d343f98193d8ea.js",
-      "static/chunks/pages/routerDirect-e928d189b603ec48.js",
+      "static/chunks/main-227116650edb4120.js",
+      "static/chunks/pages/routerDirect-aba5bef1bbf1abb4.js",
     ],
     "/script": [
-      "static/chunks/webpack-a41b19c37c499620.js",
+      "static/chunks/webpack-321866e22c0de08c.js",
       "static/chunks/framework-114cbddc60b679b8.js",
-      "static/chunks/main-b0d343f98193d8ea.js",
-      "static/chunks/pages/script-27102063f13eb116.js",
+      "static/chunks/main-227116650edb4120.js",
+      "static/chunks/pages/script-3456056ab36fef52.js",
     ],
     "/withRouter": [
-      "static/chunks/webpack-a41b19c37c499620.js",
+      "static/chunks/webpack-321866e22c0de08c.js",
       "static/chunks/framework-114cbddc60b679b8.js",
-      "static/chunks/main-b0d343f98193d8ea.js",
-      "static/chunks/pages/withRouter-f4d55d6ffac12232.js",
+      "static/chunks/main-227116650edb4120.js",
+      "static/chunks/pages/withRouter-6eb34338e0848ad4.js",
     ],
   },
   ampFirstPages: [],
Diff for middleware-r..-manifest.js
@@ -1,2 +1,2 @@
 self.__REACT_LOADABLE_MANIFEST =
-  '{"dynamic.js -> ../components/hello":{"id":8834,"files":["static/chunks/834.93f12871874e528c.js"]}}';
+  '{"dynamic.js -> ../components/hello":{"id":1922,"files":["static/chunks/922.456a7d937eef6ac6.js"]}}';
Diff for middleware.js
@@ -2,7 +2,7 @@
 (self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
   [826],
   {
-    /***/ 9492: /***/ (
+    /***/ 9277: /***/ (
       __unused_webpack_module,
       __webpack_exports__,
       __webpack_require__
@@ -22,7 +22,7 @@
       __webpack_require__.r(middleware_namespaceObject);
       __webpack_require__.d(middleware_namespaceObject, {
         default: () => 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 (
@@ -95,7 +95,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 }) {
@@ -122,7 +122,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
@@ -257,7 +257,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");
@@ -303,7 +303,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;
@@ -329,7 +329,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
@@ -339,7 +339,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
@@ -367,7 +367,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
@@ -378,7 +378,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
@@ -390,7 +390,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
@@ -404,7 +404,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
@@ -423,7 +423,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(
@@ -447,7 +447,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
@@ -467,7 +467,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
@@ -497,7 +497,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
@@ -531,7 +531,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;
@@ -582,7 +582,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)/;
@@ -809,8 +809,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");
@@ -886,7 +886,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]);
@@ -985,7 +985,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
@@ -998,7 +998,7 @@ 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/client/components/app-router-headers.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";
@@ -1014,7 +1014,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
         [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+..+main-repo+packages+next+next-packed.tgz_biqbaboplfbrettd7655fr4n2y/node_modules/next/dist/esm/server/internal-utils.js
+      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",
@@ -1042,7 +1042,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
           }
         }
         return isStringUrl ? instance.toString() : instance;
-      } //# 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
+      } //# 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
@@ -1093,7 +1093,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/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";
@@ -1197,7 +1197,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) {
@@ -1425,14 +1425,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-statsdyuDha%2Fstats-app&matchers=&preferredRegion=&middlewareConfig=e30%3D!
+      } // 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-statsdyuDha%2Fstats-app&matchers=&preferredRegion=&middlewareConfig=e30%3D!
 
       const mod = { ...middleware_namespaceObject };
       const handler = mod.middleware || mod.default;
@@ -1456,7 +1456,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
       /***/
     },
 
-    /***/ 2537: /***/ (module) => {
+    /***/ 1960: /***/ (module) => {
       "use strict";
 
       var __defProp = Object.defineProperty;
@@ -1853,7 +1853,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__(9492);
+    /******/ var __webpack_exports__ = __webpack_exec__(9277);
     /******/ (_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-121b4e3a7d4a41b9.js"],
-  "/_error": ["static\u002Fchunks\u002Fpages\u002F_error-052de1a2bbb8070c.js"],
-  "/amp": ["static\u002Fchunks\u002Fpages\u002Famp-a439d594924c2da2.js"],
+  "/": ["static\u002Fchunks\u002Fpages\u002Findex-8a8d226fb007026f.js"],
+  "/_error": ["static\u002Fchunks\u002Fpages\u002F_error-f9395761942903ac.js"],
+  "/amp": ["static\u002Fchunks\u002Fpages\u002Famp-e283d382ef96351c.js"],
   "/css": [
     "static\u002Fcss\u002F94fdbc56eafa2039.css",
-    "static\u002Fchunks\u002Fpages\u002Fcss-42ba0129f201a67f.js",
+    "static\u002Fchunks\u002Fpages\u002Fcss-b02e216aec66c87a.js",
   ],
   "/dynamic": [
-    "static\u002Fchunks\u002Fpages\u002Fdynamic-d84e71e3f72e4adc.js",
+    "static\u002Fchunks\u002Fpages\u002Fdynamic-3e2a7b2acb1cc59b.js",
   ],
   "/edge-ssr": [
-    "static\u002Fchunks\u002Fpages\u002Fedge-ssr-8a1560e68c0e9ccb.js",
+    "static\u002Fchunks\u002Fpages\u002Fedge-ssr-105fe7862d39e5c8.js",
   ],
-  "/head": ["static\u002Fchunks\u002Fpages\u002Fhead-d63a21023a2150a4.js"],
-  "/hooks": ["static\u002Fchunks\u002Fpages\u002Fhooks-aa14272a8daf5970.js"],
-  "/image": ["static\u002Fchunks\u002Fpages\u002Fimage-abb0c997ad911150.js"],
-  "/link": ["static\u002Fchunks\u002Fpages\u002Flink-46acba9523b9103d.js"],
+  "/head": ["static\u002Fchunks\u002Fpages\u002Fhead-0ab60102a7b2518d.js"],
+  "/hooks": ["static\u002Fchunks\u002Fpages\u002Fhooks-a65405ee9c6e154d.js"],
+  "/image": ["static\u002Fchunks\u002Fpages\u002Fimage-c9b3f831c6775cac.js"],
+  "/link": ["static\u002Fchunks\u002Fpages\u002Flink-5be5e37285b91bb5.js"],
   "/routerDirect": [
-    "static\u002Fchunks\u002Fpages\u002FrouterDirect-e928d189b603ec48.js",
+    "static\u002Fchunks\u002Fpages\u002FrouterDirect-aba5bef1bbf1abb4.js",
   ],
-  "/script": ["static\u002Fchunks\u002Fpages\u002Fscript-27102063f13eb116.js"],
+  "/script": ["static\u002Fchunks\u002Fpages\u002Fscript-3456056ab36fef52.js"],
   "/withRouter": [
-    "static\u002Fchunks\u002Fpages\u002FwithRouter-f4d55d6ffac12232.js",
+    "static\u002Fchunks\u002Fpages\u002FwithRouter-6eb34338e0848ad4.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__(7343);
+          return __webpack_require__(1225);
         },
       ]);
       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__(3370);
+      return __webpack_exec__(1113), __webpack_exec__(5979);
     });
     /******/ 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__(8350);
+          return __webpack_require__(5060);
         },
       ]);
       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__(2703);
+      module.exports = __webpack_require__(5507);
 
       /***/
     },
 
-    /***/ 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__(6002);
+          return __webpack_require__(9727);
         },
       ]);
       if (false) {
@@ -28,7 +28,7 @@
       /***/
     },
 
-    /***/ 2703: /***/ function (module, exports, __webpack_require__) {
+    /***/ 5507: /***/ 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__(2592);
-      const _ampmode = __webpack_require__(5761);
+      const _ampcontext = __webpack_require__(3265);
+      const _ampmode = __webpack_require__(290);
       function useAmp() {
         // Don't assign the context value to a variable to save bytes
         return (0, _ampmode.isInAmpMode)(
@@ -67,7 +67,7 @@
       /***/
     },
 
-    /***/ 6002: /***/ function (
+    /***/ 9727: /***/ 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__(2914);
+          return __webpack_require__(2899);
         },
       ]);
       if (false) {
@@ -18,7 +18,7 @@
       /***/
     },
 
-    /***/ 2914: /***/ function (
+    /***/ 2899: /***/ 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__(1827);
+        __webpack_require__(4782);
       /* 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 @@
       /***/
     },
 
-    /***/ 1827: /***/ function (module) {
+    /***/ 4782: /***/ 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__(5);
+          return __webpack_require__(323);
         },
       ]);
       if (false) {
@@ -18,7 +18,7 @@
       /***/
     },
 
-    /***/ 7901: /***/ function (module, exports, __webpack_require__) {
+    /***/ 9772: /***/ 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__(2180)
+        __webpack_require__(9445)
       );
       const isServerSide = "object" === "undefined";
       // Normalize loader to return the module as form { default: Component } for `React.lazy`.
@@ -146,7 +146,7 @@
       /***/
     },
 
-    /***/ 6592: /***/ function (
+    /***/ 2536: /***/ function (
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -173,7 +173,7 @@
       /***/
     },
 
-    /***/ 2180: /***/ function (
+    /***/ 9445: /***/ 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__(6592);
+      const _loadablecontext = __webpack_require__(2536);
       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
       /***/
     },
 
-    /***/ 5: /***/ function (
+    /***/ 323: /***/ 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() */ 834)
-            .then(__webpack_require__.bind(__webpack_require__, 8834)),
+            .e(/* import() */ 922)
+            .then(__webpack_require__.bind(__webpack_require__, 1922)),
         {
           loadableGenerated: {
-            webpack: () => [/*require.resolve*/ 8834],
+            webpack: () => [/*require.resolve*/ 1922],
           },
         }
       );
@@ -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__(7901);
+      module.exports = __webpack_require__(9772);
 
       /***/
     },
@@ -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__(4756);
+          return __webpack_require__(9910);
         },
       ]);
       if (false) {
@@ -18,7 +18,7 @@
       /***/
     },
 
-    /***/ 4756: /***/ function (
+    /***/ 9910: /***/ 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__(9350);
+          return __webpack_require__(7773);
         },
       ]);
       if (false) {
@@ -18,7 +18,7 @@
       /***/
     },
 
-    /***/ 9350: /***/ function (
+    /***/ 7773: /***/ 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__(5827);
+      module.exports = __webpack_require__(6655);
 
       /***/
     },
@@ -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__(6999);
+          return __webpack_require__(1913);
         },
       ]);
       if (false) {
@@ -18,7 +18,7 @@
       /***/
     },
 
-    /***/ 6999: /***/ function (
+    /***/ 1913: /***/ 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__(9834);
+          return __webpack_require__(2292);
         },
       ]);
       if (false) {
@@ -18,7 +18,7 @@
       /***/
     },
 
-    /***/ 1639: /***/ function (module, exports, __webpack_require__) {
+    /***/ 4304: /***/ 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__(5827)
+        __webpack_require__(6655)
       );
-      const _imageblursvg = __webpack_require__(5272);
-      const _imageconfig = __webpack_require__(3425);
-      const _imageconfigcontext = __webpack_require__(8851);
-      const _warnonce = __webpack_require__(7958);
+      const _imageblursvg = __webpack_require__(6983);
+      const _imageconfig = __webpack_require__(6227);
+      const _imageconfigcontext = __webpack_require__(2910);
+      const _warnonce = __webpack_require__(3537);
       const _imageloader = /*#__PURE__*/ _interop_require_default._(
-        __webpack_require__(758)
+        __webpack_require__(2990)
       );
       const configEnv = {
         deviceSizes: [640, 750, 828, 1080, 1200, 1920, 2048, 3840],
@@ -669,7 +669,7 @@
       /***/
     },
 
-    /***/ 5272: /***/ function (__unused_webpack_module, exports) {
+    /***/ 6983: /***/ 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 @@
       /***/
     },
 
-    /***/ 758: /***/ function (__unused_webpack_module, exports) {
+    /***/ 2990: /***/ function (__unused_webpack_module, exports) {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -766,7 +766,7 @@
       /***/
     },
 
-    /***/ 9834: /***/ function (
+    /***/ 2292: /***/ function (
       __unused_webpack_module,
       __webpack_exports__,
       __webpack_require__
@@ -787,8 +787,8 @@
 
       // EXTERNAL MODULE: ./node_modules/.pnpm/[email protected]/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__(1639);
+      module.exports = __webpack_require__(4304);
 
       /***/
     },
@@ -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__(5287);
+          return __webpack_require__(757);
         },
       ]);
       if (false) {
@@ -18,7 +18,7 @@
       /***/
     },
 
-    /***/ 5287: /***/ function (
+    /***/ 757: /***/ 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__(1640);
+          return __webpack_require__(1556);
         },
       ]);
       if (false) {
@@ -18,7 +18,7 @@
       /***/
     },
 
-    /***/ 3141: /***/ function (module, exports) {
+    /***/ 8386: /***/ function (module, exports) {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -86,7 +86,7 @@
       /***/
     },
 
-    /***/ 1293: /***/ function (module, exports) {
+    /***/ 234: /***/ function (module, exports) {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -121,7 +121,7 @@
       /***/
     },
 
-    /***/ 9351: /***/ function (module, exports, __webpack_require__) {
+    /***/ 7455: /***/ 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__(5043);
-      const _islocalurl = __webpack_require__(7446);
-      const _formaturl = __webpack_require__(1935);
-      const _utils = __webpack_require__(1162);
-      const _addlocale = __webpack_require__(7666);
-      const _routercontext = __webpack_require__(8343);
-      const _approutercontext = __webpack_require__(5442);
-      const _useintersection = __webpack_require__(9214);
-      const _getdomainlocale = __webpack_require__(1293);
-      const _addbasepath = __webpack_require__(3924);
-      const _routerreducertypes = __webpack_require__(3141);
+      const _resolvehref = __webpack_require__(8066);
+      const _islocalurl = __webpack_require__(7264);
+      const _formaturl = __webpack_require__(1361);
+      const _utils = __webpack_require__(5627);
+      const _addlocale = __webpack_require__(9936);
+      const _routercontext = __webpack_require__(1470);
+      const _approutercontext = __webpack_require__(9332);
+      const _useintersection = __webpack_require__(5520);
+      const _getdomainlocale = __webpack_require__(234);
+      const _addbasepath = __webpack_require__(9890);
+      const _routerreducertypes = __webpack_require__(8386);
       const prefetched = new Set();
       function prefetch(router, href, as, options, appOptions, isAppRouter) {
         if (false) {
@@ -561,7 +561,7 @@
       /***/
     },
 
-    /***/ 9214: /***/ function (module, exports, __webpack_require__) {
+    /***/ 5520: /***/ function (module, exports, __webpack_require__) {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -574,7 +574,7 @@
         },
       });
       const _react = __webpack_require__(959);
-      const _requestidlecallback = __webpack_require__(7889);
+      const _requestidlecallback = __webpack_require__(2627);
       const hasIntersectionObserver =
         typeof IntersectionObserver === "function";
       const observers = new Map();
@@ -687,7 +687,7 @@
       /***/
     },
 
-    /***/ 1640: /***/ function (
+    /***/ 1556: /***/ 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__(9351);
+      module.exports = __webpack_require__(7455);
 
       /***/
     },
@@ -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__(2602);
+          return __webpack_require__(1041);
         },
       ]);
       if (false) {
@@ -18,7 +18,7 @@
       /***/
     },
 
-    /***/ 2602: /***/ function (
+    /***/ 1041: /***/ 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__(3370);
+      module.exports = __webpack_require__(5979);
 
       /***/
     },
@@ -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 @@
       (window.__NEXT_P = window.__NEXT_P || []).push([
         "/script",
         function () {
-          return __webpack_require__(9463);
+          return __webpack_require__(4582);
         },
       ]);
       if (false) {
@@ -18,7 +18,7 @@
       /***/
     },
 
-    /***/ 9463: /***/ function (
+    /***/ 4582: /***/ 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_script__WEBPACK_IMPORTED_MODULE_1__ =
-        __webpack_require__(9096);
+        __webpack_require__(6071);
       /* harmony import */ var next_script__WEBPACK_IMPORTED_MODULE_1___default =
         /*#__PURE__*/ __webpack_require__.n(
           next_script__WEBPACK_IMPORTED_MODULE_1__
@@ -67,12 +67,12 @@
       /***/
     },
 
-    /***/ 9096: /***/ function (
+    /***/ 6071: /***/ function (
       module,
       __unused_webpack_exports,
       __webpack_require__
     ) {
-      module.exports = __webpack_require__(3495);
+      module.exports = __webpack_require__(2517);
 
       /***/
     },
@@ -83,7 +83,7 @@
       return __webpack_require__((__webpack_require__.s = moduleId));
     };
     /******/ __webpack_require__.O(0, [774, 888, 179], function () {
-      return __webpack_exec__(1136);
+      return __webpack_exec__(6695);
     });
     /******/ var __webpack_exports__ = __webpack_require__.O();
     /******/ _N_E = __webpack_exports__;
Diff for withRouter-HASH.js
@@ -1,7 +1,7 @@
 (self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
   [807],
   {
-    /***/ 3551: /***/ function (
+    /***/ 8374: /***/ function (
       __unused_webpack_module,
       __unused_webpack_exports,
       __webpack_require__
@@ -9,7 +9,7 @@
       (window.__NEXT_P = window.__NEXT_P || []).push([
         "/withRouter",
         function () {
-          return __webpack_require__(4753);
+          return __webpack_require__(5185);
         },
       ]);
       if (false) {
@@ -18,7 +18,7 @@
       /***/
     },
 
-    /***/ 4753: /***/ function (
+    /***/ 5185: /***/ 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_IMPORT
Post job cleanup.
[command]/usr/bin/git version
git version 2.40.1
Temporarily overriding HOME='/home/runner/work/_temp/a65d5342-7408-41c8-a3d6-326f92fef289' 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: bfdff3c42af8dd94084359027408d9f71b05e0d0

@sebmarkbage
Copy link
Contributor

We have to be careful here because this can have detrimental effects on our main usage of streaming which is streaming RSC/SSR payloads.

The React runtime does take advantage of back pressure to generate more optimal payloads by inlining and reordering ther result if the network is slow, so some backpressure can be good. But make it stall on chattiness can also severely degrade rendering performance.

@jridgewell
Copy link
Contributor Author

jridgewell commented Jun 15, 2023

We have to be careful here because this can have detrimental effects on our main usage of streaming which is streaming RSC/SSR payloads.

Default buffers in Node are 16kb, and several MB in browsers. I haven't tested performance, but my intuition is that it should be fine unless the response is very large and the client very slow.

The React runtime does take advantage of back pressure to generate more optimal payloads by inlining and reordering ther result if the network is slow, so some backpressure can be good

Can you point to where this is implemented? If it's going though Next's servers, then then you couldn't experience back-pressure before this, the for await (…) will consume everything you push down immediately and push it into the ServerResponse.

@sebmarkbage
Copy link
Contributor

sebmarkbage commented Jun 15, 2023

Can you point to where this is implemented?

Not really sure where to point. It's not really one place, it's the entire architecture of both RSC and HTML streaming libraries. They're generating the content on demand for what is available at the time the stream is pulled for more data. If there's no backpressure, it'll just pump out what it has.

If it's going though Next's servers, then then you couldn't experience back-pressure before this, the for await (…) will consume everything you push down immediately and push it into the ServerResponse.

There are several known issues with the way Next.js gets in between these streams. Our goal is to get to a point where we don't use Web Streams but use raw Node.js streams which React is optimized for. So it might be better than before with some backpressure in some situations.

Also note that buffering into a window, before sending, like compression does would completely break suspense because it often end up getting buffered before the reveal of the previous suspense boundary and so then it doesn't reveal until the next boundary competes which unblocks more bytes to fill up the buffer.

However, flushing for every write like you're doing here is also not good because if the destination is a compression stream it'll generate a compression window just for that chunk instead of optimizing further if there are more chunks to be written before we're actually ready to flush.

@jridgewell
Copy link
Contributor Author

However, flushing for every write like you're doing here is also not good because if the destination is a compression stream it'll generate a compression window just for that chunk instead of optimizing further if there are more chunks to be written before we're actually ready to flush.

The FlushStream is just maintaining the status quo:

Svelte hit something like this recently, and they overcame it by writing junk data to the stream to hit the buffer boundary. I actually don't like either solution, and think it'd be better if we could agree on a byte pattern that would signal the flush. Something like an empty chunk would be perfect, easy to detect on our stream end and could have no other significance.

export class FlushStream extends Writable {
  declare _dest: Writable & { flush: () => void }

  constructor(dest: Writable & { flush: () => void }) {
    super()
    this._dest = dest
    // snip…
  }

  _write(
    chunk: any,
    encoding: BufferEncoding,
    callback: TransformCallback
  ): void {
    if (chunk.length === 0) this._dest.flush()
    else this._dest.write(chunk, encoding)
    callback()
  }
}

But that's something for another PR. I just want to get lazy streaming into this one.

@sebmarkbage
Copy link
Contributor

sebmarkbage commented Jun 15, 2023

Node.js already has a convention for this for writable streams (.flush()). We just need to maintain it instead of inventing another one.

The issue is with Web Streams and there's no movement in WHATWG. whatwg/streams#960 Maybe WinterCG can be a trail blazer here.

@jridgewell
Copy link
Contributor Author

If I remove back-pressure from this PR, can we merge it with just the cancellation support?

@ijjk
Copy link
Member

ijjk commented Jun 16, 2023

Failing test suites

Commit: 86b4818

pnpm testheadless test/development/correct-tsconfig-defaults/index.test.ts

  • correct tsconfig.json defaults > should add moduleResolution when generating tsconfig.json in dev
Expand output

● correct tsconfig.json defaults › should add moduleResolution when generating tsconfig.json in dev

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

Expected: ObjectContaining {"moduleResolution": "node"}
Received: undefined

  38 |       expect(next.cliOutput).not.toContain('moduleResolution')
  39 |
> 40 |       expect(tsconfig.compilerOptions).toEqual(
     |                                        ^
  41 |         expect.objectContaining({ moduleResolution: 'node' })
  42 |       )
  43 |     } finally {

  at Object.<anonymous> (development/correct-tsconfig-defaults/index.test.ts:40:40)

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

@sebmarkbage
Copy link
Contributor

If the backpressure is semantically equivalent to plain Node.js streams then I'm comfortable with it. It's just that there's so many indirections here, that it's hard to follow if that's true.

@vercel-spaces
Copy link

vercel-spaces bot commented Jun 21, 2023

Notifying the following users due to files changed in this PR:

@timneutkens, @ijjk, @shuding, @huozhi, @feedthejim:

packages/next/package.json
packages/next/src/compiled/edge-runtime/index.js
packages/next/src/compiled/sass-loader/cjs.js
packages/next/src/server/body-streams.ts
packages/next/src/server/lib/render-server-standalone.ts
packages/next/src/server/lib/start-server.ts
packages/next/src/server/next-server.ts
pnpm-lock.yaml

This comment was posted based on the notify modifier.

@jridgewell
Copy link
Contributor Author

If the backpressure is semantically equivalent to plain Node.js streams then I'm comfortable with it.

It should be. We keep the same fill-the-buffer behavior (the default being 16kb), and only pause once we reach that point. If the client is keeping up, we'll pull data from the render stream as fast as it is produced.

As an alternative, I've opened #51594 which implements only the cancellation.

kodiakhq bot pushed a commit that referenced this pull request Jun 22, 2023
### What?

This is an alternative to #51330, which only support aborting the response (doesn't support back-pressure). If the client cancels the request (HMR update, navigates to another page, etc), we'll be able to detect that and stop pulling data from the dev's `ReadableStream` response.

### Why?

We want to allow API routes to stream data coming from another server (eg, AI services). The responses from these other servers can be long running and expensive. In the case the browser aborts the connection, it's critical that we stop streaming data as soon as possible.

### How?

By checking whether `response.closed` is set during the `for await (…)` iteration, we're able to detect that the client has aborted the connection. Cleanup of the `ReadableStream` is handled implicitly by the async iterator when the loop ends.

The one catch is our use of http-proxy for worker processes. It does not properly detect a client disconnecting (but does handle back-pressure). In order to fix that, I've manually added event listeners to detect the disconnect and cancel the proxied req/res pair.

Re: [WEB-1185](https://linear.app/vercel/issue/WEB-1185) (we still need back-pressure)
Fixes #50364
Fixes vercel/ai#90
@ijjk ijjk requested review from a team, timneutkens, shuding and huozhi as code owners July 20, 2023 22:07
@ijjk ijjk requested a review from feedthejim as a code owner July 20, 2023 22:07
@lassegit
Copy link

lassegit commented Sep 4, 2023

I come from vercel/ai#90 and am looking for a way to "gracefully" cancel OpenAIStream so that one of its callback functions get called with the completion like onCompletion. Will this PR enable us to make fix for this?

Perhaps add a second arguments to onCompletion:

const stream = OpenAIStream(response, {
    onCompletion: async (completion, done) => {
       // Where done tells if the stream has completed
    }
  });

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
4 participants