1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

esm: modify resolution order for specifier flag

Browse Source 
Currently `--es-module-specifier-resolution=node` has an alternative
resolution order than the default in common.js, this causes
inconsistencies. As discussed in @nodejs/modules we want to preserve
resolution order between implementations.

PR-URL: https://github.com/nodejs/node/pull/29974
Reviewed-By: Jan Krems <jan.krems@gmail.com>
Reviewed-By: Guy Bedford <guybedford@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
This commit is contained in:
Myles Borins 2019-10-14 13:28:42 -04:00 committed by Guy Bedford
parent a6b030d5ac
commit 1e5ed9a5db
4 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/internal/modules/esm/default_resolve.js
View File

@ -9,6 +9,8 @@ const { getOptionValue } = require('internal/options');
const preserveSymlinks = getOptionValue('--preserve-symlinks'); const preserveSymlinks = getOptionValue('--preserve-symlinks');
const preserveSymlinksMain = getOptionValue('--preserve-symlinks-main'); const preserveSymlinksMain = getOptionValue('--preserve-symlinks-main');
const experimentalJsonModules = getOptionValue('--experimental-json-modules'); const experimentalJsonModules = getOptionValue('--experimental-json-modules');
const esModuleSpecifierResolution =
getOptionValue('--es-module-specifier-resolution');
const typeFlag = getOptionValue('--input-type'); const typeFlag = getOptionValue('--input-type');
const experimentalWasmModules = getOptionValue('--experimental-wasm-modules'); const experimentalWasmModules = getOptionValue('--experimental-wasm-modules');
const { resolve: moduleWrapResolve, const { resolve: moduleWrapResolve,
@ -110,6 +112,8 @@ function resolve(specifier, parentURL) {
if (!format) { if (!format) {
if (isMain) if (isMain)
format = type === TYPE_MODULE ? 'module' : 'commonjs'; format = type === TYPE_MODULE ? 'module' : 'commonjs';
else if (esModuleSpecifierResolution === 'node')
format = 'commonjs';
else else
throw new ERR_UNKNOWN_FILE_EXTENSION(fileURLToPath(url)); throw new ERR_UNKNOWN_FILE_EXTENSION(fileURLToPath(url));
} }

5
src/module_wrap.cc
View File

@ -48,11 +48,10 @@ using v8::Undefined;
using v8::Value; using v8::Value;
static const char* const EXTENSIONS[] = { static const char* const EXTENSIONS[] = {
".mjs",
".cjs",
".js", ".js",
".json", ".json",
".node" ".node",
".mjs"
}; };
ModuleWrap::ModuleWrap(Environment* env, ModuleWrap::ModuleWrap(Environment* env,

6
test/es-module/test-esm-specifiers.mjs
View File

@ -1,5 +1,5 @@
// Flags: --experimental-modules --es-module-specifier-resolution=node // Flags: --experimental-modules --es-module-specifier-resolution=node
import { mustNotCall } from '../common'; import { mustNotCall } from '../common/index.mjs';
import assert from 'assert'; import assert from 'assert';
// commonJS index.js // commonJS index.js
@ -14,8 +14,8 @@ assert.strictEqual(commonjs, 'commonjs');
assert.strictEqual(module, 'module'); assert.strictEqual(module, 'module');
assert.strictEqual(success, 'success'); assert.strictEqual(success, 'success');
assert.strictEqual(explicit, 'esm'); assert.strictEqual(explicit, 'esm');
assert.strictEqual(implicit, 'esm'); assert.strictEqual(implicit, 'cjs');
assert.strictEqual(implicitModule, 'esm'); assert.strictEqual(implicitModule, 'cjs');
async function main() { async function main() {
try { try {

2
test/fixtures/es-module-specifiers/node_modules/implicit-main-type-module/entry.js generated vendored
View File

@ -1 +1 @@
export default 'nope'; export default 'cjs';