fix: more robust static site detection

Author: ascorbic

helpers/isStaticExportProject.js

@@ -6,7 +6,9 @@ const usesBuildCommand = require('./usesBuildCommand')
 const isStaticExportProject = ({ build, scripts }) => {
   const NEXT_EXPORT_COMMAND = 'next export'
 
-  const isStaticExport = usesBuildCommand({ build, scripts, command: NEXT_EXPORT_COMMAND })
+  const isStaticExport =
+    usesBuildCommand({ build, scripts, command: NEXT_EXPORT_COMMAND }) ||
+    (process.env.NEXT_IS_STATIC_EXPORT && process.env.NEXT_IS_STATIC_EXPORT !== 'false')
 
   if (isStaticExport) {
     console.log(

helpers/usesBuildCommand.js

@@ -1,3 +1,4 @@
+const parseNpmScript = require('@netlify/parse-npm-script')
 // Does the build command include this value, either directly or via an npm script?
 const usesBuildCommand = ({ build, scripts, command }) => {
   if (!build.command) return false
@@ -6,10 +7,13 @@ const usesBuildCommand = ({ build, scripts, command }) => {
     return true
   }
 
-  return Object.entries(scripts).some(
-    // Search for a npm script that is being called by the build command, and includes the searched-for command
-    ([scriptName, scriptValue]) => build.command.includes(scriptName) && scriptValue.includes(command),
-  )
+  if (!build.command.includes('npm run') && !build.command.includes('yarn')) {
+    return false
+  }
+  // This resolves the npm script that is actually being run
+  const { raw } = parseNpmScript({ scripts }, build.command)
+
+  return raw.some((script) => script.includes(command))
 }
 
 module.exports = usesBuildCommand