From e865e74eb051379d1e0c8edd69c5068677c73107 Mon Sep 17 00:00:00 2001
From: Jon Koops <jonkoops@gmail.com>
Date: Wed, 27 Nov 2024 16:23:33 +0100
Subject: [PATCH] Build JavaScript projects in parallel from root POM

Closes #35365

Signed-off-by: Jon Koops <jonkoops@gmail.com>
---
 js/apps/account-ui/pom.xml  |  6 ++-
 js/apps/admin-ui/pom.xml    |  6 ++-
 js/libs/keycloak-js/pom.xml |  5 ---
 js/package.json             | 12 +++++-
 js/pom.xml                  | 77 ++++++++++++++++++++++++-------------
 js/themes-vendor/pom.xml    |  6 ++-
 pom.xml                     |  4 +-
 7 files changed, 76 insertions(+), 40 deletions(-)

diff --git a/js/apps/account-ui/pom.xml b/js/apps/account-ui/pom.xml
index f4e6756b058e..82379674225d 100644
--- a/js/apps/account-ui/pom.xml
+++ b/js/apps/account-ui/pom.xml
@@ -91,8 +91,10 @@
         </resources>
         <plugins>
             <plugin>
-                <groupId>com.github.eirslett</groupId>
-                <artifactId>frontend-maven-plugin</artifactId>
+                <artifactId>maven-clean-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
             </plugin>
         </plugins>
     </build>
diff --git a/js/apps/admin-ui/pom.xml b/js/apps/admin-ui/pom.xml
index e32f32b9c681..e2f209d4615b 100644
--- a/js/apps/admin-ui/pom.xml
+++ b/js/apps/admin-ui/pom.xml
@@ -91,8 +91,10 @@
         </resources>
         <plugins>
             <plugin>
-                <groupId>com.github.eirslett</groupId>
-                <artifactId>frontend-maven-plugin</artifactId>
+                <artifactId>maven-clean-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
             </plugin>
         </plugins>
     </build>
diff --git a/js/libs/keycloak-js/pom.xml b/js/libs/keycloak-js/pom.xml
index b45f039eb381..68906bf6a463 100644
--- a/js/libs/keycloak-js/pom.xml
+++ b/js/libs/keycloak-js/pom.xml
@@ -42,11 +42,6 @@
                         <groupId>com.github.eirslett</groupId>
                         <artifactId>frontend-maven-plugin</artifactId>
                         <executions>
-                            <execution>
-                                <!-- Skip execution of build with an empty phase. -->
-                                <id>pnpm-build</id>
-                                <phase/>
-                            </execution>
                             <execution>
                                 <id>pnpm-pack</id>
                                 <phase>package</phase>
