Consolidate Server and Routing process into one process #53523

timneutkens · 2023-08-03T11:59:58Z

In the current version of Next.js there are 4 processes when running in production:

Server
Routing
Rendering Pages Router
Rendering App Router

This setup was introduced in order to allow App Router and Pages Router to use different versions of React (i.e. Server Actions currently requires react@experimental to function). I wrote down more on why these processes exist in this comment: #49929 (comment)

This PR combines the Server and Routing process into one handler, as the "Server" process was only proxying to the Routing process. In my testing this caused about ~2x the amount of memory per request as the response body was duplicated between the processes. This was especially visible in the case of that memory leak in Node.js 18.16 as it grew memory usage on both sides quickly.

In the process of going through these changes I found a couple of other bugs like the propagation of values to the worker processes not being awaited (link) and the dot syntax for propagation was not functioning.

It also seemed there were a few cases where watchpack was used that would cause many more files to be watched than expected, for now I've removed those cases, specifically the "delete dir while running" and instrument.js hmr (instrument.js is experimental). Those tests have been skipped for now until we can revisit them to verfiy it

I've also cleaned up the types a bit while I was looking into these changes.

Improvement

⚠️ Important preface to this, measuring memory usage / peak usage is not super reliable especially when JS gets garbage collected. These numbers are just to show the rough percentage of less memory usage.

Baseline

Old:

next-server: 44.8MB
next-router-worker: 57.5MB
next-render-worker-app: 39,6MB
next-render-worker-pages: 39,1MB

New:

next-server: Removed
next-router-worker: 64.4MB
next-render-worker-app: 43.1MB (Note: no changes here, this shows what I meant by rough numbers)
next-render-worker-pages: 42.4MB (Note: no changes here, this shows what I meant by rough numbers)

Overall win: ~40MB (process is removed)

Peak usage

Old:

next-server: 118.6MB
next-router-worker: 223.7MB
next-render-worker-app: 32.8MB (I ran the test on a pages application in this case)
next-render-worker-pages: 101.1MB

New:

next-server: Removed
next-router-worker: 179.1MB
next-render-worker-app: 33.4MB
next-render-worker-pages: 117.5MB

Overall win: ~100MB (but it scales with requests so it was about ~50% of next-router-worker constantly)

Related: #53523

ijjk · 2023-08-03T13:20:07Z

Stats from current PR

Default Build (Increase detected ⚠️)

General Overall decrease ✓

	vercel/next.js canary	vercel/next.js fix/investigate-memory-usage	Change
buildDuration	36.2s	35.5s	-703ms
buildDurationCached	14.9s	13.8s	-1s
nodeModulesSize	138 MB	138 MB	-116 kB
nextStartRea..uration (ms)	741ms	777ms	⚠️ +36ms

Client Bundles (main, webpack) Overall decrease ✓

	vercel/next.js canary	vercel/next.js fix/investigate-memory-usage	Change
146-HASH.js gzip	26 kB	26 kB	⚠️ +2 B
3f784ff6-HASH.js gzip	50.5 kB	50.5 kB	-1 B
957.HASH.js gzip	181 B	181 B	✓
framework-HASH.js gzip	45.2 kB	45.2 kB	✓
main-app-HASH.js gzip	218 B	221 B	⚠️ +3 B
main-HASH.js gzip	28.6 kB	28.6 kB	-13 B
webpack-HASH.js gzip	1.7 kB	1.7 kB	-2 B
Overall change	152 kB	152 kB	-11 B

Legacy Client Bundles (polyfills)

	vercel/next.js canary	vercel/next.js fix/investigate-memory-usage	Change
polyfills-HASH.js gzip	31 kB	31 kB	✓
Overall change	31 kB	31 kB	✓

Client Pages Overall increase ⚠️

	vercel/next.js canary	vercel/next.js fix/investigate-memory-usage	Change
_app-HASH.js gzip	194 B	195 B	⚠️ +1 B
_error-HASH.js gzip	182 B	181 B	-1 B
amp-HASH.js gzip	504 B	506 B	⚠️ +2 B
css-HASH.js gzip	322 B	322 B	✓
dynamic-HASH.js gzip	2.5 kB	2.5 kB	⚠️ +1 B
edge-ssr-HASH.js gzip	256 B	256 B	✓
head-HASH.js gzip	349 B	349 B	✓
hooks-HASH.js gzip	369 B	369 B	✓
image-HASH.js gzip	4.28 kB	4.27 kB	-6 B
index-HASH.js gzip	256 B	255 B	-1 B
link-HASH.js gzip	2.61 kB	2.62 kB	⚠️ +4 B
routerDirect..HASH.js gzip	311 B	311 B	✓
script-HASH.js gzip	384 B	383 B	-1 B
withRouter-HASH.js gzip	306 B	308 B	⚠️ +2 B
1afbb74e6ecf..834.css gzip	106 B	106 B	✓
Overall change	12.9 kB	12.9 kB	⚠️ +1 B

Client Build Manifests Overall increase ⚠️

	vercel/next.js canary	vercel/next.js fix/investigate-memory-usage	Change
_buildManifest.js gzip	484 B	485 B	⚠️ +1 B
Overall change	484 B	485 B	⚠️ +1 B

Rendered Page Sizes Overall increase ⚠️

	vercel/next.js canary	vercel/next.js fix/investigate-memory-usage	Change
index.html gzip	511 B	511 B	✓
link.html gzip	524 B	525 B	⚠️ +1 B
withRouter.html gzip	505 B	505 B	✓
Overall change	1.54 kB	1.54 kB	⚠️ +1 B

Edge SSR bundle Size Overall increase ⚠️

	vercel/next.js canary	vercel/next.js fix/investigate-memory-usage	Change
edge-ssr.js gzip	90.1 kB	90.1 kB	⚠️ +34 B
page.js gzip	147 kB	147 kB	⚠️ +17 B
Overall change	237 kB	237 kB	⚠️ +51 B

Middleware size Overall decrease ✓

	vercel/next.js canary	vercel/next.js fix/investigate-memory-usage	Change
