diff options
Diffstat (limited to 'cli/tools')
-rw-r--r-- | cli/tools/check.rs | 6 | ||||
-rw-r--r-- | cli/tools/task.rs | 8 |
2 files changed, 6 insertions, 8 deletions
diff --git a/cli/tools/check.rs b/cli/tools/check.rs index 36bc25d6a..4fb6800fa 100644 --- a/cli/tools/check.rs +++ b/cli/tools/check.rs @@ -9,6 +9,7 @@ use deno_core::error::AnyError; use deno_graph::Module; use deno_graph::ModuleGraph; use deno_runtime::colors; +use deno_runtime::deno_node::NodeResolver; use once_cell::sync::Lazy; use regex::Regex; @@ -21,7 +22,6 @@ use crate::cache::Caches; use crate::cache::DenoDir; use crate::cache::FastInsecureHasher; use crate::cache::TypeCheckCache; -use crate::node::CliNodeResolver; use crate::npm::CliNpmResolver; use crate::tsc; use crate::version; @@ -42,7 +42,7 @@ pub struct TypeChecker { deno_dir: DenoDir, caches: Arc<Caches>, cli_options: Arc<CliOptions>, - node_resolver: Arc<CliNodeResolver>, + node_resolver: Arc<NodeResolver>, npm_resolver: Arc<CliNpmResolver>, } @@ -51,7 +51,7 @@ impl TypeChecker { deno_dir: DenoDir, caches: Arc<Caches>, cli_options: Arc<CliOptions>, - node_resolver: Arc<CliNodeResolver>, + node_resolver: Arc<NodeResolver>, npm_resolver: Arc<CliNpmResolver>, ) -> Self { Self { diff --git a/cli/tools/task.rs b/cli/tools/task.rs index 898cdd8d9..5d34d39c7 100644 --- a/cli/tools/task.rs +++ b/cli/tools/task.rs @@ -4,7 +4,6 @@ use crate::args::CliOptions; use crate::args::Flags; use crate::args::TaskFlags; use crate::colors; -use crate::node::CliNodeResolver; use crate::npm::CliNpmResolver; use crate::proc_state::ProcState; use crate::util::fs::canonicalize_path; @@ -13,7 +12,7 @@ use deno_core::anyhow::Context; use deno_core::error::AnyError; use deno_core::futures; use deno_core::futures::future::LocalBoxFuture; -use deno_runtime::deno_node::RealFs; +use deno_runtime::deno_node::NodeResolver; use deno_semver::npm::NpmPackageNv; use deno_task_shell::ExecuteResult; use deno_task_shell::ShellCommand; @@ -236,13 +235,12 @@ impl ShellCommand for NpmPackageBinCommand { fn resolve_npm_commands( npm_resolver: &CliNpmResolver, - node_resolver: &CliNodeResolver, + node_resolver: &NodeResolver, ) -> Result<HashMap<String, Rc<dyn ShellCommand>>, AnyError> { let mut result = HashMap::new(); let snapshot = npm_resolver.snapshot(); for id in snapshot.top_level_packages() { - let bin_commands = - node_resolver.resolve_binary_commands::<RealFs>(&id.nv)?; + let bin_commands = node_resolver.resolve_binary_commands(&id.nv)?; for bin_command in bin_commands { result.insert( bin_command.to_string(), |