@rollup/plugin-commonjs 19.0.1 → 19.0.2

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @rollup/plugin-commonjs ChangeLog
 
+## v19.0.2
+
+_2021-07-26_
+
+### Bugfixes
+
+- fix convert module.exports with `__esModule` property(#939) (#942)
+
 ## v19.0.1
 
 _2021-07-15_

package/README.md

@@ -309,7 +309,9 @@ For these situations, you can change Rollup's behaviour either globally or per m
   import * as dep$1 from 'dep';
 
   function getDefaultExportFromNamespaceIfNotNamed(n) {
-    return n && Object.prototype.hasOwnProperty.call(n, 'default') && Object.keys(n).length === 1 ? n['default'] : n;
+    return n && Object.prototype.hasOwnProperty.call(n, 'default') && Object.keys(n).length === 1
+      ? n['default']
+      : n;
   }
 
   var dep = getDefaultExportFromNamespaceIfNotNamed(dep$1);

package/dist/index.es.js

@@ -779,6 +779,20 @@ function isShorthandProperty(parent) {
   return parent && parent.type === 'Property' && parent.shorthand;
 }
 
+function hasDefineEsmProperty(node) {
+  return node.properties.some((property) => {
+    if (
+      property.type === 'Property' &&
+      property.key.type === 'Identifier' &&
+      property.key.name === '__esModule' &&
+      isTruthy(property.value)
+    ) {
+      return true;
+    }
+    return false;
+  });
+}
+
 function wrapCode(magicString, uses, moduleName, exportsName) {
   const args = [];
   const passedArgs = [];
@@ -1254,6 +1268,18 @@ function transformCommonjs(
               } else if (!firstTopLevelModuleExportsAssignment) {
                 firstTopLevelModuleExportsAssignment = node;
               }
+
+              if (defaultIsModuleExports === false) {
+                shouldWrap = true;
+              } else if (defaultIsModuleExports === 'auto') {
+                if (node.right.type === 'ObjectExpression') {
+                  if (hasDefineEsmProperty(node.right)) {
+                    shouldWrap = true;
+                  }
+                } else if (defaultIsModuleExports === false) {
+                  shouldWrap = true;
+                }
+              }
             } else if (exportName === KEY_COMPILED_ESM) {
               if (programDepth > 3) {
                 shouldWrap = true;