Skip to content

Commit 8e886a2

Browse files
legendecasUlisesGascon
authored andcommitted
module: remove useCustomLoadersIfPresent flag
The flag is always true and can be determined by isLoaderWorker solely. PR-URL: #48655 Backport-PR-URL: #51239 Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
1 parent 11b3e47 commit 8e886a2

2 files changed

Lines changed: 6 additions & 8 deletions

File tree

‎lib/internal/modules/esm/loader.js‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -524,15 +524,13 @@ let emittedLoaderFlagWarning = false;
524524
* A loader instance is used as the main entry point for loading ES modules. Currently, this is a singleton; there is
525525
* only one used for loading the main module and everything in its dependency graph, though separate instances of this
526526
* class might be instantiated as part of bootstrap for other purposes.
527-
* @param {boolean} useCustomLoadersIfPresent If the user has provided loaders via the --loader flag, use them.
528527
* @returns {ModuleLoader}
529528
*/
530-
functioncreateModuleLoader(useCustomLoadersIfPresent=true){
529+
functioncreateModuleLoader(){
531530
letcustomizations=null;
532-
if(useCustomLoadersIfPresent&&
533-
// Don't spawn a new worker if we're already in a worker thread created by instantiating CustomizedModuleLoader;
534-
// doing so would cause an infinite loop.
535-
!require('internal/modules/esm/utils').isLoaderWorker()){
531+
// Don't spawn a new worker if we're already in a worker thread created by instantiating CustomizedModuleLoader;
532+
// doing so would cause an infinite loop.
533+
if(!require('internal/modules/esm/utils').isLoaderWorker()){
536534
constuserLoaderPaths=getOptionValue('--experimental-loader');
537535
if(userLoaderPaths.length>0){
538536
if(!emittedLoaderFlagWarning){

‎lib/internal/process/esm_loader.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ let esmLoader;
1111

1212
module.exports={
1313
getesmLoader(){
14-
returnesmLoader??=createModuleLoader(true);
14+
returnesmLoader??=createModuleLoader();
1515
},
1616
asyncloadESM(callback){
17-
esmLoader??=createModuleLoader(true);
17+
esmLoader??=createModuleLoader();
1818
try{
1919
constuserImports=getOptionValue('--import');
2020
if(userImports.length>0){

0 commit comments

Comments
 (0)