middleware-b..fest.js gzip	624 B	622 B	-2 B
middleware-r..fest.js gzip	151 B	149 B	-2 B
middleware.js gzip	22.6 kB	22.7 kB	⚠️ +3 B
edge-runtime..pack.js gzip	1.83 kB	1.83 kB	✓
Overall change	25.3 kB	25.3 kB	-1 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-3a300bf4b86e8076.js",
-    "static/chunks/3f784ff6-fb8ba574fec387f0.js",
-    "static/chunks/146-1a7e0068c7c3d1d5.js",
-    "static/chunks/main-app-3b733b9793d06b8f.js",
+    "static/chunks/webpack-84e2fed1c10027c9.js",
+    "static/chunks/3c4a14c2-842efc20b90e8da5.js",
+    "static/chunks/385-f5e902e0ddf29473.js",
+    "static/chunks/main-app-25d93585d40e0b0f.js",
   ],
   pages: {
     "/": [
-      "static/chunks/webpack-3a300bf4b86e8076.js",
+      "static/chunks/webpack-84e2fed1c10027c9.js",
       "static/chunks/framework-114cbddc60b679b8.js",
-      "static/chunks/main-0140f51c6ded8c6e.js",
-      "static/chunks/pages/index-5a9e4ec00bfafbc2.js",
+      "static/chunks/main-e74313cea25fc67f.js",
+      "static/chunks/pages/index-73df98d3a1be236b.js",
     ],
     "/_app": [
-      "static/chunks/webpack-3a300bf4b86e8076.js",
+      "static/chunks/webpack-84e2fed1c10027c9.js",
       "static/chunks/framework-114cbddc60b679b8.js",
-      "static/chunks/main-0140f51c6ded8c6e.js",
-      "static/chunks/pages/_app-91d8c3ff9c7bf801.js",
+      "static/chunks/main-e74313cea25fc67f.js",
+      "static/chunks/pages/_app-23093975f6ced067.js",
     ],
     "/_error": [
-      "static/chunks/webpack-3a300bf4b86e8076.js",
+      "static/chunks/webpack-84e2fed1c10027c9.js",
       "static/chunks/framework-114cbddc60b679b8.js",
-      "static/chunks/main-0140f51c6ded8c6e.js",
-      "static/chunks/pages/_error-08a44b197424cae9.js",
+      "static/chunks/main-e74313cea25fc67f.js",
+      "static/chunks/pages/_error-4ca4370d0bbe83ba.js",
     ],
     "/amp": [
-      "static/chunks/webpack-3a300bf4b86e8076.js",
+      "static/chunks/webpack-84e2fed1c10027c9.js",
       "static/chunks/framework-114cbddc60b679b8.js",
-      "static/chunks/main-0140f51c6ded8c6e.js",
-      "static/chunks/pages/amp-c60b5b8d65dfefd0.js",
+      "static/chunks/main-e74313cea25fc67f.js",
+      "static/chunks/pages/amp-505f7f9211f38807.js",
     ],
     "/css": [
-      "static/chunks/webpack-3a300bf4b86e8076.js",
+      "static/chunks/webpack-84e2fed1c10027c9.js",
       "static/chunks/framework-114cbddc60b679b8.js",
-      "static/chunks/main-0140f51c6ded8c6e.js",
+      "static/chunks/main-e74313cea25fc67f.js",
       "static/css/ded6b86ab9cc0a1f.css",
-      "static/chunks/pages/css-518c25e89b2cd519.js",
+      "static/chunks/pages/css-23408853b5e40486.js",
     ],
     "/dynamic": [
-      "static/chunks/webpack-3a300bf4b86e8076.js",
+      "static/chunks/webpack-84e2fed1c10027c9.js",
       "static/chunks/framework-114cbddc60b679b8.js",
-      "static/chunks/main-0140f51c6ded8c6e.js",
-      "static/chunks/pages/dynamic-016bb68f063d0de6.js",
+      "static/chunks/main-e74313cea25fc67f.js",
+      "static/chunks/pages/dynamic-4bdfb291d10e0ef9.js",
     ],
     "/edge-ssr": [
-      "static/chunks/webpack-3a300bf4b86e8076.js",
+      "static/chunks/webpack-84e2fed1c10027c9.js",
       "static/chunks/framework-114cbddc60b679b8.js",
-      "static/chunks/main-0140f51c6ded8c6e.js",
-      "static/chunks/pages/edge-ssr-3757a8c74450da23.js",
+      "static/chunks/main-e74313cea25fc67f.js",
+      "static/chunks/pages/edge-ssr-ccab9dbcc96e4bb5.js",
     ],
     "/head": [
-      "static/chunks/webpack-3a300bf4b86e8076.js",
+      "static/chunks/webpack-84e2fed1c10027c9.js",
       "static/chunks/framework-114cbddc60b679b8.js",
-      "static/chunks/main-0140f51c6ded8c6e.js",
-      "static/chunks/pages/head-fcfeabb0945b0179.js",
+      "static/chunks/main-e74313cea25fc67f.js",
+      "static/chunks/pages/head-f21c43059c8bbd7a.js",
     ],
     "/hooks": [
-      "static/chunks/webpack-3a300bf4b86e8076.js",
+      "static/chunks/webpack-84e2fed1c10027c9.js",
       "static/chunks/framework-114cbddc60b679b8.js",
-      "static/chunks/main-0140f51c6ded8c6e.js",
-      "static/chunks/pages/hooks-88ec926ebc8afbca.js",
+      "static/chunks/main-e74313cea25fc67f.js",
+      "static/chunks/pages/hooks-7616f499d44fca80.js",
     ],
     "/image": [
-      "static/chunks/webpack-3a300bf4b86e8076.js",
+      "static/chunks/webpack-84e2fed1c10027c9.js",
       "static/chunks/framework-114cbddc60b679b8.js",
-      "static/chunks/main-0140f51c6ded8c6e.js",
-      "static/chunks/pages/image-ca62a3da8fe4553c.js",
+      "static/chunks/main-e74313cea25fc67f.js",
+      "static/chunks/pages/image-f786644c996154f2.js",
     ],
     "/link": [
-      "static/chunks/webpack-3a300bf4b86e8076.js",
+      "static/chunks/webpack-84e2fed1c10027c9.js",
       "static/chunks/framework-114cbddc60b679b8.js",
-      "static/chunks/main-0140f51c6ded8c6e.js",
-      "static/chunks/pages/link-bf2ae3d845d7b091.js",
+      "static/chunks/main-e74313cea25fc67f.js",
+      "static/chunks/pages/link-ff0bde2677856bd6.js",
     ],
     "/routerDirect": [
-      "static/chunks/webpack-3a300bf4b86e8076.js",
+      "static/chunks/webpack-84e2fed1c10027c9.js",
       "static/chunks/framework-114cbddc60b679b8.js",
-      "static/chunks/main-0140f51c6ded8c6e.js",
-      "static/chunks/pages/routerDirect-1eba4a3229eda770.js",
+      "static/chunks/main-e74313cea25fc67f.js",
+      "static/chunks/pages/routerDirect-cec833fa9cf12265.js",
     ],
     "/script": [
-      "static/chunks/webpack-3a300bf4b86e8076.js",
+      "static/chunks/webpack-84e2fed1c10027c9.js",
       "static/chunks/framework-114cbddc60b679b8.js",
-      "static/chunks/main-0140f51c6ded8c6e.js",
-      "static/chunks/pages/script-e8f78c780ec0a0af.js",
+      "static/chunks/main-e74313cea25fc67f.js",
+      "static/chunks/pages/script-8716ecf7b7f48d24.js",
     ],
     "/withRouter": [
-      "static/chunks/webpack-3a300bf4b86e8076.js",
+      "static/chunks/webpack-84e2fed1c10027c9.js",
       "static/chunks/framework-114cbddc60b679b8.js",
-      "static/chunks/main-0140f51c6ded8c6e.js",
-      "static/chunks/pages/withRouter-acfbd1015ce713b8.js",
+      "static/chunks/main-e74313cea25fc67f.js",
+      "static/chunks/pages/withRouter-492ac907cdffd546.js",
     ],
   },
   ampFirstPages: [],

