feat: support functions within type=module packages (Closes #3394)

package.json

@@ -173,6 +173,7 @@
     "prettyjson": "^1.2.1",
     "pump": "^3.0.0",
     "raw-body": "^2.4.1",
+    "read-pkg-up": "^7.0.1",
     "resolve": "^1.12.0",
     "semver": "^7.3.4",
     "source-map-support": "^0.5.19",

renovate.json5

@@ -25,6 +25,7 @@
         'http-proxy-middleware',
         'p-map',
         'node-version-alias',
+        'read-pkg-up',
       ],
       major: {
         enabled: false,

src/lib/functions/runtimes/js/builders/zisi.js

@@ -1,15 +1,20 @@
+const fs = require('fs')
 const path = require('path')
+const { promisify } = require('util')
 
 const { zipFunction } = require('@netlify/zip-it-and-ship-it')
 const decache = require('decache')
 const makeDir = require('make-dir')
+const readPkgUp = require('read-pkg-up')
 const sourceMapSupport = require('source-map-support')
 
 const { NETLIFYDEVERR } = require('../../../../../utils/logo')
 const { getPathInProject } = require('../../../../settings')
 const { normalizeFunctionsConfig } = require('../../../config')
 const { memoizedBuild } = require('../../../memoized-build')
 
+const pWriteFile = promisify(fs.writeFile)
+
 const addFunctionsConfigDefaults = (config) => ({
   ...config,
   '*': {
@@ -18,7 +23,7 @@ const addFunctionsConfigDefaults = (config) => ({
   },
 })
 
-const buildFunction = async ({ cache, config, directory, func, projectRoot, targetDirectory }) => {
+const buildFunction = async ({ cache, config, directory, func, projectRoot, targetDirectory, hasTypeModule }) => {
   const zipOptions = {
     archiveFormat: 'none',
     basePath: projectRoot,
@@ -42,6 +47,15 @@ const buildFunction = async ({ cache, config, directory, func, projectRoot, targ
   const srcFiles = inputs.filter((inputPath) => !inputPath.includes(`${path.sep}node_modules${path.sep}`))
   const buildPath = path.join(functionPath, `${func.name}.js`)
 
+  if (hasTypeModule) {
+    await pWriteFile(
+      path.join(functionPath, `package.json`),
+      JSON.stringify({
+        type: 'commonjs',
+      }),
+    )
+  }
+
   clearFunctionsCache(targetDirectory)
 
   return { buildPath, srcFiles }
@@ -72,14 +86,22 @@ module.exports = async ({ config, directory, errorExit, func, projectRoot }) =>
     normalizeFunctionsConfig({ functionsConfig: config.functions, projectRoot }),
   )
 
+  const packageJson = await readPkgUp(func.mainFile)
+  const hasTypeModule = packageJson && packageJson.packageJson.type === 'module'
+
   // We must use esbuild for certain file extensions.
-  const mustUseEsbuild = ['.mjs', '.ts'].includes(path.extname(func.mainFile))
+  const hasTranspilationWorthyExtension = ['.mjs', '.ts'].includes(path.extname(func.mainFile))
+  const mustUseEsbuild = hasTypeModule || hasTranspilationWorthyExtension
+
+  if (mustUseEsbuild && !functionsConfig['*'].nodeBundler) {
+    functionsConfig['*'].nodeBundler = 'esbuild'
+  }
 
   // TODO: Resolve functions config globs so that we can check for the bundler
   // on a per-function basis.
-  const isUsingEsbuild = functionsConfig['*'].nodeBundler === 'esbuild_zisi'
+  const isUsingEsbuild = ['esbuild_zisi', 'esbuild'].includes(functionsConfig['*'].nodeBundler)
 
-  if (!mustUseEsbuild && !isUsingEsbuild) {
+  if (!isUsingEsbuild) {
     return false
   }
 
@@ -90,7 +112,7 @@ module.exports = async ({ config, directory, errorExit, func, projectRoot }) =>
 
   return {
     build: ({ cache = {} }) =>
-      buildFunction({ cache, config: functionsConfig, directory, func, projectRoot, targetDirectory }),
+      buildFunction({ cache, config: functionsConfig, directory, func, projectRoot, targetDirectory, hasTypeModule }),
     builderName: 'zip-it-and-ship-it',
     target: targetDirectory,
   }

tests/serving-functions.test.js

@@ -364,18 +364,13 @@ testMatrix.forEach(({ args }) => {
       const bundlerConfig = args.includes('esbuild') ? { node_bundler: 'esbuild' } : {}
 
       await builder
-        .withContentFile({
+        .withFunction({
           path: 'functions/help.ts',
-          content: `
-const handler = async () => {
-  return {
-    statusCode: 200,
-    body: 'I need somebody. Not just anybody.'
-  }
-}
-
-export { handler }
-      `,
+          handler: async () => ({
+            statusCode: 200,
+            body: 'I need somebody. Not just anybody.',
+          }),
+          esm: true,
         })
         .withNetlifyToml({
           config: {
@@ -713,6 +708,41 @@ exports.handler = () => ({
       })
     })
   })
+
+  test(testName('Serves functions inside a "type=module" package', args), async (t) => {
+    await withSiteBuilder('function-type-module', async (builder) => {
+      const bundlerConfig = args.includes('esbuild') ? { node_bundler: 'esbuild' } : {}
+
+      await builder
+        .withNetlifyToml({
+          config: {
+            build: { publish: 'public' },
+            functions: { directory: 'functions' },
+            ...bundlerConfig,
+          },
+        })
+        .withPackageJson({
+          packageJson: {
+            type: 'module',
+          },
+        })
+        .withFunction({
+          path: 'hello.js',
+          handler: async () => ({
+            statusCode: 200,
+            body: 'hello from es module!',
+          }),
+          esm: true,
+        })
+        .buildAsync()
+
+      await withDevServer({ cwd: builder.directory, args }, async ({ port, outputBuffer }) => {
+        await tryAndLogOutput(async () => {
+          t.is(await got(`http://localhost:${port}/.netlify/functions/hello`).text(), 'hello from es module!')
+        }, outputBuffer)
+      })
+    })
+  })
 })
 
 test('Serves functions that dynamically load files included in the `functions.included_files` config property', async (t) => {

tests/utils/site-builder.js

@@ -55,11 +55,12 @@ const createSiteBuilder = ({ siteName }) => {
       })
       return builder
     },
-    withFunction: ({ pathPrefix = 'functions', path: filePath, handler }) => {
+    withFunction: ({ pathPrefix = 'functions', path: filePath, handler, esm = false }) => {
       const dest = path.join(directory, pathPrefix, filePath)
       tasks.push(async () => {
         await ensureDir(path.dirname(dest))
-        await fs.writeFileAsync(dest, `exports.handler = ${handler.toString()}`)
+        const file = esm ? `export const handler = ${handler.toString()}` : `exports.handler = ${handler.toString()}`
+        await fs.writeFileAsync(dest, file)
       })
       return builder
     },