@rollup/plugin-commonjs 24.0.1 → 24.1.0-0

package/dist/cjs/index.js

@@ -11,7 +11,7 @@ var estreeWalker = require('estree-walker');
 var MagicString = require('magic-string');
 var isReference = require('is-reference');
 
-var version = "24.0.1";
+var version = "24.1.0-0";
 var peerDependencies = {
 	rollup: "^2.68.0||^3.0.0"
 };
@@ -415,13 +415,16 @@ async function getStaticRequireProxy(id, requireReturnsDefault, loadModule) {
   } = await loadModule({ id });
   if (!commonjsMeta) {
     return getUnknownRequireProxy(id, requireReturnsDefault);
-  } else if (commonjsMeta.isCommonJS) {
+  }
+  if (commonjsMeta.isCommonJS) {
     return `export { __moduleExports as default } from ${JSON.stringify(id)};`;
-  } else if (!requireReturnsDefault) {
+  }
+  if (!requireReturnsDefault) {
     return `import { getAugmentedNamespace } from "${HELPERS_ID}"; import * as ${name} from ${JSON.stringify(
       id
     )}; export default /*@__PURE__*/getAugmentedNamespace(${name});`;
-  } else if (
+  }
+  if (
     requireReturnsDefault !== true &&
     (requireReturnsDefault === 'namespace' ||
       !commonjsMeta.hasDefaultExport ||
@@ -911,11 +914,16 @@ function getKeypath(node) {
 
 const KEY_COMPILED_ESM = '__esModule';
 
-function isDefineCompiledEsm(node) {
+function getDefineCompiledEsmType(node) {
+  const definedPropertyWithExports = getDefinePropertyCallName(node, 'exports');
   const definedProperty =
-    getDefinePropertyCallName(node, 'exports') || getDefinePropertyCallName(node, 'module.exports');
+    definedPropertyWithExports || getDefinePropertyCallName(node, 'module.exports');
   if (definedProperty && definedProperty.key === KEY_COMPILED_ESM) {
-    return isTruthy(definedProperty.value);
+    return isTruthy(definedProperty.value)
+      ? definedPropertyWithExports
+        ? 'exports'
+        : 'module'
+      : false;
   }
   return false;
 }
@@ -959,20 +967,6 @@ 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, indentExclusionRanges) {
   const args = [];
   const passedArgs = [];
@@ -982,19 +976,22 @@ function wrapCode(magicString, uses, moduleName, exportsName, indentExclusionRan
   }
   if (uses.exports) {
     args.push('exports');
-    passedArgs.push(exportsName);
+    passedArgs.push(uses.module ? `${moduleName}.exports` : exportsName);
   }
   magicString
     .trim()
     .indent('\t', { exclude: indentExclusionRanges })
     .prepend(`(function (${args.join(', ')}) {\n`)
-    .append(`\n} (${passedArgs.join(', ')}));`);
+    // For some reason, this line is only indented correctly when using a
+    // require-wrapper if we have this leading space
+    .append(` \n} (${passedArgs.join(', ')}));`);
 }
 
 function rewriteExportsAndGetExportsBlock(
   magicString,
   moduleName,
   exportsName,
+  exportedExportsName,
   wrapped,
   moduleExportsAssignments,
   firstTopLevelModuleExportsAssignment,
@@ -1005,7 +1002,6 @@ function rewriteExportsAndGetExportsBlock(
   code,
   HELPERS_NAME,
   exportMode,
-  detectWrappedDefault,
   defaultIsModuleExports,
   usesRequireWrapper,
   requireName
@@ -1033,17 +1029,20 @@ function rewriteExportsAndGetExportsBlock(
       exportDeclarations,
       moduleExportsAssignments,
       firstTopLevelModuleExportsAssignment,
-      exportsName
+      exportsName,
+      defaultIsModuleExports,
+      HELPERS_NAME
     );
   } else {
-    exports.push(`${exportsName} as __moduleExports`);
+    if (exportMode === 'module') {
+      exportDeclarations.push(`var ${exportedExportsName} = ${moduleName}.exports`);
+      exports.push(`${exportedExportsName} as __moduleExports`);
+    } else {
+      exports.push(`${exportsName} as __moduleExports`);
+    }
     if (wrapped) {
-      getExportsWhenWrapping(
-        exportDeclarations,
-        exportsName,
-        detectWrappedDefault,
-        HELPERS_NAME,
-        defaultIsModuleExports
+      exportDeclarations.push(
+        getDefaultExportDeclaration(exportedExportsName, defaultIsModuleExports, HELPERS_NAME)
       );
     } else {
       getExports(
@@ -1056,17 +1055,19 @@ function rewriteExportsAndGetExportsBlock(
         topLevelAssignments,
         moduleName,
         exportsName,
+        exportedExportsName,
         defineCompiledEsmExpressions,
         HELPERS_NAME,
-        defaultIsModuleExports
+        defaultIsModuleExports,
+        exportMode
       );
     }
   }
   if (exports.length) {
-    exportDeclarations.push(`export { ${exports.join(', ')} };`);
+    exportDeclarations.push(`export { ${exports.join(', ')} }`);
   }
 
-  return `\n\n${exportDeclarations.join('\n')}`;
+  return `\n\n${exportDeclarations.join(';\n')};`;
 }
 
 function getExportsWhenUsingRequireWrapper(
@@ -1081,35 +1082,32 @@ function getExportsWhenUsingRequireWrapper(
   requireName,
   defineCompiledEsmExpressions
 ) {
-  if (!wrapped) {
-    if (exportMode === 'replace') {
-      for (const { left } of moduleExportsAssignments) {
-        magicString.overwrite(left.start, left.end, exportsName);
-      }
-    } else {
-      // Collect and rewrite module.exports assignments
-      for (const { left } of moduleExportsAssignments) {
-        magicString.overwrite(left.start, left.end, `${moduleName}.exports`);
-      }
-      // Collect and rewrite named exports
-      for (const [exportName, { nodes }] of exportsAssignmentsByName) {
-        for (const node of nodes) {
-          magicString.overwrite(node.start, node.left.end, `${exportsName}.${exportName}`);
-        }
-      }
-      // Collect and rewrite exports.__esModule assignments
-      for (const expression of defineCompiledEsmExpressions) {
-        const moduleExportsExpression =
-          expression.type === 'CallExpression' ? expression.arguments[0] : expression.left.object;
+  exports.push(`${requireName} as __require`);
+  if (wrapped) return;
+  if (exportMode === 'replace') {
+    rewriteModuleExportsAssignments(magicString, moduleExportsAssignments, exportsName);
+  } else {
+    rewriteModuleExportsAssignments(magicString, moduleExportsAssignments, `${moduleName}.exports`);
+    // Collect and rewrite named exports
+    for (const [exportName, { nodes }] of exportsAssignmentsByName) {
+      for (const { node, type } of nodes) {
         magicString.overwrite(
-          moduleExportsExpression.start,
-          moduleExportsExpression.end,
-          exportsName
+          node.start,
+          node.left.end,
+          `${
+            exportMode === 'module' && type === 'module' ? `${moduleName}.exports` : exportsName
+          }.${exportName}`
         );
       }
     }
+    replaceDefineCompiledEsmExpressionsAndGetIfRestorable(
+      defineCompiledEsmExpressions,
+      magicString,
+      exportMode,
+      moduleName,
+      exportsName
+    );
   }
-  exports.push(`${requireName} as __require`);
 }
 
 function getExportsForReplacedModuleExports(
@@ -1118,34 +1116,30 @@ function getExportsForReplacedModuleExports(
   exportDeclarations,
   moduleExportsAssignments,
   firstTopLevelModuleExportsAssignment,
-  exportsName
+  exportsName,
+  defaultIsModuleExports,
+  HELPERS_NAME
 ) {
   for (const { left } of moduleExportsAssignments) {
     magicString.overwrite(left.start, left.end, exportsName);
   }
   magicString.prependRight(firstTopLevelModuleExportsAssignment.left.start, 'var ');
   exports.push(`${exportsName} as __moduleExports`);
-  exportDeclarations.push(`export default ${exportsName};`);
-}
-
-function getExportsWhenWrapping(
-  exportDeclarations,
-  exportsName,
-  detectWrappedDefault,
-  HELPERS_NAME,
-  defaultIsModuleExports
-) {
   exportDeclarations.push(
-    `export default ${
-      detectWrappedDefault && defaultIsModuleExports === 'auto'
-        ? `/*@__PURE__*/${HELPERS_NAME}.getDefaultExportFromCjs(${exportsName})`
-        : defaultIsModuleExports === false
-        ? `${exportsName}.default`
-        : exportsName
-    };`
+    getDefaultExportDeclaration(exportsName, defaultIsModuleExports, HELPERS_NAME)
   );
 }
 
+function getDefaultExportDeclaration(exportedExportsName, defaultIsModuleExports, HELPERS_NAME) {
+  return `export default ${
+    defaultIsModuleExports === true
+      ? exportedExportsName
+      : defaultIsModuleExports === false
+      ? `${exportedExportsName}.default`
+      : `/*@__PURE__*/${HELPERS_NAME}.getDefaultExportFromCjs(${exportedExportsName})`
+  }`;
+}
+
 function getExports(
   magicString,
   exports,
@@ -1156,9 +1150,11 @@ function getExports(
   topLevelAssignments,
   moduleName,
   exportsName,
+  exportedExportsName,
   defineCompiledEsmExpressions,
   HELPERS_NAME,
-  defaultIsModuleExports
+  defaultIsModuleExports,
+  exportMode
 ) {
   let deconflictedDefaultExportName;
   // Collect and rewrite module.exports assignments
@@ -1170,8 +1166,10 @@ function getExports(
   for (const [exportName, { nodes }] of exportsAssignmentsByName) {
     const deconflicted = deconflictedExportNames[exportName];
     let needsDeclaration = true;
-    for (const node of nodes) {
-      let replacement = `${deconflicted} = ${exportsName}.${exportName}`;
+    for (const { node, type } of nodes) {
+      let replacement = `${deconflicted} = ${
+        exportMode === 'module' && type === 'module' ? `${moduleName}.exports` : exportsName
+      }.${exportName}`;
       if (needsDeclaration && topLevelAssignments.has(node)) {
         replacement = `var ${replacement}`;
         needsDeclaration = false;
@@ -1189,24 +1187,60 @@ function getExports(
     }
   }
 
-  // Collect and rewrite exports.__esModule assignments
-  let isRestorableCompiledEsm = false;
-  for (const expression of defineCompiledEsmExpressions) {
-    isRestorableCompiledEsm = true;
-    const moduleExportsExpression =
-      expression.type === 'CallExpression' ? expression.arguments[0] : expression.left.object;
-    magicString.overwrite(moduleExportsExpression.start, moduleExportsExpression.end, exportsName);
-  }
+  const isRestorableCompiledEsm = replaceDefineCompiledEsmExpressionsAndGetIfRestorable(
+    defineCompiledEsmExpressions,
+    magicString,
+    exportMode,
+    moduleName,
+    exportsName
+  );
 
-  if (!isRestorableCompiledEsm || defaultIsModuleExports === true) {
-    exports.push(`${exportsName} as default`);
-  } else if (moduleExportsAssignments.length === 0 || defaultIsModuleExports === false) {
-    exports.push(`${deconflictedDefaultExportName || exportsName} as default`);
+  if (
+    defaultIsModuleExports === false ||
+    (defaultIsModuleExports === 'auto' &&
+      isRestorableCompiledEsm &&
+      moduleExportsAssignments.length === 0)
+  ) {
+    // If there is no deconflictedDefaultExportName, then we use the namespace as
+    // fallback because there can be no "default" property on the namespace
+    exports.push(`${deconflictedDefaultExportName || exportedExportsName} as default`);
+  } else if (
+    defaultIsModuleExports === true ||
+    (!isRestorableCompiledEsm && moduleExportsAssignments.length === 0)
+  ) {
+    exports.push(`${exportedExportsName} as default`);
   } else {
     exportDeclarations.push(
-      `export default /*@__PURE__*/${HELPERS_NAME}.getDefaultExportFromCjs(${exportsName});`
+      getDefaultExportDeclaration(exportedExportsName, defaultIsModuleExports, HELPERS_NAME)
+    );
+  }
+}
+
+function rewriteModuleExportsAssignments(magicString, moduleExportsAssignments, exportsName) {
+  for (const { left } of moduleExportsAssignments) {
+    magicString.overwrite(left.start, left.end, exportsName);
+  }
+}
+
+function replaceDefineCompiledEsmExpressionsAndGetIfRestorable(
+  defineCompiledEsmExpressions,
+  magicString,
+  exportMode,
+  moduleName,
+  exportsName
+) {
+  let isRestorableCompiledEsm = false;
+  for (const { node, type } of defineCompiledEsmExpressions) {
+    isRestorableCompiledEsm = true;
+    const moduleExportsExpression =
+      node.type === 'CallExpression' ? node.arguments[0] : node.left.object;
+    magicString.overwrite(
+      moduleExportsExpression.start,
+      moduleExportsExpression.end,
+      exportMode === 'module' && type === 'module' ? `${moduleName}.exports` : exportsName
     );
   }
+  return isRestorableCompiledEsm;
 }
 
 function isRequireExpression(node, scope) {
@@ -1297,19 +1331,18 @@ function getRequireHandlers() {
     commonjsMeta
   ) {
     const imports = [];
-    imports.push(`import * as ${helpersName} from "${HELPERS_ID}";`);
+    imports.push(`import * as ${helpersName} from "${HELPERS_ID}"`);
     if (dynamicRequireName) {
       imports.push(
         `import { ${
           isDynamicRequireModulesEnabled ? CREATE_COMMONJS_REQUIRE_EXPORT : COMMONJS_REQUIRE_EXPORT
-        } as ${dynamicRequireName} } from "${DYNAMIC_MODULES_ID}";`
+        } as ${dynamicRequireName} } from "${DYNAMIC_MODULES_ID}"`
       );
     }
     if (exportMode === 'module') {
       imports.push(
-        `import { __module as ${moduleName}, exports as ${exportsName} } from ${JSON.stringify(
-          wrapId(id, MODULE_SUFFIX)
-        )}`
+        `import { __module as ${moduleName} } from ${JSON.stringify(wrapId(id, MODULE_SUFFIX))}`,
+        `var ${exportsName} = ${moduleName}.exports`
       );
     } else if (exportMode === 'exports') {
       imports.push(
@@ -1335,7 +1368,7 @@ function getRequireHandlers() {
       getIgnoreTryCatchRequireStatementMode,
       magicString
     );
-    return imports.length ? `${imports.join('\n')}\n\n` : '';
+    return imports.length ? `${imports.join(';\n')};\n\n` : '';
   }
 
   return {
@@ -1395,9 +1428,9 @@ function processRequireExpressions(
     }
     if (needsImport) {
       if (isCommonJS === IS_WRAPPED_COMMONJS) {
-        imports.push(`import { __require as ${name} } from ${JSON.stringify(resolvedId)};`);
+        imports.push(`import { __require as ${name} } from ${JSON.stringify(resolvedId)}`);
       } else {
-        imports.push(`import ${usesRequired ? `${name} from ` : ''}${JSON.stringify(resolvedId)};`);
+        imports.push(`import ${usesRequired ? `${name} from ` : ''}${JSON.stringify(resolvedId)}`);
       }
     }
   }
@@ -1422,6 +1455,14 @@ const exportsPattern = /^(?:module\.)?exports(?:\.([a-zA-Z_$][a-zA-Z_$0-9]*))?$/
 
 const functionType = /^(?:FunctionDeclaration|FunctionExpression|ArrowFunctionExpression)$/;
 
+// There are three different types of CommonJS modules, described by their
+// "exportMode":
+// - exports: Only assignments to (module.)exports properties
+// - replace: A single assignment to module.exports itself
+// - module: Anything else
+// Special cases:
+// - usesRequireWrapper
+// - isWrapped
 async function transformCommonjs(
   parse,
   code,
@@ -1458,7 +1499,6 @@ 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
@@ -1532,31 +1572,20 @@ async 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 (isRequireExpression(node.right, scope)) {
-                  shouldWrap = true;
-                  reexports = true;
-                }
-              }
             } else if (exportName === KEY_COMPILED_ESM) {
               if (programDepth > 3) {
                 shouldWrap = true;
               } else {
-                topLevelDefineCompiledEsmExpressions.push(node);
+                // The "type" is either "module" or "exports" to discern
+                // assignments to module.exports vs exports if needed
+                topLevelDefineCompiledEsmExpressions.push({ node, type: flattened.name });
               }
             } else {
               const exportsAssignments = exportsAssignmentsByName.get(exportName) || {
                 nodes: [],
                 scopes: new Set()
               };
-              exportsAssignments.nodes.push(node);
+              exportsAssignments.nodes.push({ node, type: flattened.name });
               exportsAssignments.scopes.add(scope);
               exportsAccessScopes.add(scope);
               exportsAssignmentsByName.set(exportName, exportsAssignments);
@@ -1573,11 +1602,12 @@ async function transformCommonjs(
           }
           return;
         case 'CallExpression': {
-          if (isDefineCompiledEsm(node)) {
+          const defineCompiledEsmType = getDefineCompiledEsmType(node);
+          if (defineCompiledEsmType) {
             if (programDepth === 3 && parent.type === 'ExpressionStatement') {
               // skip special handling for [module.]exports until we know we render this
               skippedNodes.add(node.arguments[0]);
-              topLevelDefineCompiledEsmExpressions.push(node);
+              topLevelDefineCompiledEsmExpressions.push({ node, type: defineCompiledEsmType });
             } else {
               shouldWrap = true;
             }
@@ -1595,6 +1625,7 @@ async function transformCommonjs(
             uses.require = true;
             const requireNode = node.callee.object;
             replacedDynamicRequires.push(requireNode);
+            skippedNodes.add(node.callee);
             return;
           }
 
@@ -1837,11 +1868,6 @@ async function transformCommonjs(
 
   // We cannot wrap ES/mixed modules
   shouldWrap = !isEsModule && (shouldWrap || (uses.exports && moduleExportsAssignments.length > 0));
-  const detectWrappedDefault =
-    shouldWrap &&
-    (reexports ||
-      topLevelDefineCompiledEsmExpressions.length > 0 ||
-      code.indexOf('__esModule') >= 0);
 
   if (
     !(
@@ -1879,6 +1905,9 @@ async function transformCommonjs(
     ? 'exports'
     : 'module';
 
+  const exportedExportsName =
+    exportMode === 'module' ? deconflict([], globals, `${nameBase}Exports`) : exportsName;
+
   const importBlock = await rewriteRequireExpressionsAndGetImportBlock(
     magicString,
     topLevelDeclarations,
@@ -1903,6 +1932,7 @@ async function transformCommonjs(
         magicString,
         moduleName,
         exportsName,
+        exportedExportsName,
         shouldWrap,
         moduleExportsAssignments,
         firstTopLevelModuleExportsAssignment,
@@ -1913,7 +1943,6 @@ async function transformCommonjs(
         code,
         helpersName,
         exportMode,
-        detectWrappedDefault,
         defaultIsModuleExports,
         usesRequireWrapper,
         requireName
@@ -1927,15 +1956,16 @@ async function transformCommonjs(
     magicString.trim().indent('\t', {
       exclude: indentExclusionRanges
     });
+    const exported = exportMode === 'module' ? `${moduleName}.exports` : exportsName;
     magicString.prepend(
       `var ${isRequiredName};
 
 function ${requireName} () {
-\tif (${isRequiredName}) return ${exportsName};
+\tif (${isRequiredName}) return ${exported};
 \t${isRequiredName} = 1;
 `
     ).append(`
-\treturn ${exportsName};
+\treturn ${exported};
 }`);
     if (exportMode === 'replace') {
       magicString.prepend(`var ${exportsName};\n`);
@@ -2165,15 +2195,9 @@ function commonjs(options = {}) {
       }
 
       if (isWrappedId(id, MODULE_SUFFIX)) {
-        const module = getName(unwrapId(id, MODULE_SUFFIX));
-        const moduleExports = `${module}Exports`;
+        const name = getName(unwrapId(id, MODULE_SUFFIX));
         return {
-          code: `var ${moduleExports} = {};
-var ${module} = {
-  get exports(){ return ${moduleExports}; },
-  set exports(v){ ${moduleExports} = v; },
-};
-export {${module} as __module, ${moduleExports} as exports}`,
+          code: `var ${name} = {exports: {}}; export {${name} as __module}`,
           meta: { commonjs: { isCommonJS: false } }
         };
       }

package/dist/es/index.js

@@ -7,7 +7,7 @@ import { walk } from 'estree-walker';
 import MagicString from 'magic-string';
 import isReference from 'is-reference';
 
-var version = "24.0.1";
+var version = "24.1.0-0";
 var peerDependencies = {
 	rollup: "^2.68.0||^3.0.0"
 };
@@ -411,13 +411,16 @@ async function getStaticRequireProxy(id, requireReturnsDefault, loadModule) {
   } = await loadModule({ id });
   if (!commonjsMeta) {
     return getUnknownRequireProxy(id, requireReturnsDefault);
-  } else if (commonjsMeta.isCommonJS) {
+  }
+  if (commonjsMeta.isCommonJS) {
     return `export { __moduleExports as default } from ${JSON.stringify(id)};`;
-  } else if (!requireReturnsDefault) {
+  }
+  if (!requireReturnsDefault) {
     return `import { getAugmentedNamespace } from "${HELPERS_ID}"; import * as ${name} from ${JSON.stringify(
       id
     )}; export default /*@__PURE__*/getAugmentedNamespace(${name});`;
-  } else if (
+  }
+  if (
     requireReturnsDefault !== true &&
     (requireReturnsDefault === 'namespace' ||
       !commonjsMeta.hasDefaultExport ||
@@ -907,11 +910,16 @@ function getKeypath(node) {
 
 const KEY_COMPILED_ESM = '__esModule';
 
-function isDefineCompiledEsm(node) {
+function getDefineCompiledEsmType(node) {
+  const definedPropertyWithExports = getDefinePropertyCallName(node, 'exports');
   const definedProperty =
-    getDefinePropertyCallName(node, 'exports') || getDefinePropertyCallName(node, 'module.exports');
+    definedPropertyWithExports || getDefinePropertyCallName(node, 'module.exports');
   if (definedProperty && definedProperty.key === KEY_COMPILED_ESM) {
-    return isTruthy(definedProperty.value);
+    return isTruthy(definedProperty.value)
+      ? definedPropertyWithExports
+        ? 'exports'
+        : 'module'
+      : false;
   }
   return false;
 }
@@ -955,20 +963,6 @@ 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, indentExclusionRanges) {
   const args = [];
   const passedArgs = [];
@@ -978,19 +972,22 @@ function wrapCode(magicString, uses, moduleName, exportsName, indentExclusionRan
   }
   if (uses.exports) {
     args.push('exports');
-    passedArgs.push(exportsName);
+    passedArgs.push(uses.module ? `${moduleName}.exports` : exportsName);
   }
   magicString
     .trim()
     .indent('\t', { exclude: indentExclusionRanges })
     .prepend(`(function (${args.join(', ')}) {\n`)
-    .append(`\n} (${passedArgs.join(', ')}));`);
+    // For some reason, this line is only indented correctly when using a
+    // require-wrapper if we have this leading space
+    .append(` \n} (${passedArgs.join(', ')}));`);
 }
 
 function rewriteExportsAndGetExportsBlock(
   magicString,
   moduleName,
   exportsName,
+  exportedExportsName,
   wrapped,
   moduleExportsAssignments,
   firstTopLevelModuleExportsAssignment,
@@ -1001,7 +998,6 @@ function rewriteExportsAndGetExportsBlock(
   code,
   HELPERS_NAME,
   exportMode,
-  detectWrappedDefault,
   defaultIsModuleExports,
   usesRequireWrapper,
   requireName
@@ -1029,17 +1025,20 @@ function rewriteExportsAndGetExportsBlock(
       exportDeclarations,
       moduleExportsAssignments,
       firstTopLevelModuleExportsAssignment,
-      exportsName
+      exportsName,
+      defaultIsModuleExports,
+      HELPERS_NAME
     );
   } else {
-    exports.push(`${exportsName} as __moduleExports`);
+    if (exportMode === 'module') {
+      exportDeclarations.push(`var ${exportedExportsName} = ${moduleName}.exports`);
+      exports.push(`${exportedExportsName} as __moduleExports`);
+    } else {
+      exports.push(`${exportsName} as __moduleExports`);
+    }
     if (wrapped) {
-      getExportsWhenWrapping(
-        exportDeclarations,
-        exportsName,
-        detectWrappedDefault,
-        HELPERS_NAME,
-        defaultIsModuleExports
+      exportDeclarations.push(
+        getDefaultExportDeclaration(exportedExportsName, defaultIsModuleExports, HELPERS_NAME)
       );
     } else {
       getExports(
@@ -1052,17 +1051,19 @@ function rewriteExportsAndGetExportsBlock(
         topLevelAssignments,
         moduleName,
         exportsName,
+        exportedExportsName,
         defineCompiledEsmExpressions,
         HELPERS_NAME,
-        defaultIsModuleExports
+        defaultIsModuleExports,
+        exportMode
       );
     }
   }
   if (exports.length) {
-    exportDeclarations.push(`export { ${exports.join(', ')} };`);
+    exportDeclarations.push(`export { ${exports.join(', ')} }`);
   }
 
-  return `\n\n${exportDeclarations.join('\n')}`;
+  return `\n\n${exportDeclarations.join(';\n')};`;
 }
 
 function getExportsWhenUsingRequireWrapper(
@@ -1077,35 +1078,32 @@ function getExportsWhenUsingRequireWrapper(
   requireName,
   defineCompiledEsmExpressions
 ) {
-  if (!wrapped) {
-    if (exportMode === 'replace') {
-      for (const { left } of moduleExportsAssignments) {
-        magicString.overwrite(left.start, left.end, exportsName);
-      }
-    } else {
-      // Collect and rewrite module.exports assignments
-      for (const { left } of moduleExportsAssignments) {
-        magicString.overwrite(left.start, left.end, `${moduleName}.exports`);
-      }
-      // Collect and rewrite named exports
-      for (const [exportName, { nodes }] of exportsAssignmentsByName) {
-        for (const node of nodes) {
-          magicString.overwrite(node.start, node.left.end, `${exportsName}.${exportName}`);
-        }
-      }
-      // Collect and rewrite exports.__esModule assignments
-      for (const expression of defineCompiledEsmExpressions) {
-        const moduleExportsExpression =
-          expression.type === 'CallExpression' ? expression.arguments[0] : expression.left.object;
+  exports.push(`${requireName} as __require`);
+  if (wrapped) return;
+  if (exportMode === 'replace') {
+    rewriteModuleExportsAssignments(magicString, moduleExportsAssignments, exportsName);
+  } else {
+    rewriteModuleExportsAssignments(magicString, moduleExportsAssignments, `${moduleName}.exports`);
+    // Collect and rewrite named exports
+    for (const [exportName, { nodes }] of exportsAssignmentsByName) {
+      for (const { node, type } of nodes) {
         magicString.overwrite(
-          moduleExportsExpression.start,
-          moduleExportsExpression.end,
-          exportsName
+          node.start,
+          node.left.end,
+          `${
+            exportMode === 'module' && type === 'module' ? `${moduleName}.exports` : exportsName
+          }.${exportName}`
         );
       }
     }
+    replaceDefineCompiledEsmExpressionsAndGetIfRestorable(
+      defineCompiledEsmExpressions,
+      magicString,
+      exportMode,
+      moduleName,
+      exportsName
+    );
   }
-  exports.push(`${requireName} as __require`);
 }
 
 function getExportsForReplacedModuleExports(
@@ -1114,34 +1112,30 @@ function getExportsForReplacedModuleExports(
   exportDeclarations,
   moduleExportsAssignments,
   firstTopLevelModuleExportsAssignment,
-  exportsName
+  exportsName,
+  defaultIsModuleExports,
+  HELPERS_NAME
 ) {
   for (const { left } of moduleExportsAssignments) {
     magicString.overwrite(left.start, left.end, exportsName);
   }
   magicString.prependRight(firstTopLevelModuleExportsAssignment.left.start, 'var ');
   exports.push(`${exportsName} as __moduleExports`);
-  exportDeclarations.push(`export default ${exportsName};`);
-}
-
-function getExportsWhenWrapping(
-  exportDeclarations,
-  exportsName,
-  detectWrappedDefault,
-  HELPERS_NAME,
-  defaultIsModuleExports
-) {
   exportDeclarations.push(
-    `export default ${
-      detectWrappedDefault && defaultIsModuleExports === 'auto'
-        ? `/*@__PURE__*/${HELPERS_NAME}.getDefaultExportFromCjs(${exportsName})`
-        : defaultIsModuleExports === false
-        ? `${exportsName}.default`
-        : exportsName
-    };`
+    getDefaultExportDeclaration(exportsName, defaultIsModuleExports, HELPERS_NAME)
   );
 }
 
+function getDefaultExportDeclaration(exportedExportsName, defaultIsModuleExports, HELPERS_NAME) {
+  return `export default ${
+    defaultIsModuleExports === true
+      ? exportedExportsName
+      : defaultIsModuleExports === false
+      ? `${exportedExportsName}.default`
+      : `/*@__PURE__*/${HELPERS_NAME}.getDefaultExportFromCjs(${exportedExportsName})`
+  }`;
+}
+
 function getExports(
   magicString,
   exports,
@@ -1152,9 +1146,11 @@ function getExports(
   topLevelAssignments,
   moduleName,
   exportsName,
+  exportedExportsName,
   defineCompiledEsmExpressions,
   HELPERS_NAME,
-  defaultIsModuleExports
+  defaultIsModuleExports,
+  exportMode
 ) {
   let deconflictedDefaultExportName;
   // Collect and rewrite module.exports assignments
@@ -1166,8 +1162,10 @@ function getExports(
   for (const [exportName, { nodes }] of exportsAssignmentsByName) {
     const deconflicted = deconflictedExportNames[exportName];
     let needsDeclaration = true;
-    for (const node of nodes) {
-      let replacement = `${deconflicted} = ${exportsName}.${exportName}`;
+    for (const { node, type } of nodes) {
+      let replacement = `${deconflicted} = ${
+        exportMode === 'module' && type === 'module' ? `${moduleName}.exports` : exportsName
+      }.${exportName}`;
       if (needsDeclaration && topLevelAssignments.has(node)) {
         replacement = `var ${replacement}`;
         needsDeclaration = false;
@@ -1185,24 +1183,60 @@ function getExports(
     }
   }
 
-  // Collect and rewrite exports.__esModule assignments
-  let isRestorableCompiledEsm = false;
-  for (const expression of defineCompiledEsmExpressions) {
-    isRestorableCompiledEsm = true;
-    const moduleExportsExpression =
-      expression.type === 'CallExpression' ? expression.arguments[0] : expression.left.object;
-    magicString.overwrite(moduleExportsExpression.start, moduleExportsExpression.end, exportsName);
-  }
+  const isRestorableCompiledEsm = replaceDefineCompiledEsmExpressionsAndGetIfRestorable(
+    defineCompiledEsmExpressions,
+    magicString,
+    exportMode,
+    moduleName,
+    exportsName
+  );
 
-  if (!isRestorableCompiledEsm || defaultIsModuleExports === true) {
-    exports.push(`${exportsName} as default`);
-  } else if (moduleExportsAssignments.length === 0 || defaultIsModuleExports === false) {
-    exports.push(`${deconflictedDefaultExportName || exportsName} as default`);
+  if (
+    defaultIsModuleExports === false ||
+    (defaultIsModuleExports === 'auto' &&
+      isRestorableCompiledEsm &&
+      moduleExportsAssignments.length === 0)
+  ) {
+    // If there is no deconflictedDefaultExportName, then we use the namespace as
+    // fallback because there can be no "default" property on the namespace
+    exports.push(`${deconflictedDefaultExportName || exportedExportsName} as default`);
+  } else if (
+    defaultIsModuleExports === true ||
+    (!isRestorableCompiledEsm && moduleExportsAssignments.length === 0)
+  ) {
+    exports.push(`${exportedExportsName} as default`);
   } else {
     exportDeclarations.push(
-      `export default /*@__PURE__*/${HELPERS_NAME}.getDefaultExportFromCjs(${exportsName});`
+      getDefaultExportDeclaration(exportedExportsName, defaultIsModuleExports, HELPERS_NAME)
+    );
+  }
+}
+
+function rewriteModuleExportsAssignments(magicString, moduleExportsAssignments, exportsName) {
+  for (const { left } of moduleExportsAssignments) {
+    magicString.overwrite(left.start, left.end, exportsName);
+  }
+}
+
+function replaceDefineCompiledEsmExpressionsAndGetIfRestorable(
+  defineCompiledEsmExpressions,
+  magicString,
+  exportMode,
+  moduleName,
+  exportsName
+) {
+  let isRestorableCompiledEsm = false;
+  for (const { node, type } of defineCompiledEsmExpressions) {
+    isRestorableCompiledEsm = true;
+    const moduleExportsExpression =
+      node.type === 'CallExpression' ? node.arguments[0] : node.left.object;
+    magicString.overwrite(
+      moduleExportsExpression.start,
+      moduleExportsExpression.end,
+      exportMode === 'module' && type === 'module' ? `${moduleName}.exports` : exportsName
     );
   }
+  return isRestorableCompiledEsm;
 }
 
 function isRequireExpression(node, scope) {
@@ -1293,19 +1327,18 @@ function getRequireHandlers() {
     commonjsMeta
   ) {
     const imports = [];
-    imports.push(`import * as ${helpersName} from "${HELPERS_ID}";`);
+    imports.push(`import * as ${helpersName} from "${HELPERS_ID}"`);
     if (dynamicRequireName) {
       imports.push(
         `import { ${
           isDynamicRequireModulesEnabled ? CREATE_COMMONJS_REQUIRE_EXPORT : COMMONJS_REQUIRE_EXPORT
-        } as ${dynamicRequireName} } from "${DYNAMIC_MODULES_ID}";`
+        } as ${dynamicRequireName} } from "${DYNAMIC_MODULES_ID}"`
       );
     }
     if (exportMode === 'module') {
       imports.push(
-        `import { __module as ${moduleName}, exports as ${exportsName} } from ${JSON.stringify(
-          wrapId(id, MODULE_SUFFIX)
-        )}`
+        `import { __module as ${moduleName} } from ${JSON.stringify(wrapId(id, MODULE_SUFFIX))}`,
+        `var ${exportsName} = ${moduleName}.exports`
       );
     } else if (exportMode === 'exports') {
       imports.push(
@@ -1331,7 +1364,7 @@ function getRequireHandlers() {
       getIgnoreTryCatchRequireStatementMode,
       magicString
     );
-    return imports.length ? `${imports.join('\n')}\n\n` : '';
+    return imports.length ? `${imports.join(';\n')};\n\n` : '';
   }
 
   return {
@@ -1391,9 +1424,9 @@ function processRequireExpressions(
     }
     if (needsImport) {
       if (isCommonJS === IS_WRAPPED_COMMONJS) {
-        imports.push(`import { __require as ${name} } from ${JSON.stringify(resolvedId)};`);
+        imports.push(`import { __require as ${name} } from ${JSON.stringify(resolvedId)}`);
       } else {
-        imports.push(`import ${usesRequired ? `${name} from ` : ''}${JSON.stringify(resolvedId)};`);
+        imports.push(`import ${usesRequired ? `${name} from ` : ''}${JSON.stringify(resolvedId)}`);
       }
     }
   }
@@ -1418,6 +1451,14 @@ const exportsPattern = /^(?:module\.)?exports(?:\.([a-zA-Z_$][a-zA-Z_$0-9]*))?$/
 
 const functionType = /^(?:FunctionDeclaration|FunctionExpression|ArrowFunctionExpression)$/;
 
+// There are three different types of CommonJS modules, described by their
+// "exportMode":
+// - exports: Only assignments to (module.)exports properties
+// - replace: A single assignment to module.exports itself
+// - module: Anything else
+// Special cases:
+// - usesRequireWrapper
+// - isWrapped
 async function transformCommonjs(
   parse,
   code,
@@ -1454,7 +1495,6 @@ 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
@@ -1528,31 +1568,20 @@ async 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 (isRequireExpression(node.right, scope)) {
-                  shouldWrap = true;
-                  reexports = true;
-                }
-              }
             } else if (exportName === KEY_COMPILED_ESM) {
               if (programDepth > 3) {
                 shouldWrap = true;
               } else {
-                topLevelDefineCompiledEsmExpressions.push(node);
+                // The "type" is either "module" or "exports" to discern
+                // assignments to module.exports vs exports if needed
+                topLevelDefineCompiledEsmExpressions.push({ node, type: flattened.name });
               }
             } else {
               const exportsAssignments = exportsAssignmentsByName.get(exportName) || {
                 nodes: [],
                 scopes: new Set()
               };
-              exportsAssignments.nodes.push(node);
+              exportsAssignments.nodes.push({ node, type: flattened.name });
               exportsAssignments.scopes.add(scope);
               exportsAccessScopes.add(scope);
               exportsAssignmentsByName.set(exportName, exportsAssignments);
@@ -1569,11 +1598,12 @@ async function transformCommonjs(
           }
           return;
         case 'CallExpression': {
-          if (isDefineCompiledEsm(node)) {
+          const defineCompiledEsmType = getDefineCompiledEsmType(node);
+          if (defineCompiledEsmType) {
             if (programDepth === 3 && parent.type === 'ExpressionStatement') {
               // skip special handling for [module.]exports until we know we render this
               skippedNodes.add(node.arguments[0]);
-              topLevelDefineCompiledEsmExpressions.push(node);
+              topLevelDefineCompiledEsmExpressions.push({ node, type: defineCompiledEsmType });
             } else {
               shouldWrap = true;
             }
@@ -1591,6 +1621,7 @@ async function transformCommonjs(
             uses.require = true;
             const requireNode = node.callee.object;
             replacedDynamicRequires.push(requireNode);
+            skippedNodes.add(node.callee);
             return;
           }
 
@@ -1833,11 +1864,6 @@ async function transformCommonjs(
 
   // We cannot wrap ES/mixed modules
   shouldWrap = !isEsModule && (shouldWrap || (uses.exports && moduleExportsAssignments.length > 0));
-  const detectWrappedDefault =
-    shouldWrap &&
-    (reexports ||
-      topLevelDefineCompiledEsmExpressions.length > 0 ||
-      code.indexOf('__esModule') >= 0);
 
   if (
     !(
@@ -1875,6 +1901,9 @@ async function transformCommonjs(
     ? 'exports'
     : 'module';
 
+  const exportedExportsName =
+    exportMode === 'module' ? deconflict([], globals, `${nameBase}Exports`) : exportsName;
+
   const importBlock = await rewriteRequireExpressionsAndGetImportBlock(
     magicString,
     topLevelDeclarations,
@@ -1899,6 +1928,7 @@ async function transformCommonjs(
         magicString,
         moduleName,
         exportsName,
+        exportedExportsName,
         shouldWrap,
         moduleExportsAssignments,
         firstTopLevelModuleExportsAssignment,
@@ -1909,7 +1939,6 @@ async function transformCommonjs(
         code,
         helpersName,
         exportMode,
-        detectWrappedDefault,
         defaultIsModuleExports,
         usesRequireWrapper,
         requireName
@@ -1923,15 +1952,16 @@ async function transformCommonjs(
     magicString.trim().indent('\t', {
       exclude: indentExclusionRanges
     });
+    const exported = exportMode === 'module' ? `${moduleName}.exports` : exportsName;
     magicString.prepend(
       `var ${isRequiredName};
 
 function ${requireName} () {
-\tif (${isRequiredName}) return ${exportsName};
+\tif (${isRequiredName}) return ${exported};
 \t${isRequiredName} = 1;
 `
     ).append(`
-\treturn ${exportsName};
+\treturn ${exported};
 }`);
     if (exportMode === 'replace') {
       magicString.prepend(`var ${exportsName};\n`);
@@ -2161,15 +2191,9 @@ function commonjs(options = {}) {
       }
 
       if (isWrappedId(id, MODULE_SUFFIX)) {
-        const module = getName(unwrapId(id, MODULE_SUFFIX));
-        const moduleExports = `${module}Exports`;
+        const name = getName(unwrapId(id, MODULE_SUFFIX));
         return {
-          code: `var ${moduleExports} = {};
-var ${module} = {
-  get exports(){ return ${moduleExports}; },
-  set exports(v){ ${moduleExports} = v; },
-};
-export {${module} as __module, ${moduleExports} as exports}`,
+          code: `var ${name} = {exports: {}}; export {${name} as __module}`,
           meta: { commonjs: { isCommonJS: false } }
         };
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rollup/plugin-commonjs",
-  "version": "24.0.1",
+  "version": "24.1.0-0",
   "publishConfig": {
     "access": "public"
   },
@@ -74,7 +74,7 @@
     "@rollup/plugin-node-resolve": "^15.0.0",
     "locate-character": "^2.0.5",
     "require-relative": "^0.8.7",
-    "rollup": "3.0.0-7",
+    "rollup": "^3.19.0",
     "shx": "^0.3.4",
     "source-map": "^0.7.4",
     "source-map-support": "^0.5.21",