From 7ed90a20d04982ae15a52ae2378cbffd4b6839df Mon Sep 17 00:00:00 2001
From: David Sherret <dsherret@users.noreply.github.com>
Date: Wed, 5 Jun 2024 11:04:16 -0400
Subject: fix: better handling of npm resolution occurring on workers (#24094)

Closes https://github.com/denoland/deno/issues/24063
---
 cli/tools/vendor/analyze.rs    | 3 +--
 cli/tools/vendor/build.rs      | 2 +-
 cli/tools/vendor/import_map.rs | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

(limited to 'cli/tools/vendor')

diff --git a/cli/tools/vendor/analyze.rs b/cli/tools/vendor/analyze.rs
index 2b00f6bf4..3e5964be6 100644
--- a/cli/tools/vendor/analyze.rs
+++ b/cli/tools/vendor/analyze.rs
@@ -64,7 +64,6 @@ mod test {
   use deno_ast::ModuleSpecifier;
   use deno_ast::ParseParams;
   use deno_ast::ParsedSource;
-  use deno_ast::SourceTextInfo;
 
   use super::has_default_export;
 
@@ -107,7 +106,7 @@ mod test {
       maybe_syntax: None,
       media_type: MediaType::TypeScript,
       scope_analysis: false,
-      text_info: SourceTextInfo::from_string(text.to_string()),
+      text: text.into(),
     })
     .unwrap()
   }
diff --git a/cli/tools/vendor/build.rs b/cli/tools/vendor/build.rs
index fd7401f77..5aef63192 100644
--- a/cli/tools/vendor/build.rs
+++ b/cli/tools/vendor/build.rs
@@ -118,7 +118,7 @@ pub async fn build<
   graph_util::graph_valid(
     &graph,
     &real_fs,
-    &graph.roots,
+    &graph.roots.iter().cloned().collect::<Vec<_>>(),
     graph_util::GraphValidOptions {
       is_vendoring: true,
       check_js: true,
diff --git a/cli/tools/vendor/import_map.rs b/cli/tools/vendor/import_map.rs
index 7f627f35e..68f2530d7 100644
--- a/cli/tools/vendor/import_map.rs
+++ b/cli/tools/vendor/import_map.rs
@@ -250,7 +250,7 @@ fn visit_modules(
 
     let parsed_source =
       parsed_source_cache.get_parsed_source_from_js_module(module)?;
-    let text_info = parsed_source.text_info().clone();
+    let text_info = parsed_source.text_info_lazy().clone();
 
     for dep in module.dependencies.values() {
       visit_resolution(
-- 
cgit v1.2.3