diff --git a/CHANGELOG.md b/CHANGELOG.md index c1fadbc..310a6bf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## 0.11.5 + +#### 🐞 Fixes + +- Fixed version parsing for versions that contain `.x`. + ## 0.11.4 #### 🚀 Updates diff --git a/Cargo.lock b/Cargo.lock index 1f22717..6454759 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -39,12 +39,6 @@ dependencies = [ "memchr", ] -[[package]] -name = "allocator-api2" -version = "0.2.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" - [[package]] name = "ambient-authority" version = "0.0.2" @@ -237,39 +231,6 @@ version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" -[[package]] -name = "cached" -version = "0.51.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0feb64151eed3da6107fddd2d717a6ca4b9dbd74e43784c55c841d1abfe5a295" -dependencies = [ - "ahash", - "cached_proc_macro", - "cached_proc_macro_types", - "hashbrown 0.14.5", - "instant", - "once_cell", - "thiserror", -] - -[[package]] -name = "cached_proc_macro" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "771aa57f3b17da6c8bcacb187bb9ec9bc81c8160e72342e67c329e0e1651a669" -dependencies = [ - "darling", - "proc-macro2", - "quote", - "syn 2.0.68", -] - -[[package]] -name = "cached_proc_macro_types" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ade8366b8bd5ba243f0a58f036cc0ca8a2f069cff1a2351ef1cac6b083e16fc0" - [[package]] name = "cap-fs-ext" version = "2.0.1" @@ -1249,7 +1210,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" dependencies = [ "ahash", - "allocator-api2", ] [[package]] @@ -1332,15 +1292,16 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.26.0" +version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0bea761b46ae2b24eb4aef630d8d1c398157b6fc29e6350ecf090a0b70c952c" +checksum = "5ee4be2c948921a1a5320b629c4193916ed787a7f7f293fd3f7f5a6c9de74155" dependencies = [ "futures-util", "http", "hyper", "hyper-util", - "rustls", + "rustls 0.23.11", + "rustls-native-certs", "rustls-pki-types", "tokio", "tokio-rustls", @@ -1461,15 +1422,6 @@ dependencies = [ "similar", ] -[[package]] -name = "instant" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" -dependencies = [ - "cfg-if", -] - [[package]] name = "io-extras" version = "0.18.2" @@ -1792,7 +1744,7 @@ dependencies = [ [[package]] name = "node_depman_plugin" -version = "0.11.4" +version = "0.11.5" dependencies = [ "extism-pdk", "node_common", @@ -1809,7 +1761,7 @@ dependencies = [ [[package]] name = "node_plugin" -version = "0.11.4" +version = "0.11.5" dependencies = [ "extism-pdk", "node_common", @@ -2109,7 +2061,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "81bddcdb20abf9501610992b6759a4c888aef7d1a7247ef75e2404275ac24af1" dependencies = [ "anyhow", - "itertools 0.10.5", + "itertools 0.11.0", "proc-macro2", "quote", "syn 2.0.68", @@ -2117,11 +2069,10 @@ dependencies = [ [[package]] name = "proto_core" -version = "0.37.1" +version = "0.38.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12686907cd92fc1b09741a9973f1c33aabdb5e6ba779f4c296ed8bf6cd1ae5aa" +checksum = "3a9c915f1dcd42c6511464ef45eac243901a390205b1668d8f1e1448dcaf7685" dependencies = [ - "cached", "indexmap 2.2.6", "miette", "minisign-verify", @@ -2130,7 +2081,7 @@ dependencies = [ "proto_shim", "regex", "reqwest", - "rustc-hash 1.1.0", + "rustc-hash 2.0.0", "schematic", "semver", "serde", @@ -2140,7 +2091,7 @@ dependencies = [ "starbase_archive", "starbase_events", "starbase_styles", - "starbase_utils 0.7.5", + "starbase_utils", "thiserror", "tracing", "url", @@ -2151,9 +2102,9 @@ dependencies = [ [[package]] name = "proto_pdk" -version = "0.21.1" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0cc15eb5f3bdea06e409ae31aaa918bc7b9798b8a62196aa320605b85cdd873" +checksum = "1b81e2bf0e10ed0db885ff826821492c7b76bcea7f7c88f161a837f83cc0860f" dependencies = [ "extism-pdk", "proto_pdk_api", @@ -2164,9 +2115,9 @@ dependencies = [ [[package]] name = "proto_pdk_api" -version = "0.21.1" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb274c86fd9e2c5018a3154e12b5bb8b8b9f72755c2956dad629385732cfce0f" +checksum = "764ff02c661b22e35e3797e5446326dd6ea1e0dc05bcf6ce982736ba3ab338c6" dependencies = [ "rustc-hash 2.0.0", "semver", @@ -2180,9 +2131,9 @@ dependencies = [ [[package]] name = "proto_pdk_test_utils" -version = "0.25.0" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6496c0f4114c65dc229aad80ce5ae120e93f52b1399b8b8c4b47e2c785b9ed5" +checksum = "f9de4549d636bbe65443fd46b0f22102156decc9f6470cd6fd229b8ba0279efa" dependencies = [ "proto_core", "proto_pdk_api", @@ -2211,6 +2162,53 @@ dependencies = [ "cc", ] +[[package]] +name = "quinn" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4ceeeeabace7857413798eb1ffa1e9c905a9946a57d81fb69b4b71c4d8eb3ad" +dependencies = [ + "bytes", + "pin-project-lite", + "quinn-proto", + "quinn-udp", + "rustc-hash 1.1.0", + "rustls 0.23.11", + "thiserror", + "tokio", + "tracing", +] + +[[package]] +name = "quinn-proto" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ddf517c03a109db8100448a4be38d498df8a210a99fe0e1b9eaf39e78c640efe" +dependencies = [ + "bytes", + "rand", + "ring", + "rustc-hash 1.1.0", + "rustls 0.23.11", + "slab", + "thiserror", + "tinyvec", + "tracing", +] + +[[package]] +name = "quinn-udp" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9096629c45860fc7fb143e125eb826b5e721e10be3263160c7d60ca832cf8c46" +dependencies = [ + "libc", + "once_cell", + "socket2", + "tracing", + "windows-sys 0.52.0", +] + [[package]] name = "quote" version = "1.0.36" @@ -2356,17 +2354,11 @@ version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" -[[package]] -name = "relative-path" -version = "1.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba39f3699c378cd8970968dcbff9c43159ea4cfbd88d43c00b22f2ef10a435d2" - [[package]] name = "reqwest" -version = "0.12.4" +version = "0.12.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "566cafdd92868e0939d3fb961bd0dc25fcfaaed179291093b3d43e6b3150ea10" +checksum = "c7d6d2a27d57148378eb5e111173f4276ad26340ecc5c49a4a2152167a2d6a37" dependencies = [ "base64 0.22.1", "bytes", @@ -2387,7 +2379,8 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", - "rustls", + "quinn", + "rustls 0.23.11", "rustls-native-certs", "rustls-pemfile", "rustls-pki-types", @@ -2490,6 +2483,20 @@ dependencies = [ "zeroize", ] +[[package]] +name = "rustls" +version = "0.23.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4828ea528154ae444e5a642dbb7d5623354030dc9822b83fd9bb79683c7399d0" +dependencies = [ + "once_cell", + "ring", + "rustls-pki-types", + "rustls-webpki", + "subtle", + "zeroize", +] + [[package]] name = "rustls-native-certs" version = "0.7.0" @@ -2521,9 +2528,9 @@ checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d" [[package]] name = "rustls-webpki" -version = "0.102.4" +version = "0.102.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff448f7e92e913c4b7d4c6d8e4540a1724b319b4152b8aef6d4cf8339712b33e" +checksum = "f9a6fccd794a42c2c105b513a2f62bc3fd8f3ba57a4593677ceb0bd035164d78" dependencies = [ "ring", "rustls-pki-types", @@ -2659,18 +2666,18 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.203" +version = "1.0.204" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" +checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.203" +version = "1.0.204" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" +checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222" dependencies = [ "proc-macro2", "quote", @@ -2851,16 +2858,16 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" [[package]] name = "starbase_archive" -version = "0.7.4" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1159e924d28043b3eb045d9a70e30312a50d31c7271ee0720865a32ba36042bf" +checksum = "e800f7aaa0528904cb9bbb8028a1e17c3604125c0e074eb2b4dc259359536f8d" dependencies = [ "binstall-tar", "flate2", "miette", - "rustc-hash 1.1.0", + "rustc-hash 2.0.0", "starbase_styles", - "starbase_utils 0.7.5", + "starbase_utils", "thiserror", "tracing", "xz2", @@ -2870,9 +2877,9 @@ dependencies = [ [[package]] name = "starbase_events" -version = "0.6.1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c96e6586ad2f10fcbc6d30fe330b7ea88709de3d55db6259a64e309937016b4e" +checksum = "b3b6f1a59e2dc038c76f66663148656c6422c7489762cdaa8cfb4281eae9cf7f" dependencies = [ "async-trait", "miette", @@ -2882,9 +2889,9 @@ dependencies = [ [[package]] name = "starbase_macros" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "052d4a67b75ca00709992b99a332679b21d621d3aad441a11d89dc4e1d42bd14" +checksum = "82f8e4464e968bcddf34a1d1489056387acab70521535e6e6c030330b1aab0d8" dependencies = [ "darling", "proc-macro2", @@ -2905,7 +2912,7 @@ dependencies = [ "once_cell", "predicates", "pretty_assertions", - "starbase_utils 0.8.0", + "starbase_utils", ] [[package]] @@ -2921,16 +2928,15 @@ dependencies = [ [[package]] name = "starbase_utils" -version = "0.7.5" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06fac1efba629ebe53fd2363b0af2a7b4f9a2a79540e53b1f0bbdd08c3cb6fbf" +checksum = "0dbe00ed72e809e023642fb2d181516befcc10cb517da9a47bbb6904ec8614ab" dependencies = [ "dirs 5.0.1", "fs4", "json-strip-comments", "miette", "once_cell", - "relative-path", "reqwest", "serde", "serde_json", @@ -2943,19 +2949,6 @@ dependencies = [ "wax", ] -[[package]] -name = "starbase_utils" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dbe00ed72e809e023642fb2d181516befcc10cb517da9a47bbb6904ec8614ab" -dependencies = [ - "dirs 5.0.1", - "once_cell", - "starbase_styles", - "thiserror", - "tracing", -] - [[package]] name = "static_assertions" version = "1.1.0" @@ -3007,9 +3000,9 @@ dependencies = [ [[package]] name = "sync_wrapper" -version = "0.1.2" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" +checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" [[package]] name = "system-configuration" @@ -3162,11 +3155,11 @@ dependencies = [ [[package]] name = "tokio-rustls" -version = "0.25.0" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f" +checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" dependencies = [ - "rustls", + "rustls 0.23.11", "rustls-pki-types", "tokio", ] @@ -3394,7 +3387,7 @@ dependencies = [ "flate2", "log", "once_cell", - "rustls", + "rustls 0.22.4", "rustls-pki-types", "rustls-webpki", "url", @@ -3415,9 +3408,9 @@ dependencies = [ [[package]] name = "uuid" -version = "1.8.0" +version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" +checksum = "5de17fd2f7da591098415cff336e12965a28061ddace43b59cb3c430179c9439" dependencies = [ "getrandom", ] @@ -3436,9 +3429,9 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "version_spec" -version = "0.6.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8316e120cf9c849f9ca6604ac7c42cce70b363d566843025874f1ab92daaa5b" +checksum = "037cc6c66ece56eaf96a6be8484a59eb6a3fe64fb1b26475468ffc4afc727c8a" dependencies = [ "human-sort", "regex", @@ -3478,9 +3471,9 @@ dependencies = [ [[package]] name = "warpgate" -version = "0.15.0" +version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2506eb3a4dbb45af4e2e409055483f904ed56f20943e43442ae1eb85b75df924" +checksum = "31fa92c8cc7b9e1dbfb265abd71d8a667625be5981cc543b53c0528b0127ad78" dependencies = [ "extism", "miette", @@ -3494,7 +3487,7 @@ dependencies = [ "sha2", "starbase_archive", "starbase_styles", - "starbase_utils 0.7.5", + "starbase_utils", "system_env", "thiserror", "tracing", diff --git a/Cargo.toml b/Cargo.toml index 4fca444..25d99bd 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -5,14 +5,14 @@ members = ["crates/*"] [workspace.dependencies] extism-pdk = { version = "1.2.0" } nodejs_package_json = "0.2.0" -proto_pdk = { version = "0.21.1" } #, path = "../../proto/crates/pdk" } -proto_pdk_api = { version = "0.21.1" } #, path = "../../proto/crates/pdk-api" } -proto_pdk_test_utils = { version = "0.25.0" } #, path = "../../proto/crates/pdk-test-utils" } +proto_pdk = { version = "0.21.2" } #, path = "../../proto/crates/pdk" } +proto_pdk_api = { version = "0.21.2" } #, path = "../../proto/crates/pdk-api" } +proto_pdk_test_utils = { version = "0.25.1" } #, path = "../../proto/crates/pdk-test-utils" } regex = { version = "1.10.5", default-features = false, features = [ "std", "unicode", ] } -serde = "1.0.203" +serde = "1.0.204" serde_json = "1.0.120" starbase_sandbox = "0.6.4" tokio = { version = "1.38.0", features = ["full"] } diff --git a/crates/node-depman/Cargo.toml b/crates/node-depman/Cargo.toml index 3e58e13..9b07707 100644 --- a/crates/node-depman/Cargo.toml +++ b/crates/node-depman/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "node_depman_plugin" -version = "0.11.4" +version = "0.11.5" edition = "2021" license = "MIT" publish = false diff --git a/crates/node/Cargo.toml b/crates/node/Cargo.toml index d9c25ba..05888f2 100644 --- a/crates/node/Cargo.toml +++ b/crates/node/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "node_plugin" -version = "0.11.4" +version = "0.11.5" edition = "2021" license = "MIT" publish = false diff --git a/crates/node/tests/versions_test.rs b/crates/node/tests/versions_test.rs index 2b246ad..bbe0949 100644 --- a/crates/node/tests/versions_test.rs +++ b/crates/node/tests/versions_test.rs @@ -5,8 +5,8 @@ generate_resolve_versions_tests!("node-test", { "10.1" => "10.1.0", "lts-gallium" => "16.20.2", "lts/fermium" => "14.21.3", - "stable" => "20.15.0", - "node" => "22.4.0", + "stable" => "20.15.1", + "node" => "22.4.1", }); #[test]