keycloakify 10.0.0-rc.16 → 10.0.0-rc.17

package/bin/shared/constants.d.ts

@@ -10,6 +10,7 @@ export declare const vitePluginSubScriptEnvNames: {
     readonly runPostBuildScript: "KEYCLOAKIFY_RUN_POST_BUILD_SCRIPT";
     readonly resolveViteConfig: "KEYCLOAKIFY_RESOLVE_VITE_CONFIG";
 };
+export declare const skipBuildJarsEnvName = "KEYCLOAKIFY_SKIP_BUILD_JAR";
 export declare const loginThemePageIds: readonly ["login.ftl", "login-username.ftl", "login-password.ftl", "webauthn-authenticate.ftl", "webauthn-register.ftl", "register.ftl", "info.ftl", "error.ftl", "login-reset-password.ftl", "login-verify-email.ftl", "terms.ftl", "login-oauth2-device-verify-user-code.ftl", "login-oauth-grant.ftl", "login-otp.ftl", "login-update-profile.ftl", "login-update-password.ftl", "login-idp-link-confirm.ftl", "login-idp-link-email.ftl", "login-page-expired.ftl", "login-config-totp.ftl", "logout-confirm.ftl", "idp-review-user-profile.ftl", "update-email.ftl", "select-authenticator.ftl", "saml-post-form.ftl", "delete-credential.ftl", "code.ftl", "delete-account-confirm.ftl", "frontchannel-logout.ftl", "login-recovery-authn-code-config.ftl", "login-recovery-authn-code-input.ftl", "login-reset-otp.ftl", "login-x509-info.ftl", "webauthn-error.ftl"];
 export declare const accountThemePageIds: readonly ["password.ftl", "account.ftl", "sessions.ftl", "totp.ftl", "applications.ftl", "log.ftl", "federatedIdentity.ftl"];
 export type LoginThemePageId = (typeof loginThemePageIds)[number];

package/bin/shared/constants.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.accountThemePageIds = exports.loginThemePageIds = exports.vitePluginSubScriptEnvNames = exports.accountV1ThemeName = exports.themeTypes = exports.basenameOfTheKeycloakifyResourcesDir = exports.lastKeycloakVersionWithAccountV1 = exports.resources_common = exports.keycloak_resources = exports.nameOfTheGlobal = void 0;
+exports.accountThemePageIds = exports.loginThemePageIds = exports.skipBuildJarsEnvName = exports.vitePluginSubScriptEnvNames = exports.accountV1ThemeName = exports.themeTypes = exports.basenameOfTheKeycloakifyResourcesDir = exports.lastKeycloakVersionWithAccountV1 = exports.resources_common = exports.keycloak_resources = exports.nameOfTheGlobal = void 0;
 exports.nameOfTheGlobal = "kcContext";
 exports.keycloak_resources = "keycloak-resources";
 exports.resources_common = "resources-common";
@@ -12,6 +12,7 @@ exports.vitePluginSubScriptEnvNames = {
     "runPostBuildScript": "KEYCLOAKIFY_RUN_POST_BUILD_SCRIPT",
     "resolveViteConfig": "KEYCLOAKIFY_RESOLVE_VITE_CONFIG"
 };
