keycloakify 10.0.0-rc.109 → 10.0.0-rc.110

package/bin/440.index.js

@@ -1147,9 +1147,9 @@ var isInside = __webpack_require__(90665);
 (0,assert.assert)();
 async function buildJar(params) {
     const { jarFileBasename, keycloakAccountV1Version, keycloakThemeAdditionalInfoExtensionVersion, resourcesDirPath, doesImplementAccountV1Theme, buildContext } = params;
-    const keycloakifyBuildTmpDirPath = (0,external_path_.join)(buildContext.cacheDirPath, jarFileBasename.replace(".jar", ""));
-    (0,fs_rmSync/* rmSync */.a)(keycloakifyBuildTmpDirPath, { recursive: true, force: true });
-    const tmpResourcesDirPath = (0,external_path_.join)(keycloakifyBuildTmpDirPath, "src", "main", "resources");
+    const keycloakifyBuildCacheDirPath = (0,external_path_.join)(buildContext.cacheDirPath, "maven", jarFileBasename.replace(".jar", ""));
+    const tmpResourcesDirPath = (0,external_path_.join)(keycloakifyBuildCacheDirPath, "src", "main", "resources");
+    (0,fs_rmSync/* rmSync */.a)(tmpResourcesDirPath, { recursive: true, force: true });
     (0,transformCodebase/* transformCodebase */.N)({
         srcDirPath: resourcesDirPath,
         destDirPath: tmpResourcesDirPath,
@@ -1213,7 +1213,7 @@ async function buildJar(params) {
             break route_legacy_pages;
         }
         ["register.ftl", "login-update-profile.ftl"].forEach(pageId => buildContext.themeNames.map(themeName => {
-            const ftlFilePath = (0,external_path_.join)(keycloakifyBuildTmpDirPath, "src", "main", "resources", "theme", themeName, "login", pageId);
+            const ftlFilePath = (0,external_path_.join)(tmpResourcesDirPath, "theme", themeName, "login", pageId);
             const ftlFileContent = (0,external_fs_.readFileSync)(ftlFilePath).toString("utf8");
             const realPageId = (() => {
                 switch (pageId) {
@@ -1235,9 +1235,9 @@ async function buildJar(params) {
             keycloakAccountV1Version,
             keycloakThemeAdditionalInfoExtensionVersion
         });
-        await promises_.writeFile((0,external_path_.join)(keycloakifyBuildTmpDirPath, "pom.xml"), Buffer.from(pomFileCode, "utf8"));
+        await promises_.writeFile((0,external_path_.join)(keycloakifyBuildCacheDirPath, "pom.xml"), Buffer.from(pomFileCode, "utf8"));
     }
-    await new Promise((resolve, reject) => external_child_process_default().exec(`mvn clean install -Dmaven.repo.local="${(0,external_path_.join)(keycloakifyBuildTmpDirPath, ".m2")}"`, { cwd: keycloakifyBuildTmpDirPath }, error => {
+    await new Promise((resolve, reject) => external_child_process_default().exec(`mvn install -Dmaven.repo.local="${(0,external_path_.join)(keycloakifyBuildCacheDirPath, ".m2")}"`, { cwd: keycloakifyBuildCacheDirPath }, error => {
         if (error !== null) {
             console.error(`Build jar failed: ${JSON.stringify({
                 jarFileBasename,
@@ -1249,8 +1249,7 @@ async function buildJar(params) {
         }
         resolve();
     }));
-    await promises_.rename((0,external_path_.join)(keycloakifyBuildTmpDirPath, "target", `${buildContext.artifactId}-${buildContext.themeVersion}.jar`), (0,external_path_.join)(buildContext.keycloakifyBuildDirPath, jarFileBasename));
-    (0,fs_rmSync/* rmSync */.a)(keycloakifyBuildTmpDirPath, { recursive: true });
+    await promises_.rename((0,external_path_.join)(keycloakifyBuildCacheDirPath, "target", `${buildContext.artifactId}-${buildContext.themeVersion}.jar`), (0,external_path_.join)(buildContext.keycloakifyBuildDirPath, jarFileBasename));
 }
 //# sourceMappingURL=buildJar.js.map
 ;// CONCATENATED MODULE: ./dist/bin/keycloakify/buildJars/buildJars.js

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "keycloakify",
-    "version": "10.0.0-rc.109",
+    "version": "10.0.0-rc.110",
     "description": "Create Keycloak themes using React",
     "repository": {
         "type": "git",

package/src/bin/keycloakify/buildJars/buildJar.ts

@@ -45,20 +45,21 @@ export async function buildJar(params: {
         buildContext
     } = params;
 
-    const keycloakifyBuildTmpDirPath = pathJoin(
+    const keycloakifyBuildCacheDirPath = pathJoin(
         buildContext.cacheDirPath,
+        "maven",
         jarFileBasename.replace(".jar", "")
     );
 
-    rmSync(keycloakifyBuildTmpDirPath, { recursive: true, force: true });
-
     const tmpResourcesDirPath = pathJoin(
-        keycloakifyBuildTmpDirPath,
+        keycloakifyBuildCacheDirPath,
         "src",
         "main",
         "resources"
     );
 
+    rmSync(tmpResourcesDirPath, { recursive: true, force: true });
+
     transformCodebase({
         srcDirPath: resourcesDirPath,
         destDirPath: tmpResourcesDirPath,
@@ -155,10 +156,7 @@ export async function buildJar(params: {
         (["register.ftl", "login-update-profile.ftl"] as const).forEach(pageId =>
             buildContext.themeNames.map(themeName => {
                 const ftlFilePath = pathJoin(
-                    keycloakifyBuildTmpDirPath,
-                    "src",
-                    "main",
-                    "resources",
+                    tmpResourcesDirPath,
                     "theme",
                     themeName,
                     "login",
@@ -200,15 +198,15 @@ export async function buildJar(params: {
         });
 
         await fs.writeFile(
-            pathJoin(keycloakifyBuildTmpDirPath, "pom.xml"),
+            pathJoin(keycloakifyBuildCacheDirPath, "pom.xml"),
             Buffer.from(pomFileCode, "utf8")
         );
     }
 
     await new Promise<void>((resolve, reject) =>
         child_process.exec(
-            `mvn clean install -Dmaven.repo.local="${pathJoin(keycloakifyBuildTmpDirPath, ".m2")}"`,
-            { cwd: keycloakifyBuildTmpDirPath },
+            `mvn install -Dmaven.repo.local="${pathJoin(keycloakifyBuildCacheDirPath, ".m2")}"`,
+            { cwd: keycloakifyBuildCacheDirPath },
             error => {
                 if (error !== null) {
                     console.error(
@@ -233,12 +231,10 @@ export async function buildJar(params: {
 
     await fs.rename(
         pathJoin(
-            keycloakifyBuildTmpDirPath,
+            keycloakifyBuildCacheDirPath,
             "target",
             `${buildContext.artifactId}-${buildContext.themeVersion}.jar`
         ),
         pathJoin(buildContext.keycloakifyBuildDirPath, jarFileBasename)
     );
-
-    rmSync(keycloakifyBuildTmpDirPath, { recursive: true });
 }