build(Deps): 主线归并 feature/1.x.x —— mocha 12 / vite 8.3 等 5 项开发依赖收编合入; - #137
Merged
Merged
Conversation
Bumps the dev-minor-patch group with 4 updates: [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node), [eslint](https://github.com/eslint/eslint), [prettier](https://github.com/prettier/prettier) and [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite). Updates `@types/node` from 26.4.0 to 26.6.1 - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node) Updates `eslint` from 10.9.1 to 10.10.0 - [Release notes](https://github.com/eslint/eslint/releases) - [Commits](eslint/eslint@v10.9.1...v10.10.0) Updates `prettier` from 3.9.6 to 3.9.8 - [Release notes](https://github.com/prettier/prettier/releases) - [Changelog](https://github.com/prettier/prettier/blob/main/CHANGELOG.md) - [Commits](prettier/prettier@3.9.6...3.9.8) Updates `vite` from 8.2.2 to 8.3.0 - [Release notes](https://github.com/vitejs/vite/releases) - [Changelog](https://github.com/vitejs/vite/blob/main/packages/vite/CHANGELOG.md) - [Commits](https://github.com/vitejs/vite/commits/create-vite@8.3.0/packages/vite) --- updated-dependencies: - dependency-name: "@types/node" dependency-version: 26.6.1 dependency-type: direct:development update-type: version-update:semver-minor dependency-group: dev-minor-patch - dependency-name: eslint dependency-version: 10.10.0 dependency-type: direct:development update-type: version-update:semver-minor dependency-group: dev-minor-patch - dependency-name: prettier dependency-version: 3.9.8 dependency-type: direct:development update-type: version-update:semver-patch dependency-group: dev-minor-patch - dependency-name: vite dependency-version: 8.3.0 dependency-type: direct:development update-type: version-update:semver-minor dependency-group: dev-minor-patch ... Signed-off-by: dependabot[bot] <support@github.com>
Bumps [mocha](https://github.com/mochajs/mocha) from 11.7.6 to 12.0.2. - [Release notes](https://github.com/mochajs/mocha/releases) - [Changelog](https://github.com/mochajs/mocha/blob/main/CHANGELOG.md) - [Commits](mochajs/mocha@v11.7.6...v12.0.2) --- updated-dependencies: - dependency-name: mocha dependency-version: 12.0.2 dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>
…ier 3.9.8 / @types/node 26.6.1; 收编 dependabot #134(dev-minor-patch 组 4 项)与 #135(mocha major)。两者共改 pnpm-lock.yaml 且互相冲突,顺序合并必然连环冲突,故在同一分支上一次性落地、 lockfile 只重生一次,组合兼容性由同一轮 CI 一次验证。 lockfile 以 #134 的锁定结果为基线、仅叠加 mocha 11.7.6 → 12.0.2 重解析, 确保产物是两个 PR 的忠实并集(mocha@12.0.2 integrity 与 #135 逐字一致), 不夹带任何范围外的依赖漂移。 mocha 12 为 major 且已切 ESM-only(type: module、engines: ^20.19.0 || >=22.12.0), 而 tests/suite/*.js 以 CommonJS require('mocha') + new Mocha() 加载——这是本轮 最大爆炸半径。实测 VS Code 1.138 的 Electron Node 经 require(esm) 互操作可正常 构造 Mocha,测试 harness 无需改造;CI 的 Node 22 亦满足新下限。 本地组合态验证(复刻 CI 闸门顺序): - check-types / lint / package(esbuild --production)均退出码 0 - test:unit 429 passed(46 files, vitest 5) - test:integration 8 passing + 4 passing(mocha 12.0.2 实跑) 🤖 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>
以 -s ours 记入两个原 PR 的 head commit 为祖先,使其在 GitHub 上落为 Merged 而非 Closed(GitHub 仅在 head SHA 可从 base 分支到达时标记 Merged)。 本提交工作树零变化,仅记录父子关系。 - #134 dev-minor-patch 组 4 项 a204e9e - #135 mocha 12.0.2 c3fd07c⚠️ 本 PR 必须以 merge commit 落地,严禁 squash / rebase——重写 SHA 会切断血缘, 原 PR 将退化为 Closed。 🤖 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>
…1-x-x build(Deps): 5 项开发依赖收编合入——mocha 12 / vite 8.3 / eslint 10.10 / prettier 3.9.8 / @types/node 26.6.1;
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
背景
feature/1.x.x上的 #136(收编 dependabot #134 / #135)已合入,主线master落后该集成分支 5 个 commit(仅package.json+pnpm-lock.yaml,无源码变更)。按既定发布流「deps 先落feature/1.x.x,再由其合入master」执行本次归并(同 #133 先例)。归并内容
mocharequire(esm)互操作正常viteeslintprettier@types/node验证
#136 的 CI 三关全绿,其中 Test (ubuntu-latest) 以
--frozen-lockfile安装mocha 12.0.2后集成测试 8 passing + 4 passing;本 PR 触发的 CI 将在master上复验同一组合态。须以 merge commit 落地(
gh pr merge --merge),严禁 squash / rebase——feature/1.x.x含 #136 的血缘收编提交(fddf9ca以-s ours记录 #134 / #135 的 head commit),squash 会重写整条 SHA 链。🤖 Generated with Claude Code