deps(proto): Upgrade to v0.22.5. (#1177)

* Update proto. * Fix tests. * Bump.
moonrepo · Nov 14, 2023 · 21ebd34 · 21ebd34
1 parent b90f9a0
commit 21ebd34
Show file tree

Hide file tree

Showing 14 changed files with 81 additions and 135 deletions.
diff --git a/.yarn/versions/3fdb67ef.yml b/.yarn/versions/3fdb67ef.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
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -38,7 +38,7 @@ pathdiff = "0.2.1"
 petgraph = { version = "0.6.4", default-features = false, features = [
 	"serde-1",
 ] }
-proto_core = "=0.21.0"
+proto_core = "0.22.5"
 relative-path = { version = "1.9.0", features = ["serde"] }
 regex = "1.10.2"
 reqwest = { version = "0.11.22", default-features = false, features = [
@@ -90,5 +90,3 @@ tokio-util = "0.7.10"
 tracing = "0.1.40"
 url = "2.4.1"
 uuid = { version = "1.5.0", features = ["v4"] }
-
-warpgate = "=0.5.13"
diff --git a/crates/node/platform/src/actions/run_target.rs b/crates/node/platform/src/actions/run_target.rs
@@ -208,7 +208,7 @@ pub fn create_target_command(
     if !is_package_manager && !node.global {
         command.env(
             "PATH",
-            prepend_path_env_var([node.tool.get_bin_path()?.parent().unwrap()]),
+            prepend_path_env_var([node.tool.get_exe_path()?.parent().unwrap()]),
         );
     }
 

diff --git a/crates/node/tool/src/bun_tool.rs b/crates/node/tool/src/bun_tool.rs
@@ -57,18 +57,10 @@ impl Tool for BunTool {
         Ok(if self.global {
             "bun".into()
         } else {
-            self.tool.get_bin_path()?.to_path_buf()
+            self.tool.get_exe_path()?.to_path_buf()
         })
     }
 
-    fn get_shim_path(&self) -> Option<PathBuf> {
-        if self.global {
-            return None;
-        }
-
-        self.tool.get_shim_path().map(|p| p.to_path_buf())
-    }
-
     async fn setup(
         &mut self,
         last_versions: &mut FxHashMap<String, UnresolvedVersionSpec>,
@@ -138,7 +130,7 @@ impl DependencyManager<NodeTool> for BunTool {
         if !self.global {
             cmd.env(
                 "PATH",
-                prepend_path_env_var([self.tool.get_bin_path()?.parent().unwrap()]),
+                prepend_path_env_var([self.tool.get_exe_path()?.parent().unwrap()]),
             );
         }
 

diff --git a/crates/node/tool/src/node_tool.rs b/crates/node/tool/src/node_tool.rs
@@ -104,7 +104,7 @@ impl NodeTool {
                 if !self.global {
                     cmd.env(
                         "PATH",
-                        prepend_path_env_var([self.tool.get_bin_path()?.parent().unwrap()]),
+                        prepend_path_env_var([self.tool.get_exe_path()?.parent().unwrap()]),
                     );
                 }
 
@@ -195,7 +195,7 @@ impl Tool for NodeTool {
         Ok(if self.global {
             "node".into()
         } else {
-            self.tool.get_bin_path()?.to_path_buf()
+            self.tool.get_exe_path()?.to_path_buf()
         })
     }
 

diff --git a/crates/node/tool/src/npm_tool.rs b/crates/node/tool/src/npm_tool.rs
@@ -43,18 +43,10 @@ impl Tool for NpmTool {
         Ok(if self.global {
             "npm".into()
         } else {
-            self.tool.get_bin_path()?.to_path_buf()
+            self.tool.get_exe_path()?.to_path_buf()
         })
     }
 
-    fn get_shim_path(&self) -> Option<PathBuf> {
-        if self.global {
-            return None;
-        }
-
-        self.tool.get_shim_path().map(|p| p.to_path_buf())
-    }
-
     async fn setup(
         &mut self,
         last_versions: &mut FxHashMap<String, UnresolvedVersionSpec>,
@@ -134,7 +126,7 @@ impl DependencyManager<NodeTool> for NpmTool {
                 "PATH",
                 prepend_path_env_var([
                     node.get_bin_path()?.parent().unwrap(),
-                    self.tool.get_bin_path()?.parent().unwrap(),
+                    self.tool.get_exe_path()?.parent().unwrap(),
                 ]),
             );
         }

diff --git a/crates/node/tool/src/pnpm_tool.rs b/crates/node/tool/src/pnpm_tool.rs
@@ -51,18 +51,10 @@ impl Tool for PnpmTool {
         Ok(if self.global {
             "pnpm".into()
         } else {
-            self.tool.get_bin_path()?.to_path_buf()
+            self.tool.get_exe_path()?.to_path_buf()
         })
     }
 
-    fn get_shim_path(&self) -> Option<PathBuf> {
-        if self.global {
-            return None;
-        }
-
-        self.tool.get_shim_path().map(|p| p.to_path_buf())
-    }
-
     async fn setup(
         &mut self,
         last_versions: &mut FxHashMap<String, UnresolvedVersionSpec>,
@@ -142,7 +134,7 @@ impl DependencyManager<NodeTool> for PnpmTool {
                 "PATH",
                 prepend_path_env_var([
                     node.get_bin_path()?.parent().unwrap(),
-                    self.tool.get_bin_path()?.parent().unwrap(),
+                    self.tool.get_exe_path()?.parent().unwrap(),
                 ]),
             );
         }

diff --git a/crates/node/tool/src/yarn_tool.rs b/crates/node/tool/src/yarn_tool.rs
@@ -113,18 +113,10 @@ impl Tool for YarnTool {
         Ok(if self.global {
             "yarn".into()
         } else {
-            self.tool.get_bin_path()?.to_path_buf()
+            self.tool.get_exe_path()?.to_path_buf()
         })
     }
 
-    fn get_shim_path(&self) -> Option<PathBuf> {
-        if self.global {
-            return None;
-        }
-
-        self.tool.get_shim_path().map(|p| p.to_path_buf())
-    }
-
     async fn setup(
         &mut self,
         last_versions: &mut FxHashMap<String, UnresolvedVersionSpec>,
@@ -204,7 +196,7 @@ impl DependencyManager<NodeTool> for YarnTool {
                 "PATH",
                 prepend_path_env_var([
                     node.get_bin_path()?.parent().unwrap(),
-                    self.tool.get_bin_path()?.parent().unwrap(),
+                    self.tool.get_exe_path()?.parent().unwrap(),
                 ]),
             );
         }

diff --git a/nextgen/config/src/toolchain/mod.rs b/nextgen/config/src/toolchain/mod.rs
@@ -12,7 +12,7 @@ pub use typescript_config::*;
 
 #[macro_export]
 macro_rules! inherit_tool {
-    ($config:ident, $tool:ident, $key:expr, $method:ident, $plugin:literal) => {
+    ($config:ident, $tool:ident, $key:expr, $method:ident) => {
         pub fn $method(&mut self, proto_tools: &ToolsConfig) -> miette::Result<()> {
             if let Some(version) = proto_tools.tools.get($key) {
                 let config = self.$tool.get_or_insert_with($config::default);
@@ -24,10 +24,10 @@ macro_rules! inherit_tool {
 
             if let Some(config) = &mut self.$tool {
                 if config.plugin.is_none() {
-                    // config.plugin = proto_tools.plugins.get($key).cloned();
-                    config.plugin = Some(PluginLocator::SourceUrl {
-                        url: $plugin.into(),
-                    });
+                    config.plugin = proto_tools.plugins.get($key).cloned();
+                    // config.plugin = Some(PluginLocator::SourceUrl {
+                    //     url: $plugin.into(),
+                    // });
                 }
             }
 
@@ -38,7 +38,7 @@ macro_rules! inherit_tool {
 
 #[macro_export]
 macro_rules! inherit_tool_required {
-    ($config:ident, $tool:ident, $key:expr, $method:ident, $plugin:literal) => {
+    ($config:ident, $tool:ident, $key:expr, $method:ident) => {
         pub fn $method(&mut self, proto_tools: &ToolsConfig) -> miette::Result<()> {
             if let Some(version) = proto_tools.tools.get($key) {
                 if self.$tool.version.is_none() {
@@ -47,10 +47,7 @@ macro_rules! inherit_tool_required {
             }
 
             if self.$tool.plugin.is_none() {
-                // self.$tool.plugin = proto_tools.plugins.get($key).cloned();
-                self.$tool.plugin = Some(PluginLocator::SourceUrl {
-                    url: $plugin.into(),
-                });
+                self.$tool.plugin = proto_tools.plugins.get($key).cloned();
             }
 
             Ok(())