new: Support proto v0.20. (#11)

moonrepo · Oct 20, 2023 · 148d4ef · 148d4ef
1 parent 83bf619
commit 148d4ef
Show file tree

Hide file tree

Showing 15 changed files with 127 additions and 104 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,15 @@
 # Changelog
 
+## 0.4.0
+
+#### 🚀 Updates
+
+- Updated to support proto v0.20 release.
+
+#### ⚙️ Internal
+
+- Updated dependencies.
+
 ## 0.3.2
 
 #### 🐞 Fixes

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -4,10 +4,10 @@ members = ["crates/*"]
 
 [workspace.dependencies]
 extism-pdk = "0.3.4"
-proto_pdk = { version = "=0.7.3" }            # , path = "../../proto/crates/pdk" }
-proto_pdk_api = { version = "=0.7.2" }        # , path = "../../proto/crates/pdk-api" }
-proto_pdk_test_utils = { version = "=0.7.1" } # , path = "../../proto/crates/pdk-test-utils" }
-serde = "1.0.188"
+proto_pdk = { version = "0.8.0" }            # , path = "../../proto/crates/pdk" }
+proto_pdk_api = { version = "0.8.0" }        # , path = "../../proto/crates/pdk-api" }
+proto_pdk_test_utils = { version = "0.8.2" } # , path = "../../proto/crates/pdk-test-utils" }
+serde = "1.0.189"
 serde_json = "1.0.107"
 starbase_sandbox = "0.1.11"
 tokio = "1.33.0"

diff --git a/crates/node-depman/Cargo.toml b/crates/node-depman/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "node_depman_plugin"
-version = "0.3.2"
+version = "0.4.0"
 edition = "2021"
 license = "MIT"
 publish = false

diff --git a/crates/node-depman/src/proto.rs b/crates/node-depman/src/proto.rs
@@ -10,6 +10,7 @@ use std::path::PathBuf;
 #[host_fn]
 extern "ExtismHost" {
     fn exec_command(input: Json<ExecCommandInput>) -> Json<ExecCommandOutput>;
+    fn get_env_var(key: &str) -> String;
     fn host_log(input: Json<HostLogInput>);
 }
 
@@ -69,7 +70,6 @@ pub fn register_tool(Json(_): Json<ToolMetadataInput>) -> FnResult<Json<ToolMeta
     Ok(Json(ToolMetadataOutput {
         name: manager.to_string(),
         type_of: PluginType::DependencyManager,
-        env_vars: vec!["PROTO_NODE_VERSION".into(), "PROTO_INSTALL_GLOBAL".into()],
         default_version: if manager == PackageManager::Npm {
             Some("bundled".into())
         } else {
@@ -163,7 +163,7 @@ pub fn locate_bins(Json(input): Json<LocateBinsInput>) -> FnResult<Json<LocateBi
     Ok(Json(LocateBinsOutput {
         bin_path: bin_path.map(PathBuf::from),
         fallback_last_globals_dir: true,
-        globals_lookup_dirs: vec!["$PROTO_ROOT/tools/node/globals/bin".into()],
+        globals_lookup_dirs: vec!["$PROTO_HOME/tools/node/globals/bin".into()],
         ..LocateBinsOutput::default()
     }))
 }
@@ -243,10 +243,10 @@ pub fn resolve_version(
                 let mut found_version = false;
 
                 // Infer from proto's environment variable
-                if let Some(node_version) = input.context.env_vars.get("PROTO_NODE_VERSION") {
+                if let Some(node_version) = host_env!("PROTO_NODE_VERSION") {
                     for node_release in &response {
                         // Theirs starts with v, ours does not
-                        if &node_release.version[1..] == node_version {
+                        if node_release.version[1..] == node_version {
                             output.version = node_release.npm.clone();
                             found_version = true;
                             break;
@@ -430,7 +430,7 @@ pub fn pre_run(Json(input): Json<RunHook>) -> FnResult<()> {
     let user_config = get_proto_user_config()?;
 
     if args.len() < 3
-        || input.context.env_vars.get("PROTO_INSTALL_GLOBAL").is_some()
+        || host_env!("PROTO_INSTALL_GLOBAL").is_some()
         || !user_config.node_intercept_globals
     {
         return Ok(());