@rollup/plugin-commonjs 19.0.1 → 21.0.1

package/dist/index.js

@@ -375,8 +375,7 @@ function getName(id) {
   if (name !== 'index') {
     return name;
   }
-  const segments = path.dirname(id).split(path.sep);
-  return pluginutils.makeLegalIdentifier(segments[segments.length - 1]);
+  return pluginutils.makeLegalIdentifier(path.basename(path.dirname(id)));
 }
 
 function normalizePathSlashes(path) {
@@ -456,7 +455,7 @@ function getDynamicRequirePaths(patterns) {
   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)) {
+    for (const path$1 of glob__default["default"].sync(isNegated ? pattern.substr(1) : pattern)) {
       modifySet(normalizePathSlashes(path.resolve(path$1)));
       if (isDirectory(path$1)) {
         modifySet(normalizePathSlashes(path.resolve(path.join(path$1, getPackageEntryPoint(path$1)))));
@@ -596,7 +595,7 @@ function getResolveId(extensions) {
     return undefined;
   }
 
-  return function resolveId(importee, rawImporter) {
+  return function resolveId(importee, rawImporter, resolveOptions) {
     if (isWrappedId(importee, MODULE_SUFFIX) || isWrappedId(importee, EXPORTS_SUFFIX)) {
       return importee;
     }
@@ -639,10 +638,16 @@ function getResolveId(extensions) {
       return null;
     }
 
-    return this.resolve(importee, importer, {
-      skipSelf: true,
-      custom: { 'node-resolve': { isRequire: isProxyModule || isRequiredModule } }
-    }).then((resolved) => {
+    return this.resolve(
+      importee,
+      importer,
+      Object.assign({}, resolveOptions, {
+        skipSelf: true,
+        custom: Object.assign({}, resolveOptions.custom, {
+          'node-resolve': { isRequire: isProxyModule || isRequiredModule }
+        })
+      })
+    ).then((resolved) => {
       if (!resolved) {
         resolved = resolveExtensions(importee, importer);
       }
@@ -788,6 +793,20 @@ function isShorthandProperty(parent) {
   return parent && parent.type === 'Property' && parent.shorthand;
 }
 
+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 = [];
@@ -1174,7 +1193,7 @@ function transformCommonjs(
   defaultIsModuleExports
 ) {
   const ast = astCache || tryParse(parse, code, id);
-  const magicString = new MagicString__default['default'](code);
+  const magicString = new MagicString__default["default"](code);
   const uses = {
     module: false,
     exports: false,
@@ -1263,6 +1282,18 @@ function transformCommonjs(
               } 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) {
               if (programDepth > 3) {
                 shouldWrap = true;
@@ -1421,7 +1452,7 @@ function transformCommonjs(
           return;
         case 'Identifier': {
           const { name } = node;
-          if (!(isReference__default['default'](node, parent) && !scope.contains(name))) return;
+          if (!(isReference__default["default"](node, parent) && !scope.contains(name))) return;
           switch (name) {
             case 'require':
               if (isNodeRequirePropertyAccess(parent)) {
@@ -1667,7 +1698,7 @@ function commonjs(options = {}) {
   );
   const isDynamicRequireModulesEnabled = dynamicRequireModuleSet.size > 0;
   const commonDir = isDynamicRequireModulesEnabled
-    ? getCommonDir__default['default'](null, Array.from(dynamicRequireModuleSet).concat(process.cwd()))
+    ? getCommonDir__default["default"](null, Array.from(dynamicRequireModuleSet).concat(process.cwd()))
     : null;
 
   const esModulesWithDefaultExport = new Set();
@@ -1687,7 +1718,9 @@ function commonjs(options = {}) {
         ? options.ignoreTryCatch(id)
         : Array.isArray(options.ignoreTryCatch)
         ? options.ignoreTryCatch.includes(id)
-        : options.ignoreTryCatch || false;
+        : typeof options.ignoreTryCatch !== 'undefined'
+        ? options.ignoreTryCatch
+        : true;
 
     return {
       canConvertRequire: mode !== 'remove' && mode !== true,