Skip to content

Commit f1afc96

Browse files
authored
fix: consider theme variants from JAR in bundleImports (#18248)
BundleUtil computes import paths for component theme variants from npm packages, but it does not consider variants from JAR add-ons. This change applies the same import rules for both variants from npm packages and JAR unpacked in the fronted generated folder. Fixes #18245
1 parent 8de5cd8 commit f1afc96

2 files changed

Lines changed: 18 additions & 0 deletions

File tree

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
import elemental.json.Json;
3838
import elemental.json.JsonArray;
3939
import elemental.json.JsonObject;
40+
4041
import static com.vaadin.flow.server.Constants.DEV_BUNDLE_JAR_PATH;
4142

4243
public final class BundleUtils {
@@ -64,6 +65,9 @@ public static Set<String> loadBundleImports() {
6465
bundledImports.add(jsImport);
6566
bundledImports.add(jsImport.replace("/theme/lumo/", "/src/"));
6667
bundledImports.add(jsImport.replace("/theme/material/", "/src/"));
68+
bundledImports.add(jsImport.replaceFirst(
69+
"^Frontend/generated/jar-resources/theme/(lumo|material)/",
70+
"./src/"));
6771
bundledImports.add(jsImport
6872
.replaceFirst("^Frontend/generated/jar-resources/", "./"));
6973
bundledImports.add(jsImport

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import elemental.json.Json;
2424
import elemental.json.JsonArray;
2525
import elemental.json.JsonObject;
26+
2627
import static com.vaadin.flow.server.Constants.DEV_BUNDLE_JAR_PATH;
2728

2829
public class BundleUtilsTest {
@@ -82,6 +83,19 @@ public void themeVariantsHandled() {
8283
Assert.assertTrue(bundleImports.contains("@foo/bar/src/file.js"));
8384
}
8485

86+
@Test
87+
public void themeVariantsFromJarHandled() {
88+
mockStatsJson("Frontend/generated/jar-resources/theme/lumo/file.js",
89+
"Frontend/generated/jar-resources/theme/material/file.js");
90+
Set<String> bundleImports = BundleUtils.loadBundleImports();
91+
92+
Assert.assertTrue(bundleImports.contains(
93+
"Frontend/generated/jar-resources/theme/lumo/file.js"));
94+
Assert.assertTrue(bundleImports.contains(
95+
"Frontend/generated/jar-resources/theme/material/file.js"));
96+
Assert.assertTrue(bundleImports.contains("./src/file.js"));
97+
}
98+
8599
private void mockStatsJson(String... imports) {
86100
JsonObject statsJson = Json.createObject();
87101
JsonArray importsArray = Json.createArray();

0 commit comments

Comments
 (0)