chore(deps): gpui-kit / quickjs-jit 升到支持 32 位 Windows 的版本

gpui-shell 的 QuickJS 运行时依赖改为按目标位宽拆分:64 位
macOS/Windows/Linux 保留 `compiler`,其余目标只跑解释器,于是
i686-pc-windows-msvc 上 shell 依赖链可以编译(此前会直接报缺少
i686-pc-windows-msvc 绑定)。

- gpui-kit: 6df86ef8 → 329a064a
- quickjs-jit: 51c57e3c → 1a5b7fa

gpui-wry / gpui-kit / rquickjs patch 三行一并同步到同一 rev,避免两份
gpui-kit 与两份 quickjs-jit 并存导致 ModuleDef / Ctx / Error 类型不统一。
This commit is contained in:
胡飞
2026-09-20 14:54:02 +08:00
parent 6c303e2839
commit abb0558434
7 changed files with 60 additions and 60 deletions
Generated
+45 -45
View File
@@ -1150,7 +1150,7 @@ dependencies = [
"bitflags 2.13.2",
"cexpr",
"clang-sys",
"itertools 0.13.0",
"itertools 0.11.0",
"log",
"prettyplease",
"proc-macro2",
@@ -1554,7 +1554,7 @@ dependencies = [
"cap-primitives 3.4.6",
"cap-std 3.4.6",
"io-lifetimes 2.0.4",
"windows-sys 0.59.0",
"windows-sys 0.52.0",
]
[[package]]
@@ -1583,7 +1583,7 @@ dependencies = [
"maybe-owned",
"rustix 1.1.4",
"rustix-linux-procfs",
"windows-sys 0.59.0",
"windows-sys 0.52.0",
"winx",
]
@@ -1601,7 +1601,7 @@ dependencies = [
"maybe-owned",
"rustix 1.1.4",
"rustix-linux-procfs",
"windows-sys 0.61.2",
"windows-sys 0.60.2",
"winx",
]
@@ -3454,7 +3454,7 @@ dependencies = [
"libc",
"option-ext",
"redox_users 0.5.2",
"windows-sys 0.61.2",
"windows-sys 0.60.2",
]
[[package]]
@@ -3891,7 +3891,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
dependencies = [
"libc",
"windows-sys 0.61.2",
"windows-sys 0.52.0",
]
[[package]]
@@ -4155,7 +4155,7 @@ checksum = "0ce92ff622d6dadf7349484f42c93271a0d49b7cc4d466a936405bacbe10aa78"
dependencies = [
"cfg-if",
"rustix 1.1.4",
"windows-sys 0.59.0",
"windows-sys 0.52.0",
]
[[package]]
@@ -4439,7 +4439,7 @@ checksum = "94e7099f6313ecacbe1256e8ff9d617b75d1bcb16a6fddef94866d225a01a14a"
dependencies = [
"io-lifetimes 2.0.4",
"rustix 1.1.4",
"windows-sys 0.59.0",
"windows-sys 0.52.0",
]
[[package]]
@@ -5051,7 +5051,7 @@ dependencies = [
"log",
"presser",
"thiserror 2.0.20",
"windows 0.62.2",
"windows 0.58.0",
]
[[package]]
@@ -5077,7 +5077,7 @@ dependencies = [
[[package]]
name = "gpui-base"
version = "0.6.1"
source = "git+https://github.com/feigeCode/gpui-kit?rev=6df86ef82b4b5f3b04723c0d1cf82ff57cdc7078#6df86ef82b4b5f3b04723c0d1cf82ff57cdc7078"
source = "git+https://github.com/feigeCode/gpui-kit?rev=329a064abfd3630765e11e3b8e7301d35809067c#329a064abfd3630765e11e3b8e7301d35809067c"
dependencies = [
"aho-corasick",
"anyhow",
@@ -5111,7 +5111,7 @@ dependencies = [
[[package]]
name = "gpui-component"
version = "0.6.1"
source = "git+https://github.com/feigeCode/gpui-kit?rev=6df86ef82b4b5f3b04723c0d1cf82ff57cdc7078#6df86ef82b4b5f3b04723c0d1cf82ff57cdc7078"
source = "git+https://github.com/feigeCode/gpui-kit?rev=329a064abfd3630765e11e3b8e7301d35809067c#329a064abfd3630765e11e3b8e7301d35809067c"
dependencies = [
"anyhow",
"chrono",
@@ -5161,7 +5161,7 @@ dependencies = [
[[package]]
name = "gpui-component-macros"
version = "0.6.1"
source = "git+https://github.com/feigeCode/gpui-kit?rev=6df86ef82b4b5f3b04723c0d1cf82ff57cdc7078#6df86ef82b4b5f3b04723c0d1cf82ff57cdc7078"
source = "git+https://github.com/feigeCode/gpui-kit?rev=329a064abfd3630765e11e3b8e7301d35809067c#329a064abfd3630765e11e3b8e7301d35809067c"
dependencies = [
"proc-macro-crate 3.5.0",
"proc-macro2",
@@ -5172,7 +5172,7 @@ dependencies = [
[[package]]
name = "gpui-component-shell"
version = "0.6.1"
source = "git+https://github.com/feigeCode/gpui-kit?rev=6df86ef82b4b5f3b04723c0d1cf82ff57cdc7078#6df86ef82b4b5f3b04723c0d1cf82ff57cdc7078"
source = "git+https://github.com/feigeCode/gpui-kit?rev=329a064abfd3630765e11e3b8e7301d35809067c#329a064abfd3630765e11e3b8e7301d35809067c"
dependencies = [
"gpui-component",
"gpui-shell",
@@ -5181,7 +5181,7 @@ dependencies = [
[[package]]
name = "gpui-fps"
version = "0.6.1"
source = "git+https://github.com/feigeCode/gpui-kit?rev=6df86ef82b4b5f3b04723c0d1cf82ff57cdc7078#6df86ef82b4b5f3b04723c0d1cf82ff57cdc7078"
source = "git+https://github.com/feigeCode/gpui-kit?rev=329a064abfd3630765e11e3b8e7301d35809067c#329a064abfd3630765e11e3b8e7301d35809067c"
dependencies = [
"core-graphics 0.24.0",
"gpui-pre",
@@ -5198,7 +5198,7 @@ dependencies = [
[[package]]
name = "gpui-kit-assets"
version = "0.6.1"
source = "git+https://github.com/feigeCode/gpui-kit?rev=6df86ef82b4b5f3b04723c0d1cf82ff57cdc7078#6df86ef82b4b5f3b04723c0d1cf82ff57cdc7078"
source = "git+https://github.com/feigeCode/gpui-kit?rev=329a064abfd3630765e11e3b8e7301d35809067c#329a064abfd3630765e11e3b8e7301d35809067c"
dependencies = [
"anyhow",
"gpui-pre",
@@ -5754,7 +5754,7 @@ dependencies = [
[[package]]
name = "gpui-shell"
version = "0.6.1"
source = "git+https://github.com/feigeCode/gpui-kit?rev=6df86ef82b4b5f3b04723c0d1cf82ff57cdc7078#6df86ef82b4b5f3b04723c0d1cf82ff57cdc7078"
source = "git+https://github.com/feigeCode/gpui-kit?rev=329a064abfd3630765e11e3b8e7301d35809067c#329a064abfd3630765e11e3b8e7301d35809067c"
dependencies = [
"anyhow",
"async-channel",
@@ -5786,7 +5786,7 @@ dependencies = [
[[package]]
name = "gpui-wry"
version = "0.6.1"
source = "git+https://github.com/feigeCode/gpui-kit?rev=6df86ef82b4b5f3b04723c0d1cf82ff57cdc7078#6df86ef82b4b5f3b04723c0d1cf82ff57cdc7078"
source = "git+https://github.com/feigeCode/gpui-kit?rev=329a064abfd3630765e11e3b8e7301d35809067c#329a064abfd3630765e11e3b8e7301d35809067c"
dependencies = [
"anyhow",
"gpui-pre",
@@ -6327,7 +6327,7 @@ dependencies = [
"hyper",
"libc",
"pin-project-lite",
"socket2 0.6.5",
"socket2 0.5.10",
"tokio",
"tower-service",
"tracing",
@@ -6345,7 +6345,7 @@ dependencies = [
"js-sys",
"log",
"wasm-bindgen",
"windows-core 0.62.2",
"windows-core 0.58.0",
]
[[package]]
@@ -6652,7 +6652,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2285ddfe3054097ef4b2fe909ef8c3bcd1ea52a8f0d274416caebeef39f04a65"
dependencies = [
"io-lifetimes 2.0.4",
"windows-sys 0.59.0",
"windows-sys 0.52.0",
]
[[package]]
@@ -8323,7 +8323,7 @@ version = "0.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "536bfad37a309d62069485248eeaba1e8d9853aaf951caaeaed0585a95346f08"
dependencies = [
"windows-sys 0.61.2",
"windows-sys 0.60.2",
]
[[package]]
@@ -8533,7 +8533,7 @@ dependencies = [
"once_cell",
"png 0.18.1",
"thiserror 2.0.20",
"windows-sys 0.61.2",
"windows-sys 0.60.2",
]
[[package]]
@@ -8918,7 +8918,7 @@ version = "0.50.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5"
dependencies = [
"windows-sys 0.61.2",
"windows-sys 0.60.2",
]
[[package]]
@@ -10877,7 +10877,7 @@ dependencies = [
[[package]]
name = "quickjs-jit"
version = "0.12.7"
source = "git+https://github.com/feigeCode/quickjs-jit?rev=51c57e3cc54407ac6f4938b0e7a9675d5f5f7eac#51c57e3cc54407ac6f4938b0e7a9675d5f5f7eac"
source = "git+https://github.com/feigeCode/quickjs-jit?rev=1a5b7fa7311dad0e309357c229fe93a9ee124ad8#1a5b7fa7311dad0e309357c229fe93a9ee124ad8"
dependencies = [
"quickjs-jit-core",
"quickjs-jit-macro",
@@ -10886,7 +10886,7 @@ dependencies = [
[[package]]
name = "quickjs-jit-core"
version = "0.12.7"
source = "git+https://github.com/feigeCode/quickjs-jit?rev=51c57e3cc54407ac6f4938b0e7a9675d5f5f7eac#51c57e3cc54407ac6f4938b0e7a9675d5f5f7eac"
source = "git+https://github.com/feigeCode/quickjs-jit?rev=1a5b7fa7311dad0e309357c229fe93a9ee124ad8#1a5b7fa7311dad0e309357c229fe93a9ee124ad8"
dependencies = [
"async-lock",
"half",
@@ -10898,7 +10898,7 @@ dependencies = [
[[package]]
name = "quickjs-jit-macro"
version = "0.12.7"
source = "git+https://github.com/feigeCode/quickjs-jit?rev=51c57e3cc54407ac6f4938b0e7a9675d5f5f7eac#51c57e3cc54407ac6f4938b0e7a9675d5f5f7eac"
source = "git+https://github.com/feigeCode/quickjs-jit?rev=1a5b7fa7311dad0e309357c229fe93a9ee124ad8#1a5b7fa7311dad0e309357c229fe93a9ee124ad8"
dependencies = [
"convert_case 0.11.0",
"fnv",
@@ -10914,7 +10914,7 @@ dependencies = [
[[package]]
name = "quickjs-jit-runtime"
version = "0.12.7"
source = "git+https://github.com/feigeCode/quickjs-jit?rev=51c57e3cc54407ac6f4938b0e7a9675d5f5f7eac#51c57e3cc54407ac6f4938b0e7a9675d5f5f7eac"
source = "git+https://github.com/feigeCode/quickjs-jit?rev=1a5b7fa7311dad0e309357c229fe93a9ee124ad8#1a5b7fa7311dad0e309357c229fe93a9ee124ad8"
dependencies = [
"cranelift-codegen 0.116.1",
"cranelift-frontend 0.116.1",
@@ -10949,7 +10949,7 @@ dependencies = [
[[package]]
name = "quickjs-jit-sys"
version = "0.12.7"
source = "git+https://github.com/feigeCode/quickjs-jit?rev=51c57e3cc54407ac6f4938b0e7a9675d5f5f7eac#51c57e3cc54407ac6f4938b0e7a9675d5f5f7eac"
source = "git+https://github.com/feigeCode/quickjs-jit?rev=1a5b7fa7311dad0e309357c229fe93a9ee124ad8#1a5b7fa7311dad0e309357c229fe93a9ee124ad8"
dependencies = [
"cc",
]
@@ -10967,7 +10967,7 @@ dependencies = [
"quinn-udp",
"rustc-hash 2.1.3",
"rustls 0.23.44",
"socket2 0.6.5",
"socket2 0.5.10",
"thiserror 2.0.20",
"tokio",
"tracing",
@@ -11005,9 +11005,9 @@ dependencies = [
"cfg_aliases",
"libc",
"once_cell",
"socket2 0.6.5",
"socket2 0.5.10",
"tracing",
"windows-sys 0.61.2",
"windows-sys 0.52.0",
]
[[package]]
@@ -11880,7 +11880,7 @@ dependencies = [
[[package]]
name = "rquickjs"
version = "0.12.7"
source = "git+https://github.com/feigeCode/gpui-kit?rev=6df86ef82b4b5f3b04723c0d1cf82ff57cdc7078#6df86ef82b4b5f3b04723c0d1cf82ff57cdc7078"
source = "git+https://github.com/feigeCode/gpui-kit?rev=329a064abfd3630765e11e3b8e7301d35809067c#329a064abfd3630765e11e3b8e7301d35809067c"
dependencies = [
"quickjs-jit",
]
@@ -12214,7 +12214,7 @@ dependencies = [
"errno",
"libc",
"linux-raw-sys 0.4.15",
"windows-sys 0.59.0",
"windows-sys 0.52.0",
]
[[package]]
@@ -12227,7 +12227,7 @@ dependencies = [
"errno",
"libc",
"linux-raw-sys 0.12.1",
"windows-sys 0.61.2",
"windows-sys 0.52.0",
]
[[package]]
@@ -12349,7 +12349,7 @@ dependencies = [
"security-framework 3.7.0",
"security-framework-sys",
"webpki-root-certs",
"windows-sys 0.61.2",
"windows-sys 0.52.0",
]
[[package]]
@@ -12659,7 +12659,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3afb591f9cdb6223c88ba39269aff895620c7f0716dc42b705b5733d5c7c0823"
dependencies = [
"annotate-snippets",
"base64 0.23.1",
"base64 0.21.7",
"encoding_rs_io",
"granit-parser",
"nohash-hasher",
@@ -13027,7 +13027,7 @@ version = "3.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "32824fab5e16e6c4d86dc1ba84489390419a39f97699852b66480bb87d297ed8"
dependencies = [
"dirs 6.0.0",
"dirs 5.0.1",
]
[[package]]
@@ -13233,7 +13233,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c3d1e2c7f27f8d4cb10542a02c49005dbd6e93095799d6f3be745fae9f8fedd4"
dependencies = [
"libc",
"windows-sys 0.61.2",
"windows-sys 0.60.2",
]
[[package]]
@@ -13446,7 +13446,7 @@ dependencies = [
"cfg-if",
"libc",
"psm",
"windows-sys 0.61.2",
"windows-sys 0.60.2",
]
[[package]]
@@ -13859,7 +13859,7 @@ dependencies = [
"fd-lock",
"io-lifetimes 2.0.4",
"rustix 0.38.44",
"windows-sys 0.59.0",
"windows-sys 0.52.0",
"winx",
]
@@ -13969,7 +13969,7 @@ dependencies = [
"getrandom 0.4.3",
"once_cell",
"rustix 1.1.4",
"windows-sys 0.61.2",
"windows-sys 0.52.0",
]
[[package]]
@@ -14629,7 +14629,7 @@ dependencies = [
"once_cell",
"png 0.18.1",
"thiserror 2.0.20",
"windows-sys 0.61.2",
"windows-sys 0.60.2",
]
[[package]]
@@ -14817,7 +14817,7 @@ checksum = "f2f6fb2847f6742cd76af783a2a2c49e9375d0a111c7bef6f71cd9e738c72d6e"
dependencies = [
"memoffset",
"tempfile",
"windows-sys 0.61.2",
"windows-sys 0.60.2",
]
[[package]]
@@ -16251,7 +16251,7 @@ version = "0.1.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22"
dependencies = [
"windows-sys 0.61.2",
"windows-sys 0.52.0",
]
[[package]]
@@ -17029,7 +17029,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3f3fd376f71958b862e7afb20cfe5a22830e1963462f3a17f49d82a6c1d1f42d"
dependencies = [
"bitflags 2.13.2",
"windows-sys 0.59.0",
"windows-sys 0.52.0",
]
[[package]]
+8 -8
View File
@@ -55,13 +55,13 @@ edition = "2024"
# so the workspace resolves it from GitHub instead of a sibling ../gpui-component
# checkout. The dependency keys keep the crate names navop already imports
# (`gpui_component`, `gpui_base`, `gpui_shell`, ...).
gpui-component = { git = "https://github.com/feigeCode/gpui-kit", rev = "6df86ef82b4b5f3b04723c0d1cf82ff57cdc7078" }
gpui-component-assets = { package = "gpui-kit-assets", git = "https://github.com/feigeCode/gpui-kit", rev = "6df86ef82b4b5f3b04723c0d1cf82ff57cdc7078" }
gpui-base = { git = "https://github.com/feigeCode/gpui-kit", rev = "6df86ef82b4b5f3b04723c0d1cf82ff57cdc7078" }
gpui-shell = { git = "https://github.com/feigeCode/gpui-kit", rev = "6df86ef82b4b5f3b04723c0d1cf82ff57cdc7078" }
gpui-component-shell = { git = "https://github.com/feigeCode/gpui-kit", rev = "6df86ef82b4b5f3b04723c0d1cf82ff57cdc7078" }
gpui-wry = { git = "https://github.com/feigeCode/gpui-kit", rev = "6df86ef82b4b5f3b04723c0d1cf82ff57cdc7078" }
gpui-kit = { git = "https://github.com/feigeCode/gpui-kit", rev = "6df86ef82b4b5f3b04723c0d1cf82ff57cdc7078" }
gpui-component = { git = "https://github.com/feigeCode/gpui-kit", rev = "329a064abfd3630765e11e3b8e7301d35809067c" }
gpui-component-assets = { package = "gpui-kit-assets", git = "https://github.com/feigeCode/gpui-kit", rev = "329a064abfd3630765e11e3b8e7301d35809067c" }
gpui-base = { git = "https://github.com/feigeCode/gpui-kit", rev = "329a064abfd3630765e11e3b8e7301d35809067c" }
gpui-shell = { git = "https://github.com/feigeCode/gpui-kit", rev = "329a064abfd3630765e11e3b8e7301d35809067c" }
gpui-component-shell = { git = "https://github.com/feigeCode/gpui-kit", rev = "329a064abfd3630765e11e3b8e7301d35809067c" }
gpui-wry = { git = "https://github.com/feigeCode/gpui-kit", rev = "329a064abfd3630765e11e3b8e7301d35809067c" }
gpui-kit = { git = "https://github.com/feigeCode/gpui-kit", rev = "329a064abfd3630765e11e3b8e7301d35809067c" }
gpui = { package = "gpui-pre", version = "0.3.99" }
gpui_platform = { package = "gpui-pre-platform", version = "0.3.99", features = ["font-kit", "x11", "wayland", "runtime_shaders"] }
@@ -368,4 +368,4 @@ gpui-pre-ztracing-macro = { git = "https://github.com/feigeCode/gpui-pre.git"
# live in this root manifest: [patch] sections inside the gpui-component
# workspace are ignored by cargo. Mirrors the same entry in gpui-component's
# workspace root, pinned to the same revision as the gpui dependencies above.
rquickjs = { git = "https://github.com/feigeCode/gpui-kit", rev = "6df86ef82b4b5f3b04723c0d1cf82ff57cdc7078" }
rquickjs = { git = "https://github.com/feigeCode/gpui-kit", rev = "329a064abfd3630765e11e3b8e7301d35809067c" }
@@ -140,7 +140,7 @@ fn manifest_loads_resource_workbench_with_route_and_navigation() {
"version": "1.0.0",
"engines": {
"onetcli": ">=0.1.0",
"gpui_shell": "0.2.0"
"gpui_shell": "0.6.1"
},
"permissions": ["shell:exec", "spawn:./bin/provider"],
"runtime": {
@@ -1185,7 +1185,7 @@ fn write_shell_manifest(dir: &std::path::Path, view: serde_json::Value) {
"id": "com.example.resources",
"name": "Resources",
"version": "0.1.0",
"engines": { "onetcli": ">=0.1.0", "gpui_shell": "0.2.0" },
"engines": { "onetcli": ">=0.1.0", "gpui_shell": "0.6.1" },
"api": { "shell": "1.0" },
"permissions": ["shell:exec", "spawn:./bin/provider"],
"runtime": {
@@ -8,7 +8,7 @@ use super::{Manifest, ShellHostModule, ShellViewContrib};
const SHELL_EXEC_PERMISSION: &str = "shell:exec";
const RESERVED_BACKEND_ALIASES: &[&str] = &["host", "navop", "default"];
const GPUI_SHELL_VERSION: &str = "0.2.0";
const GPUI_SHELL_VERSION: &str = "0.6.1";
pub(crate) fn validate_shell_views(manifest: &Manifest) -> Result<(), ShellViewValidationError> {
if manifest.contributes.shell_views.is_empty() {
@@ -1197,7 +1197,7 @@ fn base_manifest() -> Manifest {
keywords: vec![],
engines: Engines {
onetcli: ">=0.1.0".to_string(),
gpui_shell: "0.2.0".to_string(),
gpui_shell: "0.6.1".to_string(),
},
api: ApiVersions::default(),
activation: vec![],
@@ -58,7 +58,7 @@ UI RPC。已有 provider 协议保持不变,Elasticsearch、Kafka、Kubernetes
### 2.2 gpui-shell 已有能力
固定 fork `6df86ef82b4b5f3b04723c0d1cf82ff57cdc7078` 已合并最新上游并包含
固定 fork `329a064abfd3630765e11e3b8e7301d35809067c` 已合并最新上游并包含
`gpui-shell`crate 名为 `gpui_shell`。它已经提供:
- QuickJS ES module 执行和 `ScriptView`
@@ -192,7 +192,7 @@ Navop 只读取根目录的 `extension.json`。shell entry 是 contribution 的
"version": "1.0.0",
"engines": {
"onetcli": ">=0.14.0",
"gpui_shell": "0.2.0"
"gpui_shell": "0.6.1"
},
"api": {
"extension": "1.0",
+1 -1
View File
@@ -6,7 +6,7 @@ workspace manifest:
```text
https://github.com/feigeCode/gpui-kit.git
rev 6df86ef82b4b5f3b04723c0d1cf82ff57cdc7078
rev 329a064abfd3630765e11e3b8e7301d35809067c
```
The checkout belongs to `https://github.com/feigeCode/gpui-kit` and the