language-servers/deno
1
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2025-10-02 07:01:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

fix(cli): Respect implied BYONM from DENO_FUTURE in deno task (#24652)

Browse source 
Regression from
04f9db5b22

Originally I thought to fix the issue in the PR we needed to explicitly
pass through the `node-modules-dir` flag, but after applying the correct
fix that david pointed out (setting `NPM_PROCESS_STATE`) that wasn't
necessary (or correct).

We had a test for deno task with BYONM, but it only tested with
`"unstable": ["byonm"]` in deno.json, so it didn't catch this.
This commit is contained in:
Nathan Whitaker 2024-07-19 11:59:04 -07:00 • committed by GitHub
parent f6c7c13764
commit a4c76add56
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 67 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

8
cli/npm/managed/resolvers/local.rs
View file

@ -282,12 +282,8 @@ fn resolve_baseline_custom_commands(
custom_commands
.insert("npm".to_string(), Rc::new(crate::task_runner::NpmCommand));
custom_commands.insert(
"node".to_string(),
Rc::new(crate::task_runner::NodeCommand {
force_node_modules_dir: true,
}),
);
custom_commands
.insert("node".to_string(), Rc::new(crate::task_runner::NodeCommand));
custom_commands.insert(
"node-gyp".to_string(),

8
cli/task_runner.rs
View file

@ -164,9 +164,7 @@ impl ShellCommand for NpmCommand {
}
}
pub struct NodeCommand {
pub force_node_modules_dir: bool,
}
pub struct NodeCommand;
impl ShellCommand for NodeCommand {
fn execute(
@ -193,9 +191,6 @@ impl ShellCommand for NodeCommand {
.execute(context);
}
args.extend(["run", "-A"].into_iter().map(|s| s.to_string()));
if self.force_node_modules_dir {
args.push("--node-modules-dir=true".to_string());
}
args.extend(context.args.iter().cloned());
let mut state = context.state;
@ -308,7 +303,6 @@ impl ShellCommand for NodeModulesFileRunCommand {
let mut args = vec![
"run".to_string(),
"--ext=js".to_string(),
"--node-modules-dir=true".to_string(),
"-A".to_string(),
self.path.to_string_lossy().to_string(),
];