From 9bb3ccbab25121119d1a05627c9d695bc09d615a Mon Sep 17 00:00:00 2001
From: Sylvain Cau <10268458+sylc@users.noreply.github.com>
Date: Wed, 28 Sep 2022 02:01:43 +0800
Subject: fix(cli/vendor): handle assert type json during vendoring (#16059)

---
 cli/tools/vendor/build.rs      | 4 ++--
 cli/tools/vendor/import_map.rs | 6 ++++++
 2 files changed, 8 insertions(+), 2 deletions(-)

(limited to 'cli/tools')

diff --git a/cli/tools/vendor/build.rs b/cli/tools/vendor/build.rs
index 33f5227b5..f0a490a75 100644
--- a/cli/tools/vendor/build.rs
+++ b/cli/tools/vendor/build.rs
@@ -473,7 +473,7 @@ mod test {
             "/mod.ts",
             r#"import data from "https://localhost/data.json" assert { type: "json" };"#,
           )
-          .add("https://localhost/data.json", "{}");
+          .add("https://localhost/data.json", "{ \"a\": \"b\" }");
       })
       .build()
       .await
@@ -489,7 +489,7 @@ mod test {
     );
     assert_eq!(
       output.files,
-      to_file_vec(&[("/vendor/localhost/data.json", "{}"),]),
+      to_file_vec(&[("/vendor/localhost/data.json", "{ \"a\": \"b\" }"),]),
     );
   }
 
diff --git a/cli/tools/vendor/import_map.rs b/cli/tools/vendor/import_map.rs
index cc759b859..b5df81271 100644
--- a/cli/tools/vendor/import_map.rs
+++ b/cli/tools/vendor/import_map.rs
@@ -4,6 +4,7 @@ use deno_ast::LineAndColumnIndex;
 use deno_ast::ModuleSpecifier;
 use deno_ast::SourceTextInfo;
 use deno_core::error::AnyError;
+use deno_graph::MediaType;
 use deno_graph::Module;
 use deno_graph::ModuleGraph;
 use deno_graph::Position;
@@ -204,6 +205,11 @@ fn visit_modules(
   parsed_source_cache: &ParsedSourceCache,
 ) -> Result<(), AnyError> {
   for module in modules {
+    if module.media_type == MediaType::Json {
+      // skip visiting Json modules as they are leaves
+      continue;
+    }
+
     let text_info =
       match parsed_source_cache.get_parsed_source_from_module(module)? {
         Some(source) => source.text_info().clone(),
-- 
cgit v1.2.3