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

package/dist/index.es.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-1";
+var version = "22.0.0-2";
 var peerDependencies = {
 	rollup: "^2.60.0"
 };
@@ -478,10 +478,11 @@ function resolveExtensions(importee, importer, extensions) {
 
 function getResolveId(extensions) {
   return async function resolveId(importee, importer, resolveOptions) {
+    // We assume that all requires are pre-resolved
     if (
       resolveOptions.custom &&
-      resolveOptions.custom.commonjs &&
-      resolveOptions.custom.commonjs.skipResolver
+      resolveOptions.custom['node-resolve'] &&
+      resolveOptions.custom['node-resolve'].isRequire
     ) {
       return null;
     }
@@ -553,10 +554,39 @@ function getResolveRequireSourcesAndGetMeta(extensions, detectCyclesAndCondition
   const knownCjsModuleTypes = Object.create(null);
   const requiredIds = Object.create(null);
   const unconditionallyRequiredIds = 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));
+  const dependencies = Object.create(null);
+  const getDependencies = (id) => dependencies[id] || (dependencies[id] = new Set());
+
+  const isCyclic = (id) => {
+    const dependenciesToCheck = new Set(getDependencies(id));
+    for (const dependency of dependenciesToCheck) {
+      if (dependency === id) {
+        return true;
+      }
+      for (const childDependency of getDependencies(dependency)) {
+        dependenciesToCheck.add(childDependency);
+      }
+    }
+    return false;
+  };
+
+  const fullyAnalyzedModules = Object.create(null);
+
+  const getTypeForFullyAnalyzedModule = (id) => {
+    const knownType = knownCjsModuleTypes[id];
+    if (
+      knownType === IS_WRAPPED_COMMONJS ||
+      !detectCyclesAndConditional ||
+      fullyAnalyzedModules[id]
+    ) {
+      return knownType;
+    }
+    fullyAnalyzedModules[id] = true;
+    if (isCyclic(id)) {
+      return (knownCjsModuleTypes[id] = IS_WRAPPED_COMMONJS);
+    }
+    return knownType;
+  };
 
   return {
     getWrappedIds: () =>
@@ -569,8 +599,9 @@ function getResolveRequireSourcesAndGetMeta(extensions, detectCyclesAndCondition
       isParentCommonJS,
       sources
     ) => {
-      knownCjsModuleTypes[parentId] = knownCjsModuleTypes[parentId] || isParentCommonJS;
+      knownCjsModuleTypes[parentId] = isParentCommonJS;
       if (
+        detectCyclesAndConditional &&
         knownCjsModuleTypes[parentId] &&
         requiredIds[parentId] &&
         !unconditionallyRequiredIds[parentId]
@@ -585,10 +616,7 @@ function getResolveRequireSourcesAndGetMeta(extensions, detectCyclesAndCondition
           }
           const resolved =
             (await rollupContext.resolve(source, parentId, {
-              custom: {
-                'node-resolve': { isRequire: true },
-                commonjs: { skipResolver: true }
-              }
+              custom: { 'node-resolve': { isRequire: true } }
             })) || resolveExtensions(source, parentId, extensions);
           if (!resolved) {
             return { id: wrapId(source, EXTERNAL_SUFFIX), allowProxy: false };
@@ -598,62 +626,25 @@ function getResolveRequireSourcesAndGetMeta(extensions, detectCyclesAndCondition
             return { id: wrapId(childId, EXTERNAL_SUFFIX), allowProxy: false };
           }
           requiredIds[childId] = true;
-          if (
-            !(
-              detectCyclesAndConditional &&
-              (isConditional || knownCjsModuleTypes[parentId] === IS_WRAPPED_COMMONJS)
-            )
-          ) {
+          if (!(isConditional || knownCjsModuleTypes[parentId] === IS_WRAPPED_COMMONJS)) {
             unconditionallyRequiredIds[childId] = 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 (detectCyclesAndConditional && isParentCommonJS) {
-              knownCjsModuleTypes[parentId] = IS_WRAPPED_COMMONJS;
-              knownCjsModuleTypes[childId] = IS_WRAPPED_COMMONJS;
-              for (const dependentId of Object.keys(parentDependentModules)) {
-                if (getParentModules(dependentId)[childId]) {
-                  knownCjsModuleTypes[dependentId] = IS_WRAPPED_COMMONJS;
-                }
-              }
-            }
-          } else {
+          getDependencies(parentId).add(childId);
+          if (!isCyclic(childId)) {
             // This makes sure the current transform handler waits for all direct dependencies to be
             // loaded and transformed and therefore for all transitive CommonJS dependencies to be
             // loaded as well so that all cycles have been found and knownCjsModuleTypes is reliable.
             await rollupContext.load(resolved);
+          } else if (detectCyclesAndConditional && knownCjsModuleTypes[parentId]) {
+            knownCjsModuleTypes[parentId] = IS_WRAPPED_COMMONJS;
           }
           return { id: childId, allowProxy: true };
         })
       );
       return {
         requireTargets: requireTargets.map(({ id: dependencyId, allowProxy }, index) => {
-          const isCommonJS = knownCjsModuleTypes[dependencyId];
+          const isCommonJS = getTypeForFullyAnalyzedModule(dependencyId);
           return {
             source: sources[index].source,
             id: allowProxy
@@ -664,7 +655,7 @@ function getResolveRequireSourcesAndGetMeta(extensions, detectCyclesAndCondition
             isCommonJS
           };
         }),
-        usesRequireWrapper: knownCjsModuleTypes[parentId] === IS_WRAPPED_COMMONJS
+        usesRequireWrapper: getTypeForFullyAnalyzedModule(parentId) === IS_WRAPPED_COMMONJS
       };
     }
   };
@@ -1425,7 +1416,7 @@ async function transformCommonjs(
             isRequire(node.callee.object, scope) &&
             node.callee.property.name === 'resolve'
           ) {
-            checkDynamicRequire();
+            checkDynamicRequire(node.start);
             uses.require = true;
             const requireNode = node.callee.object;
             magicString.appendLeft(
@@ -1447,6 +1438,7 @@ async function transformCommonjs(
 
           if (hasDynamicArguments(node)) {
             if (isDynamicRequireModulesEnabled) {
+              checkDynamicRequire(node.start);
               magicString.appendLeft(
                 node.end - 1,
                 `, ${JSON.stringify(
@@ -1455,7 +1447,6 @@ async function transformCommonjs(
               );
             }
             if (!ignoreDynamicRequires) {
-              checkDynamicRequire();
               replacedDynamicRequires.push(node.callee);
             }
             return;
@@ -1513,7 +1504,6 @@ async function transformCommonjs(
                 return;
               }
               if (!ignoreDynamicRequires) {
-                checkDynamicRequire();
                 if (isShorthandProperty(parent)) {
                   magicString.prependRight(node.start, 'require: ');
                 }
@@ -1858,16 +1848,19 @@ function commonjs(options = {}) {
       !isEsModule &&
       (dynamicRequireModules.has(normalizePathSlashes(id)) || strictRequiresFilter(id));
 
-    const checkDynamicRequire = () => {
+    const checkDynamicRequire = (position) => {
       if (id.indexOf(dynamicRequireRoot) !== 0) {
-        this.error({
-          code: 'DYNAMIC_REQUIRE_OUTSIDE_ROOT',
-          id,
-          dynamicRequireRoot,
-          message: `"${id}" contains dynamic require statements but it is not within the current dynamicRequireRoot "${dynamicRequireRoot}". You should set dynamicRequireRoot to "${dirname(
-            id
-          )}" or one of its parent directories.`
-        });
+        this.error(
+          {
+            code: 'DYNAMIC_REQUIRE_OUTSIDE_ROOT',
+            id,
+            dynamicRequireRoot,
+            message: `"${id}" contains dynamic require statements but it is not within the current dynamicRequireRoot "${dynamicRequireRoot}". You should set dynamicRequireRoot to "${dirname(
+              id
+            )}" or one of its parent directories.`
+          },
+          position
+        );
       }
     };