@rollup/plugin-commonjs 22.0.0-0 → 22.0.0-1

package/dist/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-0";
+var version = "22.0.0-1";
 var peerDependencies = {
 	rollup: "^2.60.0"
 };
@@ -487,6 +487,13 @@ function resolveExtensions(importee, importer, extensions) {
 
 function getResolveId(extensions) {
   return async function resolveId(importee, importer, resolveOptions) {
+    if (
+      resolveOptions.custom &&
+      resolveOptions.custom.commonjs &&
+      resolveOptions.custom.commonjs.skipResolver
+    ) {
+      return null;
+    }
     if (isWrappedId(importee, WRAPPED_SUFFIX)) {
       return unwrapId(importee, WRAPPED_SUFFIX);
     }
@@ -506,7 +513,7 @@ function getResolveId(extensions) {
     if (importer) {
       if (
         importer === DYNAMIC_MODULES_ID ||
-        // Except for exports, proxies are only importing resolved ids, no need to resolve again
+        // Proxies are only importing resolved ids, no need to resolve again
         isWrappedId(importer, PROXY_SUFFIX) ||
         isWrappedId(importer, ES_IMPORT_SUFFIX)
       ) {
@@ -555,9 +562,10 @@ function getResolveRequireSourcesAndGetMeta(extensions, detectCyclesAndCondition
   const knownCjsModuleTypes = Object.create(null);
   const requiredIds = Object.create(null);
   const unconditionallyRequiredIds = Object.create(null);
-  const dependentModules = Object.create(null);
-  const getDependentModules = (id) =>
-    dependentModules[id] || (dependentModules[id] = Object.create(null));
+  const parentModules = Object.create(null);
+  const childModules = Object.create(null);
+  const getParentModules = (id) => parentModules[id] || (parentModules[id] = Object.create(null));
+  const getChildModules = (id) => childModules[id] || (childModules[id] = Object.create(null));
 
   return {
     getWrappedIds: () =>
@@ -587,7 +595,8 @@ function getResolveRequireSourcesAndGetMeta(extensions, detectCyclesAndCondition
           const resolved =
             (await rollupContext.resolve(source, parentId, {
               custom: {
-                'node-resolve': { isRequire: true }
+                'node-resolve': { isRequire: true },
+                commonjs: { skipResolver: true }
               }
             })) || resolveExtensions(source, parentId, extensions);
           if (!resolved) {
@@ -606,20 +615,38 @@ function getResolveRequireSourcesAndGetMeta(extensions, detectCyclesAndCondition
           ) {
             unconditionallyRequiredIds[childId] = true;
           }
-          const parentDependentModules = getDependentModules(parentId);
-          const childDependentModules = getDependentModules(childId);
-          childDependentModules[parentId] = true;
+          const parentDependentModules = getParentModules(parentId);
+          const childDependentModules = getParentModules(childId);
+
+          // Copy the parents of the current parent to the child
           for (const dependentId of Object.keys(parentDependentModules)) {
             childDependentModules[dependentId] = true;
           }
+
+          // Add the current parent to the child as well. If the child module already has known
+          // dependencies because it has already been loaded, add the current parent module to their
+          // parent modules
+          childDependentModules[parentId] = true;
+          const dependenciesToUpdate = new Set(Object.keys(getChildModules(childId)));
+          for (const dependencyId of dependenciesToUpdate) {
+            getParentModules(dependencyId)[parentId] = true;
+            for (const subDependencyId of Object.keys(getChildModules(dependencyId))) {
+              dependenciesToUpdate.add(subDependencyId);
+            }
+          }
+
+          // Add the child as a dependency to the parent
+          getChildModules(parentId)[childId] = true;
+
+          // If we depend on one of our dependencies, we have a cycle. Then all modules that
+          // we depend on that also depend on the same module are part of a cycle as well. Trying
+          // to wait for loading this module would lead to a deadlock.
           if (parentDependentModules[childId]) {
-            // If we depend on one of our dependencies, we have a cycle. Then all modules that
-            // we depend on that also depend on the same module are part of a cycle as well.
             if (detectCyclesAndConditional && isParentCommonJS) {
               knownCjsModuleTypes[parentId] = IS_WRAPPED_COMMONJS;
               knownCjsModuleTypes[childId] = IS_WRAPPED_COMMONJS;
               for (const dependentId of Object.keys(parentDependentModules)) {
-                if (getDependentModules(dependentId)[childId]) {
+                if (getParentModules(dependentId)[childId]) {
                   knownCjsModuleTypes[dependentId] = IS_WRAPPED_COMMONJS;
                 }
               }