From 5a78db644ea78b4d6e9f85dca9e48020c388bcef Mon Sep 17 00:00:00 2001
From: Joyee Cheung <joyeec9h3@gmail.com>
Date: Fri, 18 Oct 2024 14:22:11 +0200
Subject: [PATCH] fixup! module: include module information in require(esm)
 warning

---
 lib/internal/modules/cjs/loader.js            | 4 ++--
 test/es-module/test-require-module-preload.js | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/internal/modules/cjs/loader.js b/lib/internal/modules/cjs/loader.js
index 4f25b004caf49a..6389d4e3814a07 100644
--- 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
index d21991c4e932b2..7a8a09486b43d7 100644
--- 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,
     }
   );