@netlify/zip-it-and-ship-it 4.22.0 → 4.23.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/zip-it-and-ship-it",
-  "version": "4.22.0",
+  "version": "4.23.0",
   "description": "Zip it and ship it",
   "main": "./src/main.js",
   "bin": {
@@ -54,8 +54,8 @@
     "url": "https://github.com/netlify/zip-it-and-ship-it/issues"
   },
   "dependencies": {
+    "@babel/parser": "^7.15.7",
     "@netlify/esbuild": "^0.13.6",
-    "acorn": "^8.4.0",
     "archiver": "^5.3.0",
     "array-flat-polyfill": "^1.0.1",
     "common-path-prefix": "^3.0.0",
@@ -68,6 +68,7 @@
     "filter-obj": "^2.0.1",
     "find-up": "^5.0.0",
     "glob": "^7.1.6",
+    "is-builtin-module": "^3.1.0",
     "junk": "^3.1.0",
     "locate-path": "^6.0.0",
     "make-dir": "^3.1.0",

package/src/feature_flags.js

@@ -5,6 +5,7 @@ const FLAGS = {
   buildGoSource: Boolean(env.NETLIFY_EXPERIMENTAL_BUILD_GO_SOURCE),
   buildRustSource: Boolean(env.NETLIFY_EXPERIMENTAL_BUILD_RUST_SOURCE),
   defaultEsModulesToEsbuild: Boolean(env.NETLIFY_EXPERIMENTAL_DEFAULT_ES_MODULES_TO_ESBUILD),
+  parseWithEsbuild: false,
 }
 
 const getFlags = (input = {}, flags = FLAGS) =>

package/src/main.js

@@ -27,7 +27,7 @@ const listFunctionsFiles = async function (relativeSrcFolders, { config, feature
     getPluginsModulesPath(srcFolders[0]),
   ])
   const listedFunctionsFiles = await Promise.all(
-    [...functions.values()].map((func) => getListedFunctionFiles(func, { pluginsModulesPath })),
+    [...functions.values()].map((func) => getListedFunctionFiles(func, { featureFlags, pluginsModulesPath })),
   )
 
   // TODO: switch to Array.flat() once we drop support for Node.js < 11.0.0
@@ -41,9 +41,10 @@ const getListedFunction = function ({ runtime, name, mainFile, extension }) {
 
 const getListedFunctionFiles = async function (
   { config, runtime, name, stat, mainFile, extension, srcPath, srcDir },
-  { pluginsModulesPath },
+  { featureFlags, pluginsModulesPath },
 ) {
   const srcFiles = await getSrcFiles({
+    featureFlags,
     runtime,
     stat,
     mainFile,
@@ -59,6 +60,7 @@ const getListedFunctionFiles = async function (
 const getSrcFiles = function ({
   bundler,
   config,
+  featureFlags,
   runtime,
   stat,
   mainFile,
@@ -77,6 +79,7 @@ const getSrcFiles = function ({
     bundler,
     config,
     extension,
+    featureFlags,
     srcPath,
     mainFile,
     srcDir,

package/src/node_dependencies/index.js

@@ -4,6 +4,8 @@ const findUp = require('find-up')
 const { not: notJunk } = require('junk')
 const precinct = require('precinct')
 
+const { listImports } = require('../runtimes/node/list_imports')
+
 const { getPackageJson } = require('./package_json')
 const { resolvePathPreserveSymlinks } = require('./resolve')
 const { getExternalAndIgnoredModulesFromSpecialCases } = require('./special_cases')
@@ -23,10 +25,17 @@ const getPluginsModulesPath = (srcDir) => findUp(`${AUTO_PLUGINS_DIR}node_module
 // Retrieve the paths to the Node.js files to zip.
 // We only include the files actually needed by the function because AWS Lambda
 // has a size limit for the zipped file. It also makes cold starts faster.
-const listFilesUsingLegacyBundler = async function ({ srcPath, mainFile, srcDir, stat, pluginsModulesPath }) {
+const listFilesUsingLegacyBundler = async function ({
+  featureFlags,
+  srcPath,
+  mainFile,
+  srcDir,
+  stat,
+  pluginsModulesPath,
+}) {
   const [treeFiles, depFiles] = await Promise.all([
     getTreeFiles(srcPath, stat),
-    getDependencies(mainFile, srcDir, pluginsModulesPath),
+    getDependencies(mainFile, srcDir, pluginsModulesPath, featureFlags),
   ])
   const files = [...treeFiles, ...depFiles].map(normalize)
   const uniqueFiles = [...new Set(files)]
@@ -43,19 +52,26 @@ const isNotJunk = function (file) {
 }
 
 // Retrieve all the files recursively required by a Node.js file
-const getDependencies = async function (mainFile, srcDir, pluginsModulesPath) {
+const getDependencies = async function (mainFile, srcDir, pluginsModulesPath, featureFlags) {
   const packageJson = await getPackageJson(srcDir)
   const state = getNewCache()
 
   try {
-    return await getFileDependencies({ path: mainFile, packageJson, state, pluginsModulesPath })
+    return await getFileDependencies({ featureFlags, path: mainFile, packageJson, pluginsModulesPath, state })
   } catch (error) {
     error.message = `In file "${mainFile}"\n${error.message}`
     throw error
   }
 }
 
-const getFileDependencies = async function ({ path, packageJson, pluginsModulesPath, state, treeShakeNext }) {
+const getFileDependencies = async function ({
+  featureFlags,
+  path,
+  packageJson,
+  pluginsModulesPath,
+  state,
+  treeShakeNext,
+}) {
   if (state.localFiles.has(path)) {
     return []
   }
@@ -63,16 +79,21 @@ const getFileDependencies = async function ({ path, packageJson, pluginsModulesP
   state.localFiles.add(path)
 
   const basedir = dirname(path)
-  // This parses JavaScript in `path` to retrieve all the `require()` statements
-  // TODO: `precinct.paperwork()` uses `fs.readFileSync()` under the hood,
-  // but should use `fs.readFile()` instead
-  const dependencies = precinct.paperwork(path, { includeCore: false })
+  const dependencies = featureFlags.parseWithEsbuild
+    ? await listImports({ path })
+    : precinct.paperwork(path, { includeCore: false })
   const depsPaths = await Promise.all(
-    dependencies
-      .filter(Boolean)
-      .map((dependency) =>
-        getImportDependencies({ dependency, basedir, packageJson, state, treeShakeNext, pluginsModulesPath }),
-      ),
+    dependencies.filter(Boolean).map((dependency) =>
+      getImportDependencies({
+        dependency,
+        basedir,
+        featureFlags,
+        packageJson,
+        pluginsModulesPath,
+        state,
+        treeShakeNext,
+      }),
+    ),
   )
   // TODO: switch to Array.flat() once we drop support for Node.js < 11.0.0
   // eslint-disable-next-line unicorn/prefer-spread
@@ -82,20 +103,22 @@ const getFileDependencies = async function ({ path, packageJson, pluginsModulesP
 const getImportDependencies = function ({
   dependency,
   basedir,
+  featureFlags,
   packageJson,
+  pluginsModulesPath,
   state,
   treeShakeNext,
-  pluginsModulesPath,
 }) {
   const shouldTreeShakeNext = treeShakeNext || isNextOnNetlify(dependency)
   if (shouldTreeShake(dependency, shouldTreeShakeNext)) {
     return getTreeShakedDependencies({
       dependency,
       basedir,
+      featureFlags,
       packageJson,
+      pluginsModulesPath,
       state,
       treeShakeNext: shouldTreeShakeNext,
-      pluginsModulesPath,
     })
   }
 
@@ -110,13 +133,21 @@ const isNextOnNetlify = function (dependency) {
 const getTreeShakedDependencies = async function ({
   dependency,
   basedir,
+  featureFlags,
   packageJson,
+  pluginsModulesPath,
   state,
   treeShakeNext,
-  pluginsModulesPath,
 }) {
   const path = await resolvePathPreserveSymlinks(dependency, [basedir, pluginsModulesPath].filter(Boolean))
-  const depsPath = await getFileDependencies({ path, packageJson, state, treeShakeNext, pluginsModulesPath })
+  const depsPath = await getFileDependencies({
+    featureFlags,
+    path,
+    packageJson,
+    pluginsModulesPath,
+    state,
+    treeShakeNext,
+  })
   return [path, ...depsPath]
 }
 

package/src/runtimes/node/dynamic_imports/parser.js

@@ -1,8 +1,7 @@
 const { join, relative, resolve } = require('path')
 
-const acorn = require('acorn')
+const babel = require('@babel/parser')
 
-const ECMA_VERSION = 2021
 const GLOB_WILDCARD = '**'
 
 // Transforms an array of glob nodes into a glob string including an absolute
@@ -56,8 +55,10 @@ const getWildcardFromASTNode = (node) => {
 // - `includedPathsGlob`: A glob with the files to be included in the bundle
 // - `type`: The expression type (e.g. "require", "import")
 const parseExpression = ({ basePath, expression: rawExpression, resolveDir }) => {
-  const { body } = acorn.parse(rawExpression, { ecmaVersion: ECMA_VERSION })
-  const [topLevelExpression] = body
+  const { program } = babel.parse(rawExpression, {
+    sourceType: 'module',
+  })
+  const [topLevelExpression] = program.body
   const { expression } = topLevelExpression
 
   if (expression.type === 'CallExpression' && expression.callee.name === 'require') {
@@ -113,7 +114,7 @@ const parseBinaryExpression = (expression) => {
       case 'BinaryExpression':
         return parseBinaryExpression(operand)
 
-      case 'Literal':
+      case 'StringLiteral':
         return operand.value
 
       default:

package/src/runtimes/node/index.js

@@ -42,6 +42,7 @@ const zipFunction = async function ({
   config = {},
   destFolder,
   extension,
+  featureFlags,
   filename,
   mainFile,
   name,
@@ -49,7 +50,6 @@ const zipFunction = async function ({
   srcDir,
   srcPath,
   stat,
-  featureFlags,
 }) {
   const bundler = config.nodeBundler || (await getDefaultBundler({ extension, mainFile, featureFlags }))
   // If the file is a zip, we assume the function is bundled and ready to go.
@@ -67,6 +67,7 @@ const zipFunction = async function ({
       config,
       destFolder,
       extension,
+      featureFlags,
       filename,
       mainFile,
       pluginsModulesPath,

package/src/runtimes/node/list_imports.js

@@ -0,0 +1,51 @@
+const esbuild = require('@netlify/esbuild')
+const isBuiltinModule = require('is-builtin-module')
+const { tmpName } = require('tmp-promise')
+
+const { safeUnlink } = require('../../utils/fs')
+
+const getListImportsPlugin = ({ imports, path }) => ({
+  name: 'list-imports',
+  setup(build) {
+    build.onResolve({ filter: /.*/ }, (args) => {
+      const isEntryPoint = args.path === path
+      const isImport = !isEntryPoint && !isBuiltinModule(args.path)
+
+      if (isImport) {
+        imports.add(args.path)
+      }
+
+      return {
+        namespace: 'list-imports',
+        external: isImport,
+      }
+    })
+  },
+})
+
+const listImports = async ({ path }) => {
+  // We're not interested in the output that esbuild generates, we're just
+  // using it for its parsing capabilities in order to find import/require
+  // statements. However, if we don't give esbuild a path in `outfile`, it
+  // will pipe the output to stdout, which we also don't want. So we create
+  // a temporary file to serve as the esbuild output and then get rid of it
+  // when we're done.
+  const targetPath = await tmpName()
+  const imports = new Set()
+
+  try {
+    await esbuild.build({
+      entryPoints: [path],
+      bundle: true,
+      outfile: targetPath,
+      platform: 'node',
+      plugins: [getListImportsPlugin({ imports, path })],
+    })
+  } finally {
+    await safeUnlink(targetPath)
+  }
+
+  return [...imports]
+}
+
+module.exports = { listImports }

package/src/runtimes/node/src_files.js

@@ -53,6 +53,7 @@ const getSrcFiles = async function ({ config, ...parameters }) {
 const getSrcFilesAndExternalModules = async function ({
   bundler,
   externalNodeModules = [],
+  featureFlags,
   includedFiles = [],
   includedFilesBasePath,
   mainFile,
@@ -64,7 +65,14 @@ const getSrcFilesAndExternalModules = async function ({
   const includedFilePaths = await getPathsOfIncludedFiles(includedFiles, includedFilesBasePath)
 
   if (bundler === JS_BUNDLER_ZISI) {
-    const paths = await listFilesUsingLegacyBundler({ srcPath, mainFile, srcDir, stat, pluginsModulesPath })
+    const paths = await listFilesUsingLegacyBundler({
+      featureFlags,
+      srcPath,
+      mainFile,
+      srcDir,
+      stat,
+      pluginsModulesPath,
+    })
 
     return {
       moduleNames: [],

package/src/runtimes/node/zip_zisi.js

@@ -12,6 +12,7 @@ const zipZisi = async ({
   config,
   destFolder,
   extension,
+  featureFlags,
   filename,
   mainFile,
   pluginsModulesPath,
@@ -22,6 +23,7 @@ const zipZisi = async ({
   const { paths: srcFiles } = await getSrcFilesAndExternalModules({
     bundler: JS_BUNDLER_ZISI,
     extension,
+    featureFlags,
     includedFiles: config.includedFiles,
     includedFilesBasePath: config.includedFilesBasePath || basePath,
     mainFile,