diff --git a/Cargo.lock b/Cargo.lock index 9b14fc9..bfe2dd4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -194,56 +194,6 @@ dependencies = [ "libc", ] -[[package]] -name = "anstream" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "824a212faf96e9acacdbd09febd34438f8f711fb84e09a8916013cd7815ca28d" -dependencies = [ - "anstyle", - "anstyle-parse", - "anstyle-query", - "anstyle-wincon", - "colorchoice", - "is_terminal_polyfill", - "utf8parse", -] - -[[package]] -name = "anstyle" -version = "1.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "940b3a0ca603d1eade50a4846a2afffd5ef57a9feac2c0e2ec2e14f9ead76000" - -[[package]] -name = "anstyle-parse" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52ce7f38b242319f7cabaa6813055467063ecdc9d355bbb4ce0c68908cd8130e" -dependencies = [ - "utf8parse", -] - -[[package]] -name = "anstyle-query" -version = "1.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40c48f72fd53cd289104fc64099abca73db4166ad86ea0b4341abe65af83dadc" -dependencies = [ - "windows-sys 0.61.2", -] - -[[package]] -name = "anstyle-wincon" -version = "3.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d" -dependencies = [ - "anstyle", - "once_cell_polyfill", - "windows-sys 0.61.2", -] - [[package]] name = "anyhow" version = "1.0.103" @@ -592,9 +542,7 @@ version = "1.0.0-beta5" dependencies = [ "anyhow", "common", - "futures", "gpui", - "gpui_tokio", "log", "semver", "serde", @@ -1108,15 +1056,12 @@ dependencies = [ "common", "device", "flume 0.11.1", - "futures", "fuzzy-matcher", "gpui", "itertools 0.13.0", "log", "nostr-sdk", "person", - "serde", - "serde_json", "settings", "smallvec", "smol", @@ -1132,17 +1077,13 @@ dependencies = [ "common", "flume 0.11.1", "gpui", - "gpui_tokio", "itertools 0.13.0", "linkify", "log", "nostr-sdk", - "once_cell", "person", "pulldown-cmark", - "regex", "serde", - "serde_json", "settings", "smallvec", "smol", @@ -1198,46 +1139,6 @@ dependencies = [ "libloading", ] -[[package]] -name = "clap" -version = "4.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd059f9da4f5c36b3787f65d38ccaab1cc315f07b01f89abc8359ee6a8205011" -dependencies = [ - "clap_builder", - "clap_derive", -] - -[[package]] -name = "clap_builder" -version = "4.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f09628afdcc538b57f3c6341e9c8e9970f18e4a481690a64974d7023bd33548b" -dependencies = [ - "anstream", - "anstyle", - "clap_lex", - "strsim", -] - -[[package]] -name = "clap_derive" -version = "4.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2ce8604710f6733aa641a2b3731eaa1e8b3d9973d5e3565da11800813f997a9" -dependencies = [ - "heck 0.5.0", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "clap_lex" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8d4a3bb8b1e0c1050499d1815f5ab16d04f0959b233085fb31653fbfc9d98f9" - [[package]] name = "cmake" version = "0.1.58" @@ -1340,12 +1241,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" -[[package]] -name = "colorchoice" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d07550c9036bf2ae0c684c4297d503f838287c83c53686d05370d0e139ae570" - [[package]] name = "combine" version = "4.6.7" @@ -1360,8 +1255,6 @@ dependencies = [ name = "common" version = "1.0.0-beta5" dependencies = [ - "anyhow", - "bech32", "chrono", "dirs 5.0.1", "futures", @@ -1372,7 +1265,6 @@ dependencies = [ "nostr-sdk", "qrcode", "regex", - "smallvec", ] [[package]] @@ -1461,35 +1353,24 @@ dependencies = [ name = "coop" version = "1.0.0-beta5" dependencies = [ - "anyhow", "assets", "auto_update", "chat", "common", "device", - "futures", "gpui", "gpui_linux", "gpui_macos", "gpui_platform", - "gpui_tokio", "gpui_windows", - "itertools 0.13.0", "log", - "nostr-sdk", - "oneshot", "person", "reqwest_client", - "serde", - "serde_json", "settings", - "smallvec", - "smol", "state", "theme", "tracing-subscriber", "ui", - "webbrowser", "workspace", ] @@ -1503,6 +1384,7 @@ dependencies = [ "console_error_panic_hook", "console_log", "device", + "errno", "getrandom 0.2.17", "getrandom 0.3.4", "getrandom 0.4.3", @@ -1510,7 +1392,6 @@ dependencies = [ "gpui_platform", "gpui_web", "log", - "nostr-sdk", "person", "settings", "state", @@ -1845,12 +1726,9 @@ dependencies = [ "common", "flume 0.11.1", "gpui", - "itertools 0.13.0", "log", "nostr-sdk", "person", - "serde", - "serde_json", "settings", "smallvec", "smol", @@ -2420,15 +2298,6 @@ version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" -[[package]] -name = "ftree" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eeef4a9366aaf0ed0bb5292b7c489d80600a7431fca0d96271e10e23ac0bc2b0" -dependencies = [ - "serde", -] - [[package]] name = "futures" version = "0.3.32" @@ -3566,7 +3435,6 @@ dependencies = [ "qoi", "ravif", "rayon", - "rgb", "tiff", "zune-core", "zune-jpeg", @@ -3606,15 +3474,6 @@ dependencies = [ "serde_core", ] -[[package]] -name = "indexset" -version = "0.12.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ceb59e93f24cfa0ebb2d19943356df8d4217ef0b291cc3db969f280498aadbd2" -dependencies = [ - "ftree", -] - [[package]] name = "inout" version = "0.1.4" @@ -3691,12 +3550,6 @@ dependencies = [ "once_cell", ] -[[package]] -name = "is_terminal_polyfill" -version = "1.70.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6cb138bb79a146c1bd460005623e142ef0181e3d0219cb493e02f7d08a35695" - [[package]] name = "itertools" version = "0.13.0" @@ -3715,15 +3568,6 @@ dependencies = [ "either", ] -[[package]] -name = "itertools" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b4baf93f58d4425749ca49a51c50ebab072c5df6994d08fed93541c331481dc" -dependencies = [ - "either", -] - [[package]] name = "itoa" version = "1.0.18" @@ -3925,10 +3769,7 @@ version = "0.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c943259e342f1e06ff2da7a83eabdfe7f92ce10262688dbf1895ff0b3e6e4652" dependencies = [ - "bitflags 2.13.1", "libc", - "plain", - "redox_syscall 0.9.0", ] [[package]] @@ -4878,18 +4719,6 @@ version = "1.21.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9f7c3e4beb33f85d45ae3e3a1792185706c8e16d043238c593331cc7cd313b50" -[[package]] -name = "once_cell_polyfill" -version = "1.70.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "384b8ab6d37215f3c5301a95a4accb5d64aa607f1fcb26a11b5303878451b4fe" - -[[package]] -name = "oneshot" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "269bca4c2591a28585d6bf10d9ed0332b7d76900a1b02bec41bdc3a2cdcda107" - [[package]] name = "oo7" version = "0.6.0" @@ -5012,7 +4841,7 @@ checksum = "2621685985a2ebf1c516881c026032ac7deafcda1a2c9b7850dc81e3dfcb64c1" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.5.18", + "redox_syscall", "smallvec", "windows-link 0.2.1", ] @@ -5099,20 +4928,6 @@ dependencies = [ "urlencoding", ] -[[package]] -name = "petname" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cd31dcfdbbd7431a807ef4df6edd6473228e94d5c805e8cf671227a21bad068" -dependencies = [ - "anyhow", - "clap", - "itertools 0.15.0", - "proc-macro2", - "quote", - "rand 0.8.7", -] - [[package]] name = "phf" version = "0.11.3" @@ -5247,12 +5062,6 @@ version = "0.3.33" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "19f132c84eca552bf34cab8ec81f1c1dcc229b811638f9d283dceabe58c5569e" -[[package]] -name = "plain" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6" - [[package]] name = "png" version = "0.17.16" @@ -5863,15 +5672,6 @@ dependencies = [ "bitflags 2.13.1", ] -[[package]] -name = "redox_syscall" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5102a6aaa05aa011a238e178e6bca86d2cb56fc9f586d37cb80f5bca6e07759" -dependencies = [ - "bitflags 2.13.1", -] - [[package]] name = "redox_users" version = "0.4.6" @@ -6875,13 +6675,10 @@ dependencies = [ "nostr-lmdb", "nostr-memory", "nostr-sdk", - "petname", "rustls", - "serde", "serde_json", "smol", "webbrowser", - "whoami", ] [[package]] @@ -6911,12 +6708,6 @@ dependencies = [ "float-cmp", ] -[[package]] -name = "strsim" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" - [[package]] name = "strum" version = "0.27.2" @@ -7750,14 +7541,12 @@ dependencies = [ "anyhow", "common", "gpui", - "image", "itertools 0.13.0", "log", "lsp-types", "regex", "ropey", "serde", - "serde_json", "smallvec", "smol", "sum_tree", @@ -7928,12 +7717,6 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" -[[package]] -name = "utf8parse" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" - [[package]] name = "util_macros" version = "0.1.0" @@ -8076,12 +7859,6 @@ dependencies = [ "wit-bindgen", ] -[[package]] -name = "wasite" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b" - [[package]] name = "wasm-bindgen" version = "0.2.126" @@ -8518,17 +8295,6 @@ dependencies = [ "winsafe", ] -[[package]] -name = "whoami" -version = "1.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d4a4db5077702ca3015d3d02d74974948aba2ad9e12ab7df718ee64ccd7e97d" -dependencies = [ - "libredox", - "wasite", - "web-sys", -] - [[package]] name = "winapi" version = "0.3.9" @@ -9207,29 +8973,21 @@ name = "workspace" version = "1.0.0-beta5" dependencies = [ "anyhow", - "auto_update", "chat", "chat_ui", "common", "device", - "futures", "gpui", - "indexset", - "itertools 0.13.0", "log", "nostr-connect", "nostr-sdk", - "oneshot", "person", "serde", - "serde_json", "settings", "smallvec", "state", "theme", - "tracing-subscriber", "ui", - "webbrowser", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 1294da3..67a9c89 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -24,8 +24,7 @@ nostr-memory = { git = "https://github.com/rust-nostr/nostr" } nostr-blossom = { git = "https://github.com/rust-nostr/nostr" } nostr-gossip-memory = { git = "https://github.com/rust-nostr/nostr" } nostr-connect = { git = "https://github.com/rust-nostr/nostr" } -nostr-browser-signer = { git = "https://github.com/rust-nostr/nostr" } -nostr-browser-signer-proxy = { git = "https://github.com/rust-nostr/nostr" } + nostr-sdk = { git = "https://github.com/rust-nostr/nostr" } nostr = { git = "https://github.com/rust-nostr/nostr", features = [ "nip59", "nip49", "nip44" ] } @@ -43,11 +42,8 @@ serde_json = "1.0" schemars = "1" smallvec = "1.14.0" smol = "2" -tracing = "0.1.40" webbrowser = "1.0.4" tracing-subscriber = { version = "0.3.18", features = ["fmt", "env-filter"] } -# Use errno stub for WASM -errno = { version = "0.3.14", default-features = false } [patch.crates-io] # Use stacker's psm version which may have better WASM support diff --git a/crates/auto_update/Cargo.toml b/crates/auto_update/Cargo.toml index eb38556..aff6855 100644 --- a/crates/auto_update/Cargo.toml +++ b/crates/auto_update/Cargo.toml @@ -16,8 +16,6 @@ serde_json.workspace = true semver = "1.0.27" tempfile = "3.23.0" -futures.workspace = true [target.'cfg(not(target_arch = "wasm32"))'.dependencies] smol.workspace = true -gpui_tokio.workspace = true diff --git a/crates/chat/Cargo.toml b/crates/chat/Cargo.toml index 1d1e012..3117b91 100644 --- a/crates/chat/Cargo.toml +++ b/crates/chat/Cargo.toml @@ -18,10 +18,7 @@ anyhow.workspace = true itertools.workspace = true smallvec.workspace = true log.workspace = true -futures.workspace = true flume.workspace = true -serde.workspace = true -serde_json.workspace = true fuzzy-matcher = "0.3.7" diff --git a/crates/chat_ui/Cargo.toml b/crates/chat_ui/Cargo.toml index b7dbe08..0cc8ed3 100644 --- a/crates/chat_ui/Cargo.toml +++ b/crates/chat_ui/Cargo.toml @@ -21,13 +21,9 @@ smallvec.workspace = true flume.workspace = true log.workspace = true serde.workspace = true -serde_json.workspace = true -once_cell = "1.19.0" -regex = "1" linkify = "0.10.0" pulldown-cmark = "0.13.1" [target.'cfg(not(target_arch = "wasm32"))'.dependencies] smol.workspace = true -gpui_tokio.workspace = true diff --git a/crates/common/Cargo.toml b/crates/common/Cargo.toml index bec018d..bdad290 100644 --- a/crates/common/Cargo.toml +++ b/crates/common/Cargo.toml @@ -9,14 +9,11 @@ gpui.workspace = true nostr.workspace = true nostr-sdk.workspace = true -anyhow.workspace = true itertools.workspace = true chrono.workspace = true -smallvec.workspace = true futures.workspace = true log.workspace = true dirs = "5.0" qrcode = "0.14.1" -bech32 = "0.11.1" regex = "1.10" diff --git a/crates/device/Cargo.toml b/crates/device/Cargo.toml index 1b84189..20131b2 100644 --- a/crates/device/Cargo.toml +++ b/crates/device/Cargo.toml @@ -15,12 +15,9 @@ settings = { path = "../settings" } gpui.workspace = true nostr-sdk.workspace = true anyhow.workspace = true -itertools.workspace = true smallvec.workspace = true log.workspace = true flume.workspace = true -serde.workspace = true -serde_json.workspace = true [target.'cfg(not(target_arch = "wasm32"))'.dependencies] smol.workspace = true diff --git a/crates/state/Cargo.toml b/crates/state/Cargo.toml index 2eb8907..15e6006 100644 --- a/crates/state/Cargo.toml +++ b/crates/state/Cargo.toml @@ -19,11 +19,8 @@ futures.workspace = true log.workspace = true anyhow.workspace = true webbrowser.workspace = true -serde.workspace = true serde_json.workspace = true -petname = "2.0.2" -whoami = "1.6.1" mime_guess = "2.0.4" [target.'cfg(target_arch = "wasm32")'.dependencies] diff --git a/crates/ui/Cargo.toml b/crates/ui/Cargo.toml index 1e6112c..0ee2e24 100644 --- a/crates/ui/Cargo.toml +++ b/crates/ui/Cargo.toml @@ -10,7 +10,6 @@ theme = { path = "../theme" } gpui.workspace = true serde.workspace = true -serde_json.workspace = true smallvec.workspace = true anyhow.workspace = true itertools.workspace = true @@ -19,7 +18,6 @@ log.workspace = true unicode-segmentation = "1.12.0" uuid = "1.10" regex = "1" -image = "0.25.1" lsp-types = "0.97.0" ropey = { version = "=2.0.0-beta.1", features = ["metric_lines_lf", "metric_utf16"] } sum_tree = { git = "https://github.com/zed-industries/zed" } diff --git a/crates/workspace/Cargo.toml b/crates/workspace/Cargo.toml index 31c01da..f37ed1e 100644 --- a/crates/workspace/Cargo.toml +++ b/crates/workspace/Cargo.toml @@ -13,7 +13,6 @@ device = { path = "../device" } chat = { path = "../chat" } chat_ui = { path = "../chat_ui" } settings = { path = "../settings" } -auto_update = { path = "../auto_update" } person = { path = "../person" } gpui.workspace = true @@ -22,13 +21,5 @@ nostr-connect.workspace = true anyhow.workspace = true serde.workspace = true -serde_json.workspace = true -itertools.workspace = true log.workspace = true smallvec.workspace = true -futures.workspace = true -oneshot.workspace = true -webbrowser.workspace = true -tracing-subscriber.workspace = true - -indexset = "0.12.3" diff --git a/desktop/Cargo.toml b/desktop/Cargo.toml index e08ba5b..76dfb1f 100644 --- a/desktop/Cargo.toml +++ b/desktop/Cargo.toml @@ -44,19 +44,7 @@ gpui_platform.workspace = true gpui_linux.workspace = true gpui_windows.workspace = true gpui_macos.workspace = true -gpui_tokio.workspace = true reqwest_client.workspace = true -nostr-sdk.workspace = true - -anyhow.workspace = true -serde.workspace = true -serde_json.workspace = true -itertools.workspace = true log.workspace = true -smallvec.workspace = true -smol.workspace = true -futures.workspace = true -oneshot.workspace = true -webbrowser.workspace = true tracing-subscriber.workspace = true diff --git a/web/Cargo.toml b/web/Cargo.toml index 48f09e4..5560d3a 100644 --- a/web/Cargo.toml +++ b/web/Cargo.toml @@ -20,7 +20,6 @@ gpui.workspace = true gpui_platform.workspace = true gpui_web = { git = "https://github.com/zed-industries/zed" } -nostr-sdk.workspace = true log.workspace = true console_error_panic_hook = "0.1" @@ -33,3 +32,4 @@ getrandom_0_2 = { package = "getrandom", version = "0.2", features = ["js"] } getrandom_0_3 = { package = "getrandom", version = "0.3", features = ["wasm_js"] } getrandom_0_4 = { package = "getrandom", version = "0.4", features = ["wasm_js"] } tokio = { version = "1", default-features = false, features = ["sync", "macros", "io-util", "rt", "time"] } +errno = { version = "0.3.14", default-features = false }