huskies: merge 1027

crates/bft-json-crdt/bft-crdt-derive/src/lib.rs

@@ -159,7 +159,7 @@ pub fn derive_json_crdt(input: OgTokenStream) -> OgTokenStream {
                         }
 
                         fn view(&self) -> #crate_name::json_crdt::JsonValue {
-                            let mut view_map = indexmap::IndexMap::new();
+                            let mut view_map = #crate_name::indexmap::IndexMap::new();
                             #(view_map.insert(#ident_strings.to_string(), self.#ident_literals.view().into());)*
                             #crate_name::json_crdt::JsonValue::Object(view_map)
                         }

crates/bft-json-crdt/src/lib.rs

@@ -19,3 +19,8 @@ pub mod lww_crdt;
 pub mod op;
 
 extern crate self as bft_json_crdt;
+
+/// Re-exported so that code generated by `#[derive(CrdtNode)]` can resolve
+/// `indexmap` through this crate without requiring downstream crates to
+/// declare it as a direct dependency.
+pub use indexmap;

server/Cargo.toml

@@ -10,7 +10,6 @@ async-trait = { workspace = true }
 bytes = { workspace = true }
 chrono = { workspace = true, features = ["serde"] }
 chrono-tz = { workspace = true }
-eventsource-stream = { workspace = true }
 futures = { workspace = true }
 homedir = { workspace = true }
 ignore = { workspace = true }
@@ -28,8 +27,6 @@ sha2 = { workspace = true }
 hmac = { workspace = true }
 subtle = { workspace = true }
 base64 = { workspace = true }
-serde_yaml = { workspace = true }
-strip-ansi-escapes = { workspace = true }
 tokio = { workspace = true, features = ["rt-multi-thread", "macros", "sync", "process"] }
 toml = { workspace = true }
 uuid = { workspace = true, features = ["v4", "serde"] }
@@ -47,7 +44,6 @@ bft-json-crdt = { path = "../crates/bft-json-crdt", default-features = false, fe
 source-map-gen = { path = "../crates/source-map-gen" }
 ed25519-dalek = { workspace = true }
 rand = { workspace = true }
-indexmap = { workspace = true, features = ["serde"] }
 
 [target.'cfg(unix)'.dependencies]
 libc = { workspace = true }