Diff for middleware-r..-manifest.js

@@ -1,2 +1,2 @@
 self.__REACT_LOADABLE_MANIFEST =
-  '{"dynamic.js -> ../components/hello":{"id":6957,"files":["static/chunks/957.ad2a32717f99d799.js"]}}';
+  '{"dynamic.js -> ../components/hello":{"id":3440,"files":["static/chunks/440.4ecfcf525bb65d08.js"]}}';

Diff for middleware.js

@@ -2,7 +2,7 @@
 (self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
   [826],
   {
-    /***/ 1028: /***/ (
+    /***/ 1982: /***/ (
       __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/[email protected][email protected]/node_modules/next/dist/esm/server/web/globals.js
+      }); // CONCATENATED MODULE: ./node_modules/.pnpm/[email protected][email protected]/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/[email protected][email protected]/node_modules/next/dist/esm/server/web/error.js
+      enhanceGlobals(); //# sourceMappingURL=globals.js.map // CONCATENATED MODULE: ./node_modules/.pnpm/[email protected][email protected]/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/[email protected][email protected]/node_modules/next/dist/esm/server/web/utils.js
+      } //# sourceMappingURL=error.js.map // CONCATENATED MODULE: ./node_modules/.pnpm/[email protected][email protected]/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/[email protected][email protected]/node_modules/next/dist/esm/server/web/spec-extension/fetch-event.js
+      } //# sourceMappingURL=utils.js.map // CONCATENATED MODULE: ./node_modules/.pnpm/[email protected][email protected]/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/[email protected][email protected]/node_modules/next/dist/esm/shared/lib/i18n/detect-domain-locale.js
+      } //# sourceMappingURL=fetch-event.js.map // CONCATENATED MODULE: ./node_modules/.pnpm/[email protected][email protected]/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/[email protected][email protected]/node_modules/next/dist/esm/shared/lib/router/utils/remove-trailing-slash.js
+      } //# sourceMappingURL=detect-domain-locale.js.map // CONCATENATED MODULE: ./node_modules/.pnpm/[email protected][email protected]/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/[email protected][email protected]/node_modules/next/dist/esm/shared/lib/router/utils/parse-path.js
+      } //# sourceMappingURL=remove-trailing-slash.js.map // CONCATENATED MODULE: ./node_modules/.pnpm/[email protected][email protected]/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/[email protected][email protected]/node_modules/next/dist/esm/shared/lib/router/utils/add-path-prefix.js
+      } //# sourceMappingURL=parse-path.js.map // CONCATENATED MODULE: ./node_modules/.pnpm/[email protected][email protected]/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/[email protected][email protected]/node_modules/next/dist/esm/shared/lib/router/utils/add-path-suffix.js
+      } //# sourceMappingURL=add-path-prefix.js.map // CONCATENATED MODULE: ./node_modules/.pnpm/[email protected][email protected]/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/[email protected][email protected]/node_modules/next/dist/esm/shared/lib/router/utils/path-has-prefix.js
+      } //# sourceMappingURL=add-path-suffix.js.map // CONCATENATED MODULE: ./node_modules/.pnpm/[email protected][email protected]/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/[email protected][email protected]/node_modules/next/dist/esm/shared/lib/router/utils/add-locale.js
+      } //# sourceMappingURL=path-has-prefix.js.map // CONCATENATED MODULE: ./node_modules/.pnpm/[email protected][email protected]/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/[email protected][email protected]/node_modules/next/dist/esm/shared/lib/router/utils/format-next-pathname-info.js
+      } //# sourceMappingURL=add-locale.js.map // CONCATENATED MODULE: ./node_modules/.pnpm/[email protected][email protected]/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/[email protected][email protected]/node_modules/next/dist/esm/shared/lib/get-hostname.js
+      } //# sourceMappingURL=format-next-pathname-info.js.map // CONCATENATED MODULE: ./node_modules/.pnpm/[email protected][email protected]/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/[email protected][email protected]/node_modules/next/dist/esm/shared/lib/i18n/normalize-locale-path.js
+      } //# sourceMappingURL=get-hostname.js.map // CONCATENATED MODULE: ./node_modules/.pnpm/[email protected][email protected]/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/[email protected][email protected]/node_modules/next/dist/esm/shared/lib/router/utils/remove-path-prefix.js
+      } //# sourceMappingURL=normalize-locale-path.js.map // CONCATENATED MODULE: ./node_modules/.pnpm/[email protected][email protected]/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/[email protected][email protected]/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/[email protected][email protected]/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/[email protected][email protected]/node_modules/next/dist/esm/server/web/next-url.js
+      } //# sourceMappingURL=get-next-pathname-info.js.map // CONCATENATED MODULE: ./node_modules/.pnpm/[email protected][email protected]/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/[email protected][email protected]/node_modules/next/dist/compiled/@edge-runtime/cookies/index.js
-      var _edge_runtime_cookies = __webpack_require__(2698); // CONCATENATED MODULE: ./node_modules/.pnpm/[email protected][email protected]/node_modules/next/dist/esm/server/web/spec-extension/cookies.js // CONCATENATED MODULE: ./node_modules/.pnpm/[email protected][email protected]/node_modules/next/dist/esm/server/web/spec-extension/request.js
+      // EXTERNAL MODULE: ./node_modules/.pnpm/[email protected][email protected]/node_modules/next/dist/compiled/@edge-runtime/cookies/index.js
+      var _edge_runtime_cookies = __webpack_require__(5327); // CONCATENATED MODULE: ./node_modules/.pnpm/[email protected][email protected]/node_modules/next/dist/esm/server/web/spec-extension/cookies.js // CONCATENATED MODULE: ./node_modules/.pnpm/[email protected][email protected]/node_modules/next/dist/esm/server/web/spec-extension/request.js
       //# sourceMappingURL=cookies.js.map
 
       const INTERNALS = Symbol("internal request");
@@ -884,7 +884,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/[email protected][email protected]/node_modules/next/dist/esm/server/web/spec-extension/response.js
+      } //# sourceMappingURL=request.js.map // CONCATENATED MODULE: ./node_modules/.pnpm/[email protected][email protected]/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]);
@@ -983,7 +983,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
             headers,
           });
         }
-      } //# sourceMappingURL=response.js.map // CONCATENATED MODULE: ./node_modules/.pnpm/[email protected][email protected]/node_modules/next/dist/esm/shared/lib/router/utils/relativize-url.js
+      } //# sourceMappingURL=response.js.map // CONCATENATED MODULE: ./node_modules/.pnpm/[email protected][email protected]/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
@@ -996,7 +996,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/[email protected][email protected]/node_modules/next/dist/esm/client/components/app-router-headers.js
+      } //# sourceMappingURL=relativize-url.js.map // CONCATENATED MODULE: ./node_modules/.pnpm/[email protected][email protected]/node_modules/next/dist/esm/client/components/app-router-headers.js
 
       const RSC = "RSC";
       const ACTION = "Next-Action";
