@rollup/plugin-commonjs 16.0.0 → 17.0.0

package/dist/index.js

@@ -4,23 +4,87 @@ var path = require('path');
 var pluginutils = require('@rollup/pluginutils');
 var getCommonDir = require('commondir');
 var fs = require('fs');
+var glob = require('glob');
 var estreeWalker = require('estree-walker');
 var MagicString = require('magic-string');
-var resolve = require('resolve');
 var isReference = require('is-reference');
-var glob = require('glob');
+var resolve = require('resolve');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
 var getCommonDir__default = /*#__PURE__*/_interopDefaultLegacy(getCommonDir);
+var glob__default = /*#__PURE__*/_interopDefaultLegacy(glob);
 var MagicString__default = /*#__PURE__*/_interopDefaultLegacy(MagicString);
 var isReference__default = /*#__PURE__*/_interopDefaultLegacy(isReference);
-var glob__default = /*#__PURE__*/_interopDefaultLegacy(glob);
 
 var peerDependencies = {
 	rollup: "^2.30.0"
 };
 
+function tryParse(parse, code, id) {
+  try {
+    return parse(code, { allowReturnOutsideFunction: true });
+  } catch (err) {
+    err.message += ` in ${id}`;
+    throw err;
+  }
+}
+
+const firstpassGlobal = /\b(?:require|module|exports|global)\b/;
+
+const firstpassNoGlobal = /\b(?:require|module|exports)\b/;
+
+function hasCjsKeywords(code, ignoreGlobal) {
+  const firstpass = ignoreGlobal ? firstpassNoGlobal : firstpassGlobal;
+  return firstpass.test(code);
+}
+
+/* eslint-disable no-underscore-dangle */
+
+function analyzeTopLevelStatements(parse, code, id) {
+  const ast = tryParse(parse, code, id);
+
+  let isEsModule = false;
+  let hasDefaultExport = false;
+  let hasNamedExports = false;
+
+  for (const node of ast.body) {
+    switch (node.type) {
+      case 'ExportDefaultDeclaration':
+        isEsModule = true;
+        hasDefaultExport = true;
+        break;
+      case 'ExportNamedDeclaration':
+        isEsModule = true;
+        if (node.declaration) {
+          hasNamedExports = true;
+        } else {
+          for (const specifier of node.specifiers) {
+            if (specifier.exported.name === 'default') {
+              hasDefaultExport = true;
+            } else {
+              hasNamedExports = true;
+            }
+          }
+        }
+        break;
+      case 'ExportAllDeclaration':
+        isEsModule = true;
+        if (node.exported && node.exported.name === 'default') {
+          hasDefaultExport = true;
+        } else {
+          hasNamedExports = true;
+        }
+        break;
+      case 'ImportDeclaration':
+        isEsModule = true;
+        break;
+    }
+  }
+
+  return { isEsModule, hasDefaultExport, hasNamedExports, ast };
+}
+
 const isWrappedId = (id, suffix) => id.endsWith(suffix);
 const wrapId = (id, suffix) => `\0${id}${suffix}`;
 const unwrapId = (wrappedId, suffix) => wrappedId.slice(1, -suffix.length);
@@ -29,12 +93,6 @@ const PROXY_SUFFIX = '?commonjs-proxy';
 const REQUIRE_SUFFIX = '?commonjs-require';
 const EXTERNAL_SUFFIX = '?commonjs-external';
 
-const VIRTUAL_PATH_BASE = '/$$rollup_base$$';
-const getVirtualPathForDynamicRequirePath = (path, commonDir) => {
-  if (path.startsWith(commonDir)) return VIRTUAL_PATH_BASE + path.slice(commonDir.length);
-  return path;
-};
-
 const DYNAMIC_REGISTER_PREFIX = '\0commonjs-dynamic-register:';
 const DYNAMIC_JSON_PREFIX = '\0commonjs-dynamic-json:';
 const DYNAMIC_PACKAGES_ID = '\0commonjs-dynamic-packages';
@@ -46,11 +104,6 @@ const HELPERS_ID = '\0commonjsHelpers.js';
 // This will no longer be necessary once Rollup switches to ES6 output, likely
 // in Rollup 3
 
