From 5e1c7b237229595d00a5ef39011d0023190ec63c Mon Sep 17 00:00:00 2001 From: Miles Johnson Date: Thu, 15 Aug 2024 16:05:39 -0700 Subject: [PATCH 1/4] Reorder. --- crates/warpgate-api/src/host_funcs.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/crates/warpgate-api/src/host_funcs.rs b/crates/warpgate-api/src/host_funcs.rs index 8e07833d0..82484d283 100644 --- a/crates/warpgate-api/src/host_funcs.rs +++ b/crates/warpgate-api/src/host_funcs.rs @@ -53,12 +53,12 @@ impl From for HostLogInput { api_struct!( /// Input passed to the `exec_command` host function. pub struct ExecCommandInput { - /// Arguments to pass to the command. - pub args: Vec, - /// The command or script to execute. pub command: String, + /// Arguments to pass to the command. + pub args: Vec, + /// Environment variables to pass to the command. #[serde(default)] pub env: FxHashMap, From 8476013311759db6e4cc070040357bd44c44ed30 Mon Sep 17 00:00:00 2001 From: Miles Johnson Date: Thu, 15 Aug 2024 16:06:07 -0700 Subject: [PATCH 2/4] chore: Release --- Cargo.lock | 24 ++++++++++++------------ crates/cli/Cargo.toml | 10 +++++----- crates/codegen/Cargo.toml | 6 +++--- crates/core/Cargo.toml | 10 +++++----- crates/installer/Cargo.toml | 4 ++-- crates/pdk-api/Cargo.toml | 8 ++++---- crates/pdk-test-utils/Cargo.toml | 8 ++++---- crates/pdk/Cargo.toml | 6 +++--- crates/shim/Cargo.toml | 2 +- crates/system-env/Cargo.toml | 2 +- crates/version-spec/Cargo.toml | 2 +- crates/warpgate-api/Cargo.toml | 4 ++-- crates/warpgate-pdk/Cargo.toml | 4 ++-- crates/warpgate/Cargo.toml | 6 +++--- 14 files changed, 48 insertions(+), 48 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9baaae94c..914b1453d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2296,7 +2296,7 @@ dependencies = [ [[package]] name = "proto_codegen" -version = "0.1.0" +version = "0.2.0" dependencies = [ "proto_core", "proto_pdk_api", @@ -2306,7 +2306,7 @@ dependencies = [ [[package]] name = "proto_core" -version = "0.39.3" +version = "0.40.0" dependencies = [ "indexmap 2.4.0", "miette", @@ -2338,7 +2338,7 @@ dependencies = [ [[package]] name = "proto_installer" -version = "0.6.0" +version = "0.7.0" dependencies = [ "miette", "reqwest", @@ -2352,7 +2352,7 @@ dependencies = [ [[package]] name = "proto_pdk" -version = "0.22.0" +version = "0.23.0" dependencies = [ "extism-pdk", "proto_pdk_api", @@ -2363,7 +2363,7 @@ dependencies = [ [[package]] name = "proto_pdk_api" -version = "0.22.0" +version = "0.23.0" dependencies = [ "proto_pdk_api", "rustc-hash 2.0.0", @@ -2379,7 +2379,7 @@ dependencies = [ [[package]] name = "proto_pdk_test_utils" -version = "0.26.0" +version = "0.27.0" dependencies = [ "proto_core", "proto_pdk_api", @@ -2392,7 +2392,7 @@ dependencies = [ [[package]] name = "proto_shim" -version = "0.4.3" +version = "0.5.0" dependencies = [ "command-group", "dirs 5.0.1", @@ -3352,7 +3352,7 @@ dependencies = [ [[package]] name = "system_env" -version = "0.5.0" +version = "0.6.0" dependencies = [ "schematic", "serde", @@ -3786,7 +3786,7 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "version_spec" -version = "0.6.1" +version = "0.7.0" dependencies = [ "human-sort", "regex", @@ -3826,7 +3826,7 @@ dependencies = [ [[package]] name = "warpgate" -version = "0.16.1" +version = "0.17.0" dependencies = [ "extism", "miette", @@ -3852,7 +3852,7 @@ dependencies = [ [[package]] name = "warpgate_api" -version = "0.9.0" +version = "0.10.0" dependencies = [ "anyhow", "rustc-hash 2.0.0", @@ -3865,7 +3865,7 @@ dependencies = [ [[package]] name = "warpgate_pdk" -version = "0.7.0" +version = "0.8.0" dependencies = [ "extism-pdk", "serde", diff --git a/crates/cli/Cargo.toml b/crates/cli/Cargo.toml index 68011560c..4d75907bf 100644 --- a/crates/cli/Cargo.toml +++ b/crates/cli/Cargo.toml @@ -32,11 +32,11 @@ name = "proto-shim" path = "src/main_shim.rs" [dependencies] -proto_core = { version = "0.39.3", path = "../core" } -proto_installer = { version = "0.6.0", path = "../installer" } -proto_pdk_api = { version = "0.22.0", path = "../pdk-api" } -proto_shim = { version = "0.4.3", path = "../shim" } -system_env = { version = "0.5.0", path = "../system-env" } +proto_core = { version = "0.40.0", path = "../core" } +proto_installer = { version = "0.7.0", path = "../installer" } +proto_pdk_api = { version = "0.23.0", path = "../pdk-api" } +proto_shim = { version = "0.5.0", path = "../shim" } +system_env = { version = "0.6.0", path = "../system-env" } anyhow = { workspace = true } async-trait = { workspace = true } chrono = "0.4.38" diff --git a/crates/codegen/Cargo.toml b/crates/codegen/Cargo.toml index 0b4a0abec..20c572f56 100644 --- a/crates/codegen/Cargo.toml +++ b/crates/codegen/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "proto_codegen" -version = "0.1.0" +version = "0.2.0" edition = "2021" license = "MIT" publish = false @@ -9,8 +9,8 @@ publish = false dist = false [dependencies] -proto_core = { version = "0.39.3", path = "../core" } -proto_pdk_api = { version = "0.22.0", path = "../pdk-api", features = [ +proto_core = { version = "0.40.0", path = "../core" } +proto_pdk_api = { version = "0.23.0", path = "../pdk-api", features = [ "schematic", ] } schematic = { workspace = true, features = [ diff --git a/crates/core/Cargo.toml b/crates/core/Cargo.toml index 5af0b7914..6a6a46f02 100644 --- a/crates/core/Cargo.toml +++ b/crates/core/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "proto_core" -version = "0.39.3" +version = "0.40.0" edition = "2021" license = "MIT" description = "Core proto APIs." @@ -8,14 +8,14 @@ homepage = "https://moonrepo.dev/proto" repository = "https://github.com/moonrepo/proto" [dependencies] -proto_pdk_api = { version = "0.22.0", path = "../pdk-api", features = [ +proto_pdk_api = { version = "0.23.0", path = "../pdk-api", features = [ "schematic", ] } -proto_shim = { version = "0.4.3", path = "../shim" } -version_spec = { version = "0.6.1", path = "../version-spec", features = [ +proto_shim = { version = "0.5.0", path = "../shim" } +version_spec = { version = "0.7.0", path = "../version-spec", features = [ "schematic", ] } -warpgate = { version = "0.16.1", path = "../warpgate", features = [ +warpgate = { version = "0.17.0", path = "../warpgate", features = [ "schematic", ] } indexmap = { workspace = true } diff --git a/crates/installer/Cargo.toml b/crates/installer/Cargo.toml index 1f9030953..5808c25b4 100644 --- a/crates/installer/Cargo.toml +++ b/crates/installer/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "proto_installer" -version = "0.6.0" +version = "0.7.0" edition = "2021" license = "MIT" description = "Download and install proto." @@ -8,7 +8,7 @@ homepage = "https://moonrepo.dev/proto" repository = "https://github.com/moonrepo/proto" [dependencies] -system_env = { version = "0.5.0", path = "../system-env" } +system_env = { version = "0.6.0", path = "../system-env" } miette = { workspace = true } reqwest = { workspace = true, features = ["stream"] } starbase_archive = { workspace = true } diff --git a/crates/pdk-api/Cargo.toml b/crates/pdk-api/Cargo.toml index 58af1cdf2..c409df861 100644 --- a/crates/pdk-api/Cargo.toml +++ b/crates/pdk-api/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "proto_pdk_api" -version = "0.22.0" +version = "0.23.0" edition = "2021" license = "MIT" description = "Core APIs for creating proto WASM plugins." @@ -8,9 +8,9 @@ homepage = "https://moonrepo.dev/proto" repository = "https://github.com/moonrepo/proto" [dependencies] -system_env = { version = "0.5.0", path = "../system-env" } -version_spec = { version = "0.6.1", path = "../version-spec" } -warpgate_api = { version = "0.9.0", path = "../warpgate-api" } +system_env = { version = "0.6.0", path = "../system-env" } +version_spec = { version = "0.7.0", path = "../version-spec" } +warpgate_api = { version = "0.10.0", path = "../warpgate-api" } rustc-hash = { workspace = true } schematic = { workspace = true, features = [ "schema", diff --git a/crates/pdk-test-utils/Cargo.toml b/crates/pdk-test-utils/Cargo.toml index 7f9226b2b..bae90aa9f 100644 --- a/crates/pdk-test-utils/Cargo.toml +++ b/crates/pdk-test-utils/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "proto_pdk_test_utils" -version = "0.26.0" +version = "0.27.0" edition = "2021" license = "MIT" description = "Utilities for testing proto WASM plugins." @@ -8,9 +8,9 @@ homepage = "https://moonrepo.dev/proto" repository = "https://github.com/moonrepo/proto" [dependencies] -proto_core = { version = "0.39.3", path = "../core" } -proto_pdk_api = { version = "0.22.0", path = "../pdk-api" } -warpgate = { version = "0.16.1", path = "../warpgate" } +proto_core = { version = "0.40.0", path = "../core" } +proto_pdk_api = { version = "0.23.0", path = "../pdk-api" } +warpgate = { version = "0.17.0", path = "../warpgate" } serde = { workspace = true } serde_json = { workspace = true } starbase_sandbox = { workspace = true } diff --git a/crates/pdk/Cargo.toml b/crates/pdk/Cargo.toml index cb5dc60a6..381f4a70c 100644 --- a/crates/pdk/Cargo.toml +++ b/crates/pdk/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "proto_pdk" -version = "0.22.0" +version = "0.23.0" edition = "2021" license = "MIT" description = "A plugin development kit for creating proto WASM plugins." @@ -8,8 +8,8 @@ homepage = "https://moonrepo.dev/proto" repository = "https://github.com/moonrepo/proto" [dependencies] -proto_pdk_api = { version = "0.22.0", path = "../pdk-api" } -warpgate_pdk = { version = "0.7.0", path = "../warpgate-pdk" } +proto_pdk_api = { version = "0.23.0", path = "../pdk-api" } +warpgate_pdk = { version = "0.8.0", path = "../warpgate-pdk" } extism-pdk = { workspace = true } rustc-hash = { workspace = true } serde = { workspace = true } diff --git a/crates/shim/Cargo.toml b/crates/shim/Cargo.toml index 02b58caf8..b5de2572d 100644 --- a/crates/shim/Cargo.toml +++ b/crates/shim/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "proto_shim" -version = "0.4.3" +version = "0.5.0" edition = "2021" license = "MIT" description = "Utilities for working with proto shims." diff --git a/crates/system-env/Cargo.toml b/crates/system-env/Cargo.toml index 8e230f7bb..871c4b016 100644 --- a/crates/system-env/Cargo.toml +++ b/crates/system-env/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "system_env" -version = "0.5.0" +version = "0.6.0" edition = "2021" license = "MIT" description = "Information about the system environment: operating system, architecture, package manager, etc." diff --git a/crates/version-spec/Cargo.toml b/crates/version-spec/Cargo.toml index 21498aa3c..2dbbf91d7 100644 --- a/crates/version-spec/Cargo.toml +++ b/crates/version-spec/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "version_spec" -version = "0.6.1" +version = "0.7.0" edition = "2021" license = "MIT" description = "A specification for working with partial, full, or aliased versions. Supports semver and calver." diff --git a/crates/warpgate-api/Cargo.toml b/crates/warpgate-api/Cargo.toml index b36eaddf4..de7b4fecf 100644 --- a/crates/warpgate-api/Cargo.toml +++ b/crates/warpgate-api/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "warpgate_api" -version = "0.9.0" +version = "0.10.0" edition = "2021" license = "MIT" description = "APIs for working with Warpgate plugins." @@ -8,7 +8,7 @@ homepage = "https://moonrepo.dev/proto" repository = "https://github.com/moonrepo/proto" [dependencies] -system_env = { version = "0.5.0", path = "../system-env" } +system_env = { version = "0.6.0", path = "../system-env" } anyhow = { workspace = true } rustc-hash = { workspace = true } schematic = { workspace = true, optional = true, features = ["schema", "json"] } diff --git a/crates/warpgate-pdk/Cargo.toml b/crates/warpgate-pdk/Cargo.toml index b8b3e1d6c..5e7ade2b2 100644 --- a/crates/warpgate-pdk/Cargo.toml +++ b/crates/warpgate-pdk/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "warpgate_pdk" -version = "0.7.0" +version = "0.8.0" edition = "2021" license = "MIT" description = "Reusable WASM macros and functions for plugin developer kits." @@ -8,6 +8,6 @@ homepage = "https://moonrepo.dev/proto" repository = "https://github.com/moonrepo/proto" [dependencies] -warpgate_api = { version = "0.9.0", path = "../warpgate-api" } +warpgate_api = { version = "0.10.0", path = "../warpgate-api" } extism-pdk = { workspace = true } serde = { workspace = true } diff --git a/crates/warpgate/Cargo.toml b/crates/warpgate/Cargo.toml index 46ef57282..a6b667d11 100644 --- a/crates/warpgate/Cargo.toml +++ b/crates/warpgate/Cargo.toml @@ -1,14 +1,14 @@ [package] name = "warpgate" -version = "0.16.1" +version = "0.17.0" edition = "2021" license = "MIT" description = "Download, resolve, and manage Extism WASM plugins." repository = "https://github.com/moonrepo/proto" [dependencies] -system_env = { version = "0.5.0", path = "../system-env" } -warpgate_api = { version = "0.9.0", path = "../warpgate-api" } +system_env = { version = "0.6.0", path = "../system-env" } +warpgate_api = { version = "0.10.0", path = "../warpgate-api" } extism = { workspace = true, features = ["http"] } miette = { workspace = true } once_cell = { workspace = true } From d4c755a0538f1913fd5fb813a62924b3e454e001 Mon Sep 17 00:00:00 2001 From: Miles Johnson Date: Thu, 15 Aug 2024 18:23:28 -0700 Subject: [PATCH 3/4] Update plugins. --- .prototools | 2 +- CHANGELOG.md | 1 + Cargo.lock | 115 +++++++++++++++++-------------- Cargo.toml | 10 +-- crates/cli/Cargo.toml | 2 +- crates/core/src/proto_config.rs | 18 ++--- crates/pdk-test-utils/Cargo.toml | 2 +- crates/warpgate/Cargo.toml | 2 +- 8 files changed, 81 insertions(+), 71 deletions(-) diff --git a/.prototools b/.prototools index bbd26d490..cfc4d4ce0 100644 --- a/.prototools +++ b/.prototools @@ -1,6 +1,6 @@ [plugins] moon-test = "https://raw.githubusercontent.com/moonrepo/moon/master/proto-plugin.toml" -wasm-test = "file://./plugins/target/wasm32-wasi/debug/proto_wasm_test.wasm" +# wasm-test = "file://./plugins/target/wasm32-wasi/debug/proto_wasm_test.wasm" # [tools.wasm-test] # number = 123 diff --git a/CHANGELOG.md b/CHANGELOG.md index 1bc4c3633..44e9f1f53 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,7 @@ - WASM API - Removed the `ToolMetadataOutput.inventory.disable_progress_bars` field. - Removed the `is_musl` function. Use the host environment instead. + - Migrated testing APIs to async instead of sync. - Deprecated many functions. #### 🚀 Updates diff --git a/Cargo.lock b/Cargo.lock index 914b1453d..bc885b460 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -399,14 +399,14 @@ dependencies = [ "js-sys", "num-traits", "wasm-bindgen", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] name = "clap" -version = "4.5.15" +version = "4.5.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11d8838454fda655dafd3accb2b6e2bea645b9e4078abe84a22ceb947235c5cc" +checksum = "ed6719fffa43d0d87e5fd8caeab59be1554fb028cd30edc88fc4369b17971019" dependencies = [ "clap_builder", "clap_derive", @@ -986,9 +986,9 @@ dependencies = [ [[package]] name = "extism" -version = "1.4.1" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "772bff1d1a09e26152a7fc08d44bad463a69ae29d85e652dc851a9a2ebc5b7f1" +checksum = "9b3dc6c1b4091536f0eb7ad69dc15624a9d79a044a6957994e7c6447941d8669" dependencies = [ "anyhow", "cbindgen", @@ -1011,9 +1011,9 @@ dependencies = [ [[package]] name = "extism-convert" -version = "1.4.1" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e5a978634c28e4b150213cc8265c211f24421a8ee5dea4126ece0dc60cbc709" +checksum = "7327af9eaa0d7fe470f6bb0ee7a724045629bc4e6653afbdb066fb5aea4023f0" dependencies = [ "anyhow", "base64 0.22.1", @@ -1027,9 +1027,9 @@ dependencies = [ [[package]] name = "extism-convert-macros" -version = "1.4.1" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c40464260bcb3982b9e1967e2446ebea4a4637772c1b39f29b6410f555367092" +checksum = "48fc993e1ec975698a3d6e8d88d6c81088397ba9b80c43c76fef8e8f7a631e72" dependencies = [ "manyhow", "proc-macro-crate", @@ -1040,9 +1040,9 @@ dependencies = [ [[package]] name = "extism-manifest" -version = "1.4.1" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a60b6ea31edc0831e28665b4e808175dd5acd4602bfcc5d31f09c97f334238d1" +checksum = "23f529ac444f67ea8e6f81c36fa01c9864c30ca62cb356114fd0a071fb3bf3a4" dependencies = [ "base64 0.22.1", "serde", @@ -1051,9 +1051,9 @@ dependencies = [ [[package]] name = "extism-pdk" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c26a361aeddab8ebbb6157eeed9a8341358d6843c5f5a53677466caf5f0b5eaf" +checksum = "0334e38735348bd085e518bfc284395fcb5c198ba65ce36f9712bd25ff9e7be0" dependencies = [ "anyhow", "base64 0.22.1", @@ -1066,9 +1066,9 @@ dependencies = [ [[package]] name = "extism-pdk-derive" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a024b0f20295098d1d19ad443fad077c1d8c1d81d09a2c20f0618ebd201517e" +checksum = "cc4b8ea80a1b89cf8b053bdc5df2385125bcb9110d19be289c2030c61c7c6ad9" dependencies = [ "proc-macro2", "quote", @@ -2077,7 +2077,7 @@ dependencies = [ "libc", "redox_syscall 0.5.1", "smallvec", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -2800,9 +2800,9 @@ dependencies = [ [[package]] name = "scc" -version = "2.1.14" +version = "2.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79da19444d9da7a9a82b80ecf059eceba6d3129d84a8610fd25ff2364f255466" +checksum = "c478f373151538826ed50feaceeef7095ad435065a48153af789005fd5e44c0d" dependencies = [ "sdd", ] @@ -3006,12 +3006,12 @@ dependencies = [ [[package]] name = "shared_child" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0d94659ad3c2137fef23ae75b03d5241d633f8acded53d672decfa0e6e0caef" +checksum = "09fa9338aed9a1df411814a5b2252f7cd206c55ae9bf2fa763f8de84603aa60c" dependencies = [ "libc", - "winapi", + "windows-sys 0.59.0", ] [[package]] @@ -3730,9 +3730,9 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "ureq" -version = "2.10.0" +version = "2.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72139d247e5f97a3eff96229a7ae85ead5328a39efe76f8bf5a06313d505b6ea" +checksum = "b74fc6b57825be3373f7054754755f03ac3a8f5d70015ccad699ba2029956f4a" dependencies = [ "base64 0.22.1", "flate2", @@ -4439,7 +4439,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "12342cb4d8e3b046f3d80effd474a7a02447231330ef77d71daa6fbc40681143" dependencies = [ "windows-core 0.57.0", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -4448,7 +4448,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -4460,7 +4460,7 @@ dependencies = [ "windows-implement", "windows-interface", "windows-result", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -4491,7 +4491,7 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8" dependencies = [ - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -4509,7 +4509,16 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.5", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets 0.52.6", ] [[package]] @@ -4529,18 +4538,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm 0.52.5", - "windows_aarch64_msvc 0.52.5", - "windows_i686_gnu 0.52.5", + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", "windows_i686_gnullvm", - "windows_i686_msvc 0.52.5", - "windows_x86_64_gnu 0.52.5", - "windows_x86_64_gnullvm 0.52.5", - "windows_x86_64_msvc 0.52.5", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", ] [[package]] @@ -4551,9 +4560,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] name = "windows_aarch64_msvc" @@ -4563,9 +4572,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" [[package]] name = "windows_i686_gnu" @@ -4575,15 +4584,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" [[package]] name = "windows_i686_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" [[package]] name = "windows_i686_msvc" @@ -4593,9 +4602,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] name = "windows_x86_64_gnu" @@ -4605,9 +4614,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] name = "windows_x86_64_gnullvm" @@ -4617,9 +4626,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] name = "windows_x86_64_msvc" @@ -4629,9 +4638,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" diff --git a/Cargo.toml b/Cargo.toml index aa25d1798..961f5c157 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,11 +6,11 @@ default-members = ["crates/cli"] [workspace.dependencies] anyhow = "1.0.86" async-trait = "0.1.81" -clap = "4.5.15" +clap = "4.5.16" clap_complete = "4.5.16" dirs = "5.0.1" extism = "1.0.0" # Lower for consumers -extism-pdk = "1.2.0" +extism-pdk = "1.2.1" human-sort = "0.2.2" indexmap = "2.4.0" miette = "7.2.0" @@ -22,11 +22,11 @@ reqwest = { version = "0.12.5", default-features = false, features = [ "macos-system-configuration", ] } rustc-hash = "2.0.0" -scc = "2.1.14" +scc = "2.1.15" schematic = { version = "0.17.2", default-features = false } semver = { version = "1.0.23", features = ["serde"] } -serde = { version = "1.0.207", features = ["derive"] } -serde_json = "1.0.124" +serde = { version = "1.0.208", features = ["derive"] } +serde_json = "1.0.125" sha2 = "0.10.8" shell-words = "1.1.0" starbase = { version = "0.8.2" } diff --git a/crates/cli/Cargo.toml b/crates/cli/Cargo.toml index 4d75907bf..ede1457f9 100644 --- a/crates/cli/Cargo.toml +++ b/crates/cli/Cargo.toml @@ -68,7 +68,7 @@ sigpipe = "0.1.3" [dev-dependencies] starbase_sandbox = { workspace = true } -shared_child = "1.0.0" +shared_child = "1.0.1" [target."cfg(windows)".dependencies] winreg = { version = "0.52.0", default-features = false } diff --git a/crates/core/src/proto_config.rs b/crates/core/src/proto_config.rs index 363ad194c..377de5f29 100644 --- a/crates/core/src/proto_config.rs +++ b/crates/core/src/proto_config.rs @@ -237,7 +237,7 @@ impl ProtoConfig { pub fn builtin_proto_plugin(&self) -> PluginLocator { PluginLocator::Url(Box::new(UrlLocator { - url: "https://github.com/moonrepo/tools/releases/download/proto_tool-v0.1.1/proto_tool.wasm".into() + url: "https://github.com/moonrepo/tools/releases/download/proto_tool-v0.2.0/proto_tool.wasm".into() })) } @@ -251,7 +251,7 @@ impl ProtoConfig { self.plugins.insert( Id::raw("bun"), PluginLocator::Url(Box::new(UrlLocator { - url: "https://github.com/moonrepo/tools/releases/download/bun_tool-v0.12.3/bun_tool.wasm".into() + url: "https://github.com/moonrepo/tools/releases/download/bun_tool-v0.13.0/bun_tool.wasm".into() })) ); } @@ -260,7 +260,7 @@ impl ProtoConfig { self.plugins.insert( Id::raw("deno"), PluginLocator::Url(Box::new(UrlLocator { - url: "https://github.com/moonrepo/tools/releases/download/deno_tool-v0.11.4/deno_tool.wasm".into() + url: "https://github.com/moonrepo/tools/releases/download/deno_tool-v0.12.0/deno_tool.wasm".into() })) ); } @@ -269,7 +269,7 @@ impl ProtoConfig { self.plugins.insert( Id::raw("go"), PluginLocator::Url(Box::new(UrlLocator { - url: "https://github.com/moonrepo/tools/releases/download/go_tool-v0.12.0/go_tool.wasm".into() + url: "https://github.com/moonrepo/tools/releases/download/go_tool-v0.13.0/go_tool.wasm".into() })) ); } @@ -278,7 +278,7 @@ impl ProtoConfig { self.plugins.insert( Id::raw("node"), PluginLocator::Url(Box::new(UrlLocator { - url: "https://github.com/moonrepo/tools/releases/download/node_tool-v0.11.8/node_tool.wasm".into() + url: "https://github.com/moonrepo/tools/releases/download/node_tool-v0.12.0/node_tool.wasm".into() })) ); } @@ -288,7 +288,7 @@ impl ProtoConfig { self.plugins.insert( Id::raw(depman), PluginLocator::Url(Box::new(UrlLocator { - url: "https://github.com/moonrepo/tools/releases/download/node_depman_tool-v0.12.0/node_depman_tool.wasm".into() + url: "https://github.com/moonrepo/tools/releases/download/node_depman_tool-v0.13.0/node_depman_tool.wasm".into() })) ); } @@ -298,7 +298,7 @@ impl ProtoConfig { self.plugins.insert( Id::raw("python"), PluginLocator::Url(Box::new(UrlLocator { - url: "https://github.com/moonrepo/tools/releases/download/python_tool-v0.10.5/python_tool.wasm".into() + url: "https://github.com/moonrepo/tools/releases/download/python_tool-v0.11.0/python_tool.wasm".into() })) ); } @@ -307,7 +307,7 @@ impl ProtoConfig { self.plugins.insert( Id::raw("rust"), PluginLocator::Url(Box::new(UrlLocator { - url: "https://github.com/moonrepo/tools/releases/download/rust_tool-v0.10.6/rust_tool.wasm".into() + url: "https://github.com/moonrepo/tools/releases/download/rust_tool-v0.11.0/rust_tool.wasm".into() })) ); } @@ -316,7 +316,7 @@ impl ProtoConfig { self.plugins.insert( Id::raw(SCHEMA_PLUGIN_KEY), PluginLocator::Url(Box::new(UrlLocator { - url: "https://github.com/moonrepo/tools/releases/download/schema_tool-v0.14.1/schema_tool.wasm".into() + url: "https://github.com/moonrepo/tools/releases/download/schema_tool-v0.15.0/schema_tool.wasm".into() })) ); } diff --git a/crates/pdk-test-utils/Cargo.toml b/crates/pdk-test-utils/Cargo.toml index bae90aa9f..aeb5c2d2e 100644 --- a/crates/pdk-test-utils/Cargo.toml +++ b/crates/pdk-test-utils/Cargo.toml @@ -14,7 +14,7 @@ warpgate = { version = "0.17.0", path = "../warpgate" } serde = { workspace = true } serde_json = { workspace = true } starbase_sandbox = { workspace = true } -toml = { version = "0.8.16", optional = true } +toml = { version = "0.8.19", optional = true } [features] default = [] diff --git a/crates/warpgate/Cargo.toml b/crates/warpgate/Cargo.toml index a6b667d11..cfd940a27 100644 --- a/crates/warpgate/Cargo.toml +++ b/crates/warpgate/Cargo.toml @@ -27,7 +27,7 @@ tokio = { workspace = true } tracing = { workspace = true } # Enabling certs for extism! -ureq = { version = "2.10.0", features = ["native-certs"] } +ureq = { version = "2.10.1", features = ["native-certs"] } [dev-dependencies] starbase_sandbox = { workspace = true } From d0bd5942c9be95f766e01458bbae52a5e021ba83 Mon Sep 17 00:00:00 2001 From: Miles Johnson Date: Thu, 15 Aug 2024 18:27:27 -0700 Subject: [PATCH 4/4] Update changelog. --- .prototools | 2 +- CHANGELOG.md | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.prototools b/.prototools index cfc4d4ce0..bbd26d490 100644 --- a/.prototools +++ b/.prototools @@ -1,6 +1,6 @@ [plugins] moon-test = "https://raw.githubusercontent.com/moonrepo/moon/master/proto-plugin.toml" -# wasm-test = "file://./plugins/target/wasm32-wasi/debug/proto_wasm_test.wasm" +wasm-test = "file://./plugins/target/wasm32-wasi/debug/proto_wasm_test.wasm" # [tools.wasm-test] # number = 123 diff --git a/CHANGELOG.md b/CHANGELOG.md index 44e9f1f53..e1b2fce29 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -42,6 +42,17 @@ - Added a new `send_request` host function, that uses the same HTTP client as proto does. - Added `fetch_bytes`, `fetch_json`, and `fetch_text` functions that use this new host function. +#### 🧩 Plugins + +- Updated `bun_tool` to v0.13. +- Updated `deno_tool` to v0.12. +- Updated `go_tool` to v0.13. +- Updated `node_tool` to v0.12. +- Updated `node_depman_tool` to v0.13. +- Updated `python_tool` to v0.11. +- Updated `rust_tool` to v0.11. +- Updated `schema_tool` to v0.15. + #### ⚙️ Internal - We now provide a plugin for proto itself, so you can now do `proto install proto`. However, this doesn't link bins/shims and is primarily used internally for upgrade/install flows.