Skip to content

fix: add package.json overrides for workbox dependencies (#24008) (CP: 24.10)#24163

Merged
ZheSun88 merged 5 commits into24.10from
cp/24.10-24008
Apr 23, 2026
Merged

fix: add package.json overrides for workbox dependencies (#24008) (CP: 24.10)#24163
ZheSun88 merged 5 commits into24.10from
cp/24.10-24008

Conversation

@platosha
Copy link
Copy Markdown
Contributor

  • Add PwaConfiguration parameter to TaskUpdateVite constructor
  • Remove service worker plugin and its imports from vite.generated.ts
    when offline build is not enabled
  • Use FrontendDependenciesScanner in TaskGeneratePackageJson to generate
    correct dev dependencies
  • Enhance TaskUpdatePackages for proper override handling
  • Move all workbox dependencies to workbox/package.json and only add
    when offline sw build is needed
  • Add overrides for workbox dependencies to package.json
  • Add overrides support to NodeUpdater
  • Remove empty vaadin.overrides from package.json

(cherry picked from commit 90eb196)

…: 24.10)

- Add PwaConfiguration parameter to TaskUpdateVite constructor
- Remove service worker plugin and its imports from vite.generated.ts
when offline build is not enabled
- Use FrontendDependenciesScanner in TaskGeneratePackageJson to generate
correct dev dependencies
- Enhance TaskUpdatePackages for proper override handling
- Move all workbox dependencies to `workbox/package.json` and only add
when offline sw build is needed
- Add overrides for workbox dependencies to package.json
- Add overrides support to NodeUpdater
- Remove empty vaadin.overrides from package.json

(cherry picked from commit 90eb196)
@github-actions
Copy link
Copy Markdown

github-actions Bot commented Apr 22, 2026

Test Results

1 287 files  ± 0  1 287 suites  ±0   1h 9m 29s ⏱️ - 6m 11s
8 892 tests +53  8 830 ✅ +53  62 💤 ±0  0 ❌ ±0 
9 207 runs  +32  9 137 ✅ +31  70 💤 +1  0 ❌ ±0 

Results for commit 92f65fc. ± Comparison against base commit 51fa0f4.

♻️ This comment has been updated with latest results.

platosha and others added 4 commits April 23, 2026 14:04
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)
… (CP: 24.10)

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

(cherry picked from commit 2d312d2)
@sonarqubecloud
Copy link
Copy Markdown

@ZheSun88 ZheSun88 merged commit f7fe6ac into 24.10 Apr 23, 2026
28 checks passed
@ZheSun88 ZheSun88 deleted the cp/24.10-24008 branch April 23, 2026 13:20
@vaadin-bot
Copy link
Copy Markdown
Collaborator

Hi @platosha and @ZheSun88, when i performed cherry-pick to this commit to 24.9, i have encountered the following issue. Can you take a look and pick it manually?
Error Message:
Error: Command failed: git cherry-pick f7fe6ac
error: could not apply f7fe6ac... fix: add package.json overrides for workbox dependencies (#24008) (CP: 24.10) (#24163)
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".

@ZheSun88
Copy link
Copy Markdown
Contributor

cp 24.9 : #24176

platosha added a commit that referenced this pull request Apr 24, 2026
…4163) (CP:24.9) (#24176)

- Add PwaConfiguration parameter to TaskUpdateVite constructor
- Remove service worker plugin and its imports from vite.generated.ts
when offline build is not enabled
- Use FrontendDependenciesScanner in TaskGeneratePackageJson to generate
correct dev dependencies
- Enhance TaskUpdatePackages for proper override handling
- Move all workbox dependencies to `workbox/package.json` and only add
when offline sw build is needed
- Add overrides for workbox dependencies to package.json
- Add overrides support to NodeUpdater
- Remove empty vaadin.overrides from package.json

(cherry picked from commit 90eb196)

Co-authored-by: Anton Platonov <anton@vaadin.com>
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