Skip to content

build(Deps): 4 项依赖升级转向 feature/1.x.x 并锚定 dependabot target-branch - #75

Merged
ThreeFish-AI merged 1 commit into
feature/1.x.xfrom
ThreeFish-AI/merge-deps-to-1x
Jul 4, 2026
Merged

build(Deps): 4 项依赖升级转向 feature/1.x.x 并锚定 dependabot target-branch#75
ThreeFish-AI merged 1 commit into
feature/1.x.xfrom
ThreeFish-AI/merge-deps-to-1x

Conversation

@ThreeFish-AI

Copy link
Copy Markdown
Owner

背景

dependabot 的 4 个 deps 升级 PR(#70 #71 #72 #73)默认打向 master,与团队集成流「deps 先落 feature/1.x.x,再由其合入 master」冲突。本 PR 按用户决策,将这 4 项升级合并为单个 PR 直接转向 feature/1.x.x,并修复根因避免每周复发。

依赖升级

依赖 变更 性质
@vscode/test-electron 2.4.1 → 3.0.0 major
vite 7.0.0 → 8.1.3 major
@stylistic/eslint-plugin 2.9.0 → 5.10.0 major
@types/node 26.0.1 → 26.1.0 minor

合成单个 PR 只重生一次 pnpm-lock.yaml,规避 4 个独立 lockfile PR 顺序合并的连环冲突。3 个 major 的兼容性由 CI 在 feature/1.x.x 基线上组合验证。

根因修复

.github/dependabot.yml 此前未设 target-branch,dependabot 回退到仓库默认分支 master,导致 deps PR 打错分支。本 PR 为 npmgithub-actions 两个 ecosystem 锚定 target-branch: feature/1.x.x,使后续所有 deps PR 直接进入集成分支。保留既有 @types/vscode ignore 与 open-pull-requests-limit 不变。

验证

  • 本地:check-types(tsc --noEmit)、lint(eslint + stylistic 5)、package(生产构建 esbuild --production)、test:unit(vitest 4 / vite 8,349 项)全过
  • 权威:本 PR 的 GitHub Actions CI(on: pull_request)在 feature/1.x.x 基线上运行 Lint & Build / Test-ubuntu / Package vsix,验证 4 项 major 的组合兼容性(含 xvfb 包装的集成测试)。

取代

本 PR 取代以下 dependabot PR,合并后将关闭并附取代说明:

将原打向 master 的 4 个 dependabot 升级合并为单个 PR,直接进入集成分支 feature/1.x.x:

- @vscode/test-electron 2.4.1 → 3.0.0(major)
- vite 7.0.0 → 8.1.3(major)
- @stylistic/eslint-plugin 2.9.0 → 5.10.0(major)
- @types/node 26.0.1 → 26.1.0

根因修复:dependabot.yml 未设 target-branch 时回退默认分支 master,与「deps 先落
feature/1.x.x,再合入 master」的集成流冲突;为 npm 与 github-actions 两个 ecosystem
锚定 target-branch: feature/1.x.x,使后续 deps PR 直接进入集成分支。

取代 dependabot PR #70 #71 #72 #73。
本地已过 check-types / lint / 生产构建 / 349 项单测;集成测试以 PR CI 为准。

🤖 Generated with [Claude Code](https://github.com/claude), [CodeX](https://openai.com), [Gemini](https://github.com/apps/gemini-code-assist)
Co-Authored-By: Aurelius Huang<threefish.ai@gmail.com>
@ThreeFish-AI
ThreeFish-AI merged commit ebcb0a1 into feature/1.x.x Jul 4, 2026
5 checks passed
ThreeFish-AI added a commit that referenced this pull request Jul 4, 2026
…mmit-tooltip

fix(Graph): CI 与提交详情 Tooltip 互斥 + 引用胶囊完整显示,并合入 #75 依赖升级
@ThreeFish-AI
ThreeFish-AI deleted the ThreeFish-AI/merge-deps-to-1x branch July 5, 2026 00:15
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