@rollup/plugin-commonjs 22.0.0-7 → 22.0.0-8

package/dist/cjs/index.js

@@ -16,7 +16,7 @@ var glob__default = /*#__PURE__*/_interopDefaultLegacy(glob);
 var MagicString__default = /*#__PURE__*/_interopDefaultLegacy(MagicString);
 var isReference__default = /*#__PURE__*/_interopDefaultLegacy(isReference);
 
-var version = "22.0.0-7";
+var version = "22.0.0-8";
 var peerDependencies = {
 	rollup: "^2.66.1"
 };
@@ -562,7 +562,13 @@ function getResolveId(extensions) {
     const resolved =
       (await this.resolve(importee, importer, Object.assign({ skipSelf: true }, resolveOptions))) ||
       resolveExtensions(importee, importer, extensions);
-    if (!resolved || resolved.external) {
+    // Make sure that even if other plugins resolve again, we ignore our own proxies
+    if (
+      !resolved ||
+      resolved.external ||
+      resolved.id.endsWith(ENTRY_SUFFIX) ||
+      isWrappedId(resolved.id, ES_IMPORT_SUFFIX)
+    ) {
       return resolved;
     }
     if (resolveOptions.isEntry) {
@@ -1830,6 +1836,8 @@ function ${requireName} () {
   };
 }
 
+const PLUGIN_NAME = 'commonjs';
+
 function commonjs(options = {}) {
   const {
     ignoreGlobal,
@@ -1965,7 +1973,7 @@ function commonjs(options = {}) {
   }
 
   return {
-    name: 'commonjs',
+    name: PLUGIN_NAME,
 
     version,
 
@@ -1973,7 +1981,7 @@ function commonjs(options = {}) {
       // We inject the resolver in the beginning so that "catch-all-resolver" like node-resolver
       // do not prevent our plugin from resolving entry points ot proxies.
       const plugins = Array.isArray(rawOptions.plugins)
-        ? rawOptions.plugins
+        ? [...rawOptions.plugins]
         : rawOptions.plugins
         ? [rawOptions.plugins]
         : [];