Skip to content

Commit adbe290

Browse files
committed
fix: run npm install if folder changes (#14909)
If application folder changes we should execute npm install to get any folder references updated. Fixes #14908
1 parent 3a85d9d commit adbe290

2 files changed

Lines changed: 25 additions & 4 deletions

File tree

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

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,7 @@ && pinPlatformDependency(packageJson,
310310

311311
String oldHash = packageJson.getObject(VAADIN_DEP_KEY)
312312
.getString(HASH_KEY);
313-
String newHash = generatePackageJsonHash(packageJson);
313+
String newHash = generatePackageJsonHash(packageJson, npmFolder);
314314
// update packageJson hash value, if no changes it will not be written
315315
packageJson.getObject(VAADIN_DEP_KEY).put(HASH_KEY, newHash);
316316

@@ -499,9 +499,12 @@ private void deletePnpmLockFile() throws IOException {
499499
*
500500
* @param packageJson
501501
* JsonObject built in the same format as package.json
502+
* @param npmFolder
503+
* project base folder to use in hash
502504
* @return has for dependencies and devDependencies
503505
*/
504-
static String generatePackageJsonHash(JsonObject packageJson) {
506+
static String generatePackageJsonHash(JsonObject packageJson,
507+
File npmFolder) {
505508
StringBuilder hashContent = new StringBuilder();
506509
if (packageJson.hasKey(DEPENDENCIES)) {
507510
JsonObject dependencies = packageJson.getObject(DEPENDENCIES);
@@ -529,6 +532,10 @@ static String generatePackageJsonHash(JsonObject packageJson) {
529532
hashContent.append(sortedDevDependencies);
530533
hashContent.append("}");
531534
}
535+
if (hashContent.length() > 0) {
536+
hashContent.append("\n");
537+
}
538+
hashContent.append(npmFolder.getAbsolutePath());
532539
return StringUtil.getHash(hashContent.toString());
533540
}
534541

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

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -319,6 +319,20 @@ public void runNpmInstall_externalUpdateOfPackages_npmInstallIsRerun()
319319
Mockito.verify(logger).info(getRunningMsg());
320320
}
321321

322+
@Test
323+
public void differentNpmFolderName_returnsDifferentHash()
324+
throws IOException {
325+
final JsonObject packageJson = getNodeUpdater().getPackageJson();
326+
final String originalHash = TaskUpdatePackages
327+
.generatePackageJsonHash(packageJson, npmFolder);
328+
329+
final String newFolderHash = TaskUpdatePackages.generatePackageJsonHash(
330+
packageJson, new File(npmFolder, "change"));
331+
332+
Assert.assertNotEquals("Changing base folder should change hash value.",
333+
originalHash, newFolderHash);
334+
}
335+
322336
protected void setupEsbuildAndFooInstallation() throws IOException {
323337
File nodeModules = getNodeUpdater().nodeModulesFolder;
324338
nodeModules.mkdir();
@@ -441,8 +455,8 @@ public void updatePackageHash(JsonObject packageJson) {
441455
}
442456
packageJson.put(DEPENDENCIES, dependencies);
443457
packageJson.put(DEV_DEPENDENCIES, devDependencies);
444-
packageJson.getObject(VAADIN_DEP_KEY).put(HASH_KEY,
445-
TaskUpdatePackages.generatePackageJsonHash(packageJson));
458+
packageJson.getObject(VAADIN_DEP_KEY).put(HASH_KEY, TaskUpdatePackages
459+
.generatePackageJsonHash(packageJson, npmFolder));
446460
packageJson.remove(DEPENDENCIES);
447461
packageJson.remove(DEV_DEPENDENCIES);
448462
}

0 commit comments

Comments
 (0)