fixup! module: include module information in require(esm) warning

nodejs · Oct 18, 2024 · 5a78db6 · 5a78db6
1 parent c748d5e
commit 5a78db6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/lib/internal/modules/cjs/loader.js b/lib/internal/modules/cjs/loader.js
@@ -1398,8 +1398,8 @@ function loadESMFromCJS(mod, filename) {
  from = 'The REPL';
  } else if (from === '.') {
  from = 'The entry point';
- } else if (from) {
- from = `CommonJS module ${from}`;
+ } else {
+ from &&= `CommonJS module ${from}`;
  }
  if (from && to) {
  messageBefore = `${from} is loading ES Module ${to} using require().\n`;

diff --git a/test/es-module/test-require-module-preload.js b/test/es-module/test-require-module-preload.js
@@ -117,7 +117,7 @@ testPreload('--import');
  },
  {
  stdout: /^package-type-module\s+A$/,
- stderr: /ExperimentalWarning: --require is loading ES Module .*package-type-module\/index\.js using require/,
+ stderr: /ExperimentalWarning: --require is loading ES Module .*package-type-module[\\/]index\.js using require/,
  trim: true,
  }
  );