Skip to content

Commit 312025c

Browse files
vaadin-botArtur-
andauthored
fix: Do not downgrade es-version (#16474) (#16730)
Fixes #16305 Co-authored-by: Artur <artur@vaadin.com>
1 parent a6b028e commit 312025c

2 files changed

Lines changed: 45 additions & 1 deletion

File tree

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

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ private void ensureTarget(String esVersion) {
110110
String current = FileUtils.readFileToString(projectTsconfig,
111111
StandardCharsets.UTF_8);
112112
String currentEsVersion = getEsTargetVersion(current);
113-
if (!currentEsVersion.equals(esVersion)) {
113+
if (isOlder(currentEsVersion, esVersion)) {
114114
current = current.replace(currentEsVersion, esVersion);
115115
writeIfChanged(projectTsconfig, current);
116116
}
@@ -120,6 +120,13 @@ private void ensureTarget(String esVersion) {
120120
}
121121
}
122122

123+
static boolean isOlder(String esVersion1, String esVersion2) {
124+
if (esVersion1.startsWith("es") && esVersion2.startsWith("es")) {
125+
return esVersion1.compareTo(esVersion2) < 0;
126+
}
127+
return !esVersion1.equals(esVersion2);
128+
}
129+
123130
private String getDefaultEsTargetVersion() throws ExecutionFailedException {
124131
try {
125132
String defaultTsConfig = getFileContent();

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

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,32 @@ public void viteShouldUpgradeFromEs2019() throws Exception {
111111

112112
}
113113

114+
@Test
115+
public void viteShouldNotDowngradeFromEs2021() throws Exception {
116+
// Write a file with es2021
117+
taskGenerateTsConfig.execute();
118+
String content = IOUtils.toString(
119+
taskGenerateTsConfig.getGeneratedFile().toURI(),
120+
StandardCharsets.UTF_8);
121+
content = content.replace("es2020", "es2021");
122+
try (FileWriter fw = new FileWriter(
123+
taskGenerateTsConfig.getGeneratedFile(),
124+
StandardCharsets.UTF_8)) {
125+
fw.write(content);
126+
}
127+
Assert.assertTrue("The config file should use es2021", IOUtils
128+
.toString(taskGenerateTsConfig.getGeneratedFile().toURI(),
129+
StandardCharsets.UTF_8)
130+
.contains("\"target\": \"es2021\""));
131+
taskGenerateTsConfig.execute();
132+
Assert.assertTrue("Vite should not have changed the config file",
133+
IOUtils.toString(
134+
taskGenerateTsConfig.getGeneratedFile().toURI(),
135+
StandardCharsets.UTF_8)
136+
.contains("\"target\": \"es2021\""));
137+
138+
}
139+
114140
@Test
115141
public void should_notGenerateTsConfig_TsConfigExist() throws Exception {
116142
Files.createFile(new File(npmFolder, "tsconfig.json").toPath());
@@ -221,4 +247,15 @@ private File writeTestTsConfigContent(String s) throws IOException {
221247
FileUtils.writeStringToFile(tsconfig, content, UTF_8);
222248
return tsconfig;
223249
}
250+
251+
@Test
252+
public void testIsOlder() {
253+
Assert.assertTrue(TaskGenerateTsConfig.isOlder("es2019", "es2020"));
254+
Assert.assertTrue(TaskGenerateTsConfig.isOlder("es2020", "es2021"));
255+
Assert.assertFalse(TaskGenerateTsConfig.isOlder("es2020", "es2020"));
256+
Assert.assertFalse(TaskGenerateTsConfig.isOlder("es2020", "es2019"));
257+
Assert.assertFalse(TaskGenerateTsConfig.isOlder("es2021", "es2019"));
258+
259+
Assert.assertTrue(TaskGenerateTsConfig.isOlder("2019", "2021"));
260+
}
224261
}

0 commit comments

Comments
 (0)