fix: cwd memoization

Author: ehmicky

Diff for: helpers/getNextConfig.js

@@ -1,29 +1,35 @@
 'use strict'
 
+const { cwd: getCwd } = require('process')
 const { resolve } = require('path')
 
 const moize = require('moize')
 
 // We used to cache nextConfig for any cwd. Now we pass process.cwd() to cache
 // (or memoize) nextConfig per cwd.
-const getNextConfig = async function (cwd, failBuild = defaultFailBuild) {
+const getNextConfig = async function (failBuild = defaultFailBuild, cwd = getCwd()) {
   // We cannot load `next` at the top-level because we validate whether the
   // site is using `next` inside `onPreBuild`.
   const { PHASE_PRODUCTION_BUILD } = require('next/constants')
   const loadConfig = require('next/dist/next-server/server/config').default
 
   try {
-    return await loadConfig(PHASE_PRODUCTION_BUILD, resolve('.'))
+    return await loadConfig(PHASE_PRODUCTION_BUILD, cwd)
   } catch (error) {
     return failBuild('Error loading your next.config.js.', { error })
   }
 }
 
-const moizedGetNextConfig = moize(getNextConfig, { maxSize: 1e3, isPromise: true })
+const moizedGetNextConfig = moize(getNextConfig, {
+  maxSize: 1e3,
+  isPromise: true,
+  // Memoization cache key. We need to use `transformArgs` so `process.cwd()`
+  // default value is assigned
+  transformArgs: ([, cwd = getCwd()]) => [cwd],
+})
 
 const defaultFailBuild = function (message, { error }) {
   throw new Error(`${message}\n${error.stack}`)
 }
 
-// module.exports = process.env.NODE_ENV === 'test' ? getNextConfig : moizedGetNextConfig
 module.exports = moizedGetNextConfig

Diff for: helpers/hasCorrectNextConfig.js

@@ -5,7 +5,7 @@ const hasCorrectNextConfig = async ({ nextConfigPath, failBuild }) => {
   // In the plugin's case, no config is valid because we'll make it ourselves
   if (nextConfigPath === undefined) return true
 
-  const { target } = await getNextConfig(process.cwd(), failBuild)
+  const { target } = await getNextConfig(failBuild)
 
   // If the next config exists, log warning if target isnt in acceptableTargets
   const acceptableTargets = ['serverless', 'experimental-serverless-trace']

Diff for: index.js

@@ -28,7 +28,7 @@ module.exports = {
       return failBuild('Could not find a package.json for this project')
     }
 
-    const nextConfig = await getNextConfig(process.cwd(), utils.failBuild)
+    const nextConfig = await getNextConfig(utils.failBuild)
     await restoreCache({ cache: utils.cache, distDir: nextConfig.distDir })
 
     if (await doesNotNeedPlugin({ netlifyConfig, packageJson, failBuild })) {
@@ -70,7 +70,7 @@ module.exports = {
       return
     }
 
-    const nextConfig = await getNextConfig(process.cwd(), utils.failBuild)
+    const nextConfig = await getNextConfig(utils.failBuild)
     await saveCache({ cache: utils.cache, distDir: nextConfig.distDir })
     copyUnstableIncludedDirs({ nextConfig, functionsDist: FUNCTIONS_DIST })
   },

Diff for: src/lib/helpers/getI18n.js

@@ -2,7 +2,7 @@
 const getNextConfig = require('../../../helpers/getNextConfig')
 
 const getI18n = async () => {
-  const nextConfig = await getNextConfig(process.cwd())
+  const nextConfig = await getNextConfig()
 
   return nextConfig.i18n || { locales: [] }
 }

Diff for: src/lib/helpers/getNextDistDir.js

@@ -3,7 +3,7 @@ const { join } = require('path')
 const getNextConfig = require('../../../helpers/getNextConfig')
 
 const getNextDistDir = async () => {
-  const nextConfig = await getNextConfig(process.cwd())
+  const nextConfig = await getNextConfig()
 
   return join('.', nextConfig.distDir)
 }

Diff for: src/lib/helpers/getPrerenderManifest.js

@@ -27,7 +27,7 @@ const transformManifestForI18n = async (manifest) => {
 }
 
 const getPrerenderManifest = async () => {
-  const nextConfig = await getNextConfig(process.cwd())
+  const nextConfig = await getNextConfig()
   const nextDistDir = await getNextDistDir()
   const manifest = readJSONSync(join(nextDistDir, 'prerender-manifest.json'))
   if (nextConfig.i18n) return await transformManifestForI18n(manifest)