diff --git a/Cargo.lock b/Cargo.lock index 4dc7c00bc81..9d6e327bed3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -6852,7 +6852,7 @@ dependencies = [ [[package]] name = "wasmer-wasix" -version = "0.18.4" +version = "0.19.0" dependencies = [ "anyhow", "async-trait", diff --git a/Cargo.toml b/Cargo.toml index fa699fc4537..961363f30e9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -12,6 +12,7 @@ rust-version.workspace = true version.workspace = true [dependencies] +# Repo-local crates wasmer-config = { path = "./lib/config" } wasmer = { version = "=4.3.0-alpha.1", path = "lib/api", default-features = false } wasmer-compiler = { version = "=4.3.0-alpha.1", path = "lib/compiler", features = [ @@ -21,12 +22,14 @@ wasmer-compiler-cranelift = { version = "=4.3.0-alpha.1", path = "lib/compiler-c wasmer-compiler-singlepass = { version = "=4.3.0-alpha.1", path = "lib/compiler-singlepass", optional = true } wasmer-compiler-llvm = { version = "=4.3.0-alpha.1", path = "lib/compiler-llvm", optional = true } wasmer-emscripten = { version = "=4.3.0-alpha.1", path = "lib/emscripten", optional = true } -wasmer-wasix = { version = "0.18.4", path = "lib/wasix", optional = true } +wasmer-wasix = { path = "lib/wasix", optional = true } wasmer-wast = { version = "=4.3.0-alpha.1", path = "tests/lib/wast", optional = true } wasi-test-generator = { version = "=4.3.0-alpha.1", path = "tests/wasi-wast", optional = true } wasmer-cache = { version = "=4.3.0-alpha.1", path = "lib/cache", optional = true } wasmer-types = { version = "=4.3.0-alpha.1", path = "lib/types" } wasmer-middlewares = { version = "=4.3.0-alpha.1", path = "lib/middlewares", optional = true } + +# Third party dependencies cfg-if = "1.0" tokio = { version = "1", features = [ "rt", @@ -88,6 +91,7 @@ version = "4.3.0-alpha.1" [workspace.dependencies] # Repo-local crates wasmer-config = { path = "./lib/config" } +wasmer-wasix = { path = "./lib/wasix" } # Wasmer-owned crates webc = { version = "6.0.0-alpha3", default-features = false, features = ["package"] } diff --git a/lib/c-api/Cargo.toml b/lib/c-api/Cargo.toml index f1b0c9ba0a6..64d7a425358 100644 --- a/lib/c-api/Cargo.toml +++ b/lib/c-api/Cargo.toml @@ -32,7 +32,7 @@ wasmer-compiler-singlepass = { version = "=4.3.0-alpha.1", path = "../compiler-s wasmer-emscripten = { version = "=4.3.0-alpha.1", path = "../emscripten", optional = true } wasmer-middlewares = { version = "=4.3.0-alpha.1", path = "../middlewares", optional = true } wasmer-types = { version = "=4.3.0-alpha.1", path = "../types" } -wasmer-wasix = { version = "0.18.4", path = "../wasix", features = ["host-fs", "host-vnet"], optional = true } +wasmer-wasix = { workspace = true, features = ["host-fs", "host-vnet"], optional = true } webc = { workspace = true, optional = true } virtual-fs = { version = "0.11.3", path = "../virtual-fs", optional = true, default-features = false, features = ["static-fs"] } enumset.workspace = true diff --git a/lib/cli/Cargo.toml b/lib/cli/Cargo.toml index c2fc0979c09..3f5488eb811 100644 --- a/lib/cli/Cargo.toml +++ b/lib/cli/Cargo.toml @@ -76,7 +76,7 @@ wasmer-compiler-singlepass = { version = "=4.3.0-alpha.1", path = "../compiler-s wasmer-compiler-llvm = { version = "=4.3.0-alpha.1", path = "../compiler-llvm", optional = true } wasmer-emscripten = { version = "=4.3.0-alpha.1", path = "../emscripten" } wasmer-vm = { version = "=4.3.0-alpha.1", path = "../vm", optional = true } -wasmer-wasix = { version = "0.18.4", path = "../wasix", features = [ +wasmer-wasix = { workspace = true, features = [ "logging", "webc_runner_rt_wcgi", "webc_runner_rt_dcgi", diff --git a/lib/sys-utils/Cargo.toml b/lib/sys-utils/Cargo.toml index 7f889343d8b..46f5c079cd5 100644 --- a/lib/sys-utils/Cargo.toml +++ b/lib/sys-utils/Cargo.toml @@ -22,7 +22,7 @@ tracing = "0.1.37" libc = { version = "^0.2", default-features = false } [dev-dependencies] -wasmer-wasix = { path = "../wasix", version = "0.18.4" } +wasmer-wasix.workspace = true wasmer = { path = "../api", version = "=4.3.0-alpha.1", default-features = false, features = ["sys", "compiler", "cranelift"] } tracing-subscriber = { version = "0.3.16", features = ["fmt"] } tracing = "0.1.37" diff --git a/tests/lib/wast/Cargo.toml b/tests/lib/wast/Cargo.toml index 05888a01c3f..d3f5d6274a4 100644 --- a/tests/lib/wast/Cargo.toml +++ b/tests/lib/wast/Cargo.toml @@ -11,10 +11,11 @@ readme = "README.md" edition = "2018" [dependencies] -anyhow = "1.0" +wasmer-wasix.workspace = true wasmer = { path = "../../../lib/api", version = "=4.3.0-alpha.1", default-features = false } -wasmer-wasix = { path = "../../../lib/wasix", version = "0.18.4" } virtual-fs = { path = "../../../lib/virtual-fs", version = "0.11.3" } + +anyhow = "1.0" wast = "38.0" serde = "1" tempfile = "3.6.0"