@rollup/plugin-commonjs 18.0.0 → 19.0.2

package/dist/index.es.js

@@ -9,7 +9,7 @@ import isReference from 'is-reference';
 import { sync } from 'resolve';
 
 var peerDependencies = {
-	rollup: "^2.30.0"
+	rollup: "^2.38.3"
 };
 
 function tryParse(parse, code, id) {
@@ -83,6 +83,8 @@ const unwrapId = (wrappedId, suffix) => wrappedId.slice(1, -suffix.length);
 const PROXY_SUFFIX = '?commonjs-proxy';
 const REQUIRE_SUFFIX = '?commonjs-require';
 const EXTERNAL_SUFFIX = '?commonjs-external';
+const EXPORTS_SUFFIX = '?commonjs-exports';
+const MODULE_SUFFIX = '?commonjs-module';
 
 const DYNAMIC_REGISTER_SUFFIX = '?commonjs-dynamic-register';
 const DYNAMIC_JSON_PREFIX = '\0commonjs-dynamic-json:';
@@ -129,33 +131,38 @@ export function getAugmentedNamespace(n) {
 const FAILED_REQUIRE_ERROR = `throw new Error('Could not dynamically require "' + path + '". Please configure the dynamicRequireTargets or/and ignoreDynamicRequires option of @rollup/plugin-commonjs appropriately for this require call to work.');`;
 
 const HELPER_NON_DYNAMIC = `
-export function createCommonjsModule(fn) {
-  var module = { exports: {} }
-	return fn(module, module.exports), module.exports;
-}
-
 export function commonjsRequire (path) {
 	${FAILED_REQUIRE_ERROR}
 }
 `;
 
 const getDynamicHelpers = (ignoreDynamicRequires) => `
-export function createCommonjsModule(fn, basedir, module) {
-	return module = {
-		path: basedir,
+export function createModule(modulePath) {
+	return {
+		path: modulePath,
 		exports: {},
 		require: function (path, base) {
-			return commonjsRequire(path, (base === undefined || base === null) ? module.path : base);
+			return commonjsRequire(path, base == null ? modulePath : base);
 		}
-	}, fn(module, module.exports), module.exports;
+	};
 }
 
 export function commonjsRegister (path, loader) {
 	DYNAMIC_REQUIRE_LOADERS[path] = loader;
 }
 
+export function commonjsRegisterOrShort (path, to) {
+	const resolvedPath = commonjsResolveImpl(path, null, true);
+	if (resolvedPath !== null && DYNAMIC_REQUIRE_CACHE[resolvedPath]) {
+	  DYNAMIC_REQUIRE_CACHE[path] = DYNAMIC_REQUIRE_CACHE[resolvedPath];
+	} else {
+	  DYNAMIC_REQUIRE_SHORTS[path] = to;
+	}
+}
+
 const DYNAMIC_REQUIRE_LOADERS = Object.create(null);
 const DYNAMIC_REQUIRE_CACHE = Object.create(null);
+const DYNAMIC_REQUIRE_SHORTS = Object.create(null);
 const DEFAULT_PARENT_MODULE = {
 	id: '<' + 'rollup>', exports: {}, parent: undefined, filename: null, loaded: false, children: [], paths: []
 };
@@ -260,10 +267,13 @@ export function commonjsResolveImpl (path, originalModuleDir, testCache) {
 			const resolvedPath = relPath + CHECKED_EXTENSIONS[extensionIndex];
 			if (DYNAMIC_REQUIRE_CACHE[resolvedPath]) {
 				return resolvedPath;
-			};
+			}
+			if (DYNAMIC_REQUIRE_SHORTS[resolvedPath]) {
+			  return resolvedPath;
+			}
 			if (DYNAMIC_REQUIRE_LOADERS[resolvedPath]) {
 				return resolvedPath;
-			};
+			}
 		}
 		if (!shouldTryNodeModules) break;
 		const nextDir = normalize(originalModuleDir + '/..');
@@ -282,10 +292,17 @@ export function commonjsResolve (path, originalModuleDir) {
 }
 
 export function commonjsRequire (path, originalModuleDir) {
-	const resolvedPath = commonjsResolveImpl(path, originalModuleDir, true);
+	let resolvedPath = commonjsResolveImpl(path, originalModuleDir, true);
 	if (resolvedPath !== null) {
     let cachedModule = DYNAMIC_REQUIRE_CACHE[resolvedPath];
     if (cachedModule) return cachedModule.exports;
+    let shortTo = DYNAMIC_REQUIRE_SHORTS[resolvedPath];
+    if (shortTo) {
+      cachedModule = DYNAMIC_REQUIRE_CACHE[shortTo];
+      if (cachedModule)
+        return cachedModule.exports;
+      resolvedPath = commonjsResolveImpl(shortTo, null, true);
+    }
     const loader = DYNAMIC_REQUIRE_LOADERS[resolvedPath];
     if (loader) {
       DYNAMIC_REQUIRE_CACHE[resolvedPath] = cachedModule = {
@@ -326,16 +343,20 @@ function getHelpersModule(isDynamicRequireModulesEnabled, ignoreDynamicRequires)
 
 /* eslint-disable import/prefer-default-export */
 
-function deconflict(scope, globals, identifier) {
+function deconflict(scopes, globals, identifier) {
   let i = 1;
   let deconflicted = makeLegalIdentifier(identifier);
+  const hasConflicts = () =>
+    scopes.some((scope) => scope.contains(deconflicted)) || globals.has(deconflicted);
 
-  while (scope.contains(deconflicted) || globals.has(deconflicted)) {
+  while (hasConflicts()) {
     deconflicted = makeLegalIdentifier(`${identifier}_${i}`);
     i += 1;
   }
-  // eslint-disable-next-line no-param-reassign
-  scope.declarations[deconflicted] = true;
+
+  for (const scope of scopes) {
+    scope.declarations[deconflicted] = true;
+  }
 
   return deconflicted;
 }
@@ -378,15 +399,13 @@ function getPackageEntryPoint(dirPath) {
 }
 
 function getDynamicPackagesModule(dynamicRequireModuleDirPaths, commonDir) {
-  let code = `const commonjsRegister = require('${HELPERS_ID}?commonjsRegister');`;
+  let code = `const commonjsRegisterOrShort = require('${HELPERS_ID}?commonjsRegisterOrShort');`;
   for (const dir of dynamicRequireModuleDirPaths) {
     const entryPoint = getPackageEntryPoint(dir);
 
-    code += `\ncommonjsRegister(${JSON.stringify(
+    code += `\ncommonjsRegisterOrShort(${JSON.stringify(
       getVirtualPathForDynamicRequirePath(dir, commonDir)
-    )}, function (module, exports) {
-  module.exports = require(${JSON.stringify(normalizePathSlashes(join(dir, entryPoint)))});
-});`;
+    )}, ${JSON.stringify(getVirtualPathForDynamicRequirePath(join(dir, entryPoint), commonDir))});`;
   }
   return code;
 }
@@ -397,28 +416,18 @@ function getDynamicPackagesEntryIntro(
 ) {
   let dynamicImports = Array.from(
     dynamicRequireModuleSet,
-    (dynamicId) => `require(${JSON.stringify(wrapModuleRegisterProxy(dynamicId))});`
+    (dynamicId) => `require(${JSON.stringify(wrapId(dynamicId, DYNAMIC_REGISTER_SUFFIX))});`
   ).join('\n');
 
   if (dynamicRequireModuleDirPaths.length) {
-    dynamicImports += `require(${JSON.stringify(wrapModuleRegisterProxy(DYNAMIC_PACKAGES_ID))});`;
+    dynamicImports += `require(${JSON.stringify(
+      wrapId(DYNAMIC_PACKAGES_ID, DYNAMIC_REGISTER_SUFFIX)
+    )});`;
   }
 
   return dynamicImports;
 }
 
-function wrapModuleRegisterProxy(id) {
-  return wrapId(id, DYNAMIC_REGISTER_SUFFIX);
-}
-
-function unwrapModuleRegisterProxy(id) {
-  return unwrapId(id, DYNAMIC_REGISTER_SUFFIX);
-}
-
-function isModuleRegisterProxy(id) {
-  return isWrappedId(id, DYNAMIC_REGISTER_SUFFIX);
-}
-
 function isDynamicModuleImport(id, dynamicRequireModuleSet) {
   const normalizedPath = normalizePathSlashes(id);
   return dynamicRequireModuleSet.has(normalizedPath) && !normalizedPath.endsWith('.json');
@@ -451,39 +460,37 @@ function getDynamicRequirePaths(patterns) {
   return { dynamicRequireModuleSet, dynamicRequireModuleDirPaths };
 }
 
-const isCjsPromises = new Map();
-
-function getIsCjsPromise(id) {
-  let isCjsPromise = isCjsPromises.get(id);
-  if (isCjsPromise) return isCjsPromise.promise;
+function getCommonJSMetaPromise(commonJSMetaPromises, id) {
+  let commonJSMetaPromise = commonJSMetaPromises.get(id);
+  if (commonJSMetaPromise) return commonJSMetaPromise.promise;
 
   const promise = new Promise((resolve) => {
-    isCjsPromise = {
+    commonJSMetaPromise = {
       resolve,
       promise: null
     };
-    isCjsPromises.set(id, isCjsPromise);
+    commonJSMetaPromises.set(id, commonJSMetaPromise);
   });
-  isCjsPromise.promise = promise;
+  commonJSMetaPromise.promise = promise;
 
   return promise;
 }
 
-function setIsCjsPromise(id, resolution) {
-  const isCjsPromise = isCjsPromises.get(id);
-  if (isCjsPromise) {
-    if (isCjsPromise.resolve) {
-      isCjsPromise.resolve(resolution);
-      isCjsPromise.resolve = null;
+function setCommonJSMetaPromise(commonJSMetaPromises, id, commonjsMeta) {
+  const commonJSMetaPromise = commonJSMetaPromises.get(id);
+  if (commonJSMetaPromise) {
+    if (commonJSMetaPromise.resolve) {
+      commonJSMetaPromise.resolve(commonjsMeta);
+      commonJSMetaPromise.resolve = null;
     }
   } else {
-    isCjsPromises.set(id, { promise: Promise.resolve(resolution), resolve: null });
+    commonJSMetaPromises.set(id, { promise: Promise.resolve(commonjsMeta), resolve: null });
   }
 }
 
 // e.g. id === "commonjsHelpers?commonjsRegister"
 function getSpecificHelperProxy(id) {
-  return `export {${id.split('?')[1]} as default} from '${HELPERS_ID}';`;
+  return `export {${id.split('?')[1]} as default} from "${HELPERS_ID}";`;
 }
 
 function getUnknownRequireProxy(id, requireReturnsDefault) {
@@ -523,16 +530,17 @@ async function getStaticRequireProxy(
   id,
   requireReturnsDefault,
   esModulesWithDefaultExport,
-  esModulesWithNamedExports
+  esModulesWithNamedExports,
+  commonJsMetaPromises
 ) {
   const name = getName(id);
-  const isCjs = await getIsCjsPromise(id);
-  if (isCjs) {
-    return `import { __moduleExports } from ${JSON.stringify(id)}; export default __moduleExports;`;
-  } else if (isCjs === null) {
+  const commonjsMeta = await getCommonJSMetaPromise(commonJsMetaPromises, id);
+  if (commonjsMeta && commonjsMeta.isCommonJS) {
+    return `export { __moduleExports as default } from ${JSON.stringify(id)};`;
+  } else if (commonjsMeta === null) {
     return getUnknownRequireProxy(id, requireReturnsDefault);
   } else if (!requireReturnsDefault) {
-    return `import {getAugmentedNamespace} from "${HELPERS_ID}"; import * as ${name} from ${JSON.stringify(
+    return `import { getAugmentedNamespace } from "${HELPERS_ID}"; import * as ${name} from ${JSON.stringify(
       id
     )}; export default /*@__PURE__*/getAugmentedNamespace(${name});`;
   } else if (
@@ -543,7 +551,7 @@ async function getStaticRequireProxy(
   ) {
     return `import * as ${name} from ${JSON.stringify(id)}; export default ${name};`;
   }
-  return `export {default} from ${JSON.stringify(id)};`;
+  return `export { default } from ${JSON.stringify(id)};`;
 }
 
 /* eslint-disable no-param-reassign, no-undefined */
@@ -580,12 +588,17 @@ function getResolveId(extensions) {
   }
 
   return function resolveId(importee, rawImporter) {
+    if (isWrappedId(importee, MODULE_SUFFIX) || isWrappedId(importee, EXPORTS_SUFFIX)) {
+      return importee;
+    }
+
     const importer =
-      rawImporter && isModuleRegisterProxy(rawImporter)
-        ? unwrapModuleRegisterProxy(rawImporter)
+      rawImporter && isWrappedId(rawImporter, DYNAMIC_REGISTER_SUFFIX)
+        ? unwrapId(rawImporter, DYNAMIC_REGISTER_SUFFIX)
         : rawImporter;
 
-    // Proxies are only importing resolved ids, no need to resolve again
+    // Except for exports, proxies are only importing resolved ids,
+    // no need to resolve again
     if (importer && isWrappedId(importer, PROXY_SUFFIX)) {
       return importee;
     }
@@ -599,9 +612,9 @@ function getResolveId(extensions) {
     } else if (isRequiredModule) {
       importee = unwrapId(importee, REQUIRE_SUFFIX);
 
-      isModuleRegistration = isModuleRegisterProxy(importee);
+      isModuleRegistration = isWrappedId(importee, DYNAMIC_REGISTER_SUFFIX);
       if (isModuleRegistration) {
-        importee = unwrapModuleRegisterProxy(importee);
+        importee = unwrapId(importee, DYNAMIC_REGISTER_SUFFIX);
       }
     }
 
@@ -628,7 +641,7 @@ function getResolveId(extensions) {
         resolved.id = wrapId(resolved.id, resolved.external ? EXTERNAL_SUFFIX : PROXY_SUFFIX);
         resolved.external = false;
       } else if (resolved && isModuleRegistration) {
-        resolved.id = wrapModuleRegisterProxy(resolved.id);
+        resolved.id = wrapId(resolved.id, DYNAMIC_REGISTER_SUFFIX);
       } else if (!resolved && (isProxyModule || isRequiredModule)) {
         return { id: wrapId(importee, EXTERNAL_SUFFIX), external: false };
       }
@@ -728,8 +741,6 @@ function isDefineCompiledEsm(node) {
 }
 
 function getDefinePropertyCallName(node, targetName) {
-  const targetNames = targetName.split('.');
-
   const {
     callee: { object, property }
   } = node;
@@ -737,6 +748,7 @@ function getDefinePropertyCallName(node, targetName) {
   if (!property || property.type !== 'Identifier' || property.name !== 'defineProperty') return;
   if (node.arguments.length !== 3) return;
 
+  const targetNames = targetName.split('.');
   const [target, key, value] = node.arguments;
   if (targetNames.length === 1) {
     if (target.type !== 'Identifier' || target.name !== targetNames[0]) {
@@ -763,117 +775,199 @@ function getDefinePropertyCallName(node, targetName) {
   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 isShorthandProperty(parent) {
   return parent && parent.type === 'Property' && parent.shorthand;
 }
 
-function wrapCode(magicString, uses, moduleName, HELPERS_NAME, virtualDynamicRequirePath) {
-  const args = `module${uses.exports ? ', exports' : ''}`;
+function hasDefineEsmProperty(node) {
+  return node.properties.some((property) => {
+    if (
+      property.type === 'Property' &&
+      property.key.type === 'Identifier' &&
+      property.key.name === '__esModule' &&
+      isTruthy(property.value)
+    ) {
+      return true;
+    }
+    return false;
+  });
+}
 
+function wrapCode(magicString, uses, moduleName, exportsName) {
+  const args = [];
+  const passedArgs = [];
+  if (uses.module) {
+    args.push('module');
+    passedArgs.push(moduleName);
+  }
+  if (uses.exports) {
+    args.push('exports');
+    passedArgs.push(exportsName);
+  }
   magicString
     .trim()
-    .prepend(`var ${moduleName} = ${HELPERS_NAME}.createCommonjsModule(function (${args}) {\n`)
-    .append(
-      `\n}${virtualDynamicRequirePath ? `, ${JSON.stringify(virtualDynamicRequirePath)}` : ''});`
-    );
+    .prepend(`(function (${args.join(', ')}) {\n`)
+    .append(`\n}(${passedArgs.join(', ')}));`);
 }
 
 function rewriteExportsAndGetExportsBlock(
   magicString,
   moduleName,
+  exportsName,
   wrapped,
-  topLevelModuleExportsAssignments,
-  topLevelExportsAssignmentsByName,
+  moduleExportsAssignments,
+  firstTopLevelModuleExportsAssignment,
+  exportsAssignmentsByName,
+  topLevelAssignments,
   defineCompiledEsmExpressions,
-  deconflict,
-  isRestorableCompiledEsm,
+  deconflictedExportNames,
   code,
-  uses,
-  HELPERS_NAME
+  HELPERS_NAME,
+  exportMode,
+  detectWrappedDefault,
+  defaultIsModuleExports
 ) {
-  const namedExportDeclarations = [`export { ${moduleName} as __moduleExports };`];
-  const moduleExportsPropertyAssignments = [];
-  let deconflictedDefaultExportName;
+  const exports = [];
+  const exportDeclarations = [];
+
+  if (exportMode === 'replace') {
+    getExportsForReplacedModuleExports(
+      magicString,
+      exports,
+      exportDeclarations,
+      moduleExportsAssignments,
+      firstTopLevelModuleExportsAssignment,
+      exportsName
+    );
+  } else {
+    exports.push(`${exportsName} as __moduleExports`);
+    if (wrapped) {
+      getExportsWhenWrapping(
+        exportDeclarations,
+        exportsName,
+        detectWrappedDefault,
+        HELPERS_NAME,
+        defaultIsModuleExports
+      );
+    } else {
+      getExports(
+        magicString,
+        exports,
+        exportDeclarations,
+        moduleExportsAssignments,
+        exportsAssignmentsByName,
+        deconflictedExportNames,
+        topLevelAssignments,
+        moduleName,
+        exportsName,
+        defineCompiledEsmExpressions,
+        HELPERS_NAME,
+        defaultIsModuleExports
+      );
+    }
+  }
+  if (exports.length) {
+    exportDeclarations.push(`export { ${exports.join(', ')} };`);
+  }
 
-  if (!wrapped) {
-    let hasModuleExportsAssignment = false;
-    const namedExportProperties = [];
+  return `\n\n${exportDeclarations.join('\n')}`;
+}
 
-    // Collect and rewrite module.exports assignments
-    for (const { left } of topLevelModuleExportsAssignments) {
-      hasModuleExportsAssignment = true;
-      magicString.overwrite(left.start, left.end, `var ${moduleName}`);
-    }
+function getExportsForReplacedModuleExports(
+  magicString,
+  exports,
+  exportDeclarations,
+  moduleExportsAssignments,
+  firstTopLevelModuleExportsAssignment,
+  exportsName
+) {
+  for (const { left } of moduleExportsAssignments) {
+    magicString.overwrite(left.start, left.end, exportsName);
+  }
+  magicString.prependRight(firstTopLevelModuleExportsAssignment.left.start, 'var ');
+  exports.push(`${exportsName} as __moduleExports`);
+  exportDeclarations.push(`export default ${exportsName};`);
+}
 
-    // 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} };`
-        );
-      }
+function getExportsWhenWrapping(
+  exportDeclarations,
+  exportsName,
+  detectWrappedDefault,
+  HELPERS_NAME,
+  defaultIsModuleExports
+) {
+  exportDeclarations.push(
+    `export default ${
+      detectWrappedDefault && defaultIsModuleExports === 'auto'
+        ? `/*@__PURE__*/${HELPERS_NAME}.getDefaultExportFromCjs(${exportsName})`
+        : defaultIsModuleExports === false
+        ? `${exportsName}.default`
+        : exportsName
+    };`
+  );
+}
+
+function getExports(
+  magicString,
+  exports,
+  exportDeclarations,
+  moduleExportsAssignments,
+  exportsAssignmentsByName,
+  deconflictedExportNames,
+  topLevelAssignments,
+  moduleName,
+  exportsName,
+  defineCompiledEsmExpressions,
+  HELPERS_NAME,
+  defaultIsModuleExports
+) {
+  let deconflictedDefaultExportName;
+  // Collect and rewrite module.exports assignments
+  for (const { left } of moduleExportsAssignments) {
+    magicString.overwrite(left.start, left.end, `${moduleName}.exports`);
+  }
 
-      if (hasModuleExportsAssignment) {
-        moduleExportsPropertyAssignments.push(`${moduleName}.${exportName} = ${deconflicted};`);
-      } else {
-        namedExportProperties.push(`\t${exportName}: ${deconflicted}`);
+  // Collect and rewrite named exports
+  for (const [exportName, { nodes }] of exportsAssignmentsByName) {
+    const deconflicted = deconflictedExportNames[exportName];
+    let needsDeclaration = true;
+    for (const node of nodes) {
+      let replacement = `${deconflicted} = ${exportsName}.${exportName}`;
+      if (needsDeclaration && topLevelAssignments.has(node)) {
+        replacement = `var ${replacement}`;
+        needsDeclaration = false;
       }
+      magicString.overwrite(node.start, node.left.end, replacement);
+    }
+    if (needsDeclaration) {
+      magicString.prepend(`var ${deconflicted};\n`);
     }
 
-    // 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
-          };`
-        );
+    if (exportName === 'default') {
+      deconflictedDefaultExportName = deconflicted;
+    } else {
+      exports.push(exportName === deconflicted ? exportName : `${deconflicted} as ${exportName}`);
     }
   }
 
-  // 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};`);
+  // Collect and rewrite exports.__esModule assignments
+  let isRestorableCompiledEsm = false;
+  for (const expression of defineCompiledEsmExpressions) {
+    isRestorableCompiledEsm = true;
+    const moduleExportsExpression =
+      expression.type === 'CallExpression' ? expression.arguments[0] : expression.left.object;
+    magicString.overwrite(moduleExportsExpression.start, moduleExportsExpression.end, exportsName);
   }
 
-  return `\n\n${defaultExport
-    .concat(namedExportDeclarations)
-    .concat(moduleExportsPropertyAssignments)
-    .join('\n')}`;
+  if (!isRestorableCompiledEsm || defaultIsModuleExports === true) {
+    exportDeclarations.push(`export default ${exportsName};`);
+  } else if (moduleExportsAssignments.length === 0 || defaultIsModuleExports === false) {
+    exports.push(`${deconflictedDefaultExportName || exportsName} as default`);
+  } else {
+    exportDeclarations.push(
+      `export default /*@__PURE__*/${HELPERS_NAME}.getDefaultExportFromCjs(${exportsName});`
+    );
+  }
 }
 
 function isRequireStatement(node, scope) {
@@ -991,44 +1085,46 @@ function getRequireHandlers() {
     topLevelDeclarations,
     topLevelRequireDeclarators,
     reassignedNames,
-    helpersNameIfUsed,
-    dynamicRegisterSources
+    helpersName,
+    dynamicRegisterSources,
+    moduleName,
+    exportsName,
+    id,
+    exportMode
   ) {
-    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` : '';
+    const imports = [];
+    imports.push(`import * as ${helpersName} from "${HELPERS_ID}";`);
+    if (exportMode === 'module') {
+      imports.push(
+        `import { __module as ${moduleName}, exports as ${exportsName} } from ${JSON.stringify(
+          wrapId(id, MODULE_SUFFIX)
+        )}`
+      );
+    } else if (exportMode === 'exports') {
+      imports.push(
+        `import { __exports as ${exportsName} } from ${JSON.stringify(wrapId(id, EXPORTS_SUFFIX))}`
+      );
+    }
+    for (const source of dynamicRegisterSources) {
+      imports.push(`import ${JSON.stringify(wrapId(source, REQUIRE_SUFFIX))};`);
+    }
+    for (const source of requiredSources) {
+      if (!source.startsWith('\0')) {
+        imports.push(`import ${JSON.stringify(wrapId(source, REQUIRE_SUFFIX))};`);
+      }
+      const { name, nodesUsingRequired } = requiredBySource[source];
+      imports.push(
+        `import ${nodesUsingRequired.length ? `${name} from ` : ''}${JSON.stringify(
+          source.startsWith('\0') ? source : wrapId(source, PROXY_SUFFIX)
+        )};`
+      );
+    }
+    return imports.length ? `${imports.join('\n')}\n\n` : '';
   }
 
   return {
@@ -1038,30 +1134,6 @@ function getRequireHandlers() {
   };
 }
 
-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 (
-        !reassignedNames.has(potentialName) &&
-        !required.nodesUsingRequired.some((node) =>
-          isLocallyShadowed(potentialName, requiredByNode.get(node).scope)
-        )
-      ) {
-        required.name = potentialName;
-        removedDeclarators.add(declarator);
-      }
-    }
-  }
-  return removedDeclarators;
-}
-
 function setRemainingImportNamesAndRewriteRequires(
   requireExpressionsWithUsedReturnValue,
   requiredByNode,
@@ -1083,25 +1155,6 @@ function setRemainingImportNamesAndRewriteRequires(
   }
 }
 
-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;
-      }
-      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]*))?$/;
@@ -1122,7 +1175,8 @@ function transformCommonjs(
   dynamicRequireModuleSet,
   disableWrap,
   commonDir,
-  astCache
+  astCache,
+  defaultIsModuleExports
 ) {
   const ast = astCache || tryParse(parse, code, id);
   const magicString = new MagicString(code);
@@ -1130,9 +1184,9 @@ function transformCommonjs(
     module: false,
     exports: false,
     global: false,
-    require: false,
-    commonjsHelpers: false
+    require: false
   };
+  let usesDynamicRequire = false;
   const virtualDynamicRequirePath =
     isDynamicRequireModulesEnabled && getVirtualPathForDynamicRequirePath(dirname(id), commonDir);
   let scope = attachScopes(ast, 'scope');
@@ -1140,13 +1194,11 @@ function transformCommonjs(
   let programDepth = 0;
   let currentTryBlockEnd = null;
   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 HELPERS_NAME = deconflict([scope], globals, 'commonjsHelpers');
   const dynamicRegisterSources = new Set();
   let hasRemovedRequire = false;
 
@@ -1163,8 +1215,13 @@ function transformCommonjs(
   const topLevelDeclarations = [];
   const topLevelRequireDeclarators = new Set();
   const skippedNodes = new Set();
-  const topLevelModuleExportsAssignments = [];
-  const topLevelExportsAssignmentsByName = new Map();
+  const moduleAccessScopes = new Set([scope]);
+  const exportsAccessScopes = new Set([scope]);
+  const moduleExportsAssignments = [];
+  let firstTopLevelModuleExportsAssignment = null;
+  const exportsAssignmentsByName = new Map();
+  const topLevelAssignments = new Set();
+  const topLevelDefineCompiledEsmExpressions = [];
 
   walk(ast, {
     enter(node, parent) {
@@ -1204,30 +1261,46 @@ function transformCommonjs(
             uses[flattened.name] = true;
 
             // we're dealing with `module.exports = ...` or `[module.]exports.foo = ...` –
-            if (programDepth > 3) {
-              shouldWrap = true;
+            if (flattened.keypath === 'module.exports') {
+              moduleExportsAssignments.push(node);
+              if (programDepth > 3) {
+                moduleAccessScopes.add(scope);
+              } else if (!firstTopLevelModuleExportsAssignment) {
+                firstTopLevelModuleExportsAssignment = node;
+              }
+
+              if (defaultIsModuleExports === false) {
+                shouldWrap = true;
+              } else if (defaultIsModuleExports === 'auto') {
+                if (node.right.type === 'ObjectExpression') {
+                  if (hasDefineEsmProperty(node.right)) {
+                    shouldWrap = true;
+                  }
+                } else if (defaultIsModuleExports === false) {
+                  shouldWrap = true;
+                }
+              }
             } else if (exportName === KEY_COMPILED_ESM) {
-              defineCompiledEsmExpressions.push(parent);
-            } else if (flattened.keypath === 'module.exports') {
-              topLevelModuleExportsAssignments.push(node);
-            } else if (!topLevelExportsAssignmentsByName.has(exportName)) {
-              topLevelExportsAssignmentsByName.set(exportName, node);
+              if (programDepth > 3) {
+                shouldWrap = true;
+              } else {
+                topLevelDefineCompiledEsmExpressions.push(node);
+              }
             } else {
-              shouldWrap = true;
+              const exportsAssignments = exportsAssignmentsByName.get(exportName) || {
+                nodes: [],
+                scopes: new Set()
+              };
+              exportsAssignments.nodes.push(node);
+              exportsAssignments.scopes.add(scope);
+              exportsAccessScopes.add(scope);
+              exportsAssignmentsByName.set(exportName, exportsAssignments);
+              if (programDepth <= 3) {
+                topLevelAssignments.add(node);
+              }
             }
 
             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 === makeLegalIdentifier(name)) namedExports[name] = true;
-              });
-              return;
-            }
-
-            if (exportsPatternMatch[1]) namedExports[exportsPatternMatch[1]] = true;
           } else {
             for (const name of extractAssignedNames(node.left)) {
               reassignedNames.add(name);
@@ -1239,7 +1312,7 @@ function transformCommonjs(
             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);
+              topLevelDefineCompiledEsmExpressions.push(node);
             } else {
               shouldWrap = true;
             }
@@ -1267,7 +1340,6 @@ function transformCommonjs(
                 storeName: true
               }
             );
-            uses.commonjsHelpers = true;
             return;
           }
 
@@ -1294,13 +1366,13 @@ function transformCommonjs(
             }
 
             let sourceId = getRequireStringArg(node);
-            const isDynamicRegister = isModuleRegisterProxy(sourceId);
+            const isDynamicRegister = isWrappedId(sourceId, DYNAMIC_REGISTER_SUFFIX);
             if (isDynamicRegister) {
-              sourceId = unwrapModuleRegisterProxy(sourceId);
+              sourceId = unwrapId(sourceId, DYNAMIC_REGISTER_SUFFIX);
               if (sourceId.endsWith('.json')) {
                 sourceId = DYNAMIC_JSON_PREFIX + sourceId;
               }
-              dynamicRegisterSources.add(wrapModuleRegisterProxy(sourceId));
+              dynamicRegisterSources.add(wrapId(sourceId, DYNAMIC_REGISTER_SUFFIX));
             } else {
               if (
                 !sourceId.endsWith('.json') &&
@@ -1318,7 +1390,7 @@ function transformCommonjs(
                       dirname(id) === '.' ? null /* default behavior */ : virtualDynamicRequirePath
                     )})`
                   );
-                  uses.commonjsHelpers = true;
+                  usesDynamicRequire = true;
                 }
                 return;
               }
@@ -1375,7 +1447,6 @@ function transformCommonjs(
                     magicString.overwrite(node.start, node.end, `${HELPERS_NAME}.commonjsRequire`, {
                       storeName: true
                     });
-                    uses.commonjsHelpers = true;
                   }
                 }
 
@@ -1399,8 +1470,7 @@ function transformCommonjs(
                   });
                 }
               }
-
-              uses.commonjsHelpers = true;
+              usesDynamicRequire = true;
               return;
             case 'module':
             case 'exports':
@@ -1413,11 +1483,12 @@ function transformCommonjs(
                 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 });
+              magicString.overwrite(node.start, node.end, 'undefined', {
+                storeName: true
+              });
               return;
             default:
               globals.add(name);
@@ -1429,7 +1500,6 @@ function transformCommonjs(
             magicString.overwrite(node.start, node.end, `${HELPERS_NAME}.commonjsRequire`, {
               storeName: true
             });
-            uses.commonjsHelpers = true;
             skippedNodes.add(node.object);
             skippedNodes.add(node.property);
           }
@@ -1448,7 +1518,6 @@ function transformCommonjs(
               magicString.overwrite(node.start, node.end, `${HELPERS_NAME}.commonjsGlobal`, {
                 storeName: true
               });
-              uses.commonjsHelpers = true;
             }
           }
           return;
@@ -1465,7 +1534,9 @@ function transformCommonjs(
               flattened.keypath === 'module' ||
               flattened.keypath === 'exports'
             ) {
-              magicString.overwrite(node.start, node.end, `'object'`, { storeName: false });
+              magicString.overwrite(node.start, node.end, `'object'`, {
+                storeName: false
+              });
             }
           }
           return;
@@ -1483,23 +1554,22 @@ function transformCommonjs(
     }
   });
 
