Commit e683077
module: fix hook module CJS dependency loading
It can be useful to load dependencies as part of the loader hook
definition file. This fixes a bug where `import x from 'x'` would
always return `x` as `undefined` if the import was made in a loader
hooks definition module.
A parallel change to the CJS loading injection process meant that the
CJS module wasn't being injected into the correct loader instance,
which is corrected here with a test.
PR-URL: #16381
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Michaël Zasso <targos@protonmail.com>1 parent b1e2a38 commit e683077
4 files changed
Lines changed: 15 additions & 1 deletion
File tree
- lib
- test
- es-module
- fixtures/es-module-loaders
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -447,7 +447,8 @@ Module._load = function(request, parent, isMain) { | |||
| 447 | 447 | ESMLoader = new Loader(); | |
| 448 | 448 | const userLoader = process.binding('config').userLoader; | |
| 449 | 449 | if (userLoader) { | |
| 450 | - const hooks = await new Loader().import(userLoader); | ||
| 450 | + const hooks = await ESMLoader.import(userLoader); | ||
| 451 | + ESMLoader = new Loader(); | ||
| 451 | 452 | ESMLoader.hook(hooks); | |
| 452 | 453 | } | |
| 453 | 454 | } | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -0,0 +1,5 @@ | |||
| 1 | + // Flags: --experimental-modules --loader ./test/fixtures/es-module-loaders/loader-with-dep.mjs | ||
| 2 | + /* eslint-disable required-modules */ | ||
| 3 | + import './test-esm-ok.mjs'; | ||
| 4 | + | ||
| 5 | + // We just test that this module doesn't fail loading | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -0,0 +1 @@ | |||
| 1 | + exports.format = 'esm'; | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -0,0 +1,7 @@ | |||
| 1 | + import dep from './loader-dep.js'; | ||
| 2 | + export function resolve (specifier, base, defaultResolve) { | ||
| 3 | + return { | ||
| 4 | + url: defaultResolve(specifier, base).url, | ||
| 5 | + format: dep.format | ||
| 6 | + }; | ||
| 7 | + } | ||
0 commit comments