packages/commonjs/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @rollup/plugin-commonjs ChangeLog
 
+## v25.0.0
+
+_2023-05-12_
+
+### Breaking Changes
+
+- fix: dynamic require root check was broken in some cases [#1461](https://github.com/rollup/plugins/pull/1461)
+
+## v24.1.0
+
+_2023-04-11_
+
+### Features
+
+- feat: Do not use getters for module.exports [#1455](https://github.com/rollup/plugins/pull/1455)
+
 ## v24.0.1
 
 _2023-01-20_

packages/commonjs/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rollup/plugin-commonjs",
-  "version": "24.0.1",
+  "version": "25.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",

packages/commonjs/src/ast-utils.js

@@ -60,11 +60,16 @@ export function getKeypath(node) {
 
 export const KEY_COMPILED_ESM = '__esModule';
 
-export function isDefineCompiledEsm(node) {
+export 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;
 }

packages/commonjs/src/generate-exports.js

@@ -7,19 +7,22 @@ export function wrapCode(magicString, uses, moduleName, exportsName, indentExclu
   }
   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(', ')}));`);
 }
 
 export function rewriteExportsAndGetExportsBlock(
   magicString,
   moduleName,
   exportsName,
+  exportedExportsName,
   wrapped,
   moduleExportsAssignments,
   firstTopLevelModuleExportsAssignment,
@@ -30,7 +33,6 @@ export function rewriteExportsAndGetExportsBlock(
   code,
   HELPERS_NAME,
   exportMode,
-  detectWrappedDefault,
   defaultIsModuleExports,
   usesRequireWrapper,
   requireName
@@ -58,17 +60,20 @@ export 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(
@@ -81,17 +86,19 @@ export 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(
@@ -106,35 +113,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(
@@ -143,34 +147,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,
@@ -181,9 +181,11 @@ function getExports(
   topLevelAssignments,
   moduleName,
   exportsName,
+  exportedExportsName,
   defineCompiledEsmExpressions,
   HELPERS_NAME,
-  defaultIsModuleExports
+  defaultIsModuleExports,
+  exportMode
 ) {
   let deconflictedDefaultExportName;
   // Collect and rewrite module.exports assignments
@@ -195,8 +197,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;
@@ -214,22 +218,58 @@ 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;
 }

packages/commonjs/src/generate-imports.js

@@ -98,19 +98,18 @@ export 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(
@@ -136,7 +135,7 @@ export function getRequireHandlers() {
       getIgnoreTryCatchRequireStatementMode,
       magicString
     );
-    return imports.length ? `${imports.join('\n')}\n\n` : '';
+    return imports.length ? `${imports.join(';\n')};\n\n` : '';
   }
 
   return {
@@ -196,9 +195,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)}`);
       }
     }
   }