fix: don't treat .node.js as native node module, closes #589

egoist · Apr 2, 2022 · e5fe1c1 · e5fe1c1
1 parent 095b8ca
commit e5fe1c1
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 11 deletions.
diff --git a/src/esbuild/native-node-module.ts b/src/esbuild/native-node-module.ts
@@ -1,3 +1,4 @@
+import path from 'path'
 import { Plugin } from 'esbuild'
 
 // Copied from https://github.com/evanw/esbuild/issues/1051#issuecomment-806325487
@@ -7,20 +8,34 @@ export const nativeNodeModulesPlugin = (): Plugin => {
     setup(build) {
       // If a ".node" file is imported within a module in the "file" namespace, resolve
       // it to an absolute path and put it into the "node-file" virtual namespace.
-      build.onResolve({ filter: /\.node$/, namespace: 'file' }, (args) => ({
-        path: require.resolve(args.path, { paths: [args.resolveDir] }),
-        namespace: 'node-file',
-      }))
+      build.onResolve({ filter: /\.node$/, namespace: 'file' }, (args) => {
+        const resolvedId = require.resolve(args.path, {
+          paths: [args.resolveDir],
+        })
+        if (resolvedId.endsWith('.node')) {
+          return {
+            path: resolvedId,
+            namespace: 'node-file',
+          }
+        }
+        return {
+          path: resolvedId,
+        }
+      })
 
       // Files in the "node-file" virtual namespace call "require()" on the
       // path from esbuild of the ".node" file in the output directory.
-      build.onLoad({ filter: /.*/, namespace: 'node-file' }, (args) => ({
-        contents: `
-          import path from ${JSON.stringify(args.path)}
-          try { module.exports = require(path) }
-          catch {}
-        `,
-      }))
+      build.onLoad({ filter: /.*/, namespace: 'node-file' }, (args) => {
+        console.log(args.path)
+        return {
+          contents: `
+            import path from ${JSON.stringify(args.path)}
+            try { module.exports = require(path) }
+            catch {}
+          `,
+          resolveDir: path.dirname(args.path),
+        }
+      })
 
       // If a ".node" file is imported within a module in the "node-file" namespace, put
       // it in the "file" namespace where esbuild's default loading behavior will handle

diff --git a/test/index.test.ts b/test/index.test.ts
@@ -806,3 +806,16 @@ test('dts only: ignore files', async () => {
     ]
   `)
 })
+
+test('native-node-module plugin should handle *.node(.js) import properly', async () => {
+  await run(
+    getTestName(),
+    {
+      'input.tsx': `export * from './hi.node'`,
+      'hi.node.js': `export const hi = 'hi'`,
+    },
+    {
+      entry: ['input.tsx'],
+    }
+  )
+})