module: remove dynamicInstantiate loader hook #33501
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,9 @@ | ||
| // Flags: --experimental-loader ./test/fixtures/es-module-loaders/builtin-named-exports-loader.mjs | ||
| import '../common/index.mjs'; | ||
| import { readFile, __fromLoader } from 'fs'; | ||
| import assert from 'assert'; | ||
| import ok from '../fixtures/es-modules/test-esm-ok.mjs'; | ||
|
|
||
| assert(ok); | ||
| assert(readFile); | ||
| assert(__fromLoader); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,23 +1,62 @@ | ||
| import module from 'module'; | ||
|
|
||
| const GET_BUILTIN = `$__get_builtin_hole_${Date.now()}`; | ||
|
|
||
| export function getGlobalPreloadCode() { | ||
|
There was a problem hiding this comment. The only reason for needing this is because this hook is messing with the builtin There was a problem hiding this comment. If we are going to push users into this hook now, then I think we should aim to work on this usability first - you shouldn't need to define a secret global for the common use case... |
||
| return `Object.defineProperty(globalThis, ${JSON.stringify(GET_BUILTIN)}, { | ||
| value: (builtinName) => { | ||
| return getBuiltin(builtinName); | ||
| }, | ||
| enumerable: false, | ||
| configurable: false, | ||
| }); | ||
| `; | ||
| } | ||
|
|
||
| export function resolve(specifier, context, defaultResolve) { | ||
| const def = defaultResolve(specifier, context); | ||
| if (def.url.startsWith('nodejs:')) { | ||
| return { | ||
| url: `custom-${def.url}`, | ||
| }; | ||
| } | ||
| return def; | ||
| } | ||
|
|
||
| export function getSource(url, context, defaultGetSource) { | ||
| if (url.startsWith('custom-nodejs:')) { | ||
| const urlObj = new URL(url); | ||
| return { | ||
| source: generateBuiltinModule(urlObj.pathname), | ||
| format: 'module', | ||
| }; | ||
| } | ||
| return defaultGetSource(url, context); | ||
| } | ||
|
|
||
| export function getFormat(url, context, defaultGetFormat) { | ||
| if (url.startsWith('custom-nodejs:')) { | ||
| return { format: 'module' }; | ||
| } | ||
| return defaultGetFormat(url, context, defaultGetFormat); | ||
| } | ||
|
|
||
| function generateBuiltinModule(builtinName) { | ||
| const builtinInstance = module._load(builtinName); | ||
| const builtinExports = [ | ||
| ...Object.keys(builtinInstance), | ||
| ]; | ||
| return `\ | ||
|
There was a problem hiding this comment. this seems horrible enough to constitute figuring out some sort of replacement for dynamicInstantiate There was a problem hiding this comment. It's the hackiest version of generating the code. I don't agree that the loader hooks providing proper JS code is horrible in general. It's possible to create a |
||
| const $builtinInstance = ${GET_BUILTIN}(${JSON.stringify(builtinName)}); | ||
|
|
||
| export const __fromLoader = true; | ||
|
|
||
| export default $builtinInstance; | ||
|
|
||
| ${ | ||
| builtinExports | ||
| .map(name => `export const ${name} = $builtinInstance.${name};`) | ||
| .join('\n') | ||
| } | ||
| `; | ||
| } | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this isn't needed
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah, I started without it. But then the test still passed and I was super confused if anything happened. Having the warning did help me be confident that it actually ignored the hook.
That being said - happy to remove this last trace as well.