diff --git a/Cargo.lock b/Cargo.lock index 4328fa677..922272445 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -527,15 +527,6 @@ dependencies = [ "windows-sys 0.59.0", ] -[[package]] -name = "convert_case" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baaaa0ecca5b51987b9423ccdc971514dd8b0bb7b4060b983d3664dad3f1f89f" -dependencies = [ - "unicode-segmentation", -] - [[package]] name = "convert_case" version = "0.10.0" @@ -1597,7 +1588,7 @@ dependencies = [ [[package]] name = "javy" -version = "6.0.1-alpha.1" +version = "7.0.0-alpha.1" dependencies = [ "anyhow", "bitflags", @@ -1640,7 +1631,7 @@ version = "4.0.0-alpha.1" dependencies = [ "anyhow", "brotli", - "convert_case 0.10.0", + "convert_case", "insta", "swc_core", "tempfile", @@ -1678,7 +1669,7 @@ dependencies = [ [[package]] name = "javy-plugin-api" -version = "5.0.1-alpha.1" +version = "6.0.0-alpha.1" dependencies = [ "anyhow", "javy", @@ -2351,9 +2342,9 @@ dependencies = [ [[package]] name = "rquickjs" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a135375fbac5ba723bb6a48f432a72f81539cedde422f0121a86c7c4e96d8e0d" +checksum = "c50dc6d6c587c339edb4769cf705867497a2baf0eca8b4645fa6ecd22f02c77a" dependencies = [ "rquickjs-core", "rquickjs-macro", @@ -2361,9 +2352,9 @@ dependencies = [ [[package]] name = "rquickjs-core" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bccb7121a123865c8ace4dea42e7ed84d78b90cbaf4ca32c59849d8d210c9672" +checksum = "b8bf7840285c321c3ab20e752a9afb95548c75cd7f4632a0627cea3507e310c1" dependencies = [ "hashbrown 0.16.0", "relative-path", @@ -2372,11 +2363,11 @@ dependencies = [ [[package]] name = "rquickjs-macro" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89f93602cc3112c7f30bf5f29e722784232138692c7df4c52ebbac7e035d900d" +checksum = "7106215ff41a5677b104906a13e1a440b880f4b6362b5dc4f3978c267fad2b80" dependencies = [ - "convert_case 0.8.0", + "convert_case", "fnv", "ident_case", "indexmap 2.12.0", @@ -2389,9 +2380,9 @@ dependencies = [ [[package]] name = "rquickjs-serde" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20c45e5074bb11affd5147f9760f116f1ba415b8f153e6d3b24d9595767aae2c" +checksum = "8df908bfc058ac1fb7e7b4609afe712bf2ce4ea86b49cd06e041a86c89220e8b" dependencies = [ "rquickjs", "serde", @@ -2399,9 +2390,9 @@ dependencies = [ [[package]] name = "rquickjs-sys" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57b1b6528590d4d65dc86b5159eae2d0219709546644c66408b2441696d1d725" +checksum = "27344601ef27460e82d6a4e1ecb9e7e99f518122095f3c51296da8e9be2b9d83" dependencies = [ "bindgen", "cc", diff --git a/Cargo.toml b/Cargo.toml index 4a932444a..9372e7acb 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -29,7 +29,7 @@ wasmtime-wasi = "39" wasmtime-wizer = "39" wasm-opt = "0.116.1" anyhow = "1.0" -javy = { path = "crates/javy", version = "6.0.1-alpha.1" } +javy = { path = "crates/javy", version = "7.0.0-alpha.1" } tempfile = "3.24.0" tokio = "1" uuid = { version = "1.19", features = ["v4"] } diff --git a/crates/codegen/tests/snapshots/integration_test__default_dynamic.snap b/crates/codegen/tests/snapshots/integration_test__default_dynamic.snap index 05369c357..c80afa098 100644 --- a/crates/codegen/tests/snapshots/integration_test__default_dynamic.snap +++ b/crates/codegen/tests/snapshots/integration_test__default_dynamic.snap @@ -6,9 +6,9 @@ expression: wat (type (;0;) (func)) (type (;1;) (func (param i32 i32 i32 i32) (result i32))) (type (;2;) (func (param i32 i32 i32 i32 i32))) - (import "javy-default-plugin-v2" "cabi_realloc" (func (;0;) (type 1))) - (import "javy-default-plugin-v2" "invoke" (func (;1;) (type 2))) - (import "javy-default-plugin-v2" "memory" (memory (;0;) 0)) + (import "javy-default-plugin-v3" "cabi_realloc" (func (;0;) (type 1))) + (import "javy-default-plugin-v3" "invoke" (func (;1;) (type 2))) + (import "javy-default-plugin-v3" "memory" (memory (;0;) 0)) (export "_start" (func 4)) (export "log" (func 2)) (export "log2" (func 3)) diff --git a/crates/javy/CHANGELOG.md b/crates/javy/CHANGELOG.md index e28df1346..0cb8c6e49 100644 --- a/crates/javy/CHANGELOG.md +++ b/crates/javy/CHANGELOG.md @@ -8,6 +8,10 @@ Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] +### Changed + +- Bumped rquickjs to 0.11.0. + ### Fixed - Fixed memory leak in Serde deserializer implementation for RQuickJS values. diff --git a/crates/javy/Cargo.toml b/crates/javy/Cargo.toml index 1b8420549..dd3414b5d 100644 --- a/crates/javy/Cargo.toml +++ b/crates/javy/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "javy" -version = "6.0.1-alpha.1" +version = "7.0.0-alpha.1" authors.workspace = true edition.workspace = true license.workspace = true @@ -11,12 +11,12 @@ categories = ["wasm"] [dependencies] anyhow = { workspace = true } -rquickjs = { version = "0.10.0", features = [ +rquickjs = { version = "0.11.0", features = [ "array-buffer", "bindgen", "disable-assertions", ] } -rquickjs-serde = { version = "0.3.0", optional = true } +rquickjs-serde = { version = "0.4.0", optional = true } serde = { workspace = true, default-features = true, features = ["derive"] } serde_json = { workspace = true, optional = true } serde-transcode = { version = "1.1", optional = true } diff --git a/crates/plugin-api/CHANGELOG.md b/crates/plugin-api/CHANGELOG.md index c19c95042..95f9db901 100644 --- a/crates/plugin-api/CHANGELOG.md +++ b/crates/plugin-api/CHANGELOG.md @@ -8,6 +8,11 @@ Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] +### Changed + +- Bumped rquickjs to 0.11. If you are using a plugin for dynamic linking, you + are strongly encouraged to change the import namespace. + ### Fixed - Fixed memory leak in Serde deserializer implementation for RQuickJS values. diff --git a/crates/plugin-api/Cargo.toml b/crates/plugin-api/Cargo.toml index bc1ed37e1..9877f65dd 100644 --- a/crates/plugin-api/Cargo.toml +++ b/crates/plugin-api/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "javy-plugin-api" -version = "5.0.1-alpha.1" +version = "6.0.0-alpha.1" authors.workspace = true edition.workspace = true license.workspace = true diff --git a/crates/plugin/src/lib.rs b/crates/plugin/src/lib.rs index fd23196a9..886ef7e6c 100644 --- a/crates/plugin/src/lib.rs +++ b/crates/plugin/src/lib.rs @@ -7,7 +7,7 @@ use crate::shared_config::SharedConfig; mod shared_config; -import_namespace!("javy-default-plugin-v2"); +import_namespace!("javy-default-plugin-v3"); fn config() -> Config { // Read shared config JSON in from stdin. diff --git a/crates/runner/src/lib.rs b/crates/runner/src/lib.rs index e68c25d18..36d5d5c71 100644 --- a/crates/runner/src/lib.rs +++ b/crates/runner/src/lib.rs @@ -34,7 +34,7 @@ impl Plugin { Self::InvalidUser => "invalid-plugin", // Could try and derive this but not going to for now since tests // will break if it changes. - Self::Default | Self::DefaultAsUser => "javy-default-plugin-v2", + Self::Default | Self::DefaultAsUser => "javy-default-plugin-v3", Self::UserWasiP1 { .. } => "test-plugin-wasip1", Self::UserWasiP2 { .. } => "test-plugin-wasip2", } diff --git a/docs/docs-using-dynamic-linking.md b/docs/docs-using-dynamic-linking.md index 7929c1501..cde35085d 100644 --- a/docs/docs-using-dynamic-linking.md +++ b/docs/docs-using-dynamic-linking.md @@ -41,6 +41,6 @@ Run: $ echo 'console.log("hello world!");' > my_code.js $ javy emit-plugin -o plugin.wasm $ javy build -C dynamic -C plugin=plugin.wasm -o my_code.wasm my_code.js -$ wasmtime run --preload javy-default-plugin-v2=plugin.wasm my_code.wasm +$ wasmtime run --preload javy-default-plugin-v3=plugin.wasm my_code.wasm hello world! ``` diff --git a/docs/docs-using-nodejs.md b/docs/docs-using-nodejs.md index ec52bcab4..c7bacd0d8 100644 --- a/docs/docs-using-nodejs.md +++ b/docs/docs-using-nodejs.md @@ -158,7 +158,7 @@ async function runJavy(pluginModule, embeddedModule, input) { wasi.getImportObject(), ); const instance = await WebAssembly.instantiate(embeddedModule, { - "javy-default-plugin-v2": pluginInstance.exports, + "javy-default-plugin-v3": pluginInstance.exports, }); // Javy plugin is a WASI reactor see https://github.com/WebAssembly/WASI/blob/main/legacy/application-abi.md?plain=1 diff --git a/supply-chain/config.toml b/supply-chain/config.toml index 39c437e9d..4911f9f1f 100644 --- a/supply-chain/config.toml +++ b/supply-chain/config.toml @@ -129,10 +129,6 @@ criteria = "safe-to-deploy" version = "0.15.11" criteria = "safe-to-run" -[[exemptions.convert_case]] -version = "0.8.0" -criteria = "safe-to-deploy" - [[exemptions.convert_case]] version = "0.10.0" criteria = "safe-to-deploy" @@ -470,23 +466,23 @@ version = "1.3.1" criteria = "safe-to-deploy" [[exemptions.rquickjs]] -version = "0.10.0" +version = "0.11.0" criteria = "safe-to-deploy" [[exemptions.rquickjs-core]] -version = "0.10.0" +version = "0.11.0" criteria = "safe-to-deploy" [[exemptions.rquickjs-macro]] -version = "0.10.0" +version = "0.11.0" criteria = "safe-to-deploy" [[exemptions.rquickjs-serde]] -version = "0.3.0" +version = "0.4.0" criteria = "safe-to-deploy" [[exemptions.rquickjs-sys]] -version = "0.10.0" +version = "0.11.0" criteria = "safe-to-deploy" [[exemptions.rustc-demangle]]