fix: take repositoryRoot into account when computing base path with…

… esbuild (#754)

* chore: add failing case to test

* fix: take `repositoryRoot` into account in esbuild base path computation

src/runtimes/node/bundlers/esbuild/index.ts

@@ -3,6 +3,7 @@ import { dirname, normalize } from 'path'
 import type { BundleFunction } from '..'
 import type { FunctionConfig } from '../../../../config'
 import { getPathWithExtension } from '../../../../utils/fs'
+import { nonNullable } from '../../../../utils/non_nullable'
 import { getBasePath } from '../../utils/base_path'
 
 import { bundleJsFile } from './bundler'
@@ -12,15 +13,19 @@ import { getSrcFiles } from './src_files'
 const getFunctionBasePath = ({
   basePathFromConfig,
   mainFile,
+  repositoryRoot,
   supportingSrcFiles,
 }: {
   basePathFromConfig?: string
   mainFile: string
+  repositoryRoot?: string
   supportingSrcFiles: string[]
 }) => {
-  // If there is a base path defined in the config, we use that.
+  // If there is a base path defined in the config, we use that. To account for
+  // paths outside of `basePathFromConfig` but inside `repositoryRoot`, we use
+  // the common path prefix between the two.
   if (basePathFromConfig !== undefined) {
-    return basePathFromConfig
+    return getBasePath([basePathFromConfig, repositoryRoot].filter(nonNullable))
   }
 
   // If not, the base path is the common path prefix between all the supporting
@@ -52,6 +57,7 @@ const bundle: BundleFunction = async ({
   mainFile,
   name,
   pluginsModulesPath,
+  repositoryRoot,
   runtime,
   srcDir,
   srcPath,
@@ -102,7 +108,12 @@ const bundle: BundleFunction = async ({
   // bundled file further below.
   const supportingSrcFiles = srcFiles.filter((path) => path !== mainFile)
   const normalizedMainFile = getPathWithExtension(mainFile, '.js')
-  const functionBasePath = getFunctionBasePath({ basePathFromConfig: basePath, mainFile, supportingSrcFiles })
+  const functionBasePath = getFunctionBasePath({
+    basePathFromConfig: basePath,
+    mainFile,
+    repositoryRoot,
+    supportingSrcFiles,
+  })
 
   return {
     aliases: bundlePaths,

tests/fixtures/node-monorepo/package.json

@@ -2,6 +2,7 @@
   "name": "local-node-module",
   "version": "1.0.0",
   "dependencies": {
-    "@netlify/mock-package": "1.0.0"
+    "@netlify/mock-package": "1.0.0",
+    "@netlify/mock-package-2": "1.0.0"
   }
 }

tests/fixtures/node-monorepo/packages/site-1/netlify/functions/function-1.js

@@ -1 +1,4 @@
-module.exports = require('@netlify/mock-package')
+const mock1 = require('@netlify/mock-package')
+const mock2 = require('@netlify/mock-package-2')
+
+module.exports = { mock1, mock2 }

tests/main.js

@@ -2175,15 +2175,21 @@ testMany(
     const basePath = join(fixtureDir, 'packages', 'site-1', 'netlify', 'functions')
     const opts = merge(options, {
       basePath,
+      config: {
+        '*': {
+          externalNodeModules: ['@netlify/mock-package-2'],
+        },
+      },
       repositoryRoot: fixtureDir,
     })
     const result = await zipFunction(`${basePath}/function-1.js`, tmpDir, opts)
 
     await unzipFiles([result])
 
-    const { mock } = require(`${tmpDir}/function-1.js`)
+    const { mock1, mock2 } = require(`${tmpDir}/function-1.js`)
 
-    t.true(mock)
+    t.true(mock1)
+    t.true(mock2)
   },
 )