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

module: remove bogus assertion in CJS entrypoint handling with --import

Browse Source 
The synchronous CJS translator can handle entrypoints now, this
can be hit when --import is used, so lift the bogus assertions and
added tests.

PR-URL: https://github.com/nodejs/node/pull/54592
Fixes: https://github.com/nodejs/node/issues/54577
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
This commit is contained in:
Joyee Cheung 2024-08-27 17:49:25 +02:00
parent d17fefcd71
commit 3c4ef343ee
2 changed files with 103 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -240,11 +240,9 @@ function createCJSModuleWrap(url, source, isMain, loadCJS = loadCJSModule) {
translators.set('commonjs-sync', function requireCommonJS(url, source, isMain) {
initCJSParseSync();
assert(!isMain); // This is only used by imported CJS modules.
return createCJSModuleWrap(url, source, isMain, (module, source, url, filename, isMain) => {
assert(module === CJSModule._cache[filename]);
assert(!isMain);
wrapModuleLoad(filename, null, isMain);
});
});

159
test/es-module/test-require-module-preload.js
View File

@ -1,70 +1,117 @@
'use strict';
require('../common');
const { spawnSyncAndExitWithoutError } = require('../common/child_process');
const fixtures = require('../common/fixtures');
const { spawnSyncAndAssert } = require('../common/child_process');
const { fixturesDir } = require('../common/fixtures');
const stderr = /ExperimentalWarning: Support for loading ES Module in require/;
// Test named exports.
{
spawnSyncAndExitWithoutError(
process.execPath,
[ '--experimental-require-module', '-r', fixtures.path('../fixtures/es-module-loaders/module-named-exports.mjs') ],
{
stderr,
}
);
function testPreload(preloadFlag) {
// Test named exports.
{
spawnSyncAndAssert(
process.execPath,
[
'--experimental-require-module',
preloadFlag,
'./es-module-loaders/module-named-exports.mjs',
'./printA.js',
],
{
cwd: fixturesDir
},
{
stdout: 'A',
stderr,
trim: true,
}
);
}
// Test ESM that import ESM.
{
spawnSyncAndAssert(
process.execPath,
[
'--experimental-require-module',
preloadFlag,
'./es-modules/import-esm.mjs',
'./printA.js',
],
{
cwd: fixturesDir
},
{
stderr,
stdout: /^world\s+A$/,
trim: true,
}
);
}
// Test ESM that import CJS.
{
spawnSyncAndAssert(
process.execPath,
[
'--experimental-require-module',
preloadFlag,
'./es-modules/cjs-exports.mjs',
'./printA.js',
],
{
cwd: fixturesDir
},
{
stdout: /^ok\s+A$/,
stderr,
trim: true,
}
);
}
// Test ESM that require() CJS.
// Can't use the common/index.mjs here because that checks the globals, and
// -r injects a bunch of globals.
{
spawnSyncAndAssert(
process.execPath,
[
'--experimental-require-module',
preloadFlag,
'./es-modules/require-cjs.mjs',
'./printA.js',
],
{
cwd: fixturesDir
},
{
stdout: /^world\s+A$/,
stderr,
trim: true,
}
);
}
}
// Test ESM that import ESM.
{
spawnSyncAndExitWithoutError(
process.execPath,
[ '--experimental-require-module', '-r', fixtures.path('../fixtures/es-modules/import-esm.mjs') ],
{
stderr,
stdout: 'world',
trim: true,
}
);
}
testPreload('--require');
testPreload('--import');
// Test ESM that import CJS.
// Test "type": "module" and "main" field in package.json, this is only for --require because
// --import does not support extension-less preloads.
{
spawnSyncAndExitWithoutError(
spawnSyncAndAssert(
process.execPath,
[ '--experimental-require-module', '-r', fixtures.path('../fixtures/es-modules/cjs-exports.mjs') ],
[
'--experimental-require-module',
'--require',
'./es-modules/package-type-module',
'./printA.js',
],
{
stdout: 'ok',
stderr,
trim: true,
}
);
}
// Test ESM that require() CJS.
// Can't use the common/index.mjs here because that checks the globals, and
// -r injects a bunch of globals.
{
spawnSyncAndExitWithoutError(
process.execPath,
[ '--experimental-require-module', '-r', fixtures.path('../fixtures/es-modules/require-cjs.mjs') ],
{
stdout: 'world',
stderr,
trim: true,
}
);
}
// Test "type": "module" and "main" field in package.json.
{
spawnSyncAndExitWithoutError(
process.execPath,
[ '--experimental-require-module', '-r', fixtures.path('../fixtures/es-modules/package-type-module') ],
{
stdout: 'package-type-module',
cwd: fixturesDir
},
{
stdout: /^package-type-module\s+A$/,
stderr,
trim: true,
}