+exports.skipBuildJarsEnvName = "KEYCLOAKIFY_SKIP_BUILD_JAR";
 exports.loginThemePageIds = [
     "login.ftl",
     "login-username.ftl",

package/bin/shared/constants.js.map

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/bin/shared/constants.ts"],"names":[],"mappings":";;;AAAa,QAAA,eAAe,GAAG,WAAW,CAAC;AAC9B,QAAA,kBAAkB,GAAG,oBAAoB,CAAC;AAC1C,QAAA,gBAAgB,GAAG,kBAAkB,CAAC;AACtC,QAAA,gCAAgC,GAAG,QAAQ,CAAC;AAC5C,QAAA,oCAAoC,GAAG,OAAO,CAAC;AAE/C,QAAA,UAAU,GAAG,CAAC,OAAO,EAAE,SAAS,CAAU,CAAC;AAC3C,QAAA,kBAAkB,GAAG,YAAY,CAAC;AAIlC,QAAA,2BAA2B,GAAG;IACvC,oBAAoB,EAAE,mCAAmC;IACzD,mBAAmB,EAAE,iCAAiC;CAChD,CAAC;AAEE,QAAA,iBAAiB,GAAG;IAC7B,WAAW;IACX,oBAAoB;IACpB,oBAAoB;IACpB,2BAA2B;IAC3B,uBAAuB;IACvB,cAAc;IACd,UAAU;IACV,WAAW;IACX,0BAA0B;IAC1B,wBAAwB;IACxB,WAAW;IACX,0CAA0C;IAC1C,uBAAuB;IACvB,eAAe;IACf,0BAA0B;IAC1B,2BAA2B;IAC3B,4BAA4B;IAC5B,0BAA0B;IAC1B,wBAAwB;IACxB,uBAAuB;IACvB,oBAAoB;IACpB,6BAA6B;IAC7B,kBAAkB;IAClB,0BAA0B;IAC1B,oBAAoB;IACpB,uBAAuB;IACvB,UAAU;IACV,4BAA4B;IAC5B,yBAAyB;IACzB,sCAAsC;IACtC,qCAAqC;IACrC,qBAAqB;IACrB,qBAAqB;IACrB,oBAAoB;CACd,CAAC;AAEE,QAAA,mBAAmB,GAAG;IAC/B,cAAc;IACd,aAAa;IACb,cAAc;IACd,UAAU;IACV,kBAAkB;IAClB,SAAS;IACT,uBAAuB;CACjB,CAAC"}
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/bin/shared/constants.ts"],"names":[],"mappings":";;;AAAa,QAAA,eAAe,GAAG,WAAW,CAAC;AAC9B,QAAA,kBAAkB,GAAG,oBAAoB,CAAC;AAC1C,QAAA,gBAAgB,GAAG,kBAAkB,CAAC;AACtC,QAAA,gCAAgC,GAAG,QAAQ,CAAC;AAC5C,QAAA,oCAAoC,GAAG,OAAO,CAAC;AAE/C,QAAA,UAAU,GAAG,CAAC,OAAO,EAAE,SAAS,CAAU,CAAC;AAC3C,QAAA,kBAAkB,GAAG,YAAY,CAAC;AAIlC,QAAA,2BAA2B,GAAG;IACvC,oBAAoB,EAAE,mCAAmC;IACzD,mBAAmB,EAAE,iCAAiC;CAChD,CAAC;AAEE,QAAA,oBAAoB,GAAG,4BAA4B,CAAC;AAEpD,QAAA,iBAAiB,GAAG;IAC7B,WAAW;IACX,oBAAoB;IACpB,oBAAoB;IACpB,2BAA2B;IAC3B,uBAAuB;IACvB,cAAc;IACd,UAAU;IACV,WAAW;IACX,0BAA0B;IAC1B,wBAAwB;IACxB,WAAW;IACX,0CAA0C;IAC1C,uBAAuB;IACvB,eAAe;IACf,0BAA0B;IAC1B,2BAA2B;IAC3B,4BAA4B;IAC5B,0BAA0B;IAC1B,wBAAwB;IACxB,uBAAuB;IACvB,oBAAoB;IACpB,6BAA6B;IAC7B,kBAAkB;IAClB,0BAA0B;IAC1B,oBAAoB;IACpB,uBAAuB;IACvB,UAAU;IACV,4BAA4B;IAC5B,yBAAyB;IACzB,sCAAsC;IACtC,qCAAqC;IACrC,qBAAqB;IACrB,qBAAqB;IACrB,oBAAoB;CACd,CAAC;AAEE,QAAA,mBAAmB,GAAG;IAC/B,cAAc;IACd,aAAa;IACb,cAAc;IACd,UAAU;IACV,kBAAkB;IAClB,SAAS;IACT,uBAAuB;CACjB,CAAC"}

package/package.json

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

package/src/bin/download-keycloak-default-theme.ts

@@ -24,7 +24,11 @@ export async function command(params: { cliCommandOptions: CliCommandOptions })
     const destDirPath = pathJoin(buildOptions.keycloakifyBuildDirPath, "src", "main", "resources", "theme");
 
     console.log(
-        `Downloading builtins theme of Keycloak ${keycloakVersion} here ${chalk.bold(`.${pathSep}${pathRelative(process.cwd(), destDirPath)}`)}`
+        [
+            `Downloading builtins theme of Keycloak ${keycloakVersion} here:`,
+            `- ${chalk.bold(`.${pathSep}${pathJoin(pathRelative(process.cwd(), destDirPath), "base")}`)}`,
+            `- ${chalk.bold(`.${pathSep}${pathJoin(pathRelative(process.cwd(), destDirPath), "keycloak")}`)}`
+        ].join("\n")
     );
 
     await downloadKeycloakDefaultTheme({

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

@@ -10,7 +10,8 @@ import { readFileSync } from "fs";
 import { isInside } from "../../tools/isInside";
 import child_process from "child_process";
 import { rmSync } from "../../tools/fs.rmSync";
-import { getMetaInfKeycloakThemesJsonPath } from "../../shared/metaInfKeycloakThemes";
+import { getMetaInfKeycloakThemesJsonFilePath } from "../../shared/metaInfKeycloakThemes";
+import type { Param0 } from "tsafe";
 
 export type BuildOptionsLike = BuildOptionsLike_generatePom & {
     keycloakifyBuildDirPath: string;
@@ -35,50 +36,98 @@ export async function buildJar(params: {
     rmSync(keycloakifyBuildTmpDirPath, { "recursive": true, "force": true });
 
     {
-        const keycloakThemesJsonFilePath = getMetaInfKeycloakThemesJsonPath({ "keycloakifyBuildDirPath": "" });
+        const metaInfKeycloakThemesJsonRelativePath = getMetaInfKeycloakThemesJsonFilePath({ "keycloakifyBuildDirPath": "" });
 
-        const themePropertiesFilePathSet = new Set(
-            ...buildOptions.themeNames.map(themeName => pathJoin("src", "main", "resources", "theme", themeName, "account", "theme.properties"))
-        );
+        const { transformCodebase_common } = (() => {
+            const includingAccountV1ThemeNames = [...buildOptions.themeNames, accountV1ThemeName];
+
+            const transformCodebase_common: Param0<typeof transformCodebase>["transformSourceCode"] = ({ fileRelativePath, sourceCode }) => {
+                if (metaInfKeycloakThemesJsonRelativePath === fileRelativePath) {
+                    return { "modifiedSourceCode": sourceCode };
+                }
+
+                for (const themeName of includingAccountV1ThemeNames) {
+                    if (isInside({ "dirPath": pathJoin("src", "main", "resources", "theme", themeName), "filePath": fileRelativePath })) {
+                        return { "modifiedSourceCode": sourceCode };
+                    }
+                }
+
+                return undefined;
+            };
+
+            return { transformCodebase_common };
+        })();
+
+        const { transformCodebase_patchForUsingBuiltinAccountV1 } = (() => {
+            if (keycloakAccountV1Version !== null) {
+                return { "transformCodebase_patchForUsingBuiltinAccountV1": undefined };
+            }
+
+            const themePropertiesFileRelativePathSet = new Set(
+                ...buildOptions.themeNames.map(themeName => pathJoin("src", "main", "resources", "theme", themeName, "account", "theme.properties"))
+            );
+
+            const accountV1RelativeDirPath = pathJoin("src", "main", "resources", "theme", accountV1ThemeName);
+
+            const transformCodebase_patchForUsingBuiltinAccountV1: Param0<typeof transformCodebase>["transformSourceCode"] = ({
+                fileRelativePath,
+                sourceCode
+            }) => {
+                if (isInside({ "dirPath": accountV1RelativeDirPath, "filePath": fileRelativePath })) {
+                    return undefined;
+                }
+
+                if (fileRelativePath === metaInfKeycloakThemesJsonRelativePath) {
+                    const keycloakThemesJsonParsed = JSON.parse(sourceCode.toString("utf8")) as {
+                        themes: { name: string; types: string[] }[];
+                    };
 
-        const accountV1RelativeDirPath = pathJoin("src", "main", "resources", "theme", accountV1ThemeName);
+                    keycloakThemesJsonParsed.themes = keycloakThemesJsonParsed.themes.filter(({ name }) => name !== accountV1ThemeName);
+
+                    return { "modifiedSourceCode": Buffer.from(JSON.stringify(keycloakThemesJsonParsed, null, 2), "utf8") };
+                }
+
+                if (themePropertiesFileRelativePathSet.has(fileRelativePath)) {
+                    const modifiedSourceCode = Buffer.from(
+                        sourceCode.toString("utf8").replace(`parent=${accountV1ThemeName}`, "parent=keycloak"),
+                        "utf8"
+                    );
+
+                    // assert modifiedSourceCode !== sourceCode
+                    assert(Buffer.compare(modifiedSourceCode, sourceCode) !== 0);
+
+                    return { modifiedSourceCode };
+                }
+
+                return { "modifiedSourceCode": sourceCode };
+            };
+
+            return { transformCodebase_patchForUsingBuiltinAccountV1 };
+        })();
 
         transformCodebase({
             "srcDirPath": buildOptions.keycloakifyBuildDirPath,
             "destDirPath": keycloakifyBuildTmpDirPath,
-            "transformSourceCode":
-                keycloakAccountV1Version !== null
-                    ? undefined
-                    : ({ fileRelativePath, sourceCode }) => {
-                          if (fileRelativePath === keycloakThemesJsonFilePath) {
-                              const keycloakThemesJsonParsed = JSON.parse(sourceCode.toString("utf8")) as {
-                                  themes: { name: string; types: string[] }[];
-                              };
-
-                              keycloakThemesJsonParsed.themes = keycloakThemesJsonParsed.themes.filter(({ name }) => name !== accountV1ThemeName);
-
-                              return { "modifiedSourceCode": Buffer.from(JSON.stringify(keycloakThemesJsonParsed, null, 2), "utf8") };
-                          }
-
-                          if (isInside({ "dirPath": "target", "filePath": fileRelativePath })) {
-                              return undefined;
-                          }
-
-                          if (isInside({ "dirPath": accountV1RelativeDirPath, "filePath": fileRelativePath })) {
-                              return undefined;
-                          }
-
-                          if (themePropertiesFilePathSet.has(fileRelativePath)) {
-                              return {
-                                  "modifiedSourceCode": Buffer.from(
-                                      sourceCode.toString("utf8").replace(`parent=${accountV1ThemeName}`, "parent=keycloak"),
-                                      "utf8"
-                                  )
-                              };
-                          }
-
-                          return { "modifiedSourceCode": sourceCode };
-                      }
+            "transformSourceCode": params => {
+                const resultCommon = transformCodebase_common(params);
+
+                if (resultCommon === undefined) {
+                    return undefined;
+                }
+
+                if (transformCodebase_patchForUsingBuiltinAccountV1 === undefined) {
+                    return resultCommon;
+                }
+
+                const { modifiedSourceCode, newFileName } = resultCommon;
+
+                assert(newFileName === undefined);
+
+                return transformCodebase_patchForUsingBuiltinAccountV1?.({
+                    ...params,
+                    "sourceCode": modifiedSourceCode
+                });
+            }
         });
     }
 

package/src/bin/keycloakify/keycloakify.ts

@@ -3,7 +3,7 @@ import { join as pathJoin, relative as pathRelative, sep as pathSep } from "path
 import * as child_process from "child_process";
 import * as fs from "fs";
 import { readBuildOptions } from "../shared/buildOptions";
-import { vitePluginSubScriptEnvNames } from "../shared/constants";
+import { vitePluginSubScriptEnvNames, skipBuildJarsEnvName } from "../shared/constants";
 import { buildJars } from "./buildJars";
 import type { CliCommandOptions } from "../main";
 import chalk from "chalk";
@@ -76,7 +76,13 @@ export async function command(params: { cliCommandOptions: CliCommandOptions })
         });
     }
 
-    await buildJars({ buildOptions });
+    build_jars: {
+        if (process.env[skipBuildJarsEnvName]) {
+            break build_jars;
+        }
+
+        await buildJars({ buildOptions });
+    }
 
     console.log(chalk.green(`✓ built in ${((Date.now() - startTime) / 1000).toFixed(2)}s`));
 }

package/src/bin/shared/buildOptions.ts

@@ -163,7 +163,10 @@ export function readBuildOptions(params: { cliCommandOptions: CliCommandOptions
         return pathJoin(reactAppRootDirPath, resolvedViteConfig.buildDir);
     })();
 
-    const { npmWorkspaceRootDirPath } = getNpmWorkspaceRootDirPath({ reactAppRootDirPath });
+    const { npmWorkspaceRootDirPath } = getNpmWorkspaceRootDirPath({
+        reactAppRootDirPath,
+        "dependencyExpected": "keycloakify"
+    });
 
     return {
         "bundler": resolvedViteConfig !== undefined ? "vite" : "webpack",

package/src/bin/shared/constants.ts

@@ -14,6 +14,8 @@ export const vitePluginSubScriptEnvNames = {
     "resolveViteConfig": "KEYCLOAKIFY_RESOLVE_VITE_CONFIG"
 } as const;
 
+export const skipBuildJarsEnvName = "KEYCLOAKIFY_SKIP_BUILD_JAR";
+
 export const loginThemePageIds = [
     "login.ftl",
     "login-username.ftl",

package/src/bin/shared/metaInfKeycloakThemes.ts

@@ -6,7 +6,7 @@ export type MetaInfKeycloakTheme = {
     themes: { name: string; types: (ThemeType | "email")[] }[];
 };
 
-export function getMetaInfKeycloakThemesJsonPath(params: { keycloakifyBuildDirPath: string }) {
+export function getMetaInfKeycloakThemesJsonFilePath(params: { keycloakifyBuildDirPath: string }) {
     const { keycloakifyBuildDirPath } = params;
 
     return pathJoin(keycloakifyBuildDirPath, "src", "main", "resources", "META-INF", "keycloak-themes.json");
@@ -15,13 +15,13 @@ export function getMetaInfKeycloakThemesJsonPath(params: { keycloakifyBuildDirPa
 export function readMetaInfKeycloakThemes(params: { keycloakifyBuildDirPath: string }): MetaInfKeycloakTheme {
     const { keycloakifyBuildDirPath } = params;
 
-    return JSON.parse(fs.readFileSync(getMetaInfKeycloakThemesJsonPath({ keycloakifyBuildDirPath })).toString("utf8")) as MetaInfKeycloakTheme;
+    return JSON.parse(fs.readFileSync(getMetaInfKeycloakThemesJsonFilePath({ keycloakifyBuildDirPath })).toString("utf8")) as MetaInfKeycloakTheme;
 }
 
 export function writeMetaInfKeycloakThemes(params: { keycloakifyBuildDirPath: string; metaInfKeycloakThemes: MetaInfKeycloakTheme }) {
     const { keycloakifyBuildDirPath, metaInfKeycloakThemes } = params;
 
-    const metaInfKeycloakThemesJsonPath = getMetaInfKeycloakThemesJsonPath({ keycloakifyBuildDirPath });
+    const metaInfKeycloakThemesJsonPath = getMetaInfKeycloakThemesJsonFilePath({ keycloakifyBuildDirPath });
 
     {
         const dirPath = pathDirname(metaInfKeycloakThemesJsonPath);

package/src/bin/start-keycloak.ts

@@ -2,15 +2,19 @@ import { readBuildOptions } from "./shared/buildOptions";
 import type { CliCommandOptions as CliCommandOptions_common } from "./main";
 import { promptKeycloakVersion } from "./shared/promptKeycloakVersion";
 import { readMetaInfKeycloakThemes } from "./shared/metaInfKeycloakThemes";
-import { accountV1ThemeName } from "./shared/constants";
+import { accountV1ThemeName, skipBuildJarsEnvName } from "./shared/constants";
 import { SemVer } from "./tools/SemVer";
 import type { KeycloakVersionRange } from "./shared/KeycloakVersionRange";
 import { getJarFileBasename } from "./shared/getJarFileBasename";
 import { assert, type Equals } from "tsafe/assert";
 import * as fs from "fs";
-import { join as pathJoin, posix as pathPosix } from "path";
+import { join as pathJoin, relative as pathRelative, sep as pathSep, posix as pathPosix } from "path";
 import * as child_process from "child_process";
 import chalk from "chalk";
+import chokidar from "chokidar";
+import { waitForDebounceFactory } from "powerhooks/tools/waitForDebounce";
+import { getThemeSrcDirPath } from "./shared/getThemeSrcDirPath";
+import { Deferred } from "evt/tools/Deferred";
 
 export type CliCommandOptions = CliCommandOptions_common & {
     port: number;
@@ -91,13 +95,15 @@ export async function command(params: { cliCommandOptions: CliCommandOptions })
             };
         }
 
-        console.log("On which version of Keycloak do you want to test your theme?");
+        console.log(chalk.cyan("On which version of Keycloak do you want to test your theme?"));
 
         const { keycloakVersion } = await promptKeycloakVersion({
             "startingFromMajor": 17,
             "cacheDirPath": buildOptions.cacheDirPath
         });
 
+        console.log(`→ ${keycloakVersion}`);
+
         const keycloakMajorNumber = SemVer.parse(keycloakVersion).major;
 
         if (doesImplementAccountTheme && keycloakMajorNumber === 22) {
@@ -149,6 +155,8 @@ export async function command(params: { cliCommandOptions: CliCommandOptions })
 
     const { jarFileBasename } = getJarFileBasename({ keycloakVersionRange });
 
+    console.log(`Using Keycloak ${chalk.bold(jarFileBasename)}`);
+
     const mountTargets = buildOptions.themeNames
         .map(themeName => {
             const themeEntry = metaInfKeycloakThemes.themes.find(({ name }) => name === themeName);
@@ -182,10 +190,10 @@ export async function command(params: { cliCommandOptions: CliCommandOptions })
     const containerName = "keycloak-keycloakify";
 
     try {
-        child_process.execSync(`docker rm ${containerName}`, { "stdio": "ignore" });
+        child_process.execSync(`docker rm --force ${containerName}`, { "stdio": "ignore" });
     } catch {}
 
-    const child = child_process.spawn(
+    const spawnParams = [
         "docker",
         [
             "run",
@@ -203,12 +211,18 @@ export async function command(params: { cliCommandOptions: CliCommandOptions })
         {
             "cwd": buildOptions.keycloakifyBuildDirPath
         }
-    );
+    ] as const;
+
+    const child = child_process.spawn(...spawnParams);
 
     child.stdout.on("data", data => process.stdout.write(data));
 
     child.stderr.on("data", data => process.stderr.write(data));
 
+    child.on("exit", process.exit);
+
+    const { themeSrcDirPath } = getThemeSrcDirPath({ "reactAppRootDirPath": buildOptions.reactAppRootDirPath });
+
     {
         const handler = async (data: Buffer) => {
             if (!data.toString("utf8").includes("Listening on: http://0.0.0.0:8080")) {
@@ -224,7 +238,12 @@ export async function command(params: { cliCommandOptions: CliCommandOptions })
                     "",
                     `${chalk.green("Your theme is accessible at:")}`,
                     `${chalk.green("➜")} ${chalk.cyan.bold("https://test.keycloakify.dev/")}`,
-                    ""
+                    "",
+                    `Keycloak Admin console: ${chalk.cyan.bold(`http://localhost:${cliCommandOptions.port}`)}`,
+                    `- user: ${chalk.cyan.bold("admin")}`,
+                    `- password: ${chalk.cyan.bold("admin")}`,
+                    "",
+                    `Watching for changes in ${chalk.bold(`.${pathSep}${pathRelative(process.cwd(), themeSrcDirPath)}`)} ...`
                 ].join("\n")
             );
         };
@@ -232,5 +251,59 @@ export async function command(params: { cliCommandOptions: CliCommandOptions })
         child.stdout.on("data", handler);
     }
 
-    child.on("exit", process.exit);
+    {
+        const { waitForDebounce } = waitForDebounceFactory({ "delay": 400 });
+
+        chokidar.watch(themeSrcDirPath, { "ignoreInitial": true }).on("all", async (...eventArgs) => {
+            console.log({ eventArgs });
+
+            await waitForDebounce();
+
+            console.log(chalk.cyan("Detected changes in the theme. Rebuilding ..."));
+
+            const dViteBuildDone = new Deferred<void>();
+
+            {
+                const child = child_process.spawn("npx", ["vite", "build"], {
+                    "cwd": buildOptions.reactAppRootDirPath,
+                    "env": process.env
+                });
+
+                child.stdout.on("data", data => process.stdout.write(data));
+
+                child.stderr.on("data", data => process.stderr.write(data));
+
+                child.on("exit", code => {
+                    if (code === 0) {
+                        dViteBuildDone.resolve();
+                    }
+                });
+            }
+
+            await dViteBuildDone.pr;
+
+            {
+                const child = child_process.spawn("npx", ["keycloakify", "build"], {
+                    "cwd": buildOptions.reactAppRootDirPath,
+                    "env": {
+                        ...process.env,
+                        [skipBuildJarsEnvName]: "true"
+                    }
+                });
+
+                child.stdout.on("data", data => process.stdout.write(data));
+
+                child.stderr.on("data", data => process.stderr.write(data));
+
+                child.on("exit", code => {
+                    if (code !== 0) {
+                        console.log(chalk.yellow("Theme not updated, build failed"));
+                        return;
+                    }
+
+                    console.log(chalk.green("Rebuild done"));
+                });
+            }
+        });
+    }
 }

package/src/bin/tools/getNpmWorkspaceRootDirPath.ts

@@ -1,9 +1,10 @@
 import * as child_process from "child_process";
 import { join as pathJoin, resolve as pathResolve, sep as pathSep } from "path";
 import { assert } from "tsafe/assert";
+import * as fs from "fs";
 
-export function getNpmWorkspaceRootDirPath(params: { reactAppRootDirPath: string }) {
-    const { reactAppRootDirPath } = params;
+export function getNpmWorkspaceRootDirPath(params: { reactAppRootDirPath: string; dependencyExpected: string }) {
+    const { reactAppRootDirPath, dependencyExpected } = params;
 
     const npmWorkspaceRootDirPath = (function callee(depth: number): string {
         const cwd = pathResolve(pathJoin(...[reactAppRootDirPath, ...Array(depth).fill("..")]));
@@ -20,6 +21,38 @@ export function getNpmWorkspaceRootDirPath(params: { reactAppRootDirPath: string
             throw error;
         }
 
+        const { isExpectedDependencyFound } = (() => {
+            const packageJsonFilePath = pathJoin(cwd, "package.json");
+
+            assert(fs.existsSync(packageJsonFilePath));
+
+            const parsedPackageJson = JSON.parse(fs.readFileSync(packageJsonFilePath).toString("utf8"));
+
+            let isExpectedDependencyFound = false;
+
+            for (const dependenciesOrDevDependencies of ["dependencies", "devDependencies"] as const) {
+                const dependencies = parsedPackageJson[dependenciesOrDevDependencies];
+
+                if (dependencies === undefined) {
+                    continue;
+                }
+
+                assert(dependencies instanceof Object);
+
+                if (dependencies[dependencyExpected] === undefined) {
+                    continue;
+                }
+
+                isExpectedDependencyFound = true;
+            }
+
+            return { isExpectedDependencyFound };
+        })();
+
+        if (!isExpectedDependencyFound) {
+            return callee(depth + 1);
+        }
+
         return cwd;
     })(0);
 

package/vite-plugin/index.js

@@ -133,7 +133,10 @@ function readBuildOptions(params) {
         }
         return (0, path_1.join)(reactAppRootDirPath, resolvedViteConfig.buildDir);
     })();
-    var npmWorkspaceRootDirPath = (0, getNpmWorkspaceRootDirPath_1.getNpmWorkspaceRootDirPath)({ reactAppRootDirPath: reactAppRootDirPath }).npmWorkspaceRootDirPath;
+    var npmWorkspaceRootDirPath = (0, getNpmWorkspaceRootDirPath_1.getNpmWorkspaceRootDirPath)({
+        reactAppRootDirPath: reactAppRootDirPath,
+        "dependencyExpected": "keycloakify"
+    }).npmWorkspaceRootDirPath;
     return {
         "bundler": resolvedViteConfig !== undefined ? "vite" : "webpack",
         "themeVersion": (_b = (_a = process.env.KEYCLOAKIFY_THEME_VERSION) !== null && _a !== void 0 ? _a : parsedPackageJson.version) !== null && _b !== void 0 ? _b : "0.0.0",
@@ -228,7 +231,7 @@ exports.readBuildOptions = readBuildOptions;
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.accountThemePageIds = exports.loginThemePageIds = exports.vitePluginSubScriptEnvNames = exports.accountV1ThemeName = exports.themeTypes = exports.basenameOfTheKeycloakifyResourcesDir = exports.lastKeycloakVersionWithAccountV1 = exports.resources_common = exports.keycloak_resources = exports.nameOfTheGlobal = void 0;
+exports.accountThemePageIds = exports.loginThemePageIds = exports.skipBuildJarsEnvName = exports.vitePluginSubScriptEnvNames = exports.accountV1ThemeName = exports.themeTypes = exports.basenameOfTheKeycloakifyResourcesDir = exports.lastKeycloakVersionWithAccountV1 = exports.resources_common = exports.keycloak_resources = exports.nameOfTheGlobal = void 0;
 exports.nameOfTheGlobal = "kcContext";
 exports.keycloak_resources = "keycloak-resources";
 exports.resources_common = "resources-common";
@@ -240,6 +243,7 @@ exports.vitePluginSubScriptEnvNames = {
     "runPostBuildScript": "KEYCLOAKIFY_RUN_POST_BUILD_SCRIPT",
     "resolveViteConfig": "KEYCLOAKIFY_RESOLVE_VITE_CONFIG"
 };
+exports.skipBuildJarsEnvName = "KEYCLOAKIFY_SKIP_BUILD_JAR";
 exports.loginThemePageIds = [
     "login.ftl",
     "login-username.ftl",
@@ -1973,13 +1977,25 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
     }
     return to.concat(ar || Array.prototype.slice.call(from));
 };
+var __values = (this && this.__values) || function(o) {
+    var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
+    if (m) return m.call(o);
+    if (o && typeof o.length === "number") return {
+        next: function () {
+            if (o && i >= o.length) o = void 0;
+            return { value: o && o[i++], done: !o };
+        }
+    };
+    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
+};
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.getNpmWorkspaceRootDirPath = void 0;
 var child_process = __importStar(__nccwpck_require__(2081));
 var path_1 = __nccwpck_require__(1017);
 var assert_1 = __nccwpck_require__(8078);
+var fs = __importStar(__nccwpck_require__(7147));
 function getNpmWorkspaceRootDirPath(params) {
-    var reactAppRootDirPath = params.reactAppRootDirPath;
+    var reactAppRootDirPath = params.reactAppRootDirPath, dependencyExpected = params.dependencyExpected;
     var npmWorkspaceRootDirPath = (function callee(depth) {
         var cwd = (0, path_1.resolve)(path_1.join.apply(void 0, __spreadArray([], __read(__spreadArray([reactAppRootDirPath], __read(Array(depth).fill("..")), false)), false)));
         try {
@@ -1992,6 +2008,38 @@ function getNpmWorkspaceRootDirPath(params) {
             }
             throw error;
         }
+        var isExpectedDependencyFound = (function () {
+            var e_1, _a;
+            var packageJsonFilePath = (0, path_1.join)(cwd, "package.json");
+            (0, assert_1.assert)(fs.existsSync(packageJsonFilePath));
+            var parsedPackageJson = JSON.parse(fs.readFileSync(packageJsonFilePath).toString("utf8"));
+            var isExpectedDependencyFound = false;
+            try {
+                for (var _b = __values(["dependencies", "devDependencies"]), _c = _b.next(); !_c.done; _c = _b.next()) {
+                    var dependenciesOrDevDependencies = _c.value;
+                    var dependencies = parsedPackageJson[dependenciesOrDevDependencies];
+                    if (dependencies === undefined) {
+                        continue;
+                    }
+                    (0, assert_1.assert)(dependencies instanceof Object);
+                    if (dependencies[dependencyExpected] === undefined) {
+                        continue;
+                    }
+                    isExpectedDependencyFound = true;
+                }
+            }
+            catch (e_1_1) { e_1 = { error: e_1_1 }; }
+            finally {
+                try {
+                    if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+                }
+                finally { if (e_1) throw e_1.error; }
+            }
+            return { isExpectedDependencyFound: isExpectedDependencyFound };
+        })().isExpectedDependencyFound;
+        if (!isExpectedDependencyFound) {
+            return callee(depth + 1);
+        }
         return cwd;
     })(0);
     return { npmWorkspaceRootDirPath: npmWorkspaceRootDirPath };