diff --git a/js/package.json b/js/package.json
index ad2372061d0e..5280bfc1722c 100644
--- a/js/package.json
+++ b/js/package.json
@@ -4,7 +4,17 @@
   "type": "module",
   "packageManager": "pnpm@9.14.4+sha512.c8180b3fbe4e4bca02c94234717896b5529740a6cbadf19fa78254270403ea2f27d4e1d46a08a0f56c89b63dc8ebfd3ee53326da720273794e6200fcf0d184ab",
   "scripts": {
-    "prepare": "cd .. && husky js/.husky"
+    "prepare": "cd .. && husky js/.husky",
+    "build": "wireit"
+  },
+  "wireit": {
+    "build": {
+      "dependencies": [
+        "./apps/account-ui:build",
+        "./apps/admin-ui:build",
+        "./themes-vendor:build"
+      ]
+    }
   },
   "devDependencies": {
     "@eslint/compat": "^1.2.3",
diff --git a/js/pom.xml b/js/pom.xml
index 5d3f48400e83..759478d51c5e 100644
--- a/js/pom.xml
+++ b/js/pom.xml
@@ -38,32 +38,6 @@
                     <groupId>com.github.eirslett</groupId>
                     <artifactId>frontend-maven-plugin</artifactId>
                     <version>${frontend.plugin.version}</version>
-                    <executions>
-                        <execution>
-                            <goals>
-                                <goal>install-node-and-pnpm</goal>
-                            </goals>
-                        </execution>
-                        <execution>
-                            <id>pnpm-install</id>
-                            <goals>
-                                <goal>pnpm</goal>
-                            </goals>
-                            <configuration>
-                                <arguments>install --prefer-offline --frozen-lockfile --ignore-scripts</arguments>
-                                <workingDirectory>${maven.multiModuleProjectDirectory}/js</workingDirectory>
-                            </configuration>
-                        </execution>
-                        <execution>
-                            <id>pnpm-build</id>
-                            <goals>
-                                <goal>pnpm</goal>
-                            </goals>
-                            <configuration>
-                                <arguments>build</arguments>
-                            </configuration>
-                        </execution>
-                    </executions>
                     <configuration>
                         <nodeVersion>${node.version}</nodeVersion>
                         <pnpmVersion>${pnpm.version}</pnpmVersion>
@@ -73,5 +47,56 @@
                 </plugin>
             </plugins>
         </pluginManagement>
+
+        <plugins>
+            <plugin>
+                <!-- Clean child modules from parent, as we trigger the build here for parallelization. -->
+                <artifactId>maven-clean-plugin</artifactId>
+                <configuration>
+                    <filesets>
+                        <fileset>
+                            <directory>apps/account-ui/target</directory>
+                        </fileset>
+                        <fileset>
+                            <directory>apps/admin-ui/target</directory>
+                        </fileset>
+                        <fileset>
+                            <directory>themes-vendor/target</directory>
+                        </fileset>
+                    </filesets>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>com.github.eirslett</groupId>
+                <artifactId>frontend-maven-plugin</artifactId>
+                <version>${frontend.plugin.version}</version>
+                <inherited>false</inherited>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>install-node-and-pnpm</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>pnpm-install</id>
+                        <goals>
+                            <goal>pnpm</goal>
+                        </goals>
+                        <configuration>
+                            <arguments>install --prefer-offline --frozen-lockfile --ignore-scripts</arguments>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>pnpm-build</id>
+                        <goals>
+                            <goal>pnpm</goal>
+                        </goals>
+                        <configuration>
+                            <arguments>build</arguments>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
     </build>
 </project>
diff --git a/js/themes-vendor/pom.xml b/js/themes-vendor/pom.xml
index 94a22c9c24a9..98e72f13ae1e 100755
--- a/js/themes-vendor/pom.xml
+++ b/js/themes-vendor/pom.xml
@@ -20,8 +20,10 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>com.github.eirslett</groupId>
-                <artifactId>frontend-maven-plugin</artifactId>
+                <artifactId>maven-clean-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
             </plugin>
             <plugin>
                 <artifactId>maven-resources-plugin</artifactId>
diff --git a/pom.xml b/pom.xml
index 291bf1c6aba0..098e1bbe97ab 100644
--- a/pom.xml
+++ b/pom.xml
@@ -195,7 +195,7 @@
         <wildfly.plugin.version>5.0.0.Final</wildfly.plugin.version>
         <nexus.staging.plugin.version>1.6.13</nexus.staging.plugin.version>
         <nexus3.staging.plugin.version>1.0.7</nexus3.staging.plugin.version>
-        <frontend.plugin.version>1.15.0</frontend.plugin.version>
+        <frontend.plugin.version>1.15.1</frontend.plugin.version>
         <docker.maven.plugin.version>0.40.3</docker.maven.plugin.version>
         <verifier.plugin.version>1.1</verifier.plugin.version>
         <shade.plugin.version>3.4.1</shade.plugin.version>
@@ -1035,7 +1035,7 @@
                 <version>${project.version}</version>
                 <type>zip</type>
             </dependency>
-           <dependency>
+            <dependency>
                 <groupId>org.keycloak</groupId>
                 <artifactId>keycloak-saml-wildfly-subsystem</artifactId>
                 <version>${project.version}</version>