Merge pull request #4617 from wasmerio/4.3.0-alpha.1-leftover-fixes

4.3.0 alpha.1 leftover fixes
wasmerio · May 8, 2024 · bebb859 · bebb859
2 parents 0d61573 + 3377910
commit bebb859
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 10 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -12,8 +12,6 @@ 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 = [
     "compiler",

diff --git a/lib/backend-api/Cargo.toml b/lib/backend-api/Cargo.toml
@@ -17,7 +17,7 @@ rust-version.workspace = true
 [dependencies]
 # Wasmer dependencies.
 edge-schema.workspace = true
-wasmer-config.workspace = true
+wasmer-config = { version = "0.2.0", path = "../config" }
 webc.workspace = true
 
 # crates.io dependencies.

diff --git a/lib/cli/Cargo.toml b/lib/cli/Cargo.toml
@@ -172,7 +172,7 @@ serde = { version = "1.0.147", features = ["derive"] }
 dirs = { version = "4.0" }
 serde_json = { version = "1.0" }
 target-lexicon = { version = "0.12", features = ["std"] }
-wasmer-config = { workspace = true }
+wasmer-config = { version = "0.2.0", path = "../config" }
 indexmap = "1.9.2"
 walkdir = "2.3.2"
 regex = "1.6.0"

diff --git a/lib/journal/Cargo.toml b/lib/journal/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "wasmer-journal"
-version = "0.1.1"
+version = "0.1.2"
 description = "Journaling functionality used by Wasmer to save and restore WASM state"
 authors.workspace = true
 edition.workspace = true

diff --git a/lib/registry/Cargo.toml b/lib/registry/Cargo.toml
@@ -49,7 +49,7 @@ tokio-tungstenite = {version = "0.20", features = ["rustls-tls-native-roots"]}
 toml.workspace = true
 tracing = "0.1.40"
 url = "2.3.1"
-wasmer-config = { workspace = true }
+wasmer-config = { version = "0.2.0", path = "../config" }
 wasmer-wasm-interface = { version = "4.3.0-alpha.1", path = "../wasm-interface", optional = true }
 wasmparser = { workspace = true, optional = true }
 whoami = "1.2.3"

diff --git a/lib/wasix/Cargo.toml b/lib/wasix/Cargo.toml
@@ -19,9 +19,9 @@ wasmer = { path = "../api", version = "=4.3.0-alpha.1", default-features = false
 virtual-mio  = { path = "../virtual-io", version = "0.3.1", default-features = false }
 virtual-fs = { path = "../virtual-fs", version = "0.11.3", default-features = false, features = ["webc-fs"] }
 virtual-net = { path = "../virtual-net", version = "0.6.5", default-features = false, features = ["rkyv"] }
-wasmer-journal = { path = "../journal", version = "0.1.0", default-features = false }
+wasmer-journal = { path = "../journal", version = "0.1.2", default-features = false }
 wasmer-emscripten = { path = "../emscripten", version = "=4.3.0-alpha.1", optional = true }
-wasmer-config.workspace = true
+wasmer-config = { version = "0.2.0", path = "../config" }
 
 xxhash-rust = { version = "0.8.8", features = ["xxh64"] }
 rusty_pool = { version = "0.7.0", optional = true }

diff --git a/scripts/publish.py b/scripts/publish.py
@@ -169,6 +169,19 @@ def return_dependencies(toml) -> typing.List[str]:
                                 )
                             )
                         )
+                    if "dev-dependencies" in toml:
+                        acc.update(
+                            list(
+                                map(
+                                    lambda dep: dep[1]["package"]
+                                    if "package" in dep[1]
+                                    else dep[0],
+                                    filter(
+                                        check_local_dep_fn, toml["dev-dependencies"].items()
+                                    ),
+                                )
+                            )
+                        )
                     if "target" in toml:
                         stack.append(toml["target"])
                     for key, value in toml.items():