test changes and updates

Author: lindsaylevine

.gitignore

@@ -7,9 +7,6 @@ yarn-debug.log*
 yarn-error.log*
 lerna-debug.log*
 
-# Tests
-next.config.js
-
 # Diagnostic reports (https://nodejs.org/api/report.html)
 report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
 

.prettierignore

@@ -17,5 +17,5 @@ node_modules
 .next
 
 # Test
-next.config.js
 __mocks__
+sample

__mocks__/makef.js

@@ -0,0 +1,3 @@
+module.exports = {
+  createFile: jest.fn()
+};

index.js

@@ -1,8 +1,11 @@
-const { existsSync, readFileSync, appendFileSync } = require('fs')
+const fs = require('fs')
+const { promisify } = require('util')
+const exists = promisify(fs.exists)
 const path = require('path')
 const nextOnNetlify = require('next-on-netlify')
 const { PHASE_PRODUCTION_BUILD } = require('next/constants')
 const { default: loadConfig } = require('next/dist/next-server/server/config')
+const makef = require('makef')
 const makeDir = require('make-dir')
 const cpx = require('cpx')
 const isStaticExportProject = require('./helpers/isStaticExportProject')
@@ -12,9 +15,23 @@ const isStaticExportProject = require('./helpers/isStaticExportProject')
 // - Between the build and postbuild steps, any functions are bundled
 
 module.exports = {
-  async onPreBuild({ netlifyConfig = {}, packageJson: { scripts = {}, dependencies = {} }, utils }) {
+  // TO-DO: remove default packageJson once CLI issue is diagnosed
+  async onPreBuild({ netlifyConfig, packageJson = {}, utils }) {
     const { failBuild } = utils.build
+
+    if (!packageJson) {
+      failBuild(`Could not find a package.json for this project`)
+      return
+    }
+
+    if (!netlifyConfig) {
+      failBuild(`Could not find a Netlify configuration for this project`)
+      return
+    }
+
     const { build } = netlifyConfig
+    const { scripts = {}, dependencies = {} } = packageJson
+
     // TO-DO: Post alpha, try to remove this workaround for missing deps in
     // the next-on-netlify function template
     await utils.run.command('npm install next-on-netlify@latest')
@@ -38,7 +55,8 @@ module.exports = {
       )
     }
 
-    if (existsSync('next.config.js')) {
+    const hasNextConfig = await exists('next.config.js')
+    if (hasNextConfig) {
       // If the next config exists, fail build if target isnt in acceptableTargets
       const acceptableTargets = ['serverless', 'experimental-serverless-trace']
       const nextConfig = loadConfig(PHASE_PRODUCTION_BUILD, path.resolve('.'))
@@ -53,7 +71,7 @@ module.exports = {
             target: 'serverless'
           }
         `
-      appendFileSync('next.config.js', nextConfig)
+      makef.createFile({ 'next.config.js': nextConfig })
       console.log(`** Adding next.config.js with target set to 'serverless' **`)
     }
   },
@@ -69,7 +87,8 @@ module.exports = {
     // if (!existsSync(FUNCTIONS_DIST)) {
     //   await makeDir(FUNCTIONS_DIST);
     // }
-    if (!existsSync(PUBLISH_DIR)) {
+    const hasPublishDir = await exists(PUBLISH_DIR)
+    if (!hasPublishDir) {
       await makeDir(PUBLISH_DIR)
     }