Skip to content

fix(flow-build-tools): re-enable upgrading override versions#24137

Merged
mcollovati merged 2 commits intomainfrom
fix/override-old-package-json
Apr 17, 2026
Merged

fix(flow-build-tools): re-enable upgrading override versions#24137
mcollovati merged 2 commits intomainfrom
fix/override-old-package-json

Conversation

@platosha
Copy link
Copy Markdown
Contributor

@platosha platosha commented Apr 16, 2026 •
edited
Loading

Adjust user opt-out override detection for package.json without explicitly stored previous Vaadin overrides to still upgrade old override versions of Vaadin managed dependencies.

Fixes the build issues for https://github.com/vaadin/patient-portal-demo-flow

@platosha
fix(flow-build-tools): re-enable upgrading override versions
eae69eb 
Adjust user opt-out override detection for `package.json` without explicitly
stored previous Vaadin overrides to still upgrade old override versions
of Vaadin managed dependencies.

Fixes the build issues for https://github.com/vaadin/patient-portal-demo-flow
@platosha platosha requested a review from mcollovati April 16, 2026 13:07
@sonarqubecloud
Copy link
Copy Markdown

sonarqubecloud bot commented Apr 16, 2026

Quality Gate Passed Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

@github-actions
Copy link
Copy Markdown

github-actions bot commented Apr 16, 2026

Test Results

 1 391 files  ±0   1 391 suites  ±0   1h 15m 12s ⏱️ + 1m 2s
 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 48af301. ± Comparison against base commit 3598abb.

@mcollovati
Copy link
Copy Markdown
Collaborator

mcollovati commented Apr 16, 2026

Should be picked to 25.0 as well?

@mcollovati mcollovati added the target/25.0 Cherry-pick to 25.0 branch label Apr 17, 2026
@mcollovati mcollovati added this pull request to the merge queue Apr 17, 2026
Merged via the queue into main with commit 2d312d2 Apr 17, 2026
31 checks passed
@mcollovati mcollovati deleted the fix/override-old-package-json branch April 17, 2026 06:20
vaadin-bot pushed a commit that referenced this pull request Apr 17, 2026
@platosha @vaadin-bot
fix(flow-build-tools): re-enable upgrading override versions (#24137)
6e6ca41 
Adjust user opt-out override detection for `package.json` without
explicitly stored previous Vaadin overrides to still upgrade old
override versions of Vaadin managed dependencies.

Fixes the build issues for
https://github.com/vaadin/patient-portal-demo-flow
@vaadin-bot vaadin-bot mentioned this pull request Apr 17, 2026
Merged
@vaadin-bot
Copy link
Copy Markdown
Collaborator

vaadin-bot commented Apr 17, 2026

Hi @platosha and @mcollovati, when i performed cherry-pick to this commit to 25.0, i have encountered the following issue. Can you take a look and pick it manually?
Error Message:
Error: Command failed: git cherry-pick 2d312d2
error: could not apply 2d312d2... fix(flow-build-tools): re-enable upgrading override versions (#24137)
hint: After resolving the conflicts, mark them with
hint: "git add/rm ", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".

vaadin-bot added a commit that referenced this pull request Apr 17, 2026
@vaadin-bot @platosha
fix(flow-build-tools): re-enable upgrading override versions (#24137)…
227ab62 
… (CP: 25.1) (#24138)

This PR cherry-picks changes from the original PR #24137 to branch 25.1.
---
#### Original PR description
> Adjust user opt-out override detection for `package.json` without
explicitly stored previous Vaadin overrides to still upgrade old
override versions of Vaadin managed dependencies.
> 
> Fixes the build issues for
https://github.com/vaadin/patient-portal-demo-flow
>

Co-authored-by: Anton Platonov <anton@vaadin.com>
@mcollovati mcollovati removed target/25.0 Cherry-pick to 25.0 branch need to pick manually 25.0 labels Apr 17, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@mcollovati mcollovati mcollovati approved these changes

Assignees

No one assigned

Labels

cherry-picked-25.1 target/25.1 +0.0.1

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@platosha @mcollovati @vaadin-bot