fix: improved using declaration support (#20959)

Upgrades to deno_ast 0.30.

3 files changed, 13 insertions, 7 deletions

diff --git a/cli/tools/vendor/build.rs b/cli/tools/vendor/build.rs
index 3e5f13d81..dd7c053c1 100644
--- a/cli/tools/vendor/build.rs
+++ b/cli/tools/vendor/build.rs
@@ -11,6 +11,7 @@ use deno_core::anyhow::Context;
 use deno_core::error::AnyError;
 use deno_core::futures::future::LocalBoxFuture;
 use deno_core::parking_lot::Mutex;
+use deno_graph::source::ResolutionMode;
 use deno_graph::EsmModule;
 use deno_graph::Module;
 use deno_graph::ModuleGraph;
@@ -111,9 +112,11 @@ pub async fn build<
   // add the jsx import source to the entry points to ensure it is always vendored
   if let Some(jsx_import_source) = jsx_import_source {
     if let Some(specifier_text) = jsx_import_source.maybe_specifier_text() {
-      if let Ok(specifier) =
-        resolver.resolve(&specifier_text, &jsx_import_source.base_url)
-      {
+      if let Ok(specifier) = resolver.resolve(
+        &specifier_text,
+        &jsx_import_source.base_url,
+        ResolutionMode::Execution,
+      ) {
         entry_points.push(specifier);
       }
     }
diff --git a/cli/tools/vendor/import_map.rs b/cli/tools/vendor/import_map.rs
index 36a70d4e0..b5893e9f5 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::source::ResolutionMode;
 use deno_graph::Module;
 use deno_graph::ModuleGraph;
 use deno_graph::Position;
@@ -213,9 +214,11 @@ pub fn build_import_map(
   // add the jsx import source to the destination import map, if mapped in the original import map
   if let Some(jsx_import_source) = jsx_import_source {
     if let Some(specifier_text) = jsx_import_source.maybe_specifier_text() {
-      if let Ok(resolved_url) =
-        resolver.resolve(&specifier_text, &jsx_import_source.base_url)
-      {
+      if let Ok(resolved_url) = resolver.resolve(
+        &specifier_text,
+        &jsx_import_source.base_url,
+        ResolutionMode::Execution,
+      ) {
         builder.imports.add(specifier_text, &resolved_url);
       }
     }
diff --git a/cli/tools/vendor/mod.rs b/cli/tools/vendor/mod.rs
index c324a56dd..42909598d 100644
--- a/cli/tools/vendor/mod.rs
+++ b/cli/tools/vendor/mod.rs
@@ -355,7 +355,7 @@ fn update_config_text(
 
   let new_text = deno_ast::apply_text_changes(text, text_changes);
   modified_result.new_text = if should_format {
-    format_json(&new_text, fmt_options)
+    format_json(&PathBuf::from("deno.json"), &new_text, fmt_options)
       .ok()
       .map(|formatted_text| formatted_text.unwrap_or(new_text))
   } else {