From 36fe5e30cb11c45b9496962ed67d262baad334af Mon Sep 17 00:00:00 2001 From: Jonathan Kelley Date: Wed, 21 Feb 2024 14:16:01 -0800 Subject: [PATCH] chore: clean up cargo.tomls to enable releasing --- Cargo.lock | 16 +++++++++------- Cargo.toml | 10 +++++----- packages/fullstack/Cargo.toml | 6 +++--- packages/ssr/Cargo.toml | 2 +- 4 files changed, 18 insertions(+), 16 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 52f5a173a..e5ace42e3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5728,7 +5728,8 @@ dependencies = [ [[package]] name = "manganis" version = "0.1.0" -source = "git+https://github.com/DioxusLabs/collect-assets?rev=f982698#f982698027fc27d22acfb4121fba389ec125d538" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a25951ece27df54c1506824923c824e1b3d9f742bb01beab45123b306c95a0e4" dependencies = [ "manganis-macro", ] @@ -5736,7 +5737,8 @@ dependencies = [ [[package]] name = "manganis-cli-support" version = "0.1.0" -source = "git+https://github.com/DioxusLabs/collect-assets?rev=f982698#f982698027fc27d22acfb4121fba389ec125d538" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78d2f137b00aeba4862491a418930ae727493106c67bd720d8588b92ed7529b7" dependencies = [ "anyhow", "cargo-lock 9.0.0", @@ -5762,7 +5764,8 @@ dependencies = [ [[package]] name = "manganis-common" version = "0.1.0" -source = "git+https://github.com/DioxusLabs/collect-assets?rev=f982698#f982698027fc27d22acfb4121fba389ec125d538" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b22d7de6c9e0ad3332c900a120aadedab171907504ad02440d104272c351c80" dependencies = [ "anyhow", "base64", @@ -5776,11 +5779,10 @@ dependencies = [ [[package]] name = "manganis-macro" -version = "0.0.1" -source = "git+https://github.com/DioxusLabs/collect-assets?rev=f982698#f982698027fc27d22acfb4121fba389ec125d538" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30a04a22bb5d861f3b4fa37669d0344cf1350f19e18b9a73d1acdd2c8079fbc2" dependencies = [ - "base64", - "manganis-cli-support", "manganis-common", "proc-macro2", "quote", diff --git a/Cargo.toml b/Cargo.toml index bb8e9ae78..22c1f1a38 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -84,7 +84,7 @@ dioxus-cli-config = { path = "packages/cli-config", version = "0.4.1" } generational-box = { path = "packages/generational-box", version = "0.4.3" } dioxus-hot-reload = { path = "packages/hot-reload", version = "0.4.0" } dioxus-fullstack = { path = "packages/fullstack", version = "0.4.1" } -dioxus_server_macro = { path = "packages/server-macro", version = "0.4.1" } +dioxus_server_macro = { path = "packages/server-macro", version = "0.4.1", default-features = false} tracing = "0.1.37" tracing-futures = "0.2.5" toml = "0.8" @@ -99,16 +99,16 @@ thiserror = "1.0.40" prettyplease = { package = "prettier-please", version = "0.2", features = [ "verbatim", ] } -manganis-cli-support = { git = "https://github.com/DioxusLabs/collect-assets", rev = "f982698", features = [ +manganis-cli-support = { version = "0.1.0", features = [ "webp", "html", ] } -manganis = { git = "https://github.com/DioxusLabs/collect-assets", rev = "f982698" } +manganis = { version = "0.1.0" } lru = "0.12.2" async-trait = "0.1.77" axum = "0.7.0" -axum-server = "0.6.0" +axum-server = {version = "0.6.0", default-features = false} tower = "0.4.13" http = "1.0.0" tower-http = "0.5.1" @@ -192,4 +192,4 @@ required-features = ["http"] [[example]] name = "image_generator_openai" -required-features = ["http"] \ No newline at end of file +required-features = ["http"] diff --git a/packages/fullstack/Cargo.toml b/packages/fullstack/Cargo.toml index 2dcdb9b65..e419205a9 100644 --- a/packages/fullstack/Cargo.toml +++ b/packages/fullstack/Cargo.toml @@ -13,10 +13,10 @@ resolver = "2" [dependencies] # server functions server_fn = { version = "0.6.5", features = ["json", "url", "browser"], default-features = false } -dioxus_server_macro = { workspace = true, version = "0.6.5", default-features = false } +dioxus_server_macro = { workspace = true } # axum -axum = { workspace = true, features = ["ws", "macros"], default-features = false, optional = true } +axum = { workspace = true, features = ["ws", "macros"], optional = true } tower-http = { workspace = true, optional = true, features = ["fs", "compression-gzip"] } dioxus-lib = { workspace = true } @@ -44,7 +44,7 @@ anymap = { version = "0.12.1", optional = true } serde = "1.0.159" serde_json = { version = "1.0.95", optional = true } tokio-stream = { version = "0.1.12", features = ["sync"], optional = true } -futures-util = { workspace = true, default-features = false } +futures-util = { workspace = true } ciborium = "0.2.1" base64 = "0.21.0" diff --git a/packages/ssr/Cargo.toml b/packages/ssr/Cargo.toml index a46c14177..4e55e8ea2 100644 --- a/packages/ssr/Cargo.toml +++ b/packages/ssr/Cargo.toml @@ -20,7 +20,7 @@ tracing = { workspace = true } http = { workspace = true } async-trait = { workspace = true } serde_json = { workspace = true } -chrono = { verison = "0.4.34", optional = true } +chrono = { version = "0.4.34", optional = true } [target.'cfg(target_arch = "wasm32")'.dependencies] tokio = { version = "1.28", features = ["io-util"], optional = true }