diff --git a/Cargo.lock b/Cargo.lock index 6c0c2ca5e..251bfebed 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2282,9 +2282,9 @@ dependencies = [ "reqwest", "tokio", "wac-graph", - "wasmprinter 0.218.0", - "wit-component 0.218.0", - "wit-parser 0.218.0", + "wasmprinter 0.220.0", + "wit-component", + "wit-parser 0.220.0", ] [[package]] @@ -3468,16 +3468,6 @@ dependencies = [ "leb128", ] -[[package]] -name = "wasm-encoder" -version = "0.218.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22b896fa8ceb71091ace9bcb81e853f54043183a1c9667cf93422c40252ffa0a" -dependencies = [ - "leb128", - "wasmparser 0.218.0", -] - [[package]] name = "wasm-encoder" version = "0.219.1" @@ -3514,22 +3504,6 @@ dependencies = [ "wasmparser 0.202.0", ] -[[package]] -name = "wasm-metadata" -version = "0.218.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa5eeb071abe8a2132fdd5565dabffee70775ee8c24fc7e300ac43f51f4a8a91" -dependencies = [ - "anyhow", - "indexmap 2.4.0", - "serde", - "serde_derive", - "serde_json", - "spdx", - "wasm-encoder 0.218.0", - "wasmparser 0.218.0", -] - [[package]] name = "wasm-metadata" version = "0.220.0" @@ -3557,19 +3531,6 @@ dependencies = [ "semver", ] -[[package]] -name = "wasmparser" -version = "0.218.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b09e46c7fceceaa72b2dd1a8a137ea7fd8f93dfaa69806010a709918e496c5dc" -dependencies = [ - "ahash", - "bitflags", - "hashbrown 0.14.5", - "indexmap 2.4.0", - "semver", -] - [[package]] name = "wasmparser" version = "0.219.1" @@ -3599,24 +3560,24 @@ dependencies = [ [[package]] name = "wasmprinter" -version = "0.218.0" +version = "0.219.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ace089155491837b75f474bf47c99073246d1b737393fe722d6dee311595ddc" +checksum = "228cdc1f30c27816da225d239ce4231f28941147d34713dee8f1fff7cb330e54" dependencies = [ "anyhow", "termcolor", - "wasmparser 0.218.0", + "wasmparser 0.219.1", ] [[package]] name = "wasmprinter" -version = "0.219.1" +version = "0.220.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "228cdc1f30c27816da225d239ce4231f28941147d34713dee8f1fff7cb330e54" +checksum = "ae749f2c66587777ce9ad0e8c632e72c77574336b17d2f040a47cffbd92198c7" dependencies = [ "anyhow", "termcolor", - "wasmparser 0.219.1", + "wasmparser 0.220.0", ] [[package]] @@ -4272,7 +4233,7 @@ dependencies = [ "syn 2.0.89", "wasm-metadata 0.220.0", "wit-bindgen-core", - "wit-component 0.220.0", + "wit-component", ] [[package]] @@ -4290,26 +4251,6 @@ dependencies = [ "wit-bindgen-rust", ] -[[package]] -name = "wit-component" -version = "0.218.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa53aa7e6bf2b3e8ccaffbcc963fbdb672a603dc0af393a481b6cec24c266406" -dependencies = [ - "anyhow", - "bitflags", - "indexmap 2.4.0", - "log", - "serde", - "serde_derive", - "serde_json", - "wasm-encoder 0.218.0", - "wasm-metadata 0.218.0", - "wasmparser 0.218.0", - "wat", - "wit-parser 0.218.0", -] - [[package]] name = "wit-component" version = "0.220.0" @@ -4326,27 +4267,10 @@ dependencies = [ "wasm-encoder 0.220.0", "wasm-metadata 0.220.0", "wasmparser 0.220.0", + "wat", "wit-parser 0.220.0", ] -[[package]] -name = "wit-parser" -version = "0.218.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d3d1066ab761b115f97fef2b191090faabcb0f37b555b758d3caf42d4ed9e55" -dependencies = [ - "anyhow", - "id-arena", - "indexmap 2.4.0", - "log", - "semver", - "serde", - "serde_derive", - "serde_json", - "unicode-xid", - "wasmparser 0.218.0", -] - [[package]] name = "wit-parser" version = "0.219.1" diff --git a/Cargo.toml b/Cargo.toml index 65bbc19c7..40cd5ebdf 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -93,7 +93,7 @@ serde_yaml = "0.9.33" prettyplease = "0.2.20" directories = "5.0" reqwest = "0.12.5" -wit-component = "0.218.0" -wit-parser = "0.218.0" -wasmprinter = "0.218.0" +wit-component = "0.220.0" +wit-parser = "0.220.0" +wasmprinter = "0.220.0" bon = "3.0.0" \ No newline at end of file diff --git a/pulumi_wasm_runner_component_creator/tests/create_final_component_test.rs b/pulumi_wasm_runner_component_creator/tests/create_final_component_test.rs index 73f31746e..54618a503 100644 --- a/pulumi_wasm_runner_component_creator/tests/create_final_component_test.rs +++ b/pulumi_wasm_runner_component_creator/tests/create_final_component_test.rs @@ -5,6 +5,7 @@ use std::collections::BTreeMap; use wac_graph::types::Package; use wac_graph::CompositionGraph; use wit_component::{dummy_module, embed_component_metadata, ComponentEncoder, StringEncoding}; +use wit_parser::Mangling::Standard32; use wit_parser::{PackageId, Resolve}; #[tokio::test] @@ -34,7 +35,7 @@ async fn should_combine_wasm_components() -> Result<()> { let world = resolve.select_world(pkg, None).unwrap(); - let mut module = dummy_module(&resolve, world); + let mut module = dummy_module(&resolve, world, Standard32); embed_component_metadata(&mut module, &resolve, world, StringEncoding::UTF8).unwrap(); @@ -90,7 +91,7 @@ async fn return_error_when_multiple_dependencies_on_the_same_provider_is_found() let world = resolve.select_world(pkg, None).unwrap(); - let mut module = dummy_module(&resolve, world); + let mut module = dummy_module(&resolve, world, Standard32); embed_component_metadata(&mut module, &resolve, world, StringEncoding::UTF8).unwrap(); @@ -140,7 +141,7 @@ async fn return_error_when_multiple_versions_of_pulumi_wasm_is_found() -> Result let world = resolve.select_world(pkg, None).unwrap(); - let mut module = dummy_module(&resolve, world); + let mut module = dummy_module(&resolve, world, Standard32); embed_component_metadata(&mut module, &resolve, world, StringEncoding::UTF8).unwrap(); @@ -201,7 +202,7 @@ async fn return_error_when_multiple_versions_of_pulumi_wasm_in_providers_is_foun let world = resolve.select_world(pkg, None).unwrap(); - let mut module = dummy_module(&resolve, world); + let mut module = dummy_module(&resolve, world, Standard32); embed_component_metadata(&mut module, &resolve, world, StringEncoding::UTF8).unwrap(); @@ -271,7 +272,7 @@ impl PulumiWasmSource for TestProgramSource { let world = resolve.select_world(pkg, None).unwrap(); - let mut module = dummy_module(&resolve, world); + let mut module = dummy_module(&resolve, world, Standard32); embed_component_metadata(&mut module, &resolve, world, StringEncoding::UTF8).unwrap(); @@ -306,7 +307,7 @@ impl DefaultProviderSource for TestDefaultProviderSource { let world = resolve.select_world(pkg, None).unwrap(); - let mut module = dummy_module(&resolve, world); + let mut module = dummy_module(&resolve, world, Standard32); embed_component_metadata(&mut module, &resolve, world, StringEncoding::UTF8).unwrap();