diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index d9030f93b48..39054e706bf 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -28,7 +28,7 @@ jobs: with: bins: just,cargo-wasi cache: false - - run: rustup target add wasm32-wasi + targets: wasm32-wasip1 - name: Building crates run: just build-wasm format: diff --git a/.gitignore b/.gitignore index 60975177810..b17a8555ec2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ /target +/wasm/*/target node_modules/ .nx bazel-remote diff --git a/.yarn/versions/7275a654.yml b/.yarn/versions/7275a654.yml new file mode 100644 index 00000000000..1f2a5d9c201 --- /dev/null +++ b/.yarn/versions/7275a654.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/CHANGELOG.md b/CHANGELOG.md index 24ad9a226f3..3495c541c33 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## Unreleased + +#### ⚙️ Internal + +- Updated Rust to v1.84. + ## 1.31.1 #### 🐞 Fixes diff --git a/Cargo.lock b/Cargo.lock index 11fdf8b1780..b9b3782c225 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -911,9 +911,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.24" +version = "4.5.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9560b07a799281c7e0958b9296854d6fafd4c5f31444a7e5bb1ad6dde5ccf1bd" +checksum = "a8eb5e908ef3a6efbe1ed62520fb7287959888c88485abe072543190ecc66783" dependencies = [ "clap_builder", "clap_derive", @@ -921,9 +921,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.24" +version = "4.5.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "874e0dd3eb68bf99058751ac9712f622e61e6f393a94f7128fa26e3f02f5c7cd" +checksum = "96b01801b5fc6a0a232407abc821660c9c6d25a1cafc0d4f85f29fb8d9afc121" dependencies = [ "anstream", "anstyle", @@ -934,9 +934,9 @@ dependencies = [ [[package]] name = "clap_complete" -version = "4.5.41" +version = "4.5.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "942dc5991a34d8cf58937ec33201856feba9cbceeeab5adf04116ec7c763bff1" +checksum = "33a7e468e750fa4b6be660e8b5651ad47372e8fb114030b594c2d75d48c5ffd0" dependencies = [ "clap", ] @@ -2853,9 +2853,9 @@ checksum = "db13adb97ab515a3691f56e4dbab09283d0b86cb45abd991d8634a9d6f501760" [[package]] name = "libc" -version = "0.2.167" +version = "0.2.169" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09d6582e104315a817dff97f75133544b2e094ee22447d2acf4a74e189ba06fc" +checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a" [[package]] name = "libm" @@ -3202,7 +3202,7 @@ dependencies = [ "petgraph", "rustc-hash", "starbase_sandbox", - "thiserror 2.0.9", + "thiserror 2.0.10", "tokio", "tracing", ] @@ -3308,7 +3308,7 @@ dependencies = [ "semver", "serde", "starbase_utils", - "thiserror 2.0.9", + "thiserror 2.0.10", "tokio", "tokio-util", "tracing", @@ -3398,7 +3398,7 @@ dependencies = [ "starbase_utils", "system_env", "tera", - "thiserror 2.0.9", + "thiserror 2.0.10", "tiny_http", "tokio", "tracing", @@ -3420,7 +3420,7 @@ version = "0.0.1" dependencies = [ "miette 7.4.0", "shell-words", - "thiserror 2.0.9", + "thiserror 2.0.10", ] [[package]] @@ -3569,7 +3569,7 @@ dependencies = [ "starbase_sandbox", "starbase_utils", "tera", - "thiserror 2.0.9", + "thiserror 2.0.10", "tokio", "tracing", ] @@ -3600,7 +3600,7 @@ dependencies = [ "schematic", "serde", "starbase_styles", - "thiserror 2.0.9", + "thiserror 2.0.10", ] [[package]] @@ -3774,7 +3774,7 @@ dependencies = [ "serde", "starbase_sandbox", "starbase_utils", - "thiserror 2.0.9", + "thiserror 2.0.10", ] [[package]] @@ -3999,7 +3999,7 @@ dependencies = [ "starbase_sandbox", "starbase_styles", "starbase_utils", - "thiserror 2.0.9", + "thiserror 2.0.10", "tokio", "tracing", "warpgate", @@ -4018,7 +4018,7 @@ dependencies = [ "rustc-hash", "starbase_shell", "system_env", - "thiserror 2.0.9", + "thiserror 2.0.10", "tokio", "tracing", ] @@ -4033,7 +4033,7 @@ dependencies = [ "moon_file_group", "moon_task", "serde", - "thiserror 2.0.9", + "thiserror 2.0.10", ] [[package]] @@ -4062,7 +4062,7 @@ dependencies = [ "moon_common", "moon_config", "moon_project", - "thiserror 2.0.9", + "thiserror 2.0.10", ] [[package]] @@ -4076,7 +4076,7 @@ dependencies = [ "rustc-hash", "starbase_sandbox", "starbase_utils", - "thiserror 2.0.9", + "thiserror 2.0.10", "tracing", ] @@ -4101,7 +4101,7 @@ dependencies = [ "starbase_events", "starbase_sandbox", "starbase_utils", - "thiserror 2.0.9", + "thiserror 2.0.10", "tokio", "tracing", ] @@ -4179,7 +4179,7 @@ dependencies = [ "pest", "pest_derive", "starbase_utils", - "thiserror 2.0.9", + "thiserror 2.0.10", "tracing", ] @@ -4200,7 +4200,7 @@ dependencies = [ "serde", "sha2", "starbase_utils", - "thiserror 2.0.9", + "thiserror 2.0.10", "tokio", "tonic", "tracing", @@ -4303,7 +4303,7 @@ dependencies = [ "regex", "schematic", "serde", - "thiserror 2.0.9", + "thiserror 2.0.10", "tracing", ] @@ -4344,7 +4344,7 @@ dependencies = [ "moon_toolchain", "rustc-hash", "starbase_sandbox", - "thiserror 2.0.9", + "thiserror 2.0.10", "tokio", "tracing", ] @@ -4368,7 +4368,7 @@ dependencies = [ "rustc-hash", "starbase_sandbox", "starbase_utils", - "thiserror 2.0.9", + "thiserror 2.0.10", "tracing", ] @@ -4386,7 +4386,7 @@ dependencies = [ "moon_task_expander", "petgraph", "rustc-hash", - "thiserror 2.0.9", + "thiserror 2.0.10", "tracing", ] @@ -4437,7 +4437,7 @@ dependencies = [ "starbase_archive", "starbase_sandbox", "starbase_utils", - "thiserror 2.0.9", + "thiserror 2.0.10", "tokio", "tokio-util", "tracing", @@ -4506,7 +4506,7 @@ dependencies = [ "proto_core", "rustc-hash", "starbase_styles", - "thiserror 2.0.9", + "thiserror 2.0.10", "tokio", "warpgate", ] @@ -4613,7 +4613,7 @@ dependencies = [ "serde", "starbase_sandbox", "starbase_utils", - "thiserror 2.0.9", + "thiserror 2.0.10", "tokio", "tracing", ] @@ -4659,7 +4659,7 @@ dependencies = [ "serde", "starbase_events", "starbase_utils", - "thiserror 2.0.9", + "thiserror 2.0.10", "tracing", ] @@ -4731,7 +4731,7 @@ dependencies = [ "semver", "serde", "serde_json", - "thiserror 2.0.9", + "thiserror 2.0.10", ] [[package]] @@ -4994,7 +4994,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b7cafe60d6cf8e62e1b9b2ea516a089c008945bb5a275416789e7db0bc199dc" dependencies = [ "memchr", - "thiserror 2.0.9", + "thiserror 2.0.10", "ucd-trie", ] @@ -5312,9 +5312,9 @@ dependencies = [ [[package]] name = "proto_core" -version = "0.44.3" +version = "0.44.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16652b7f710c617b5caaa38d41cc8ebc8ea9f5472471e614eab365dcc221de69" +checksum = "61c65b12ed528d47b89e6c89323928e0c39f1042173bf32cbe5c053bef088b6b" dependencies = [ "convert_case", "dotenvy", @@ -5336,7 +5336,7 @@ dependencies = [ "starbase_archive", "starbase_styles", "starbase_utils", - "thiserror 2.0.9", + "thiserror 2.0.10", "tracing", "url", "uuid", @@ -5356,7 +5356,7 @@ dependencies = [ "starbase_styles", "starbase_utils", "system_env", - "thiserror 2.0.9", + "thiserror 2.0.10", "tracing", ] @@ -5372,7 +5372,7 @@ dependencies = [ "serde", "serde_json", "system_env", - "thiserror 2.0.9", + "thiserror 2.0.10", "version_spec", "warpgate_api", ] @@ -5956,7 +5956,7 @@ dependencies = [ "serde_path_to_error", "serde_yaml", "starbase_styles", - "thiserror 2.0.9", + "thiserror 2.0.10", "toml", "tracing", ] @@ -6399,7 +6399,7 @@ dependencies = [ "rustc-hash", "starbase_styles", "starbase_utils", - "thiserror 2.0.9", + "thiserror 2.0.10", "tracing", "xz2", "zip", @@ -6453,7 +6453,7 @@ checksum = "d4a1e16cb1a23e18cb58c0e4793a786a6b3a459bef6f689333ee7a65a379d6b4" dependencies = [ "regex", "sysinfo", - "thiserror 2.0.9", + "thiserror 2.0.10", "tracing", ] @@ -6488,7 +6488,7 @@ dependencies = [ "serde_json", "serde_yaml", "starbase_styles", - "thiserror 2.0.9", + "thiserror 2.0.10", "tokio", "toml", "tracing", @@ -6779,11 +6779,11 @@ dependencies = [ [[package]] name = "thiserror" -version = "2.0.9" +version = "2.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f072643fd0190df67a8bab670c20ef5d8737177d6ac6b2e9a236cb096206b2cc" +checksum = "a3ac7f54ca534db81081ef1c1e7f6ea8a3ef428d2fc069097c079443d24124d3" dependencies = [ - "thiserror-impl 2.0.9", + "thiserror-impl 2.0.10", ] [[package]] @@ -6799,9 +6799,9 @@ dependencies = [ [[package]] name = "thiserror-impl" -version = "2.0.9" +version = "2.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b50fa271071aae2e6ee85f842e2e28ba8cd2c5fb67f11fcb1fd70b276f9e7d4" +checksum = "9e9465d30713b56a37ede7185763c3492a91be2f5fa68d958c44e41ab9248beb" dependencies = [ "proc-macro2", "quote", @@ -6897,9 +6897,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.42.0" +version = "1.43.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cec9b21b0450273377fc97bd4c33a8acffc8c996c987a7c5b319a0083707551" +checksum = "3d61fa4ffa3de412bfea335c6ecff681de2b609ba3c77ef3e00e521813a9ed9e" dependencies = [ "backtrace", "bytes", @@ -6916,9 +6916,9 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" +checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8" dependencies = [ "proc-macro2", "quote", @@ -7395,7 +7395,7 @@ dependencies = [ "schematic", "semver", "serde", - "thiserror 2.0.9", + "thiserror 2.0.10", ] [[package]] @@ -7452,7 +7452,7 @@ dependencies = [ "starbase_styles", "starbase_utils", "system_env", - "thiserror 2.0.9", + "thiserror 2.0.10", "tokio", "tracing", "ureq", @@ -8426,7 +8426,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1123fd5b3197a2de22c3f41904d82ee680577c634b8d2cbb56e61d0b5ed312d5" dependencies = [ "nom", - "thiserror 2.0.9", + "thiserror 2.0.10", ] [[package]] @@ -8536,7 +8536,7 @@ dependencies = [ "flate2", "indexmap 2.7.0", "memchr", - "thiserror 2.0.9", + "thiserror 2.0.10", "zopfli", ] diff --git a/Cargo.toml b/Cargo.toml index b2e8103b436..e00c736013e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,5 +1,5 @@ [workspace] -resolver = "2" +resolver = "3" members = [ "crates/*", "legacy/core/*", @@ -23,11 +23,11 @@ cached = "0.54.0" chrono = { version = "0.4.39", features = ["serde"] } cd_env = "0.2.0" ci_env = "0.3.0" -clap = { version = "4.5.24", default-features = false, features = [ +clap = { version = "4.5.26", default-features = false, features = [ "std", "error-context", ] } -clap_complete = "4.5.41" +clap_complete = "4.5.42" compact_str = { version = "0.8.1", default-features = false, features = [ "serde", ] } @@ -78,8 +78,8 @@ starbase_utils = { version = "0.9.1", default-features = false, features = [ "miette", ] } tera = { version = "1.20.0", features = ["preserve_order"] } -thiserror = "2.0.9" -tokio = { version = "1.42.0", default-features = false, features = [ +thiserror = "2.0.10" +tokio = { version = "1.43.0", default-features = false, features = [ "macros", "process", "rt-multi-thread", @@ -95,7 +95,7 @@ uuid = { version = "1.11.0", features = ["v4"] } # proto/plugin related extism = "=1.9.1" extism-pdk = "1.3.0" -proto_core = "0.44.3" +proto_core = "0.44.4" proto_installer = "0.8.0" system_env = "0.6.1" version_spec = "0.7.1" diff --git a/crates/action-pipeline/src/job_dispatcher.rs b/crates/action-pipeline/src/job_dispatcher.rs index 16eaab5b529..39d78603a29 100644 --- a/crates/action-pipeline/src/job_dispatcher.rs +++ b/crates/action-pipeline/src/job_dispatcher.rs @@ -31,7 +31,7 @@ impl<'graph> JobDispatcher<'graph> { } // This is based on the `Topo` struct from petgraph! -impl<'graph> JobDispatcher<'graph> { +impl JobDispatcher<'_> { pub async fn next(&mut self) -> Option { let completed = self.context.completed_jobs.read().await; diff --git a/crates/app/src/commands/upgrade.rs b/crates/app/src/commands/upgrade.rs index e34e4a37abe..d31a4abe6ca 100644 --- a/crates/app/src/commands/upgrade.rs +++ b/crates/app/src/commands/upgrade.rs @@ -20,7 +20,7 @@ pub fn is_musl() -> bool { return false; }; - String::from_utf8(output.stdout).map_or(false, |out| out.contains("musl")) + String::from_utf8(output.stdout).is_ok_and(|out| out.contains("musl")) } #[instrument(skip_all)] diff --git a/crates/cli/tests/run_rust_test.rs b/crates/cli/tests/run_rust_test.rs index c556cea5a52..708551a98b6 100644 --- a/crates/cli/tests/run_rust_test.rs +++ b/crates/cli/tests/run_rust_test.rs @@ -181,7 +181,7 @@ mod rustup_toolchain { let toolchain_config = PartialToolchainConfig { rust: Some(PartialRustConfig { components: Some(vec!["clippy".into()]), - targets: Some(vec!["wasm32-wasi".into()]), + targets: Some(vec!["wasm32-wasip1".into()]), ..PartialRustConfig::default() }), ..PartialToolchainConfig::default() diff --git a/crates/process/src/async_command.rs b/crates/process/src/async_command.rs index 3e2a5e06bdf..8fb3c27f812 100644 --- a/crates/process/src/async_command.rs +++ b/crates/process/src/async_command.rs @@ -16,7 +16,7 @@ pub struct AsyncCommand<'cmd> { pub current_id: Option, } -impl<'cmd> AsyncCommand<'cmd> { +impl AsyncCommand<'_> { pub async fn exec_capture_output(&mut self) -> miette::Result { self.inspector.log_command(); diff --git a/crates/task-runner/src/output_archiver.rs b/crates/task-runner/src/output_archiver.rs index b65330f05a1..2541cc0ee1f 100644 --- a/crates/task-runner/src/output_archiver.rs +++ b/crates/task-runner/src/output_archiver.rs @@ -20,7 +20,7 @@ pub struct OutputArchiver<'task> { pub task: &'task Task, } -impl<'task> OutputArchiver<'task> { +impl OutputArchiver<'_> { #[instrument(skip(self, operation))] pub async fn archive( &self, diff --git a/crates/task-runner/src/output_hydrater.rs b/crates/task-runner/src/output_hydrater.rs index 48bdfeacceb..209fa7b71a1 100644 --- a/crates/task-runner/src/output_hydrater.rs +++ b/crates/task-runner/src/output_hydrater.rs @@ -24,7 +24,7 @@ pub struct OutputHydrater<'task> { pub task: &'task Task, } -impl<'task> OutputHydrater<'task> { +impl OutputHydrater<'_> { #[instrument(skip(self, operation))] pub async fn hydrate( &self, diff --git a/crates/test-utils/src/workspace_mocker.rs b/crates/test-utils/src/workspace_mocker.rs index c77d43c2019..8b72e0d7e2c 100644 --- a/crates/test-utils/src/workspace_mocker.rs +++ b/crates/test-utils/src/workspace_mocker.rs @@ -130,9 +130,9 @@ impl WorkspaceMocker { .await } - pub async fn build_workspace_graph_with_options<'l>( + pub async fn build_workspace_graph_with_options( &self, - mut options: WorkspaceMockOptions<'l>, + mut options: WorkspaceMockOptions<'_>, ) -> WorkspaceGraph { let context = options .context diff --git a/justfile b/justfile index 9d362abd2a1..45173d10c6b 100644 --- a/justfile +++ b/justfile @@ -10,7 +10,7 @@ build: cargo build --workspace build-wasm: - cd wasm/test-plugin && cargo wasi build + cd wasm/test-plugin && cargo build --target wasm32-wasip1 # CHECKING @@ -74,7 +74,7 @@ schemas: cargo run -p moon_config_schema --features typescript clean-bazel-remote: - rm -f ~/.moon/bazel-cache/cas.v2/.DS_Store && rm -f ~/.moon/bazel-cache/ac.v2/.DS_Store + rm -f ~/.moon/bazel-cache/cas.v2/.DS_Store && rm -f ~/.moon/bazel-cache/ac.v2/.DS_Store bazel-remote: just clean-bazel-remote && bazel-remote --dir ~/.moon/bazel-cache --max_size 10 --storage_mode uncompressed --grpc_address 0.0.0.0:9092 diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 80f03dfe12b..d2bcae8ceb6 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,3 +1,3 @@ [toolchain] profile = "default" -channel = "1.83.0" +channel = "1.84.0" diff --git a/wasm/test-plugin/Cargo.lock b/wasm/test-plugin/Cargo.lock index 11ee02b4be6..6b7dc43d0f0 100644 --- a/wasm/test-plugin/Cargo.lock +++ b/wasm/test-plugin/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "aho-corasick" @@ -13,9 +13,15 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.86" +version = "1.0.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" +checksum = "34ac096ce696dc2fcabef30516bb13c0a68a11d30131d3df6f04711467681b04" + +[[package]] +name = "autocfg" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" [[package]] name = "bitflags" @@ -29,11 +35,17 @@ version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + [[package]] name = "castaway" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a17ed5635fc8536268e5d4de1e22e81ac34419e5f052d4d51f4e01dcc263fcc" +checksum = "0abae9be0aaf9ea96a3b1b8b1b55c602ca751eba1b1500220cea4ecbafe7c0d5" dependencies = [ "rustversion", ] @@ -46,14 +58,16 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "compact_str" -version = "0.7.1" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f86b9c4c00838774a6d902ef931eff7470720c51d90c2e32cfe15dc304737b3f" +checksum = "3b79c4069c6cad78e2e0cdfcbd26275770669fb39fd308a752dc110e83b9af32" dependencies = [ "castaway", "cfg-if", "itoa", + "rustversion", "ryu", + "serde", "static_assertions", ] @@ -122,6 +136,12 @@ dependencies = [ "windows-sys", ] +[[package]] +name = "dunce" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813" + [[package]] name = "equivalent" version = "1.0.1" @@ -145,9 +165,9 @@ dependencies = [ [[package]] name = "garde" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a3233677ea1554a48235d81bb59d2a41654969a8e29a1316c48105fd1701693" +checksum = "1dbf10452e3dbf51033a5035a05762b2653c43bf84d46e96f15bc93beedd426d" dependencies = [ "compact_str", "garde_derive", @@ -159,9 +179,9 @@ dependencies = [ [[package]] name = "garde_derive" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8796f322e43105351a7ec35148807b32b5b6058a539656dafe4a5b456d5ca41f" +checksum = "ccfdbc9c39fad7991686e229c55cf71565eafe73dcb2cf38ddf1d4aa3ca7e176" dependencies = [ "proc-macro2", "quote", @@ -182,9 +202,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.14.3" +version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" +checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289" [[package]] name = "human-sort" @@ -210,9 +230,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.4.0" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93ead53efc7ea8ed3cfb0c79fc8023fbb782a5432b52830b6518941cebe6505c" +checksum = "62f822373a4fe84d4bb149bf54e584a7f4abec90e072ed49cda0edea5b95471f" dependencies = [ "equivalent", "hashbrown", @@ -256,21 +276,21 @@ checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" [[package]] name = "miette" -version = "7.2.0" +version = "7.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4edc8853320c2a0dab800fbda86253c8938f6ea88510dc92c5f1ed20e794afc1" +checksum = "317f146e2eb7021892722af37cf1b971f0a70c8406f487e24952667616192c64" dependencies = [ "cfg-if", "miette-derive", - "thiserror", + "thiserror 1.0.69", "unicode-width", ] [[package]] name = "miette-derive" -version = "7.2.0" +version = "7.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcf09caffaac8068c346b6df2a7fc27a177fd20b39421a39ce0a211bde679a6c" +checksum = "23c9b935fbe1d6cbd1dac857b54a688145e2d93f48db36010514d0f612d0ad67" dependencies = [ "proc-macro2", "quote", @@ -279,8 +299,9 @@ dependencies = [ [[package]] name = "moon_common" -version = "0.0.7" +version = "0.0.10" dependencies = [ + "compact_str", "dirs", "miette", "regex", @@ -289,12 +310,12 @@ dependencies = [ "schematic", "serde", "starbase_styles", - "thiserror", + "thiserror 2.0.10", ] [[package]] name = "moon_config" -version = "0.0.9" +version = "0.0.12" dependencies = [ "indexmap", "miette", @@ -302,6 +323,7 @@ dependencies = [ "moon_target", "once_cell", "regex", + "rpkl", "rustc-hash", "schematic", "semver", @@ -314,23 +336,33 @@ dependencies = [ [[package]] name = "moon_target" -version = "0.0.6" +version = "0.0.9" dependencies = [ + "compact_str", "miette", "moon_common", "once_cell", "regex", "schematic", "serde", - "thiserror", + "thiserror 2.0.10", "tracing", ] +[[package]] +name = "num-traits" +version = "0.2.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" +dependencies = [ + "autocfg", +] + [[package]] name = "once_cell" -version = "1.19.0" +version = "1.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" +checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" [[package]] name = "option-ext" @@ -340,9 +372,15 @@ checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" [[package]] name = "owo-colors" -version = "4.0.0" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb37767f6569cd834a413442455e0f066d0d522de8630436e2a1761d9726ba56" + +[[package]] +name = "paste" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "caff54706df99d2a78a5a4e3455ff45448d81ef1bb63c22cd14052ca0e993a3f" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] name = "percent-encoding" @@ -358,18 +396,18 @@ checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" [[package]] name = "proc-macro2" -version = "1.0.86" +version = "1.0.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.36" +version = "1.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc" dependencies = [ "proc-macro2", ] @@ -391,14 +429,14 @@ checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" dependencies = [ "getrandom", "libredox", - "thiserror", + "thiserror 1.0.69", ] [[package]] name = "regex" -version = "1.10.6" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" +checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" dependencies = [ "aho-corasick", "memchr", @@ -408,9 +446,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.5" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd" +checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" dependencies = [ "aho-corasick", "memchr", @@ -419,9 +457,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.2" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" +checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" [[package]] name = "relative-path" @@ -432,11 +470,55 @@ dependencies = [ "serde", ] +[[package]] +name = "rmp" +version = "0.8.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "228ed7c16fa39782c3b3468e974aec2795e9089153cd08ee2e9aefb3613334c4" +dependencies = [ + "byteorder", + "num-traits", + "paste", +] + +[[package]] +name = "rmp-serde" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52e599a477cf9840e92f2cde9a7189e67b42c57532749bf90aea6ec10facd4db" +dependencies = [ + "byteorder", + "rmp", + "serde", +] + +[[package]] +name = "rmpv" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58450723cd9ee93273ce44a20b6ec4efe17f8ed2e3631474387bfdecf18bb2a9" +dependencies = [ + "num-traits", + "rmp", +] + +[[package]] +name = "rpkl" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90d4fb97471646d778a76c8009623e1303898fdf9f4ba9f404b02a0217b7dfb1" +dependencies = [ + "dunce", + "rmp-serde", + "rmpv", + "serde", +] + [[package]] name = "rustc-hash" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152" +checksum = "c7fb8039b3032c191086b10f11f319a6e99e1e82889c5cc6046f515c9db1d497" [[package]] name = "rustversion" @@ -452,13 +534,14 @@ checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" [[package]] name = "schematic" -version = "0.17.2" +version = "0.17.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14bf79931c9c99d9bcdc29a448836dbcea9ad5991285cc83dd4c9f46cf771ac2" +checksum = "bc902ccf410e32f7d1fdcad8080729def0cd5e696fb70ca7468bfcd02ff4fe80" dependencies = [ "garde", "indexmap", "miette", + "rpkl", "schematic_macros", "schematic_types", "serde", @@ -466,15 +549,15 @@ dependencies = [ "serde_path_to_error", "serde_yaml", "starbase_styles", - "thiserror", + "thiserror 2.0.10", "tracing", ] [[package]] name = "schematic_macros" -version = "0.17.1" +version = "0.17.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea2f037e36d93185ba8e25049754095e4aabb985ed5a8157da369d40be60d9fa" +checksum = "55f638e083cb574cc60a6f15a9eecc45bb4ace4bbbeda0e904298788f04e9453" dependencies = [ "convert_case", "darling", @@ -485,11 +568,12 @@ dependencies = [ [[package]] name = "schematic_types" -version = "0.9.2" +version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ce97b2ad673e2183ec94cce86b039e692ecdf1b3b8a1195c90ad31f8adbbd0d" +checksum = "f320deb050277c5bcc79213b01d749f8a847a63713e76d5748fdad654f47ed52" dependencies = [ "indexmap", + "rpkl", "semver", "serde_json", "serde_yaml", @@ -506,18 +590,18 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.208" +version = "1.0.217" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cff085d2cb684faa248efb494c39b68e522822ac0de72ccf08109abde717cfb2" +checksum = "02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.208" +version = "1.0.217" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24008e81ff7613ed8e5ba0cfaf24e2c2f1e5b8a0495711e44fcd4882fca62bcf" +checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0" dependencies = [ "proc-macro2", "quote", @@ -526,9 +610,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.125" +version = "1.0.135" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83c8e735a073ccf5be70aa8066aa984eaf2fa000db6c8d0100ae605b366d31ed" +checksum = "2b0d7ba2887406110130a978386c4e1befb98c674b4fba677954e4db976630d9" dependencies = [ "indexmap", "itoa", @@ -574,9 +658,9 @@ checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "starbase_styles" -version = "0.4.2" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44854a14e28e3b1d602d802576162380504df73efae50d4b901934d25579524b" +checksum = "1a4df972f8b4010b3ca083555953f6b320de4962aa2b63823c273de9830a3e9f" dependencies = [ "dirs", "owo-colors", @@ -598,18 +682,18 @@ checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "supports-color" -version = "3.0.0" +version = "3.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9829b314621dfc575df4e409e79f9d6a66a3bd707ab73f23cb4aa3a854ac854f" +checksum = "c64fc7232dd8d2e4ac5ce4ef302b1d81e0b80d055b9d77c7c4f51f6aa4c867d6" dependencies = [ "is_ci", ] [[package]] name = "syn" -version = "2.0.75" +version = "2.0.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6af063034fc1935ede7be0122941bafa9bacb949334d090b77ca98b5817c7d9" +checksum = "46f71c0377baf4ef1cc3e3402ded576dccc315800fbc62dfc7fe04b009773b4a" dependencies = [ "proc-macro2", "quote", @@ -618,15 +702,15 @@ dependencies = [ [[package]] name = "system_env" -version = "0.6.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce619f78837291fe16f40f216ba2493b66b34e3f8c37201f96cd5833ae95b44f" +checksum = "1303c37a9842bba9d6ec7725d2e73b13dbca214bbf9a5a9219da59115047ff06" dependencies = [ "schematic", "serde", "serde_json", "shell-words", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -640,18 +724,38 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.63" +version = "1.0.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" +dependencies = [ + "thiserror-impl 1.0.69", +] + +[[package]] +name = "thiserror" +version = "2.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3ac7f54ca534db81081ef1c1e7f6ea8a3ef428d2fc069097c079443d24124d3" +dependencies = [ + "thiserror-impl 2.0.10", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" +checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ - "thiserror-impl", + "proc-macro2", + "quote", + "syn", ] [[package]] name = "thiserror-impl" -version = "1.0.63" +version = "2.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" +checksum = "9e9465d30713b56a37ede7185763c3492a91be2f5fa68d958c44e41ab9248beb" dependencies = [ "proc-macro2", "quote", @@ -675,9 +779,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tracing" -version = "0.1.40" +version = "0.1.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0" dependencies = [ "pin-project-lite", "tracing-attributes", @@ -686,9 +790,9 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.27" +version = "0.1.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" +checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d" dependencies = [ "proc-macro2", "quote", @@ -697,9 +801,9 @@ dependencies = [ [[package]] name = "tracing-core" -version = "0.1.32" +version = "0.1.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c" dependencies = [ "once_cell", ] @@ -756,23 +860,24 @@ dependencies = [ [[package]] name = "version_spec" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a8115efd6e9e71ef4f9b71169432fe99b042d435cd80e41314d3d869dab2d33" +checksum = "acae98122dbacf133351b898ae29916c0faa263279e1ee7ab418b02e38aaaecf" dependencies = [ + "compact_str", "human-sort", "regex", "schematic", "semver", "serde", - "thiserror", + "thiserror 2.0.10", ] [[package]] name = "warpgate_api" -version = "0.10.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d4fb1a48a03154125e71b7dd3b26887cbc78732d5598859795c6475fdabba6b" +checksum = "a122a35bbc9d72d386d44fcf5685dc1083d65755168108c9ecd08b8913580dfc" dependencies = [ "anyhow", "rustc-hash", @@ -780,7 +885,7 @@ dependencies = [ "serde", "serde_json", "system_env", - "thiserror", + "thiserror 1.0.69", ] [[package]] diff --git a/website/docs/guides/wasm-plugins.mdx b/website/docs/guides/wasm-plugins.mdx index 47569131473..a744997535a 100644 --- a/website/docs/guides/wasm-plugins.mdx +++ b/website/docs/guides/wasm-plugins.mdx @@ -421,11 +421,10 @@ use extism_pdk::*; ``` We can then build the WASM binary. The file will be available at -`target/wasm32-wasi/debug/.wasm`. +`target/wasm32-wasip1/debug/.wasm`. ```shell -cargo install cargo-wasi -cargo wasi build +cargo build --target wasm32-wasip1 ``` ## Building and publishing @@ -452,12 +451,12 @@ This functionality is natively supported in our #!/usr/bin/env bash target="${CARGO_TARGET_DIR:-target}" -input="$target/wasm32-wasi/release/$1.wasm" -output="$target/wasm32-wasi/$1.wasm" +input="$target/wasm32-wasip1/release/$1.wasm" +output="$target/wasm32-wasip1/$1.wasm" echo "Building" -cargo build --target wasm32-wasi --release +cargo build --target wasm32-wasip1 --release echo "Optimizing" @@ -483,7 +482,7 @@ git push --tags ``` 2. Build a release version of the plugin using the `build-wasm` script above. The file will be - available at `target/wasm32-wasi/.wasm`. + available at `target/wasm32-wasip1/.wasm`. ```shell build-wasm diff --git a/website/docs/proto/wasm-plugin.mdx b/website/docs/proto/wasm-plugin.mdx index 36711a9d25f..66ebd44837b 100644 --- a/website/docs/proto/wasm-plugin.mdx +++ b/website/docs/proto/wasm-plugin.mdx @@ -400,13 +400,13 @@ debug build: ```toml [plugins] - = "file://./target/wasm32-wasi/debug/.wasm" + = "file://./target/wasm32-wasip1/debug/.wasm" ``` And everytime you make a change to the plugin, you'll need to rebuild it with: ```shell -cargo wasi build +cargo build --target wasm32-wasip1 ``` With these 2 pieces in place, you can now execute `proto` commands. Be sure you're running them from @@ -432,7 +432,7 @@ cargo add --dev proto_pdk_test_utils starbase_sandbox tokio And as mentioned above, everytime you make a change to the plugin, you'll need to rebuild it with: ```shell -cargo wasi build +cargo build --target wasm32-wasip1 ``` #### Testing plugin functions