-  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;
-    }
+  const nameBase = getName(id);
+  const exportsName = deconflict([...exportsAccessScopes], globals, nameBase);
+  const moduleName = deconflict([...moduleAccessScopes], globals, `${nameBase}Module`);
+  const deconflictedExportNames = Object.create(null);
+  for (const [exportName, { scopes }] of exportsAssignmentsByName) {
+    deconflictedExportNames[exportName] = deconflict([...scopes], globals, exportName);
   }
 
   // We cannot wrap ES/mixed modules
-  shouldWrap = shouldWrap && !disableWrap && !isEsModule;
-  uses.commonjsHelpers = uses.commonjsHelpers || shouldWrap;
+  shouldWrap =
+    !isEsModule &&
+    !disableWrap &&
+    (shouldWrap || (uses.exports && moduleExportsAssignments.length > 0));
+  const detectWrappedDefault =
+    shouldWrap &&
+    (topLevelDefineCompiledEsmExpressions.length > 0 || code.indexOf('__esModule') >= 0);
 
   if (
     !(
@@ -1508,17 +1578,15 @@ function transformCommonjs(
       uses.module ||
       uses.exports ||
       uses.require ||
-      uses.commonjsHelpers ||
+      usesDynamicRequire ||
       hasRemovedRequire ||
-      isRestorableCompiledEsm
+      topLevelDefineCompiledEsmExpressions.length > 0
     ) &&
     (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;
@@ -1526,33 +1594,53 @@ function transformCommonjs(
     magicString.remove(0, commentEnd).trim();
   }
 
+  const exportMode = shouldWrap
+    ? uses.module
+      ? 'module'
+      : 'exports'
+    : firstTopLevelModuleExportsAssignment
+    ? exportsAssignmentsByName.size === 0 && topLevelDefineCompiledEsmExpressions.length === 0
+      ? 'replace'
+      : 'module'
+    : moduleExportsAssignments.length === 0
+    ? 'exports'
+    : 'module';
+
+  const importBlock = rewriteRequireExpressionsAndGetImportBlock(
+    magicString,
+    topLevelDeclarations,
+    topLevelRequireDeclarators,
+    reassignedNames,
+    HELPERS_NAME,
+    dynamicRegisterSources,
+    moduleName,
+    exportsName,
+    id,
+    exportMode
+  );
+
   const exportBlock = isEsModule
     ? ''
     : rewriteExportsAndGetExportsBlock(
         magicString,
         moduleName,
+        exportsName,
         shouldWrap,
-        topLevelModuleExportsAssignments,
-        topLevelExportsAssignmentsByName,
-        defineCompiledEsmExpressions,
-        (name) => deconflict(scope, globals, name),
-        isRestorableCompiledEsm,
+        moduleExportsAssignments,
+        firstTopLevelModuleExportsAssignment,
+        exportsAssignmentsByName,
+        topLevelAssignments,
+        topLevelDefineCompiledEsmExpressions,
+        deconflictedExportNames,
         code,
-        uses,
-        HELPERS_NAME
+        HELPERS_NAME,
+        exportMode,
+        detectWrappedDefault,
+        defaultIsModuleExports
       );
 
-  const importBlock = rewriteRequireExpressionsAndGetImportBlock(
-    magicString,
-    topLevelDeclarations,
-    topLevelRequireDeclarators,
-    reassignedNames,
-    uses.commonjsHelpers && HELPERS_NAME,
-    dynamicRegisterSources
-  );
-
   if (shouldWrap) {
-    wrapCode(magicString, uses, moduleName, HELPERS_NAME, virtualDynamicRequirePath);
+    wrapCode(magicString, uses, moduleName, exportsName);
   }
 
   magicString
@@ -1588,6 +1676,8 @@ function commonjs(options = {}) {
       : Array.isArray(esmExternals)
       ? ((esmExternalIds = new Set(esmExternals)), (id) => esmExternalIds.has(id))
       : () => esmExternals;
+  const defaultIsModuleExports =
+    typeof options.defaultIsModuleExports === 'boolean' ? options.defaultIsModuleExports : 'auto';
 
   const { dynamicRequireModuleSet, dynamicRequireModuleDirPaths } = getDynamicRequirePaths(
     options.dynamicRequireTargets
@@ -1599,6 +1689,7 @@ function commonjs(options = {}) {
 
   const esModulesWithDefaultExport = new Set();
   const esModulesWithNamedExports = new Set();
+  const commonJsMetaPromises = new Map();
 
   const ignoreRequire =
     typeof options.ignore === 'function'
@@ -1651,13 +1742,11 @@ function commonjs(options = {}) {
       return { meta: { commonjs: { isCommonJS: false } } };
     }
 
-    let disableWrap = false;
-
-    // avoid wrapping in createCommonjsModule, as this is a commonjsRegister call
-    if (isModuleRegisterProxy(id)) {
-      disableWrap = true;
+    // avoid wrapping as this is a commonjsRegister call
+    const disableWrap = isWrappedId(id, DYNAMIC_REGISTER_SUFFIX);
+    if (disableWrap) {
       // eslint-disable-next-line no-param-reassign
-      id = unwrapModuleRegisterProxy(id);
+      id = unwrapId(id, DYNAMIC_REGISTER_SUFFIX);
     }
 
     return transformCommonjs(
@@ -1674,7 +1763,8 @@ function commonjs(options = {}) {
       dynamicRequireModuleSet,
       disableWrap,
       commonDir,
-      ast
+      ast,
+      defaultIsModuleExports
     );
   }
 
@@ -1701,6 +1791,39 @@ function commonjs(options = {}) {
         return getSpecificHelperProxy(id);
       }
 
+      if (isWrappedId(id, MODULE_SUFFIX)) {
+        const actualId = unwrapId(id, MODULE_SUFFIX);
+        let name = getName(actualId);
+        let code;
+        if (isDynamicRequireModulesEnabled) {
+          if (['modulePath', 'commonjsRequire', 'createModule'].includes(name)) {
+            name = `${name}_`;
+          }
+          code =
+            `import {commonjsRequire, createModule} from "${HELPERS_ID}";\n` +
+            `var ${name} = createModule(${JSON.stringify(
+              getVirtualPathForDynamicRequirePath(dirname(actualId), commonDir)
+            )});\n` +
+            `export {${name} as __module}`;
+        } else {
+          code = `var ${name} = {exports: {}}; export {${name} as __module}`;
+        }
+        return {
+          code,
+          syntheticNamedExports: '__module',
+          meta: { commonjs: { isCommonJS: false } }
+        };
+      }
+
+      if (isWrappedId(id, EXPORTS_SUFFIX)) {
+        const actualId = unwrapId(id, EXPORTS_SUFFIX);
+        const name = getName(actualId);
+        return {
+          code: `var ${name} = {}; export {${name} as __exports}`,
+          meta: { commonjs: { isCommonJS: false } }
+        };
+      }
+
       if (isWrappedId(id, EXTERNAL_SUFFIX)) {
         const actualId = unwrapId(id, EXTERNAL_SUFFIX);
         return getUnknownRequireProxy(
@@ -1721,9 +1844,9 @@ function commonjs(options = {}) {
         return `export default require(${JSON.stringify(normalizePathSlashes(id))});`;
       }
 
-      if (isModuleRegisterProxy(id)) {
+      if (isWrappedId(id, DYNAMIC_REGISTER_SUFFIX)) {
         return getDynamicRequireProxy(
-          normalizePathSlashes(unwrapModuleRegisterProxy(id)),
+          normalizePathSlashes(unwrapId(id, DYNAMIC_REGISTER_SUFFIX)),
           commonDir
         );
       }
@@ -1734,7 +1857,8 @@ function commonjs(options = {}) {
           actualId,
           getRequireReturnsDefault(actualId),
           esModulesWithDefaultExport,
-          esModulesWithNamedExports
+          esModulesWithNamedExports,
+          commonJsMetaPromises
         );
       }
 
@@ -1744,8 +1868,8 @@ function commonjs(options = {}) {
     transform(code, rawId) {
       let id = rawId;
 
-      if (isModuleRegisterProxy(id)) {
-        id = unwrapModuleRegisterProxy(id);
+      if (isWrappedId(id, DYNAMIC_REGISTER_SUFFIX)) {
+        id = unwrapId(id, DYNAMIC_REGISTER_SUFFIX);
       }
 
       const extName = extname(id);
@@ -1765,16 +1889,12 @@ function commonjs(options = {}) {
       }
     },
 
-    // eslint-disable-next-line no-shadow
-    moduleParsed({ id, meta: { commonjs } }) {
-      if (commonjs) {
-        const isCjs = commonjs.isCommonJS;
-        if (isCjs != null) {
-          setIsCjsPromise(id, isCjs);
-          return;
-        }
+    moduleParsed({ id, meta: { commonjs: commonjsMeta } }) {
+      if (commonjsMeta && commonjsMeta.isCommonJS != null) {
+        setCommonJSMetaPromise(commonJsMetaPromises, id, commonjsMeta);
+        return;
       }
-      setIsCjsPromise(id, null);
+      setCommonJSMetaPromise(commonJsMetaPromises, id, null);
     }
   };
 }