Polish.

.yarn/versions/fdfb2523.yml

@@ -0,0 +1,9 @@
+releases:
+  "@moonrepo/cli": patch
+  "@moonrepo/core-linux-arm64-gnu": patch
+  "@moonrepo/core-linux-arm64-musl": patch
+  "@moonrepo/core-linux-x64-gnu": patch
+  "@moonrepo/core-linux-x64-musl": patch
+  "@moonrepo/core-macos-arm64": patch
+  "@moonrepo/core-macos-x64": patch
+  "@moonrepo/core-windows-x64-msvc": patch

crates/core/tool/src/lib.rs

@@ -18,9 +18,17 @@ use std::path::Path;
 /// other binaries of the same name. Otherwise, tooling like nvm will
 /// intercept execution and break our processes. We can work around this
 /// by prepending the `PATH` environment variable.
-pub fn get_path_env_var(bin_dir: &Path) -> std::ffi::OsString {
+pub fn prepend_path_env_var<I, V>(paths: I) -> std::ffi::OsString
+where
+    I: IntoIterator<Item = V>,
+    V: AsRef<Path>,
+{
     let path = env::var("PATH").unwrap_or_default();
-    let mut paths = vec![bin_dir.to_path_buf()];
+
+    let mut paths = paths
+        .into_iter()
+        .map(|p| p.as_ref().to_path_buf())
+        .collect::<Vec<_>>();
 
     paths.extend(env::split_paths(&path).collect::<Vec<_>>());
 

crates/node/platform/src/actions/run_target.rs

@@ -10,7 +10,7 @@ use moon_node_tool::NodeTool;
 use moon_process::Command;
 use moon_project::Project;
 use moon_task::Task;
-use moon_tool::{get_path_env_var, DependencyManager, Tool, ToolError};
+use moon_tool::{prepend_path_env_var, DependencyManager, Tool, ToolError};
 use moon_utils::{get_cache_dir, path, string_vec};
 use rustc_hash::FxHashMap;
 use starbase_styles::color;
@@ -163,6 +163,7 @@ pub fn create_target_command(
     let node_bin = node.get_bin_path()?;
     let node_options = create_node_options(&node.config, context, task)?;
     let mut command = Command::new(node.get_shim_path().unwrap_or(node_bin));
+    let mut is_package_manager = false;
 
     match task.command.as_str() {
         "node" | "nodejs" => {
@@ -172,12 +173,15 @@ pub fn create_target_command(
             command = Command::new(node.get_npx_path()?);
         }
         "npm" => {
+            is_package_manager = true;
             command = node.get_npm()?.create_command(node)?;
         }
         "pnpm" => {
+            is_package_manager = true;
             command = node.get_pnpm()?.create_command(node)?;
         }
         "yarn" | "yarnpkg" => {
+            is_package_manager = true;
             command = node.get_yarn()?.create_command(node)?;
         }
         bin => {
@@ -189,10 +193,12 @@ pub fn create_target_command(
         }
     };
 
-    command.env(
-        "PATH",
-        get_path_env_var(node.tool.get_bin_path()?.parent().unwrap()),
-    );
+    if !is_package_manager {
+        command.env(
+            "PATH",
+            prepend_path_env_var([node.tool.get_bin_path()?.parent().unwrap()]),
+        );
+    }
 
     prepare_target_command(&mut command, context, task, &node.config)?;
 

crates/node/tool/src/node_tool.rs

@@ -8,7 +8,7 @@ use moon_platform_runtime::RuntimeReq;
 use moon_process::Command;
 use moon_terminal::{print_checkpoint, Checkpoint};
 use moon_tool::{
-    async_trait, get_path_env_var, load_tool_plugin, DependencyManager, Tool, ToolError,
+    async_trait, load_tool_plugin, prepend_path_env_var, DependencyManager, Tool, ToolError,
 };
 use proto_core::{Id, ProtoEnvironment, Tool as ProtoTool};
 use rustc_hash::FxHashMap;
@@ -80,7 +80,7 @@ impl NodeTool {
         if !self.global {
             cmd.env(
                 "PATH",
-                get_path_env_var(self.tool.get_bin_path()?.parent().unwrap()),
+                prepend_path_env_var([self.tool.get_bin_path()?.parent().unwrap()]),
             );
         }
 

crates/node/tool/src/npm_tool.rs

@@ -4,7 +4,7 @@ use moon_logger::debug;
 use moon_node_lang::{npm, LockfileDependencyVersions, NPM};
 use moon_process::Command;
 use moon_terminal::{print_checkpoint, Checkpoint};
-use moon_tool::{async_trait, get_path_env_var, load_tool_plugin, DependencyManager, Tool};
+use moon_tool::{async_trait, load_tool_plugin, prepend_path_env_var, DependencyManager, Tool};
 use moon_utils::is_ci;
 use proto_core::{Id, ProtoEnvironment, Tool as ProtoTool, UnresolvedVersionSpec};
 use rustc_hash::FxHashMap;
@@ -119,7 +119,10 @@ impl DependencyManager<NodeTool> for NpmTool {
         if !self.global {
             cmd.env(
                 "PATH",
-                get_path_env_var(self.tool.get_bin_path()?.parent().unwrap()),
+                prepend_path_env_var([
+                    node.get_bin_path()?.parent().unwrap(),
+                    self.tool.get_bin_path()?.parent().unwrap(),
+                ]),
             );
         }
 

crates/node/tool/src/pnpm_tool.rs

@@ -4,7 +4,7 @@ use moon_logger::debug;
 use moon_node_lang::{pnpm, LockfileDependencyVersions, PNPM};
 use moon_process::Command;
 use moon_terminal::{print_checkpoint, Checkpoint};
-use moon_tool::{async_trait, get_path_env_var, load_tool_plugin, DependencyManager, Tool};
+use moon_tool::{async_trait, load_tool_plugin, prepend_path_env_var, DependencyManager, Tool};
 use moon_utils::is_ci;
 use proto_core::{Id, ProtoEnvironment, Tool as ProtoTool, UnresolvedVersionSpec, VersionReq};
 use rustc_hash::FxHashMap;
@@ -125,7 +125,10 @@ impl DependencyManager<NodeTool> for PnpmTool {
         if !self.global {
             cmd.env(
                 "PATH",
-                get_path_env_var(self.tool.get_bin_path()?.parent().unwrap()),
+                prepend_path_env_var([
+                    node.get_bin_path()?.parent().unwrap(),
+                    self.tool.get_bin_path()?.parent().unwrap(),
+                ]),
             );
         }
 

crates/node/tool/src/yarn_tool.rs

@@ -5,7 +5,7 @@ use moon_node_lang::{yarn, LockfileDependencyVersions, YARN};
 use moon_process::Command;
 use moon_terminal::{print_checkpoint, Checkpoint};
 use moon_tool::{
-    async_trait, get_path_env_var, load_tool_plugin, DependencyManager, Tool, ToolError,
+    async_trait, load_tool_plugin, prepend_path_env_var, DependencyManager, Tool, ToolError,
 };
 use moon_utils::{get_workspace_root, is_ci};
 use proto_core::{Id, ProtoEnvironment, Tool as ProtoTool, UnresolvedVersionSpec};
@@ -181,7 +181,10 @@ impl DependencyManager<NodeTool> for YarnTool {
         if !self.global {
             cmd.env(
                 "PATH",
-                get_path_env_var(self.tool.get_bin_path()?.parent().unwrap()),
+                prepend_path_env_var([
+                    node.get_bin_path()?.parent().unwrap(),
+                    self.tool.get_bin_path()?.parent().unwrap(),
+                ]),
             );
         }
 

packages/cli/CHANGELOG.md

@@ -10,6 +10,12 @@
   - More accurately monitors signals (ctrl+c) and shutdowns.
   - Tasks can now be configured with a timeout.
 
+## Unreleased
+
+#### 🐞 Fixes
+
+- Fixed some `PATH` inconsistencies when executing npm/pnpm/yarn binaries.
+
 ## 1.14.3
 
 #### 🚀 Updates