-// The "hasOwnProperty" call in "getDefaultExportFromCjs" is technically not
-// needed, but for consumers that use Rollup's old interop pattern, it will fix
-// rollup/rollup-plugin-commonjs#224
-// We should remove it once Rollup core and this plugin are updated to not use
-// this pattern any more
 const HELPERS = `
 export var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};
 
@@ -58,16 +111,6 @@ export function getDefaultExportFromCjs (x) {
 	return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;
 }
 
-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 getDefaultExportFromNamespaceIfPresent (n) {
 	return n && Object.prototype.hasOwnProperty.call(n, 'default') ? n['default'] : n;
 }
@@ -93,12 +136,27 @@ export function getAugmentedNamespace(n) {
 `;
 
 const HELPER_NON_DYNAMIC = `
-export function commonjsRequire () {
-	throw new Error('Dynamic requires are not currently supported by @rollup/plugin-commonjs');
+export function createCommonjsModule(fn) {
+  var module = { exports: {} }
+	return fn(module, module.exports), module.exports;
+}
+
+export function commonjsRequire (target) {
+	throw new Error('Could not dynamically require "' + target + '". Please configure the dynamicRequireTargets option of @rollup/plugin-commonjs appropriately for this require call to behave properly.');
 }
 `;
 
 const HELPERS_DYNAMIC = `
+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 commonjsRegister (path, loader) {
 	DYNAMIC_REQUIRE_LOADERS[path] = loader;
 }
@@ -241,67 +299,22 @@ function getHelpersModule(isDynamicRequireModulesEnabled) {
   return `${HELPERS}${isDynamicRequireModulesEnabled ? HELPERS_DYNAMIC : HELPER_NON_DYNAMIC}`;
 }
 
-/* eslint-disable no-undefined */
-
-const operators = {
-  '==': (x) => equals(x.left, x.right, false),
-
-  '!=': (x) => not(operators['=='](x)),
-
-  '===': (x) => equals(x.left, x.right, true),
-
-  '!==': (x) => not(operators['==='](x)),
-
-  '!': (x) => isFalsy(x.argument),
-
-  '&&': (x) => isTruthy(x.left) && isTruthy(x.right),
-
-  '||': (x) => isTruthy(x.left) || isTruthy(x.right)
-};
-
-function flatten(node) {
-  const parts = [];
+/* eslint-disable import/prefer-default-export */
 
-  while (node.type === 'MemberExpression') {
-    if (node.computed) return null;
+function deconflict(scope, globals, identifier) {
+  let i = 1;
+  let deconflicted = pluginutils.makeLegalIdentifier(identifier);
 
-    parts.unshift(node.property.name);
-    // eslint-disable-next-line no-param-reassign
-    node = node.object;
+  while (scope.contains(deconflicted) || globals.has(deconflicted)) {
+    deconflicted = pluginutils.makeLegalIdentifier(`${identifier}_${i}`);
+    i += 1;
   }
+  // eslint-disable-next-line no-param-reassign
+  scope.declarations[deconflicted] = true;
 
-  if (node.type !== 'Identifier') return null;
-
-  const { name } = node;
-  parts.unshift(name);
-
-  return { name, keypath: parts.join('.') };
-}
-
-function isTruthy(node) {
-  if (node.type === 'Literal') return !!node.value;
-  if (node.type === 'ParenthesizedExpression') return isTruthy(node.expression);
-  if (node.operator in operators) return operators[node.operator](node);
-  return undefined;
-}
-
-function isFalsy(node) {
-  return not(isTruthy(node));
-}
-
-function not(value) {
-  return value === undefined ? value : !value;
-}
-
-function equals(a, b, strict) {
-  if (a.type !== b.type) return undefined;
-  // eslint-disable-next-line eqeqeq
-  if (a.type === 'Literal') return strict ? a.value === b.value : a.value == b.value;
-  return undefined;
+  return deconflicted;
 }
 
-/* eslint-disable import/prefer-default-export */
-
 function getName(id) {
   const name = pluginutils.makeLegalIdentifier(path.basename(id, path.extname(id)));
   if (name !== 'index') {
@@ -311,780 +324,101 @@ function getName(id) {
   return pluginutils.makeLegalIdentifier(segments[segments.length - 1]);
 }
 
-/* eslint-disable no-param-reassign, no-shadow, no-underscore-dangle, no-continue */
-
-const reserved = 'process location abstract arguments boolean break byte case catch char class const continue debugger default delete do double else enum eval export extends false final finally float for from function goto if implements import in instanceof int interface let long native new null package private protected public return short static super switch synchronized this throw throws transient true try typeof var void volatile while with yield'.split(
-  ' '
-);
-const blacklist = { __esModule: true };
-reserved.forEach((word) => (blacklist[word] = true));
+function normalizePathSlashes(path) {
+  return path.replace(/\\/g, '/');
+}
 
-const exportsPattern = /^(?:module\.)?exports(?:\.([a-zA-Z_$][a-zA-Z_$0-9]*))?$/;
+const VIRTUAL_PATH_BASE = '/$$rollup_base$$';
+const getVirtualPathForDynamicRequirePath = (path, commonDir) => {
+  const normalizedPath = normalizePathSlashes(path);
+  return normalizedPath.startsWith(commonDir)
+    ? VIRTUAL_PATH_BASE + normalizedPath.slice(commonDir.length)
+    : normalizedPath;
+};
 
-const firstpassGlobal = /\b(?:require|module|exports|global)\b/;
-const firstpassNoGlobal = /\b(?:require|module|exports)\b/;
-const functionType = /^(?:FunctionDeclaration|FunctionExpression|ArrowFunctionExpression)$/;
+function getDynamicPackagesModule(dynamicRequireModuleDirPaths, commonDir) {
+  let code = `const commonjsRegister = require('${HELPERS_ID}?commonjsRegister');`;
+  for (const dir of dynamicRequireModuleDirPaths) {
+    let entryPoint = 'index.js';
 
-function deconflict(scope, globals, identifier) {
-  let i = 1;
-  let deconflicted = pluginutils.makeLegalIdentifier(identifier);
+    try {
+      if (fs.existsSync(path.join(dir, 'package.json'))) {
+        entryPoint =
+          JSON.parse(fs.readFileSync(path.join(dir, 'package.json'), { encoding: 'utf8' })).main ||
+          entryPoint;
+      }
+    } catch (ignored) {
+      // ignored
+    }
 
-  while (scope.contains(deconflicted) || globals.has(deconflicted) || deconflicted in blacklist) {
-    deconflicted = `${identifier}_${i}`;
-    i += 1;
+    code += `\ncommonjsRegister(${JSON.stringify(
+      getVirtualPathForDynamicRequirePath(dir, commonDir)
+    )}, function (module, exports) {
+  module.exports = require(${JSON.stringify(normalizePathSlashes(path.join(dir, entryPoint)))});
+});`;
   }
-  scope.declarations[deconflicted] = true;
-
-  return deconflicted;
+  return code;
 }
 
-function tryParse(parse, code, id) {
-  try {
-    return parse(code, { allowReturnOutsideFunction: true });
-  } catch (err) {
-    err.message += ` in ${id}`;
-    throw err;
+function getDynamicPackagesEntryIntro(
+  dynamicRequireModuleDirPaths,
+  dynamicRequireModuleSet
+) {
+  let dynamicImports = Array.from(
+    dynamicRequireModuleSet,
+    (dynamicId) => `require(${JSON.stringify(DYNAMIC_REGISTER_PREFIX + dynamicId)});`
+  ).join('\n');
+
+  if (dynamicRequireModuleDirPaths.length) {
+    dynamicImports += `require(${JSON.stringify(DYNAMIC_REGISTER_PREFIX + DYNAMIC_PACKAGES_ID)});`;
   }
-}
 
-function normalizePathSlashes(path) {
-  return path.replace(/\\/g, '/');
+  return dynamicImports;
 }
 
-function hasCjsKeywords(code, ignoreGlobal) {
-  const firstpass = ignoreGlobal ? firstpassNoGlobal : firstpassGlobal;
-  return firstpass.test(code);
+function isModuleRegistrationProxy(id, dynamicRequireModuleSet) {
+  const normalizedPath = normalizePathSlashes(id);
+  return dynamicRequireModuleSet.has(normalizedPath) && !normalizedPath.endsWith('.json');
 }
 
-function checkEsModule(parse, code, id) {
-  const ast = tryParse(parse, code, id);
-
-  let isEsModule = false;
-  let hasDefaultExport = false;
-  let hasNamedExports = false;
-  for (const node of ast.body) {
-    if (node.type === 'ExportDefaultDeclaration') {
-      isEsModule = true;
-      hasDefaultExport = true;
-    } else if (node.type === 'ExportNamedDeclaration') {
-      isEsModule = true;
-      if (node.declaration) {
-        hasNamedExports = true;
-      } else {
-        for (const specifier of node.specifiers) {
-          if (specifier.exported.name === 'default') {
-            hasDefaultExport = true;
-          } else {
-            hasNamedExports = true;
-          }
-        }
-      }
-    } else if (node.type === 'ExportAllDeclaration') {
-      isEsModule = true;
-      if (node.exported && node.exported.name === 'default') {
-        hasDefaultExport = true;
-      } else {
-        hasNamedExports = true;
-      }
-    } else if (node.type === 'ImportDeclaration') {
-      isEsModule = true;
+function getDynamicRequirePaths(patterns) {
+  const dynamicRequireModuleSet = new Set();
+  for (const pattern of !patterns || Array.isArray(patterns) ? patterns || [] : [patterns]) {
+    const isNegated = pattern.startsWith('!');
+    const modifySet = Set.prototype[isNegated ? 'delete' : 'add'].bind(dynamicRequireModuleSet);
+    for (const path$1 of glob__default['default'].sync(isNegated ? pattern.substr(1) : pattern)) {
+      modifySet(normalizePathSlashes(path.resolve(path$1)));
     }
   }
-
-  return { isEsModule, hasDefaultExport, hasNamedExports, ast };
+  const dynamicRequireModuleDirPaths = Array.from(dynamicRequireModuleSet.values()).filter(
+    (path) => {
+      try {
+        if (fs.statSync(path).isDirectory()) return true;
+      } catch (ignored) {
+        // Nothing to do here
+      }
+      return false;
+    }
+  );
+  return { dynamicRequireModuleSet, dynamicRequireModuleDirPaths };
 }
 
-function getDefinePropertyCallName(node, targetName) {
-  if (node.type !== 'CallExpression') return;
-
-  const {
-    callee: { object, property }
-  } = node;
-
-  if (!object || object.type !== 'Identifier' || object.name !== 'Object') return;
+const isCjsPromises = new Map();
 
-  if (!property || property.type !== 'Identifier' || property.name !== 'defineProperty') return;
+function getIsCjsPromise(id) {
+  let isCjsPromise = isCjsPromises.get(id);
+  if (isCjsPromise) return isCjsPromise.promise;
 
-  if (node.arguments.length !== 3) return;
+  const promise = new Promise((resolve) => {
+    isCjsPromise = {
+      resolve,
+      promise: null
+    };
+    isCjsPromises.set(id, isCjsPromise);
+  });
+  isCjsPromise.promise = promise;
 
-  const [target, val] = node.arguments;
-  if (target.type !== 'Identifier' || target.name !== targetName) return;
-  // eslint-disable-next-line consistent-return
-  return val.value;
-}
-
-function transformCommonjs(
-  parse,
-  code,
-  id,
-  isEsModule,
-  ignoreGlobal,
-  ignoreRequire,
-  sourceMap,
-  isDynamicRequireModulesEnabled,
-  dynamicRequireModuleSet,
-  disableWrap,
-  commonDir,
-  astCache
-) {
-  const ast = astCache || tryParse(parse, code, id);
-
-  const magicString = new MagicString__default['default'](code);
-
-  const required = {};
-  // Because objects have no guaranteed ordering, yet we need it,
-  // we need to keep track of the order in a array
-  const requiredSources = [];
-  const dynamicRegisterSources = [];
-
-  let uid = 0;
-
-  let scope = pluginutils.attachScopes(ast, 'scope');
-  const uses = { module: false, exports: false, global: false, require: false };
-
-  let lexicalDepth = 0;
-  let programDepth = 0;
-
-  const globals = new Set();
-
-  // TODO technically wrong since globals isn't populated yet, but ¯\_(ツ)_/¯
-  const HELPERS_NAME = deconflict(scope, globals, 'commonjsHelpers');
-
-  const namedExports = {};
-
-  // TODO handle transpiled modules
-  let shouldWrap = /__esModule/.test(code);
-  let usesCommonjsHelpers = false;
-
-  function isRequireStatement(node) {
-    if (!node) return false;
-    if (node.type !== 'CallExpression') return false;
-
-    // Weird case of `require()` or `module.require()` without arguments
-    if (node.arguments.length === 0) return false;
-
-    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) {
-    return (
-      node.arguments.length > 1 ||
-      (node.arguments[0].type !== 'Literal' &&
-        (node.arguments[0].type !== 'TemplateLiteral' || node.arguments[0].expressions.length > 0))
-    );
-  }
-
-  function isStaticRequireStatement(node) {
-    if (!isRequireStatement(node)) return false;
-    return !hasDynamicArguments(node);
-  }
-
-  function isNodeRequireStatement(parent) {
-    const reservedMethod = ['resolve', 'cache', 'main'];
-    return !!(parent && parent.property && reservedMethod.indexOf(parent.property.name) > -1);
-  }
-
-  function isIgnoredRequireStatement(requiredNode) {
-    return ignoreRequire(requiredNode.arguments[0].value);
-  }
-
-  function getRequireStringArg(node) {
-    return node.arguments[0].type === 'Literal'
-      ? node.arguments[0].value
-      : node.arguments[0].quasis[0].value.cooked;
-  }
-
-  function getRequired(node, name) {
-    let sourceId = getRequireStringArg(node);
-    const isDynamicRegister = sourceId.startsWith(DYNAMIC_REGISTER_PREFIX);
-    if (isDynamicRegister) {
-      sourceId = sourceId.substr(DYNAMIC_REGISTER_PREFIX.length);
-    }
-
-    const existing = required[sourceId];
-    if (!existing) {
-      const isDynamic = hasDynamicModuleForPath(sourceId);
-
-      if (!name) {
-        do {
-          name = `require$$${uid}`;
-          uid += 1;
-        } while (scope.contains(name));
-      }
-
-      if (isDynamicRegister) {
-        if (sourceId.endsWith('.json')) {
-          sourceId = DYNAMIC_JSON_PREFIX + sourceId;
-        }
-        dynamicRegisterSources.push(sourceId);
-      }
-
-      if (!isDynamic || sourceId.endsWith('.json')) {
-        requiredSources.push(sourceId);
-      }
-
-      required[sourceId] = { source: sourceId, name, importsDefault: false, isDynamic };
-    }
-
-    return required[sourceId];
-  }
-
-  function hasDynamicModuleForPath(source) {
-    if (!/^(?:\.{0,2}[/\\]|[A-Za-z]:[/\\])/.test(source)) {
-      try {
-        const resolvedPath = normalizePathSlashes(
-          resolve.sync(source, { basedir: path.dirname(id) })
-        );
-        if (dynamicRequireModuleSet.has(resolvedPath)) {
-          return true;
-        }
-      } catch (ex) {
-        // Probably a node.js internal module
-        return false;
-      }
-
-      return false;
-    }
-
-    for (const attemptExt of ['', '.js', '.json']) {
-      const resolvedPath = normalizePathSlashes(path.resolve(path.dirname(id), source + attemptExt));
-      if (dynamicRequireModuleSet.has(resolvedPath)) {
-        return true;
-      }
-    }
-
-    return false;
-  }
-
-  function shouldUseSimulatedRequire(required) {
-    return (
-      hasDynamicModuleForPath(required.source) &&
-      // We only do `commonjsRequire` for json if it's the `commonjsRegister` call.
-      (required.source.startsWith(DYNAMIC_REGISTER_PREFIX) || !required.source.endsWith('.json'))
-    );
-  }
-
-  // do a first pass, see which names are assigned to. This is necessary to prevent
-  // illegally replacing `var foo = require('foo')` with `import foo from 'foo'`,
-  // where `foo` is later reassigned. (This happens in the wild. CommonJS, sigh)
-  const assignedTo = new Set();
-  estreeWalker.walk(ast, {
-    enter(node) {
-      if (node.type !== 'AssignmentExpression') return;
-      if (node.left.type === 'MemberExpression') return;
-
-      pluginutils.extractAssignedNames(node.left).forEach((name) => {
-        assignedTo.add(name);
-      });
-    }
-  });
-
-  estreeWalker.walk(ast, {
-    enter(node, parent) {
-      if (sourceMap) {
-        magicString.addSourcemapLocation(node.start);
-        magicString.addSourcemapLocation(node.end);
-      }
-
-      // skip dead branches
-      if (parent && (parent.type === 'IfStatement' || parent.type === 'ConditionalExpression')) {
-        if (node === parent.consequent && isFalsy(parent.test)) {
-          this.skip();
-          return;
-        }
-        if (node === parent.alternate && isTruthy(parent.test)) {
-          this.skip();
-          return;
-        }
-      }
-
-      if (node._skip) {
-        this.skip();
-        return;
-      }
-
-      programDepth += 1;
-
-      if (node.scope) ({ scope } = node);
-      if (functionType.test(node.type)) lexicalDepth += 1;
-
-      // if toplevel return, we need to wrap it
-      if (node.type === 'ReturnStatement' && lexicalDepth === 0) {
-        shouldWrap = true;
-      }
-
-      // rewrite `this` as `commonjsHelpers.commonjsGlobal`
-      if (node.type === 'ThisExpression' && lexicalDepth === 0) {
-        uses.global = 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)
-      if (node.type === 'UnaryExpression' && node.operator === 'typeof') {
-        const flattened = flatten(node.argument);
-        if (!flattened) return;
-
-        if (scope.contains(flattened.name)) return;
-
-        if (
-          flattened.keypath === 'module.exports' ||
-          flattened.keypath === 'module' ||
-          flattened.keypath === 'exports'
-        ) {
-          magicString.overwrite(node.start, node.end, `'object'`, { storeName: false });
-        }
-      }
-
-      // rewrite `require` (if not already handled) `global` and `define`, and handle free references to
-      // `module` and `exports` as these mean we need to wrap the module in commonjsHelpers.createCommonjsModule
-      if (node.type === 'Identifier') {
-        if (isReference__default['default'](node, parent) && !scope.contains(node.name)) {
-          if (node.name in uses) {
-            if (isRequireIdentifier(node)) {
-              if (isNodeRequireStatement(parent)) {
-                return;
-              }
-
-              if (!isDynamicRequireModulesEnabled && isStaticRequireStatement(parent)) {
-                return;
-              }
-
-              if (isDynamicRequireModulesEnabled && isRequireStatement(parent)) {
-                magicString.appendLeft(
-                  parent.end - 1,
-                  `,${JSON.stringify(
-                    path.dirname(id) === '.'
-                      ? null /* default behavior */
-                      : getVirtualPathForDynamicRequirePath(
-                          normalizePathSlashes(path.dirname(id)),
-                          commonDir
-                        )
-                  )}`
-                );
-              }
-
-              magicString.overwrite(node.start, node.end, `${HELPERS_NAME}.commonjsRequire`, {
-                storeName: true
-              });
-              usesCommonjsHelpers = true;
-            }
-
-            uses[node.name] = true;
-            if (node.name === 'global' && !ignoreGlobal) {
-              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
-            if (node.name === 'module' || node.name === 'exports') {
-              shouldWrap = true;
-            }
-          }
-
-          if (node.name === 'define') {
-            magicString.overwrite(node.start, node.end, 'undefined', { storeName: true });
-          }
-
-          globals.add(node.name);
-        }
-
-        return;
-      }
-
-      // Is this an assignment to exports or module.exports?
-      if (node.type === 'AssignmentExpression') {
-        if (node.left.type !== 'MemberExpression') return;
-
-        const flattened = flatten(node.left);
-        if (!flattened) return;
-
-        if (scope.contains(flattened.name)) return;
-
-        const match = exportsPattern.exec(flattened.keypath);
-        if (!match || flattened.keypath === 'exports') return;
-
-        uses[flattened.name] = true;
-
-        // we're dealing with `module.exports = ...` or `[module.]exports.foo = ...` –
-        // if this isn't top-level, we'll need to wrap the module
-        if (programDepth > 3) shouldWrap = true;
-
-        node.left._skip = true;
-
-        if (flattened.keypath === 'module.exports' && node.right.type === 'ObjectExpression') {
-          node.right.properties.forEach((prop) => {
-            if (prop.computed || !('key' in prop) || prop.key.type !== 'Identifier') return;
-            const { name } = prop.key;
-            if (name === pluginutils.makeLegalIdentifier(name)) namedExports[name] = true;
-          });
-          return;
-        }
-
-        if (match[1]) namedExports[match[1]] = true;
-        return;
-      }
-
-      const name = getDefinePropertyCallName(node, 'exports');
-      if (name && name === pluginutils.makeLegalIdentifier(name)) namedExports[name] = true;
-
-      // if this is `var x = require('x')`, we can do `import x from 'x'`
-      if (
-        node.type === 'VariableDeclarator' &&
-        node.id.type === 'Identifier' &&
-        isStaticRequireStatement(node.init) &&
-        !isIgnoredRequireStatement(node.init)
-      ) {
-        // for now, only do this for top-level requires. maybe fix this in future
-        if (scope.parent) return;
-
-        // edge case — CJS allows you to assign to imports. ES doesn't
-        if (assignedTo.has(node.id.name)) return;
-
-        const required = getRequired(node.init, node.id.name);
-        required.importsDefault = true;
-
-        if (required.name === node.id.name && !required.isDynamic) {
-          node._shouldRemove = true;
-        }
-      }
-
-      if (!isStaticRequireStatement(node) || isIgnoredRequireStatement(node)) {
-        return;
-      }
-
-      const required = getRequired(node);
-
-      if (parent.type === 'ExpressionStatement') {
-        // is a bare import, e.g. `require('foo');`
-        magicString.remove(parent.start, parent.end);
-      } else {
-        required.importsDefault = true;
-
-        if (shouldUseSimulatedRequire(required)) {
-          magicString.overwrite(
-            node.start,
-            node.end,
-            `${HELPERS_NAME}.commonjsRequire(${JSON.stringify(
-              getVirtualPathForDynamicRequirePath(normalizePathSlashes(required.source), commonDir)
-            )}, ${JSON.stringify(
-              path.dirname(id) === '.'
-                ? null /* default behavior */
-                : getVirtualPathForDynamicRequirePath(normalizePathSlashes(path.dirname(id)), commonDir)
-            )})`
-          );
-          usesCommonjsHelpers = true;
-        } else {
-          magicString.overwrite(node.start, node.end, required.name);
-        }
-      }
-
-      node.callee._skip = true;
-    },
-
-    leave(node) {
-      programDepth -= 1;
-      if (node.scope) scope = scope.parent;
-      if (functionType.test(node.type)) lexicalDepth -= 1;
-
-      if (node.type === 'VariableDeclaration') {
-        let keepDeclaration = false;
-        let c = node.declarations[0].start;
-
-        for (let i = 0; i < node.declarations.length; i += 1) {
-          const declarator = node.declarations[i];
-
-          if (declarator._shouldRemove) {
-            magicString.remove(c, declarator.end);
-          } else {
-            if (!keepDeclaration) {
-              magicString.remove(c, declarator.start);
-              keepDeclaration = true;
-            }
-
-            c = declarator.end;
-          }
-        }
-
-        if (!keepDeclaration) {
-          magicString.remove(node.start, node.end);
-        }
-      }
-    }
-  });
-
-  // If `isEsModule` is on, it means it has ES6 import/export statements,
-  //   which just can't be wrapped in a function.
-  shouldWrap = shouldWrap && !disableWrap && !isEsModule;
-
-  usesCommonjsHelpers = usesCommonjsHelpers || shouldWrap;
-
-  if (
-    !requiredSources.length &&
-    !dynamicRegisterSources.length &&
-    !uses.module &&
-    !uses.exports &&
-    !uses.require &&
-    !usesCommonjsHelpers &&
-    (ignoreGlobal || !uses.global)
-  ) {
-    return { meta: { commonjs: { isCommonJS: false } } };
-  }
-
-  const importBlock = `${(usesCommonjsHelpers
-    ? [`import * as ${HELPERS_NAME} from '${HELPERS_ID}';`]
-    : []
-  )
-    .concat(
-      // dynamic registers first, as the may be required in the other modules
-      dynamicRegisterSources.map((source) => `import '${source}';`),
-
-      // now the actual modules so that they are analyzed before creating the proxies;
-      // no need to do this for virtual modules as we never proxy them
-      requiredSources
-        .filter((source) => !source.startsWith('\0'))
-        .map((source) => `import '${wrapId(source, REQUIRE_SUFFIX)}';`),
-
-      // now the proxy modules
-      requiredSources.map((source) => {
-        const { name, importsDefault } = required[source];
-        return `import ${importsDefault ? `${name} from ` : ``}'${
-          source.startsWith('\0') ? source : wrapId(source, PROXY_SUFFIX)
-        }';`;
-      })
-    )
-    .join('\n')}\n\n`;
-
-  const namedExportDeclarations = [];
-  let wrapperStart = '';
-  let wrapperEnd = '';
-
-  const moduleName = deconflict(scope, globals, getName(id));
-  if (!isEsModule) {
-    const exportModuleExports = {
-      str: `export { ${moduleName} as __moduleExports };`,
-      name: '__moduleExports'
-    };
-
-    namedExportDeclarations.push(exportModuleExports);
-  }
-
-  const defaultExportPropertyAssignments = [];
-  let hasDefaultExport = false;
-
-  if (shouldWrap) {
-    const args = `module${uses.exports ? ', exports' : ''}`;
-
-    wrapperStart = `var ${moduleName} = ${HELPERS_NAME}.createCommonjsModule(function (${args}) {\n`;
-
-    wrapperEnd = `\n}`;
-    if (isDynamicRequireModulesEnabled) {
-      wrapperEnd += `, ${JSON.stringify(
-        getVirtualPathForDynamicRequirePath(normalizePathSlashes(path.dirname(id)), commonDir)
-      )}`;
-    }
-
-    wrapperEnd += `);`;
-  } else {
-    const names = [];
-
-    for (const node of ast.body) {
-      if (node.type === 'ExpressionStatement' && node.expression.type === 'AssignmentExpression') {
-        const { left } = node.expression;
-        const flattened = flatten(left);
-
-        if (!flattened) {
-          continue;
-        }
-
-        const match = exportsPattern.exec(flattened.keypath);
-        if (!match) {
-          continue;
-        }
-
-        if (flattened.keypath === 'module.exports') {
-          hasDefaultExport = true;
-          magicString.overwrite(left.start, left.end, `var ${moduleName}`);
-        } else {
-          const [, name] = match;
-          const deconflicted = deconflict(scope, globals, name);
-
-          names.push({ name, deconflicted });
-
-          magicString.overwrite(node.start, left.end, `var ${deconflicted}`);
-
-          const declaration =
-            name === deconflicted
-              ? `export { ${name} };`
-              : `export { ${deconflicted} as ${name} };`;
-
-          if (name !== 'default') {
-            namedExportDeclarations.push({
-              str: declaration,
-              name
-            });
-          }
-
-          defaultExportPropertyAssignments.push(`${moduleName}.${name} = ${deconflicted};`);
-        }
-      }
-    }
-
-    if (!(isEsModule || hasDefaultExport)) {
-      wrapperEnd = `\n\nvar ${moduleName} = {\n${names
-        .map(({ name, deconflicted }) => `\t${name}: ${deconflicted}`)
-        .join(',\n')}\n};`;
-    }
-  }
-
-  magicString
-    .trim()
-    .prepend(importBlock + wrapperStart)
-    .trim()
-    .append(wrapperEnd);
-
-  const defaultExport =
-    code.indexOf('__esModule') >= 0
-      ? `export default /*@__PURE__*/${HELPERS_NAME}.getDefaultExportFromCjs(${moduleName});`
-      : `export default ${moduleName};`;
-
-  const named = namedExportDeclarations
-    .filter((x) => x.name !== 'default' || !hasDefaultExport)
-    .map((x) => x.str);
-
-  magicString.append(
-    `\n\n${(isEsModule ? [] : [defaultExport])
-      .concat(named)
-      .concat(hasDefaultExport ? defaultExportPropertyAssignments : [])
-      .join('\n')}`
-  );
-
-  code = magicString.toString();
-  const map = sourceMap ? magicString.generateMap() : null;
-
-  return {
-    code,
-    map,
-    syntheticNamedExports: isEsModule ? false : '__moduleExports',
-    meta: { commonjs: { isCommonJS: !isEsModule } }
-  };
-}
-
-function getDynamicPackagesModule(dynamicRequireModuleDirPaths, commonDir) {
-  let code = `const commonjsRegister = require('${HELPERS_ID}?commonjsRegister');`;
-  for (const dir of dynamicRequireModuleDirPaths) {
-    let entryPoint = 'index.js';
-
-    try {
-      if (fs.existsSync(path.join(dir, 'package.json'))) {
-        entryPoint =
-          JSON.parse(fs.readFileSync(path.join(dir, 'package.json'), { encoding: 'utf8' })).main ||
-          entryPoint;
-      }
-    } catch (ignored) {
-      // ignored
-    }
-
-    code += `\ncommonjsRegister(${JSON.stringify(
-      getVirtualPathForDynamicRequirePath(dir, commonDir)
-    )}, function (module, exports) {
-  module.exports = require(${JSON.stringify(normalizePathSlashes(path.join(dir, entryPoint)))});
-});`;
-  }
-  return code;
-}
-
-function getDynamicPackagesEntryIntro(
-  dynamicRequireModuleDirPaths,
-  dynamicRequireModuleSet
-) {
-  let dynamicImports = Array.from(
-    dynamicRequireModuleSet,
-    (dynamicId) => `require(${JSON.stringify(DYNAMIC_REGISTER_PREFIX + dynamicId)});`
-  ).join('\n');
-
-  if (dynamicRequireModuleDirPaths.length) {
-    dynamicImports += `require(${JSON.stringify(DYNAMIC_REGISTER_PREFIX + DYNAMIC_PACKAGES_ID)});`;
-  }
-
-  return dynamicImports;
-}
-
-function isModuleRegistrationProxy(id, dynamicRequireModuleSet) {
-  const normalizedPath = normalizePathSlashes(id);
-  return dynamicRequireModuleSet.has(normalizedPath) && !normalizedPath.endsWith('.json');
-}
-
-function getDynamicRequirePaths(patterns) {
-  const dynamicRequireModuleSet = new Set();
-  for (const pattern of !patterns || Array.isArray(patterns) ? patterns || [] : [patterns]) {
-    const isNegated = pattern.startsWith('!');
-    const modifySet = Set.prototype[isNegated ? 'delete' : 'add'].bind(dynamicRequireModuleSet);
-    for (const path$1 of glob__default['default'].sync(isNegated ? pattern.substr(1) : pattern)) {
-      modifySet(normalizePathSlashes(path.resolve(path$1)));
-    }
-  }
-  const dynamicRequireModuleDirPaths = Array.from(dynamicRequireModuleSet.values()).filter(
-    (path) => {
-      try {
-        if (fs.statSync(path).isDirectory()) return true;
-      } catch (ignored) {
-        // Nothing to do here
-      }
-      return false;
-    }
-  );
-  return { dynamicRequireModuleSet, dynamicRequireModuleDirPaths };
-}
-
-const isCjsPromises = new Map();
-
-function getIsCjsPromise(id) {
-  let isCjsPromise = isCjsPromises.get(id);
-  if (isCjsPromise) return isCjsPromise.promise;
-
-  const promise = new Promise((resolve) => {
-    isCjsPromise = {
-      resolve,
-      promise: null
-    };
-    isCjsPromises.set(id, isCjsPromise);
-  });
-  isCjsPromise.promise = promise;
-
-  return promise;
+  return promise;
 }
 
 function setIsCjsPromise(id, resolution) {
@@ -1164,78 +498,916 @@ async function getStaticRequireProxy(
   return `export {default} from ${JSON.stringify(id)};`;
 }
 
-/* eslint-disable no-param-reassign, no-undefined */
+/* eslint-disable no-param-reassign, no-undefined */
+
+function getCandidatesForExtension(resolved, extension) {
+  return [resolved + extension, `${resolved}${path.sep}index${extension}`];
+}
+
+function getCandidates(resolved, extensions) {
+  return extensions.reduce(
+    (paths, extension) => paths.concat(getCandidatesForExtension(resolved, extension)),
+    [resolved]
+  );
+}
+
+function getResolveId(extensions) {
+  function resolveExtensions(importee, importer) {
+    // not our problem
+    if (importee[0] !== '.' || !importer) return undefined;
+
+    const resolved = path.resolve(path.dirname(importer), importee);
+    const candidates = getCandidates(resolved, extensions);
+
+    for (let i = 0; i < candidates.length; i += 1) {
+      try {
+        const stats = fs.statSync(candidates[i]);
+        if (stats.isFile()) return { id: candidates[i] };
+      } catch (err) {
+        /* noop */
+      }
+    }
+
+    return undefined;
+  }
+
+  return function resolveId(importee, importer) {
+    // Proxies are only importing resolved ids, no need to resolve again
+    if (importer && isWrappedId(importer, PROXY_SUFFIX)) {
+      return importee;
+    }
+
+    const isProxyModule = isWrappedId(importee, PROXY_SUFFIX);
+    const isRequiredModule = isWrappedId(importee, REQUIRE_SUFFIX);
+    if (isProxyModule) {
+      importee = unwrapId(importee, PROXY_SUFFIX);
+    } else if (isRequiredModule) {
+      importee = unwrapId(importee, REQUIRE_SUFFIX);
+    }
+    if (importee.startsWith('\0')) {
+      if (
+        importee.startsWith(HELPERS_ID) ||
+        importee === DYNAMIC_PACKAGES_ID ||
+        importee.startsWith(DYNAMIC_JSON_PREFIX)
+      ) {
+        return importee;
+      }
+      return null;
+    }
+
+    return this.resolve(importee, importer, {
+      skipSelf: true,
+      custom: { 'node-resolve': { isRequire: isProxyModule || isRequiredModule } }
+    }).then((resolved) => {
+      if (!resolved) {
+        resolved = resolveExtensions(importee, importer);
+      }
+      if (resolved && isProxyModule) {
+        resolved.id = wrapId(resolved.id, resolved.external ? EXTERNAL_SUFFIX : PROXY_SUFFIX);
+        resolved.external = false;
+      } else if (!resolved && (isProxyModule || isRequiredModule)) {
+        return { id: wrapId(importee, EXTERNAL_SUFFIX), external: false };
+      }
+      return resolved;
+    });
+  };
+}
+
+function validateRollupVersion(rollupVersion, peerDependencyVersion) {
+  const [major, minor] = rollupVersion.split('.').map(Number);
+  const versionRegexp = /\^(\d+\.\d+)\.\d+/g;
+  let minMajor = Infinity;
+  let minMinor = Infinity;
+  let foundVersion;
+  // eslint-disable-next-line no-cond-assign
+  while ((foundVersion = versionRegexp.exec(peerDependencyVersion))) {
+    const [foundMajor, foundMinor] = foundVersion[1].split('.').map(Number);
+    if (foundMajor < minMajor) {
+      minMajor = foundMajor;
+      minMinor = foundMinor;
+    }
+  }
+  if (major < minMajor || (major === minMajor && minor < minMinor)) {
+    throw new Error(
+      `Insufficient Rollup version: "@rollup/plugin-commonjs" requires at least rollup@${minMajor}.${minMinor} but found rollup@${rollupVersion}.`
+    );
+  }
+}
+
+const operators = {
+  '==': (x) => equals(x.left, x.right, false),
+
+  '!=': (x) => not(operators['=='](x)),
+
+  '===': (x) => equals(x.left, x.right, true),
+
+  '!==': (x) => not(operators['==='](x)),
+
+  '!': (x) => isFalsy(x.argument),
+
+  '&&': (x) => isTruthy(x.left) && isTruthy(x.right),
+
+  '||': (x) => isTruthy(x.left) || isTruthy(x.right)
+};
+
+function not(value) {
+  return value === null ? value : !value;
+}
+
+function equals(a, b, strict) {
+  if (a.type !== b.type) return null;
+  // eslint-disable-next-line eqeqeq
+  if (a.type === 'Literal') return strict ? a.value === b.value : a.value == b.value;
+  return null;
+}
+
+function isTruthy(node) {
+  if (!node) return false;
+  if (node.type === 'Literal') return !!node.value;
+  if (node.type === 'ParenthesizedExpression') return isTruthy(node.expression);
+  if (node.operator in operators) return operators[node.operator](node);
+  return null;
+}
+
+function isFalsy(node) {
+  return not(isTruthy(node));
+}
+
+function getKeypath(node) {
+  const parts = [];
+
+  while (node.type === 'MemberExpression') {
+    if (node.computed) return null;
+
+    parts.unshift(node.property.name);
+    // eslint-disable-next-line no-param-reassign
+    node = node.object;
+  }
+
+  if (node.type !== 'Identifier') return null;
+
+  const { name } = node;
+  parts.unshift(name);
+
+  return { name, keypath: parts.join('.') };
+}
+
+const KEY_COMPILED_ESM = '__esModule';
+
+function isDefineCompiledEsm(node) {
+  const definedProperty =
+    getDefinePropertyCallName(node, 'exports') || getDefinePropertyCallName(node, 'module.exports');
+  if (definedProperty && definedProperty.key === KEY_COMPILED_ESM) {
+    return isTruthy(definedProperty.value);
+  }
+  return false;
+}
+
+function getDefinePropertyCallName(node, targetName) {
+  const targetNames = targetName.split('.');
+
+  const {
+    callee: { object, property }
+  } = node;
+  if (!object || object.type !== 'Identifier' || object.name !== 'Object') return;
+  if (!property || property.type !== 'Identifier' || property.name !== 'defineProperty') return;
+  if (node.arguments.length !== 3) return;
+
+  const [target, key, value] = node.arguments;
+  if (targetNames.length === 1) {
+    if (target.type !== 'Identifier' || target.name !== targetNames[0]) {
+      return;
+    }
+  }
+
+  if (targetNames.length === 2) {
+    if (
+      target.type !== 'MemberExpression' ||
+      target.object.name !== targetNames[0] ||
+      target.property.name !== targetNames[1]
+    ) {
+      return;
+    }
+  }
+
+  if (value.type !== 'ObjectExpression' || !value.properties) return;
+
+  const valueProperty = value.properties.find((p) => p.key && p.key.name === 'value');
+  if (!valueProperty || !valueProperty.value) return;
+
+  // eslint-disable-next-line consistent-return
+  return { key: key.value, value: valueProperty.value };
+}
+
+function isLocallyShadowed(name, scope) {
+  while (scope.parent) {
+    if (scope.declarations[name]) {
+      return true;
+    }
+    // eslint-disable-next-line no-param-reassign
+    scope = scope.parent;
+  }
+  return false;
+}
+
+function wrapCode(magicString, uses, moduleName, HELPERS_NAME, virtualDynamicRequirePath) {
+  const args = `module${uses.exports ? ', exports' : ''}`;
+
+  magicString
+    .trim()
+    .prepend(`var ${moduleName} = ${HELPERS_NAME}.createCommonjsModule(function (${args}) {\n`)
+    .append(
+      `\n}${virtualDynamicRequirePath ? `, ${JSON.stringify(virtualDynamicRequirePath)}` : ''});`
+    );
+}
+
+function rewriteExportsAndGetExportsBlock(
+  magicString,
+  moduleName,
+  wrapped,
+  topLevelModuleExportsAssignments,
+  topLevelExportsAssignmentsByName,
+  defineCompiledEsmExpressions,
+  deconflict,
+  isRestorableCompiledEsm,
+  code,
+  uses,
+  HELPERS_NAME
+) {
+  const namedExportDeclarations = [`export { ${moduleName} as __moduleExports };`];
+  const moduleExportsPropertyAssignments = [];
+  let deconflictedDefaultExportName;
+
+  if (!wrapped) {
+    let hasModuleExportsAssignment = false;
+    const namedExportProperties = [];
+
+    // Collect and rewrite module.exports assignments
+    for (const { left } of topLevelModuleExportsAssignments) {
+      hasModuleExportsAssignment = true;
+      magicString.overwrite(left.start, left.end, `var ${moduleName}`);
+    }
+
+    // Collect and rewrite named exports
+    for (const [exportName, node] of topLevelExportsAssignmentsByName) {
+      const deconflicted = deconflict(exportName);
+      magicString.overwrite(node.start, node.left.end, `var ${deconflicted}`);
+
+      if (exportName === 'default') {
+        deconflictedDefaultExportName = deconflicted;
+      } else {
+        namedExportDeclarations.push(
+          exportName === deconflicted
+            ? `export { ${exportName} };`
+            : `export { ${deconflicted} as ${exportName} };`
+        );
+      }
+
+      if (hasModuleExportsAssignment) {
+        moduleExportsPropertyAssignments.push(`${moduleName}.${exportName} = ${deconflicted};`);
+      } else {
+        namedExportProperties.push(`\t${exportName}: ${deconflicted}`);
+      }
+    }
+
+    // Regenerate CommonJS namespace
+    if (!hasModuleExportsAssignment) {
+      const moduleExports = `{\n${namedExportProperties.join(',\n')}\n}`;
+      magicString
+        .trim()
+        .append(
+          `\n\nvar ${moduleName} = ${
+            isRestorableCompiledEsm
+              ? `/*#__PURE__*/Object.defineProperty(${moduleExports}, '__esModule', {value: true})`
+              : moduleExports
+          };`
+        );
+    }
+  }
+
+  // Generate default export
+  const defaultExport = [];
+  if (isRestorableCompiledEsm) {
+    defaultExport.push(`export default ${deconflictedDefaultExportName || moduleName};`);
+  } else if (
+    (wrapped || deconflictedDefaultExportName) &&
+    (defineCompiledEsmExpressions.length > 0 || code.indexOf('__esModule') >= 0)
+  ) {
+    // eslint-disable-next-line no-param-reassign
+    uses.commonjsHelpers = true;
+    defaultExport.push(
+      `export default /*@__PURE__*/${HELPERS_NAME}.getDefaultExportFromCjs(${moduleName});`
+    );
+  } else {
+    defaultExport.push(`export default ${moduleName};`);
+  }
+
+  return `\n\n${defaultExport
+    .concat(namedExportDeclarations)
+    .concat(moduleExportsPropertyAssignments)
+    .join('\n')}`;
+}
+
+function isRequireStatement(node, scope) {
+  if (!node) return false;
+  if (node.type !== 'CallExpression') return false;
 
-function getCandidatesForExtension(resolved, extension) {
-  return [resolved + extension, `${resolved}${path.sep}index${extension}`];
+  // Weird case of `require()` or `module.require()` without arguments
+  if (node.arguments.length === 0) return false;
+
+  return isRequire(node.callee, scope);
 }
 
-function getCandidates(resolved, extensions) {
-  return extensions.reduce(
-    (paths, extension) => paths.concat(getCandidatesForExtension(resolved, extension)),
-    [resolved]
+function isRequire(node, scope) {
+  return (
+    (node.type === 'Identifier' && node.name === 'require' && !scope.contains('require')) ||
+    (node.type === 'MemberExpression' && isModuleRequire(node, scope))
   );
 }
 
-function getResolveId(extensions) {
-  function resolveExtensions(importee, importer) {
-    // not our problem
-    if (importee[0] !== '.' || !importer) return undefined;
+function isModuleRequire({ object, property }, scope) {
+  return (
+    object.type === 'Identifier' &&
+    object.name === 'module' &&
+    property.type === 'Identifier' &&
+    property.name === 'require' &&
+    !scope.contains('module')
+  );
+}
 
-    const resolved = path.resolve(path.dirname(importer), importee);
-    const candidates = getCandidates(resolved, extensions);
+function isStaticRequireStatement(node, scope) {
+  if (!isRequireStatement(node, scope)) return false;
+  return !hasDynamicArguments(node);
+}
 
-    for (let i = 0; i < candidates.length; i += 1) {
-      try {
-        const stats = fs.statSync(candidates[i]);
-        if (stats.isFile()) return { id: candidates[i] };
-      } catch (err) {
-        /* noop */
+function hasDynamicArguments(node) {
+  return (
+    node.arguments.length > 1 ||
+    (node.arguments[0].type !== 'Literal' &&
+      (node.arguments[0].type !== 'TemplateLiteral' || node.arguments[0].expressions.length > 0))
+  );
+}
+
+const reservedMethod = { resolve: true, cache: true, main: true };
+
+function isNodeRequirePropertyAccess(parent) {
+  return parent && parent.property && reservedMethod[parent.property.name];
+}
+
+function isIgnoredRequireStatement(requiredNode, ignoreRequire) {
+  return ignoreRequire(requiredNode.arguments[0].value);
+}
+
+function getRequireStringArg(node) {
+  return node.arguments[0].type === 'Literal'
+    ? node.arguments[0].value
+    : node.arguments[0].quasis[0].value.cooked;
+}
+
+function hasDynamicModuleForPath(source, id, dynamicRequireModuleSet) {
+  if (!/^(?:\.{0,2}[/\\]|[A-Za-z]:[/\\])/.test(source)) {
+    try {
+      const resolvedPath = normalizePathSlashes(resolve.sync(source, { basedir: path.dirname(id) }));
+      if (dynamicRequireModuleSet.has(resolvedPath)) {
+        return true;
       }
+    } catch (ex) {
+      // Probably a node.js internal module
+      return false;
     }
 
-    return undefined;
+    return false;
   }
 
-  return function resolveId(importee, importer) {
-    // Proxies are only importing resolved ids, no need to resolve again
-    if (importer && isWrappedId(importer, PROXY_SUFFIX)) {
-      return importee;
+  for (const attemptExt of ['', '.js', '.json']) {
+    const resolvedPath = normalizePathSlashes(path.resolve(path.dirname(id), source + attemptExt));
+    if (dynamicRequireModuleSet.has(resolvedPath)) {
+      return true;
     }
+  }
 
-    const isProxyModule = isWrappedId(importee, PROXY_SUFFIX);
-    const isRequiredModule = isWrappedId(importee, REQUIRE_SUFFIX);
-    if (isProxyModule) {
-      importee = unwrapId(importee, PROXY_SUFFIX);
-    } else if (isRequiredModule) {
-      importee = unwrapId(importee, REQUIRE_SUFFIX);
+  return false;
+}
+
+function getRequireHandlers() {
+  const requiredSources = [];
+  const requiredBySource = Object.create(null);
+  const requiredByNode = new Map();
+  const requireExpressionsWithUsedReturnValue = [];
+
+  function addRequireStatement(sourceId, node, scope, usesReturnValue) {
+    const required = getRequired(sourceId);
+    requiredByNode.set(node, { scope, required });
+    if (usesReturnValue) {
+      required.nodesUsingRequired.push(node);
+      requireExpressionsWithUsedReturnValue.push(node);
     }
-    if (importee.startsWith('\0')) {
+  }
+
+  function getRequired(sourceId) {
+    if (!requiredBySource[sourceId]) {
+      requiredSources.push(sourceId);
+
+      requiredBySource[sourceId] = {
+        source: sourceId,
+        name: null,
+        nodesUsingRequired: []
+      };
+    }
+
+    return requiredBySource[sourceId];
+  }
+
+  function rewriteRequireExpressionsAndGetImportBlock(
+    magicString,
+    topLevelDeclarations,
+    topLevelRequireDeclarators,
+    reassignedNames,
+    helpersNameIfUsed,
+    dynamicRegisterSources
+  ) {
+    const removedDeclarators = getDeclaratorsReplacedByImportsAndSetImportNames(
+      topLevelRequireDeclarators,
+      requiredByNode,
+      reassignedNames
+    );
+    setRemainingImportNamesAndRewriteRequires(
+      requireExpressionsWithUsedReturnValue,
+      requiredByNode,
+      magicString
+    );
+    removeDeclaratorsFromDeclarations(topLevelDeclarations, removedDeclarators, magicString);
+    const importBlock = `${(helpersNameIfUsed
+      ? [`import * as ${helpersNameIfUsed} from '${HELPERS_ID}';`]
+      : []
+    )
+      .concat(
+        // dynamic registers first, as the may be required in the other modules
+        [...dynamicRegisterSources].map((source) => `import '${wrapId(source, REQUIRE_SUFFIX)}';`),
+
+        // now the actual modules so that they are analyzed before creating the proxies;
+        // no need to do this for virtual modules as we never proxy them
+        requiredSources
+          .filter((source) => !source.startsWith('\0'))
+          .map((source) => `import '${wrapId(source, REQUIRE_SUFFIX)}';`),
+
+        // now the proxy modules
+        requiredSources.map((source) => {
+          const { name, nodesUsingRequired } = requiredBySource[source];
+          return `import ${nodesUsingRequired.length ? `${name} from ` : ``}'${
+            source.startsWith('\0') ? source : wrapId(source, PROXY_SUFFIX)
+          }';`;
+        })
+      )
+      .join('\n')}`;
+    return importBlock ? `${importBlock}\n\n` : '';
+  }
+
+  return {
+    addRequireStatement,
+    requiredSources,
+    rewriteRequireExpressionsAndGetImportBlock
+  };
+}
+
+function getDeclaratorsReplacedByImportsAndSetImportNames(
+  topLevelRequireDeclarators,
+  requiredByNode,
+  reassignedNames
+) {
+  const removedDeclarators = new Set();
+  for (const declarator of topLevelRequireDeclarators) {
+    const { required } = requiredByNode.get(declarator.init);
+    if (!required.name) {
+      const potentialName = declarator.id.name;
       if (
-        importee.startsWith(HELPERS_ID) ||
-        importee === DYNAMIC_PACKAGES_ID ||
-        importee.startsWith(DYNAMIC_JSON_PREFIX)
+        !reassignedNames.has(potentialName) &&
+        !required.nodesUsingRequired.some((node) =>
+          isLocallyShadowed(potentialName, requiredByNode.get(node).scope)
+        )
       ) {
-        return importee;
+        required.name = potentialName;
+        removedDeclarators.add(declarator);
       }
-      return null;
     }
+  }
+  return removedDeclarators;
+}
+
+function setRemainingImportNamesAndRewriteRequires(
+  requireExpressionsWithUsedReturnValue,
+  requiredByNode,
+  magicString
+) {
+  let uid = 0;
+  for (const requireExpression of requireExpressionsWithUsedReturnValue) {
+    const { required } = requiredByNode.get(requireExpression);
+    if (!required.name) {
+      let potentialName;
+      const isUsedName = (node) => requiredByNode.get(node).scope.contains(potentialName);
+      do {
+        potentialName = `require$$${uid}`;
+        uid += 1;
+      } while (required.nodesUsingRequired.some(isUsedName));
+      required.name = potentialName;
+    }
+    magicString.overwrite(requireExpression.start, requireExpression.end, required.name);
+  }
+}
 
-    return this.resolve(importee, importer, {
-      skipSelf: true,
-      custom: { 'node-resolve': { isRequire: isProxyModule || isRequiredModule } }
-    }).then((resolved) => {
-      if (!resolved) {
-        resolved = resolveExtensions(importee, importer);
+function removeDeclaratorsFromDeclarations(topLevelDeclarations, removedDeclarators, magicString) {
+  for (const declaration of topLevelDeclarations) {
+    let keepDeclaration = false;
+    let [{ start }] = declaration.declarations;
+    for (const declarator of declaration.declarations) {
+      if (removedDeclarators.has(declarator)) {
+        magicString.remove(start, declarator.end);
+      } else if (!keepDeclaration) {
+        magicString.remove(start, declarator.start);
+        keepDeclaration = true;
       }
-      if (resolved && isProxyModule) {
-        resolved.id = wrapId(resolved.id, resolved.external ? EXTERNAL_SUFFIX : PROXY_SUFFIX);
-        resolved.external = false;
-      } else if (!resolved && (isProxyModule || isRequiredModule)) {
-        return { id: wrapId(importee, EXTERNAL_SUFFIX), external: false };
+      start = declarator.end;
+    }
+    if (!keepDeclaration) {
+      magicString.remove(declaration.start, declaration.end);
+    }
+  }
+}
+
+/* eslint-disable no-param-reassign, no-shadow, no-underscore-dangle, no-continue */
+
+const exportsPattern = /^(?:module\.)?exports(?:\.([a-zA-Z_$][a-zA-Z_$0-9]*))?$/;
+
+const functionType = /^(?:FunctionDeclaration|FunctionExpression|ArrowFunctionExpression)$/;
+
+function transformCommonjs(
+  parse,
+  code,
+  id,
+  isEsModule,
+  ignoreGlobal,
+  ignoreRequire,
+  sourceMap,
+  isDynamicRequireModulesEnabled,
+  dynamicRequireModuleSet,
+  disableWrap,
+  commonDir,
+  astCache
+) {
+  const ast = astCache || tryParse(parse, code, id);
+  const magicString = new MagicString__default['default'](code);
+  const uses = {
+    module: false,
+    exports: false,
+    global: false,
+    require: false,
+    commonjsHelpers: false
+  };
+  const virtualDynamicRequirePath =
+    isDynamicRequireModulesEnabled && getVirtualPathForDynamicRequirePath(path.dirname(id), commonDir);
+  let scope = pluginutils.attachScopes(ast, 'scope');
+  let lexicalDepth = 0;
+  let programDepth = 0;
+  let shouldWrap = false;
+  const defineCompiledEsmExpressions = [];
+
+  const globals = new Set();
+
+  // TODO technically wrong since globals isn't populated yet, but ¯\_(ツ)_/¯
+  const HELPERS_NAME = deconflict(scope, globals, 'commonjsHelpers');
+  const namedExports = {};
+  const dynamicRegisterSources = new Set();
+
+  const {
+    addRequireStatement,
+    requiredSources,
+    rewriteRequireExpressionsAndGetImportBlock
+  } = getRequireHandlers();
+
+  // See which names are assigned to. This is necessary to prevent
+  // illegally replacing `var foo = require('foo')` with `import foo from 'foo'`,
+  // where `foo` is later reassigned. (This happens in the wild. CommonJS, sigh)
+  const reassignedNames = new Set();
+  const topLevelDeclarations = [];
+  const topLevelRequireDeclarators = new Set();
+  const skippedNodes = new Set();
+  const topLevelModuleExportsAssignments = [];
+  const topLevelExportsAssignmentsByName = new Map();
+
+  estreeWalker.walk(ast, {
+    enter(node, parent) {
+      if (skippedNodes.has(node)) {
+        this.skip();
+        return;
       }
-      return resolved;
-    });
+
+      programDepth += 1;
+      if (node.scope) ({ scope } = node);
+      if (functionType.test(node.type)) lexicalDepth += 1;
+      if (sourceMap) {
+        magicString.addSourcemapLocation(node.start);
+        magicString.addSourcemapLocation(node.end);
+      }
+
+      // eslint-disable-next-line default-case
+      switch (node.type) {
+        case 'AssignmentExpression':
+          if (node.left.type === 'MemberExpression') {
+            const flattened = getKeypath(node.left);
+            if (!flattened || scope.contains(flattened.name)) return;
+
+            const exportsPatternMatch = exportsPattern.exec(flattened.keypath);
+            if (!exportsPatternMatch || flattened.keypath === 'exports') return;
+
+            const [, exportName] = exportsPatternMatch;
+            uses[flattened.name] = true;
+
+            // we're dealing with `module.exports = ...` or `[module.]exports.foo = ...` –
+            if (programDepth > 3) {
+              shouldWrap = true;
+            } else if (exportName === KEY_COMPILED_ESM) {
+              defineCompiledEsmExpressions.push(parent);
+            } else if (flattened.keypath === 'module.exports') {
+              topLevelModuleExportsAssignments.push(node);
+            } else if (!topLevelExportsAssignmentsByName.has(exportName)) {
+              topLevelExportsAssignmentsByName.set(exportName, node);
+            } else {
+              shouldWrap = true;
+            }
+
+            skippedNodes.add(node.left);
+
+            if (flattened.keypath === 'module.exports' && node.right.type === 'ObjectExpression') {
+              node.right.properties.forEach((prop) => {
+                if (prop.computed || !('key' in prop) || prop.key.type !== 'Identifier') return;
+                const { name } = prop.key;
+                if (name === pluginutils.makeLegalIdentifier(name)) namedExports[name] = true;
+              });
+              return;
+            }
+
+            if (exportsPatternMatch[1]) namedExports[exportsPatternMatch[1]] = true;
+          } else {
+            for (const name of pluginutils.extractAssignedNames(node.left)) {
+              reassignedNames.add(name);
+            }
+          }
+          return;
+        case 'CallExpression': {
+          if (isDefineCompiledEsm(node)) {
+            if (programDepth === 3 && parent.type === 'ExpressionStatement') {
+              // skip special handling for [module.]exports until we know we render this
+              skippedNodes.add(node.arguments[0]);
+              defineCompiledEsmExpressions.push(parent);
+            } else {
+              shouldWrap = true;
+            }
+            return;
+          }
+          if (!isStaticRequireStatement(node, scope)) return;
+          if (!isDynamicRequireModulesEnabled) {
+            skippedNodes.add(node.callee);
+          }
+          if (!isIgnoredRequireStatement(node, ignoreRequire)) {
+            skippedNodes.add(node.callee);
+            const usesReturnValue = parent.type !== 'ExpressionStatement';
+
+            let sourceId = getRequireStringArg(node);
+            const isDynamicRegister = sourceId.startsWith(DYNAMIC_REGISTER_PREFIX);
+            if (isDynamicRegister) {
+              sourceId = sourceId.substr(DYNAMIC_REGISTER_PREFIX.length);
+              if (sourceId.endsWith('.json')) {
+                sourceId = DYNAMIC_JSON_PREFIX + sourceId;
+              }
+              dynamicRegisterSources.add(sourceId);
+            } else {
+              if (
+                !sourceId.endsWith('.json') &&
+                hasDynamicModuleForPath(sourceId, id, dynamicRequireModuleSet)
+              ) {
+                magicString.overwrite(
+                  node.start,
+                  node.end,
+                  `${HELPERS_NAME}.commonjsRequire(${JSON.stringify(
+                    getVirtualPathForDynamicRequirePath(sourceId, commonDir)
+                  )}, ${JSON.stringify(
+                    path.dirname(id) === '.' ? null /* default behavior */ : virtualDynamicRequirePath
+                  )})`
+                );
+                uses.commonjsHelpers = true;
+                return;
+              }
+              addRequireStatement(sourceId, node, scope, usesReturnValue);
+            }
+
+            if (usesReturnValue) {
+              if (
+                parent.type === 'VariableDeclarator' &&
+                !scope.parent &&
+                parent.id.type === 'Identifier'
+              ) {
+                // This will allow us to reuse this variable name as the imported variable if it is not reassigned
+                // and does not conflict with variables in other places where this is imported
+                topLevelRequireDeclarators.add(parent);
+              }
+            } else {
+              // This is a bare import, e.g. `require('foo');`
+              magicString.remove(parent.start, parent.end);
+            }
+          }
+          return;
+        }
+        case 'ConditionalExpression':
+        case 'IfStatement':
+          // skip dead branches
+          if (isFalsy(node.test)) {
+            skippedNodes.add(node.consequent);
+          } else if (node.alternate && isTruthy(node.test)) {
+            skippedNodes.add(node.alternate);
+          }
+          return;
+        case 'Identifier': {
+          const { name } = node;
+          if (!(isReference__default['default'](node, parent) && !scope.contains(name))) return;
+          switch (name) {
+            case 'require':
+              if (isNodeRequirePropertyAccess(parent)) return;
+
+              if (isDynamicRequireModulesEnabled && isRequireStatement(parent, scope)) {
+                magicString.appendLeft(
+                  parent.end - 1,
+                  `,${JSON.stringify(
+                    path.dirname(id) === '.' ? null /* default behavior */ : virtualDynamicRequirePath
+                  )}`
+                );
+              }
+
+              magicString.overwrite(node.start, node.end, `${HELPERS_NAME}.commonjsRequire`, {
+                storeName: true
+              });
+              uses.commonjsHelpers = true;
+              return;
+            case 'module':
+            case 'exports':
+              shouldWrap = true;
+              uses[name] = true;
+              return;
+            case 'global':
+              uses.global = true;
+              if (!ignoreGlobal) {
+                magicString.overwrite(node.start, node.end, `${HELPERS_NAME}.commonjsGlobal`, {
+                  storeName: true
+                });
+                uses.commonjsHelpers = true;
+              }
+              return;
+            case 'define':
+              magicString.overwrite(node.start, node.end, 'undefined', { storeName: true });
+              return;
+            default:
+              globals.add(name);
+              return;
+          }
+        }
+        case 'MemberExpression':
+          if (!isDynamicRequireModulesEnabled && isModuleRequire(node, scope)) {
+            magicString.overwrite(node.start, node.end, `${HELPERS_NAME}.commonjsRequire`, {
+              storeName: true
+            });
+            uses.commonjsHelpers = true;
+            skippedNodes.add(node.object);
+            skippedNodes.add(node.property);
+          }
+          return;
+        case 'ReturnStatement':
+          // if top-level return, we need to wrap it
+          if (lexicalDepth === 0) {
+            shouldWrap = true;
+          }
+          return;
+        case 'ThisExpression':
+          // rewrite top-level `this` as `commonjsHelpers.commonjsGlobal`
+          if (lexicalDepth === 0) {
+            uses.global = true;
+            if (!ignoreGlobal) {
+              magicString.overwrite(node.start, node.end, `${HELPERS_NAME}.commonjsGlobal`, {
+                storeName: true
+              });
+              uses.commonjsHelpers = true;
+            }
+          }
+          return;
+        case 'UnaryExpression':
+          // rewrite `typeof module`, `typeof module.exports` and `typeof exports` (https://github.com/rollup/rollup-plugin-commonjs/issues/151)
+          if (node.operator === 'typeof') {
+            const flattened = getKeypath(node.argument);
+            if (!flattened) return;
+
+            if (scope.contains(flattened.name)) return;
+
+            if (
+              flattened.keypath === 'module.exports' ||
+              flattened.keypath === 'module' ||
+              flattened.keypath === 'exports'
+            ) {
+              magicString.overwrite(node.start, node.end, `'object'`, { storeName: false });
+            }
+          }
+          return;
+        case 'VariableDeclaration':
+          if (!scope.parent) {
+            topLevelDeclarations.push(node);
+          }
+      }
+    },
+
+    leave(node) {
+      programDepth -= 1;
+      if (node.scope) scope = scope.parent;
+      if (functionType.test(node.type)) lexicalDepth -= 1;
+    }
+  });
+
+  let isRestorableCompiledEsm = false;
+  if (defineCompiledEsmExpressions.length > 0) {
+    if (!shouldWrap && defineCompiledEsmExpressions.length === 1) {
+      isRestorableCompiledEsm = true;
+      magicString.remove(
+        defineCompiledEsmExpressions[0].start,
+        defineCompiledEsmExpressions[0].end
+      );
+    } else {
+      shouldWrap = true;
+      uses.exports = true;
+    }
+  }
+
+  // We cannot wrap ES/mixed modules
+  shouldWrap = shouldWrap && !disableWrap && !isEsModule;
+  uses.commonjsHelpers = uses.commonjsHelpers || shouldWrap;
+
+  if (
+    !(
+      requiredSources.length ||
+      dynamicRegisterSources.size ||
+      uses.module ||
+      uses.exports ||
+      uses.require ||
+      uses.commonjsHelpers
+    ) &&
+    (ignoreGlobal || !uses.global)
+  ) {
+    return { meta: { commonjs: { isCommonJS: false } } };
+  }
+
+  const moduleName = deconflict(scope, globals, getName(id));
+
+  let leadingComment = '';
+  if (code.startsWith('/*')) {
+    const commentEnd = code.indexOf('*/', 2) + 2;
+    leadingComment = `${code.slice(0, commentEnd)}\n`;
+    magicString.remove(0, commentEnd).trim();
+  }
+
+  const exportBlock = isEsModule
+    ? ''
+    : rewriteExportsAndGetExportsBlock(
+        magicString,
+        moduleName,
+        shouldWrap,
+        topLevelModuleExportsAssignments,
+        topLevelExportsAssignmentsByName,
+        defineCompiledEsmExpressions,
+        (name) => deconflict(scope, globals, name),
+        isRestorableCompiledEsm,
+        code,
+        uses,
+        HELPERS_NAME
+      );
+
+  const importBlock = rewriteRequireExpressionsAndGetImportBlock(
+    magicString,
+    topLevelDeclarations,
+    topLevelRequireDeclarators,
+    reassignedNames,
+    uses.commonjsHelpers && HELPERS_NAME,
+    dynamicRegisterSources
+  );
+
+  if (shouldWrap) {
+    wrapCode(magicString, uses, moduleName, HELPERS_NAME, virtualDynamicRequirePath);
+  }
+
+  magicString
+    .trim()
+    .prepend(leadingComment + importBlock)
+    .append(exportBlock);
+
+  return {
+    code: magicString.toString(),
+    map: sourceMap ? magicString.generateMap() : null,
+    syntheticNamedExports: isEsModule ? false : '__moduleExports',
+    meta: { commonjs: { isCommonJS: !isEsModule } }
   };
 }
 
@@ -1287,7 +1459,7 @@ function commonjs(options = {}) {
         getDynamicPackagesEntryIntro(dynamicRequireModuleDirPaths, dynamicRequireModuleSet) + code;
     }
 
-    const { isEsModule, hasDefaultExport, hasNamedExports, ast } = checkEsModule(
+    const { isEsModule, hasDefaultExport, hasNamedExports, ast } = analyzeTopLevelStatements(
       this.parse,
       code,
       id
@@ -1329,20 +1501,12 @@ function commonjs(options = {}) {
     name: 'commonjs',
 
     buildStart() {
+      validateRollupVersion(this.meta.rollupVersion, peerDependencies.rollup);
       if (options.namedExports != null) {
         this.warn(
           'The namedExports option from "@rollup/plugin-commonjs" is deprecated. Named exports are now handled automatically.'
         );
       }
-
-      const [major, minor] = this.meta.rollupVersion.split('.').map(Number);
-      const minVersion = peerDependencies.rollup.slice(2);
-      const [minMajor, minMinor] = minVersion.split('.').map(Number);
-      if (major < minMajor || (major === minMajor && minor < minMinor)) {
-        this.error(
-          `Insufficient Rollup version: "@rollup/plugin-commonjs" requires at least rollup@${minVersion} but found rollup@${this.meta.rollupVersion}.`
-        );
-      }
     },
 
     resolveId,