diff --git a/Cargo.lock b/Cargo.lock index 5e5352b1d0..05a0e9c226 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1864,9 +1864,9 @@ dependencies = [ [[package]] name = "deno_task_shell" -version = "0.16.1" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97e5ff66a1e89edb7ca0c36b73a8fcdc008ba426c4ad7a36e1dfb3f4a166179e" +checksum = "dd6413ffc1654cad015edb5c4ab574069acdc929a6efafed23bc947901bcff1a" dependencies = [ "anyhow", "futures", diff --git a/cli/Cargo.toml b/cli/Cargo.toml index 68cfc89fce..67060f5299 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -75,7 +75,7 @@ deno_lockfile.workspace = true deno_npm = "=0.21.4" deno_runtime = { workspace = true, features = ["include_js_files_for_snapshotting"] } deno_semver = "=0.5.6" -deno_task_shell = "=0.16.1" +deno_task_shell = "=0.17.0" deno_terminal.workspace = true eszip = "=0.71.0" napi_sym.workspace = true diff --git a/cli/tools/task.rs b/cli/tools/task.rs index 6b18e18bb1..a44dc8dbba 100644 --- a/cli/tools/task.rs +++ b/cli/tools/task.rs @@ -367,7 +367,7 @@ impl ShellCommand for NpmCommand { } // fallback to running the real npm command - let npm_path = match context.resolve_command_path("npm") { + let npm_path = match context.state.resolve_command_path("npm") { Ok(path) => path, Err(err) => { let _ = context.stderr.write_line(&format!("{}", err)); @@ -388,7 +388,7 @@ impl ShellCommand for NpxCommand { mut context: ShellCommandContext, ) -> LocalBoxFuture<'static, ExecuteResult> { if let Some(first_arg) = context.args.first().cloned() { - if let Some(command) = context.state.resolve_command(&first_arg) { + if let Some(command) = context.state.resolve_custom_command(&first_arg) { let context = ShellCommandContext { args: context.args.iter().skip(1).cloned().collect::>(), ..context @@ -396,7 +396,7 @@ impl ShellCommand for NpxCommand { command.execute(context) } else { // can't find the command, so fallback to running the real npx command - let npx_path = match context.resolve_command_path("npx") { + let npx_path = match context.state.resolve_command_path("npx") { Ok(npx) => npx, Err(err) => { let _ = context.stderr.write_line(&format!("{}", err));