From 3331aa56f8f2cc12e76479090aebc1e9ed3d1edd Mon Sep 17 00:00:00 2001 From: Wikum Weerakutti Date: Fri, 2 Aug 2024 18:26:30 +0530 Subject: [PATCH] O3-3437: Update SDK to bundle SPA frontend into WAR --- .../main/java/org/openmrs/maven/plugins/BuildDistro.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maven-plugin/src/main/java/org/openmrs/maven/plugins/BuildDistro.java b/maven-plugin/src/main/java/org/openmrs/maven/plugins/BuildDistro.java index 40f3ccf2..2318cb73 100644 --- a/maven-plugin/src/main/java/org/openmrs/maven/plugins/BuildDistro.java +++ b/maven-plugin/src/main/java/org/openmrs/maven/plugins/BuildDistro.java @@ -286,6 +286,12 @@ private String buildDistro(File targetDirectory, Artifact distroArtifact, Distro owasDir.mkdir(); downloadOWAs(targetDirectory, distroProperties, owasDir); + spaInstaller.installFromDistroProperties(tempDir, distroProperties, ignorePeerDependencies, overrideReuseNodeCache); + File frontendDir = new File(tempDir, "frontend"); + if(frontendDir.exists()) { + frontendDir.renameTo(new File(tempDir, "bundledFrontend")); + } + warfile.addFolder(tempDir, new ZipParameters()); try { FileUtils.deleteDirectory(tempDir);