fix web build

2026-07-27 08:09:55 +07:00
parent b518c729f6
commit 9addbd49f4
5 changed files with 95 additions and 52 deletions
--- 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#58df5a14ce946fa27b14194d9d2fce8f87b1c331"
+source = "git+https://github.com/zed-industries/zed#50da8c40dcd596a91fe252537d8e4249f2fd3a50"
 dependencies = [
 "gpui_util",
 "indexmap",
@@ -1384,7 +1384,6 @@ dependencies = [
 "console_error_panic_hook",
 "console_log",
 "device",
- "errno",
 "getrandom 0.2.17",
 "getrandom 0.3.4",
 "getrandom 0.4.3",
@@ -1650,9 +1649,9 @@ dependencies = [

 [[package]]
 name = "ctor"
-version = "1.0.10"
+version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2e30e509674ef0ec91e21a7735766db37d163d46151b6a361d8b83dd79116bd"
+checksum = "e9bb72bb94fdc1bd619f4c18cc91ecf6302aeb333d31b3c6ec0bb841cd920209"
 dependencies = [
 "link-section",
 "linktime-proc-macro",
@@ -1711,7 +1710,7 @@ dependencies = [
 [[package]]
 name = "derive_refineable"
 version = "0.1.0"
-source = "git+https://github.com/zed-industries/zed#58df5a14ce946fa27b14194d9d2fce8f87b1c331"
+source = "git+https://github.com/zed-industries/zed#50da8c40dcd596a91fe252537d8e4249f2fd3a50"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -2607,7 +2606,7 @@ dependencies = [
 [[package]]
 name = "gpui"
 version = "0.2.2"
-source = "git+https://github.com/zed-industries/zed#58df5a14ce946fa27b14194d9d2fce8f87b1c331"
+source = "git+https://github.com/zed-industries/zed#50da8c40dcd596a91fe252537d8e4249f2fd3a50"
 dependencies = [
 "accesskit",
 "anyhow",
@@ -2689,7 +2688,7 @@ dependencies = [
 [[package]]
 name = "gpui_linux"
 version = "0.1.0"
-source = "git+https://github.com/zed-industries/zed#58df5a14ce946fa27b14194d9d2fce8f87b1c331"
+source = "git+https://github.com/zed-industries/zed#50da8c40dcd596a91fe252537d8e4249f2fd3a50"
 dependencies = [
 "accesskit",
 "accesskit_unix",
@@ -2741,7 +2740,7 @@ dependencies = [
 [[package]]
 name = "gpui_macos"
 version = "0.1.0"
-source = "git+https://github.com/zed-industries/zed#58df5a14ce946fa27b14194d9d2fce8f87b1c331"
+source = "git+https://github.com/zed-industries/zed#50da8c40dcd596a91fe252537d8e4249f2fd3a50"
 dependencies = [
 "accesskit",
 "accesskit_macos",
@@ -2790,7 +2789,7 @@ dependencies = [
 [[package]]
 name = "gpui_macros"
 version = "0.1.0"
-source = "git+https://github.com/zed-industries/zed#58df5a14ce946fa27b14194d9d2fce8f87b1c331"
+source = "git+https://github.com/zed-industries/zed#50da8c40dcd596a91fe252537d8e4249f2fd3a50"
 dependencies = [
 "heck 0.5.0",
 "proc-macro2",
@@ -2801,7 +2800,7 @@ dependencies = [
 [[package]]
 name = "gpui_platform"
 version = "0.1.0"
-source = "git+https://github.com/zed-industries/zed#58df5a14ce946fa27b14194d9d2fce8f87b1c331"
+source = "git+https://github.com/zed-industries/zed#50da8c40dcd596a91fe252537d8e4249f2fd3a50"
 dependencies = [
 "console_error_panic_hook",
 "gpui",
@@ -2814,7 +2813,7 @@ dependencies = [
 [[package]]
 name = "gpui_shared_string"
 version = "0.1.0"
-source = "git+https://github.com/zed-industries/zed#58df5a14ce946fa27b14194d9d2fce8f87b1c331"
+source = "git+https://github.com/zed-industries/zed#50da8c40dcd596a91fe252537d8e4249f2fd3a50"
 dependencies = [
 "schemars",
 "serde",
@@ -2824,7 +2823,7 @@ dependencies = [
 [[package]]
 name = "gpui_tokio"
 version = "0.1.0"
-source = "git+https://github.com/zed-industries/zed#58df5a14ce946fa27b14194d9d2fce8f87b1c331"
+source = "git+https://github.com/zed-industries/zed#50da8c40dcd596a91fe252537d8e4249f2fd3a50"
 dependencies = [
 "anyhow",
 "gpui",
@@ -2835,7 +2834,7 @@ dependencies = [
 [[package]]
 name = "gpui_util"
 version = "0.1.0"
-source = "git+https://github.com/zed-industries/zed#58df5a14ce946fa27b14194d9d2fce8f87b1c331"
+source = "git+https://github.com/zed-industries/zed#50da8c40dcd596a91fe252537d8e4249f2fd3a50"
 dependencies = [
 "anyhow",
 "log",
@@ -2845,7 +2844,7 @@ dependencies = [
 [[package]]
 name = "gpui_web"
 version = "0.1.0"
-source = "git+https://github.com/zed-industries/zed#58df5a14ce946fa27b14194d9d2fce8f87b1c331"
+source = "git+https://github.com/zed-industries/zed#50da8c40dcd596a91fe252537d8e4249f2fd3a50"
 dependencies = [
 "anyhow",
 "console_error_panic_hook",
@@ -2869,7 +2868,7 @@ dependencies = [
 [[package]]
 name = "gpui_wgpu"
 version = "0.1.0"
-source = "git+https://github.com/zed-industries/zed#58df5a14ce946fa27b14194d9d2fce8f87b1c331"
+source = "git+https://github.com/zed-industries/zed#50da8c40dcd596a91fe252537d8e4249f2fd3a50"
 dependencies = [
 "anyhow",
 "bytemuck",
@@ -2887,6 +2886,7 @@ dependencies = [
 "raw-window-handle",
 "smallvec",
 "swash",
+ "unicode-bidi",
 "unicode-segmentation",
 "wasm-bindgen",
 "wasm-bindgen-futures",
@@ -2898,7 +2898,7 @@ dependencies = [
 [[package]]
 name = "gpui_windows"
 version = "0.1.0"
-source = "git+https://github.com/zed-industries/zed#58df5a14ce946fa27b14194d9d2fce8f87b1c331"
+source = "git+https://github.com/zed-industries/zed#50da8c40dcd596a91fe252537d8e4249f2fd3a50"
 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#58df5a14ce946fa27b14194d9d2fce8f87b1c331"
+source = "git+https://github.com/zed-industries/zed#50da8c40dcd596a91fe252537d8e4249f2fd3a50"
 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#58df5a14ce946fa27b14194d9d2fce8f87b1c331"
+source = "git+https://github.com/zed-industries/zed#50da8c40dcd596a91fe252537d8e4249f2fd3a50"
 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#58df5a14ce946fa27b14194d9d2fce8f87b1c331"
+source = "git+https://github.com/zed-industries/zed#50da8c40dcd596a91fe252537d8e4249f2fd3a50"
 dependencies = [
 "anyhow",
 "bindgen",
@@ -4196,8 +4196,8 @@ checksum = "0676bb32a98c1a483ce53e500a81ad9c3d5b3f7c920c28c24e9cb0980d0b5bc8"

 [[package]]
 name = "nostr"
-version = "0.45.0-alpha.4"
-source = "git+https://github.com/rust-nostr/nostr#a48ab1cff0e1896537ac7bcdf16d828152f80841"
+version = "0.45.0-alpha.6"
+source = "git+https://github.com/rust-nostr/nostr#77df10e45437ae60f09f99d034d28109d86eb09a"
 dependencies = [
 "aes",
 "base64",
@@ -4221,8 +4221,8 @@ dependencies = [

 [[package]]
 name = "nostr-blossom"
-version = "0.45.0-alpha.4"
-source = "git+https://github.com/rust-nostr/nostr#a48ab1cff0e1896537ac7bcdf16d828152f80841"
+version = "0.45.0-alpha.6"
+source = "git+https://github.com/rust-nostr/nostr#77df10e45437ae60f09f99d034d28109d86eb09a"
 dependencies = [
 "base64",
 "nostr",
@@ -4233,8 +4233,8 @@ dependencies = [

 [[package]]
 name = "nostr-connect"
-version = "0.45.0-alpha.4"
-source = "git+https://github.com/rust-nostr/nostr#a48ab1cff0e1896537ac7bcdf16d828152f80841"
+version = "0.45.0-alpha.6"
+source = "git+https://github.com/rust-nostr/nostr#77df10e45437ae60f09f99d034d28109d86eb09a"
 dependencies = [
 "async-utility",
 "futures-core",
@@ -4247,8 +4247,8 @@ dependencies = [

 [[package]]
 name = "nostr-database"
-version = "0.45.0-alpha.4"
-source = "git+https://github.com/rust-nostr/nostr#a48ab1cff0e1896537ac7bcdf16d828152f80841"
+version = "0.45.0-alpha.6"
+source = "git+https://github.com/rust-nostr/nostr#77df10e45437ae60f09f99d034d28109d86eb09a"
 dependencies = [
 "btreecap",
 "flatbuffers",
@@ -4258,8 +4258,8 @@ dependencies = [

 [[package]]
 name = "nostr-gossip"
-version = "0.45.0-alpha.4"
-source = "git+https://github.com/rust-nostr/nostr#a48ab1cff0e1896537ac7bcdf16d828152f80841"
+version = "0.45.0-alpha.6"
+source = "git+https://github.com/rust-nostr/nostr#77df10e45437ae60f09f99d034d28109d86eb09a"
 dependencies = [
 "nostr",
 "opaquerr",
@@ -4267,8 +4267,8 @@ dependencies = [

 [[package]]
 name = "nostr-gossip-memory"
-version = "0.45.0-alpha.4"
-source = "git+https://github.com/rust-nostr/nostr#a48ab1cff0e1896537ac7bcdf16d828152f80841"
+version = "0.45.0-alpha.6"
+source = "git+https://github.com/rust-nostr/nostr#77df10e45437ae60f09f99d034d28109d86eb09a"
 dependencies = [
 "indexmap",
 "lru",
@@ -4279,8 +4279,8 @@ dependencies = [

 [[package]]
 name = "nostr-lmdb"
-version = "0.45.0-alpha.4"
-source = "git+https://github.com/rust-nostr/nostr#a48ab1cff0e1896537ac7bcdf16d828152f80841"
+version = "0.45.0-alpha.6"
+source = "git+https://github.com/rust-nostr/nostr#77df10e45437ae60f09f99d034d28109d86eb09a"
 dependencies = [
 "async-utility",
 "flume 0.12.0",
@@ -4293,8 +4293,8 @@ dependencies = [

 [[package]]
 name = "nostr-memory"
-version = "0.45.0-alpha.4"
-source = "git+https://github.com/rust-nostr/nostr#a48ab1cff0e1896537ac7bcdf16d828152f80841"
+version = "0.45.0-alpha.6"
+source = "git+https://github.com/rust-nostr/nostr#77df10e45437ae60f09f99d034d28109d86eb09a"
 dependencies = [
 "btreecap",
 "nostr",
@@ -4304,8 +4304,8 @@ dependencies = [

 [[package]]
 name = "nostr-sdk"
-version = "0.45.0-alpha.4"
-source = "git+https://github.com/rust-nostr/nostr#a48ab1cff0e1896537ac7bcdf16d828152f80841"
+version = "0.45.0-alpha.6"
+source = "git+https://github.com/rust-nostr/nostr#77df10e45437ae60f09f99d034d28109d86eb09a"
 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#58df5a14ce946fa27b14194d9d2fce8f87b1c331"
+source = "git+https://github.com/zed-industries/zed#50da8c40dcd596a91fe252537d8e4249f2fd3a50"
 dependencies = [
 "collections",
 "serde",
@@ -5717,7 +5717,7 @@ dependencies = [
 [[package]]
 name = "refineable"
 version = "0.1.0"
-source = "git+https://github.com/zed-industries/zed#58df5a14ce946fa27b14194d9d2fce8f87b1c331"
+source = "git+https://github.com/zed-industries/zed#50da8c40dcd596a91fe252537d8e4249f2fd3a50"
 dependencies = [
 "derive_refineable",
 ]
@@ -5799,7 +5799,7 @@ dependencies = [
 [[package]]
 name = "reqwest_client"
 version = "0.1.0"
-source = "git+https://github.com/zed-industries/zed#58df5a14ce946fa27b14194d9d2fce8f87b1c331"
+source = "git+https://github.com/zed-industries/zed#50da8c40dcd596a91fe252537d8e4249f2fd3a50"
 dependencies = [
 "anyhow",
 "bytes",
@@ -6114,7 +6114,7 @@ dependencies = [
 [[package]]
 name = "scheduler"
 version = "0.1.0"
-source = "git+https://github.com/zed-industries/zed#58df5a14ce946fa27b14194d9d2fce8f87b1c331"
+source = "git+https://github.com/zed-industries/zed#50da8c40dcd596a91fe252537d8e4249f2fd3a50"
 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#58df5a14ce946fa27b14194d9d2fce8f87b1c331"
+source = "git+https://github.com/zed-industries/zed#50da8c40dcd596a91fe252537d8e4249f2fd3a50"
 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#58df5a14ce946fa27b14194d9d2fce8f87b1c331"
+source = "git+https://github.com/zed-industries/zed#50da8c40dcd596a91fe252537d8e4249f2fd3a50"
 dependencies = [
 "perf",
 "quote",
@@ -9465,7 +9465,7 @@ dependencies = [
 [[package]]
 name = "zlog"
 version = "0.1.0"
-source = "git+https://github.com/zed-industries/zed#58df5a14ce946fa27b14194d9d2fce8f87b1c331"
+source = "git+https://github.com/zed-industries/zed#50da8c40dcd596a91fe252537d8e4249f2fd3a50"
 dependencies = [
 "anyhow",
 "chrono",
@@ -9482,7 +9482,7 @@ checksum = "29666d0abbfad1e3dc4dcf6144730dd3a3ab225bbbdac83319345b1b44ccfc1b"
 [[package]]
 name = "ztracing"
 version = "0.1.0"
-source = "git+https://github.com/zed-industries/zed#58df5a14ce946fa27b14194d9d2fce8f87b1c331"
+source = "git+https://github.com/zed-industries/zed#50da8c40dcd596a91fe252537d8e4249f2fd3a50"
 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#58df5a14ce946fa27b14194d9d2fce8f87b1c331"
+source = "git+https://github.com/zed-industries/zed#50da8c40dcd596a91fe252537d8e4249f2fd3a50"

 [[package]]
 name = "zune-core"
@@ -9559,3 +9559,38 @@ dependencies = [
 "syn 2.0.119",
 "winnow 1.0.4",
 ]
+
+[[patch.unused]]
+name = "nostr"
+version = "0.45.0-alpha.6"
+source = "git+https://github.com/rust-nostr/nostr?branch=send-bound#edf9ab4b523af6c969b1f0ca36cbc9486cc21ac6"
+
+[[patch.unused]]
+name = "nostr-blossom"
+version = "0.45.0-alpha.6"
+source = "git+https://github.com/rust-nostr/nostr?branch=send-bound#edf9ab4b523af6c969b1f0ca36cbc9486cc21ac6"
+
+[[patch.unused]]
+name = "nostr-connect"
+version = "0.45.0-alpha.6"
+source = "git+https://github.com/rust-nostr/nostr?branch=send-bound#edf9ab4b523af6c969b1f0ca36cbc9486cc21ac6"
+
+[[patch.unused]]
+name = "nostr-gossip-memory"
+version = "0.45.0-alpha.6"
+source = "git+https://github.com/rust-nostr/nostr?branch=send-bound#edf9ab4b523af6c969b1f0ca36cbc9486cc21ac6"
+
+[[patch.unused]]
+name = "nostr-lmdb"
+version = "0.45.0-alpha.6"
+source = "git+https://github.com/rust-nostr/nostr?branch=send-bound#edf9ab4b523af6c969b1f0ca36cbc9486cc21ac6"
+
+[[patch.unused]]
+name = "nostr-memory"
+version = "0.45.0-alpha.6"
+source = "git+https://github.com/rust-nostr/nostr?branch=send-bound#edf9ab4b523af6c969b1f0ca36cbc9486cc21ac6"
+
+[[patch.unused]]
+name = "nostr-sdk"
+version = "0.45.0-alpha.6"
+source = "git+https://github.com/rust-nostr/nostr?branch=send-bound#edf9ab4b523af6c969b1f0ca36cbc9486cc21ac6"
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -44,11 +44,21 @@ smallvec = "1.14.0"
 smol = "2"
 webbrowser = "1.0.4"
 tracing-subscriber = { version = "0.3.18", features = ["fmt", "env-filter"] }
+errno = { version = "0.3.14", default-features = false }

 [patch.crates-io]
 # Use stacker's psm version which may have better WASM support
 psm = { git = "https://github.com/rust-lang/stacker", branch = "master" }

+# Use send-bound branch for all nostr crates
+nostr = { git = "https://github.com/rust-nostr/nostr", branch = "send-bound" }
+nostr-sdk = { git = "https://github.com/rust-nostr/nostr", branch = "send-bound" }
+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" }
+
 [profile.release]
 strip = true
 opt-level = "z"
--- a/crates/theme/src/platform_kind.rs
+++ b/crates/theme/src/platform_kind.rs
@@ -3,6 +3,7 @@ pub enum PlatformKind {
    Mac,
    Linux,
    Windows,
+    Web,
 }

 impl PlatformKind {
@@ -11,22 +12,21 @@ impl PlatformKind {
            Self::Linux
        } else if cfg!(target_os = "windows") {
            Self::Windows
-        } else {
+        } else if cfg!(target_os = "macos") {
            Self::Mac
+        } else {
+            Self::Web
        }
    }

-    #[allow(dead_code)]
    pub fn is_linux(&self) -> bool {
        matches!(self, Self::Linux)
    }

-    #[allow(dead_code)]
    pub fn is_windows(&self) -> bool {
        matches!(self, Self::Windows)
    }

-    #[allow(dead_code)]
    pub fn is_mac(&self) -> bool {
        matches!(self, Self::Mac)
    }
--- a/crates/ui/src/title_bar.rs
+++ b/crates/ui/src/title_bar.rs
@@ -12,7 +12,6 @@ use theme::ActiveTheme;
 use crate::{Icon, IconName, InteractiveElementExt as _, Sizable as _, StyledExt, h_flex};

 pub const TITLE_BAR_HEIGHT: Pixels = px(34.);
-#[cfg(target_os = "macos")]
 pub const TRAFFIC_LIGHT_PADDING: f32 = 80.;

 /// TitleBar used to customize the appearance of the title bar.
--- a/web/Cargo.toml
+++ b/web/Cargo.toml
@@ -32,4 +32,3 @@ 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 }