fix: force esbuild target in zisi (#681)

* fix: force esbuild target in zisi * refactor: reduce esbuild log limit * refactor: increase esbuild log limit in zisi
netlify · Sep 29, 2021 · 6e74a0a · 6e74a0a · github-actions · Sep 29, 2021
1 parent 12a08ba
commit 6e74a0a
Show file tree

Hide file tree

Showing 8 changed files with 47 additions and 1 deletion.
diff --git a/src/runtimes/node/list_imports.js b/src/runtimes/node/list_imports.js
@@ -4,6 +4,11 @@ const { tmpName } = require('tmp-promise')
 
 const { safeUnlink } = require('../../utils/fs')
 
+// Maximum number of log messages that an esbuild instance will produce. This
+// limit is important to avoid out-of-memory errors due to too much data being
+// sent in the Go<>Node IPC channel.
+const ESBUILD_LOG_LIMIT = 10
+
 const getListImportsPlugin = ({ imports, path }) => ({
   name: 'list-imports',
   setup(build) {
@@ -35,11 +40,14 @@ const listImports = async ({ path }) => {
 
   try {
     await esbuild.build({
-      entryPoints: [path],
       bundle: true,
+      entryPoints: [path],
+      logLevel: 'error',
+      logLimit: ESBUILD_LOG_LIMIT,
       outfile: targetPath,
       platform: 'node',
       plugins: [getListImportsPlugin({ imports, path })],
+      target: 'esnext',
     })
   } finally {
     await safeUnlink(targetPath)

diff --git a/tests/fixtures/local-node-module-destructure-require/function.js b/tests/fixtures/local-node-module-destructure-require/function.js
@@ -0,0 +1,3 @@
+const { stack } = require('@netlify/mock-package/stack')
+
+module.exports = { stack }
diff --git a/...ixtures/local-node-module-destructure-require/node_modules/@netlify/mock-package/index.js b/...ixtures/local-node-module-destructure-require/node_modules/@netlify/mock-package/index.js
diff --git a/...res/local-node-module-destructure-require/node_modules/@netlify/mock-package/package.json b/...res/local-node-module-destructure-require/node_modules/@netlify/mock-package/package.json
diff --git a/...ixtures/local-node-module-destructure-require/node_modules/@netlify/mock-package/stack.js b/...ixtures/local-node-module-destructure-require/node_modules/@netlify/mock-package/stack.js
diff --git a/tests/fixtures/local-node-module-destructure-require/package.json b/tests/fixtures/local-node-module-destructure-require/package.json
@@ -0,0 +1,7 @@
+{
+  "name": "local-node-module-destructure-require",
+  "version": "1.0.0",
+  "dependencies": {
+    "@netlify/mock-package": "1.0.0"
+  }
+}
diff --git a/tests/fixtures/local-node-module-destructure-require/tsconfig.json b/tests/fixtures/local-node-module-destructure-require/tsconfig.json
@@ -0,0 +1,5 @@
+{
+  "compilerOptions": {
+    "target": "ES5"
+  }
+}
diff --git a/tests/main.js b/tests/main.js
@@ -173,6 +173,21 @@ testBundlers('Can require deep paths in node modules', [ESBUILD, ESBUILD_ZISI, D
   }
 })
 
+testBundlers(
+  'Can require Node modules with destructuring expressions',
+  [ESBUILD, ESBUILD_ZISI, DEFAULT],
+  async (bundler, t) => {
+    await zipNode(t, `local-node-module-destructure-require`, {
+      opts: { config: { '*': { nodeBundler: bundler } } },
+    })
+
+    // TO DO: Remove when `parseWithEsbuild` feature flag is decommissioned.
+    await zipNode(t, `local-node-module-destructure-require`, {
+      opts: { config: { '*': { nodeBundler: bundler } }, featureFlags: { parseWithEsbuild: true } },
+    })
+  },
+)
+
 testBundlers('Can require scoped node modules', [ESBUILD, ESBUILD_ZISI, DEFAULT], async (bundler, t) => {
   await zipNode(t, 'node-module-scope', { opts: { config: { '*': { nodeBundler: bundler } } } })
 })
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		const { stack } = require('@netlify/mock-package/stack')

		module.exports = { stack }