Skip to content

fix: respect user opt-out when adding overrides (#24123) (CP: 25.1)#24125

Merged
vaadin-bot merged 1 commit into25.1from
cherry-pick-24123-to-25.1-1776251455453
Apr 15, 2026
Merged

fix: respect user opt-out when adding overrides (#24123) (CP: 25.1)#24125
vaadin-bot merged 1 commit into25.1from
cherry-pick-24123-to-25.1-1776251455453

Conversation

@vaadin-bot
Copy link
Copy Markdown
Collaborator

This PR cherry-picks changes from the original PR #24123 to branch 25.1.

Original PR description

Adjust the checks for user opt-out in package.json overrides, so that an existing override for new entries added by Vaadin is considered as an opt-out, so that the existing user value is kept. This behavior satisfies the previously existing NodeUpdatePackagesNpmVersionLockingTest.shouldNotUpdatesOverrides_whenHasUserModification
test.

Adjust the checks for user opt-out in package.json overrides, so that an
existing override for new entries added by Vaadin is considered as an
opt-out, so that the existing user value is kept. This behavior
satisfies the previously existing
`NodeUpdatePackagesNpmVersionLockingTest.shouldNotUpdatesOverrides_whenHasUserModification`
test.
@vaadin-bot
Copy link
Copy Markdown
Collaborator Author

This PR is eligible for auto-merging policy, so it has been approved automatically. If there are pending conditions, auto merge (with 'squash' method) has been enabled for this PR [Message is sent from bot]

@vaadin-bot vaadin-bot enabled auto-merge (squash) April 15, 2026 11:20
@sonarqubecloud
Copy link
Copy Markdown

@github-actions
Copy link
Copy Markdown

Test Results

 1 387 files  ±0   1 387 suites  ±0   1h 16m 53s ⏱️ + 1m 24s
 9 990 tests ±0   9 919 ✅ ±0  71 💤 ±0  0 ❌ ±0 
10 463 runs  ±0  10 383 ✅ ±0  80 💤 ±0  0 ❌ ±0 

Results for commit 87a21b5. ± Comparison against base commit 30757e4.

@vaadin-bot vaadin-bot merged commit efe9060 into 25.1 Apr 15, 2026
29 checks passed
@vaadin-bot vaadin-bot deleted the cherry-pick-24123-to-25.1-1776251455453 branch April 15, 2026 11:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants