fix: dependabot 20260529#482
Merged
Merged
Conversation
--- updated-dependencies: - dependency-name: electron dependency-version: 42.1.0 dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>
Bumps [@babel/preset-env](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-env) from 7.29.2 to 7.29.5. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md) - [Commits](https://github.com/babel/babel/commits/v7.29.5/packages/babel-preset-env) --- updated-dependencies: - dependency-name: "@babel/preset-env" dependency-version: 7.29.5 dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
Bumps [electron-builder](https://github.com/electron-userland/electron-builder/tree/HEAD/packages/electron-builder) from 26.7.0 to 26.8.1. - [Release notes](https://github.com/electron-userland/electron-builder/releases) - [Changelog](https://github.com/electron-userland/electron-builder/blob/master/packages/electron-builder/CHANGELOG.md) - [Commits](https://github.com/electron-userland/electron-builder/commits/electron-builder@26.8.1/packages/electron-builder) --- updated-dependencies: - dependency-name: electron-builder dependency-version: 26.8.1 dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
Bumps [@sentry/electron](https://github.com/getsentry/sentry-electron) from 7.11.0 to 7.13.0. - [Release notes](https://github.com/getsentry/sentry-electron/releases) - [Changelog](https://github.com/getsentry/sentry-electron/blob/master/CHANGELOG.md) - [Commits](getsentry/sentry-electron@7.11.0...7.13.0) --- updated-dependencies: - dependency-name: "@sentry/electron" dependency-version: 7.13.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
Bumps the github-actions group with 1 update: [golangci/golangci-lint-action](https://github.com/golangci/golangci-lint-action). Updates `golangci/golangci-lint-action` from 9.2.0 to 9.2.1 - [Release notes](https://github.com/golangci/golangci-lint-action/releases) - [Commits](golangci/golangci-lint-action@1e7e51e...82606bf) --- updated-dependencies: - dependency-name: golangci/golangci-lint-action dependency-version: 9.2.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: github-actions ... Signed-off-by: dependabot[bot] <support@github.com>
…-actions-262b37236a' into fix/dependabot-20260529
…-42.1.0' into fix/dependabot-20260529
…eset-env-7.29.5' into fix/dependabot-20260529
…-builder-26.8.1' into fix/dependabot-20260529 # Conflicts: # package-lock.json # src/frontend/package.json
…lectron-7.13.0' into fix/dependabot-20260529 # Conflicts: # package-lock.json
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 subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Summary
Merged 5 dependabot PRs into the current branch (
fix/dependabot-20260529), oldest-to-newest:golangci-lint-action9.2.0 → 9.2.1 (workflow)electron41.2.1 → 42.1.0@babel/preset-env7.29.2 → 7.29.5electron-builder26.7.0 → 26.8.1@sentry/electron7.11.0 → 7.13.0Because all four npm PRs branched off
mainindependently and each touchedsrc/frontend/package.json+ the rootpackage-lock.json, the later ones conflicted. I resolved the manifest conflicts by hand (keeping each PR's own bump) and, rather than hand-editing the transitive-dependency blocks in the lock (risky), regeneratedpackage-lock.jsonwithnpm install --package-lock-onlyso npm computed the correct combined tree.