ensure config is only loaded once

vercel · Sep 1, 2023 · bde9e09 · bde9e09
1 parent 97e85bb
commit bde9e09
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 12 deletions.
diff --git a/packages/next/src/bin/next.ts b/packages/next/src/bin/next.ts
@@ -135,15 +135,6 @@ async function main() {
     )
     const origEnv = Object.assign({}, process.env)
 
-    // TODO: set config to env variable to be re-used so we don't reload
-    // un-necessarily
-    const config = await loadConfig(
-      command === 'dev' ? PHASE_DEVELOPMENT_SERVER : PHASE_PRODUCTION_SERVER,
-      dir,
-      undefined,
-      undefined,
-      true
-    )
     let dirsResult: ReturnType<typeof findPagesDir> | undefined = undefined
 
     try {
@@ -156,6 +147,16 @@ async function main() {
       process.env = origEnv
     }
 
+    const config = await loadConfig(
+      command === 'dev' ? PHASE_DEVELOPMENT_SERVER : PHASE_PRODUCTION_SERVER,
+      dir,
+      undefined,
+      undefined,
+      true
+    )
+
+    process.env.__NEXT_EXISTING_CONFIG = JSON.stringify(config)
+
     if (dirsResult?.appDir) {
       // we need to reset env if we are going to create
       // the worker process with the esm loader so that the

diff --git a/packages/next/src/server/config.ts b/packages/next/src/server/config.ts
@@ -761,8 +761,8 @@ export default async function loadConfig(
   // have Webpack plugins added.
   // Because of this change, unserializable fields like `.webpack` won't be
   // existing here but the render worker shouldn't use these as well.
-  if (process.env.__NEXT_PRIVATE_RENDER_WORKER_CONFIG) {
-    return JSON.parse(process.env.__NEXT_PRIVATE_RENDER_WORKER_CONFIG)
+  if (process.env.__NEXT_EXISTING_CONFIG) {
+    return JSON.parse(process.env.__NEXT_EXISTING_CONFIG)
   }
 
   const curLog = silent

diff --git a/packages/next/src/server/lib/server-ipc/index.ts b/packages/next/src/server/lib/server-ipc/index.ts
@@ -109,7 +109,7 @@ export const createWorker = async (
           .replace(/--max-old-space-size=[\d]{1,}/, '')
           .trim(),
         __NEXT_PRIVATE_RENDER_WORKER: type,
-        __NEXT_PRIVATE_RENDER_WORKER_CONFIG: JSON.stringify(nextConfig),
+        __NEXT_EXISTING_CONFIG: JSON.stringify(nextConfig),
         __NEXT_PRIVATE_ROUTER_IPC_PORT: ipcPort + '',
         __NEXT_PRIVATE_ROUTER_IPC_KEY: ipcValidationKey,
         __NEXT_PRIVATE_STANDALONE_CONFIG: