From a26a813ad564965df00b24bee7c9a8d61d18b1db Mon Sep 17 00:00:00 2001
From: Joseph Garrone <joseph.garrone.gj@gmail.com>
Date: Sun, 12 May 2024 19:37:16 +0200
Subject: [PATCH] Checkpoint

---
 src/bin/keycloakify/buildJars/buildJar.ts     |  6 +++
 .../{ => buildJars}/generatePom.ts            |  0
 src/bin/keycloakify/keycloakify.ts            | 41 ++++++++-----------
 3 files changed, 24 insertions(+), 23 deletions(-)
 rename src/bin/keycloakify/{ => buildJars}/generatePom.ts (100%)

diff --git a/src/bin/keycloakify/buildJars/buildJar.ts b/src/bin/keycloakify/buildJars/buildJar.ts
index 89c5987e..7a7ba43c 100644
--- a/src/bin/keycloakify/buildJars/buildJar.ts
+++ b/src/bin/keycloakify/buildJars/buildJar.ts
@@ -10,6 +10,12 @@ export async function buildJar(params: {
         keycloakifyBuildDirPath: string;
     };
 }): Promise<void> {
+    {
+        const { pomFileCode } = generatePom({ buildOptions });
+
+        fs.writeFileSync(pathJoin(buildOptions.keycloakifyBuildDirPath, "pom.xml"), Buffer.from(pomFileCode, "utf8"));
+    }
+
     child_process.execSync("mvn clean install", { "cwd": buildOptions.keycloakifyBuildDirPath });
     // TODO: Implement
 }
diff --git a/src/bin/keycloakify/generatePom.ts b/src/bin/keycloakify/buildJars/generatePom.ts
similarity index 100%
rename from src/bin/keycloakify/generatePom.ts
rename to src/bin/keycloakify/buildJars/generatePom.ts
diff --git a/src/bin/keycloakify/keycloakify.ts b/src/bin/keycloakify/keycloakify.ts
index 8e2c05da..3a076c19 100644
--- a/src/bin/keycloakify/keycloakify.ts
+++ b/src/bin/keycloakify/keycloakify.ts
@@ -1,5 +1,4 @@
 import { generateTheme } from "./generateTheme";
-import { generatePom } from "./generatePom";
 import { join as pathJoin, relative as pathRelative, sep as pathSep } from "path";
 import * as child_process from "child_process";
 import { generateStartKeycloakTestingContainer } from "./generateStartKeycloakTestingContainer";
@@ -23,33 +22,29 @@ export async function main() {
 
     const { themeSrcDirPath } = getThemeSrcDirPath({ "reactAppRootDirPath": buildOptions.reactAppRootDirPath });
 
-    const [themeName, ...themeVariantNames] = buildOptions.themeNames;
-
-    const { implementedThemeTypes } = await generateTheme({
-        themeName,
-        themeSrcDirPath,
-        "keycloakifySrcDirPath": pathJoin(getThisCodebaseRootDirPath(), "src"),
-        "keycloakifyVersion": readThisNpmProjectVersion(),
-        buildOptions
-    });
-
-    for (const themeVariantName of themeVariantNames) {
-        generateThemeVariations({
-            themeName,
-            themeVariantName,
-            implementedThemeTypes,
-            buildOptions
-        });
-    }
+    fs.writeFileSync(pathJoin(buildOptions.keycloakifyBuildDirPath, ".gitignore"), Buffer.from("*", "utf8"));
 
     {
-        const { pomFileCode } = generatePom({ buildOptions });
+        const [themeName, ...themeVariantNames] = buildOptions.themeNames;
 
-        fs.writeFileSync(pathJoin(buildOptions.keycloakifyBuildDirPath, "pom.xml"), Buffer.from(pomFileCode, "utf8"));
+        const { implementedThemeTypes } = await generateTheme({
+            themeName,
+            themeSrcDirPath,
+            "keycloakifySrcDirPath": pathJoin(getThisCodebaseRootDirPath(), "src"),
+            "keycloakifyVersion": readThisNpmProjectVersion(),
+            buildOptions
+        });
+
+        for (const themeVariantName of themeVariantNames) {
+            generateThemeVariations({
+                themeName,
+                themeVariantName,
+                implementedThemeTypes,
+                buildOptions
+            });
+        }
     }
 
-    fs.writeFileSync(pathJoin(buildOptions.keycloakifyBuildDirPath, ".gitignore"), Buffer.from("*", "utf8"));
-
     run_post_build_script: {
         if (buildOptions.bundler !== "vite") {
             break run_post_build_script;