Nodejs/node
1
0
Fork 0
mirror of https://github.com/nodejs/node.git synced 2024-11-21 10:59:27 +00:00
Code Issues Actions 25 Packages Projects Releases Wiki Activity

esm: fix loading of CJS modules from ESM

Browse Source 
PR-URL: https://github.com/nodejs/node/pull/49500
Fixes: https://github.com/nodejs/node/issues/49497
Reviewed-By: Stephen Belanger <admin@stephenbelanger.com>
Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>
Reviewed-By: Jacob Smith <jacob@frende.me>
This commit is contained in:
Antoine du Hamel 2023-09-06 12:12:14 +02:00 committed by GitHub
parent cfe4166f0f
commit fdc65d9769
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/internal/modules/esm/translators.js
View File

@ -279,7 +279,8 @@ translators.set('commonjs', async function commonjsStrategy(url, source,
// obtained by calling the monkey-patchable CJS loader. // obtained by calling the monkey-patchable CJS loader.
const cjsLoader = source == null ? (module, source, url, filename) => { const cjsLoader = source == null ? (module, source, url, filename) => {
try { try {
module.load(filename); assert(module === CJSModule._cache[filename]);
CJSModule._load(filename);
} catch (err) { } catch (err) {
enrichCJSError(err, source, url); enrichCJSError(err, source, url);
throw err; throw err;

7
test/es-module/test-esm-recursive-cjs-dependencies.mjs Normal file
View File

@ -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;

6
test/fixtures/recursive-a.cjs vendored Normal file
View File

@ -0,0 +1,6 @@
'use strict';
global.counter ??= 0;
global.counter++;
require('./recursive-b.cjs');

3
test/fixtures/recursive-b.cjs vendored Normal file
View File

@ -0,0 +1,3 @@
'use strict';
require('./recursive-a.cjs');