From bd3a1e29f2aaaa03b4133901cff4cc93bd17a52b Mon Sep 17 00:00:00 2001 From: Tryanks Date: Fri, 4 Sep 2026 01:30:09 +0800 Subject: [PATCH] chore(deps): move to gpui-kit 0.6.0 and crates.io gpui-pre, drop the zed git dependency gpui-base 0.6.0 (now published from longbridge/gpui-kit) depends on the crates.io `gpui-pre` snapshot of zed's gpui instead of the zed git repo. Follow it: `gpui`/`gpui_platform` become `gpui-pre`/`gpui-pre-platform` so cargo unifies them with gpui-base's requirement, and every `zed-industries/zed` git reference disappears from Cargo.lock. Also bump gpui-wry / gpui-component-macros to 0.6.0 and switch the assets crate to its new name `gpui-kit-assets` (kept under the old dependency key so `assets.rs` is untouched). API adaptations for gpui-base 0.6.0: - build.rs: the assets `links` key is now `gpui-kit-default-icons`. - theme.rs: `Theme.appearance`, `ColorTokens.selection`, `ScrollbarTheme` builder, `ResizableTheme` handles are `Option`. - menu.rs: `register_deferred_popover` returns an RAII token; hold it in `ContextMenuState` and drop it on dismiss. Verified: cargo check --all-targets, clippy clean, cargo test --workspace green. --- Cargo.lock | 966 ++++++++++++++++++++-------------- crates/app/Cargo.toml | 6 +- crates/ui/Cargo.toml | 14 +- crates/ui/build.rs | 4 +- crates/ui/src/theme.rs | 36 +- crates/ui/src/widgets/menu.rs | 6 +- 6 files changed, 617 insertions(+), 415 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c722c14a..a73a047c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -14,12 +14,12 @@ dependencies = [ [[package]] name = "accesskit_atspi_common" -version = "0.18.1" +version = "0.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e8c61bee90b42a772d39d06a740207dc71a4e780004ace1db8d99fb1baaa954" +checksum = "023da0e5097f46df7092d5280b02efb9bbf8d93298daeced42652463e357d636" dependencies = [ "accesskit", - "accesskit_consumer 0.36.0", + "accesskit_consumer 0.38.0", "atspi-common", "phf 0.13.1", "serde", @@ -28,9 +28,9 @@ dependencies = [ [[package]] name = "accesskit_consumer" -version = "0.36.0" +version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25e0d7e25d06f4dc21d1774d67146e9e80d6789216cbd4d1e88185b0095dba60" +checksum = "f950720ce064757a1b629caad3a408e8d2c63bb01f29b8a3ff8daa331053ffeb" dependencies = [ "accesskit", "hashbrown 0.16.1", @@ -38,9 +38,9 @@ dependencies = [ [[package]] name = "accesskit_consumer" -version = "0.37.0" +version = "0.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f950720ce064757a1b629caad3a408e8d2c63bb01f29b8a3ff8daa331053ffeb" +checksum = "5d10a236f96f87d70732e44520046785431ef01d5bcd6b041317bfadd2f88245" dependencies = [ "accesskit", "hashbrown 0.16.1", @@ -62,9 +62,9 @@ dependencies = [ [[package]] name = "accesskit_unix" -version = "0.21.1" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b016ca8db0ea0ea2ceff29a9d6240391492d960716aa471967c00e8cc8cb197c" +checksum = "03e156ed3802e35eefe894ef2671bc6c889303d8a7e110b5e1b48f504b91362f" dependencies = [ "accesskit", "accesskit_atspi_common", @@ -80,12 +80,12 @@ dependencies = [ [[package]] name = "accesskit_windows" -version = "0.33.1" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36e93ac7bf50b964f1cbb75f741629a4e950571baa1ef1274457ab5a80d9bcc2" +checksum = "106c2b961215864d1c2e703ee63269c25c4e80a577ffb2c1017b9c17dcdf83a1" dependencies = [ "accesskit", - "accesskit_consumer 0.37.0", + "accesskit_consumer 0.38.0", "hashbrown 0.16.1", "static_assertions", "windows 0.62.2", @@ -794,14 +794,14 @@ dependencies = [ [[package]] name = "bindgen" -version = "0.71.1" +version = "0.72.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f58bf3d7db68cfbac37cfc485a8d711e87e064c3d0fe0435b92f7a407f9d6b3" +checksum = "993776b509cfb49c750f11b8f07a46fa23e0a1386ffc01fb1e7d343efc387895" dependencies = [ "bitflags 2.13.0", "cexpr", "clang-sys", - "itertools 0.11.0", + "itertools 0.13.0", "log", "prettyplease", "proc-macro2", @@ -1332,16 +1332,6 @@ dependencies = [ "unicode-width", ] -[[package]] -name = "collections" -version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#1662f5f3f6497c5f80830ccdca1edfd1fc0c6c6a" -dependencies = [ - "gpui_util", - "indexmap 2.14.0", - "rustc-hash 2.1.3", -] - [[package]] name = "color_quant" version = "1.1.0" @@ -2000,16 +1990,6 @@ dependencies = [ "unicode-xid", ] -[[package]] -name = "derive_refineable" -version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#1662f5f3f6497c5f80830ccdca1edfd1fc0c6c6a" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.118", -] - [[package]] name = "digest" version = "0.10.7" @@ -2032,13 +2012,34 @@ dependencies = [ "crypto-common 0.2.2", ] +[[package]] +name = "dirs" +version = "5.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" +dependencies = [ + "dirs-sys 0.4.1", +] + [[package]] name = "dirs" version = "6.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3e8aa94d75141228480295a7d0e7feb620b1a5ad9f12bc40be62411e38cce4e" dependencies = [ - "dirs-sys", + "dirs-sys 0.5.0", +] + +[[package]] +name = "dirs-sys" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" +dependencies = [ + "libc", + "option-ext", + "redox_users 0.4.6", + "windows-sys 0.48.0", ] [[package]] @@ -2049,7 +2050,7 @@ checksum = "e01a3366d27ee9890022452ee61b2b63a67e6f13f58900b651ff5665f0bb1fab" dependencies = [ "libc", "option-ext", - "redox_users", + "redox_users 0.5.2", "windows-sys 0.61.2", ] @@ -3092,9 +3093,74 @@ dependencies = [ ] [[package]] -name = "gpui" -version = "0.2.2" -source = "git+https://github.com/zed-industries/zed#1662f5f3f6497c5f80830ccdca1edfd1fc0c6c6a" +name = "gpui-base" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2caaf00ebe0482774dd370a82a936edf4bf19a18a0d1a39353d20ecf61f70330" +dependencies = [ + "aho-corasick", + "anyhow", + "async-channel", + "chrono", + "futures", + "gpui-pre", + "gpui-pre-macros", + "gpui-pre-platform", + "gpui-pre-sum-tree", + "html5ever 0.27.0", + "instant", + "lsp-types", + "markdown", + "markup5ever_rcdom", + "objc2 0.6.4", + "objc2-app-kit 0.3.2", + "objc2-foundation 0.3.2", + "raw-window-handle", + "regex", + "ropey", + "schemars 1.2.2", + "serde", + "serde_json", + "smallvec", + "smol", + "syntect", + "tracing", + "unicode-segmentation", + "web-time", +] + +[[package]] +name = "gpui-component-macros" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dacef57cadf1ce9b05b1f1ba6b3f3fed2521fd814f548eea0e4d8e43c5857795" +dependencies = [ + "proc-macro-crate 3.5.0", + "proc-macro2", + "quote", + "syn 2.0.118", +] + +[[package]] +name = "gpui-kit-assets" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6bb6fed67d6488fa9333b6534d17f5eaef32b83e3d7148b83a3d444a1884bd1c" +dependencies = [ + "anyhow", + "gpui-pre", + "gpui-pre-reqwest", + "log", + "rust-embed", + "wasm-bindgen", + "wasm-bindgen-futures", +] + +[[package]] +name = "gpui-pre" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8b0f6f593153b6eb84c336ea7ccf12a1fca186f0db99af628e72f85048c1d7b" dependencies = [ "accesskit", "anyhow", @@ -3104,7 +3170,6 @@ dependencies = [ "bindgen", "bitflags 2.13.0", "chrono", - "collections", "core-video", "ctor", "derive_more 2.1.1", @@ -3113,11 +3178,17 @@ dependencies = [ "futures", "futures-concurrency", "getrandom 0.3.4", - "gpui_macros", - "gpui_shared_string", - "gpui_util", + "gpui-pre-collections", + "gpui-pre-http-client", + "gpui-pre-macros", + "gpui-pre-refineable", + "gpui-pre-scheduler", + "gpui-pre-shared-string", + "gpui-pre-sum-tree", + "gpui-pre-util", + "gpui-pre-util-macros", + "gpui-pre-ztracing", "heapless", - "http_client", "image", "inventory", "itertools 0.14.0", @@ -3133,10 +3204,8 @@ dependencies = [ "proptest", "rand 0.9.4", "raw-window-handle", - "refineable", "regex", "resvg", - "scheduler", "schemars 1.2.2", "seahash", "serde", @@ -3145,71 +3214,60 @@ dependencies = [ "smallvec", "spin 0.10.0", "strum", - "sum_tree", "taffy", "thiserror 2.0.19", "tracing", "ttf-parser", "url", "usvg", - "util_macros", "uuid", "waker-fn", "web-time", - "windows 0.61.3", + "windows 0.62.2", "zed-font-kit", "zed-scap", - "ztracing", ] [[package]] -name = "gpui-base" -version = "0.5.2" -source = "git+https://github.com/longbridge/gpui-component?rev=fd3bc2bbb8a2c4dfe268c1475682476ada54cd0c#fd3bc2bbb8a2c4dfe268c1475682476ada54cd0c" +name = "gpui-pre-apple" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38e027ea436bb876a8da6962862ffdbf9708c6b8352415325647c4fc2a48467d" dependencies = [ - "aho-corasick", "anyhow", - "async-channel", - "chrono", - "gpui", - "gpui_macros", - "instant", - "lsp-types", - "objc2 0.6.4", - "objc2-app-kit 0.3.2", - "objc2-foundation 0.3.2", - "raw-window-handle", - "regex", - "ropey", - "schemars 1.2.2", - "serde", - "serde_json", - "smallvec", - "smol", - "tracing", - "unicode-segmentation", - "web-time", - "zed-sum-tree", + "block", + "cbindgen", + "cocoa 0.26.0", + "core-foundation 0.10.1", + "core-video", + "derive_more 2.1.1", + "etagere", + "foreign-types", + "gpui-pre", + "gpui-pre-collections", + "image", + "log", + "metal", + "objc", + "parking_lot", ] [[package]] -name = "gpui-component-assets" -version = "0.5.1" -source = "git+https://github.com/longbridge/gpui-component?rev=fd3bc2bbb8a2c4dfe268c1475682476ada54cd0c#fd3bc2bbb8a2c4dfe268c1475682476ada54cd0c" +name = "gpui-pre-collections" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89c8efa2e51e368c8538a7be1ea9a12127ca03abe6cc01d9d3474e9ac4f53016" dependencies = [ - "anyhow", - "gpui", - "log", - "rust-embed", - "wasm-bindgen", - "wasm-bindgen-futures", - "zed-reqwest", + "gpui-pre-util", + "indexmap 2.14.0", + "rustc-hash 2.1.3", ] [[package]] -name = "gpui-component-macros" -version = "0.5.1" -source = "git+https://github.com/longbridge/gpui-component?rev=fd3bc2bbb8a2c4dfe268c1475682476ada54cd0c#fd3bc2bbb8a2c4dfe268c1475682476ada54cd0c" +name = "gpui-pre-derive-refineable" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a098d319acc9f84bf159944f96c5ea43a4f4cd7ed759f984acbd15719495aa0" dependencies = [ "proc-macro2", "quote", @@ -3217,42 +3275,31 @@ dependencies = [ ] [[package]] -name = "gpui-wry" -version = "0.5.0" -source = "git+https://github.com/longbridge/gpui-component?rev=fd3bc2bbb8a2c4dfe268c1475682476ada54cd0c#fd3bc2bbb8a2c4dfe268c1475682476ada54cd0c" -dependencies = [ - "anyhow", - "gpui", - "lb-wry", -] - -[[package]] -name = "gpui_apple" -version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#1662f5f3f6497c5f80830ccdca1edfd1fc0c6c6a" +name = "gpui-pre-http-client" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3495a45a28cb800c8626d2053406114bcaca26d390a4d4b183365b5bb8fdaf02" dependencies = [ "anyhow", - "block", - "cbindgen", - "cocoa 0.26.0", - "collections", - "core-foundation 0.10.1", - "core-video", + "async-compression", + "bytes", "derive_more 2.1.1", - "etagere", - "foreign-types", - "gpui", - "image", + "futures", + "http", + "http-body", "log", - "metal", - "objc", "parking_lot", + "serde", + "serde_json", + "serde_urlencoded", + "url", ] [[package]] -name = "gpui_linux" -version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#1662f5f3f6497c5f80830ccdca1edfd1fc0c6c6a" +name = "gpui-pre-linux" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9025a2a9f7e9241651bb5f9df6b69233ca4111b233e1fb3a4544d69ecc52bc3" dependencies = [ "accesskit", "accesskit_unix", @@ -3263,13 +3310,13 @@ dependencies = [ "bytemuck", "calloop", "calloop-wayland-source", - "collections", "filedescriptor", "futures", - "gpui", - "gpui_util", - "gpui_wgpu", - "http_client", + "gpui-pre", + "gpui-pre-collections", + "gpui-pre-http-client", + "gpui-pre-util", + "gpui-pre-wgpu", "libc", "log", "notify-rust", @@ -3296,9 +3343,10 @@ dependencies = [ ] [[package]] -name = "gpui_macos" -version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#1662f5f3f6497c5f80830ccdca1edfd1fc0c6c6a" +name = "gpui-pre-macos" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54678bfe6be71aa8e3fd31c3ae51af5d81e367344762540fd7cfdb778621abb1" dependencies = [ "accesskit", "accesskit_macos", @@ -3307,7 +3355,6 @@ dependencies = [ "block", "block2 0.6.2", "cocoa 0.26.0", - "collections", "core-foundation 0.10.1", "core-foundation-sys", "core-graphics 0.24.0", @@ -3316,15 +3363,16 @@ dependencies = [ "dispatch2", "foreign-types", "futures", - "gpui", - "gpui_apple", - "gpui_util", + "gpui-pre", + "gpui-pre-apple", + "gpui-pre-collections", + "gpui-pre-media", + "gpui-pre-util", "image", "itertools 0.14.0", "libc", "log", "mach2", - "media", "metal", "objc", "objc2 0.6.4", @@ -3342,33 +3390,139 @@ dependencies = [ ] [[package]] -name = "gpui_macros" -version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#1662f5f3f6497c5f80830ccdca1edfd1fc0c6c6a" +name = "gpui-pre-macros" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5be2db7b5097b4d523b2bce933604bcc5acdaf679bb9a150e8299e6c07efc29c" dependencies = [ "heck 0.5.0", + "proc-macro-crate 3.5.0", "proc-macro2", "quote", "syn 2.0.118", ] [[package]] -name = "gpui_platform" -version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#1662f5f3f6497c5f80830ccdca1edfd1fc0c6c6a" +name = "gpui-pre-media" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a35102d2a165f2fbf21521d56e37d6f0ab906372d13b3e1fa94d68b299b22b74" +dependencies = [ + "anyhow", + "bindgen", + "core-foundation 0.10.1", + "core-video", + "foreign-types", + "metal", + "objc", +] + +[[package]] +name = "gpui-pre-perf" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1db0c046b93c2a29120f8ee4c04bc80a4d7d6117d1164ef349faface8943491" +dependencies = [ + "gpui-pre-collections", + "serde", + "serde_json", +] + +[[package]] +name = "gpui-pre-platform" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35131851444188e573d21d3e8020a51af16bf08b177e25b1120815edbd448c80" dependencies = [ "console_error_panic_hook", - "gpui", - "gpui_linux", - "gpui_macos", - "gpui_web", - "gpui_windows", + "gpui-pre", + "gpui-pre-linux", + "gpui-pre-macos", + "gpui-pre-web", + "gpui-pre-windows", ] [[package]] -name = "gpui_shared_string" -version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#1662f5f3f6497c5f80830ccdca1edfd1fc0c6c6a" +name = "gpui-pre-refineable" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "864e2e54a3029481dae5b6aae3ba2905f2fb1dfe66ced913b68c9ff527f8e327" +dependencies = [ + "gpui-pre-derive-refineable", +] + +[[package]] +name = "gpui-pre-reqwest" +version = "0.12.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05be23908e707966824f8c51a609904b7f30739e8d915e120a53c1b995ba964c" +dependencies = [ + "base64 0.22.1", + "bytes", + "encoding_rs", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "http-body-util", + "hyper", + "hyper-rustls", + "hyper-util", + "ipnet", + "js-sys", + "log", + "mime", + "mime_guess", + "once_cell", + "percent-encoding", + "pin-project-lite", + "quinn", + "rustls", + "rustls-native-certs", + "rustls-pemfile", + "rustls-pki-types", + "serde", + "serde_json", + "serde_urlencoded", + "sync_wrapper", + "system-configuration", + "tokio", + "tokio-rustls", + "tokio-socks", + "tokio-util", + "tower", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "wasm-streams", + "web-sys", + "windows-registry 0.4.0", +] + +[[package]] +name = "gpui-pre-scheduler" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b58a78c4e0c032900704ea49922641c534cf8bbf1bf22eda6ba00a76e88c6c3" +dependencies = [ + "async-task", + "backtrace", + "chrono", + "flume 0.12.0", + "futures", + "parking_lot", + "rand 0.9.4", + "wasm_thread", + "web-time", +] + +[[package]] +name = "gpui-pre-shared-string" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82fc99fe88e44173758a500522d3f4059a6541da4b471af720e3f60cf34a2bc3" dependencies = [ "schemars 1.2.2", "serde", @@ -3376,9 +3530,23 @@ dependencies = [ ] [[package]] -name = "gpui_util" -version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#1662f5f3f6497c5f80830ccdca1edfd1fc0c6c6a" +name = "gpui-pre-sum-tree" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "002baed852f20cef1188d3d5e0f749025fc718e4d6cea026b9077a9a6c10d042" +dependencies = [ + "gpui-pre-ztracing", + "heapless", + "log", + "rayon", + "tracing", +] + +[[package]] +name = "gpui-pre-util" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fe779c4cb00929aafcb2b307cd1240588aebb5d1eb328c59b80f77c05a41fad" dependencies = [ "anyhow", "log", @@ -3386,21 +3554,33 @@ dependencies = [ ] [[package]] -name = "gpui_web" -version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#1662f5f3f6497c5f80830ccdca1edfd1fc0c6c6a" +name = "gpui-pre-util-macros" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f0ccc4bccb6a31786095d15fc9f40d6a4c6a295522e3460331dd7e929ff2f79" +dependencies = [ + "gpui-pre-perf", + "quote", + "syn 2.0.118", +] + +[[package]] +name = "gpui-pre-web" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "27728bd9180d1a10516d719fed446adf85872cedf0e262ad0738f4edc9deaf33" dependencies = [ "anyhow", "console_error_panic_hook", "futures", - "gpui", - "gpui_wgpu", - "http_client", + "gpui-pre", + "gpui-pre-http-client", + "gpui-pre-scheduler", + "gpui-pre-wgpu", "js-sys", "log", "parking_lot", "raw-window-handle", - "scheduler", "uuid", "wasm-bindgen", "wasm-bindgen-futures", @@ -3410,17 +3590,18 @@ dependencies = [ ] [[package]] -name = "gpui_wgpu" -version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#1662f5f3f6497c5f80830ccdca1edfd1fc0c6c6a" +name = "gpui-pre-wgpu" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "695c613099863bbf434ff896d196e3f55d4d5f59769dac99596e79dbb18a8aff" dependencies = [ "anyhow", "bytemuck", - "collections", "cosmic-text", "etagere", - "gpui", - "gpui_util", + "gpui-pre", + "gpui-pre-collections", + "gpui-pre-util", "itertools 0.14.0", "log", "parking_lot", @@ -3436,19 +3617,20 @@ dependencies = [ ] [[package]] -name = "gpui_windows" -version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#1662f5f3f6497c5f80830ccdca1edfd1fc0c6c6a" +name = "gpui-pre-windows" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a4b60579aa2cb4ef7b6f22133a7b9fe12458062961343bdcf36e259047bc7ad" dependencies = [ "accesskit", "accesskit_windows", "anyhow", - "collections", "dunce", "etagere", "futures", - "gpui", - "gpui_util", + "gpui-pre", + "gpui-pre-collections", + "gpui-pre-util", "image", "itertools 0.14.0", "log", @@ -3457,10 +3639,51 @@ dependencies = [ "raw-window-handle", "smallvec", "uuid", - "windows 0.61.3", - "windows-core 0.61.2", - "windows-numerics 0.2.0", - "windows-registry 0.5.3", + "windows 0.62.2", + "windows-core 0.62.2", + "windows-numerics 0.3.1", + "windows-registry 0.6.1", +] + +[[package]] +name = "gpui-pre-zlog" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1416ea5f018e3a8a1c8be266332c443583f28f8f87379a84ab1e77622173ac0" +dependencies = [ + "anyhow", + "chrono", + "gpui-pre-collections", + "log", +] + +[[package]] +name = "gpui-pre-ztracing" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cc64a25a3cc4e4f1d8acb00074d3925339dae657c020083735738ba8af96bf7" +dependencies = [ + "gpui-pre-zlog", + "gpui-pre-ztracing-macro", + "tracing", + "tracing-subscriber", +] + +[[package]] +name = "gpui-pre-ztracing-macro" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41f3ea75672348f37d94472e579f5979ee19b744d0fa5aaadc2fe129ccafa80b" + +[[package]] +name = "gpui-wry" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4b1524e5ddb45c54d545b01b973def017b4383016903ae4b116d9e444e6a376" +dependencies = [ + "anyhow", + "gpui-pre", + "lb-wry", ] [[package]] @@ -3674,6 +3897,20 @@ dependencies = [ "digest 0.10.7", ] +[[package]] +name = "html5ever" +version = "0.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c13771afe0e6e846f1e67d038d4cb29998a6779f93c809212e4e9c32efd244d4" +dependencies = [ + "log", + "mac", + "markup5ever 0.12.1", + "proc-macro2", + "quote", + "syn 2.0.118", +] + [[package]] name = "html5ever" version = "0.29.1" @@ -3682,7 +3919,7 @@ checksum = "3b7410cae13cbc75623c98ac4cbfd1f0bedddf3227afc24f370cf0f50a44a11c" dependencies = [ "log", "mac", - "markup5ever", + "markup5ever 0.14.1", "match_token", ] @@ -3709,34 +3946,14 @@ dependencies = [ [[package]] name = "http-body-util" version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b021d93e26becf5dc7e1b75b1bed1fd93124b374ceb73f43d4d4eafec896a64a" -dependencies = [ - "bytes", - "futures-core", - "http", - "http-body", - "pin-project-lite", -] - -[[package]] -name = "http_client" -version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#1662f5f3f6497c5f80830ccdca1edfd1fc0c6c6a" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b021d93e26becf5dc7e1b75b1bed1fd93124b374ceb73f43d4d4eafec896a64a" dependencies = [ - "anyhow", - "async-compression", "bytes", - "derive_more 2.1.1", - "futures", + "futures-core", "http", "http-body", - "log", - "parking_lot", - "serde", - "serde_json", - "serde_urlencoded", - "url", + "pin-project-lite", ] [[package]] @@ -4300,7 +4517,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "02cb977175687f33fa4afa0c95c112b987ea1443e5a51c8f8ff27dc618270cc2" dependencies = [ "cssparser", - "html5ever", + "html5ever 0.29.1", "indexmap 2.14.0", "selectors", ] @@ -4333,13 +4550,13 @@ dependencies = [ "block2 0.6.2", "cookie", "crossbeam-channel", - "dirs", + "dirs 6.0.0", "dpi", "dunce", "flume 0.11.1", "gdkx11", "gtk", - "html5ever", + "html5ever 0.29.1", "http", "javascriptcore-rs", "jni", @@ -4610,6 +4827,30 @@ dependencies = [ "libc", ] +[[package]] +name = "markdown" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5cab8f2cadc416a82d2e783a1946388b31654d391d1c7d92cc1f03e295b1deb" +dependencies = [ + "serde", + "unicode-id", +] + +[[package]] +name = "markup5ever" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16ce3abbeba692c8b8441d036ef91aea6df8da2c6b6e21c7e14d3c18e526be45" +dependencies = [ + "log", + "phf 0.11.3", + "phf_codegen 0.11.3", + "string_cache", + "string_cache_codegen", + "tendril", +] + [[package]] name = "markup5ever" version = "0.14.1" @@ -4624,6 +4865,18 @@ dependencies = [ "tendril", ] +[[package]] +name = "markup5ever_rcdom" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edaa21ab3701bfee5099ade5f7e1f84553fd19228cf332f13cd6e964bf59be18" +dependencies = [ + "html5ever 0.27.0", + "markup5ever 0.12.1", + "tendril", + "xml5ever", +] + [[package]] name = "match_token" version = "0.1.0" @@ -4679,20 +4932,6 @@ dependencies = [ "digest 0.10.7", ] -[[package]] -name = "media" -version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#1662f5f3f6497c5f80830ccdca1edfd1fc0c6c6a" -dependencies = [ - "anyhow", - "bindgen", - "core-foundation 0.10.1", - "core-video", - "foreign-types", - "metal", - "objc", -] - [[package]] name = "memchr" version = "2.8.3" @@ -5089,7 +5328,7 @@ version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "680998035259dcfcafe653688bf2aa6d3e2dc05e98be6ab46afb089dc84f1df8" dependencies = [ - "proc-macro-crate 1.3.1", + "proc-macro-crate 3.5.0", "proc-macro2", "quote", "syn 2.0.118", @@ -5723,16 +5962,6 @@ version = "2.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220" -[[package]] -name = "perf" -version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#1662f5f3f6497c5f80830ccdca1edfd1fc0c6c6a" -dependencies = [ - "collections", - "serde", - "serde_json", -] - [[package]] name = "phf" version = "0.8.0" @@ -6224,8 +6453,9 @@ dependencies = [ [[package]] name = "proptest" -version = "1.10.0" -source = "git+https://github.com/proptest-rs/proptest?rev=3dca198a8fef1b32e3a66f1e1897c955b4dc5b5b#3dca198a8fef1b32e3a66f1e1897c955b4dc5b5b" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b45fcc2344c680f5025fe57779faef368840d0bd1f42f216291f0dc4ace4744" dependencies = [ "bit-set 0.8.0", "bit-vec 0.8.0", @@ -6244,7 +6474,8 @@ dependencies = [ [[package]] name = "proptest-macro" version = "0.5.0" -source = "git+https://github.com/proptest-rs/proptest?rev=3dca198a8fef1b32e3a66f1e1897c955b4dc5b5b#3dca198a8fef1b32e3a66f1e1897c955b4dc5b5b" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "efaa288b896cb2b345da7b7f2110ab19e51565b83495b56fcec98a62f8b1f33e" dependencies = [ "convert_case 0.11.0", "proc-macro2", @@ -6687,6 +6918,17 @@ dependencies = [ "bitflags 2.13.0", ] +[[package]] +name = "redox_users" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" +dependencies = [ + "getrandom 0.2.17", + "libredox", + "thiserror 1.0.69", +] + [[package]] name = "redox_users" version = "0.5.2" @@ -6718,14 +6960,6 @@ dependencies = [ "syn 2.0.118", ] -[[package]] -name = "refineable" -version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#1662f5f3f6497c5f80830ccdca1edfd1fc0c6c6a" -dependencies = [ - "derive_refineable", -] - [[package]] name = "regex" version = "1.13.0" @@ -7183,22 +7417,6 @@ dependencies = [ "windows-sys 0.61.2", ] -[[package]] -name = "scheduler" -version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#1662f5f3f6497c5f80830ccdca1edfd1fc0c6c6a" -dependencies = [ - "async-task", - "backtrace", - "chrono", - "flume 0.12.0", - "futures", - "parking_lot", - "rand 0.9.4", - "wasm_thread", - "web-time", -] - [[package]] name = "schemars" version = "0.9.0" @@ -7572,7 +7790,7 @@ version = "3.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32824fab5e16e6c4d86dc1ba84489390419a39f97699852b66480bb87d297ed8" dependencies = [ - "dirs", + "dirs 6.0.0", ] [[package]] @@ -7882,18 +8100,6 @@ version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" -[[package]] -name = "sum_tree" -version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#1662f5f3f6497c5f80830ccdca1edfd1fc0c6c6a" -dependencies = [ - "heapless", - "log", - "rayon", - "tracing", - "ztracing", -] - [[package]] name = "sval" version = "2.20.0" @@ -8197,9 +8403,9 @@ dependencies = [ "computer-use-mcp", "embed-resource", "env_logger", - "gpui", "gpui-base", - "gpui_platform", + "gpui-pre", + "gpui-pre-platform", "log", "mcp-host", "orchestrate-mcp", @@ -8259,7 +8465,7 @@ dependencies = [ "agent", "base64 0.23.1", "chrono", - "dirs", + "dirs 6.0.0", "flate2", "log", "serde", @@ -8284,12 +8490,12 @@ dependencies = [ "chrono", "computer-use-mcp", "criterion", - "gpui", "gpui-base", - "gpui-component-assets", "gpui-component-macros", + "gpui-kit-assets", + "gpui-pre", + "gpui-pre-platform", "gpui-wry", - "gpui_platform", "image", "imara-diff", "lb-wry", @@ -8331,7 +8537,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "023e8f45440d8a7768f49511a128208d5899555d8c48df594552d70043e2b2fb" dependencies = [ "corcovado", - "dirs", + "dirs 6.0.0", "libc", "miow 0.6.1", "parking_lot", @@ -8928,6 +9134,12 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ce61d488bcdc9bc8b5d1772c404828b17fc481c0a582b5581e95fb233aef503e" +[[package]] +name = "unicode-id" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70ba288e709927c043cbe476718d37be306be53fb1fafecd0dbe36d072be2580" + [[package]] name = "unicode-ident" version = "1.0.24" @@ -9055,16 +9267,6 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" -[[package]] -name = "util_macros" -version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#1662f5f3f6497c5f80830ccdca1edfd1fc0c6c6a" -dependencies = [ - "perf", - "quote", - "syn 2.0.118", -] - [[package]] name = "uuid" version = "1.25.0" @@ -9289,7 +9491,8 @@ dependencies = [ [[package]] name = "wasm_thread" version = "0.3.3" -source = "git+https://github.com/zed-industries/wasm_thread?rev=0cf96c7708dfb97ccf3da50347e25edcf75d6937#0cf96c7708dfb97ccf3da50347e25edcf75d6937" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7516db7f32decdadb1c3b8deb1b7d78b9df7606c5cc2f6241737c2ab3a0258e" dependencies = [ "futures", "js-sys", @@ -9305,6 +9508,7 @@ checksum = "2857dd20b54e916ec7253b3d6b4d5c4d7d4ca2c33c2e11c6c76a99bd8744755d" dependencies = [ "cc", "downcast-rs", + "log", "rustix", "scoped-tls", "smallvec", @@ -9952,13 +10156,13 @@ dependencies = [ [[package]] name = "windows-registry" -version = "0.5.3" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b8a9ed28765efc97bbc954883f4e6796c33a06546ebafacbabee9696967499e" +checksum = "02752bf7fbdcce7f2a27a742f798510f3e5ad88dbe84871e5168e2120c3d5720" dependencies = [ - "windows-link 0.1.3", - "windows-result 0.3.4", - "windows-strings 0.4.2", + "windows-link 0.2.1", + "windows-result 0.4.1", + "windows-strings 0.5.1", ] [[package]] @@ -10039,6 +10243,15 @@ dependencies = [ "windows-targets 0.42.2", ] +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.5", +] + [[package]] name = "windows-sys" version = "0.52.0" @@ -10081,6 +10294,21 @@ dependencies = [ "windows_x86_64_msvc 0.42.2", ] +[[package]] +name = "windows-targets" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + [[package]] name = "windows-targets" version = "0.52.6" @@ -10147,6 +10375,12 @@ version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + [[package]] name = "windows_aarch64_gnullvm" version = "0.52.6" @@ -10165,6 +10399,12 @@ version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + [[package]] name = "windows_aarch64_msvc" version = "0.52.6" @@ -10183,6 +10423,12 @@ version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" +[[package]] +name = "windows_i686_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + [[package]] name = "windows_i686_gnu" version = "0.52.6" @@ -10213,6 +10459,12 @@ version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" +[[package]] +name = "windows_i686_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + [[package]] name = "windows_i686_msvc" version = "0.52.6" @@ -10231,6 +10483,12 @@ version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + [[package]] name = "windows_x86_64_gnu" version = "0.52.6" @@ -10249,6 +10507,12 @@ version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + [[package]] name = "windows_x86_64_gnullvm" version = "0.52.6" @@ -10267,6 +10531,12 @@ version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + [[package]] name = "windows_x86_64_msvc" version = "0.52.6" @@ -10331,12 +10601,6 @@ version = "0.57.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ebf944e87a7c253233ad6766e082e3cd714b5d03812acc24c318f549614536e" -[[package]] -name = "workspace-hack" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "beffa227304dbaea3ad6a06ac674f9bc83a3dec3b7f63eeb442de37e7cb6bb01" - [[package]] name = "writeable" version = "0.6.3" @@ -10425,15 +10689,17 @@ checksum = "bec9e4a500ca8864c5b47b8b482a73d62e4237670e5b5f1d6b9e3cae50f28f2b" [[package]] name = "xim-ctext" version = "0.3.0" -source = "git+https://github.com/zed-industries/xim-rs.git?rev=16f35a2c881b815a2b6cdfd6687988e84f8447d8#16f35a2c881b815a2b6cdfd6687988e84f8447d8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ac61a7062c40f3c37b6e82eeeef835d5cc7824b632a72784a89b3963c33284c" dependencies = [ "encoding_rs", ] [[package]] name = "xim-parser" -version = "0.2.1" -source = "git+https://github.com/zed-industries/xim-rs.git?rev=16f35a2c881b815a2b6cdfd6687988e84f8447d8#16f35a2c881b815a2b6cdfd6687988e84f8447d8" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5dcee45f89572d5a65180af3a84e7ddb24f5ea690a6d3aa9de231281544dd7b7" dependencies = [ "bitflags 2.13.0", ] @@ -10462,6 +10728,17 @@ version = "0.8.28" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3ae8337f8a065cfc972643663ea4279e04e7256de865aa66fe25cec5fb912d3f" +[[package]] +name = "xml5ever" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9bbb26405d8e919bc1547a5aa9abc95cbfa438f04844f5fdd9dc7596b748bf69" +dependencies = [ + "log", + "mac", + "markup5ever 0.12.1", +] + [[package]] name = "xmlwriter" version = "0.1.0" @@ -10614,14 +10891,15 @@ dependencies = [ [[package]] name = "zed-font-kit" version = "0.14.1-zed" -source = "git+https://github.com/zed-industries/font-kit?rev=94b0f28166665e8fd2f53ff6d268a14955c82269#94b0f28166665e8fd2f53ff6d268a14955c82269" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3898e450f36f852edda72e3f985c34426042c4951790b23b107f93394f9bff5" dependencies = [ "bitflags 2.13.0", "byteorder", "core-foundation 0.10.1", "core-graphics 0.24.0", "core-text", - "dirs", + "dirs 5.0.1", "dwrote", "float-ord", "freetype-sys", @@ -10635,59 +10913,11 @@ dependencies = [ "yeslogic-fontconfig-sys", ] -[[package]] -name = "zed-reqwest" -version = "0.12.15-zed" -source = "git+https://github.com/zed-industries/reqwest.git?rev=c15662463bda39148ba154100dd44d3fba5873a4#c15662463bda39148ba154100dd44d3fba5873a4" -dependencies = [ - "base64 0.22.1", - "bytes", - "encoding_rs", - "futures-core", - "futures-util", - "h2", - "http", - "http-body", - "http-body-util", - "hyper", - "hyper-rustls", - "hyper-util", - "ipnet", - "js-sys", - "log", - "mime", - "mime_guess", - "once_cell", - "percent-encoding", - "pin-project-lite", - "quinn", - "rustls", - "rustls-native-certs", - "rustls-pemfile", - "rustls-pki-types", - "serde", - "serde_json", - "serde_urlencoded", - "sync_wrapper", - "system-configuration", - "tokio", - "tokio-rustls", - "tokio-socks", - "tokio-util", - "tower", - "tower-service", - "url", - "wasm-bindgen", - "wasm-bindgen-futures", - "wasm-streams", - "web-sys", - "windows-registry 0.4.0", -] - [[package]] name = "zed-scap" version = "0.0.8-zed" -source = "git+https://github.com/zed-industries/scap?rev=4afea48c3b002197176fb19cd0f9b180dd36eaac#4afea48c3b002197176fb19cd0f9b180dd36eaac" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6b338d705ae33a43ca00287c11129303a7a0aa57b101b72a1c08c863f698ac8" dependencies = [ "anyhow", "cocoa 0.25.0", @@ -10705,22 +10935,11 @@ dependencies = [ "xcb", ] -[[package]] -name = "zed-sum-tree" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d490156d0d7311855564d6e1d6dccab992405a0c0e15e1c8ef18920c02177e35" -dependencies = [ - "arrayvec", - "log", - "rayon", - "workspace-hack", -] - [[package]] name = "zed-xim" version = "0.4.0-zed" -source = "git+https://github.com/zed-industries/xim-rs.git?rev=16f35a2c881b815a2b6cdfd6687988e84f8447d8#16f35a2c881b815a2b6cdfd6687988e84f8447d8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c0b46ed118eba34d9ba53d94ddc0b665e0e06a2cf874cfa2dd5dec278148642" dependencies = [ "ahash", "hashbrown 0.14.5", @@ -10846,39 +11065,12 @@ dependencies = [ "thiserror 2.0.19", ] -[[package]] -name = "zlog" -version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#1662f5f3f6497c5f80830ccdca1edfd1fc0c6c6a" -dependencies = [ - "anyhow", - "chrono", - "collections", - "log", -] - [[package]] name = "zmij" version = "1.0.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b8848ee67ecc8aedbaf3e4122217aff892639231befc6a1b58d29fff4c2cabaa" -[[package]] -name = "ztracing" -version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#1662f5f3f6497c5f80830ccdca1edfd1fc0c6c6a" -dependencies = [ - "tracing", - "tracing-subscriber", - "zlog", - "ztracing_macro", -] - -[[package]] -name = "ztracing_macro" -version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#1662f5f3f6497c5f80830ccdca1edfd1fc0c6c6a" - [[package]] name = "zune-core" version = "0.5.1" diff --git a/crates/app/Cargo.toml b/crates/app/Cargo.toml index a455113c..3e8842a4 100644 --- a/crates/app/Cargo.toml +++ b/crates/app/Cargo.toml @@ -21,9 +21,9 @@ preview-mcp = { path = "../preview-mcp" } orchestrate-mcp = { path = "../orchestrate-mcp" } computer-use-mcp = { path = "../computer-use-mcp" } mcp-host = { path = "../mcp-host" } -gpui = { git = "https://github.com/zed-industries/zed" } -gpui_platform = { git = "https://github.com/zed-industries/zed", features = ["font-kit", "x11", "wayland", "runtime_shaders"] } -gpui-base = { git = "https://github.com/longbridge/gpui-component", rev = "fd3bc2bbb8a2c4dfe268c1475682476ada54cd0c" } +gpui = { package = "gpui-pre", version = "0.3.1" } +gpui_platform = { package = "gpui-pre-platform", version = "0.3.1", features = ["font-kit", "x11", "wayland", "runtime_shaders"] } +gpui-base = "0.6.0" env_logger = "0.11" log = "0.4" diff --git a/crates/ui/Cargo.toml b/crates/ui/Cargo.toml index 12aacb55..2b4804bc 100644 --- a/crates/ui/Cargo.toml +++ b/crates/ui/Cargo.toml @@ -13,10 +13,10 @@ tcode-voice = { path = "../voice" } term = { path = "../term" } preview-mcp = { path = "../preview-mcp" } computer-use-mcp = { path = "../computer-use-mcp" } -gpui = { git = "https://github.com/zed-industries/zed" } -gpui-base = { git = "https://github.com/longbridge/gpui-component", rev = "fd3bc2bbb8a2c4dfe268c1475682476ada54cd0c" } -gpui-component-assets = { git = "https://github.com/longbridge/gpui-component", rev = "fd3bc2bbb8a2c4dfe268c1475682476ada54cd0c" } -gpui-component-macros = { git = "https://github.com/longbridge/gpui-component", rev = "fd3bc2bbb8a2c4dfe268c1475682476ada54cd0c" } +gpui = { package = "gpui-pre", version = "0.3.1" } +gpui-base = "0.6.0" +gpui-component-assets = { package = "gpui-kit-assets", version = "0.6.0" } +gpui-component-macros = "0.6.0" image = { version = "0.25.10", default-features = false, features = ["png", "jpeg", "gif", "webp", "bmp", "tiff"] } base64 = "0.23" async-channel = "2" @@ -32,7 +32,7 @@ syntect = { version = "5.3.0", default-features = false, features = ["parsing", imara-diff = "0.2" [target.'cfg(not(target_os = "linux"))'.dependencies] -gpui-wry = { git = "https://github.com/longbridge/gpui-component", rev = "fd3bc2bbb8a2c4dfe268c1475682476ada54cd0c" } +gpui-wry = "0.6.0" wry = { version = "0.53.3", package = "lb-wry" } raw-window-handle = { version = "0.6", features = ["std"] } @@ -47,8 +47,8 @@ objc2-web-kit = { version = "0.3.2", features = ["WKSnapshotConfiguration", "WKW [dev-dependencies] criterion = "0.8" -gpui = { git = "https://github.com/zed-industries/zed", features = ["test-support"] } -gpui_platform = { git = "https://github.com/zed-industries/zed", features = ["font-kit", "x11", "wayland", "runtime_shaders"] } +gpui = { package = "gpui-pre", version = "0.3.1", features = ["test-support"] } +gpui_platform = { package = "gpui-pre-platform", version = "0.3.1", features = ["font-kit", "x11", "wayland", "runtime_shaders"] } tcode-runtime = { path = "../runtime", features = ["test-support"] } # dump-create is only needed by examples/sanitize_syntaxes.rs and the syntax-set # regression test; the shipped binary keeps the lean dependency feature set. diff --git a/crates/ui/build.rs b/crates/ui/build.rs index 1015775f..bcbad28a 100644 --- a/crates/ui/build.rs +++ b/crates/ui/build.rs @@ -1,8 +1,8 @@ use std::env; fn main() { - let icons_dir = env::var("DEP_GPUI_COMPONENT_DEFAULT_ICONS_ICONS_DIR") - .expect("DEP_GPUI_COMPONENT_DEFAULT_ICONS_ICONS_DIR is set by gpui-component-assets"); + let icons_dir = env::var("DEP_GPUI_KIT_DEFAULT_ICONS_ICONS_DIR") + .expect("DEP_GPUI_KIT_DEFAULT_ICONS_ICONS_DIR is set by gpui-kit-assets"); println!("cargo:rustc-env=GPUI_COMPONENT_DEFAULT_ICONS_DIR={icons_dir}"); println!("cargo:rerun-if-changed={icons_dir}"); diff --git a/crates/ui/src/theme.rs b/crates/ui/src/theme.rs index b6cd3922..1670a535 100644 --- a/crates/ui/src/theme.rs +++ b/crates/ui/src/theme.rs @@ -3,7 +3,7 @@ use std::{collections::HashMap, sync::Arc, sync::LazyLock}; use gpui::{App, Global, Hsla, Pixels, Rgba, SharedString, Window, WindowAppearance, px}; use gpui_base::{ ColorTokens, RadiusTokens, ResizableTheme, ScrollbarMode, ScrollbarStyles, ScrollbarTheme, - SemanticThemeTokens, TypographyTokens, + SemanticThemeTokens, ThemeAppearance, TypographyTokens, }; use serde::Deserialize; @@ -194,6 +194,7 @@ impl TryFrom for Theme { let tokens = SemanticThemeTokens { colors: ColorTokens { + selection: primary.alpha(0.3), background, foreground, surface: popover, @@ -300,24 +301,31 @@ pub fn change_mode(mode: ThemeMode, window: Option<&mut Window>, cx: &mut App) { ThemeMode::Dark => cx.global::().dark.clone(), }; let base_theme = gpui_base::Theme { + appearance: match mode { + ThemeMode::Light => ThemeAppearance::Light, + ThemeMode::Dark => ThemeAppearance::Dark, + }, tokens: theme.tokens.clone(), - scrollbar: ScrollbarTheme { - mode: if cx.should_auto_hide_scrollbars() { + scrollbar: ScrollbarTheme::new() + .with_mode(if cx.should_auto_hide_scrollbars() { ScrollbarMode::Scrolling } else { ScrollbarMode::Hover - }, - styles: ScrollbarStyles::default() - .track(|style| style.bg(theme.scrollbar)) - .track_hover(|style| style.bg(theme.scrollbar)) - .track_active(|style| style.bg(theme.scrollbar).border_color(theme.border)) - .thumb(|style| style.bg(theme.scrollbar_thumb).radius(theme.radius)) - .thumb_hover(|style| style.bg(theme.scrollbar_thumb_hover).radius(theme.radius)) - .thumb_active(|style| style.bg(theme.scrollbar_thumb_hover).radius(theme.radius)), - }, + }) + .with_styles( + ScrollbarStyles::default() + .track(|style| style.bg(theme.scrollbar)) + .track_hover(|style| style.bg(theme.scrollbar)) + .track_active(|style| style.bg(theme.scrollbar).border_color(theme.border)) + .thumb(|style| style.bg(theme.scrollbar_thumb).radius(theme.radius)) + .thumb_hover(|style| style.bg(theme.scrollbar_thumb_hover).radius(theme.radius)) + .thumb_active(|style| { + style.bg(theme.scrollbar_thumb_hover).radius(theme.radius) + }), + ), resizable: ResizableTheme { - handle: theme.border, - active_handle: theme.ring, + handle: Some(theme.border), + active_handle: Some(theme.ring), }, }; cx.set_global(base_theme); diff --git a/crates/ui/src/widgets/menu.rs b/crates/ui/src/widgets/menu.rs index 528135e9..c41425db 100644 --- a/crates/ui/src/widgets/menu.rs +++ b/crates/ui/src/widgets/menu.rs @@ -350,6 +350,7 @@ struct ContextMenuState { menu: Option>, position: Point, _subscription: Option, + _deferred: Option, } impl RenderOnce @@ -380,15 +381,15 @@ impl Ren } let previous_focus = window.focused(cx); let menu_focus = menu.focus_handle(cx); - gpui_base::GlobalState::register_deferred_popover(&menu_focus, cx); + let deferred = gpui_base::GlobalState::register_deferred_popover(cx); let subscription = window.subscribe(&menu, cx, { let state = state.clone(); move |_, _: &DismissEvent, window, cx| { state.update(cx, |state, _| { state.menu = None; state._subscription = None; + state._deferred = None; }); - gpui_base::GlobalState::unregister_deferred_popover(&menu_focus, cx); if menu_focus.contains_focused(window, cx) && let Some(previous) = &previous_focus { @@ -402,6 +403,7 @@ impl Ren state.menu = Some(menu); state.position = position; state._subscription = Some(subscription); + state._deferred = Some(deferred); }); window.refresh(); });