Skip to content

chore(deps): 合入 gpui-kit 上游改动,gpui-shell 跟进到 0.6.4 - #258

Merged
feigeCode merged 2 commits into
mainfrom
chore/gpui-kit-upstream-0.6.4
Sep 20, 2026
Merged

feigeCode merged 2 commits into
mainfrom
chore/gpui-kit-upstream-0.6.4

Conversation

@feigeCode

Copy link
Copy Markdown
Owner

Description

  • Brings feigeCode/gpui-kit (port-ce-generic-to-main) up to 23c8e5b78, which merges the 45 upstream commits released between 0.6.1 and 0.6.4. Upstream bumped the QuickJS JIT to 0.12.9 in the very files our 32-bit work touches, so the fork keeps its per-target split and carries the i686 patch rebased onto 0.12.9 (feigeCode/quickjs-jit fix/i686-interpreter-only-0.12.9, 2287cef70).
  • gpui-shell 0.6.1 → 0.6.4: extension-runtime's GPUI_SHELL_VERSION and every test fixture / doc example declaring engines.gpui_shell follow. The check matches 0.x by minor exactly, so a stale value is rejected outright.
  • All 8 gpui-kit pin sites in Cargo.toml move together, and Cargo.lock re-resolves (gpui-wry 0.6.4, rquickjs 0.12.9, no stale revision left).
  • Merge notes from the gpui-kit side: keep the 32-bit split in crates/shell; keep our gutter-lane and inline-widget code next to upstream's token_element; upstream's new InputLine rows carry len as a field and have no split_at, so it gained one (delegating to the inner ShapedLine, passing a token row through whole) to keep the inline-widget layout reserving room between two runs of a row; DialogButtonProps is merged rather than replaced now, so alert()/confirm() go through the show_cancel(..) builder and the footer reads is_cancel_shown().

Break Changes

  • Extensions whose manifest requires engines.gpui_shell below 0.6.4 — the 0.2.0 plugin manifests for instance — are rejected by the host, exactly as the earlier 0.6.1 bump already did.

How to Test

  • cargo check -p remote_desktop_view against the new gpui-kit revision and the i686 quickjs-jit branch: finishes with 0 errors.
  • cargo test -p extension-runtime: 214 tests pass. The wasm contract fixture needs the workspace-wide feature unification, so the suite has to run as cargo test --all, the way CI runs it.
  • CI covers the full three-platform suite on this pull request.

feigeCode and others added 2 commits September 20, 2026 19:20
- gpui-kit(feigeCode/gpui-kit port-ce-generic-to-main)升到 23c8e5b78:合入上游
  45 个提交(0.6.1 → 0.6.4)。其中 QuickJS JIT 升到 0.12.9,与本分支的 32 位改动
  重叠,冲突已在 gpui-kit 侧解决(保留按位宽拆分 + i686 补丁;上游把软换行的行换成
  `InputLine`、对话框 button props 改为合并语义,内联 widget 布局与 alert/confirm
  已相应适配)。Cargo.toml 的 8 处 pin 一起回填到新 rev,Cargo.lock 重新解析
  (gpui-wry 0.6.4、rquickjs 0.12.9,旧 rev 无残留)。
- 宿主 gpui-shell 版本 0.6.1 → 0.6.4:extension-runtime 的 GPUI_SHELL_VERSION 与
  各处测试清单、文档示例同步提升。该校验对 0.x 按 minor 精确匹配,旧值会被直接拒绝。

验证:cargo check -p remote_desktop_view(新 gpui-kit + quickjs-jit i686 分支)
→ Finished dev profile,0 error。
@feigeCode
feigeCode merged commit 95f69e1 into main Sep 20, 2026
8 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant