Skip to content

fix: respect user opt-out when adding overrides - #24123

Merged
mcollovati merged 2 commits into
mainfrom
fix/override-tests
Apr 15, 2026
Merged

mcollovati merged 2 commits into
mainfrom
fix/override-tests

Conversation

@platosha

@platosha platosha commented Apr 15, 2026 •

Copy link
Copy Markdown
Contributor

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.
@mcollovati
mcollovati enabled auto-merge April 15, 2026 10:43
@sonarqubecloud

Copy link
Copy Markdown

@github-actions

Copy link
Copy Markdown
Contributor

Test Results

 1 391 files  ±0   1 391 suites  ±0   1h 14m 49s ⏱️ +16s
 9 997 tests ±0   9 926 ✅ ±0  71 💤 ±0  0 ❌ ±0 
10 472 runs  ±0  10 392 ✅ ±0  80 💤 ±0  0 ❌ ±0 

Results for commit 1ad2796. ± Comparison against base commit 9f34b7a.

@mcollovati
mcollovati added this pull request to the merge queue Apr 15, 2026
Merged via the queue into main with commit 070e32c Apr 15, 2026
31 checks passed
@mcollovati
mcollovati deleted the fix/override-tests branch April 15, 2026 11:08
vaadin-bot pushed a commit that referenced this pull request Apr 15, 2026
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 added a commit that referenced this pull request Apr 15, 2026
…24125)

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.
>

Co-authored-by: Anton Platonov <anton@vaadin.com>
platosha added a commit that referenced this pull request Apr 23, 2026
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.

(cherry picked from commit 070e32c)
ZheSun88 pushed a commit that referenced this pull request Apr 24, 2026
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

This ticket/PR has been released with Vaadin 25.0.10.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants