esm: fix loading of CJS modules from ESM

aduh95 · RafaelGSS · commit 8acbe6d8e8ca · 2023-09-07T09:15:49.000-03:00
PR-URL: #49500 Fixes: #49497 Reviewed-By: Stephen Belanger <admin@stephenbelanger.com> Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com> Reviewed-By: Jacob Smith <jacob@frende.me>
diff --git a/lib/internal/modules/esm/translators.js b/lib/internal/modules/esm/translators.js
@@ -279,7 +279,8 @@ translators.set('commonjs', async function commonjsStrategy(url, source,
   // obtained by calling the monkey-patchable CJS loader.
   const cjsLoader = source == null ? (module, source, url, filename) => {
     try {
-      module.load(filename);
+      assert(module === CJSModule._cache[filename]);
+      CJSModule._load(filename);
     } catch (err) {
       enrichCJSError(err, source, url);
       throw err;
diff --git a/test/es-module/test-esm-recursive-cjs-dependencies.mjs b/test/es-module/test-esm-recursive-cjs-dependencies.mjs
@@ -0,0 +1,7 @@
+import '../common/index.mjs';
+import { strictEqual } from 'node:assert';
+
+import '../fixtures/recursive-a.cjs';
+
+strictEqual(global.counter, 1);
+delete global.counter;
diff --git a/test/fixtures/recursive-a.cjs b/test/fixtures/recursive-a.cjs
@@ -0,0 +1,6 @@
+'use strict';
+
+global.counter ??= 0;
+global.counter++;
+
+require('./recursive-b.cjs');
diff --git a/test/fixtures/recursive-b.cjs b/test/fixtures/recursive-b.cjs
@@ -0,0 +1,3 @@
+'use strict';
+
+require('./recursive-a.cjs');

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+'use strict';`
	`2`	`+`
	`3`	`+require('./recursive-a.cjs');`