diff options
author | Guy Bedford <guybedford@gmail.com> | 2017-10-11 15:45:21 +0200 |
---|---|---|
committer | Michaël Zasso <targos@protonmail.com> | 2017-10-21 10:45:40 -0700 |
commit | fe4675b301f0e3e26dcb88ef9f68fe35403330a0 (patch) | |
tree | 5857d5b4f56dc297dc5865fd311c5307ac80695a /test/fixtures/es-module-loaders | |
parent | c4c63812822fc973cb3d4bb4040729213dcaa620 (diff) | |
download | android-node-v8-fe4675b301f0e3e26dcb88ef9f68fe35403330a0.tar.gz android-node-v8-fe4675b301f0e3e26dcb88ef9f68fe35403330a0.tar.bz2 android-node-v8-fe4675b301f0e3e26dcb88ef9f68fe35403330a0.zip |
module: fix main resolution and not found updates
This simplifies the top-level load when ES modules are enabled
as we can entirely delegate the module resolver, which will hand
over to CommonJS where appropriate.
All not found errors are made consistent to throw during resolve
and have the MODULE_NOT_FOUND code.
Includes the test case from https://github.com/nodejs/node/pull/15736.
Fixes: https://github.com/nodejs/node/issues/15732
PR-URL: https://github.com/nodejs/node/pull/16147
Reviewed-By: Franziska Hinkelmann <franziska.hinkelmann@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Diffstat (limited to 'test/fixtures/es-module-loaders')
-rw-r--r-- | test/fixtures/es-module-loaders/not-found-assert-loader.mjs | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/test/fixtures/es-module-loaders/not-found-assert-loader.mjs b/test/fixtures/es-module-loaders/not-found-assert-loader.mjs new file mode 100644 index 0000000000..7718cc7c4b --- /dev/null +++ b/test/fixtures/es-module-loaders/not-found-assert-loader.mjs @@ -0,0 +1,22 @@ +import assert from 'assert'; + +// a loader that asserts that the defaultResolve will throw "not found" +// (skipping the top-level main of course) +let mainLoad = true; +export async function resolve (specifier, base, defaultResolve) { + if (mainLoad) { + mainLoad = false; + return defaultResolve(specifier, base); + } + try { + await defaultResolve(specifier, base); + } + catch (e) { + assert.equal(e.code, 'MODULE_NOT_FOUND'); + return { + format: 'builtin', + url: 'fs' + }; + } + assert.fail(`Module resolution for ${specifier} should be throw MODULE_NOT_FOUND`); +} |