fix: use default publish dir

Author: ascorbic

helpers/checkNxConfig.js

@@ -2,7 +2,7 @@ const { existsSync } = require('fs')
 const { EOL } = require('os')
 const path = require('path')
 
-const checkNxConfig = ({ netlifyConfig, nextConfig, failBuild, constants: { PUBLISH_DIR } }) => {
+const checkNxConfig = ({ netlifyConfig, nextConfig, failBuild, constants: { PUBLISH_DIR = 'out' } }) => {
   const errors = []
   if (nextConfig.distDir === '.next') {
     errors.push(
@@ -15,8 +15,9 @@ const checkNxConfig = ({ netlifyConfig, nextConfig, failBuild, constants: { PUBL
       "Please set the 'publish' value in your Netlify build config to a folder inside your app directory. e.g. 'apps/myapp/out'",
     )
   }
+
   // Look for the config file as a sibling of the publish dir
-  const expectedConfigFile = path.resolve(netlifyConfig.build.publish, '..', 'next.config.js')
+  const expectedConfigFile = path.resolve(netlifyConfig.build.publish || PUBLISH_DIR, '..', 'next.config.js')
 
   if (expectedConfigFile !== nextConfig.configFile) {
     const confName = path.relative(process.cwd(), nextConfig.configFile)

helpers/getNextRoot.js

@@ -6,10 +6,16 @@ const path = require('path')
  * If there's no next.config.js in the root, we instead look for it as a sibling of the publish dir
  */
 const getNextRoot = ({ netlifyConfig }) => {
+  console.log('cwd', process.cwd(), 'publish', netlifyConfig.build.publish)
   let nextRoot = process.cwd()
-  if (!existsSync(path.join(nextRoot, 'next.config.js')) && netlifyConfig.build.publish) {
+  if (
+    !existsSync(path.join(nextRoot, 'next.config.js')) &&
+    netlifyConfig.build.publish &&
+    netlifyConfig.build.publish !== nextRoot
+  ) {
     nextRoot = path.dirname(netlifyConfig.build.publish)
   }
+  console.log({ nextRoot })
   return nextRoot
 }
 

helpers/verifyBuildTarget.js

@@ -41,7 +41,10 @@ const verifyBuildTarget = async ({ failBuild, netlifyConfig }) => {
 
   // Creating a config file, because otherwise Next won't reload the config and pick up the new target
 
-  if (!configFile) {
+  if (configFile) {
+    console.log(`Using ${configFile}`)
+  } else {
+    console.log(`Writing config to ${path.resolve(nextRoot, 'next.config.js')}`)
     await writeFile(
       path.resolve(nextRoot, 'next.config.js'),
       `
@@ -52,7 +55,8 @@ module.exports = {
     )
   }
   // Force the new config to be generated
-  await getNextConfig(failBuild, nextRoot)
+  const newConf = await getNextConfig(failBuild, nextRoot)
+  console.log(`Set target to ${newConf.target}`)
   // Reset the value in case something else is looking for it
   process.env.NOW_BUILDER = false
 }

index.js

@@ -1,3 +1,4 @@
+const { readdirSync } = require('fs')
 const path = require('path')
 
 const makeDir = require('make-dir')
@@ -17,6 +18,7 @@ const nextOnNetlify = require('./src')
 
 module.exports = {
   async onPreBuild({ netlifyConfig, packageJson, utils, constants }) {
+    console.log(process.env, { constants }, process.cwd())
     const { failBuild } = utils.build
 
     validateNextUsage({ failBuild, netlifyConfig })
@@ -60,24 +62,26 @@ module.exports = {
   async onBuild({
     netlifyConfig,
     packageJson,
-    constants: { PUBLISH_DIR, FUNCTIONS_SRC = DEFAULT_FUNCTIONS_SRC },
+    constants: { PUBLISH_DIR = DEFAULT_PUBLISH_DIR, FUNCTIONS_SRC = DEFAULT_FUNCTIONS_SRC },
     utils,
   }) {
     const { failBuild } = utils.build
 
     const nextRoot = getNextRoot({ netlifyConfig })
 
     if (doesNotNeedPlugin({ netlifyConfig, packageJson, failBuild })) {
+      console.log('Does not need plugin')
       return
     }
 
-    console.log(`** Running Next on Netlify package **`)
+    console.log(`** Running Next on Netlify package **`, netlifyConfig.build.publish)
 
     await makeDir(PUBLISH_DIR)
-
+    const { target, distDir } = await getNextConfig(utils.failBuild, nextRoot)
+    console.log(`Building with target ${target} distDir ${distDir}`)
     await nextOnNetlify({
       functionsDir: path.resolve(FUNCTIONS_SRC),
-      publishDir: netlifyConfig.build.publish,
+      publishDir: netlifyConfig.build.publish || PUBLISH_DIR,
       nextRoot,
     })
   },
@@ -89,10 +93,12 @@ module.exports = {
     const nextRoot = getNextRoot({ netlifyConfig })
 
     const nextConfig = await getNextConfig(utils.failBuild, nextRoot)
+    console.log(`Finished building with target ${nextConfig.target}`)
     await saveCache({ cache: utils.cache, distDir: nextConfig.distDir })
     copyUnstableIncludedDirs({ nextConfig, functionsDist: path.resolve(FUNCTIONS_DIST) })
   },
 }
 
 const DEFAULT_FUNCTIONS_SRC = 'netlify/functions'
 const DEFAULT_FUNCTIONS_DIST = '.netlify/functions/'
+const DEFAULT_PUBLISH_DIR = 'out'

src/index.js

@@ -23,6 +23,7 @@ const build = async (functionsPath, publishPath, nextRoot) => {
   // If we're in a monorepo we need to move into the Next site root
   const oldCwd = process.cwd()
   if (nextRoot !== oldCwd) {
+    console.log(`Changing dir from ${oldCwd} to ${nextRoot}`)
     process.chdir(nextRoot)
   }
   copyPublicFiles(publishPath)
@@ -79,7 +80,7 @@ const nextOnNetlify = async (options = {}) => {
   const functionsPath = normalize(options.functionsDir || NETLIFY_FUNCTIONS_PATH)
   const publishPath = normalize(options.publishDir || NETLIFY_PUBLISH_PATH)
   const nextRoot = normalize(options.nextRoot || process.cwd())
-
+  console.log('nextRoot', nextRoot)
   if (options.watch) {
     watch(functionsPath, publishPath, nextRoot)
   } else {

src/lib/steps/copyNextAssets.js

@@ -1,4 +1,5 @@
-const { join } = require('path')
+const { readdirSync } = require('fs')
+const { join, resolve } = require('path')
 
 const { copySync, existsSync } = require('fs-extra')
 
@@ -15,8 +16,11 @@ const copyNextAssets = async (publishPath) => {
   const nextDistDir = await getNextDistDir()
   const staticAssetsPath = join(nextDistDir, 'static')
   if (!existsSync(staticAssetsPath)) {
+    console.log(nextDistDir, readdirSync(nextDistDir))
     throw new Error(
-      `No static assets found in your distDir (missing /static in ${nextDistDir}). Please check your project configuration. Your next.config.js must be one of \`serverless\` or \`experimental-serverless-trace\`. Your build command should include \`next build\`.`,
+      `No static assets found in your distDir (missing /static in ${resolve(
+        nextDistDir,
+      )}). Please check your project configuration. Your next.config.js must be one of \`serverless\` or \`experimental-serverless-trace\`. Your build command should include \`next build\`.`,
     )
   }
   logTitle('💼 Copying static NextJS assets to', publishPath)