@rollup/plugin-commonjs 11.1.0 → 13.0.2

package/dist/index.es.js

@@ -1,15 +1,15 @@
-import { statSync, existsSync, realpathSync, readFileSync } from 'fs';
-import { basename, extname, dirname, sep, resolve, join, normalize } from 'path';
-import { sync, isCore } from 'resolve';
+import { statSync, existsSync, readFileSync } from 'fs';
+import { basename, extname, dirname, sep, resolve, join } from 'path';
 import { makeLegalIdentifier, attachScopes, extractAssignedNames, createFilter } from '@rollup/pluginutils';
+import getCommonDir from 'commondir';
 import glob from 'glob';
 import { walk } from 'estree-walker';
 import MagicString from 'magic-string';
+import { sync } from 'resolve';
 import isReference from 'is-reference';
-import getCommonDir from 'commondir';
 
 function _slicedToArray(arr, i) {
-  return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _nonIterableRest();
+  return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest();
 }
 
 function _arrayWithHoles(arr) {
@@ -17,10 +17,7 @@ function _arrayWithHoles(arr) {
 }
 
 function _iterableToArrayLimit(arr, i) {
-  if (!(Symbol.iterator in Object(arr) || Object.prototype.toString.call(arr) === "[object Arguments]")) {
-    return;
-  }
-
+  if (typeof Symbol === "undefined" || !(Symbol.iterator in Object(arr))) return;
   var _arr = [];
   var _n = true;
   var _d = false;
@@ -46,10 +43,86 @@ function _iterableToArrayLimit(arr, i) {
   return _arr;
 }
 
+function _unsupportedIterableToArray(o, minLen) {
+  if (!o) return;
+  if (typeof o === "string") return _arrayLikeToArray(o, minLen);
+  var n = Object.prototype.toString.call(o).slice(8, -1);
+  if (n === "Object" && o.constructor) n = o.constructor.name;
+  if (n === "Map" || n === "Set") return Array.from(n);
+  if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen);
+}
+
+function _arrayLikeToArray(arr, len) {
+  if (len == null || len > arr.length) len = arr.length;
+
+  for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i];
+
+  return arr2;
+}
+
 function _nonIterableRest() {
-  throw new TypeError("Invalid attempt to destructure non-iterable instance");
+  throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
+}
+
+function _createForOfIteratorHelper(o) {
+  if (typeof Symbol === "undefined" || o[Symbol.iterator] == null) {
+    if (Array.isArray(o) || (o = _unsupportedIterableToArray(o))) {
+      var i = 0;
+
+      var F = function () {};
+
+      return {
+        s: F,
+        n: function () {
+          if (i >= o.length) return {
+            done: true
+          };
+          return {
+            done: false,
+            value: o[i++]
+          };
+        },
+        e: function (e) {
+          throw e;
+        },
+        f: F
+      };
+    }
+
+    throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
+  }
+
+  var it,
+      normalCompletion = true,
+      didErr = false,
+      err;
+  return {
+    s: function () {
+      it = o[Symbol.iterator]();
+    },
+    n: function () {
+      var step = it.next();
+      normalCompletion = step.done;
+      return step;
+    },
+    e: function (e) {
+      didErr = true;
+      err = e;
+    },
+    f: function () {
+      try {
+        if (!normalCompletion && it.return != null) it.return();
+      } finally {
+        if (didErr) throw err;
+      }
+    }
+  };
 }
 
