diff --git a/Cargo.lock b/Cargo.lock index 15895aa..aa9709d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -121,7 +121,7 @@ dependencies = [ "sync_wrapper 1.0.1", "tokio", "tokio-tungstenite", - "tower", + "tower 0.4.13", "tower-layer", "tower-service", "tracing", @@ -269,7 +269,6 @@ dependencies = [ "leptos_router", "lib", "log", - "serde-lite", "serde_json", "wasm-bindgen", "wasm-bindgen-test", @@ -1645,15 +1644,6 @@ dependencies = [ "serde_derive", ] -[[package]] -name = "serde-lite" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9e8277ab91a9f0d9ba8d626675f18b456372bccbf642db35d36a8f011ae016c" -dependencies = [ - "serde", -] - [[package]] name = "serde-wasm-bindgen" version = "0.6.5" @@ -1762,7 +1752,7 @@ dependencies = [ "serde", "serde_json", "tokio", - "tower", + "tower 0.5.0", "tower-http", "tracing", "tracing-subscriber", @@ -2122,6 +2112,20 @@ dependencies = [ "tracing", ] +[[package]] +name = "tower" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "36b837f86b25d7c0d7988f00a54e74739be6477f2aac6201b8f429a7569991b7" +dependencies = [ + "futures-core", + "futures-util", + "pin-project-lite", + "sync_wrapper 0.1.2", + "tower-layer", + "tower-service", +] + [[package]] name = "tower-http" version = "0.5.2" diff --git a/client/Cargo.toml b/client/Cargo.toml index 7eea2db..b385fc0 100644 --- a/client/Cargo.toml +++ b/client/Cargo.toml @@ -7,25 +7,18 @@ authors = ["Adam Doyle "] # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] +codee = "0.1" +console_error_panic_hook = "0.1" +console_log = "1" leptos = { version = "0.6", features = ["csr", "nightly"] } +leptos-use = "0.12" leptos_meta = { version = "0.6", features = ["csr", "nightly"] } leptos_router = { version = "0.6", features = ["csr", "nightly"] } -console_log = "1" -log = "0.4" -console_error_panic_hook = "0.1" -leptos-use = "0.12" -serde-lite = "0.5.0" - lib = { workspace = true } -serde_json = "1.0.120" -codee = "0.1.2" - -# utils -# strum = { version = "0.25", features = ["derive", "strum_macros"] } -# strum_macros = "0.25" - +log = "0.4" +serde_json = "1.0" [dev-dependencies] -wasm-bindgen = "0.2.92" +wasm-bindgen = "0.2" wasm-bindgen-test = "0.3" web-sys = { version = "0.3", features = ["Document", "Window"] } diff --git a/server/Cargo.toml b/server/Cargo.toml index 14bc2d1..36b4d83 100644 --- a/server/Cargo.toml +++ b/server/Cargo.toml @@ -5,17 +5,17 @@ edition = "2021" authors = ["Adam Doyle "] [dependencies] -rand = "0.8.5" -serde = { version = "1.0.197", features = ["derive"] } -serde_json = "1.0.115" +lib = { workspace = true } + +anyhow = "1.0" axum = { version = "0.7", features = ["ws"] } futures = "0.3" +rand = "0.8" +serde = { version = "1.0", features = ["derive"] } +serde_json = "1.0" tokio = { version = "1", features = ["full"] } -tower = { version = "0.4", features = ["util"] } +tower = { version = "0.5", features = ["util"] } +tower-http = { version = "0.5", features = ["fs", "trace"] } tracing = "0.1" tracing-subscriber = { version = "0.3", features = ["env-filter"] } -anyhow = "1.0.82" -tower-http = { version = "0.5.2", features = ["fs", "trace"] } - -lib = { workspace = true } -uuid = { version = "1.10.0", features = ["v7", "serde", "fast-rng"] } +uuid = { version = "1.10", features = ["v7", "serde", "fast-rng"] }