From 2b35b4430c68bc00073ed52bfb7d03ed5f47ce34 Mon Sep 17 00:00:00 2001
From: Jon Koops <jonkoops@gmail.com>
Date: Wed, 19 Jun 2024 14:36:04 +0200
Subject: [PATCH] Output Vite build directly into Maven target directory
 (#30490)

Signed-off-by: Jon Koops <jonkoops@gmail.com>
---
 js/apps/account-ui/pom.xml        | 7 -------
 js/apps/account-ui/vite.config.ts | 1 +
 js/apps/admin-ui/pom.xml          | 7 -------
 js/apps/admin-ui/vite.config.ts   | 1 +
 js/pom.xml                        | 2 --
 5 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/js/apps/account-ui/pom.xml b/js/apps/account-ui/pom.xml
index 203fad0206..356af6bfa1 100644
--- a/js/apps/account-ui/pom.xml
+++ b/js/apps/account-ui/pom.xml
@@ -56,13 +56,6 @@
             <resource>
                 <directory>maven-resources</directory>
             </resource>
-            <resource>
-                <directory>dist</directory>
-                <targetPath>theme/keycloak.v3/account/resources</targetPath>
-                <excludes>
-                    <exclude>index.html</exclude>
-                </excludes>
-            </resource>
         </resources>
 
         <plugins>
diff --git a/js/apps/account-ui/vite.config.ts b/js/apps/account-ui/vite.config.ts
index d3d666f7df..64a0b4113a 100644
--- a/js/apps/account-ui/vite.config.ts
+++ b/js/apps/account-ui/vite.config.ts
@@ -31,6 +31,7 @@ export default defineConfig(({ mode }) => {
       port: 5173,
     },
     build: {
+      outDir: "target/classes/theme/keycloak.v3/account/resources",
       ...lib,
       sourcemap: true,
       target: "esnext",
diff --git a/js/apps/admin-ui/pom.xml b/js/apps/admin-ui/pom.xml
index 4e7a668c89..6134c39eca 100644
--- a/js/apps/admin-ui/pom.xml
+++ b/js/apps/admin-ui/pom.xml
@@ -56,13 +56,6 @@
             <resource>
                 <directory>maven-resources</directory>
             </resource>
-            <resource>
-                <directory>dist</directory>
-                <targetPath>theme/keycloak.v2/admin/resources</targetPath>
-                <excludes>
-                    <exclude>index.html</exclude>
-                </excludes>
-            </resource>
         </resources>
 
         <plugins>
diff --git a/js/apps/admin-ui/vite.config.ts b/js/apps/admin-ui/vite.config.ts
index 0d7b511bef..fe229c3307 100644
--- a/js/apps/admin-ui/vite.config.ts
+++ b/js/apps/admin-ui/vite.config.ts
@@ -10,6 +10,7 @@ export default defineConfig({
     port: 5174,
   },
   build: {
+    outDir: "target/classes/theme/keycloak.v2/admin/resources",
     sourcemap: true,
     target: "esnext",
     modulePreload: false,
diff --git a/js/pom.xml b/js/pom.xml
index 3b21df22db..f624e8ea7a 100644
--- a/js/pom.xml
+++ b/js/pom.xml
@@ -26,7 +26,5 @@
     <properties>
         <!-- The JavaScript projects use the non-standard 'src' folder for their sources, therefore, name it here explicitly -->
         <maven.build.cache.input.1>src</maven.build.cache.input.1>
-        <!-- The child projects will package from the 'dist' folder, which is listed as a resource, but isn't a source folder -->
-        <maven.build.cache.exclude.value.1>dist</maven.build.cache.exclude.value.1>
     </properties>
 </project>