@rollup/plugin-commonjs 17.1.0 → 18.1.0

package/dist/index.js

@@ -135,18 +135,20 @@ 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 (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.');
+export function commonjsRequire (path) {
+	${FAILED_REQUIRE_ERROR}
 }
 `;
 
-const HELPERS_DYNAMIC = `
+const getDynamicHelpers = (ignoreDynamicRequires) => `
 export function createCommonjsModule(fn, basedir, module) {
 	return module = {
 		path: basedir,
@@ -318,15 +320,17 @@ export function commonjsRequire (path, originalModuleDir) {
       return cachedModule.exports;
     };
 	}
-	return require(path);
+	${ignoreDynamicRequires ? 'return require(path);' : FAILED_REQUIRE_ERROR}
 }
 
 commonjsRequire.cache = DYNAMIC_REQUIRE_CACHE;
 commonjsRequire.resolve = commonjsResolve;
 `;
 
-function getHelpersModule(isDynamicRequireModulesEnabled) {
-  return `${HELPERS}${isDynamicRequireModulesEnabled ? HELPERS_DYNAMIC : HELPER_NON_DYNAMIC}`;
+function getHelpersModule(isDynamicRequireModulesEnabled, ignoreDynamicRequires) {
+  return `${HELPERS}${
+    isDynamicRequireModulesEnabled ? getDynamicHelpers(ignoreDynamicRequires) : HELPER_NON_DYNAMIC
+  }`;
 }
 
 /* eslint-disable import/prefer-default-export */
@@ -456,9 +460,7 @@ function getDynamicRequirePaths(patterns) {
   return { dynamicRequireModuleSet, dynamicRequireModuleDirPaths };
 }
 
-const isCjsPromises = new Map();
-
-function getIsCjsPromise(id) {
+function getIsCjsPromise(isCjsPromises, id) {
   let isCjsPromise = isCjsPromises.get(id);
   if (isCjsPromise) return isCjsPromise.promise;
 
@@ -474,7 +476,7 @@ function getIsCjsPromise(id) {
   return promise;
 }
 
-function setIsCjsPromise(id, resolution) {
+function setIsCjsPromise(isCjsPromises, id, resolution) {
   const isCjsPromise = isCjsPromises.get(id);
   if (isCjsPromise) {
     if (isCjsPromise.resolve) {
@@ -528,10 +530,11 @@ async function getStaticRequireProxy(
   id,
   requireReturnsDefault,
   esModulesWithDefaultExport,
-  esModulesWithNamedExports
+  esModulesWithNamedExports,
+  isCjsPromises
 ) {
   const name = getName(id);
-  const isCjs = await getIsCjsPromise(id);
+  const isCjs = await getIsCjsPromise(isCjsPromises, id);
   if (isCjs) {
     return `import { __moduleExports } from ${JSON.stringify(id)}; export default __moduleExports;`;
   } else if (isCjs === null) {
@@ -805,7 +808,8 @@ function rewriteExportsAndGetExportsBlock(
   isRestorableCompiledEsm,
   code,
   uses,
-  HELPERS_NAME
+  HELPERS_NAME,
+  defaultIsModuleExports
 ) {
   const namedExportDeclarations = [`export { ${moduleName} as __moduleExports };`];
   const moduleExportsPropertyAssignments = [];
@@ -860,19 +864,29 @@ function rewriteExportsAndGetExportsBlock(
 
   // 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 {
+  if (defaultIsModuleExports === 'auto') {
+    if (isRestorableCompiledEsm) {
+      defaultExport.push(`export default ${deconflictedDefaultExportName || moduleName};`);
+    } else if (
+      (wrapped || deconflictedDefaultExportName) &&
+      (defineCompiledEsmExpressions.length > 0 || code.includes('__esModule'))
+    ) {
+      // 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};`);
+    }
+  } else if (defaultIsModuleExports === true) {
     defaultExport.push(`export default ${moduleName};`);
+  } else if (defaultIsModuleExports === false) {
+    if (deconflictedDefaultExportName) {
+      defaultExport.push(`export default ${deconflictedDefaultExportName};`);
+    } else {
+      defaultExport.push(`export default ${moduleName}.default;`);
+    }
   }
 
   return `\n\n${defaultExport
@@ -1120,13 +1134,15 @@ function transformCommonjs(
   isEsModule,
   ignoreGlobal,
   ignoreRequire,
+  ignoreDynamicRequires,
   getIgnoreTryCatchRequireStatementMode,
   sourceMap,
   isDynamicRequireModulesEnabled,
   dynamicRequireModuleSet,
   disableWrap,
   commonDir,
-  astCache
+  astCache,
+  defaultIsModuleExports
 ) {
   const ast = astCache || tryParse(parse, code, id);
   const magicString = new MagicString__default['default'](code);
@@ -1394,12 +1410,14 @@ function transformCommonjs(
                   )}`
                 );
               }
-              if (isShorthandProperty(parent)) {
-                magicString.appendRight(node.end, `: ${HELPERS_NAME}.commonjsRequire`);
-              } else {
-                magicString.overwrite(node.start, node.end, `${HELPERS_NAME}.commonjsRequire`, {
-                  storeName: true
-                });
+              if (!ignoreDynamicRequires) {
+                if (isShorthandProperty(parent)) {
+                  magicString.appendRight(node.end, `: ${HELPERS_NAME}.commonjsRequire`);
+                } else {
+                  magicString.overwrite(node.start, node.end, `${HELPERS_NAME}.commonjsRequire`, {
+                    storeName: true
+                  });
+                }
               }
 
               uses.commonjsHelpers = true;
@@ -1511,7 +1529,8 @@ function transformCommonjs(
       uses.exports ||
       uses.require ||
       uses.commonjsHelpers ||
-      hasRemovedRequire
+      hasRemovedRequire ||
+      isRestorableCompiledEsm
     ) &&
     (ignoreGlobal || !uses.global)
   ) {
@@ -1540,7 +1559,8 @@ function transformCommonjs(
         isRestorableCompiledEsm,
         code,
         uses,
-        HELPERS_NAME
+        HELPERS_NAME,
+        defaultIsModuleExports
       );
 
   const importBlock = rewriteRequireExpressionsAndGetImportBlock(
@@ -1574,6 +1594,7 @@ function commonjs(options = {}) {
   const filter = pluginutils.createFilter(options.include, options.exclude);
   const {
     ignoreGlobal,
+    ignoreDynamicRequires,
     requireReturnsDefault: requireReturnsDefaultOption,
     esmExternals
   } = options;
@@ -1588,6 +1609,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 +1622,7 @@ function commonjs(options = {}) {
 
   const esModulesWithDefaultExport = new Set();
   const esModulesWithNamedExports = new Set();
+  const isCjsPromises = new Map();
 
   const ignoreRequire =
     typeof options.ignore === 'function'
@@ -1627,6 +1651,7 @@ function commonjs(options = {}) {
 
   function transformAndCheckExports(code, id) {
     if (isDynamicRequireModulesEnabled && this.getModuleInfo(id).isEntry) {
+      // eslint-disable-next-line no-param-reassign
       code =
         getDynamicPackagesEntryIntro(dynamicRequireModuleDirPaths, dynamicRequireModuleSet) + code;
     }
@@ -1655,6 +1680,7 @@ function commonjs(options = {}) {
     // avoid wrapping in createCommonjsModule, as this is a commonjsRegister call
     if (isModuleRegisterProxy(id)) {
       disableWrap = true;
+      // eslint-disable-next-line no-param-reassign
       id = unwrapModuleRegisterProxy(id);
     }
 
@@ -1665,13 +1691,15 @@ function commonjs(options = {}) {
       isEsModule,
       ignoreGlobal || isEsModule,
       ignoreRequire,
+      ignoreDynamicRequires && !isDynamicRequireModulesEnabled,
       getIgnoreTryCatchRequireStatementMode,
       sourceMap,
       isDynamicRequireModulesEnabled,
       dynamicRequireModuleSet,
       disableWrap,
       commonDir,
-      ast
+      ast,
+      defaultIsModuleExports
     );
   }
 
@@ -1691,7 +1719,7 @@ function commonjs(options = {}) {
 
     load(id) {
       if (id === HELPERS_ID) {
-        return getHelpersModule(isDynamicRequireModulesEnabled);
+        return getHelpersModule(isDynamicRequireModulesEnabled, ignoreDynamicRequires);
       }
 
       if (id.startsWith(HELPERS_ID)) {
@@ -1731,7 +1759,8 @@ function commonjs(options = {}) {
           actualId,
           getRequireReturnsDefault(actualId),
           esModulesWithDefaultExport,
-          esModulesWithNamedExports
+          esModulesWithNamedExports,
+          isCjsPromises
         );
       }
 
@@ -1762,15 +1791,16 @@ 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);
+          setIsCjsPromise(isCjsPromises, id, isCjs);
           return;
         }
       }
-      setIsCjsPromise(id, null);
+      setIsCjsPromise(isCjsPromises, id, null);
     }
   };
 }