@@ -1018,7 +1018,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/[email protected][email protected]/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/[email protected][email protected]/node_modules/next/dist/esm/server/internal-utils.js
 
       const INTERNAL_QUERY_NAMES = [
         "__nextFallback",
@@ -1046,7 +1046,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/[email protected][email protected]/node_modules/next/dist/esm/shared/lib/router/utils/app-paths.js
+      } //# sourceMappingURL=internal-utils.js.map // CONCATENATED MODULE: ./node_modules/.pnpm/[email protected][email protected]/node_modules/next/dist/esm/shared/lib/router/utils/app-paths.js
 
       /**
        * Normalizes an app route so it represents the actual request path. Essentially
@@ -1097,7 +1097,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/[email protected][email protected]/node_modules/next/dist/esm/lib/constants.js
+      } //# sourceMappingURL=app-paths.js.map // CONCATENATED MODULE: ./node_modules/.pnpm/[email protected][email protected]/node_modules/next/dist/esm/lib/constants.js
 
       const NEXT_QUERY_PARAM_PREFIX = "nxtP";
       const PRERENDER_REVALIDATE_HEADER = "x-prerender-revalidate";
@@ -1235,7 +1235,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
         metadata: "__next_metadata__",
         metadataRoute: "__next_metadata_route__",
         metadataImageMeta: "__next_metadata_image_meta__",
-      }; //# sourceMappingURL=constants.js.map // CONCATENATED MODULE: ./node_modules/.pnpm/[email protected][email protected]/node_modules/next/dist/esm/server/web/spec-extension/adapters/reflect.js
+      }; //# sourceMappingURL=constants.js.map // CONCATENATED MODULE: ./node_modules/.pnpm/[email protected][email protected]/node_modules/next/dist/esm/server/web/spec-extension/adapters/reflect.js
 
       class ReflectAdapter {
         static get(target, prop, receiver) {
@@ -1254,7 +1254,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
         static deleteProperty(target, prop) {
           return Reflect.deleteProperty(target, prop);
         }
-      } //# sourceMappingURL=reflect.js.map // CONCATENATED MODULE: ./node_modules/.pnpm/[email protected][email protected]/node_modules/next/dist/esm/server/web/spec-extension/adapters/headers.js
+      } //# sourceMappingURL=reflect.js.map // CONCATENATED MODULE: ./node_modules/.pnpm/[email protected][email protected]/node_modules/next/dist/esm/server/web/spec-extension/adapters/headers.js
 
       /**
        * @internal
@@ -1435,7 +1435,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
         [Symbol.iterator]() {
           return this.entries();
         }
-      } //# sourceMappingURL=headers.js.map // CONCATENATED MODULE: ./node_modules/.pnpm/[email protected][email protected]/node_modules/next/dist/esm/server/web/spec-extension/adapters/request-cookies.js
+      } //# sourceMappingURL=headers.js.map // CONCATENATED MODULE: ./node_modules/.pnpm/[email protected][email protected]/node_modules/next/dist/esm/server/web/spec-extension/adapters/request-cookies.js
 
       /**
        * @internal
@@ -1568,7 +1568,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
             },
           });
         }
-      } //# sourceMappingURL=request-cookies.js.map // CONCATENATED MODULE: ./node_modules/.pnpm/[email protected][email protected]/node_modules/next/dist/esm/server/api-utils/index.js
+      } //# sourceMappingURL=request-cookies.js.map // CONCATENATED MODULE: ./node_modules/.pnpm/[email protected][email protected]/node_modules/next/dist/esm/server/api-utils/index.js
 
       /**
        * Parse cookies from the `headers` of request
@@ -1579,7 +1579,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
           if (!cookie) {
             return {};
           }
-          const { parse: parseCookieFn } = __webpack_require__(3554);
+          const { parse: parseCookieFn } = __webpack_require__(3340);
           return parseCookieFn(
             Array.isArray(cookie) ? cookie.join("; ") : cookie
           );
@@ -1638,7 +1638,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
         if (SYMBOL_CLEARED_COOKIES in res) {
           return res;
         }
-        const { serialize } = __webpack_require__(3554);
+        const { serialize } = __webpack_require__(3340);
         const previous = res.getHeader("Set-Cookie");
         res.setHeader(`Set-Cookie`, [
           ...(typeof previous === "string"
@@ -1735,7 +1735,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
             });
           },
         });
-      } //# sourceMappingURL=index.js.map // CONCATENATED MODULE: ./node_modules/.pnpm/[email protected][email protected]/node_modules/next/dist/esm/server/async-storage/draft-mode-provider.js
+      } //# sourceMappingURL=index.js.map // CONCATENATED MODULE: ./node_modules/.pnpm/[email protected][email protected]/node_modules/next/dist/esm/server/async-storage/draft-mode-provider.js
 
       class DraftModeProvider {
         constructor(previewProps, req, cookies, mutableCookies) {
@@ -1788,7 +1788,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
             expires: new Date(0),
           });
         }
-      } //# sourceMappingURL=draft-mode-provider.js.map // CONCATENATED MODULE: ./node_modules/.pnpm/[email protected][email protected]/node_modules/next/dist/esm/server/async-storage/request-async-storage-wrapper.js
+      } //# sourceMappingURL=draft-mode-provider.js.map // CONCATENATED MODULE: ./node_modules/.pnpm/[email protected][email protected]/node_modules/next/dist/esm/server/async-storage/request-async-storage-wrapper.js
 
       function getHeaders(headers) {
         const cleaned = HeadersAdapter.from(headers);
@@ -1873,10 +1873,10 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
         },
       }; //# sourceMappingURL=request-async-storage-wrapper.js.map
 
-      // EXTERNAL MODULE: ./node_modules/.pnpm/[email protected][email protected]/node_modules/next/dist/esm/client/components/async-local-storage.js
-      var async_local_storage = __webpack_require__(6650); // CONCATENATED MODULE: ./node_modules/.pnpm/[email protected][email protected]/node_modules/next/dist/esm/client/components/request-async-storage.js
+      // EXTERNAL MODULE: ./node_modules/.pnpm/[email protected][email protected]/node_modules/next/dist/esm/client/components/async-local-storage.js
+      var async_local_storage = __webpack_require__(7705); // CONCATENATED MODULE: ./node_modules/.pnpm/[email protected][email protected]/node_modules/next/dist/esm/client/components/request-async-storage.js
       const requestAsyncStorage = (0,
-      async_local_storage /* createAsyncLocalStorage */.P)(); //# sourceMappingURL=request-async-storage.js.map // CONCATENATED MODULE: ./node_modules/.pnpm/[email protected][email protected]/node_modules/next/dist/esm/server/web/adapter.js
+      async_local_storage /* createAsyncLocalStorage */.P)(); //# sourceMappingURL=request-async-storage.js.map // CONCATENATED MODULE: ./node_modules/.pnpm/[email protected][email protected]/node_modules/next/dist/esm/server/web/adapter.js
 
       class NextRequestHint extends NextRequest {
         constructor(params) {
@@ -2138,14 +2138,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/[email protected][email protected]/node_modules/next/dist/esm/server/web/exports/next-response.js // CONCATENATED MODULE: ./middleware.js
+      } //# sourceMappingURL=adapter.js.map // CONCATENATED MODULE: ./node_modules/.pnpm/[email protected][email protected]/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/[email protected][email protected]/node_modules/next/dist/build/webpack/loaders/next-middleware-loader.js?absolutePagePath=private-next-root-dir%2Fmiddleware.js&page=%2Fmiddleware&rootDir=%2Ftmp%2Fnext-statsH8AgA8%2Fstats-app&matchers=&preferredRegion=&middlewareConfig=e30%3D!
+      } // CONCATENATED MODULE: ./node_modules/.pnpm/[email protected][email protected]/node_modules/next/dist/build/webpack/loaders/next-middleware-loader.js?absolutePagePath=private-next-root-dir%2Fmiddleware.js&page=%2Fmiddleware&rootDir=%2Ftmp%2Fnext-statsH8AgA8%2Fstats-app&matchers=&preferredRegion=&middlewareConfig=e30%3D!
 
       const mod = { ...middleware_namespaceObject };
       const handler = mod.middleware || mod.default;
