From 233d5422fdf7493bbd1768c611811085c0ff46ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bartek=20Iwa=C5=84czuk?= <biwanczuk@gmail.com>
Date: Tue, 13 Sep 2022 00:11:32 +0200
Subject: fix(npm): use shim from deno_node crate for 'module' built-in module
 (#15881)

---
 cli/module_loader.rs | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

(limited to 'cli/module_loader.rs')

diff --git a/cli/module_loader.rs b/cli/module_loader.rs
index d3293c957..2a7a69dca 100644
--- a/cli/module_loader.rs
+++ b/cli/module_loader.rs
@@ -63,6 +63,7 @@ impl CliModuleLoader {
   fn load_prepared_module(
     &self,
     specifier: &ModuleSpecifier,
+    maybe_referrer: Option<ModuleSpecifier>,
   ) -> Result<ModuleCodeSource, AnyError> {
     if specifier.as_str() == "node:module" {
       return Ok(ModuleCodeSource {
@@ -121,10 +122,13 @@ impl CliModuleLoader {
           media_type: *media_type,
         })
       }
-      _ => Err(anyhow!(
-        "Loading unprepared module: {}",
-        specifier.to_string()
-      )),
+      _ => {
+        let mut msg = format!("Loading unprepared module: {}", specifier);
+        if let Some(referrer) = maybe_referrer {
+          msg = format!("{}, imported from: {}", msg, referrer.as_str());
+        }
+        Err(anyhow!(msg))
+      }
     }
   }
 
@@ -164,7 +168,7 @@ impl CliModuleLoader {
         media_type: MediaType::from(specifier),
       }
     } else {
-      self.load_prepared_module(specifier)?
+      self.load_prepared_module(specifier, maybe_referrer)?
     };
     let code = if self.ps.options.is_inspecting() {
       // we need the code with the source map in order for
@@ -261,7 +265,7 @@ impl SourceMapGetter for CliModuleLoader {
       "wasm" | "file" | "http" | "https" | "data" | "blob" => (),
       _ => return None,
     }
-    let source = self.load_prepared_module(&specifier).ok()?;
+    let source = self.load_prepared_module(&specifier, None).ok()?;
     source_map_from_code(&source.code)
   }
 
-- 
cgit v1.2.3