Skip to content

[WIP] Fix npm EOVERRIDE conflict when upgrading vaadin.version #24213

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Codex wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

[WIP] Fix npm EOVERRIDE conflict when upgrading vaadin.version #24213

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1d67082
Initial plan
Codex Apr 28, 2026
f6e84b3
Fix stale Vaadin npm overrides when dependencies bump
Codex Apr 28, 2026
fc6da0c
Merge branch 'main' into codex/fix-npm-eoverride-conflict
platosha May 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions flow-build-tools/src/main/java/com/vaadin/flow/server/frontend/TaskUpdatePackages.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,11 +157,6 @@ boolean lockVersionForNpm(ObjectNode packageJson) throws IOException {
// Already locked with a dependency reference, skip
continue;
}
if (dependencies.has(dependency)
|| devDependencies.has(dependency)) {
// Skip platform overrides for existing dependencies
continue;
}
// Lock with a version number
vaadinOverrides.put(dependency,
frontendVersion.getFullVersion());
Expand Down
27 changes: 27 additions & 0 deletions ...rc/test/java/com/vaadin/flow/server/frontend/NodeUpdatePackagesNpmVersionLockingTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,33 @@ void shouldNotUpdatesOverrides_whenHasUserModification()
packageJson.get(OVERRIDES).get(TEST_DEPENDENCY).stringValue());
}

@Test
void shouldUpdatePlatformOverride_whenDependencyVersionBumped()
throws IOException {
TaskUpdatePackages packageUpdater = createPackageUpdater();

// Simulate existing platform override from a previous Flow version
ObjectNode packageJson = packageUpdater.getPackageJson();
ObjectNode overridesSection = JacksonUtils.createObjectNode();
packageJson.set(OVERRIDES, overridesSection);

((ObjectNode) packageJson.get(DEPENDENCIES)).put(TEST_DEPENDENCY,
PLATFORM_PINNED_DEPENDENCY_VERSION);
overridesSection.put(TEST_DEPENDENCY, "0.0.1");

// vaadin.overrides tracks what Flow last wrote
ObjectNode vaadinSection = (ObjectNode) packageJson.get(VAADIN_DEP_KEY);
vaadinSection.set(OVERRIDES, JacksonUtils.createObjectNode()
.put(TEST_DEPENDENCY, "0.0.1"));

packageUpdater.generateVersionsJson(packageJson);
packageUpdater.lockVersionForNpm(packageJson);

// Override is updated to the new platform version
assertEquals(PLATFORM_PINNED_DEPENDENCY_VERSION,
packageJson.get(OVERRIDES).get(TEST_DEPENDENCY).stringValue());
}

@Test
void shouldUpdatesOverrides_whenNoVaadinOverrides_changingVersion()
throws IOException {
Expand Down
Loading