@@ -2169,7 +2169,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
       /***/
     },
 
-    /***/ 2698: /***/ (module) => {
+    /***/ 5327: /***/ (module) => {
       "use strict";
 
       var __defProp = Object.defineProperty;
@@ -2562,7 +2562,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
       /***/
     },
 
-    /***/ 3554: /***/ (module) => {
+    /***/ 3340: /***/ (module) => {
       "use strict";
       var __dirname = "/";
 
@@ -2692,7 +2692,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
       /***/
     },
 
-    /***/ 6650: /***/ (
+    /***/ 7705: /***/ (
       __unused_webpack_module,
       __webpack_exports__,
       __webpack_require__
@@ -2738,7 +2738,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__(1028);
+    /******/ var __webpack_exports__ = __webpack_exec__(1982);
     /******/ (_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: { afterFiles: [], beforeFiles: [], fallback: [] },
-  "/": ["static\u002Fchunks\u002Fpages\u002Findex-5a9e4ec00bfafbc2.js"],
-  "/_error": ["static\u002Fchunks\u002Fpages\u002F_error-08a44b197424cae9.js"],
-  "/amp": ["static\u002Fchunks\u002Fpages\u002Famp-c60b5b8d65dfefd0.js"],
+  "/": ["static\u002Fchunks\u002Fpages\u002Findex-73df98d3a1be236b.js"],
+  "/_error": ["static\u002Fchunks\u002Fpages\u002F_error-4ca4370d0bbe83ba.js"],
+  "/amp": ["static\u002Fchunks\u002Fpages\u002Famp-505f7f9211f38807.js"],
   "/css": [
     "static\u002Fcss\u002Fded6b86ab9cc0a1f.css",
-    "static\u002Fchunks\u002Fpages\u002Fcss-518c25e89b2cd519.js",
+    "static\u002Fchunks\u002Fpages\u002Fcss-23408853b5e40486.js",
   ],
   "/dynamic": [
-    "static\u002Fchunks\u002Fpages\u002Fdynamic-016bb68f063d0de6.js",
+    "static\u002Fchunks\u002Fpages\u002Fdynamic-4bdfb291d10e0ef9.js",
   ],
   "/edge-ssr": [
-    "static\u002Fchunks\u002Fpages\u002Fedge-ssr-3757a8c74450da23.js",
+    "static\u002Fchunks\u002Fpages\u002Fedge-ssr-ccab9dbcc96e4bb5.js",
   ],
-  "/head": ["static\u002Fchunks\u002Fpages\u002Fhead-fcfeabb0945b0179.js"],
-  "/hooks": ["static\u002Fchunks\u002Fpages\u002Fhooks-88ec926ebc8afbca.js"],
-  "/image": ["static\u002Fchunks\u002Fpages\u002Fimage-ca62a3da8fe4553c.js"],
-  "/link": ["static\u002Fchunks\u002Fpages\u002Flink-bf2ae3d845d7b091.js"],
+  "/head": ["static\u002Fchunks\u002Fpages\u002Fhead-f21c43059c8bbd7a.js"],
+  "/hooks": ["static\u002Fchunks\u002Fpages\u002Fhooks-7616f499d44fca80.js"],
+  "/image": ["static\u002Fchunks\u002Fpages\u002Fimage-f786644c996154f2.js"],
+  "/link": ["static\u002Fchunks\u002Fpages\u002Flink-ff0bde2677856bd6.js"],
   "/routerDirect": [
-    "static\u002Fchunks\u002Fpages\u002FrouterDirect-1eba4a3229eda770.js",
+    "static\u002Fchunks\u002Fpages\u002FrouterDirect-cec833fa9cf12265.js",
   ],
-  "/script": ["static\u002Fchunks\u002Fpages\u002Fscript-e8f78c780ec0a0af.js"],
+  "/script": ["static\u002Fchunks\u002Fpages\u002Fscript-8716ecf7b7f48d24.js"],
   "/withRouter": [
-    "static\u002Fchunks\u002Fpages\u002FwithRouter-acfbd1015ce713b8.js",
+    "static\u002Fchunks\u002Fpages\u002FwithRouter-492ac907cdffd546.js",
   ],
   sortedPages: [
     "\u002F",

Diff for _app-HASH.js

@@ -1,7 +1,7 @@
 (self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
   [888],
   {
-    /***/ 7108: /***/ function (
+    /***/ 6392: /***/ 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__(7858);
+          return __webpack_require__(7798);
         },
       ]);
       if (false) {
@@ -24,7 +24,7 @@
       return __webpack_require__((__webpack_require__.s = moduleId));
     };
     /******/ __webpack_require__.O(0, [774, 179], function () {
-      return __webpack_exec__(7108), __webpack_exec__(8272);
+      return __webpack_exec__(6392), __webpack_exec__(2866);
     });
     /******/ 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],
   {
-    /***/ 2665: /***/ function (
+    /***/ 630: /***/ 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__(6647);
+          return __webpack_require__(8693);
         },
       ]);
       if (false) {
@@ -24,7 +24,7 @@
       return __webpack_require__((__webpack_require__.s = moduleId));
     };
     /******/ __webpack_require__.O(0, [888, 774, 179], function () {
-      return __webpack_exec__(2665);
+      return __webpack_exec__(630);
     });
     /******/ 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],
   {
-    /***/ 1571: /***/ function (
+    /***/ 1158: /***/ function (
       module,
       __unused_webpack_exports,
       __webpack_require__
     ) {
-      module.exports = __webpack_require__(2689);
+      module.exports = __webpack_require__(6691);
 
       /***/
     },
 
-    /***/ 4273: /***/ function (
+    /***/ 8255: /***/ 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__(8260);
+          return __webpack_require__(2860);
         },
       ]);
       if (false) {
@@ -28,7 +28,7 @@
       /***/
     },
 
-    /***/ 2689: /***/ function (module, exports, __webpack_require__) {
+    /***/ 6691: /***/ 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__(8128);
-      const _ampmode = __webpack_require__(9939);
+      const _ampcontext = __webpack_require__(9031);
+      const _ampmode = __webpack_require__(1358);
       function useAmp() {
         // Don't assign the context value to a variable to save bytes
         return (0, _ampmode.isInAmpMode)(
@@ -67,7 +67,7 @@
       /***/
     },
 
-    /***/ 8260: /***/ function (
+    /***/ 2860: /***/ 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__(1571);
+        __webpack_require__(1158);
       /* 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__(4273);
+      return __webpack_exec__(8255);
     });
     /******/ 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],
   {
-    /***/ 2094: /***/ function (
+    /***/ 2714: /***/ 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__(4405);
+          return __webpack_require__(3041);
         },
       ]);
       if (false) {
@@ -18,7 +18,7 @@
       /***/
     },
 
-    /***/ 4405: /***/ function (
+    /***/ 3041: /***/ 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__(262);
+        __webpack_require__(1885);
       /* 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 @@
       /***/
     },
 
-    /***/ 262: /***/ function (module) {
+    /***/ 1885: /***/ function (module) {
       // extracted by mini-css-extract-plugin
       module.exports = { helloWorld: "css_helloWorld__aUdUq" };
 
@@ -61,7 +61,7 @@
       return __webpack_require__((__webpack_require__.s = moduleId));
     };
     /******/ __webpack_require__.O(0, [774, 888, 179], function () {
-      return __webpack_exec__(2094);
+      return __webpack_exec__(2714);
     });
     /******/ 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],
   {
-    /***/ 8484: /***/ function (
+    /***/ 9816: /***/ 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__(6928);
+          return __webpack_require__(4020);
         },
       ]);
       if (false) {
@@ -18,7 +18,7 @@
       /***/
     },
 
-    /***/ 6361: /***/ function (module, exports, __webpack_require__) {
+    /***/ 1133: /***/ 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__(9460)
+        __webpack_require__(2304)
       );
       const isServerSide = "object" === "undefined";
       // Normalize loader to return the module as form { default: Component } for `React.lazy`.
@@ -146,7 +146,7 @@
       /***/
     },
 
-    /***/ 9472: /***/ function (
+    /***/ 5689: /***/ function (
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -173,7 +173,7 @@
       /***/
     },
 
-    /***/ 9460: /***/ function (
+    /***/ 2304: /***/ 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__(9472);
+      const _loadablecontext = __webpack_require__(5689);
       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
       /***/
     },
 
-    /***/ 6928: /***/ function (
+    /***/ 4020: /***/ 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__(5620);
+        __webpack_require__(4438);
       /* 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() */ 957)
-            .then(__webpack_require__.bind(__webpack_require__, 6957)),
+            .e(/* import() */ 440)
+            .then(__webpack_require__.bind(__webpack_require__, 3440)),
         {
           loadableGenerated: {
-            webpack: () => [/*require.resolve*/ 6957],
+            webpack: () => [/*require.resolve*/ 3440],
           },
         }
       );
@@ -506,12 +506,12 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE
       /***/
     },
 
-    /***/ 5620: /***/ function (
+    /***/ 4438: /***/ function (
       module,
       __unused_webpack_exports,
       __webpack_require__
     ) {
-      module.exports = __webpack_require__(6361);
+      module.exports = __webpack_require__(1133);
 
       /***/
     },
@@ -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__(8484);
+      return __webpack_exec__(9816);
     });
     /******/ 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],
   {
-    /***/ 9835: /***/ function (
+    /***/ 7423: /***/ 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__(5727);
+          return __webpack_require__(5365);
         },
       ]);
       if (false) {
@@ -18,7 +18,7 @@
       /***/
     },
 
