@rollup/plugin-commonjs 19.0.1 → 21.0.1

package/CHANGELOG.md

@@ -1,5 +1,37 @@
 # @rollup/plugin-commonjs ChangeLog
 
+## v21.0.1
+
+_2021-10-19_
+
+### Bugfixes
+
+- fix: pass on isEntry and custom resolve options (#1018)
+
+## v21.0.0
+
+_2021-10-01_
+
+### Breaking Changes
+
+- fix: use safe default value for ignoreTryCatch (#1005)
+
+## v20.0.0
+
+_2021-07-30_
+
+### Breaking Changes
+
+- fix: Correctly infer module name for any separator (#924)
+
+## v19.0.2
+
+_2021-07-26_
+
+### Bugfixes
+
+- fix convert module.exports with `__esModule` property(#939) (#942)
+
 ## v19.0.1
 
 _2021-07-15_

package/README.md

@@ -123,7 +123,7 @@ Sometimes you have to leave require statements unconverted. Pass an array contai
 ### `ignoreTryCatch`
 
 Type: `boolean | 'remove' | string[] | ((id: string) => boolean)`<br>
-Default: `false`
+Default: `true`
 
 In most cases, where `require` calls are inside a `try-catch` clause, they should be left unconverted as it requires an optional dependency that may or may not be installed beside the rolled up package.
 Due to the conversion of `require` to a static `import` - the call is hoisted to the top of the file, outside of the `try-catch` clause.
@@ -309,7 +309,9 @@ For these situations, you can change Rollup's behaviour either globally or per m
   import * as dep$1 from 'dep';
 
   function getDefaultExportFromNamespaceIfNotNamed(n) {
-    return n && Object.prototype.hasOwnProperty.call(n, 'default') && Object.keys(n).length === 1 ? n['default'] : n;
+    return n && Object.prototype.hasOwnProperty.call(n, 'default') && Object.keys(n).length === 1
+      ? n['default']
+      : n;
   }
 
   var dep = getDefaultExportFromNamespaceIfNotNamed(dep$1);

package/dist/index.es.js

@@ -1,4 +1,4 @@
-import { basename, extname, dirname, sep, join, resolve } from 'path';
+import { basename, extname, dirname, join, resolve, sep } from 'path';
 import { makeLegalIdentifier, attachScopes, extractAssignedNames, createFilter } from '@rollup/pluginutils';
 import getCommonDir from 'commondir';
 import { existsSync, readFileSync, statSync } from 'fs';
@@ -366,8 +366,7 @@ function getName(id) {
   if (name !== 'index') {
     return name;
   }
-  const segments = dirname(id).split(sep);
-  return makeLegalIdentifier(segments[segments.length - 1]);
+  return makeLegalIdentifier(basename(dirname(id)));
 }
 
 function normalizePathSlashes(path) {
@@ -587,7 +586,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;
     }
@@ -630,10 +629,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);
       }
@@ -779,6 +784,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 = [];
@@ -1254,6 +1273,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;
@@ -1678,7 +1709,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,
@@ -1873,5 +1906,5 @@ function commonjs(options = {}) {
   };
 }
 
-export default commonjs;
+export { commonjs as default };
 //# sourceMappingURL=index.es.js.map