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

package/README.md

@@ -51,9 +51,9 @@ When used together with the node-resolve plugin
 Type: `"auto" | boolean | "debug" | string[]`<br>
 Default: `"auto"`
 
-By default, this plugin will try to hoist `require` statements as imports to the top of each file. While this works well for many code bases and allows for very efficient ESM output, it does not perfectly capture CommonJS semantics as the order of side effects like log statements may change. But it is especially problematic when there are circular `require` calls between CommonJS modules as those often rely on the lazy execution of nested `require` calls.
+By default, this plugin will try to hoist `require` statements as imports to the top of each file. While this works well for many code bases and allows for very efficient ESM output, it does not perfectly capture CommonJS semantics as the initialisation order of required modules will be different. The resultant side effects can include log statements being emitted in a different order, and some code that is dependent on the initialisation order of polyfills in require statements may not work. But it is especially problematic when there are circular `require` calls between CommonJS modules as those often rely on the lazy execution of nested `require` calls.
 
-Setting this option to `true` will wrap all CommonJS files in functions which are executed when they are required for the first time, preserving NodeJS semantics. Note that this can have an impact on the size and performance of the generated code.
+Setting this option to `true` will wrap all CommonJS files in functions which are executed when they are required for the first time, preserving NodeJS semantics. This is the safest setting and should be used if the generated code does not work correctly with `"auto"`. Note that `strictRequires: true` can have a small impact on the size and performance of generated code, but less so if the code is minified.
 
 The default value of `"auto"` will only wrap CommonJS files when they are part of a CommonJS dependency cycle, e.g. an index file that is required by some of its dependencies, or if they are only required in a potentially "conditional" way like from within an if-statement or a function. All other CommonJS files are hoisted. This is the recommended setting for most code bases. Note that the detection of conditional requires can be subject to race conditions if there are both conditional and unconditional requires of the same file, which in edge cases may result in inconsistencies between builds. If you think this is a problem for you, you can avoid this by using any value other than `"auto"` or `"debug"`.
 

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-0";
+var version = "22.0.0-1";
 var peerDependencies = {
 	rollup: "^2.60.0"
 };
@@ -478,6 +478,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);
     }
@@ -497,7 +504,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)
       ) {
@@ -546,9 +553,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: () =>
@@ -578,7 +586,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) {
@@ -597,20 +606,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;
                 }
               }