foster/denoland-deno
1
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2024-11-21 15:04:11 -05:00
Code Issues Packages 1 Wiki Activity

fix(task): always use npm for npm run with flags (#24028)

Browse source
This commit is contained in:
Marvin Hagemeister 2024-05-29 22:16:35 +02:00 committed by GitHub
parent 814ac9a75d
commit 3c3076a84c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 32 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
cli/tools/task.rs
View file

@ -344,12 +344,16 @@ impl ShellCommand for NpmCommand {
mut context: ShellCommandContext,
) -> LocalBoxFuture<'static, ExecuteResult> {
if context.args.first().map(|s| s.as_str()) == Some("run")
&& !context.args.iter().any(|s| s == "--")
&& context.args.len() > 2
// for now, don't run any npm scripts that have a flag because
// we don't handle stuff like `--workspaces` properly
&& !context.args.iter().any(|s| s.starts_with('-'))
{
if let Some(task_name) = context.args.get(1) {
// run with deno task instead
let mut args = vec!["task".to_string(), task_name.to_string()];
args.extend(context.args.iter().skip(2).cloned());
let mut args = Vec::with_capacity(context.args.len());
args.push("task".to_string());
args.extend(context.args.iter().skip(1).cloned());
let mut state = context.state;
state.apply_env_var(USE_PKG_JSON_HIDDEN_ENV_VAR_NAME, "1");
return ExecutableCommand::new(
@ -362,7 +366,6 @@ impl ShellCommand for NpmCommand {
..context
});
}
}
// fallback to running the real npm command
let npm_path = match context.resolve_command_path("npm") {

4
tests/specs/task/npm_run/__test__.jsonc
View file

@ -12,6 +12,10 @@
"npm_run": {
"args": "task npm_run",
"output": "task_npm_run.out"
},
"npm_run_args": {
"args": "task npm_run_args",
"output": "task_npm_run_args.out"
}
}
}

3
tests/specs/task/npm_run/deno.jsonc
View file

@ -6,6 +6,7 @@
// currently this will execute using the actual `npm run` because we
// haven't implemented the flags for `npm run` yet
"test_using_npm": "npm run non_existent -- --ignore-scripts",
"npm_run": "npm run"
"npm_run": "npm run",
"npm_run_args": "npm run -d echo"
}
}

5
tests/specs/task/npm_run/task_npm_run_args.out Normal file
View file

@ -0,0 +1,5 @@
Task npm_run_args npm run -d echo
npm info using[WILDCARD]
> echo
[WILDCARD]