-    /***/ 5727: /***/ function (
+    /***/ 5365: /***/ 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__(9835);
+      return __webpack_exec__(7423);
     });
     /******/ 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],
   {
-    /***/ 3365: /***/ function (
+    /***/ 4278: /***/ 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__(7566);
+          return __webpack_require__(2218);
         },
       ]);
       if (false) {
@@ -18,7 +18,7 @@
       /***/
     },
 
-    /***/ 7566: /***/ function (
+    /***/ 2218: /***/ 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__(2022);
+        __webpack_require__(4469);
       /* harmony import */ var next_head__WEBPACK_IMPORTED_MODULE_1___default =
         /*#__PURE__*/ __webpack_require__.n(
           next_head__WEBPACK_IMPORTED_MODULE_1__
@@ -68,12 +68,12 @@
       /***/
     },
 
-    /***/ 2022: /***/ function (
+    /***/ 4469: /***/ function (
       module,
       __unused_webpack_exports,
       __webpack_require__
     ) {
-      module.exports = __webpack_require__(4778);
+      module.exports = __webpack_require__(6647);
 
       /***/
     },
@@ -84,7 +84,7 @@
       return __webpack_require__((__webpack_require__.s = moduleId));
     };
     /******/ __webpack_require__.O(0, [774, 888, 179], function () {
-      return __webpack_exec__(3365);
+      return __webpack_exec__(4278);
     });
     /******/ 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],
   {
-    /***/ 5315: /***/ function (
+    /***/ 5046: /***/ 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__(4692);
+          return __webpack_require__(7075);
         },
       ]);
       if (false) {
@@ -18,7 +18,7 @@
       /***/
     },
 
-    /***/ 4692: /***/ function (
+    /***/ 7075: /***/ 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__(5315);
+      return __webpack_exec__(5046);
     });
     /******/ 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],
   {
-    /***/ 1552: /***/ function (
+    /***/ 4070: /***/ 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__(9773);
+          return __webpack_require__(8213);
         },
       ]);
       if (false) {
@@ -18,7 +18,7 @@
       /***/
     },
 
