fix(commonjs): support CJS modules re-exporting transpiled ESM modules (#1165)

Author: fwouts

packages/commonjs/src/transform-commonjs.js

@@ -71,6 +71,7 @@ export default async function transformCommonjs(
   let programDepth = 0;
   let currentTryBlockEnd = null;
   let shouldWrap = false;
+  let reexports = false;
 
   const globals = new Set();
   // A conditionalNode is a node for which execution is not guaranteed. If such a node is a require
@@ -151,8 +152,9 @@ export default async function transformCommonjs(
                   if (hasDefineEsmProperty(node.right)) {
                     shouldWrap = true;
                   }
-                } else if (defaultIsModuleExports === false) {
+                } else if (isRequireExpression(node.right, scope)) {
                   shouldWrap = true;
+                  reexports = true;
                 }
               }
             } else if (exportName === KEY_COMPILED_ESM) {
@@ -444,7 +446,9 @@ export default async function transformCommonjs(
   shouldWrap = !isEsModule && (shouldWrap || (uses.exports && moduleExportsAssignments.length > 0));
   const detectWrappedDefault =
     shouldWrap &&
-    (topLevelDefineCompiledEsmExpressions.length > 0 || code.indexOf('__esModule') >= 0);
+    (reexports ||
+      topLevelDefineCompiledEsmExpressions.length > 0 ||
+      code.indexOf('__esModule') >= 0);
 
   if (
     !(

packages/commonjs/test/fixtures/function/transpiled-esm-reexported-default/_config.js

@@ -0,0 +1,3 @@
+module.exports = {
+  description: 'creates the correct exports from CJS module re-exporting a transpiled ES module',
+};

packages/commonjs/test/fixtures/function/transpiled-esm-reexported-default/dep.js

@@ -0,0 +1,2 @@
+Object.defineProperty(exports, '__esModule', { value: true });
+exports.default = 'default';

packages/commonjs/test/fixtures/function/transpiled-esm-reexported-default/main.js

@@ -0,0 +1,3 @@
+import dep from './proxy';
+
+t.is(dep, 'default');

packages/commonjs/test/fixtures/function/transpiled-esm-reexported-default/proxy.js

@@ -0,0 +1 @@
+module.exports = require('./dep');

packages/commonjs/test/fixtures/function/transpiled-esm-reexported-entry-default/_config.js

@@ -0,0 +1,3 @@
+module.exports = {
+  description: 'creates the correct exports from CJS module re-exporting a transpiled ES module',
+};

packages/commonjs/test/fixtures/function/transpiled-esm-reexported-entry-default/entry.js

@@ -0,0 +1,2 @@
+Object.defineProperty(exports, '__esModule', { value: true });
+exports.default = 'default';

packages/commonjs/test/fixtures/function/transpiled-esm-reexported-entry-default/main.js

@@ -0,0 +1,3 @@
+import * as entry from './proxy';
+
+t.deepEqual(entry, { default: 'default' });

packages/commonjs/test/fixtures/function/transpiled-esm-reexported-entry-default/proxy.js

@@ -0,0 +1 @@
+module.exports = require('./entry');

packages/commonjs/test/fixtures/function/transpiled-esm-reexported-entry-mixed/_config.js

@@ -0,0 +1,3 @@
+module.exports = {
+  description: 'creates the correct exports from CJS module re-exporting a transpiled ES module',
+};

packages/commonjs/test/fixtures/function/transpiled-esm-reexported-entry-mixed/entry.js

@@ -0,0 +1,3 @@
+Object.defineProperty(exports, '__esModule', { value: true });
+exports.default = 'default';
+exports.named = 'named';

packages/commonjs/test/fixtures/function/transpiled-esm-reexported-entry-mixed/main.js

@@ -0,0 +1,3 @@
+import * as entry from './proxy';
+
+t.deepEqual(entry, { default: 'default', named: 'named' });

packages/commonjs/test/fixtures/function/transpiled-esm-reexported-entry-mixed/proxy.js

@@ -0,0 +1 @@
+module.exports = require('./entry');

packages/commonjs/test/fixtures/function/transpiled-esm-reexported-entry-named/_config.js

@@ -0,0 +1,3 @@
+module.exports = {
+  description: 'creates the correct exports from CJS module re-exporting a transpiled ES module',
+};

packages/commonjs/test/fixtures/function/transpiled-esm-reexported-entry-named/entry.js

@@ -0,0 +1,2 @@
+Object.defineProperty(exports, '__esModule', { value: true });
+exports.named = 'named';

packages/commonjs/test/fixtures/function/transpiled-esm-reexported-entry-named/main.js

@@ -0,0 +1,8 @@
+import * as entry from './proxy';
+
+t.deepEqual(entry, {
+  default: {
+    named: 'named',
+  },
+  named: 'named'
+});

packages/commonjs/test/fixtures/function/transpiled-esm-reexported-entry-named/proxy.js

@@ -0,0 +1 @@
+module.exports = require('./entry');

packages/commonjs/test/fixtures/function/transpiled-esm-reexported-mixed/_config.js

@@ -0,0 +1,3 @@
+module.exports = {
+  description: 'creates the correct exports from CJS module re-exporting a transpiled ES module',
+};

packages/commonjs/test/fixtures/function/transpiled-esm-reexported-mixed/dep.js

@@ -0,0 +1,3 @@
+Object.defineProperty(exports, '__esModule', { value: true });
+exports.named = 'named';
+exports.default = 'default';

packages/commonjs/test/fixtures/function/transpiled-esm-reexported-mixed/main.js

@@ -0,0 +1,4 @@
+import dep, { named } from './proxy';
+
+t.is(dep, 'default');
+t.is(named, 'named');

packages/commonjs/test/fixtures/function/transpiled-esm-reexported-mixed/proxy.js

@@ -0,0 +1 @@
+module.exports = require('./dep');

packages/commonjs/test/fixtures/function/transpiled-esm-reexported-named/_config.js

@@ -0,0 +1,3 @@
+module.exports = {
+  description: 'creates the correct exports from CJS module re-exporting a transpiled ES module',
+};

packages/commonjs/test/fixtures/function/transpiled-esm-reexported-named/dep.js

@@ -0,0 +1,2 @@
+Object.defineProperty(exports, '__esModule', { value: true });
+exports.named = 'named';

packages/commonjs/test/fixtures/function/transpiled-esm-reexported-named/main.js

@@ -0,0 +1,3 @@
+import { named } from './proxy';
+
+t.is(named, 'named');

packages/commonjs/test/fixtures/function/transpiled-esm-reexported-named/proxy.js

@@ -0,0 +1 @@
+module.exports = require('./dep');