diff --git a/Cargo.lock b/Cargo.lock index 3ad9529..f881eff 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1228,7 +1228,7 @@ dependencies = [ [[package]] name = "collections" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#5a020093f5bfb59f3bb683ff28686f97b6d7b9c8" +source = "git+https://github.com/zed-industries/zed#63b52a7ee354741a7485e8a20ab087a485fcb8a1" dependencies = [ "gpui_util", "indexmap", @@ -1710,7 +1710,7 @@ dependencies = [ [[package]] name = "derive_refineable" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#5a020093f5bfb59f3bb683ff28686f97b6d7b9c8" +source = "git+https://github.com/zed-industries/zed#63b52a7ee354741a7485e8a20ab087a485fcb8a1" dependencies = [ "proc-macro2", "quote", @@ -2606,7 +2606,7 @@ dependencies = [ [[package]] name = "gpui" version = "0.2.2" -source = "git+https://github.com/zed-industries/zed#5a020093f5bfb59f3bb683ff28686f97b6d7b9c8" +source = "git+https://github.com/zed-industries/zed#63b52a7ee354741a7485e8a20ab087a485fcb8a1" dependencies = [ "accesskit", "anyhow", @@ -2688,7 +2688,7 @@ dependencies = [ [[package]] name = "gpui_linux" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#5a020093f5bfb59f3bb683ff28686f97b6d7b9c8" +source = "git+https://github.com/zed-industries/zed#63b52a7ee354741a7485e8a20ab087a485fcb8a1" dependencies = [ "accesskit", "accesskit_unix", @@ -2740,7 +2740,7 @@ dependencies = [ [[package]] name = "gpui_macos" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#5a020093f5bfb59f3bb683ff28686f97b6d7b9c8" +source = "git+https://github.com/zed-industries/zed#63b52a7ee354741a7485e8a20ab087a485fcb8a1" dependencies = [ "accesskit", "accesskit_macos", @@ -2789,7 +2789,7 @@ dependencies = [ [[package]] name = "gpui_macros" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#5a020093f5bfb59f3bb683ff28686f97b6d7b9c8" +source = "git+https://github.com/zed-industries/zed#63b52a7ee354741a7485e8a20ab087a485fcb8a1" dependencies = [ "heck 0.5.0", "proc-macro2", @@ -2800,7 +2800,7 @@ dependencies = [ [[package]] name = "gpui_platform" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#5a020093f5bfb59f3bb683ff28686f97b6d7b9c8" +source = "git+https://github.com/zed-industries/zed#63b52a7ee354741a7485e8a20ab087a485fcb8a1" dependencies = [ "console_error_panic_hook", "gpui", @@ -2813,7 +2813,7 @@ dependencies = [ [[package]] name = "gpui_shared_string" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#5a020093f5bfb59f3bb683ff28686f97b6d7b9c8" +source = "git+https://github.com/zed-industries/zed#63b52a7ee354741a7485e8a20ab087a485fcb8a1" dependencies = [ "schemars", "serde", @@ -2823,7 +2823,7 @@ dependencies = [ [[package]] name = "gpui_tokio" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#5a020093f5bfb59f3bb683ff28686f97b6d7b9c8" +source = "git+https://github.com/zed-industries/zed#63b52a7ee354741a7485e8a20ab087a485fcb8a1" dependencies = [ "anyhow", "gpui", @@ -2834,7 +2834,7 @@ dependencies = [ [[package]] name = "gpui_util" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#5a020093f5bfb59f3bb683ff28686f97b6d7b9c8" +source = "git+https://github.com/zed-industries/zed#63b52a7ee354741a7485e8a20ab087a485fcb8a1" dependencies = [ "anyhow", "log", @@ -2844,7 +2844,7 @@ dependencies = [ [[package]] name = "gpui_web" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#5a020093f5bfb59f3bb683ff28686f97b6d7b9c8" +source = "git+https://github.com/zed-industries/zed#63b52a7ee354741a7485e8a20ab087a485fcb8a1" dependencies = [ "anyhow", "console_error_panic_hook", @@ -2868,7 +2868,7 @@ dependencies = [ [[package]] name = "gpui_wgpu" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#5a020093f5bfb59f3bb683ff28686f97b6d7b9c8" +source = "git+https://github.com/zed-industries/zed#63b52a7ee354741a7485e8a20ab087a485fcb8a1" dependencies = [ "anyhow", "bytemuck", @@ -2898,7 +2898,7 @@ dependencies = [ [[package]] name = "gpui_windows" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#5a020093f5bfb59f3bb683ff28686f97b6d7b9c8" +source = "git+https://github.com/zed-industries/zed#63b52a7ee354741a7485e8a20ab087a485fcb8a1" dependencies = [ "accesskit", "accesskit_windows", @@ -3188,7 +3188,7 @@ dependencies = [ [[package]] name = "http_client" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#5a020093f5bfb59f3bb683ff28686f97b6d7b9c8" +source = "git+https://github.com/zed-industries/zed#63b52a7ee354741a7485e8a20ab087a485fcb8a1" dependencies = [ "anyhow", "async-compression", @@ -3208,7 +3208,7 @@ dependencies = [ [[package]] name = "http_client_tls" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#5a020093f5bfb59f3bb683ff28686f97b6d7b9c8" +source = "git+https://github.com/zed-industries/zed#63b52a7ee354741a7485e8a20ab087a485fcb8a1" dependencies = [ "rustls", "rustls-platform-verifier", @@ -4003,7 +4003,7 @@ dependencies = [ [[package]] name = "media" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#5a020093f5bfb59f3bb683ff28686f97b6d7b9c8" +source = "git+https://github.com/zed-industries/zed#63b52a7ee354741a7485e8a20ab087a485fcb8a1" dependencies = [ "anyhow", "bindgen", @@ -4197,7 +4197,7 @@ checksum = "0676bb32a98c1a483ce53e500a81ad9c3d5b3f7c920c28c24e9cb0980d0b5bc8" [[package]] name = "nostr" version = "0.45.0-alpha.6" -source = "git+https://github.com/rust-nostr/nostr?branch=send-bound#0d9e68e19f6afb6c93492ed28c0e3c572d34aee1" +source = "git+https://github.com/rust-nostr/nostr#d331bed1394af5f88a4d71549c4812fdcc5d90e3" dependencies = [ "aes", "base64", @@ -4222,7 +4222,7 @@ dependencies = [ [[package]] name = "nostr-blossom" version = "0.45.0-alpha.6" -source = "git+https://github.com/rust-nostr/nostr?branch=send-bound#0d9e68e19f6afb6c93492ed28c0e3c572d34aee1" +source = "git+https://github.com/rust-nostr/nostr#d331bed1394af5f88a4d71549c4812fdcc5d90e3" dependencies = [ "base64", "nostr", @@ -4234,7 +4234,7 @@ dependencies = [ [[package]] name = "nostr-connect" version = "0.45.0-alpha.6" -source = "git+https://github.com/rust-nostr/nostr?branch=send-bound#0d9e68e19f6afb6c93492ed28c0e3c572d34aee1" +source = "git+https://github.com/rust-nostr/nostr#d331bed1394af5f88a4d71549c4812fdcc5d90e3" dependencies = [ "async-utility", "futures-core", @@ -4248,7 +4248,7 @@ dependencies = [ [[package]] name = "nostr-database" version = "0.45.0-alpha.6" -source = "git+https://github.com/rust-nostr/nostr?branch=send-bound#0d9e68e19f6afb6c93492ed28c0e3c572d34aee1" +source = "git+https://github.com/rust-nostr/nostr#d331bed1394af5f88a4d71549c4812fdcc5d90e3" dependencies = [ "btreecap", "flatbuffers", @@ -4259,7 +4259,7 @@ dependencies = [ [[package]] name = "nostr-gossip" version = "0.45.0-alpha.6" -source = "git+https://github.com/rust-nostr/nostr?branch=send-bound#0d9e68e19f6afb6c93492ed28c0e3c572d34aee1" +source = "git+https://github.com/rust-nostr/nostr#d331bed1394af5f88a4d71549c4812fdcc5d90e3" dependencies = [ "nostr", "opaquerr", @@ -4268,7 +4268,7 @@ dependencies = [ [[package]] name = "nostr-gossip-memory" version = "0.45.0-alpha.6" -source = "git+https://github.com/rust-nostr/nostr?branch=send-bound#0d9e68e19f6afb6c93492ed28c0e3c572d34aee1" +source = "git+https://github.com/rust-nostr/nostr#d331bed1394af5f88a4d71549c4812fdcc5d90e3" dependencies = [ "indexmap", "lru", @@ -4280,7 +4280,7 @@ dependencies = [ [[package]] name = "nostr-lmdb" version = "0.45.0-alpha.6" -source = "git+https://github.com/rust-nostr/nostr?branch=send-bound#0d9e68e19f6afb6c93492ed28c0e3c572d34aee1" +source = "git+https://github.com/rust-nostr/nostr#d331bed1394af5f88a4d71549c4812fdcc5d90e3" dependencies = [ "async-utility", "flume 0.12.0", @@ -4294,7 +4294,7 @@ dependencies = [ [[package]] name = "nostr-memory" version = "0.45.0-alpha.6" -source = "git+https://github.com/rust-nostr/nostr?branch=send-bound#0d9e68e19f6afb6c93492ed28c0e3c572d34aee1" +source = "git+https://github.com/rust-nostr/nostr#d331bed1394af5f88a4d71549c4812fdcc5d90e3" dependencies = [ "btreecap", "nostr", @@ -4305,7 +4305,7 @@ dependencies = [ [[package]] name = "nostr-sdk" version = "0.45.0-alpha.6" -source = "git+https://github.com/rust-nostr/nostr?branch=send-bound#0d9e68e19f6afb6c93492ed28c0e3c572d34aee1" +source = "git+https://github.com/rust-nostr/nostr#d331bed1394af5f88a4d71549c4812fdcc5d90e3" dependencies = [ "async-utility", "async-wsocket", @@ -4906,7 +4906,7 @@ checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220" [[package]] name = "perf" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#5a020093f5bfb59f3bb683ff28686f97b6d7b9c8" +source = "git+https://github.com/zed-industries/zed#63b52a7ee354741a7485e8a20ab087a485fcb8a1" dependencies = [ "collections", "serde", @@ -5717,7 +5717,7 @@ dependencies = [ [[package]] name = "refineable" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#5a020093f5bfb59f3bb683ff28686f97b6d7b9c8" +source = "git+https://github.com/zed-industries/zed#63b52a7ee354741a7485e8a20ab087a485fcb8a1" dependencies = [ "derive_refineable", ] @@ -5799,7 +5799,7 @@ dependencies = [ [[package]] name = "reqwest_client" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#5a020093f5bfb59f3bb683ff28686f97b6d7b9c8" +source = "git+https://github.com/zed-industries/zed#63b52a7ee354741a7485e8a20ab087a485fcb8a1" dependencies = [ "anyhow", "bytes", @@ -6114,7 +6114,7 @@ dependencies = [ [[package]] name = "scheduler" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#5a020093f5bfb59f3bb683ff28686f97b6d7b9c8" +source = "git+https://github.com/zed-industries/zed#63b52a7ee354741a7485e8a20ab087a485fcb8a1" dependencies = [ "async-task", "backtrace", @@ -6738,7 +6738,7 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "sum_tree" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#5a020093f5bfb59f3bb683ff28686f97b6d7b9c8" +source = "git+https://github.com/zed-industries/zed#63b52a7ee354741a7485e8a20ab087a485fcb8a1" dependencies = [ "heapless 0.9.3", "log", @@ -7732,7 +7732,7 @@ checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" [[package]] name = "util_macros" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#5a020093f5bfb59f3bb683ff28686f97b6d7b9c8" +source = "git+https://github.com/zed-industries/zed#63b52a7ee354741a7485e8a20ab087a485fcb8a1" dependencies = [ "perf", "quote", @@ -9465,7 +9465,7 @@ dependencies = [ [[package]] name = "zlog" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#5a020093f5bfb59f3bb683ff28686f97b6d7b9c8" +source = "git+https://github.com/zed-industries/zed#63b52a7ee354741a7485e8a20ab087a485fcb8a1" dependencies = [ "anyhow", "chrono", @@ -9482,7 +9482,7 @@ checksum = "29666d0abbfad1e3dc4dcf6144730dd3a3ab225bbbdac83319345b1b44ccfc1b" [[package]] name = "ztracing" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#5a020093f5bfb59f3bb683ff28686f97b6d7b9c8" +source = "git+https://github.com/zed-industries/zed#63b52a7ee354741a7485e8a20ab087a485fcb8a1" dependencies = [ "tracing", "tracing-subscriber", @@ -9493,7 +9493,7 @@ dependencies = [ [[package]] name = "ztracing_macro" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#5a020093f5bfb59f3bb683ff28686f97b6d7b9c8" +source = "git+https://github.com/zed-industries/zed#63b52a7ee354741a7485e8a20ab087a485fcb8a1" [[package]] name = "zune-core" diff --git a/Cargo.toml b/Cargo.toml index 5475b0d..94be91f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -19,13 +19,13 @@ gpui_tokio = { git = "https://github.com/zed-industries/zed" } reqwest_client = { git = "https://github.com/zed-industries/zed" } # Nostr -nostr-lmdb = { git = "https://github.com/rust-nostr/nostr", branch = "send-bound" } -nostr-memory = { git = "https://github.com/rust-nostr/nostr", branch = "send-bound" } -nostr-blossom = { git = "https://github.com/rust-nostr/nostr", branch = "send-bound" } -nostr-gossip-memory = { git = "https://github.com/rust-nostr/nostr", branch = "send-bound" } -nostr-connect = { git = "https://github.com/rust-nostr/nostr", branch = "send-bound" } -nostr-sdk = { git = "https://github.com/rust-nostr/nostr", branch = "send-bound" } -nostr = { git = "https://github.com/rust-nostr/nostr", features = [ "nip59", "nip49", "nip44" ], branch = "send-bound" } +nostr-lmdb = { git = "https://github.com/rust-nostr/nostr" } +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-sdk = { git = "https://github.com/rust-nostr/nostr" } +nostr = { git = "https://github.com/rust-nostr/nostr", features = [ "nip59", "nip49", "nip44" ] } # Others anyhow = "1.0.44" diff --git a/web/Cargo.toml b/web/Cargo.toml index 8cfadb0..dae84a6 100644 --- a/web/Cargo.toml +++ b/web/Cargo.toml @@ -4,6 +4,9 @@ version.workspace = true edition.workspace = true publish.workspace = true +[lib] +crate-type = ["cdylib"] + [dependencies] workspace = { path = "../crates/workspace" } assets = { path = "../crates/assets" } diff --git a/web/script/build-wasm.sh b/web/script/build-wasm.sh index 3775664..6eb507a 100755 --- a/web/script/build-wasm.sh +++ b/web/script/build-wasm.sh @@ -23,7 +23,12 @@ fi # macOS: ensure LLVM from Homebrew is available if [[ "$(uname)" == "Darwin" ]]; then echo -e "${GREEN}Detected macOS, setting up LLVM...${NC}" - brew install llvm + if brew list llvm &>/dev/null; then + echo -e "${GREEN}LLVM already installed, skipping install${NC}" + else + echo -e "${YELLOW}LLVM not found, installing via Homebrew...${NC}" + brew install llvm + fi LLVM_PATH=$(brew --prefix llvm) export AR="${LLVM_PATH}/bin/llvm-ar" export CC="${LLVM_PATH}/bin/clang"