Merge pull request quarkusio#41875 from phillip-kruger/importmap-update

Update importmap to 1.0.11
jacobdotcosta · Jul 16, 2024 · a52fa86 · a52fa86
2 parents a539f55 + 4694e5a
commit a52fa86
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/bom/application/pom.xml b/bom/application/pom.xml
@@ -220,7 +220,7 @@
         <!-- keep in-sync, if possible, with Micrometer registry Prometheus -->
         <prometheus.version>0.16.0</prometheus.version>
         <!-- Dev UI -->
-        <importmap.version>1.0.10</importmap.version>
+        <importmap.version>1.0.11</importmap.version>
     </properties>
 
     <dependencyManagement>

diff --git a/...-http/deployment/src/main/java/io/quarkus/devui/deployment/BuildTimeContentProcessor.java b/...-http/deployment/src/main/java/io/quarkus/devui/deployment/BuildTimeContentProcessor.java
@@ -45,6 +45,7 @@
 
 import io.mvnpm.importmap.Aggregator;
 import io.mvnpm.importmap.Location;
+import io.mvnpm.importmap.model.Imports;
 import io.quarkus.bootstrap.model.ApplicationModel;
 import io.quarkus.builder.Version;
 import io.quarkus.deployment.IsDevelopment;
@@ -340,8 +341,8 @@ QuteTemplateBuildItem createIndexHtmlTemplate(
             aggregator.addMappings(importMap);
         }
 
-        Map<String, String> currentImportMap = aggregator.aggregate(nonApplicationRootPathBuildItem.getNonApplicationRootPath())
-                .getImports();
+        Imports imports = aggregator.aggregate(nonApplicationRootPathBuildItem.getNonApplicationRootPath());
+        Map<String, String> currentImportMap = imports.getImports();
         Map<String, String> relocationMap = relocationImportMapBuildItem.getRelocationMap();
         for (Map.Entry<String, String> relocation : relocationMap.entrySet()) {
             String from = relocation.getKey();
@@ -356,7 +357,7 @@ QuteTemplateBuildItem createIndexHtmlTemplate(
         }
 
         String esModuleShimsVersion = extractEsModuleShimsVersion(mvnpmBuildItem.getMvnpmJars());
-        String importmap = aggregator.aggregateAsJson(nonApplicationRootPathBuildItem.getNonApplicationRootPath());
+        String importmap = aggregator.aggregateAsJson(imports);
         aggregator.reset();
 
         String themeVars = themeVarsBuildItem.getTemplateValue();