Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 14 additions & 23 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"] }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
4 changes: 4 additions & 0 deletions crates/javy/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
6 changes: 3 additions & 3 deletions crates/javy/Cargo.toml
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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 }
Expand Down
5 changes: 5 additions & 0 deletions crates/plugin-api/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion crates/plugin-api/Cargo.toml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion crates/plugin/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion crates/runner/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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",
}
Expand Down
2 changes: 1 addition & 1 deletion docs/docs-using-dynamic-linking.md
Original file line number Diff line number Diff line change
Expand Up @@ -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!
```
2 changes: 1 addition & 1 deletion docs/docs-using-nodejs.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
14 changes: 5 additions & 9 deletions supply-chain/config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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]]
Expand Down