module: disallow CJS <-> ESM edges in a cycle from require(esm)

codebytere · codebytere · commit 46a118e72a3b · 2024-08-26T15:06:36.000-04:00
nodejs/node#52264
diff --git a/patches/node/pass_all_globals_through_require.patch b/patches/node/pass_all_globals_through_require.patch
@@ -6,10 +6,10 @@ Subject: Pass all globals through "require"
 (cherry picked from commit 7d015419cb7a0ecfe6728431a4ed2056cd411d62)
 
 diff --git a/lib/internal/modules/cjs/loader.js b/lib/internal/modules/cjs/loader.js
-index 7bbd59e16330b59f6c71aa8e6ff59659e42f6cee..276ab42c22b796ee07ce66744187adca6a8b8da4 100644
+index c284b39b1ac13eaea8776b7b4f457c084dce5fb8..e385702c708048593b51f75db0e00803383b2b42 100644
 --- a/lib/internal/modules/cjs/loader.js
 +++ b/lib/internal/modules/cjs/loader.js
-@@ -148,6 +148,13 @@ const {
+@@ -185,6 +185,13 @@ const {
    CHAR_FORWARD_SLASH,
  } = require('internal/constants');
  
@@ -23,8 +23,8 @@ index 7bbd59e16330b59f6c71aa8e6ff59659e42f6cee..276ab42c22b796ee07ce66744187adca
  const {
    isProxy,
  } = require('internal/util/types');
-@@ -1353,10 +1360,12 @@ Module.prototype._compile = function(content, filename) {
-   setHasStartedUserCJSExecution();
+@@ -1464,10 +1471,12 @@ Module.prototype._compile = function(content, filename, loadAsESM = false) {
+   this[kIsExecuting] = true;
    if (inspectorWrapper) {
      result = inspectorWrapper(compiledWrapper, thisValue, exports,
 -                              require, module, filename, dirname);
@@ -36,5 +36,6 @@ index 7bbd59e16330b59f6c71aa8e6ff59659e42f6cee..276ab42c22b796ee07ce66744187adca
 +                          [exports, require, module, filename,
 +                           dirname, process, localGlobal, localBuffer]);
    }
+   this[kIsExecuting] = false;
    if (requireDepth === 0) { statCache = null; }
-   return result;
+
