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

File tree

2 files changed

+6
-8
lines changed

2 files changed

+6
-8
lines changed

lib/internal/modules/esm/loader.js

+4-6
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-
function createModuleLoader(useCustomLoadersIfPresent = true) {
529+
function createModuleLoader() {
531530
let customizations = 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
const userLoaderPaths = getOptionValue('--experimental-loader');
537535
if (userLoaderPaths.length > 0) {
538536
if (!emittedLoaderFlagWarning) {

lib/internal/process/esm_loader.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ let esmLoader;
1111

1212
module.exports = {
1313
get esmLoader() {
14-
return esmLoader ??= createModuleLoader(true);
14+
return esmLoader ??= createModuleLoader();
1515
},
1616
async loadESM(callback) {
17-
esmLoader ??= createModuleLoader(true);
17+
esmLoader ??= createModuleLoader();
1818
try {
1919
const userImports = getOptionValue('--import');
2020
if (userImports.length > 0) {

0 commit comments

Comments
 (0)