@rollup/plugin-commonjs 22.0.0 → 22.0.1

package/dist/es/index.js

@@ -7,7 +7,7 @@ import { walk } from 'estree-walker';
 import MagicString from 'magic-string';
 import isReference from 'is-reference';
 
-var version = "22.0.0";
+var version = "22.0.1";
 var peerDependencies = {
 	rollup: "^2.68.0"
 };
@@ -489,7 +489,7 @@ function resolveExtensions(importee, importer, extensions) {
   return undefined;
 }
 
-function getResolveId(extensions) {
+function getResolveId(extensions, isPossibleCjsId) {
   const currentlyResolving = new Map();
 
   return {
@@ -581,21 +581,27 @@ function getResolveId(extensions) {
         !resolved ||
         resolved.external ||
         resolved.id.endsWith(ENTRY_SUFFIX) ||
-        isWrappedId(resolved.id, ES_IMPORT_SUFFIX)
+        isWrappedId(resolved.id, ES_IMPORT_SUFFIX) ||
+        !isPossibleCjsId(resolved.id)
       ) {
         return resolved;
       }
       const moduleInfo = await this.load(resolved);
-      if (resolveOptions.isEntry) {
-        moduleInfo.moduleSideEffects = true;
-        // We must not precede entry proxies with a `\0` as that will mess up relative external resolution
-        return resolved.id + ENTRY_SUFFIX;
-      }
       const {
         meta: { commonjs: commonjsMeta }
       } = moduleInfo;
-      if (commonjsMeta && commonjsMeta.isCommonJS === IS_WRAPPED_COMMONJS) {
-        return { id: wrapId(resolved.id, ES_IMPORT_SUFFIX), meta: { commonjs: { resolved } } };
+      if (commonjsMeta) {
+        const { isCommonJS } = commonjsMeta;
+        if (isCommonJS) {
+          if (resolveOptions.isEntry) {
+            moduleInfo.moduleSideEffects = true;
+            // We must not precede entry proxies with a `\0` as that will mess up relative external resolution
+            return resolved.id + ENTRY_SUFFIX;
+          }
+          if (isCommonJS === IS_WRAPPED_COMMONJS) {
+            return { id: wrapId(resolved.id, ES_IMPORT_SUFFIX), meta: { commonjs: { resolved } } };
+          }
+        }
       }
       return resolved;
     }
@@ -1945,6 +1951,11 @@ function commonjs(options = {}) {
   } = options;
   const extensions = options.extensions || ['.js'];
   const filter = createFilter(options.include, options.exclude);
+  const isPossibleCjsId = (id) => {
+    const extName = extname(id);
+    return extName === '.cjs' || (extensions.includes(extName) && filter(id));
+  };
+
   const { strictRequiresFilter, detectCyclesAndConditional } = getStrictRequiresFilter(options);
 
   const getRequireReturnsDefault =
@@ -1999,7 +2010,7 @@ function commonjs(options = {}) {
     };
   };
 
-  const { currentlyResolving, resolveId } = getResolveId(extensions);
+  const { currentlyResolving, resolveId } = getResolveId(extensions, isPossibleCjsId);
 
   const sourceMap = options.sourceMap !== false;
 
@@ -2195,10 +2206,7 @@ function commonjs(options = {}) {
     },
 
     transform(code, id) {
-      const extName = extname(id);
-      if (extName !== '.cjs' && (!filter(id) || !extensions.includes(extName))) {
-        return null;
-      }
+      if (!isPossibleCjsId(id)) return null;
 
       try {
         return transformAndCheckExports.call(this, code, id);