Support default interop for CommonJS macros (#9525)

parcel-bundler · Feb 11, 2024 · e14784d · e14784d
1 parent a93af6a
commit e14784d
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 0 deletions.
diff --git a/packages/core/integration-tests/test/macros.js b/packages/core/integration-tests/test/macros.js
@@ -83,6 +83,28 @@ describe('macros', function () {
     assert(res.includes('output="2a2300bbd7ea6e9a"'));
   });
 
+  it('should support default interop with CommonJS modules', async function () {
+    await fsFixture(overlayFS, dir)`
+      index.js:
+        import test from "./macro.js" with { type: "macro" };
+        output = test('hi');
+
+      macro.js:
+        import {hashString} from '@parcel/rust';
+        module.exports = function(s) {
+          return hashString(s);
+        }
+    `;
+
+    let b = await bundle(path.join(dir, '/index.js'), {
+      inputFS: overlayFS,
+      mode: 'production',
+    });
+
+    let res = await overlayFS.readFile(b.getBundles()[0].filePath, 'utf8');
+    assert(res.includes('output="2a2300bbd7ea6e9a"'));
+  });
+
   it('should support namespace imports', async function () {
     await fsFixture(overlayFS, dir)`
       index.js:

diff --git a/packages/transformers/js/src/JSTransformer.js b/packages/transformers/js/src/JSTransformer.js
@@ -477,6 +477,17 @@ export default (new Transformer({
             let mod;
             try {
               mod = await options.packageManager.require(src, asset.filePath);
+
+              // Default interop for CommonJS modules.
+              if (
+                exportName === 'default' &&
+                !mod.__esModule &&
+                // $FlowFixMe
+                Object.prototype.toString.call(config) !== '[object Module]'
+              ) {
+                mod = {default: mod};
+              }
+
               if (!Object.hasOwnProperty.call(mod, exportName)) {
                 throw new Error(`"${src}" does not export "${exportName}".`);
               }