Repository navigation
build(deps): combine dependabot #418 and #425 - #426
Merged
Merged
Conversation
…h 2 updates Bumps the patch-deps-updates group with 2 updates in the / directory: [@fastify/websocket](https://github.com/fastify/fastify-websocket) and [vite-plugin-dts](https://github.com/qmhc/unplugin-dts/tree/HEAD/packages/vite-plugin-dts). Updates `@fastify/websocket` from 11.3.1 to 11.3.3 - [Release notes](https://github.com/fastify/fastify-websocket/releases) - [Commits](fastify/fastify-websocket@v11.3.1...v11.3.3) Updates `vite-plugin-dts` from 5.1.1 to 5.1.2 - [Release notes](https://github.com/qmhc/unplugin-dts/releases) - [Changelog](https://github.com/qmhc/unplugin-dts/blob/main/packages/vite-plugin-dts/CHANGELOG.md) - [Commits](https://github.com/qmhc/unplugin-dts/commits/vite-plugin-dts@5.1.2/packages/vite-plugin-dts) --- updated-dependencies: - dependency-name: "@fastify/websocket" dependency-version: 11.3.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: patch-deps-updates - dependency-name: vite-plugin-dts dependency-version: 5.1.2 dependency-type: direct:development update-type: version-update:semver-patch dependency-group: patch-deps-updates ... Signed-off-by: dependabot[bot] <support@github.com>
…h 3 updates Bumps the minor-deps-updates group with 3 updates in the / directory: [eslint](https://github.com/eslint/eslint), [shell-quote](https://github.com/ljharb/shell-quote) and [rollup](https://github.com/rollup/rollup). Updates `eslint` from 10.11.0 to 10.12.0 - [Release notes](https://github.com/eslint/eslint/releases) - [Commits](eslint/eslint@v10.11.0...v10.12.0) Updates `shell-quote` from 1.10.0 to 1.12.0 - [Changelog](https://github.com/ljharb/shell-quote/blob/main/CHANGELOG.md) - [Commits](ljharb/shell-quote@v1.10.0...v1.12.0) Updates `rollup` from 4.63.5 to 4.64.0 - [Release notes](https://github.com/rollup/rollup/releases) - [Changelog](https://github.com/rollup/rollup/blob/master/CHANGELOG.md) - [Commits](rollup/rollup@v4.63.5...v4.64.0) --- updated-dependencies: - dependency-name: eslint dependency-version: 10.12.0 dependency-type: direct:development update-type: version-update:semver-minor dependency-group: minor-deps-updates - dependency-name: rollup dependency-version: 4.64.0 dependency-type: direct:development update-type: version-update:semver-minor dependency-group: minor-deps-updates - dependency-name: shell-quote dependency-version: 1.12.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: minor-deps-updates ... Signed-off-by: dependabot[bot] <support@github.com>
Both PRs rewrite pnpm-lock.yaml, so merging one conflicts the other. Regenerated the lockfile with pnpm instead of hand-merging so it keeps main's shape: - @fastify/websocket 11.3.1 -> 11.3.3 - vite-plugin-dts (patch) - eslint 10.11.0 -> 10.12.0 - rollup 4.63.5 -> 4.64.0 - shell-quote 1.10.0 -> 1.12.0 No package.json ranges change. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
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
1 participant
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.
Combines #418 and #425 into one PR. Both only rewrite
pnpm-lock.yaml, so merging either one conflicts the other.@fastify/websocketvite-plugin-dtseslintrollupshell-quoteNo
package.jsonrange changes, so no changeset: every new version is already inside the existing ranges, and published consumers resolve them today.How the lockfile was built
Started from #418's lockfile and applied #425's bumps with
pnpm update -r --no-saverather than hand-merging the conflict.npm-run-allwas then pointed atshell-quote1.12.0 so only one copy remains, matching #425. The result keepsmain's lockfile shape: the Dependabot versions split hundreds of entries into per-supports-colorpeer variants, which is why the diff here (+397/-628) is much smaller than either original PR.pnpm dedupewas deliberately not run, since it also bumps webdriverio and the@wdio/*packages, which is out of scope.shell-quoteis the only bump in runtime code: the backend uses itsparse/quoteto build rerun commands. 1.12 only adds parsing for shell constructs (here-documents,>(),;;&) that test launch commands do not use, and the backend runner tests pass.Verification
Run locally on this branch:
pnpm install --frozen-lockfile: passpnpm lint: pass, 0 errors (all warnings are existing ones, none in code these bumps touch)pnpm -r build: passpnpm typecheck: passpnpm test: 191 files, 2509 tests passedpnpm test:uiwas not run locally; it runs in CI on this PR.Closes #418
Closes #425
🤖 Generated with Claude Code