Skip to content

Commit 95058c4

Browse files
fix: install all packages from versions.json also when using pnpm (#12787)
Fixes #12834
1 parent 4155088 commit 95058c4

2 files changed

Lines changed: 41 additions & 25 deletions

File tree

‎flow-server/src/main/java/com/vaadin/flow/server/frontend/TaskUpdatePackages.java‎

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -221,24 +221,22 @@ private boolean updatePackageJsonDependencies(JsonObject packageJson,
221221
}
222222

223223
/*
224-
* #10572 lock all platform internal versions for npm
224+
* #10572 lock all platform internal versions
225225
*/
226226
List<String> pinnedPlatformDependencies = new ArrayList<>();
227-
if (!enablePnpm) {
228-
final JsonObject platformPinnedDependencies = getPlatformPinnedDependencies();
229-
if (platformPinnedDependencies != null) {
230-
for (String key : platformPinnedDependencies.keys()) {
231-
// need to double check that not overriding a scanned
232-
// dependency since add-ons should be able to downgrade
233-
// version through exclusion
234-
if (!applicationDependencies.containsKey(key)
235-
&& pinPlatformDependency(packageJson,
236-
platformPinnedDependencies, key)) {
237-
added++;
238-
}
239-
// make sure platform pinned dependency is not cleared
240-
pinnedPlatformDependencies.add(key);
227+
final JsonObject platformPinnedDependencies = getPlatformPinnedDependencies();
228+
if (platformPinnedDependencies != null) {
229+
for (String key : platformPinnedDependencies.keys()) {
230+
// need to double check that not overriding a scanned
231+
// dependency since add-ons should be able to downgrade
232+
// version through exclusion
233+
if (!applicationDependencies.containsKey(key)
234+
&& pinPlatformDependency(packageJson,
235+
platformPinnedDependencies, key)) {
236+
added++;
241237
}
238+
// make sure platform pinned dependency is not cleared
239+
pinnedPlatformDependencies.add(key);
242240
}
243241
}
244242

‎flow-server/src/test/java/com/vaadin/flow/server/frontend/TaskUpdatePackagesNpmTest.java‎

Lines changed: 28 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,11 @@
1818

1919
import java.io.File;
2020
import java.io.IOException;
21+
import java.net.MalformedURLException;
2122
import java.nio.charset.StandardCharsets;
2223
import java.util.ArrayList;
2324
import java.util.Arrays;
25+
import java.util.Collections;
2426
import java.util.HashMap;
2527
import java.util.LinkedHashMap;
2628
import java.util.LinkedHashSet;
@@ -31,7 +33,6 @@
3133
import org.apache.commons.io.FileUtils;
3234
import org.junit.Assert;
3335
import org.junit.Before;
34-
import org.junit.Ignore;
3536
import org.junit.Rule;
3637
import org.junit.Test;
3738
import org.junit.rules.ExpectedException;
@@ -219,17 +220,15 @@ public void npmIsInUse_platformVersionsJsonAdded_versionsPinned()
219220
}
220221

221222
@Test
222-
@Ignore
223-
public void npmIsInUse_switchToPnpm_pinnedVersionsDeleted()
223+
public void pnpmIsInUse_platformVersionsJsonAdded_dependenciesAdded()
224224
throws IOException {
225-
runTestWithoutPreexistingPackageJson();
226-
final TaskUpdatePackages task = createTask(
227-
createApplicationDependencies(), true);
228-
task.execute();
229-
Assert.assertTrue("Updates not picked", task.modified);
225+
verifyPlatformDependenciesAreAdded(true);
226+
}
230227

231-
// only the application dependency should stay
232-
verifyVersions(PLATFORM_DIALOG_VERSION, null, null);
228+
@Test
229+
public void npmIsInUse_platformVersionsJsonAdded_dependenciesAdded()
230+
throws IOException {
231+
verifyPlatformDependenciesAreAdded(false);
233232
}
234233

235234
@Test
@@ -569,4 +568,23 @@ private void verifyVersionLockingWithNpmOverrides(boolean hasDialogLocking,
569568
}
570569
}
571570

571+
private void verifyPlatformDependenciesAreAdded(boolean enablePnpm)
572+
throws MalformedURLException, IOException {
573+
Mockito.when(finder.getResource(Constants.VAADIN_VERSIONS_JSON))
574+
.thenReturn(versionJsonFile.toURI().toURL());
575+
final String newVersion = "20.0.0";
576+
createVaadinVersionsJson(newVersion, newVersion, newVersion);
577+
578+
final Map<String, String> applicationDependencies = Collections
579+
.emptyMap();
580+
final TaskUpdatePackages task = createTask(applicationDependencies,
581+
enablePnpm);
582+
583+
verifyVersions(null, null, null);
584+
585+
task.execute();
586+
587+
verifyVersions(newVersion, newVersion, newVersion);
588+
}
589+
572590
}

0 commit comments

Comments
 (0)