-    /***/ 1657: /***/ function (module, exports, __webpack_require__) {
+    /***/ 226: /***/ function (module, exports, __webpack_require__) {
       "use strict";
       /* __next_internal_client_entry_do_not_use__  cjs */
       Object.defineProperty(exports, "__esModule", {
@@ -37,15 +37,15 @@
       );
       const _reactdom = __webpack_require__(422);
       const _head = /*#__PURE__*/ _interop_require_default._(
-        __webpack_require__(4778)
+        __webpack_require__(6647)
       );
-      const _getimgprops = __webpack_require__(6609);
-      const _imageconfig = __webpack_require__(2262);
-      const _imageconfigcontext = __webpack_require__(5786);
-      const _warnonce = __webpack_require__(601);
-      const _routercontext = __webpack_require__(1038);
+      const _getimgprops = __webpack_require__(9819);
+      const _imageconfig = __webpack_require__(103);
+      const _imageconfigcontext = __webpack_require__(1106);
+      const _warnonce = __webpack_require__(2909);
+      const _routercontext = __webpack_require__(8703);
       const _imageloader = /*#__PURE__*/ _interop_require_default._(
-        __webpack_require__(4746)
+        __webpack_require__(4254)
       );
       // This is replaced by webpack define plugin
       const configEnv = {
@@ -370,7 +370,7 @@
       /***/
     },
 
-    /***/ 6609: /***/ function (
+    /***/ 9819: /***/ function (
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -386,9 +386,9 @@
           return getImgProps;
         },
       });
-      const _warnonce = __webpack_require__(601);
-      const _imageblursvg = __webpack_require__(8880);
-      const _imageconfig = __webpack_require__(2262);
+      const _warnonce = __webpack_require__(2909);
+      const _imageblursvg = __webpack_require__(6721);
+      const _imageconfig = __webpack_require__(103);
       const VALID_LOADING_VALUES =
         /* unused pure expression or super */ null && [
           "lazy",
@@ -753,7 +753,7 @@
       /***/
     },
 
-    /***/ 8880: /***/ function (__unused_webpack_module, exports) {
+    /***/ 6721: /***/ function (__unused_webpack_module, exports) {
       "use strict";
       /**
        * A shared function, used on both client and server, to generate a SVG blur placeholder.
@@ -808,7 +808,7 @@
       /***/
     },
 
-    /***/ 6715: /***/ function (
+    /***/ 981: /***/ function (
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -835,11 +835,11 @@
         },
       });
       const _interop_require_default = __webpack_require__(8266);
-      const _getimgprops = __webpack_require__(6609);
-      const _warnonce = __webpack_require__(601);
-      const _imagecomponent = __webpack_require__(1657);
+      const _getimgprops = __webpack_require__(9819);
+      const _warnonce = __webpack_require__(2909);
+      const _imagecomponent = __webpack_require__(226);
       const _imageloader = /*#__PURE__*/ _interop_require_default._(
-        __webpack_require__(4746)
+        __webpack_require__(4254)
       );
       const unstable_getImgProps = (imgProps) => {
         (0, _warnonce.warnOnce)(
@@ -871,7 +871,7 @@
       /***/
     },
 
-    /***/ 4746: /***/ function (__unused_webpack_module, exports) {
+    /***/ 4254: /***/ function (__unused_webpack_module, exports) {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -906,7 +906,7 @@
       /***/
     },
 
-    /***/ 9773: /***/ function (
+    /***/ 8213: /***/ function (
       __unused_webpack_module,
       __webpack_exports__,
       __webpack_require__
@@ -927,8 +927,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/[email protected][email protected]/node_modules/next/image.js
-      var next_image = __webpack_require__(1577);
+      // EXTERNAL MODULE: ./node_modules/.pnpm/[email protected][email protected]/node_modules/next/image.js
+      var next_image = __webpack_require__(73);
       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",
@@ -958,12 +958,12 @@
       /***/
     },
 
-    /***/ 1577: /***/ function (
+    /***/ 73: /***/ function (
       module,
       __unused_webpack_exports,
       __webpack_require__
     ) {
-      module.exports = __webpack_require__(6715);
+      module.exports = __webpack_require__(981);
 
       /***/
     },
@@ -974,7 +974,7 @@
       return __webpack_require__((__webpack_require__.s = moduleId));
     };
     /******/ __webpack_require__.O(0, [774, 888, 179], function () {
-      return __webpack_exec__(1552);
+      return __webpack_exec__(4070);
     });
     /******/ 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],
   {
-    /***/ 7410: /***/ function (
+    /***/ 4990: /***/ function (
       __unused_webpack_module,
       __unused_webpack_exports,
       __webpack_require__
@@ -9,7 +9,7 @@
       (window.__NEXT_P = window.__NEXT_P || []).push([
         "/",
         function () {
-          return __webpack_require__(1464);
+          return __webpack_require__(9075);
         },
       ]);
       if (false) {
@@ -18,7 +18,7 @@
       /***/
     },
 
-    /***/ 1464: /***/ function (
+    /***/ 9075: /***/ 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__(7410);
+      return __webpack_exec__(4990);
     });
     /******/ 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],
   {
-    /***/ 1794: /***/ function (
+    /***/ 8959: /***/ 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__(597);
+          return __webpack_require__(4375);
         },
       ]);
       if (false) {
@@ -18,7 +18,7 @@
       /***/
     },
 
-    /***/ 6804: /***/ function (module, exports) {
+    /***/ 4909: /***/ function (module, exports) {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -86,7 +86,7 @@
       /***/
     },
 
-    /***/ 5565: /***/ function (module, exports, __webpack_require__) {
+    /***/ 8406: /***/ function (module, exports, __webpack_require__) {
       "use s
Post job cleanup.
[command]/usr/bin/git version
git version 2.41.0
Temporarily overriding HOME='/home/runner/work/_temp/801ed101-cc1e-4440-99ba-20d44f8b79c6' 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: f4654374169c4126c284ada3ace63ecb1adf4045

ijjk · 2023-08-03T13:24:01Z

Tests Passed

…anges are caught

…cel/next.js into fix/investigate-memory-usage

feedthejim

looks mostly good to me

feedthejim · 2023-08-08T13:07:51Z

packages/next/src/server/lib/router-server.ts

-        ])
-      } catch (err) {
-        console.error(err)
+      for (const cb of nextDeleteCacheCallbacks) {


should those callbacks be parallelised?

@ijjk it's unclear to me why these are arrays, seems they're all arrays with only one item? 🤔

stx-chris · 2023-08-08T15:25:25Z

Hi @timneutkens I applied the latest canary v13.4.14-canary.1 to the reproduction-template via npx create-next-app -e reproduction-template (appDir only) and ran a bunch of requests via ab -n 30000 -c 100 http://127.0.0.1:3000/, as outlined here.

I ran

a baseline: once the server started
3 mins after the first run
3 mins after the second run
3 mins after the third run

I received the following results (left: develop, right: production, top to bottom the different runs):

With an older version 13.4.12, I received the following results (left: develop, right: production, top to bottom the different runs):

Observations:

next-render-worker-app now uses significantly less memory and releases more afterwards
next-render-worker-pages now uses about half the amount of memory compared to before
next-render-worker-pages not used in develop but still in production

karlhorky · 2023-08-09T08:24:22Z

Nice improvements! 🙌

next-render-worker-pages not used in develop but still in production

Oh interesting, I guess this will also be removed at some point, or is a remaining bug @timneutkens ?

gabor-at-reed · 2023-08-09T09:33:43Z

@timneutkens do you think it's related to our issue (#51653)?

timneutkens · 2023-08-09T13:51:18Z

Oh interesting, I guess this will also be removed at some point, or is a remaining bug @timneutkens ?

Please see my post on #49929. I didn't change the render workers in this PR.

@gabor-at-reed this PR and earlier changes in ~13.4.10+ (probably .11/.12 too) would have a big effect on request time. This one has a big improvement on that too.

karlhorky · 2023-08-09T14:06:24Z

Aha, if it's about this comment, then maybe it's going to be in the upcoming PR from Shu 🙌

@shuding is working on avoiding the extra Pages Router renderer when you only use App Router (and vice-versa).

mtlehtin · 2023-08-10T07:20:34Z

Oh interesting, I guess this will also be removed at some point, or is a remaining bug @timneutkens ?

Please see my post on #49929. I didn't change the render workers in this PR.

@gabor-at-reed this PR and earlier changes in ~13.4.10+ (probably .11/.12 too) would have a big effect on request time. This one has a big improvement on that too.

This seems to fix the request count issue as well. #51653 (comment)

karlhorky · 2023-08-23T09:43:25Z

@shuding is working on avoiding the extra Pages Router renderer when you only use App Router (and vice-versa).

Oh, was this work done in #54143? Maybe it should be announced also in #49929 to see if this helps anyone?

I've introduced a bug with memory watching in development in this PR: #53523. Specifically when calling `cleanup` the process would exit because the `exit` listener on the childprocess would be called which then calls `process.exit(0)`. This caused a condition where calling `worker.end()` would immediately quit the process. This PR ensures the cleanup listeners for childprocess are disabled (`.off(`) so that when we call `worker.end()` the process is terminated without the main process being terminated.

timneutkens added 6 commits August 3, 2023 11:11

Remove unused types

ba3d6d6

Remove useWorkers option (simplifying implementation)

56c8daf

Don't create separate router worker, use the main process

f8f0954

Remove sockets variable as server.close() already handlers it.

8afa284

Don't use underscore for used variables

c3a7663

Only initialize workers once.

edb494c

ijjk added created-by: Next.js team PRs by the Next.js team. type: next labels Aug 3, 2023

timneutkens changed the title ~~fix/investigate memory usage~~ Investigate memory usage Aug 3, 2023

timneutkens changed the title ~~Investigate memory usage~~ WIP: Investigate memory usage Aug 3, 2023

timneutkens mentioned this pull request Aug 3, 2023

[NEXT-1314] High memory usage in deployed Next.js project #49929

Closed

1 task

masterkain mentioned this pull request Aug 3, 2023

/404 compiled as pages route #53059

Open

1 task

timneutkens added 2 commits August 3, 2023 14:16

Fix typescript errors

18007e7

Fix type mismatches

176f7f7

timneutkens added 14 commits August 3, 2023 17:06

Bring back compression

2c790d4

Fix socket connection with custom server

a03d642

Use fixture for test

47e0059

WIP rework config file watching in dev

b563a8d

Reboot on config file changes

968b253

Handle case where cleanup throws

5c84094

Remove unused initializer

a46589e

Reset test

4c097e1

Use temporary redirect for test otherwise the browser caches it.

c6cc0a0

Ensure watcher is attached before booting server so that immediate ch…

da891b9

…anges are caught

Merge branch 'canary' into fix/investigate-memory-usage

50e66f2

Disable project delete test

828847d

Merge branch 'canary' into fix/investigate-memory-usage

74bd66d

Merge branch 'fix/investigate-memory-usage' of https://github.com/ver…

342cae0

…cel/next.js into fix/investigate-memory-usage

timneutkens added 3 commits August 8, 2023 12:51

Fix lint

cda6ef5

Bring back previous test

bfe6d04

Remove unused variables

f465437

timneutkens changed the title ~~WIP: Investigate memory usage~~ Consolidate Server and Routing process into one process Aug 8, 2023

timneutkens marked this pull request as ready for review August 8, 2023 12:34

timneutkens requested review from ijjk, shuding, padmaia, huozhi, feedthejim and ztanner as code owners August 8, 2023 12:34

feedthejim approved these changes Aug 8, 2023

View reviewed changes

timneutkens merged commit c5a8e09 into canary Aug 8, 2023
54 of 56 checks passed

timneutkens deleted the fix/investigate-memory-usage branch August 8, 2023 14:06

mtlehtin mentioned this pull request Aug 9, 2023

3x more network requests and latency issue on the same project after version upgrade #51653

Closed

1 task

This was referenced Aug 10, 2023

Improve deployed memory footprint with different start commands upleveled/next-js-example-spring-2023-atvie#10

Open

Upgrade Next.js to latest canary version upleveled/security-vulnerability-examples-next-js-postgres#108

Merged

jmartin4563 mentioned this pull request Aug 14, 2023

test: update versioned test helper to handle [email protected] changes newrelic/newrelic-node-nextjs#153

Merged

timneutkens mentioned this pull request Aug 15, 2023

Hight number of processes of /next/dist/compiled/jest-worker/processChild.js still alive after next build #45508

Closed

1 task

timneutkens mentioned this pull request Aug 30, 2023

Fix memory watcher reboot #54760

Merged

github-actions bot added the locked label Sep 6, 2023

github-actions bot locked as resolved and limited conversation to collaborators Sep 6, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Consolidate Server and Routing process into one process #53523

Consolidate Server and Routing process into one process #53523

timneutkens commented Aug 3, 2023 •

edited

Loading

ijjk commented Aug 3, 2023 •

edited

Loading

Diffs

ijjk commented Aug 3, 2023 •

edited

Loading

feedthejim left a comment

feedthejim Aug 8, 2023

timneutkens Aug 8, 2023

stx-chris commented Aug 8, 2023

karlhorky commented Aug 9, 2023

gabor-at-reed commented Aug 9, 2023

timneutkens commented Aug 9, 2023 •

edited

Loading

karlhorky commented Aug 9, 2023

mtlehtin commented Aug 10, 2023

karlhorky commented Aug 23, 2023

Consolidate Server and Routing process into one process #53523

Consolidate Server and Routing process into one process #53523

Conversation

timneutkens commented Aug 3, 2023 • edited Loading

Improvement

Baseline

Peak usage

ijjk commented Aug 3, 2023 • edited Loading

Stats from current PR

Diffs

ijjk commented Aug 3, 2023 • edited Loading

Tests Passed

feedthejim left a comment

Choose a reason for hiding this comment

feedthejim Aug 8, 2023

Choose a reason for hiding this comment

timneutkens Aug 8, 2023

Choose a reason for hiding this comment

stx-chris commented Aug 8, 2023

karlhorky commented Aug 9, 2023

gabor-at-reed commented Aug 9, 2023

timneutkens commented Aug 9, 2023 • edited Loading

karlhorky commented Aug 9, 2023

mtlehtin commented Aug 10, 2023

karlhorky commented Aug 23, 2023

timneutkens commented Aug 3, 2023 •

edited

Loading

ijjk commented Aug 3, 2023 •

edited

Loading

ijjk commented Aug 3, 2023 •

edited

Loading

timneutkens commented Aug 9, 2023 •

edited

Loading