pass constants FUNCTIONS_SRC and PUBLISH_DIR to nextOnNetlify

Author: lindsaylevine

index.js

@@ -4,13 +4,11 @@ const util = require('util')
 
 const findUp = require('find-up')
 const makeDir = require('make-dir')
-const { copy } = require('cpx')
 
 const isStaticExportProject = require('./helpers/isStaticExportProject')
 const validateNextUsage = require('./helpers/validateNextUsage')
 
 const pWriteFile = util.promisify(fs.writeFile)
-const pCopy = util.promisify(copy)
 
 // * Helpful Plugin Context *
 // - Between the prebuild and build steps, the project's build command is run
@@ -72,16 +70,13 @@ module.exports = {
   async onBuild({ constants: { PUBLISH_DIR, FUNCTIONS_SRC = DEFAULT_FUNCTIONS_SRC } }) {
     console.log(`** Running Next on Netlify package **`)
 
+    await makeDir(PUBLISH_DIR)
+
     // We cannot load `next-on-netlify` (which depends on `next`) at the
     // top-level because we validate whether the site is using `next`
     // inside `onPreBuild`.
     const nextOnNetlify = require('next-on-netlify')
-    nextOnNetlify()
-
-    // Next-on-netlify puts its files into out_functions and out_publish
-    // Copy files from next-on-netlify's output to the right functions/publish dirs
-    await makeDir(PUBLISH_DIR)
-    await Promise.all([pCopy('out_functions/**', FUNCTIONS_SRC), pCopy('out_publish/**', PUBLISH_DIR)])
+    nextOnNetlify({ functionsDir: FUNCTIONS_SRC, publishDir: PUBLISH_DIR })
   },
 }
 

package-lock.json

@@ -27,7 +27,7 @@
     "cpx": "^1.5.0",
     "find-up": "^4.1.0",
     "make-dir": "^3.1.0",
-    "next-on-netlify": "^2.6.0"
+    "next-on-netlify": "^2.6.2"
   },
   "devDependencies": {
     "@netlify/eslint-config-node": "^0.3.0",

package.json

@@ -10,7 +10,7 @@
   "dependencies": {
     "date-fns": "^2.16.1",
     "next": "9.5.3",
-    "next-on-netlify": "^2.6.0",
+    "next-on-netlify": "^2.6.2",
     "react": "16.13.1",
     "react-dom": "16.13.1"
   }

sample/package-lock.json

@@ -1,3 +1,4 @@
+const fs = require('fs')
 const path = require('path')
 const process = require('process')
 const { promisify } = require('util')
@@ -121,51 +122,43 @@ describe('preBuild()', () => {
 })
 
 describe('onBuild()', () => {
-  test('runs next on netlify', async () => {
-    await plugin.onBuild({
-      constants: {
-        PUBLISH_DIR: '.',
-      },
-    })
-
-    expect(nextOnNetlify.mock.calls.length).toEqual(1)
-  })
-
-  test('calls makeDir with correct path', async () => {
+  test('runs NoN with functions_src & publish_dir options', async () => {
     const PUBLISH_DIR = 'some/path'
+    const FUNCTIONS_SRC = 'other/path'
     await plugin.onBuild({
       constants: {
         PUBLISH_DIR,
+        FUNCTIONS_SRC,
       },
     })
 
-    expect(await pathExists(PUBLISH_DIR)).toBeTruthy()
+    const nextOnNetlifyOptions = nextOnNetlify.mock.calls[0][0]
+    expect(nextOnNetlifyOptions.functionsDir).toEqual(FUNCTIONS_SRC)
+    expect(nextOnNetlifyOptions.publishDir).toEqual(PUBLISH_DIR)
   })
 
-  test('copy files to the publish directory', async () => {
-    await useFixture('publish_copy_files')
-    const PUBLISH_DIR = 'publish'
+  test('runs NoN with publish_dir option only', async () => {
+    const defaultFunctionsSrc = 'netlify-automatic-functions'
+    const PUBLISH_DIR = 'some/path'
     await plugin.onBuild({
       constants: {
         PUBLISH_DIR,
       },
     })
 
-    expect(await pathExists(`${PUBLISH_DIR}/subdir/dummy.txt`)).toBeTruthy()
+    const nextOnNetlifyOptions = nextOnNetlify.mock.calls[0][0]
+    expect(nextOnNetlifyOptions.functionsDir).toEqual(defaultFunctionsSrc)
+    expect(nextOnNetlifyOptions.publishDir).toEqual(PUBLISH_DIR)
   })
 
-  test.each([
-    { FUNCTIONS_SRC: 'functions', resolvedFunctions: 'functions' },
-    { FUNCTIONS_SRC: undefined, resolvedFunctions: 'netlify-automatic-functions' },
-  ])('copy files to the functions directory', async ({ FUNCTIONS_SRC, resolvedFunctions }) => {
-    await useFixture('functions_copy_files')
+  test('calls makeDir with correct path', async () => {
+    const PUBLISH_DIR = 'some/path'
     await plugin.onBuild({
       constants: {
-        FUNCTIONS_SRC,
-        PUBLISH_DIR: '.',
+        PUBLISH_DIR,
       },
     })
 
-    expect(await pathExists(`${resolvedFunctions}/next_random/next_random.js`)).toBeTruthy()
+    expect(await pathExists(PUBLISH_DIR)).toBeTruthy()
   })
 })