Merge pull request #28 from netlify/bug/fix-functions-src

Author: ehmicky

index.js

@@ -15,7 +15,7 @@ const isStaticExportProject = require('./helpers/isStaticExportProject')
 // - Between the build and postbuild steps, any functions are bundled
 
 module.exports = {
-  async onPreBuild({ netlifyConfig, packageJson, utils }) {
+  async onPreBuild({ netlifyConfig, packageJson, utils, constants: { FUNCTIONS_SRC } }) {
     const { failBuild } = utils.build
 
     if (!packageJson) {
@@ -46,7 +46,8 @@ module.exports = {
     //   failBuild(`This plugin cannot support apps that manually use next-on-netlify. Uninstall next-on-netlify as a dependency to resolve.`);
     // }
 
-    const isFunctionsDirectoryCorrect = build && build.functions && build.functions === path.resolve('out_functions')
+    const isFunctionsDirectoryCorrect =
+      FUNCTIONS_SRC !== undefined && path.resolve(FUNCTIONS_SRC) === path.resolve('out_functions')
     if (!isFunctionsDirectoryCorrect) {
       // to do rephrase
       failBuild(

test/index.js

@@ -39,6 +39,7 @@ describe('preBuild()', () => {
       netlifyConfig: {},
       packageJson,
       utils,
+      constants: { FUNCTIONS_SRC: 'out_functions' },
     })
 
     expect(utils.build.failBuild.mock.calls[0][0]).toEqual(
@@ -54,6 +55,7 @@ describe('preBuild()', () => {
       netlifyConfig,
       packageJson,
       utils,
+      constants: { FUNCTIONS_SRC: 'out_functions' },
     })
 
     expect(utils.build.failBuild.mock.calls[0][0]).toEqual(
@@ -62,13 +64,13 @@ describe('preBuild()', () => {
   })
 
   test('fail build if the app has no functions directory defined', async () => {
-    const netlifyConfig = { build: {} }
     const packageJson = {}
 
     await plugin.onPreBuild({
-      netlifyConfig,
+      netlifyConfig: {},
       packageJson,
       utils,
+      constants: {},
     })
 
     expect(utils.build.failBuild.mock.calls[0][0]).toEqual(
@@ -81,23 +83,24 @@ describe('preBuild()', () => {
       netlifyConfig: {},
       packageJson: {},
       utils,
+      constants: { FUNCTIONS_SRC: 'out_functions' },
     })
 
     expect(makef.createFile.mock.calls.length).toEqual(1)
   })
 
   test(`fail build if the app's next config has an invalid target`, async () => {
-    const netlifyConfig = { build: { functions: path.resolve('out_functions') } }
     mockFs({
       'next.config.js': {
         target: 'nonsense',
       },
     })
 
     await plugin.onPreBuild({
-      netlifyConfig,
+      netlifyConfig: {},
       packageJson: {},
       utils,
+      constants: { FUNCTIONS_SRC: 'out_functions' },
     })
 
     mockFs.restore()