+var peerDependencies = {
+	rollup: "^2.3.4"
+};
+
 /* eslint-disable no-undefined */
 const operators = {
   '==': x => equals(x.left, x.right, false),
@@ -125,8 +198,14 @@ export function unwrapExports (x) {
 	return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;
 }
 
-export function createCommonjsModule(fn, module) {
-	return module = { exports: {} }, fn(module, module.exports), module.exports;
+export function createCommonjsModule(fn, basedir, module) {
+	return module = {
+	  path: basedir,
+	  exports: {},
+	  require: function (path, base) {
+      return commonjsRequire(path, (base === undefined || base === null) ? module.path : base);
+    }
+	}, fn(module, module.exports), module.exports;
 }
 
 export function getCjsExportFromNamespace (n) {
@@ -189,7 +268,7 @@ function join () {
 	}
 	if (joined === undefined)
 	  return '.';
-  
+
 	return joined;
 }
 
@@ -204,6 +283,27 @@ function isPossibleNodeModulesPath (modulePath) {
 	return true;
 }
 
+function dirname (path) {
+  if (path.length === 0)
+    return '.';
+
+  let i = path.length - 1;
+  while (i > 0) {
+    const c = path.charCodeAt(i);
+    if ((c === 47 || c === 92) && i !== path.length - 1)
+      break;
+    i--;
+  }
+
+  if (i > 0)
+    return path.substr(0, i);
+
+  if (path.chartCodeAt(0) === 47 || path.chartCodeAt(0) === 92)
+    return path.charAt(0);
+
+  return '.';
+}
+
 export function commonjsRequire (path, originalModuleDir) {
 	const shouldTryNodeModules = isPossibleNodeModulesPath(path);
 	path = normalize(path);
@@ -225,11 +325,15 @@ export function commonjsRequire (path, originalModuleDir) {
 				DYNAMIC_REQUIRE_CACHE[resolvedPath] = cachedModule = {
 					id: resolvedPath,
 					filename: resolvedPath,
+					path: dirname(resolvedPath),
 					exports: {},
 					parent: DEFAULT_PARENT_MODULE,
 					loaded: false,
 					children: [],
-					paths: []
+					paths: [],
+					require: function (path, base) {
+					  return commonjsRequire(path, (base === undefined || base === null) ? cachedModule.path : base);
+					}
 				};
 				try {
 					loader.call(commonjsGlobal, cachedModule, cachedModule.exports);
@@ -309,12 +413,12 @@ function hasCjsKeywords(code, ignoreGlobal) {
 function checkEsModule(parse, code, id) {
   const ast = tryParse(parse, code, id);
   let isEsModule = false;
-  var _iteratorNormalCompletion = true;
-  var _didIteratorError = false;
-  var _iteratorError = undefined;
+
+  var _iterator = _createForOfIteratorHelper(ast.body),
+      _step;
 
   try {
-    for (var _iterator = ast.body[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+    for (_iterator.s(); !(_step = _iterator.n()).done;) {
       const node = _step.value;
       if (node.type === 'ExportDefaultDeclaration') return {
         isEsModule: true,
@@ -324,12 +428,12 @@ function checkEsModule(parse, code, id) {
 
       if (node.type === 'ExportNamedDeclaration') {
         isEsModule = true;
-        var _iteratorNormalCompletion2 = true;
-        var _didIteratorError2 = false;
-        var _iteratorError2 = undefined;
+
+        var _iterator2 = _createForOfIteratorHelper(node.specifiers),
+            _step2;
 
         try {
-          for (var _iterator2 = node.specifiers[Symbol.iterator](), _step2; !(_iteratorNormalCompletion2 = (_step2 = _iterator2.next()).done); _iteratorNormalCompletion2 = true) {
+          for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
             const specifier = _step2.value;
 
             if (specifier.exported.name === 'default') {
@@ -341,34 +445,16 @@ function checkEsModule(parse, code, id) {
             }
           }
         } catch (err) {
-          _didIteratorError2 = true;
-          _iteratorError2 = err;
+          _iterator2.e(err);
         } finally {
-          try {
-            if (!_iteratorNormalCompletion2 && _iterator2.return != null) {
-              _iterator2.return();
-            }
-          } finally {
-            if (_didIteratorError2) {
-              throw _iteratorError2;
-            }
-          }
+          _iterator2.f();
         }
       } else if (importExportDeclaration.test(node.type)) isEsModule = true;
     }
   } catch (err) {
-    _didIteratorError = true;
-    _iteratorError = err;
+    _iterator.e(err);
   } finally {
-    try {
-      if (!_iteratorNormalCompletion && _iterator.return != null) {
-        _iterator.return();
-      }
-    } finally {
-      if (_didIteratorError) {
-        throw _iteratorError;
-      }
-    }
+    _iterator.f();
   }
 
   return {
@@ -396,7 +482,7 @@ function getDefinePropertyCallName(node, targetName) {
   return val.value;
 }
 
-function transformCommonjs(parse, code, id, isEntry, isEsModule, ignoreGlobal, ignoreRequire, customNamedExports, sourceMap, isDynamicRequireModulesEnabled, dynamicRequireModuleSet, commonDir, astCache) {
+function transformCommonjs(parse, code, id, isEntry, hasImporters, isEsModule, ignoreGlobal, ignoreRequire, sourceMap, isDynamicRequireModulesEnabled, dynamicRequireModuleSet, commonDir, astCache) {
   const ast = astCache || tryParse(parse, code, id);
   const magicString = new MagicString(code);
   const required = {}; // Because objects have no guaranteed ordering, yet we need it,
@@ -419,15 +505,38 @@ function transformCommonjs(parse, code, id, isEntry, isEsModule, ignoreGlobal, i
   const namedExports = {}; // TODO handle transpiled modules
 
   let shouldWrap = /__esModule/.test(code);
-  let usesDynamicHelpers = false;
+  let usesCommonjsHelpers = false;
 
   function isRequireStatement(node) {
     if (!node) return false;
-    if (node.type !== 'CallExpression') return false;
-    if (node.callee.name !== 'require' || scope.contains('require')) return false; // Weird case of require() without arguments
+    if (node.type !== 'CallExpression') return false; // Weird case of `require()` or `module.require()` without arguments
 
     if (node.arguments.length === 0) return false;
-    return true;
+    return isRequireIdentifier(node.callee);
+  }
+
+  function isRequireIdentifier(node) {
+    if (!node) return false;
+
+    if (node.type === 'Identifier' && node.name === 'require'
+    /* `require` */
+    ) {
+        // `require` is hidden by a variable in local scope
+        if (scope.contains('require')) return false;
+        return true;
+      } else if (node.type === 'MemberExpression'
+    /* `[something].[something]` */
+    ) {
+        // `module.[something]`
+        if (node.object.type !== 'Identifier' || node.object.name !== 'module') return false; // `module` is hidden by a variable in local scope
+
+        if (scope.contains('module')) return false; // `module.require(...)`
+
+        if (node.property.type !== 'Identifier' || node.property.name !== 'require') return false;
+        return true;
+      }
+
+    return false;
   }
 
   function hasDynamicArguments(node) {
@@ -576,9 +685,14 @@ function transformCommonjs(parse, code, id, isEntry, isEsModule, ignoreGlobal, i
 
       if (node.type === 'ThisExpression' && lexicalDepth === 0) {
         uses.global = true;
-        if (!ignoreGlobal) magicString.overwrite(node.start, node.end, `${HELPERS_NAME}.commonjsGlobal`, {
-          storeName: true
-        });
+
+        if (!ignoreGlobal) {
+          magicString.overwrite(node.start, node.end, `${HELPERS_NAME}.commonjsGlobal`, {
+            storeName: true
+          });
+          usesCommonjsHelpers = true;
+        }
+
         return;
       } // rewrite `typeof module`, `typeof module.exports` and `typeof exports` (https://github.com/rollup/rollup-plugin-commonjs/issues/151)
 
@@ -600,21 +714,21 @@ function transformCommonjs(parse, code, id, isEntry, isEsModule, ignoreGlobal, i
       if (node.type === 'Identifier') {
         if (isReference(node, parent) && !scope.contains(node.name)) {
           if (node.name in uses) {
-            if (node.name === 'require') {
+            if (isRequireIdentifier(node)) {
               if (!isDynamicRequireModulesEnabled && isStaticRequireStatement(parent)) {
                 return;
               }
 
               if (isDynamicRequireModulesEnabled && isRequireStatement(parent)) {
-                magicString.appendLeft(parent.end - 1, ',' + JSON.stringify(dirname(id) === '.' ? null
+                magicString.appendLeft(parent.end - 1, `,${JSON.stringify(dirname(id) === '.' ? null
                 /* default behavior */
-                : getVirtualPathForDynamicRequirePath(normalizePathSlashes(dirname(id)), commonDir)));
+                : getVirtualPathForDynamicRequirePath(normalizePathSlashes(dirname(id)), commonDir))}`);
               }
 
               magicString.overwrite(node.start, node.end, `${HELPERS_NAME}.commonjsRequire`, {
                 storeName: true
               });
-              usesDynamicHelpers = true;
+              usesCommonjsHelpers = true;
             }
 
             uses[node.name] = true;
@@ -623,6 +737,7 @@ function transformCommonjs(parse, code, id, isEntry, isEsModule, ignoreGlobal, i
               magicString.overwrite(node.start, node.end, `${HELPERS_NAME}.commonjsGlobal`, {
                 storeName: true
               });
+              usesCommonjsHelpers = true;
             } // if module or exports are used outside the context of an assignment
             // expression, we need to wrap the module
 
@@ -703,7 +818,7 @@ function transformCommonjs(parse, code, id, isEntry, isEsModule, ignoreGlobal, i
           magicString.overwrite(node.start, node.end, `${HELPERS_NAME}.commonjsRequire(${JSON.stringify(getVirtualPathForDynamicRequirePath(normalizePathSlashes(required.source), commonDir))}, ${JSON.stringify(dirname(id) === '.' ? null
           /* default behavior */
           : getVirtualPathForDynamicRequirePath(normalizePathSlashes(dirname(id)), commonDir))})`);
-          usesDynamicHelpers = true;
+          usesCommonjsHelpers = true;
         } else {
           magicString.overwrite(node.start, node.end, required.name);
         }
@@ -745,16 +860,15 @@ function transformCommonjs(parse, code, id, isEntry, isEsModule, ignoreGlobal, i
   });
 
   if (!sources.length && !uses.module && !uses.exports && !uses.require && (ignoreGlobal || !uses.global)) {
-    if (Object.keys(namedExports).length) {
-      throw new Error(`Custom named exports were specified for ${id} but it does not appear to be a CommonJS module`);
-    } // not a CommonJS module
-
-
+    // not a CommonJS module
     return null;
-  }
+  } // If `isEsModule` is on, it means it has ES6 import/export statements,
+  //   which just can't be wrapped in a function.
 
-  const includeHelpers = usesDynamicHelpers || shouldWrap || uses.global || uses.require;
-  const importBlock = `${(includeHelpers ? [`import * as ${HELPERS_NAME} from '${HELPERS_ID}';`] : []).concat(sources.map(([source]) => // import the actual module before the proxy, so that we know
+
+  if (isEsModule) shouldWrap = false;
+  usesCommonjsHelpers = usesCommonjsHelpers || shouldWrap;
+  const importBlock = `${(usesCommonjsHelpers ? [`import * as ${HELPERS_NAME} from '${HELPERS_ID}';`] : []).concat(sources.map(([source]) => // import the actual module before the proxy, so that we know
   // what kind of proxy to build
   `import '${source}';`), sources.filter(([, importProxy]) => importProxy).map(([source]) => {
     const _required$source = required[source],
@@ -767,7 +881,7 @@ function transformCommonjs(parse, code, id, isEntry, isEsModule, ignoreGlobal, i
   let wrapperEnd = '';
   const moduleName = deconflict(scope, globals, getName(id));
 
-  if (!isEntry && !isEsModule) {
+  if ((!isEntry || hasImporters) && !isEsModule) {
     const exportModuleExports = {
       str: `export { ${moduleName} as __moduleExports };`,
       name: '__moduleExports'
@@ -775,33 +889,27 @@ function transformCommonjs(parse, code, id, isEntry, isEsModule, ignoreGlobal, i
     namedExportDeclarations.push(exportModuleExports);
   }
 
-  const name = getName(id);
-
-  function addExport(x) {
-    const deconflicted = deconflict(scope, globals, name);
-    const declaration = deconflicted === name ? `export var ${x} = ${moduleName}.${x};` : `var ${deconflicted} = ${moduleName}.${x};\nexport { ${deconflicted} as ${x} };`;
-    namedExportDeclarations.push({
-      str: declaration,
-      name: x
-    });
-  }
-
-  if (customNamedExports) customNamedExports.forEach(addExport);
   const defaultExportPropertyAssignments = [];
   let hasDefaultExport = false;
 
   if (shouldWrap) {
     const args = `module${uses.exports ? ', exports' : ''}`;
     wrapperStart = `var ${moduleName} = ${HELPERS_NAME}.createCommonjsModule(function (${args}) {\n`;
-    wrapperEnd = `\n});`;
+    wrapperEnd = `\n}`;
+
+    if (isDynamicRequireModulesEnabled) {
+      wrapperEnd += `, ${JSON.stringify(getVirtualPathForDynamicRequirePath(normalizePathSlashes(dirname(id)), commonDir))}`;
+    }
+
+    wrapperEnd += `);`;
   } else {
     const names = [];
-    var _iteratorNormalCompletion3 = true;
-    var _didIteratorError3 = false;
-    var _iteratorError3 = undefined;
+
+    var _iterator3 = _createForOfIteratorHelper(ast.body),
+        _step3;
 
     try {
-      for (var _iterator3 = ast.body[Symbol.iterator](), _step3; !(_iteratorNormalCompletion3 = (_step3 = _iterator3.next()).done); _iteratorNormalCompletion3 = true) {
+      for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
         const node = _step3.value;
 
         if (node.type === 'ExpressionStatement' && node.expression.type === 'AssignmentExpression') {
@@ -838,7 +946,6 @@ function transformCommonjs(parse, code, id, isEntry, isEsModule, ignoreGlobal, i
                 str: declaration,
                 name
               });
-              delete namedExports[name];
             }
 
             defaultExportPropertyAssignments.push(`${moduleName}.${name} = ${deconflicted};`);
@@ -846,21 +953,12 @@ function transformCommonjs(parse, code, id, isEntry, isEsModule, ignoreGlobal, i
         }
       }
     } catch (err) {
-      _didIteratorError3 = true;
-      _iteratorError3 = err;
+      _iterator3.e(err);
     } finally {
-      try {
-        if (!_iteratorNormalCompletion3 && _iterator3.return != null) {
-          _iterator3.return();
-        }
-      } finally {
-        if (_didIteratorError3) {
-          throw _iteratorError3;
-        }
-      }
+      _iterator3.f();
     }
 
-    if (!hasDefaultExport && (names.length || !isEntry && !isEsModule)) {
+    if (!hasDefaultExport && (names.length || (!isEntry || hasImporters) && !isEsModule)) {
       wrapperEnd = `\n\nvar ${moduleName} = {\n${names.map(({
         name,
         deconflicted
@@ -868,13 +966,13 @@ function transformCommonjs(parse, code, id, isEntry, isEsModule, ignoreGlobal, i
     }
   }
 
-  Object.keys(namedExports).filter(key => !blacklist[key]).forEach(addExport);
-  const defaultExport = /__esModule/.test(code) ? `export default ${HELPERS_NAME}.unwrapExports(${moduleName});` : `export default ${moduleName};`;
+  const defaultExport = /__esModule/.test(code) ? `export default /*@__PURE__*/${HELPERS_NAME}.unwrapExports(${moduleName});` : `export default ${moduleName};`;
   const named = namedExportDeclarations.filter(x => x.name !== 'default' || !hasDefaultExport).map(x => x.str);
   const exportBlock = `\n\n${(isEsModule ? [] : [defaultExport]).concat(named).concat(hasDefaultExport ? defaultExportPropertyAssignments : []).join('\n')}`;
   magicString.trim().prepend(importBlock + wrapperStart).trim().append(wrapperEnd);
+  const injectExportBlock = hasDefaultExport || named.length > 0 || shouldWrap || !isEntry || hasImporters;
 
-  if (hasDefaultExport || named.length > 0 || shouldWrap || !isEntry && !isEsModule) {
+  if (injectExportBlock) {
     magicString.append(exportBlock);
   }
 
@@ -882,58 +980,41 @@ function transformCommonjs(parse, code, id, isEntry, isEsModule, ignoreGlobal, i
   const map = sourceMap ? magicString.generateMap() : null;
   return {
     code,
-    map
+    map,
+    syntheticNamedExports: injectExportBlock
   };
 }
 
 function getDynamicRequirePaths(patterns) {
   const dynamicRequireModuleSet = new Set();
-  var _iteratorNormalCompletion = true;
-  var _didIteratorError = false;
-  var _iteratorError = undefined;
+
+  var _iterator = _createForOfIteratorHelper(!patterns || Array.isArray(patterns) ? patterns || [] : [patterns]),
+      _step;
 
   try {
-    for (var _iterator = (!patterns || Array.isArray(patterns) ? patterns || [] : [patterns])[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+    for (_iterator.s(); !(_step = _iterator.n()).done;) {
       const pattern = _step.value;
       const isNegated = pattern.startsWith('!');
       const modifySet = Set.prototype[isNegated ? 'delete' : 'add'].bind(dynamicRequireModuleSet);
-      var _iteratorNormalCompletion2 = true;
-      var _didIteratorError2 = false;
-      var _iteratorError2 = undefined;
+
+      var _iterator2 = _createForOfIteratorHelper(glob.sync(isNegated ? pattern.substr(1) : pattern)),
+          _step2;
 
       try {
-        for (var _iterator2 = glob.sync(isNegated ? pattern.substr(1) : pattern)[Symbol.iterator](), _step2; !(_iteratorNormalCompletion2 = (_step2 = _iterator2.next()).done); _iteratorNormalCompletion2 = true) {
+        for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
           const path = _step2.value;
           modifySet(normalizePathSlashes(resolve(path)));
         }
       } catch (err) {
-        _didIteratorError2 = true;
-        _iteratorError2 = err;
+        _iterator2.e(err);
       } finally {
-        try {
-          if (!_iteratorNormalCompletion2 && _iterator2.return != null) {
-            _iterator2.return();
-          }
-        } finally {
-          if (_didIteratorError2) {
-            throw _iteratorError2;
-          }
-        }
+        _iterator2.f();
       }
     }
   } catch (err) {
-    _didIteratorError = true;
-    _iteratorError = err;
+    _iterator.e(err);
   } finally {
-    try {
-      if (!_iteratorNormalCompletion && _iterator.return != null) {
-        _iterator.return();
-      }
-    } finally {
-      if (_didIteratorError) {
-        throw _iteratorError;
-      }
-    }
+    _iterator.f();
   }
 
   const dynamicRequireModuleDirPaths = Array.from(dynamicRequireModuleSet.values()).filter(path => {
@@ -950,10 +1031,6 @@ function getDynamicRequirePaths(patterns) {
   };
 }
 
-var peerDependencies = {
-	rollup: "^1.20.0||^2.0.0"
-};
-
 /* eslint-disable no-undefined */
 const isCjsPromises = new Map();
 function getIsCjsPromise(id) {
@@ -1075,44 +1152,6 @@ function commonjs(options = {}) {
 
   const isDynamicRequireModulesEnabled = dynamicRequireModuleSet.size > 0;
   const commonDir = isDynamicRequireModulesEnabled ? getCommonDir(null, Array.from(dynamicRequireModuleSet).concat(process.cwd())) : null;
-  const customNamedExports = {};
-
-  if (options.namedExports) {
-    Object.keys(options.namedExports).forEach(id => {
-      let resolveId = id;
-      let resolvedId;
-
-      if (isCore(id)) {
-        // resolve will not find npm modules with the same name as
-        // core modules without a trailing slash. Since core modules
-        // must be external, we can assume any core modules defined
-        // here are npm modules by that name.
-        resolveId += '/';
-      }
-
-      try {
-        resolvedId = sync(resolveId, {
-          basedir: process.cwd()
-        });
-      } catch (err) {
-        resolvedId = resolve(id);
-      } // Note: customNamedExport's keys must be normalized file paths.
-      // resolve and nodeResolveSync both return normalized file paths
-      // so no additional normalization is necessary.
-
-
-      customNamedExports[resolvedId] = options.namedExports[id];
-
-      if (existsSync(resolvedId)) {
-        const realpath = realpathSync(resolvedId);
-
-        if (realpath !== resolvedId) {
-          customNamedExports[realpath] = options.namedExports[id];
-        }
-      }
-    });
-  }
-
   const esModulesWithoutDefaultExport = new Set();
   const esModulesWithDefaultExport = new Set();
   const ignoreRequire = typeof options.ignore === 'function' ? options.ignore : Array.isArray(options.ignore) ? id => options.ignore.includes(id) : () => false;
@@ -1127,17 +1166,22 @@ function commonjs(options = {}) {
 
     const isDynamicRequireModule = dynamicRequireModuleSet.has(normalizePathSlashes(id));
 
-    if (isEsModule && !isDynamicRequireModule) {
+    if (isEsModule && (!isDynamicRequireModule || !options.transformMixedEsModules)) {
       (hasDefaultExport ? esModulesWithDefaultExport : esModulesWithoutDefaultExport).add(id);
-    } // it is not an ES module but it does not have CJS-specific elements.
+
+      if (!options.transformMixedEsModules) {
+        setIsCjsPromise(id, false);
+        return null;
+      }
+    } // it is not an ES module AND it does not have CJS-specific elements.
     else if (!hasCjsKeywords(code, ignoreGlobal)) {
         esModulesWithoutDefaultExport.add(id);
         setIsCjsPromise(id, false);
         return null;
       }
 
-    const normalizedId = normalize(id);
-    const transformed = transformCommonjs(this.parse, code, id, this.getModuleInfo(id).isEntry, isEsModule, ignoreGlobal || isEsModule, ignoreRequire, customNamedExports[normalizedId], sourceMap, isDynamicRequireModulesEnabled, dynamicRequireModuleSet, commonDir, ast);
+    const moduleInfo = this.getModuleInfo(id);
+    const transformed = transformCommonjs(this.parse, code, id, moduleInfo.isEntry, moduleInfo.importers && moduleInfo.importers.length > 0, isEsModule, ignoreGlobal || isEsModule, ignoreRequire, sourceMap, isDynamicRequireModulesEnabled, dynamicRequireModuleSet, commonDir, ast);
     setIsCjsPromise(id, isEsModule ? false : Boolean(transformed));
 
     if (!transformed) {
@@ -1152,6 +1196,10 @@ function commonjs(options = {}) {
     name: 'commonjs',
 
     buildStart() {
+      if (options.namedExports != null) {
+        this.warn('The namedExports option from "@rollup/plugin-commonjs" is deprecated. Named exports are now handled automatically.');
+      }
+
       const _this$meta$rollupVers = this.meta.rollupVersion.split('.').map(Number),
             _this$meta$rollupVers2 = _slicedToArray(_this$meta$rollupVers, 2),
             major = _this$meta$rollupVers2[0],
@@ -1190,12 +1238,12 @@ function commonjs(options = {}) {
 
       if (id === DYNAMIC_PACKAGES_ID) {
         let code = `const { commonjsRegister } = require('${HELPERS_ID}');`;
-        var _iteratorNormalCompletion = true;
-        var _didIteratorError = false;
-        var _iteratorError = undefined;
+
+        var _iterator = _createForOfIteratorHelper(dynamicRequireModuleDirPaths),
+            _step;
 
         try {
-          for (var _iterator = dynamicRequireModuleDirPaths[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+          for (_iterator.s(); !(_step = _iterator.n()).done;) {
             const dir = _step.value;
             let entryPoint = 'index.js';
 
@@ -1213,18 +1261,9 @@ function commonjs(options = {}) {
 });`;
           }
         } catch (err) {
-          _didIteratorError = true;
-          _iteratorError = err;
+          _iterator.e(err);
         } finally {
-          try {
-            if (!_iteratorNormalCompletion && _iterator.return != null) {
-              _iterator.return();
-            }
-          } finally {
-            if (_didIteratorError) {
-              throw _iteratorError;
-            }
-          }
+          _iterator.f();
         }
 
         return code;
@@ -1284,7 +1323,7 @@ function commonjs(options = {}) {
           dynamicImports += `require(${JSON.stringify(DYNAMIC_REGISTER_PREFIX + DYNAMIC_PACKAGES_ID)});`;
         }
 
-        code = dynamicImports + '\n' + code;
+        code = `${dynamicImports}\n${code}`;
         return code;
       }