Release debug build

.github/workflows/ci.yaml

@@ -17,7 +17,7 @@ jobs:
     - uses: actions/setup-node@v4
     - uses: bahmutov/npm-install@v1
     - name: If this step fails run 'npm run format' then commit again.
-      run: npm run _format --list-different
+      run: npm run format:check
   test:
     runs-on: ${{ matrix.os }}
     needs: test_lint

.gitignore

@@ -48,8 +48,8 @@ jspm_packages
 
 .idea
 
-/src/login/i18n/messages_defaultSet/
-/src/account/i18n/messages_defaultSet/
+/src/login/i18n/baseMessages/
+/src/account/i18n/baseMessages/
 
 # VS Code devcontainers
 .devcontainer

.prettierignore

@@ -6,8 +6,8 @@ node_modules/
 /src/tools/types/
 /build_keycloak/
 /.vscode/
-/src/login/i18n/messages_defaultSet/
-/src/account/i18n/messages_defaultSet/
+/src/login/i18n/baseMessages/
+/src/account/i18n/baseMessages/
 /dist_test
 /sample_react_project/
 /sample_custom_react_project/

README.md

@@ -17,12 +17,9 @@
     <a href="https://github.com/thomasdarimont/awesome-keycloak">
         <img src="https://awesome.re/mentioned-badge.svg"/>
     </a>
-    <p align="center">
-      Check out our discord server!<br/>
-      <a href="https://discord.gg/mJdYJSdcm4">
-        <img src="https://dcbadge.limes.pink/api/server/kYFZG7fQmn"/>
-      </a>
-    </p>
+    <a href="https://discord.gg/kYFZG7fQmn">
+        <img src="https://img.shields.io/discord/1097708346976505977"/>
+    </a>
     <p align="center">
         <a href="https://www.keycloakify.dev">Home</a>
         -
@@ -41,9 +38,10 @@
     <img width="400" src="https://github.com/keycloakify/keycloakify/assets/6702424/e66d105c-c06f-47d1-8a31-a6ab09da4e80">
 </p>
 
-Keycloakify is fully compatible with Keycloak 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, [~~22~~](https://github.com/keycloakify/keycloakify/issues/389#issuecomment-1822509763), 23, 24, 25...[and beyond](https://github.com/keycloakify/keycloakify/discussions/346#discussioncomment-5889791)
+Keycloakify is fully compatible with Keycloak 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, [~~22~~](https://github.com/keycloakify/keycloakify/issues/389#issuecomment-1822509763), **23** [and up](https://github.com/keycloakify/keycloakify/discussions/346#discussioncomment-5889791)!
 
-> NOTE: Keycloakify 10 is still in realase-candidate state. [Follow progress](https://github.com/keycloakify/keycloakify/pull/538).
+> NOTE: Keycloak 24 introduces [important changes](https://www.keycloak.org/docs/latest/upgrading/index.html#changes-to-freemarker-templates-to-render-pages-based-on-the-user-profile-and-realm).  
+> We're actively working on incorporating them into Keycloakify. [Follow progress](https://github.com/keycloakify/keycloakify/pull/538).
 
 ## Sponsor
 

package.json

@@ -1,6 +1,6 @@
 {
     "name": "keycloakify",
-    "version": "10.0.0-rc.120",
+    "version": "10.0.0-rc.90",
     "description": "Create Keycloak themes using React",
     "repository": {
         "type": "git",
@@ -15,6 +15,7 @@
         "test:types": "tsc -p test/tsconfig.json --noEmit",
         "_format": "prettier '**/*.{ts,tsx,json,md}'",
         "format": "yarn _format --write",
+        "format:check": "yarn _format --list-different",
         "link-in-app": "tsx scripts/link-in-app.ts",
         "build-storybook": "tsx scripts/build-storybook.ts",
         "dump-keycloak-realm": "tsx scripts/dump-keycloak-realm.ts"
@@ -40,14 +41,14 @@
         "!dist/bin/",
         "dist/bin/main.js",
         "dist/bin/*.index.js",
-        "dist/bin/*.node",
+        "!dist/bin/shared/*.js",
         "dist/bin/shared/constants.js",
         "dist/bin/shared/*.d.ts",
         "dist/bin/shared/*.js.map",
         "!dist/vite-plugin/",
-        "dist/vite-plugin/index.js",
         "dist/vite-plugin/index.d.ts",
-        "dist/vite-plugin/vite-plugin.d.ts"
+        "dist/vite-plugin/vite-plugin.d.ts",
+        "dist/vite-plugin/index.js"
     ],
     "keywords": [
         "keycloak",

scripts/build-storybook.ts

@@ -1,13 +1,16 @@
 import * as child_process from "child_process";
-import { copyKeycloakResourcesToStorybookStaticDir } from "./copyKeycloakResourcesToStorybookStaticDir";
+import { join } from "path";
 
-(async () => {
-    run("yarn build");
+run("yarn build");
 
-    await copyKeycloakResourcesToStorybookStaticDir();
+run(`node ${join("dist", "bin", "main.js")} copy-keycloak-resources-to-public`, {
+    env: {
+        ...process.env,
+        PUBLIC_DIR_PATH: join(".storybook", "static")
+    }
+});
 
-    run("npx build-storybook");
-})();
+run("npx build-storybook");
 
 function run(command: string, options?: { env?: NodeJS.ProcessEnv }) {
     console.log(`$ ${command}`);

scripts/build.ts

@@ -1,6 +1,6 @@
 import * as child_process from "child_process";
 import * as fs from "fs";
-import { join } from "path";
+import { join, relative } from "path";
 import { assert } from "tsafe/assert";
 import { transformCodebase } from "../src/bin/tools/transformCodebase";
 import chalk from "chalk";
@@ -16,7 +16,7 @@ if (fs.existsSync(join("dist", "bin", "main.original.js"))) {
     );
 
     fs.readdirSync(join("dist", "bin")).forEach(fileBasename => {
-        if (/[0-9]\.index.js/.test(fileBasename) || fileBasename.endsWith(".node")) {
+        if (/[0-9]\.index.js/.test(fileBasename)) {
             fs.rmSync(join("dist", "bin", fileBasename));
         }
     });
@@ -111,10 +111,9 @@ run(
     )}`
 );
 
-fs.readdirSync(join("dist", "ncc_out")).forEach(fileBasename => {
-    assert(!fileBasename.endsWith(".index.js"));
-    assert(!fileBasename.endsWith(".node"));
-});
+fs.readdirSync(join("dist", "ncc_out")).forEach(fileBasename =>
+    assert(!fileBasename.endsWith(".index.js"))
+);
 
 transformCodebase({
     srcDirPath: join("dist", "ncc_out"),

scripts/copyKeycloakResourcesToStorybookStaticDir.ts

@@ -1,18 +0,0 @@
-import { join as pathJoin } from "path";
-import { copyKeycloakResourcesToPublic } from "../src/bin/shared/copyKeycloakResourcesToPublic";
-import { getProxyFetchOptions } from "../src/bin/tools/fetchProxyOptions";
-import { LOGIN_THEME_RESOURCES_FROMkEYCLOAK_VERSION_DEFAULT } from "../src/bin/shared/constants";
-
-export async function copyKeycloakResourcesToStorybookStaticDir() {
-    await copyKeycloakResourcesToPublic({
-        buildContext: {
-            cacheDirPath: pathJoin(__dirname, "..", "node_modules", ".cache", "scripts"),
-            fetchOptions: getProxyFetchOptions({
-                npmConfigGetCwd: pathJoin(__dirname, "..")
-            }),
-            loginThemeResourcesFromKeycloakVersion:
-                LOGIN_THEME_RESOURCES_FROMkEYCLOAK_VERSION_DEFAULT,
-            publicDirPath: pathJoin(__dirname, "..", ".storybook", "static")
-        }
-    });
-}

scripts/dump-keycloak-realm.ts

@@ -1,4 +1,4 @@
-import { CONTAINER_NAME } from "../src/bin/shared/constants";
+import { containerName } from "../src/bin/shared/constants";
 import child_process from "child_process";
 import { SemVer } from "../src/bin/tools/SemVer";
 import { join as pathJoin, relative as pathRelative } from "path";
@@ -14,7 +14,7 @@ import { is } from "tsafe/is";
         const child = child_process.spawn(
             "docker",
             [
-                ...["exec", CONTAINER_NAME],
+                ...["exec", containerName],
                 ...["/opt/keycloak/bin/kc.sh", "export"],
                 ...["--dir", "/tmp"],
                 ...["--realm", "myrealm"],
@@ -62,7 +62,7 @@ import { is } from "tsafe/is";
 
     const keycloakMajorVersionNumber = SemVer.parse(
         child_process
-            .execSync(`docker inspect --format '{{.Config.Image}}' ${CONTAINER_NAME}`)
+            .execSync(`docker inspect --format '{{.Config.Image}}' ${containerName}`)
             .toString("utf8")
             .trim()
             .split(":")[1]
@@ -80,7 +80,7 @@ import { is } from "tsafe/is";
         )
     );
 
-    run(`docker cp ${CONTAINER_NAME}:/tmp/myrealm-realm.json ${targetFilePath}`);
+    run(`docker cp ${containerName}:/tmp/myrealm-realm.json ${targetFilePath}`);
 
     console.log(`${chalk.green(`✓ Exported realm to`)} ${chalk.bold(targetFilePath)}`);
 })();

scripts/generate-i18n-messages.ts

@@ -12,7 +12,6 @@ import { crawl } from "../src/bin/tools/crawl";
 import { downloadKeycloakDefaultTheme } from "../src/bin/shared/downloadKeycloakDefaultTheme";
 import { getThisCodebaseRootDirPath } from "../src/bin/tools/getThisCodebaseRootDirPath";
 import { deepAssign } from "../src/tools/deepAssign";
-import { getProxyFetchOptions } from "../src/bin/tools/fetchProxyOptions";
 
 // NOTE: To run without argument when we want to generate src/i18n/generated_kcMessages files,
 // update the version array for generating for newer version.
@@ -34,9 +33,7 @@ async function main() {
                 ".cache",
                 "keycloakify"
             ),
-            fetchOptions: getProxyFetchOptions({
-                npmConfigGetCwd: thisCodebaseRootDirPath
-            })
+            npmWorkspaceRootDirPath: thisCodebaseRootDirPath
         }
     });
 
@@ -110,12 +107,12 @@ async function main() {
             source: keycloakifyExtraMessages
         });
 
-        const messagesDirPath = pathJoin(
+        const baseMessagesDirPath = pathJoin(
             thisCodebaseRootDirPath,
             "src",
             themeType,
             "i18n",
-            "messages_defaultSet"
+            "baseMessages"
         );
 
         const generatedFileHeader = [
@@ -127,7 +124,7 @@ async function main() {
         ].join("\n");
 
         languages.forEach(language => {
-            const filePath = pathJoin(messagesDirPath, `${language}.ts`);
+            const filePath = pathJoin(baseMessagesDirPath, `${language}.ts`);
 
             fs.mkdirSync(pathDirname(filePath), { recursive: true });
 
@@ -155,14 +152,14 @@ async function main() {
         });
 
         fs.writeFileSync(
-            pathJoin(messagesDirPath, "index.ts"),
+            pathJoin(baseMessagesDirPath, "index.ts"),
             Buffer.from(
                 [
                     generatedFileHeader,
                     `import * as en from "./en";`,
                     "",
-                    "export async function fetchMessages_defaultSet(currentLanguageTag: string) {",
-                    "    const { default: messages_defaultSet } = await (() => {",
+                    "export async function getMessages(currentLanguageTag: string) {",
+                    "    const { default: messages } = await (() => {",
                     "        switch (currentLanguageTag) {",
                     `            case "en": return en;`,
                     ...languages
@@ -174,7 +171,7 @@ async function main() {
                     '            default: return { "default": {} };',
                     "        }",
                     "    })();",
-                    "    return messages_defaultSet;",
+                    "    return messages;",
                     "}"
                 ].join("\n"),
                 "utf8"

scripts/link-in-app.ts

@@ -44,12 +44,6 @@ const commonThirdPartyDeps = [
         .replace(/"!dist\//g, '"!')
         .replace(/"!\.\/dist\//g, '"!./');
 
-    modifiedPackageJsonContent = JSON.stringify(
-        { ...JSON.parse(modifiedPackageJsonContent), version: "0.0.0" },
-        null,
-        4
-    );
-
     fs.writeFileSync(
         pathJoin(rootDirPath, "dist", "package.json"),
         Buffer.from(modifiedPackageJsonContent, "utf8")

scripts/link-in-starter.ts

@@ -10,16 +10,14 @@ fs.rmSync(".yarn_home", { recursive: true, force: true });
 run("yarn install");
 run("yarn build");
 
-const starterName = "keycloakify-starter";
-
-fs.rmSync(join("..", starterName, "node_modules"), {
+fs.rmSync(join("..", "keycloakify-starter", "node_modules"), {
     recursive: true,
     force: true
 });
 
-run("yarn install", { cwd: join("..", starterName) });
+run("yarn install", { cwd: join("..", "keycloakify-starter") });
 
-run(`npx tsx ${join("scripts", "link-in-app.ts")} ${starterName}`);
+run(`npx tsx ${join("scripts", "link-in-app.ts")} keycloakify-starter`);
 
 startRebuildOnSrcChange();
 

scripts/start-storybook.ts

@@ -1,26 +1,30 @@
 import * as child_process from "child_process";
+import * as fs from "fs";
+import { join } from "path";
 import { startRebuildOnSrcChange } from "./startRebuildOnSrcChange";
-import { copyKeycloakResourcesToStorybookStaticDir } from "./copyKeycloakResourcesToStorybookStaticDir";
 
-(async () => {
-    run("yarn build");
+run("yarn build");
 
-    await copyKeycloakResourcesToStorybookStaticDir();
-
-    {
-        const child = child_process.spawn("npx", ["start-storybook", "-p", "6006"], {
-            shell: true
-        });
-
-        child.stdout.on("data", data => process.stdout.write(data));
-
-        child.stderr.on("data", data => process.stderr.write(data));
-
-        child.on("exit", process.exit.bind(process));
+run(`node ${join("dist", "bin", "main.js")} copy-keycloak-resources-to-public`, {
+    env: {
+        ...process.env,
+        PUBLIC_DIR_PATH: join(".storybook", "static")
     }
+});
 
-    startRebuildOnSrcChange();
-})();
+{
+    const child = child_process.spawn("npx", ["start-storybook", "-p", "6006"], {
+        shell: true
+    });
+
+    child.stdout.on("data", data => process.stdout.write(data));
+
+    child.stderr.on("data", data => process.stderr.write(data));
+
+    child.on("exit", process.exit.bind(process));
+}
+
+startRebuildOnSrcChange();
 
 function run(command: string, options?: { env?: NodeJS.ProcessEnv }) {
     console.log(`$ ${command}`);

src/PUBLIC_URL.ts

@@ -1,4 +1,4 @@
-import { BASENAME_OF_KEYCLOAKIFY_RESOURCES_DIR } from "keycloakify/bin/shared/constants";
+import { basenameOfTheKeycloakifyResourcesDir } from "keycloakify/bin/shared/constants";
 import { assert } from "tsafe/assert";
 
 /**
@@ -17,5 +17,5 @@ export const PUBLIC_URL = (() => {
         return process.env.PUBLIC_URL;
     }
 
-    return `${kcContext.url.resourcesPath}/${BASENAME_OF_KEYCLOAKIFY_RESOURCES_DIR}`;
+    return `${kcContext.url.resourcesPath}/${basenameOfTheKeycloakifyResourcesDir}`;
 })();

src/account/KcContext/KcContext.ts

@@ -118,10 +118,7 @@ export declare namespace KcContext {
             lastName?: string;
             username?: string;
         };
-        properties: {};
-        "x-keycloakify": {
-            messages: Record<string, string>;
-        };
+        properties: Record<string, string | undefined>;
     };
 
     export type Password = Common & {

src/account/KcContext/kcContextMocks.ts

@@ -1,10 +1,10 @@
 import "keycloakify/tools/Object.fromEntries";
-import { RESOURCES_COMMON, KEYCLOAK_RESOURCES } from "keycloakify/bin/shared/constants";
+import { resources_common, keycloak_resources } from "keycloakify/bin/shared/constants";
 import { id } from "tsafe/id";
 import type { KcContext } from "./KcContext";
 import { BASE_URL } from "keycloakify/lib/BASE_URL";
 
-const resourcesPath = `${BASE_URL}${KEYCLOAK_RESOURCES}/account/resources`;
+const resourcesPath = `${BASE_URL}${keycloak_resources}/account/resources`;
 
 export const kcContextCommonMock: KcContext.Common = {
     themeVersion: "0.0.0",
@@ -13,7 +13,7 @@ export const kcContextCommonMock: KcContext.Common = {
     themeName: "my-theme-name",
     url: {
         resourcesPath,
-        resourcesCommonPath: `${resourcesPath}/${RESOURCES_COMMON}`,
+        resourcesCommonPath: `${resourcesPath}/${resources_common}`,
         resourceUrl: "#",
         accountUrl: "#",
         applicationsUrl: "#",
@@ -82,10 +82,7 @@ export const kcContextCommonMock: KcContext.Common = {
         email: "john.doe@code.gouv.fr",
         username: "doe_j"
     },
-    properties: {},
-    "x-keycloakify": {
-        messages: {}
-    }
+    properties: {}
 };
 
 export const kcContextMocks: KcContext[] = [

src/account/Template.tsx

@@ -145,12 +145,7 @@ export default function Template(props: TemplateProps<KcContext, I18n>) {
                         <div className={clsx("alert", `alert-${message.type}`)}>
                             {message.type === "success" && <span className="pficon pficon-ok"></span>}
                             {message.type === "error" && <span className="pficon pficon-error-circle-o"></span>}
-                            <span
-                                className="kc-feedback-text"
-                                dangerouslySetInnerHTML={{
-                                    __html: message.summary
-                                }}
-                            />
+                            <span className="kc-feedback-text">{message.summary}</span>
                         </div>
                     )}
 

src/account/i18n/GenericI18n.tsx

@@ -1,6 +0,0 @@
-import type { GenericI18n_noJsx } from "./i18n";
-
-export type GenericI18n<MessageKey extends string> = GenericI18n_noJsx<MessageKey> & {
-    msg: (key: MessageKey, ...args: (string | undefined)[]) => JSX.Element;
-    advancedMsg: (key: string, ...args: (string | undefined)[]) => JSX.Element;
-};

src/account/i18n/i18n.tsx

@@ -1,24 +1,22 @@
 import "keycloakify/tools/Object.fromEntries";
 import { assert } from "tsafe/assert";
-import messages_defaultSet_fallbackLanguage from "./messages_defaultSet/en";
-import { fetchMessages_defaultSet } from "./messages_defaultSet";
+import messages_fallbackLanguage from "./baseMessages/en";
+import { getMessages } from "./baseMessages";
 import type { KcContext } from "../KcContext";
-import { FALLBACK_LANGUAGE_TAG } from "keycloakify/bin/shared/constants";
-import { id } from "tsafe/id";
+import { fallbackLanguageTag } from "keycloakify/bin/shared/constants";
 
 export type KcContextLike = {
     locale?: {
         currentLanguageTag: string;
         supported: { languageTag: string; url: string; label: string }[];
     };
-    "x-keycloakify": {
-        messages: Record<string, string>;
-    };
 };
 
 assert<KcContext extends KcContextLike ? true : false>();
 
-export type GenericI18n_noJsx<MessageKey extends string> = {
+export type MessageKey = keyof typeof messages_fallbackLanguage;
+
+export type GenericI18n<MessageKey extends string> = {
     /**
      * e.g: "en", "fr", "zh-CN"
      *
@@ -38,21 +36,16 @@ export type GenericI18n_noJsx<MessageKey extends string> = {
      * */
     labelBySupportedLanguageTag: Record<string, string>;
     /**
-     *
      * Examples assuming currentLanguageTag === "en"
-     * {
-     *   en: {
-     *     "access-denied": "Access denied",
-     *     "impersonateTitleHtml": "<strong>{0}</strong> Impersonate User",
-     *     "bar": "Bar {0}"
-     *   }
-     * }
      *
-     * msgStr("access-denied") === "Access denied"
-     * msgStr("not-a-message-key") Throws an error
+     * msg("access-denied") === <span>Access denied</span>
+     * msg("impersonateTitleHtml", "Foo") === <span><strong>Foo</strong> Impersonate User</span>
+     */
+    msg: (key: MessageKey, ...args: (string | undefined)[]) => JSX.Element;
+    /**
+     * It's the same thing as msg() but instead of returning a JSX.Element it returns a string.
+     * It can be more convenient to manipulate strings but if there are HTML tags it wont render.
      * msgStr("impersonateTitleHtml", "Foo") === "<strong>Foo</strong> Impersonate User"
-     * msgStr("${bar}", "<strong>c</strong>") === "Bar &lt;strong&gt;XXX&lt;/strong&gt;"
-     *  The html in the arg is partially escaped for security reasons, it might come from an untrusted source, it's not safe to render it as html.
      */
     msgStr: (key: MessageKey, ...args: (string | undefined)[]) => string;
     /**
@@ -63,11 +56,24 @@ export type GenericI18n_noJsx<MessageKey extends string> = {
      * {
      *   en: {
      *     "access-denied": "Access denied",
+     *     "foo": "Foo {0} {1}",
+     *     "bar": "Bar {0}"
      *   }
      * }
      *
-     * advancedMsgStr("${access-denied}") === advancedMsgStr("access-denied") === msgStr("access-denied") === "Access denied"
-     * advancedMsgStr("${not-a-message-key}") === advancedMsgStr("not-a-message-key") === "not-a-message-key"
+     * advancedMsg("${access-denied} foo bar") === <span>{msgStr("access-denied")} foo bar<span> === <span>Access denied foo bar</span>
+     * advancedMsg("${access-denied}") === advancedMsg("access-denied") === msg("access-denied") === <span>Access denied</span>
+     * advancedMsg("${not-a-message-key}") === advancedMsg(not-a-message-key") === <span>not-a-message-key</span>
+     * advancedMsg("${bar}", "<strong>c</strong>")
+     *    === <span>{msgStr("bar", "<strong>XXX</strong>")}<span>
+     *    === <span>Bar &lt;strong&gt;XXX&lt;/strong&gt;</span> (The html in the arg is partially escaped for security reasons, it might be untrusted)
+     * advancedMsg("${foo} xx ${bar}", "a", "b", "c")
+     *    === <span>{msgStr("foo", "a", "b")} xx {msgStr("bar")}<span>
+     *    === <span>Foo a b xx Bar {0}</span> (The substitution are only applied in the first message)
+     */
+    advancedMsg: (key: string, ...args: (string | undefined)[]) => JSX.Element;
+    /**
+     * See advancedMsg() but instead of returning a JSX.Element it returns a string.
      */
     advancedMsgStr: (key: string, ...args: (string | undefined)[]) => string;
 
@@ -79,12 +85,10 @@ export type GenericI18n_noJsx<MessageKey extends string> = {
     isFetchingTranslations: boolean;
 };
 
-export type MessageKey_defaultSet = keyof typeof messages_defaultSet_fallbackLanguage;
-
-export function createGetI18n<MessageKey_themeDefined extends string = never>(messagesByLanguageTag_themeDefined: {
-    [languageTag: string]: { [key in MessageKey_themeDefined]: string };
+export function createGetI18n<ExtraMessageKey extends string = never>(messageBundle: {
+    [languageTag: string]: { [key in ExtraMessageKey]: string };
 }) {
-    type I18n = GenericI18n_noJsx<MessageKey_defaultSet | MessageKey_themeDefined>;
+    type I18n = GenericI18n<MessageKey | ExtraMessageKey>;
 
     type Result = { i18n: I18n; prI18n_currentLanguage: Promise<I18n> | undefined };
 
@@ -104,7 +108,7 @@ export function createGetI18n<MessageKey_themeDefined extends string = never>(me
         }
 
         const partialI18n: Pick<I18n, "currentLanguageTag" | "getChangeLocaleUrl" | "labelBySupportedLanguageTag"> = {
-            currentLanguageTag: kcContext.locale?.currentLanguageTag ?? FALLBACK_LANGUAGE_TAG,
+            currentLanguageTag: kcContext.locale?.currentLanguageTag ?? fallbackLanguageTag,
             getChangeLocaleUrl: newLanguageTag => {
                 const { locale } = kcContext;
 
@@ -119,38 +123,30 @@ export function createGetI18n<MessageKey_themeDefined extends string = never>(me
             labelBySupportedLanguageTag: Object.fromEntries((kcContext.locale?.supported ?? []).map(({ languageTag, label }) => [languageTag, label]))
         };
 
-        const { createI18nTranslationFunctions } = createI18nTranslationFunctionsFactory<MessageKey_themeDefined>({
-            messages_themeDefined:
-                messagesByLanguageTag_themeDefined[partialI18n.currentLanguageTag] ??
-                messagesByLanguageTag_themeDefined[FALLBACK_LANGUAGE_TAG] ??
-                (() => {
-                    const firstLanguageTag = Object.keys(messagesByLanguageTag_themeDefined)[0];
-                    if (firstLanguageTag === undefined) {
-                        return undefined;
-                    }
-                    return messagesByLanguageTag_themeDefined[firstLanguageTag];
-                })(),
-            messages_fromKcServer: kcContext["x-keycloakify"].messages
+        const { createI18nTranslationFunctions } = createI18nTranslationFunctionsFactory<MessageKey, ExtraMessageKey>({
+            messages_fallbackLanguage,
+            messageBundle_fallbackLanguage: messageBundle[fallbackLanguageTag],
+            messageBundle_currentLanguage: messageBundle[partialI18n.currentLanguageTag]
         });
 
-        const isCurrentLanguageFallbackLanguage = partialI18n.currentLanguageTag === FALLBACK_LANGUAGE_TAG;
+        const isCurrentLanguageFallbackLanguage = partialI18n.currentLanguageTag === fallbackLanguageTag;
 
         const result: Result = {
             i18n: {
                 ...partialI18n,
                 ...createI18nTranslationFunctions({
-                    messages_defaultSet_currentLanguage: isCurrentLanguageFallbackLanguage ? messages_defaultSet_fallbackLanguage : undefined
+                    messages_currentLanguage: isCurrentLanguageFallbackLanguage ? messages_fallbackLanguage : undefined
                 }),
                 isFetchingTranslations: !isCurrentLanguageFallbackLanguage
             },
             prI18n_currentLanguage: isCurrentLanguageFallbackLanguage
                 ? undefined
                 : (async () => {
-                      const messages_defaultSet_currentLanguage = await fetchMessages_defaultSet(partialI18n.currentLanguageTag);
+                      const messages_currentLanguage = await getMessages(partialI18n.currentLanguageTag);
 
                       const i18n_currentLanguage: I18n = {
                           ...partialI18n,
-                          ...createI18nTranslationFunctions({ messages_defaultSet_currentLanguage }),
+                          ...createI18nTranslationFunctions({ messages_currentLanguage }),
                           isFetchingTranslations: false
                       };
 
@@ -173,76 +169,118 @@ export function createGetI18n<MessageKey_themeDefined extends string = never>(me
     return { getI18n };
 }
 
-function createI18nTranslationFunctionsFactory<MessageKey_themeDefined extends string>(params: {
-    messages_themeDefined: Record<MessageKey_themeDefined, string> | undefined;
-    messages_fromKcServer: Record<string, string>;
+function createI18nTranslationFunctionsFactory<MessageKey extends string, ExtraMessageKey extends string>(params: {
+    messages_fallbackLanguage: Record<MessageKey, string>;
+    messageBundle_fallbackLanguage: Record<ExtraMessageKey, string> | undefined;
+    messageBundle_currentLanguage: Partial<Record<ExtraMessageKey, string>> | undefined;
 }) {
-    const { messages_themeDefined, messages_fromKcServer } = params;
+    const { messageBundle_currentLanguage } = params;
+
+    const messages_fallbackLanguage = {
+        ...params.messages_fallbackLanguage,
+        ...params.messageBundle_fallbackLanguage
+    };
 
     function createI18nTranslationFunctions(params: {
-        messages_defaultSet_currentLanguage: Partial<Record<MessageKey_defaultSet, string>> | undefined;
-    }): Pick<GenericI18n_noJsx<MessageKey_defaultSet | MessageKey_themeDefined>, "msgStr" | "advancedMsgStr"> {
-        const { messages_defaultSet_currentLanguage } = params;
+        messages_currentLanguage: Partial<Record<MessageKey, string>> | undefined;
+    }): Pick<GenericI18n<MessageKey | ExtraMessageKey>, "msg" | "msgStr" | "advancedMsg" | "advancedMsgStr"> {
+        const messages_currentLanguage = {
+            ...params.messages_currentLanguage,
+            ...messageBundle_currentLanguage
+        };
 
-        function resolveMsg(props: { key: string; args: (string | undefined)[] }): string | undefined {
-            const { key, args } = props;
+        function resolveMsg(props: { key: string; args: (string | undefined)[]; doRenderAsHtml: boolean }): string | JSX.Element | undefined {
+            const { key, args, doRenderAsHtml } = props;
 
-            const message =
-                id<Record<string, string | undefined>>(messages_fromKcServer)[key] ??
-                id<Record<string, string | undefined> | undefined>(messages_themeDefined)?.[key] ??
-                id<Record<string, string | undefined> | undefined>(messages_defaultSet_currentLanguage)?.[key] ??
-                id<Record<string, string | undefined>>(messages_defaultSet_fallbackLanguage)[key];
+            const messageOrUndefined: string | undefined = (messages_currentLanguage as any)[key] ?? (messages_fallbackLanguage as any)[key];
 
-            if (message === undefined) {
+            if (messageOrUndefined === undefined) {
                 return undefined;
             }
 
-            const startIndex = message
-                .match(/{[0-9]+}/g)
-                ?.map(g => g.match(/{([0-9]+)}/)![1])
-                .map(indexStr => parseInt(indexStr))
-                .sort((a, b) => a - b)[0];
+            const message = messageOrUndefined;
 
-            if (startIndex === undefined) {
-                // No {0} in message (no arguments expected)
-                return message;
-            }
+            const messageWithArgsInjectedIfAny = (() => {
+                const startIndex = message
+                    .match(/{[0-9]+}/g)
+                    ?.map(g => g.match(/{([0-9]+)}/)![1])
+                    .map(indexStr => parseInt(indexStr))
+                    .sort((a, b) => a - b)[0];
 
-            let messageWithArgsInjected = message;
-
-            args.forEach((arg, i) => {
-                if (arg === undefined) {
-                    return;
+                if (startIndex === undefined) {
+                    // No {0} in message (no arguments expected)
+                    return message;
                 }
 
-                messageWithArgsInjected = messageWithArgsInjected.replace(
-                    new RegExp(`\\{${i + startIndex}\\}`, "g"),
-                    arg.replace(/</g, "&lt;").replace(/>/g, "&gt;")
-                );
-            });
+                let messageWithArgsInjected = message;
 
-            return messageWithArgsInjected;
+                args.forEach((arg, i) => {
+                    if (arg === undefined) {
+                        return;
+                    }
+
+                    messageWithArgsInjected = messageWithArgsInjected.replace(
+                        new RegExp(`\\{${i + startIndex}\\}`, "g"),
+                        arg.replace(/</g, "&lt;").replace(/>/g, "&gt;")
+                    );
+                });
+
+                return messageWithArgsInjected;
+            })();
+
+            return doRenderAsHtml ? (
+                <span
+                    // NOTE: The message is trusted. The arguments are not but are escaped.
+                    dangerouslySetInnerHTML={{
+                        __html: messageWithArgsInjectedIfAny
+                    }}
+                />
+            ) : (
+                messageWithArgsInjectedIfAny
+            );
         }
 
-        function resolveMsgAdvanced(props: { key: string; args: (string | undefined)[] }): string {
-            const { key, args } = props;
+        function resolveMsgAdvanced(props: { key: string; args: (string | undefined)[]; doRenderAsHtml: boolean }): JSX.Element | string {
+            const { key, args, doRenderAsHtml } = props;
 
-            const match = key.match(/^\$\{(.+)\}$/);
+            if (!/\$\{[^}]+\}/.test(key)) {
+                const resolvedMessage = resolveMsg({ key, args, doRenderAsHtml });
 
-            if (match === null) {
-                return key;
+                if (resolvedMessage === undefined) {
+                    return doRenderAsHtml ? <span dangerouslySetInnerHTML={{ __html: key }} /> : key;
+                }
+
+                return resolvedMessage;
             }
 
-            return resolveMsg({ key: match[1], args }) ?? key;
+            let isFirstMatch = true;
+
+            const resolvedComplexMessage = key.replace(/\$\{([^}]+)\}/g, (...[, key_i]) => {
+                const replaceBy = resolveMsg({ key: key_i, args: isFirstMatch ? args : [], doRenderAsHtml: false }) ?? key_i;
+
+                isFirstMatch = false;
+
+                return replaceBy;
+            });
+
+            return doRenderAsHtml ? <span dangerouslySetInnerHTML={{ __html: resolvedComplexMessage }} /> : resolvedComplexMessage;
         }
 
         return {
-            msgStr: (key, ...args) => {
-                const resolvedMessage = resolveMsg({ key, args });
-                assert(resolvedMessage !== undefined, `Message with key "${key}" not found`);
-                return resolvedMessage;
-            },
-            advancedMsgStr: (key, ...args) => resolveMsgAdvanced({ key, args })
+            msgStr: (key, ...args) => resolveMsg({ key, args, doRenderAsHtml: false }) as string,
+            msg: (key, ...args) => resolveMsg({ key, args, doRenderAsHtml: true }) as JSX.Element,
+            advancedMsg: (key, ...args) =>
+                resolveMsgAdvanced({
+                    key,
+                    args,
+                    doRenderAsHtml: true
+                }) as JSX.Element,
+            advancedMsgStr: (key, ...args) =>
+                resolveMsgAdvanced({
+                    key,
+                    args,
+                    doRenderAsHtml: false
+                }) as string
         };
     }
 

src/account/i18n/index.ts

@@ -1,5 +1,4 @@
-import type { GenericI18n } from "./GenericI18n";
-import type { MessageKey_defaultSet, KcContextLike } from "./i18n";
-export type { MessageKey_defaultSet, KcContextLike };
-export type I18n = GenericI18n<MessageKey_defaultSet>;
+import type { GenericI18n, MessageKey, KcContextLike } from "./i18n";
+export type { MessageKey, KcContextLike };
+export type I18n = GenericI18n<MessageKey>;
 export { createUseI18n } from "./useI18n";

src/account/i18n/useI18n.ts

@@ -0,0 +1,44 @@
+import { useEffect, useState } from "react";
+import {
+    createGetI18n,
+    type GenericI18n,
+    type MessageKey,
+    type KcContextLike
+} from "./i18n";
+import { Reflect } from "tsafe/Reflect";
+
+export function createUseI18n<ExtraMessageKey extends string = never>(messageBundle: {
+    [languageTag: string]: { [key in ExtraMessageKey]: string };
+}) {
+    type I18n = GenericI18n<MessageKey | ExtraMessageKey>;
+
+    const { getI18n } = createGetI18n(messageBundle);
+
+    function useI18n(params: { kcContext: KcContextLike }): { i18n: I18n } {
+        const { kcContext } = params;
+
+        const { i18n, prI18n_currentLanguage } = getI18n({ kcContext });
+
+        const [i18n_toReturn, setI18n_toReturn] = useState<I18n>(i18n);
+
+        useEffect(() => {
+            let isActive = true;
+
+            prI18n_currentLanguage?.then(i18n => {
+                if (!isActive) {
+                    return;
+                }
+
+                setI18n_toReturn(i18n);
+            });
+
+            return () => {
+                isActive = false;
+            };
+        }, []);
+
+        return { i18n: i18n_toReturn };
+    }
+
+    return { useI18n, ofTypeI18n: Reflect<I18n>() };
+}

src/account/i18n/useI18n.tsx

@@ -1,95 +0,0 @@
-import { useEffect, useState } from "react";
-import { createGetI18n, type GenericI18n_noJsx, type KcContextLike, type MessageKey_defaultSet } from "./i18n";
-import { GenericI18n } from "./GenericI18n";
-import { Reflect } from "tsafe/Reflect";
-
-export function createUseI18n<MessageKey_themeDefined extends string = never>(messagesByLanguageTag: {
-    [languageTag: string]: { [key in MessageKey_themeDefined]: string };
-}) {
-    type MessageKey = MessageKey_defaultSet | MessageKey_themeDefined;
-
-    type I18n = GenericI18n<MessageKey>;
-
-    const { withJsx } = (() => {
-        const cache = new WeakMap<GenericI18n_noJsx<MessageKey>, GenericI18n<MessageKey>>();
-
-        function renderHtmlString(params: { htmlString: string; msgKey: string }): JSX.Element {
-            const { htmlString, msgKey } = params;
-            return (
-                <div
-                    data-kc-msg={msgKey}
-                    dangerouslySetInnerHTML={{
-                        __html: htmlString
-                    }}
-                />
-            );
-        }
-
-        function withJsx(i18n_noJsx: GenericI18n_noJsx<MessageKey>): I18n {
-            use_cache: {
-                const i18n = cache.get(i18n_noJsx);
-
-                if (i18n === undefined) {
-                    break use_cache;
-                }
-
-                return i18n;
-            }
-
-            const i18n: I18n = {
-                ...i18n_noJsx,
-                msg: (msgKey, ...args) => renderHtmlString({ htmlString: i18n_noJsx.msgStr(msgKey, ...args), msgKey }),
-                advancedMsg: (msgKey, ...args) => renderHtmlString({ htmlString: i18n_noJsx.advancedMsgStr(msgKey, ...args), msgKey })
-            };
-
-            cache.set(i18n_noJsx, i18n);
-
-            return i18n;
-        }
-
-        return { withJsx };
-    })();
-
-    add_style: {
-        const attributeName = "data-kc-i18n";
-
-        // Check if already exists in head
-        if (document.querySelector(`style[${attributeName}]`) !== null) {
-            break add_style;
-        }
-
-        const styleElement = document.createElement("style");
-        styleElement.attributes.setNamedItem(document.createAttribute(attributeName));
-        (styleElement.textContent = `[data-kc-msg] { display: inline-block; }`), document.head.prepend(styleElement);
-    }
-
-    const { getI18n } = createGetI18n(messagesByLanguageTag);
-
-    function useI18n(params: { kcContext: KcContextLike }): { i18n: I18n } {
-        const { kcContext } = params;
-
-        const { i18n, prI18n_currentLanguage } = getI18n({ kcContext });
-
-        const [i18n_toReturn, setI18n_toReturn] = useState<I18n>(withJsx(i18n));
-
-        useEffect(() => {
-            let isActive = true;
-
-            prI18n_currentLanguage?.then(i18n => {
-                if (!isActive) {
-                    return;
-                }
-
-                setI18n_toReturn(withJsx(i18n));
-            });
-
-            return () => {
-                isActive = false;
-            };
-        }, []);
-
-        return { i18n: i18n_toReturn };
-    }
-
-    return { useI18n, ofTypeI18n: Reflect<I18n>() };
-}

src/account/pages/Applications.tsx

@@ -62,6 +62,7 @@ export default function Applications(props: PageProps<Extract<KcContext, { pageI
                                                     {index < application.realmRolesAvailable.length - 1 && ", "}
                                                 </span>
                                             ))}
+                                        {!isArrayWithEmptyObject(application.realmRolesAvailable) && application.resourceRolesAvailable && ", "}
                                         {application.resourceRolesAvailable &&
                                             Object.keys(application.resourceRolesAvailable).map(resource => (
                                                 <span key={resource}>

src/account/pages/FederatedIdentity.tsx

@@ -8,7 +8,7 @@ export default function FederatedIdentity(props: PageProps<Extract<KcContext, {
     const { url, federatedIdentity, stateChecker } = kcContext;
     const { msg } = i18n;
     return (
-        <Template {...{ kcContext, i18n, doUseDefaultCss, classes }} active="social">
+        <Template {...{ kcContext, i18n, doUseDefaultCss, classes }} active="federatedIdentity">
             <div className="main-layout social">
                 <div className="row">
                     <div className="col-md-10">

src/account/pages/Totp.tsx

@@ -154,14 +154,9 @@ export default function Totp(props: PageProps<Extract<KcContext, { pageId: "totp
                                     />
 
                                     {messagesPerField.existsError("totp") && (
-                                        <span
-                                            id="input-error-otp-code"
-                                            className={kcClsx("kcInputErrorMessageClass")}
-                                            aria-live="polite"
-                                            dangerouslySetInnerHTML={{
-                                                __html: messagesPerField.get("totp")
-                                            }}
-                                        />
+                                        <span id="input-error-otp-code" className={kcClsx("kcInputErrorMessageClass")} aria-live="polite">
+                                            {messagesPerField.get("totp")}
+                                        </span>
                                     )}
                                 </div>
                                 <input type="hidden" id="totpSecret" name="totpSecret" value={totp.totpSecret} />
@@ -185,14 +180,9 @@ export default function Totp(props: PageProps<Extract<KcContext, { pageId: "totp
                                         aria-invalid={messagesPerField.existsError("userLabel")}
                                     />
                                     {messagesPerField.existsError("userLabel") && (
-                                        <span
-                                            id="input-error-otp-label"
-                                            className={kcClsx("kcInputErrorMessageClass")}
-                                            aria-live="polite"
-                                            dangerouslySetInnerHTML={{
-                                                __html: messagesPerField.get("userLabel")
-                                            }}
-                                        />
+                                        <span id="input-error-otp-label" className={kcClsx("kcInputErrorMessageClass")} aria-live="polite">
+                                            {messagesPerField.get("userLabel")}
+                                        </span>
                                     )}
                                 </div>
                             </div>

src/bin/add-story.ts

@@ -1,11 +1,11 @@
 import { getThisCodebaseRootDirPath } from "./tools/getThisCodebaseRootDirPath";
 import cliSelect from "cli-select";
 import {
-    LOGIN_THEME_PAGE_IDS,
-    ACCOUNT_THEME_PAGE_IDS,
+    loginThemePageIds,
+    accountThemePageIds,
     type LoginThemePageId,
     type AccountThemePageId,
-    THEME_TYPES,
+    themeTypes,
     type ThemeType
 } from "./shared/constants";
 import { capitalize } from "tsafe/capitalize";
@@ -27,7 +27,7 @@ export async function command(params: { cliCommandOptions: CliCommandOptions })
     console.log(chalk.cyan("Theme type:"));
 
     const { value: themeType } = await cliSelect<ThemeType>({
-        values: [...THEME_TYPES]
+        values: [...themeTypes]
     }).catch(() => {
         process.exit(-1);
     });
@@ -40,9 +40,9 @@ export async function command(params: { cliCommandOptions: CliCommandOptions })
         values: (() => {
             switch (themeType) {
                 case "login":
-                    return [...LOGIN_THEME_PAGE_IDS];
+                    return [...loginThemePageIds];
                 case "account":
-                    return [...ACCOUNT_THEME_PAGE_IDS];
+                    return [...accountThemePageIds];
             }
             assert<Equals<typeof themeType, never>>(false);
         })()
@@ -81,8 +81,7 @@ export async function command(params: { cliCommandOptions: CliCommandOptions })
             )
         )
         .toString("utf8")
-        .replace('import React from "react";\n', "")
-        .replace(/from "[./]+dist\//, 'from "keycloakify/');
+        .replace('import React from "react";\n', "");
 
     {
         const targetDirPath = pathDirname(targetFilePath);

src/bin/eject-page.ts

@@ -3,11 +3,11 @@
 import { getThisCodebaseRootDirPath } from "./tools/getThisCodebaseRootDirPath";
 import cliSelect from "cli-select";
 import {
-    LOGIN_THEME_PAGE_IDS,
-    ACCOUNT_THEME_PAGE_IDS,
+    loginThemePageIds,
+    accountThemePageIds,
     type LoginThemePageId,
     type AccountThemePageId,
-    THEME_TYPES,
+    themeTypes,
     type ThemeType
 } from "./shared/constants";
 import { capitalize } from "tsafe/capitalize";
@@ -29,7 +29,7 @@ export async function command(params: { cliCommandOptions: CliCommandOptions })
     console.log(chalk.cyan("Theme type:"));
 
     const { value: themeType } = await cliSelect<ThemeType>({
-        values: [...THEME_TYPES]
+        values: [...themeTypes]
     }).catch(() => {
         process.exit(-1);
     });
@@ -54,10 +54,10 @@ export async function command(params: { cliCommandOptions: CliCommandOptions })
                     return [
                         templateValue,
                         userProfileFormFieldsValue,
-                        ...LOGIN_THEME_PAGE_IDS
+                        ...loginThemePageIds
                     ];
                 case "account":
-                    return [templateValue, ...ACCOUNT_THEME_PAGE_IDS];
+                    return [templateValue, ...accountThemePageIds];
             }
             assert<Equals<typeof themeType, never>>(false);
         })()

src/bin/initialize-account-theme/copyBoilerplate.ts

@@ -1,32 +0,0 @@
-import * as fs from "fs";
-import { join as pathJoin } from "path";
-import { getThisCodebaseRootDirPath } from "../tools/getThisCodebaseRootDirPath";
-import { assert, type Equals } from "tsafe/assert";
-
-export function copyBoilerplate(params: {
-    accountThemeType: "Single-Page" | "Multi-Page";
-    accountThemeSrcDirPath: string;
-}) {
-    const { accountThemeType, accountThemeSrcDirPath } = params;
-
-    fs.cpSync(
-        pathJoin(
-            getThisCodebaseRootDirPath(),
-            "src",
-            "bin",
-            "initialize-account-theme",
-            "src",
-            (() => {
-                switch (accountThemeType) {
-                    case "Single-Page":
-                        return "single-page";
-                    case "Multi-Page":
-                        return "multi-page";
-                }
-                assert<Equals<typeof accountThemeType, never>>(false);
-            })()
-        ),
-        accountThemeSrcDirPath,
-        { recursive: true }
-    );
-}

src/bin/initialize-account-theme/index.ts

@@ -1 +0,0 @@
-export * from "./initialize-account-theme";

src/bin/initialize-account-theme/initialize-account-theme.ts

@@ -1,95 +0,0 @@
-import { getBuildContext } from "../shared/buildContext";
-import type { CliCommandOptions } from "../main";
-import cliSelect from "cli-select";
-import child_process from "child_process";
-import chalk from "chalk";
-import { join as pathJoin, relative as pathRelative } from "path";
-import * as fs from "fs";
-import { updateAccountThemeImplementationInConfig } from "./updateAccountThemeImplementationInConfig";
-
-export async function command(params: { cliCommandOptions: CliCommandOptions }) {
-    const { cliCommandOptions } = params;
-
-    const buildContext = getBuildContext({ cliCommandOptions });
-
-    const accountThemeSrcDirPath = pathJoin(buildContext.themeSrcDirPath, "account");
-
-    if (fs.existsSync(accountThemeSrcDirPath)) {
-        console.warn(
-            chalk.red(
-                `There is already a ${pathRelative(
-                    process.cwd(),
-                    accountThemeSrcDirPath
-                )} directory in your project. Aborting.`
-            )
-        );
-
-        process.exit(-1);
-    }
-
-    exit_if_uncommitted_changes: {
-        let hasUncommittedChanges: boolean | undefined = undefined;
-
-        try {
-            hasUncommittedChanges =
-                child_process
-                    .execSync(`git status --porcelain`, {
-                        cwd: buildContext.projectDirPath
-                    })
-                    .toString()
-                    .trim() !== "";
-        } catch {
-            // Probably not a git repository
-            break exit_if_uncommitted_changes;
-        }
-
-        if (!hasUncommittedChanges) {
-            break exit_if_uncommitted_changes;
-        }
-        console.warn(
-            [
-                chalk.red(
-                    "Please commit or stash your changes before running this command.\n"
-                ),
-                "This command will modify your project's files so it's better to have a clean working directory",
-                "so that you can easily see what has been changed and revert if needed."
-            ].join(" ")
-        );
-
-        process.exit(-1);
-    }
-
-    const { value: accountThemeType } = await cliSelect({
-        values: ["Single-Page" as const, "Multi-Page" as const]
-    }).catch(() => {
-        process.exit(-1);
-    });
-
-    switch (accountThemeType) {
-        case "Multi-Page":
-            {
-                const { initializeAccountTheme_multiPage } = await import(
-                    "./initializeAccountTheme_multiPage"
-                );
-
-                await initializeAccountTheme_multiPage({
-                    accountThemeSrcDirPath
-                });
-            }
-            break;
-        case "Single-Page":
-            {
-                const { initializeAccountTheme_singlePage } = await import(
-                    "./initializeAccountTheme_singlePage"
-                );
-
-                await initializeAccountTheme_singlePage({
-                    accountThemeSrcDirPath,
-                    buildContext
-                });
-            }
-            break;
-    }
-
-    updateAccountThemeImplementationInConfig({ buildContext, accountThemeType });
-}

src/bin/initialize-account-theme/initializeAccountTheme_multiPage.ts

@@ -1,21 +0,0 @@
-import { relative as pathRelative } from "path";
-import chalk from "chalk";
-import { copyBoilerplate } from "./copyBoilerplate";
-
-export async function initializeAccountTheme_multiPage(params: {
-    accountThemeSrcDirPath: string;
-}) {
-    const { accountThemeSrcDirPath } = params;
-
-    copyBoilerplate({
-        accountThemeType: "Multi-Page",
-        accountThemeSrcDirPath
-    });
-
-    console.log(
-        [
-            chalk.green("The Multi-Page account theme has been initialized."),
-            `Directory created: ${chalk.bold(pathRelative(process.cwd(), accountThemeSrcDirPath))}`
-        ].join("\n")
-    );
-}

src/bin/initialize-account-theme/initializeAccountTheme_singlePage.ts

@@ -1,150 +0,0 @@
-import { join as pathJoin, relative as pathRelative, dirname as pathDirname } from "path";
-import type { BuildContext } from "../shared/buildContext";
-import * as fs from "fs";
-import chalk from "chalk";
-import { getLatestsSemVersionedTag } from "../shared/getLatestsSemVersionedTag";
-import fetch from "make-fetch-happen";
-import { z } from "zod";
-import { assert, type Equals } from "tsafe/assert";
-import { is } from "tsafe/is";
-import { id } from "tsafe/id";
-import { npmInstall } from "../tools/npmInstall";
-import { copyBoilerplate } from "./copyBoilerplate";
-import { getThisCodebaseRootDirPath } from "../tools/getThisCodebaseRootDirPath";
-
-type BuildContextLike = {
-    cacheDirPath: string;
-    fetchOptions: BuildContext["fetchOptions"];
-    packageJsonFilePath: string;
-};
-
-assert<BuildContext extends BuildContextLike ? true : false>();
-
-export async function initializeAccountTheme_singlePage(params: {
-    accountThemeSrcDirPath: string;
-    buildContext: BuildContextLike;
-}) {
-    const { accountThemeSrcDirPath, buildContext } = params;
-
-    const OWNER = "keycloakify";
-    const REPO = "keycloak-account-ui";
-
-    const [semVersionedTag] = await getLatestsSemVersionedTag({
-        cacheDirPath: buildContext.cacheDirPath,
-        owner: OWNER,
-        repo: REPO,
-        count: 1,
-        doIgnoreReleaseCandidates: false
-    });
-
-    const dependencies = await fetch(
-        `https://raw.githubusercontent.com/${OWNER}/${REPO}/${semVersionedTag.tag}/dependencies.gen.json`,
-        buildContext.fetchOptions
-    )
-        .then(r => r.json())
-        .then(
-            (() => {
-                type Dependencies = {
-                    dependencies: Record<string, string>;
-                    devDependencies?: Record<string, string>;
-                };
-
-                const zDependencies = (() => {
-                    type TargetType = Dependencies;
-
-                    const zTargetType = z.object({
-                        dependencies: z.record(z.string()),
-                        devDependencies: z.record(z.string()).optional()
-                    });
-
-                    assert<Equals<z.infer<typeof zTargetType>, TargetType>>();
-
-                    return id<z.ZodType<TargetType>>(zTargetType);
-                })();
-
-                return o => zDependencies.parse(o);
-            })()
-        );
-
-    dependencies.dependencies["@keycloakify/keycloak-account-ui"] = semVersionedTag.tag;
-
-    const parsedPackageJson = (() => {
-        type ParsedPackageJson = {
-            dependencies?: Record<string, string>;
-            devDependencies?: Record<string, string>;
-        };
-
-        const zParsedPackageJson = (() => {
-            type TargetType = ParsedPackageJson;
-
-            const zTargetType = z.object({
-                dependencies: z.record(z.string()).optional(),
-                devDependencies: z.record(z.string()).optional()
-            });
-
-            assert<Equals<z.infer<typeof zTargetType>, TargetType>>();
-
-            return id<z.ZodType<TargetType>>(zTargetType);
-        })();
-        const parsedPackageJson = JSON.parse(
-            fs.readFileSync(buildContext.packageJsonFilePath).toString("utf8")
-        );
-
-        zParsedPackageJson.parse(parsedPackageJson);
-
-        assert(is<ParsedPackageJson>(parsedPackageJson));
-
-        return parsedPackageJson;
-    })();
-
-    parsedPackageJson.dependencies = {
-        ...parsedPackageJson.dependencies,
-        ...dependencies.dependencies
-    };
-
-    parsedPackageJson.devDependencies = {
-        ...parsedPackageJson.devDependencies,
-        ...dependencies.devDependencies
-    };
-
-    if (Object.keys(parsedPackageJson.devDependencies).length === 0) {
-        delete parsedPackageJson.devDependencies;
-    }
-
-    fs.writeFileSync(
-        buildContext.packageJsonFilePath,
-        JSON.stringify(parsedPackageJson, undefined, 4)
-    );
-
-    run_npm_install: {
-        if (
-            JSON.parse(
-                fs
-                    .readFileSync(pathJoin(getThisCodebaseRootDirPath(), "package.json"))
-                    .toString("utf8")
-            )["version"] === "0.0.0"
-        ) {
-            //NOTE: Linked version
-            break run_npm_install;
-        }
-
-        npmInstall({ packageJsonDirPath: pathDirname(buildContext.packageJsonFilePath) });
-    }
-
-    copyBoilerplate({
-        accountThemeType: "Single-Page",
-        accountThemeSrcDirPath
-    });
-
-    console.log(
-        [
-            chalk.green(
-                "The Single-Page account theme has been successfully initialized."
-            ),
-            `Using Account UI of Keycloak version: ${chalk.bold(semVersionedTag.tag.split("-")[0])}`,
-            `Directory created: ${chalk.bold(pathRelative(process.cwd(), accountThemeSrcDirPath))}`,
-            `Dependencies added to your project's package.json: `,
-            chalk.bold(JSON.stringify(dependencies, null, 2))
-        ].join("\n")
-    );
-}

src/bin/initialize-account-theme/src/multi-page/KcContext.ts

@@ -1,12 +0,0 @@
-/* eslint-disable @typescript-eslint/ban-types */
-import type { ExtendKcContext } from "keycloakify/account";
-import type { KcEnvName, ThemeName } from "../kc.gen";
-
-export type KcContextExtension = {
-    themeName: ThemeName;
-    properties: Record<KcEnvName, string> & {};
-};
-
-export type KcContextExtensionPerPage = {};
-
-export type KcContext = ExtendKcContext<KcContextExtension, KcContextExtensionPerPage>;

src/bin/initialize-account-theme/src/multi-page/KcPage.tsx

@@ -1,25 +0,0 @@
-import { Suspense } from "react";
-import type { ClassKey } from "keycloakify/account";
-import type { KcContext } from "./KcContext";
-import { useI18n } from "./i18n";
-import DefaultPage from "keycloakify/account/DefaultPage";
-import Template from "keycloakify/account/Template";
-
-export default function KcPage(props: { kcContext: KcContext }) {
-    const { kcContext } = props;
-
-    const { i18n } = useI18n({ kcContext });
-
-    return (
-        <Suspense>
-            {(() => {
-                switch (kcContext.pageId) {
-                    default:
-                        return <DefaultPage kcContext={kcContext} i18n={i18n} classes={classes} Template={Template} doUseDefaultCss={true} />;
-                }
-            })()}
-        </Suspense>
-    );
-}
-
-const classes = {} satisfies { [key in ClassKey]?: string };

src/bin/initialize-account-theme/src/multi-page/KcPageStory.tsx

@@ -1,38 +0,0 @@
-import type { DeepPartial } from "keycloakify/tools/DeepPartial";
-import type { KcContext } from "./KcContext";
-import { createGetKcContextMock } from "keycloakify/account/KcContext";
-import type { KcContextExtension, KcContextExtensionPerPage } from "./KcContext";
-import KcPage from "./KcPage";
-import { themeNames, kcEnvDefaults } from "../kc.gen";
-
-const kcContextExtension: KcContextExtension = {
-    themeName: themeNames[0],
-    properties: {
-        ...kcEnvDefaults
-    }
-};
-const kcContextExtensionPerPage: KcContextExtensionPerPage = {};
-
-export const { getKcContextMock } = createGetKcContextMock({
-    kcContextExtension,
-    kcContextExtensionPerPage,
-    overrides: {},
-    overridesPerPage: {}
-});
-
-export function createKcPageStory<PageId extends KcContext["pageId"]>(params: { pageId: PageId }) {
-    const { pageId } = params;
-
-    function KcPageStory(props: { kcContext?: DeepPartial<Extract<KcContext, { pageId: PageId }>> }) {
-        const { kcContext: overrides } = props;
-
-        const kcContextMock = getKcContextMock({
-            pageId,
-            overrides
-        });
-
-        return <KcPage kcContext={kcContextMock} />;
-    }
-
-    return { KcPageStory };
-}

src/bin/initialize-account-theme/src/multi-page/i18n.ts

@@ -1,5 +0,0 @@
-import { createUseI18n } from "keycloakify/account";
-
-export const { useI18n, ofTypeI18n } = createUseI18n({});
-
-export type I18n = typeof ofTypeI18n;

src/bin/initialize-account-theme/src/single-page/KcContext.ts

@@ -1,7 +0,0 @@
-import type { KcContextLike } from "@keycloakify/keycloak-account-ui";
-import type { KcEnvName } from "../kc.gen";
-
-export type KcContext = KcContextLike & {
-    themeType: "account";
-    properties: Record<KcEnvName, string>;
-};

src/bin/initialize-account-theme/src/single-page/KcPage.tsx

@@ -1,11 +0,0 @@
-import { lazy } from "react";
-import { KcAccountUiLoader } from "@keycloakify/keycloak-account-ui";
-import type { KcContext } from "./KcContext";
-
-const KcAccountUi = lazy(() => import("@keycloakify/keycloak-account-ui/KcAccountUi"));
-
-export default function KcPage(props: { kcContext: KcContext }) {
-    const { kcContext } = props;
-
-    return <KcAccountUiLoader kcContext={kcContext} KcAccountUi={KcAccountUi} />;
-}

src/bin/initialize-account-theme/updateAccountThemeImplementationInConfig.ts

@@ -1,92 +0,0 @@
-import { join as pathJoin } from "path";
-import { assert, type Equals } from "tsafe/assert";
-import type { BuildContext } from "../shared/buildContext";
-import * as fs from "fs";
-import chalk from "chalk";
-import { z } from "zod";
-import { id } from "tsafe/id";
-
-export type BuildContextLike = {
-    bundler: BuildContext["bundler"];
-};
-
-assert<BuildContext extends BuildContextLike ? true : false>();
-
-export function updateAccountThemeImplementationInConfig(params: {
-    buildContext: BuildContext;
-    accountThemeType: "Single-Page" | "Multi-Page";
-}) {
-    const { buildContext, accountThemeType } = params;
-
-    switch (buildContext.bundler) {
-        case "vite":
-            {
-                const viteConfigPath = pathJoin(
-                    buildContext.projectDirPath,
-                    "vite.config.ts"
-                );
-
-                if (!fs.existsSync(viteConfigPath)) {
-                    console.log(
-                        chalk.bold(
-                            `You must manually set the accountThemeImplementation to "${accountThemeType}" in your vite config`
-                        )
-                    );
-                    break;
-                }
-
-                const viteConfigContent = fs
-                    .readFileSync(viteConfigPath)
-                    .toString("utf8");
-
-                const modifiedViteConfigContent = viteConfigContent.replace(
-                    /accountThemeImplementation\s*:\s*"none"/,
-                    `accountThemeImplementation: "${accountThemeType}"`
-                );
-
-                if (modifiedViteConfigContent === viteConfigContent) {
-                    console.log(
-                        chalk.bold(
-                            `You must manually set the accountThemeImplementation to "${accountThemeType}" in your vite.config.ts`
-                        )
-                    );
-                    break;
-                }
-
-                fs.writeFileSync(viteConfigPath, modifiedViteConfigContent);
-            }
-            break;
-        case "webpack":
-            {
-                const parsedPackageJson = (() => {
-                    type ParsedPackageJson = {
-                        keycloakify: Record<string, string>;
-                    };
-
-                    const zParsedPackageJson = (() => {
-                        type TargetType = ParsedPackageJson;
-
-                        const zTargetType = z.object({
-                            keycloakify: z.record(z.string())
-                        });
-
-                        assert<Equals<z.infer<typeof zTargetType>, TargetType>>();
-
-                        return id<z.ZodType<TargetType>>(zTargetType);
-                    })();
-
-                    return zParsedPackageJson.parse(
-                        JSON.parse(
-                            fs
-                                .readFileSync(buildContext.packageJsonFilePath)
-                                .toString("utf8")
-                        )
-                    );
-                })();
-
-                parsedPackageJson.keycloakify.accountThemeImplementation =
-                    accountThemeType;
-            }
-            break;
-    }
-}

src/bin/keycloakify/buildJars/buildJar.ts

@@ -7,7 +7,7 @@ import { join as pathJoin, dirname as pathDirname } from "path";
 import { transformCodebase } from "../../tools/transformCodebase";
 import type { BuildContext } from "../../shared/buildContext";
 import * as fs from "fs/promises";
-import { ACCOUNT_V1_THEME_NAME } from "../../shared/constants";
+import { accountV1ThemeName } from "../../shared/constants";
 import {
     generatePom,
     BuildContextLike as BuildContextLike_generatePom
@@ -24,7 +24,6 @@ export type BuildContextLike = BuildContextLike_generatePom & {
     artifactId: string;
     themeVersion: string;
     cacheDirPath: string;
-    implementedThemeTypes: BuildContext["implementedThemeTypes"];
 };
 
 assert<BuildContext extends BuildContextLike ? true : false>();
@@ -34,7 +33,6 @@ export async function buildJar(params: {
     keycloakAccountV1Version: KeycloakAccountV1Version;
     keycloakThemeAdditionalInfoExtensionVersion: KeycloakThemeAdditionalInfoExtensionVersion;
     resourcesDirPath: string;
-    doesImplementAccountV1Theme: boolean;
     buildContext: BuildContextLike;
 }): Promise<void> {
     const {
@@ -42,30 +40,28 @@ export async function buildJar(params: {
         keycloakAccountV1Version,
         keycloakThemeAdditionalInfoExtensionVersion,
         resourcesDirPath,
-        doesImplementAccountV1Theme,
         buildContext
     } = params;
 
-    const keycloakifyBuildCacheDirPath = pathJoin(
+    const keycloakifyBuildTmpDirPath = pathJoin(
         buildContext.cacheDirPath,
-        "maven",
         jarFileBasename.replace(".jar", "")
     );
 
+    rmSync(keycloakifyBuildTmpDirPath, { recursive: true, force: true });
+
     const tmpResourcesDirPath = pathJoin(
-        keycloakifyBuildCacheDirPath,
+        keycloakifyBuildTmpDirPath,
         "src",
         "main",
         "resources"
     );
 
-    rmSync(tmpResourcesDirPath, { recursive: true, force: true });
-
     transformCodebase({
         srcDirPath: resourcesDirPath,
         destDirPath: tmpResourcesDirPath,
         transformSourceCode:
-            !doesImplementAccountV1Theme || keycloakAccountV1Version !== null
+            keycloakAccountV1Version !== null
                 ? undefined
                 : (params: {
                       fileRelativePath: string;
@@ -75,7 +71,7 @@ export async function buildJar(params: {
 
                       if (
                           isInside({
-                              dirPath: pathJoin("theme", ACCOUNT_V1_THEME_NAME),
+                              dirPath: pathJoin("theme", accountV1ThemeName),
                               filePath: fileRelativePath
                           })
                       ) {
@@ -91,7 +87,7 @@ export async function buildJar(params: {
                                   sourceCode
                                       .toString("utf8")
                                       .replace(
-                                          `parent=${ACCOUNT_V1_THEME_NAME}`,
+                                          `parent=${accountV1ThemeName}`,
                                           "parent=keycloak"
                                       ),
                                   "utf8"
@@ -109,24 +105,14 @@ export async function buildJar(params: {
                   }
     });
 
-    remove_account_v1_in_meta_inf: {
-        if (!doesImplementAccountV1Theme) {
-            // NOTE: We do not have account v1 anyway
-            break remove_account_v1_in_meta_inf;
-        }
-
-        if (keycloakAccountV1Version !== null) {
-            // NOTE: No, we need to keep account-v1 in meta-inf
-            break remove_account_v1_in_meta_inf;
-        }
-
+    if (keycloakAccountV1Version === null) {
         writeMetaInfKeycloakThemes({
             resourcesDirPath: tmpResourcesDirPath,
             getNewMetaInfKeycloakTheme: ({ metaInfKeycloakTheme }) => {
                 assert(metaInfKeycloakTheme !== undefined);
 
                 metaInfKeycloakTheme.themes = metaInfKeycloakTheme.themes.filter(
-                    ({ name }) => name !== ACCOUNT_V1_THEME_NAME
+                    ({ name }) => name !== accountV1ThemeName
                 );
 
                 return metaInfKeycloakTheme;
@@ -135,10 +121,6 @@ export async function buildJar(params: {
     }
 
     route_legacy_pages: {
-        if (!buildContext.implementedThemeTypes.login.isImplemented) {
-            break route_legacy_pages;
-        }
-
         // NOTE: If there's no account theme there is no special target for keycloak 24 and up so we create
         // the pages anyway. If there is an account pages, since we know that account-v1 is only support keycloak
         // 24 in version 0.4 and up, we can safely break the route for legacy pages.
@@ -153,7 +135,6 @@ export async function buildJar(params: {
             }
         })();
 
-        // TODO: Remove this optimization, it's a bit hacky.
         if (doBreak) {
             break route_legacy_pages;
         }
@@ -161,7 +142,10 @@ export async function buildJar(params: {
         (["register.ftl", "login-update-profile.ftl"] as const).forEach(pageId =>
             buildContext.themeNames.map(themeName => {
                 const ftlFilePath = pathJoin(
-                    tmpResourcesDirPath,
+                    keycloakifyBuildTmpDirPath,
+                    "src",
+                    "main",
+                    "resources",
                     "theme",
                     themeName,
                     "login",
@@ -170,7 +154,7 @@ export async function buildJar(params: {
 
                 const ftlFileContent = readFileSync(ftlFilePath).toString("utf8");
 
-                const ftlFileBasename = (() => {
+                const realPageId = (() => {
                     switch (pageId) {
                         case "register.ftl":
                             return "register-user-profile.ftl";
@@ -181,14 +165,14 @@ export async function buildJar(params: {
                 })();
 
                 const modifiedFtlFileContent = ftlFileContent.replace(
-                    `"ftlTemplateFileName": "${pageId}"`,
-                    `"ftlTemplateFileName": "${ftlFileBasename}"`
+                    `kcContext.pageId = "\${pageId}";`,
+                    `kcContext.pageId = "${pageId}"; kcContext.realPageId = "${realPageId}";`
                 );
 
                 assert(modifiedFtlFileContent !== ftlFileContent);
 
                 fs.writeFile(
-                    pathJoin(pathDirname(ftlFilePath), ftlFileBasename),
+                    pathJoin(pathDirname(ftlFilePath), realPageId),
                     Buffer.from(modifiedFtlFileContent, "utf8")
                 );
             })
@@ -203,15 +187,15 @@ export async function buildJar(params: {
         });
 
         await fs.writeFile(
-            pathJoin(keycloakifyBuildCacheDirPath, "pom.xml"),
+            pathJoin(keycloakifyBuildTmpDirPath, "pom.xml"),
             Buffer.from(pomFileCode, "utf8")
         );
     }
 
     await new Promise<void>((resolve, reject) =>
         child_process.exec(
-            `mvn install -Dmaven.repo.local="${pathJoin(keycloakifyBuildCacheDirPath, ".m2")}"`,
-            { cwd: keycloakifyBuildCacheDirPath },
+            `mvn clean install -Dmaven.repo.local=${pathJoin(keycloakifyBuildTmpDirPath, ".m2")}`,
+            { cwd: keycloakifyBuildTmpDirPath },
             error => {
                 if (error !== null) {
                     console.error(
@@ -236,10 +220,12 @@ export async function buildJar(params: {
 
     await fs.rename(
         pathJoin(
-            keycloakifyBuildCacheDirPath,
+            keycloakifyBuildTmpDirPath,
             "target",
             `${buildContext.artifactId}-${buildContext.themeVersion}.jar`
         ),
         pathJoin(buildContext.keycloakifyBuildDirPath, jarFileBasename)
     );
+
+    rmSync(keycloakifyBuildTmpDirPath, { recursive: true });
 }

src/bin/keycloakify/buildJars/buildJars.ts

@@ -10,7 +10,7 @@ import type { BuildContext } from "../../shared/buildContext";
 export type BuildContextLike = BuildContextLike_buildJar & {
     projectDirPath: string;
     keycloakifyBuildDirPath: string;
-    implementedThemeTypes: BuildContext["implementedThemeTypes"];
+    recordIsImplementedByThemeType: BuildContext["recordIsImplementedByThemeType"];
     jarTargets: BuildContext["jarTargets"];
 };
 
@@ -22,9 +22,7 @@ export async function buildJars(params: {
 }): Promise<void> {
     const { resourcesDirPath, buildContext } = params;
 
-    const doesImplementAccountV1Theme =
-        buildContext.implementedThemeTypes.account.isImplemented &&
-        buildContext.implementedThemeTypes.account.type === "Multi-Page";
+    const doesImplementAccountTheme = buildContext.recordIsImplementedByThemeType.account;
 
     await Promise.all(
         keycloakAccountV1Versions
@@ -32,7 +30,7 @@ export async function buildJars(params: {
                 keycloakThemeAdditionalInfoExtensionVersions.map(
                     keycloakThemeAdditionalInfoExtensionVersion => {
                         const keycloakVersionRange = getKeycloakVersionRangeForJar({
-                            doesImplementAccountV1Theme,
+                            doesImplementAccountTheme,
                             keycloakAccountV1Version,
                             keycloakThemeAdditionalInfoExtensionVersion
                         });
@@ -57,7 +55,6 @@ export async function buildJars(params: {
                             keycloakAccountV1Version,
                             keycloakThemeAdditionalInfoExtensionVersion,
                             resourcesDirPath,
-                            doesImplementAccountV1Theme,
                             buildContext
                         });
                     }

src/bin/keycloakify/buildJars/getKeycloakVersionRangeForJar.ts

@@ -6,17 +6,17 @@ import type {
 import type { KeycloakVersionRange } from "../../shared/KeycloakVersionRange";
 
 export function getKeycloakVersionRangeForJar(params: {
-    doesImplementAccountV1Theme: boolean;
+    doesImplementAccountTheme: boolean;
     keycloakAccountV1Version: KeycloakAccountV1Version;
     keycloakThemeAdditionalInfoExtensionVersion: KeycloakThemeAdditionalInfoExtensionVersion;
 }): KeycloakVersionRange | undefined {
     const {
         keycloakAccountV1Version,
         keycloakThemeAdditionalInfoExtensionVersion,
-        doesImplementAccountV1Theme
+        doesImplementAccountTheme
     } = params;
 
-    if (doesImplementAccountV1Theme) {
+    if (doesImplementAccountTheme) {
         const keycloakVersionRange = (() => {
             switch (keycloakAccountV1Version) {
                 case null:
@@ -63,7 +63,7 @@ export function getKeycloakVersionRangeForJar(params: {
         assert<
             Equals<
                 typeof keycloakVersionRange,
-                KeycloakVersionRange.WithAccountV1Theme | undefined
+                KeycloakVersionRange.WithAccountTheme | undefined
             >
         >();
 
@@ -87,7 +87,7 @@ export function getKeycloakVersionRangeForJar(params: {
         assert<
             Equals<
                 typeof keycloakVersionRange,
-                KeycloakVersionRange.WithoutAccountV1Theme | undefined
+                KeycloakVersionRange.WithoutAccountTheme | undefined
             >
         >();
 

src/bin/keycloakify/generateFtl/generateFtl.ts

@@ -1,29 +1,25 @@
 import cheerio from "cheerio";
-import {
-    replaceImportsInJsCode,
-    BuildContextLike as BuildContextLike_replaceImportsInJsCode
-} from "../replacers/replaceImportsInJsCode";
-import {
-    replaceImportsInCssCode,
-    BuildContextLike as BuildContextLike_replaceImportsInCssCode
-} from "../replacers/replaceImportsInCssCode";
+import { replaceImportsInJsCode } from "../replacers/replaceImportsInJsCode";
+import { replaceImportsInCssCode } from "../replacers/replaceImportsInCssCode";
 import * as fs from "fs";
 import { join as pathJoin } from "path";
 import type { BuildContext } from "../../shared/buildContext";
 import { assert } from "tsafe/assert";
 import {
     type ThemeType,
-    BASENAME_OF_KEYCLOAKIFY_RESOURCES_DIR,
-    RESOURCES_COMMON
+    basenameOfTheKeycloakifyResourcesDir,
+    resources_common
 } from "../../shared/constants";
 import { getThisCodebaseRootDirPath } from "../../tools/getThisCodebaseRootDirPath";
 
-export type BuildContextLike = BuildContextLike_replaceImportsInJsCode &
-    BuildContextLike_replaceImportsInCssCode & {
-        urlPathname: string | undefined;
-        themeVersion: string;
-        kcContextExclusionsFtlCode: string | undefined;
-    };
+export type BuildContextLike = {
+    bundler: "vite" | "webpack";
+    themeVersion: string;
+    urlPathname: string | undefined;
+    projectBuildDirPath: string;
+    assetsDirPath: string;
+    kcContextExclusionsFtlCode: string | undefined;
+};
 
 assert<BuildContext extends BuildContextLike ? true : false>();
 
@@ -93,7 +89,7 @@ export function generateFtlFilesCodeFactory(params: {
                         new RegExp(
                             `^${(buildContext.urlPathname ?? "/").replace(/\//g, "\\/")}`
                         ),
-                        `\${xKeycloakify.resourcesPath}/${BASENAME_OF_KEYCLOAKIFY_RESOURCES_DIR}/`
+                        `\${url.resourcesPath}/${basenameOfTheKeycloakifyResourcesDir}/`
                     )
                 );
             })
@@ -113,17 +109,19 @@ export function generateFtlFilesCodeFactory(params: {
             )
         )
         .toString("utf8")
-        .replace("{{themeType}}", themeType)
-        .replace("{{themeName}}", themeName)
-        .replace("{{keycloakifyVersion}}", keycloakifyVersion)
-        .replace("{{themeVersion}}", buildContext.themeVersion)
-        .replace("{{fieldNames}}", fieldNames.map(name => `"${name}"`).join(", "))
-        .replace("{{RESOURCES_COMMON}}", RESOURCES_COMMON)
         .replace(
-            "{{userDefinedExclusions}}",
+            "FIELD_NAMES_eKsIY4ZsZ4xeM",
+            fieldNames.map(name => `"${name}"`).join(", ")
+        )
+        .replace("KEYCLOAKIFY_VERSION_xEdKd3xEdr", keycloakifyVersion)
+        .replace("KEYCLOAKIFY_THEME_VERSION_sIgKd3xEdr3dx", buildContext.themeVersion)
+        .replace("KEYCLOAKIFY_THEME_TYPE_dExKd3xEdr", themeType)
+        .replace("KEYCLOAKIFY_THEME_NAME_cXxKd3xEer", themeName)
+        .replace("RESOURCES_COMMON_cLsLsMrtDkpVv", resources_common)
+        .replace(
+            "USER_DEFINED_EXCLUSIONS_eKsaY4ZsZ4eMr2",
             buildContext.kcContextExclusionsFtlCode ?? ""
         );
-
     const ftlObjectToJsCodeDeclaringAnObjectPlaceholder =
         '{ "x": "vIdLqMeOed9sdLdIdOxdK0d" }';
 
@@ -168,8 +166,7 @@ export function generateFtlFilesCodeFactory(params: {
         Object.entries({
             [ftlObjectToJsCodeDeclaringAnObjectPlaceholder]:
                 kcContextDeclarationTemplateFtl,
-            "{{pageId}}": pageId,
-            "{{ftlTemplateFileName}}": pageId
+            PAGE_ID_xIgLsPgGId9D8e: pageId
         }).map(
             ([searchValue, replaceValue]) =>
                 (ftlCode = ftlCode.replace(searchValue, replaceValue))

src/bin/keycloakify/generateFtl/kcContextDeclarationTemplate.ftl

@@ -1,50 +1,5 @@
-<#assign xKeycloakify={
-    "messages": {},
-    "pageId": "{{pageId}}",
-    "ftlTemplateFileName": "{{ftlTemplateFileName}}",
-    "themeType": "{{themeType}}",
-    "themeName": "{{themeName}}",
-    "keycloakifyVersion": "{{keycloakifyVersion}}",
-    "themeVersion": "{{themeVersion}}",
-    "resourcesPath": ""
-}>
-
-<#if url?? && url?is_hash && url.resourcesPath?? && url.resourcesPath?is_string>
-    <#assign xKeycloakify = xKeycloakify + { "resourcesPath": url.resourcesPath }>
-</#if>
-<#if resourceUrl?? && resourceUrl?is_string>
-    <#assign xKeycloakify = xKeycloakify + { "resourcesPath": resourceUrl }>
-</#if>
-
-const kcContext = ${toJsDeclarationString(.data_model, [])?no_esc};
-kcContext.keycloakifyVersion = "${xKeycloakify.keycloakifyVersion}";
-kcContext.themeVersion = "${xKeycloakify.themeVersion}";
-kcContext.themeType = "${xKeycloakify.themeType}";
-kcContext.themeName = "${xKeycloakify.themeName}";
-kcContext.pageId = "${xKeycloakify.pageId}";
-kcContext.ftlTemplateFileName = "${xKeycloakify.ftlTemplateFileName}";
-
-<@addNonAutomaticallyGatherableMessagesToXKeycloakifyMessages />
-
-kcContext["x-keycloakify"] = {};
-
-kcContext["x-keycloakify"].resourcesPath = "${xKeycloakify.resourcesPath}";
-
-{
-    var messages = {};
-    <#list xKeycloakify.messages as key, resolvedMsg>
-        messages["${key}"] = decodeHtmlEntities("${resolvedMsg?js_string}");
-    </#list>
-    kcContext["x-keycloakify"].messages = messages;
-}
-
-if( 
-    kcContext.url instanceof Object &&
-    typeof kcContext.url.resourcesPath === "string"
-){
-    kcContext.url.resourcesCommonPath = kcContext.url.resourcesPath + "/{{RESOURCES_COMMON}}";
-}
-
+<#assign pageId="PAGE_ID_xIgLsPgGId9D8e">
+const kcContext = ${ftl_object_to_js_code_declaring_an_object(.data_model, [])?no_esc};
 if( kcContext.messagesPerField ){
     var existsError_singleFieldName = kcContext.messagesPerField.existsError;
     kcContext.messagesPerField.existsError = function (){
@@ -70,6 +25,46 @@ if( kcContext.messagesPerField ){
         }
     };
 }
+kcContext.keycloakifyVersion = "KEYCLOAKIFY_VERSION_xEdKd3xEdr";
+kcContext.themeVersion = "KEYCLOAKIFY_THEME_VERSION_sIgKd3xEdr3dx";
+kcContext.themeType = "KEYCLOAKIFY_THEME_TYPE_dExKd3xEdr";
+kcContext.themeName = "KEYCLOAKIFY_THEME_NAME_cXxKd3xEer";
+kcContext.pageId = "${pageId}";
+if( kcContext.url && kcContext.url.resourcesPath ){
+    kcContext.url.resourcesCommonPath = kcContext.url.resourcesPath + "/" + "RESOURCES_COMMON_cLsLsMrtDkpVv";
+}
+kcContext["x-keycloakify"] = {};
+<#if profile?? && profile.attributes??>
+    kcContext["x-keycloakify"].realmMessageBundleUserProfile = {
+        <#list profile.attributes as attribute>
+            <#if attribute.annotations?? && attribute.displayName??>
+                "${attribute.displayName}": decodeHtmlEntities("${advancedMsg(attribute.displayName)?js_string}"),
+            </#if>
+            <#if attribute.annotations.inputHelperTextBefore??>
+                "${attribute.annotations.inputHelperTextBefore}": decodeHtmlEntities("${advancedMsg(attribute.annotations.inputHelperTextBefore)?js_string}"),
+            </#if>
+            <#if attribute.annotations.inputHelperTextAfter??>
+                "${attribute.annotations.inputHelperTextAfter}": decodeHtmlEntities("${advancedMsg(attribute.annotations.inputHelperTextAfter)?js_string}"),
+            </#if>
+            <#if attribute.annotations.inputTypePlaceholder??>
+                "${attribute.annotations.inputTypePlaceholder}": decodeHtmlEntities("${advancedMsg(attribute.annotations.inputTypePlaceholder)?js_string}"),
+            </#if>
+            <!-- Loop through the options that are in attribute.validators.options.options -->
+            <#if (
+                attribute.annotations.inputOptionLabelsI18nPrefix?? &&
+                attribute.validators?? &&
+                attribute.validators.options??
+            )>
+                <#list attribute.validators.options.options as option>
+                    "${attribute.annotations.inputOptionLabelsI18nPrefix}.${option}": decodeHtmlEntities("${msg(attribute.annotations.inputOptionLabelsI18nPrefix + "." + option)?js_string}"),
+                </#list>
+            </#if>
+        </#list>
+    };
+</#if>
+<#if pageId == "terms.ftl" || termsAcceptanceRequired?? && termsAcceptanceRequired>
+    kcContext["x-keycloakify"].realmMessageBundleTermsText= decodeHtmlEntities("${msg("termsText")?js_string}");
+</#if>
 attributes_to_attributesByName: {
     if( !kcContext.profile ){
         break attributes_to_attributesByName;
@@ -77,7 +72,7 @@ attributes_to_attributesByName: {
     if( !kcContext.profile.attributes ){
         break attributes_to_attributesByName;
     }
-    var attributes = kcContext.profile.attributes;
+    var attributes =  kcContext.profile.attributes;
     delete kcContext.profile.attributes;
     kcContext.profile.attributesByName = {};
     attributes.forEach(function(attribute){
@@ -95,453 +90,432 @@ function decodeHtmlEntities(htmlStr){
     return element.value;
 }
 
-<#function toJsDeclarationString object path>
-    <#local isHash = -1>
-    <#attempt>
-        <#local isHash = object?is_hash || object?is_hash_ex>
-    <#recover>
-        <#return "ABORT: Can't evaluate if " + path?join(".") + " is a hash">
-    </#attempt>
-
-    <#if isHash>
-        <#if path?size gt 10>
-            <#return "ABORT: Too many recursive calls, path: " + path?join(".")>
-        </#if>
-        <#local keys = -1>
+<#function ftl_object_to_js_code_declaring_an_object object path>
 
+        <#local isHash = "">
         <#attempt>
-            <#local keys = object?keys>
+            <#local isHash = object?is_hash || object?is_hash_ex>
         <#recover>
-            <#return "ABORT: We can't list keys on object">
+            <#return "ABORT: Can't evaluate if " + path?join(".") + " is hash">
         </#attempt>
 
-        <#local outSeq = []>
+        <#if isHash>
 
-        <#list keys as key>
-            <#if ["class","declaredConstructors","superclass","declaringClass" ]?seq_contains(key) >
-                <#continue>
+            <#if path?size gt 10>
+                <#return "ABORT: Too many recursive calls, path: " + path?join(".")>
             </#if>
 
-            <#if (
-                    areSamePath(path, ["url"]) &&
-                    ["loginUpdatePasswordUrl", "loginUpdateProfileUrl", "loginUsernameReminderUrl", "loginUpdateTotpUrl"]?seq_contains(key)
-                ) || (
-                    key == "updateProfileCtx" && 
-                    areSamePath(path, [])
-                ) || (
-                    <#-- https://github.com/keycloakify/keycloakify/pull/65#issuecomment-991896344 (reports with saml-post-form.ftl) -->
-                    <#-- https://github.com/keycloakify/keycloakify/issues/91#issue-1212319466 (reports with error.ftl and Kc18) -->
-                    <#-- https://github.com/keycloakify/keycloakify/issues/109#issuecomment-1134610163 -->
-                    <#-- https://github.com/keycloakify/keycloakify/issues/357 -->
-                    <#-- https://github.com/keycloakify/keycloakify/discussions/406#discussioncomment-7514787 -->
-                    key == "loginAction" && 
-                    areSamePath(path, ["url"]) && 
-                    ["saml-post-form.ftl", "error.ftl", "info.ftl", "login-oauth-grant.ftl", "logout-confirm.ftl", "login-oauth2-device-verify-user-code.ftl"]?seq_contains(xKeycloakify.pageId) &&
-                    !(auth?has_content && auth.showTryAnotherWayLink())
-                ) || (
-                    <#-- https://github.com/keycloakify/keycloakify/issues/362 -->
-                    ["secretData", "value"]?seq_contains(key) && 
-                    areSamePath(path, [ "totp", "otpCredentials", "*" ])
-                ) || (
-                    ["contextData", "idpConfig", "idp", "authenticationSession"]?seq_contains(key) &&
-                    areSamePath(path, ["brokerContext"]) &&
-                    ["login-idp-link-confirm.ftl", "login-idp-link-email.ftl" ]?seq_contains(xKeycloakify.pageId)
-                ) || (
-                    key == "identityProviderBrokerCtx" && 
-                    areSamePath(path, []) &&
-                    ["login-idp-link-confirm.ftl", "login-idp-link-email.ftl" ]?seq_contains(xKeycloakify.pageId)
-                ) ||  (
-                    ["masterAdminClient", "delegateForUpdate", "defaultRole"]?seq_contains(key) &&
-                    areSamePath(path, ["realm"])
-                ) || (
-                    xKeycloakify.pageId == "error.ftl" &&
-                    areSamePath(path, ["realm"]) &&
-                    !["name", "displayName", "displayNameHtml", "internationalizationEnabled", "registrationEmailAsUsername" ]?seq_contains(key)
-                ) || (
-                    xKeycloakify.pageId == "applications.ftl" &&
-                    ( 
-                        key == "realm" || 
-                        key == "container" 
-                    ) &&
-                    isSubpath(path, ["applications", "applications"])
-                ) || (
-                    key == "delegateForUpdate" &&
-                    areSamePath(path, ["user"])
-                ) || (
-                    <#-- Security audit forwarded by Garth (Gmail) -->
-                    key == "saml.signing.private.key" &&
-                    areSamePath(path, ["client", "attributes"])
-                ) || (
-                    <#-- See: https://github.com/keycloakify/keycloakify/issues/534 -->
-                    key == "password" &&
-                    areSamePath(path, ["login"])
-                ) || (
-                    <#-- Remove realmAttributes added by https://github.com/jcputney/keycloak-theme-additional-info-extension for peace of mind. -->
-                    key == "realmAttributes" &&
-                    areSamePath(path, [])
-                ) || (
-                    <#-- attributesByName adds a lot of noise to the output and is not needed, we already have profile.attributes -->
-                    key == "attributesByName" &&
-                    areSamePath(path, ["profile"]) 
-                ) || (
-                    <#-- We already have the attributes in profile speedup the rendering by filtering it out from the register object -->
-                    (key == "attributes" || key == "attributesByName") &&
-                    areSamePath(path, ["register"])
-                ) || (
-                    areSamePath(path, ["properties"]) &&
+            <#local keys = "">
+
+            <#attempt>
+                <#local keys = object?keys>
+            <#recover>
+                <#return "ABORT: We can't list keys on this object">
+            </#attempt>
+
+            <#local out_seq = []>
+
+            <#list keys as key>
+
+                <#if ["class","declaredConstructors","superclass","declaringClass" ]?seq_contains(key) >
+                    <#continue>
+                </#if>
+
+                <#if 
                     (
-                        key?starts_with("kc") || 
-                        key == "locales" || 
-                        key == "import" || 
-                        key == "parent" || 
-                        key == "meta" ||
-                        key == "stylesCommon" ||
-                        key == "styles" ||
-                        key == "accountResourceProvider"
+                        ["loginUpdatePasswordUrl", "loginUpdateProfileUrl", "loginUsernameReminderUrl", "loginUpdateTotpUrl"]?seq_contains(key) && 
+                        are_same_path(path, ["url"])
+                    ) || (
+                        key == "updateProfileCtx" && 
+                        are_same_path(path, [])
+                    ) || (
+                        <#-- https://github.com/keycloakify/keycloakify/pull/65#issuecomment-991896344 (reports with saml-post-form.ftl) -->
+                        <#-- https://github.com/keycloakify/keycloakify/issues/91#issue-1212319466 (reports with error.ftl and Kc18) -->
+                        <#-- https://github.com/keycloakify/keycloakify/issues/109#issuecomment-1134610163 -->
+                        <#-- https://github.com/keycloakify/keycloakify/issues/357 -->
+                        <#-- https://github.com/keycloakify/keycloakify/discussions/406#discussioncomment-7514787 -->
+                        key == "loginAction" && 
+                        are_same_path(path, ["url"]) && 
+                        ["saml-post-form.ftl", "error.ftl", "info.ftl", "login-oauth-grant.ftl", "logout-confirm.ftl", "login-oauth2-device-verify-user-code.ftl"]?seq_contains(pageId) &&
+                        !(auth?has_content && auth.showTryAnotherWayLink())
+                    ) || (
+                        <#-- https://github.com/keycloakify/keycloakify/issues/362 -->
+                        ["secretData", "value"]?seq_contains(key) && 
+                        are_same_path(path, [ "totp", "otpCredentials", "*" ])
+                    ) || (
+                        ["contextData", "idpConfig", "idp", "authenticationSession"]?seq_contains(key) &&
+                        are_same_path(path, ["brokerContext"]) &&
+                        ["login-idp-link-confirm.ftl", "login-idp-link-email.ftl" ]?seq_contains(pageId)
+                    ) || (
+                        key == "identityProviderBrokerCtx" && 
+                        are_same_path(path, []) &&
+                        ["login-idp-link-confirm.ftl", "login-idp-link-email.ftl" ]?seq_contains(pageId)
+                    ) ||  (
+                        ["masterAdminClient", "delegateForUpdate", "defaultRole"]?seq_contains(key) &&
+                        are_same_path(path, ["realm"])
+                    ) || (
+                        "error.ftl" == pageId &&
+                        are_same_path(path, ["realm"]) &&
+                        !["name", "displayName", "displayNameHtml", "internationalizationEnabled", "registrationEmailAsUsername" ]?seq_contains(key)
+                    ) || (
+                        "applications.ftl" == pageId &&
+                        ( 
+                            key == "realm" || 
+                            key == "container" 
+                        ) &&
+                        is_subpath(path, ["applications", "applications"])
+                    ) || (
+                        key == "delegateForUpdate" &&
+                        are_same_path(path, ["user"])
+                    ) || (
+                        <#-- Security audit forwarded by Garth (Gmail) -->
+                        key == "saml.signing.private.key" &&
+                        are_same_path(path, ["client", "attributes"])
+                    ) || (
+                        <#-- See: https://github.com/keycloakify/keycloakify/issues/534 -->
+                        key == "password" &&
+                        are_same_path(path, ["login"])
+                    ) || (
+                        <#-- Remove realmAttributes added by https://github.com/jcputney/keycloak-theme-additional-info-extension for peace of mind. -->
+                        key == "realmAttributes" &&
+                        are_same_path(path, [])
+                    ) || (
+                        <#-- attributesByName adds a lot of noise to the output and is not needed, we already have profile.attributes -->
+                        key == "attributesByName" &&
+                        are_same_path(path, ["profile"]) 
+                    ) || (
+                        <#-- We already have the attributes in profile speedup the rendering by filtering it out from the register object -->
+                        (key == "attributes" || key == "attributesByName") &&
+                        are_same_path(path, ["register"])
+                    ) || (
+                        are_same_path(path, ["properties"]) &&
+                        (
+                            key?starts_with("kc") || 
+                            key == "locales" || 
+                            key == "import" || 
+                            key == "parent" || 
+                            key == "meta" ||
+                            key == "stylesCommon" ||
+                            key == "styles" ||
+                            key == "accountResourceProvider"
+                        )
+                    ) || (
+                        key == "execution" &&
+                        are_same_path(path, [])
+                    ) || (
+                        key == "entity" &&
+                        are_same_path(path, ["user"])
                     )
-                ) || (
-                    key == "execution" &&
-                    areSamePath(path, [])
-                ) || (
-                    key == "entity" &&
-                    areSamePath(path, ["user"])
-                ) || (
-                    key == "attributes" &&
-                    areSamePath(path, ["realm"])
-                )
-            >
-                <#-- <#local outSeq += ["/*" + path?join(".") + "." + key + " excluded*/"]> -->
-                <#continue>
-            </#if>
+                >
+                    <#-- <#local out_seq += ["/*" + path?join(".") + "." + key + " excluded*/"]> -->
+                    <#continue>
+                </#if>
+                
+                <#-- https://github.com/keycloakify/keycloakify/discussions/406 -->
+                <#if (
+                    ["register.ftl", "register-user-profile.ftl", "terms.ftl", "info.ftl", "login.ftl", "login-update-password.ftl", "login-oauth2-device-verify-user-code.ftl"]?seq_contains(pageId) && 
+                    key == "attemptedUsername" && are_same_path(path, ["auth"])
+                )>
+                    <#attempt>
+                        <#-- https://github.com/keycloak/keycloak/blob/3a2bf0c04bcde185e497aaa32d0bb7ab7520cf4a/themes/src/main/resources/theme/base/login/template.ftl#L63 -->
+                        <#if !(auth?has_content && auth.showUsername() && !auth.showResetCredentials())>
+                            <#local out_seq += ["/*" + path?join(".") + "." + key + " excluded*/"]>
+                            <#continue>
+                        </#if>
+                    <#recover>
+                        <#local out_seq += ["/*Accessing attemptedUsername throwed an exception */"]>
+                    </#attempt>
+                </#if>
 
-            <#-- https://github.com/keycloakify/keycloakify/discussions/406 -->
-            <#if (
-                key == "attemptedUsername" &&
-                areSamePath(path, ["auth"]) &&
-                [ 
-                    "register.ftl", "terms.ftl", "info.ftl", "login.ftl", 
-                    "login-update-password.ftl", "login-oauth2-device-verify-user-code.ftl"
-                ]?seq_contains(xKeycloakify.pageId)
-            )>
+                USER_DEFINED_EXCLUSIONS_eKsaY4ZsZ4eMr2
+                
                 <#attempt>
-                    <#-- https://github.com/keycloak/keycloak/blob/3a2bf0c04bcde185e497aaa32d0bb7ab7520cf4a/themes/src/main/resources/theme/base/login/template.ftl#L63 -->
-                    <#if !(auth?has_content && auth.showUsername() && !auth.showResetCredentials())>
-                        <#local outSeq += ["/*" + path?join(".") + "." + key + " excluded*/"]>
+                    <#if !object[key]??>
                         <#continue>
                     </#if>
                 <#recover>
-                    <#local outSeq += ["/*Accessing attemptedUsername throwed an exception */"]>
-                </#attempt>
-            </#if>
-
-            {{userDefinedExclusions}}
-
-            <#attempt>
-                <#if !object[key]??>
+                    <#local out_seq += ["/*Couldn't test if '" + key + "' is available on this object*/"]>
                     <#continue>
-                </#if>
-            <#recover>
-                <#local outSeq += ["/*Couldn't test if '" + key + "' is available on this object*/"]>
-                <#continue>
-            </#attempt>
+                </#attempt>
 
-            <#local propertyValue = -1>
+                <#local propertyValue = "">
 
-            <#attempt>
-                <#local propertyValue = object[key]>
-            <#recover>
-                <#local outSeq += ["/*Couldn't dereference '" + key + "' on this object*/"]>
-                <#continue>
-            </#attempt>
-
-            <#local recOut = toJsDeclarationString(propertyValue, path + [ key ])>
-
-            <#if recOut?starts_with("ABORT:")>
-
-                <#local errorMessage = recOut?remove_beginning("ABORT:")>
-
-                <#if errorMessage != " It's a method" >
-                    <#local outSeq += ["/*" + key + ": " + errorMessage + "*/"]>
-                </#if>
-
-                <#continue>
-            </#if>
-
-            <#local outSeq +=  ['"' + key + '": ' + recOut + ","]>
-
-        </#list>
-
-        <#return (["{"] + outSeq?map(str -> ""?right_pad(4 * (path?size + 1)) + str) + [ ""?right_pad(4 * path?size) + "}"])?join("\n")>
-
-    </#if>
-
-    <#local isMethod = -1>
-    <#attempt>
-        <#local isMethod = object?is_method>
-    <#recover>
-        <#return "ABORT: Can't test if it'sa method.">
-    </#attempt>
-
-    <#if isMethod>
-
-        <#if areSamePath(path, ["auth", "showUsername"])>
-            <#attempt>
-                <#return auth.showUsername()?c>
-            <#recover>
-                <#return "ABORT: Couldn't evaluate auth.showUsername()">
-            </#attempt>
-        </#if>
-
-        <#if areSamePath(path, ["auth", "showResetCredentials"])>
-            <#attempt>
-                <#return auth.showResetCredentials()?c>
-            <#recover>
-                <#return "ABORT: Couldn't evaluate auth.showResetCredentials()">
-            </#attempt>
-        </#if>
-
-        <#if areSamePath(path, ["auth", "showTryAnotherWayLink"])>
-            <#attempt>
-                <#return auth.showTryAnotherWayLink()?c>
-            <#recover>
-                <#return "ABORT: Couldn't evaluate auth.showTryAnotherWayLink()">
-            </#attempt>
-        </#if>
-
-        <#if areSamePath(path, ["url", "getLogoutUrl"])>
-            <#local returnValue = -1>
-            <#attempt>
-                <#local returnValue = url.getLogoutUrl()>
-            <#recover>
-                <#return "ABORT: Couldn't evaluate url.getLogoutUrl()">
-            </#attempt>
-            <#return 'function(){ return "' + returnValue + '"; }'>
-        </#if>
-
-        <#if areSamePath(path, ["totp", "policy", "getAlgorithmKey"])>
-            <#local returnValue = "error">
-            <#if mode?? && mode = "manual">
                 <#attempt>
-                    <#local returnValue = totp.policy.getAlgorithmKey()>
+                    <#local propertyValue = object[key]>
                 <#recover>
-                    <#return "ABORT: Couldn't evaluate totp.policy.getAlgorithmKey()">
+                    <#local out_seq += ["/*Couldn't dereference '" + key + "' on this object*/"]>
+                    <#continue>
                 </#attempt>
-            </#if>
-            <#return 'function(){ return "' + returnValue + '"; }'>
-        </#if>
 
-        <#assign fieldNames = [{{fieldNames}}]>
-        <#if profile?? && profile.attributes??>
-            <#list profile.attributes as attribute>
-                <#if fieldNames?seq_contains(attribute.name)>
+                <#local rec_out = ftl_object_to_js_code_declaring_an_object(propertyValue, path + [ key ])>
+
+                <#if rec_out?starts_with("ABORT:")>
+
+                    <#local errorMessage = rec_out?remove_beginning("ABORT:")>
+
+                    <#if errorMessage != " It's a method" >
+                        <#local out_seq += ["/*" + key + ": " + errorMessage + "*/"]>
+                    </#if>
+
                     <#continue>
                 </#if>
-                <#assign fieldNames += [attribute.name]>
-            </#list>
-        </#if>
 
-        <#if areSamePath(path, ["messagesPerField", "get"])>
-
-            <#local jsFunctionCode = "function (fieldName) { ">
-
-            <#list fieldNames as fieldName>
-
-                <#-- See: https://github.com/keycloakify/keycloakify/issues/217 -->
-                <#if xKeycloakify.pageId == "login.ftl" >
-
-                    <#if fieldName == "username">
-
-                        <#local jsFunctionCode += "if(fieldName === 'username' || fieldName === 'password' ){ ">
-
-                        <#if messagesPerField.exists('username') || messagesPerField.exists('password')>
-                            <#local jsFunctionCode += "return kcContext.message && kcContext.message.summary ? kcContext.message.summary : 'error'; ">
-                        <#else>
-                            <#local jsFunctionCode += "return ''; ">
-                        </#if>
-
-                        <#local jsFunctionCode += "} ">
-
-                        <#continue>
-                    </#if>
-
-                    <#if fieldName == "password">
-                        <#continue>
-                    </#if>
-
-                </#if>
-
-                <#local jsFunctionCode += "if(fieldName === '" + fieldName + "'){ ">
-
-                <#if messagesPerField.exists('${fieldName}')>
-                    <#local jsFunctionCode += 'return decodeHtmlEntities("' + messagesPerField.get('${fieldName}')?js_string + '"); '>
-                <#else>
-                    <#local jsFunctionCode += "return ''; ">
-                </#if>
-
-                <#local jsFunctionCode += "} ">
+                <#local out_seq +=  ['"' + key + '": ' + rec_out + ","]>
 
             </#list>
 
-            <#local jsFunctionCode += "}">
-
-            <#return jsFunctionCode>
+            <#return (["{"] + out_seq?map(str -> ""?right_pad(4 * (path?size + 1)) + str) + [ ""?right_pad(4 * path?size) + "}"])?join("\n")>
 
         </#if>
 
-        <#if areSamePath(path, ["messagesPerField", "existsError"])>
+        <#local isMethod = "">
+        <#attempt>
+            <#local isMethod = object?is_method>
+        <#recover>
+            <#return "ABORT: Can't test if it'sa method.">
+        </#attempt>
 
-            <#local jsFunctionCode = "function (fieldName) { ">
+        <#if isMethod>
 
-            <#list fieldNames as fieldName>
+            <#if are_same_path(path, ["auth", "showUsername"])>
+                <#attempt>
+                    <#return auth.showUsername()?c>
+                <#recover>
+                    <#return "ABORT: Couldn't evaluate auth.showUsername()">
+                </#attempt>
+            </#if>
 
-                <#-- See: https://github.com/keycloakify/keycloakify/issues/217 -->
-                <#if xKeycloakify.pageId == "login.ftl" >
-                    <#if fieldName == "username">
+            <#if are_same_path(path, ["auth", "showResetCredentials"])>
+                <#attempt>
+                    <#return auth.showResetCredentials()?c>
+                <#recover>
+                    <#return "ABORT: Couldn't evaluate auth.showResetCredentials()">
+                </#attempt>
+            </#if>
 
-                        <#local jsFunctionCode += "if(fieldName === 'username' || fieldName === 'password' ){ ">
+            <#if are_same_path(path, ["auth", "showTryAnotherWayLink"])>
+                <#attempt>
+                    <#return auth.showTryAnotherWayLink()?c>
+                <#recover>
+                    <#return "ABORT: Couldn't evaluate auth.showTryAnotherWayLink()">
+                </#attempt>
+            </#if>
 
-                        <#if messagesPerField.existsError('username') || messagesPerField.existsError('password')>
-                            <#local jsFunctionCode += "return true; ">
-                        <#else>
-                            <#local jsFunctionCode += "return false; ">
+            <#if are_same_path(path, ["url", "getLogoutUrl"])>
+                <#local returnValue = "">
+                <#attempt>
+                    <#local returnValue = url.getLogoutUrl()>
+                <#recover>
+                    <#return "ABORT: Couldn't evaluate url.getLogoutUrl()">
+                </#attempt>
+                <#return 'function(){ return "' + returnValue + '"; }'>
+            </#if>
+
+            <#if are_same_path(path, ["totp", "policy", "getAlgorithmKey"])>
+                <#local returnValue = "error">
+                <#if mode?? && mode = "manual">
+                    <#attempt>
+                        <#local returnValue = totp.policy.getAlgorithmKey()>
+                    <#recover>
+                        <#return "ABORT: Couldn't evaluate totp.policy.getAlgorithmKey()">
+                    </#attempt>
+                </#if>
+                <#return 'function(){ return "' + returnValue + '"; }'>
+            </#if>
+
+            <#assign fieldNames = [ FIELD_NAMES_eKsIY4ZsZ4xeM ]>
+            <#if profile?? && profile.attributes??>
+                <#list profile.attributes as attribute>
+                    <#if fieldNames?seq_contains(attribute.name)>
+                        <#continue>
+                    </#if>
+                    <#assign fieldNames += [attribute.name]>
+                </#list>
+            </#if>
+
+            <#if are_same_path(path, ["messagesPerField", "get"])>
+
+                <#local jsFunctionCode = "function (fieldName) { ">
+
+                <#list fieldNames as fieldName>
+
+                    <#-- See: https://github.com/keycloakify/keycloakify/issues/217 -->
+                    <#if pageId == "login.ftl" >
+
+                        <#if fieldName == "username">
+
+                            <#local jsFunctionCode += "if(fieldName === 'username' || fieldName === 'password' ){ ">
+
+                            <#if messagesPerField.exists('username') || messagesPerField.exists('password')>
+                                <#local jsFunctionCode += "return kcContext.message && kcContext.message.summary ? kcContext.message.summary : 'error'; ">
+                            <#else>
+                                <#local jsFunctionCode += "return ''; ">
+                            </#if>
+
+                            <#local jsFunctionCode += "} ">
+
+                            <#continue>
                         </#if>
 
-                        <#local jsFunctionCode += "} ">
+                        <#if fieldName == "password">
+                            <#continue>
+                        </#if>
 
-                        <#continue>
                     </#if>
 
-                    <#if fieldName == "password">
-                        <#continue>
+                    <#local jsFunctionCode += "if(fieldName === '" + fieldName + "'){ ">
+
+                    <#if messagesPerField.exists('${fieldName}')>
+                        <#local jsFunctionCode += 'return decodeHtmlEntities("' + messagesPerField.get('${fieldName}')?js_string + '"); '>
+                    <#else>
+                        <#local jsFunctionCode += "return ''; ">
                     </#if>
-                </#if>
 
-                <#local jsFunctionCode += "if(fieldName === '" + fieldName + "' ){ ">
+                    <#local jsFunctionCode += "} ">
 
-                <#if messagesPerField.existsError('${fieldName}')>
-                    <#local jsFunctionCode += 'return true; '>
-                <#else>
-                    <#local jsFunctionCode += "return false; ">
-                </#if>
+                </#list>
 
                 <#local jsFunctionCode += "}">
 
-            </#list>
+                <#return jsFunctionCode>
 
-            <#local jsFunctionCode += "}">
-
-            <#return jsFunctionCode>
-
-        </#if>
-
-        <#if xKeycloakify.themeType == "account" && areSamePath(path, ["realm", "isInternationalizationEnabled"])>
-            <#attempt>
-                <#return realm.isInternationalizationEnabled()?c>
-            <#recover>
-                <#return "ABORT: Couldn't evaluate realm.isInternationalizationEnabled()">
-            </#attempt>
-        </#if>
-
-        <#return "ABORT: It's a method">
-    </#if>
-
-    <#local isBoolean = -1>
-    <#attempt>
-        <#local isBoolean = object?is_boolean>
-    <#recover>
-        <#return "ABORT: Can't test if it's a boolean">
-    </#attempt>
-
-    <#if isBoolean>
-        <#return object?c>
-    </#if>
-
-    <#local isEnumerable = -1>
-    <#attempt>
-        <#local isEnumerable = object?is_enumerable>
-    <#recover>
-        <#return "ABORT: Can't test if it's an enumerable">
-    </#attempt>
-
-
-    <#if isEnumerable>
-
-        <#local outSeq = []>
-
-        <#local i = 0>
-
-        <#list object as array_item>
-
-            <#if !array_item??>
-                <#local outSeq += ["null,"]>
-                <#continue>
             </#if>
 
-            <#local recOut = toJsDeclarationString(array_item, path + [ i ])>
+            <#if are_same_path(path, ["messagesPerField", "existsError"])>
 
-            <#local i = i + 1>
+                <#local jsFunctionCode = "function (fieldName) { ">
 
-            <#if recOut?starts_with("ABORT:")>
+                <#list fieldNames as fieldName>
 
-                <#local errorMessage = recOut?remove_beginning("ABORT:")>
+                    <#-- See: https://github.com/keycloakify/keycloakify/issues/217 -->
+                    <#if pageId == "login.ftl" >
+                        <#if fieldName == "username">
 
-                <#if errorMessage != " It's a method" >
-                    <#local outSeq += ["/*" + i?string + ": " + errorMessage + "*/"]>
+                            <#local jsFunctionCode += "if(fieldName === 'username' || fieldName === 'password' ){ ">
+
+                            <#if messagesPerField.existsError('username') || messagesPerField.existsError('password')>
+                                <#local jsFunctionCode += "return true; ">
+                            <#else>
+                                <#local jsFunctionCode += "return false; ">
+                            </#if>
+
+                            <#local jsFunctionCode += "} ">
+
+                            <#continue>
+                        </#if>
+
+                        <#if fieldName == "password">
+                            <#continue>
+                        </#if>
+                    </#if>
+
+                    <#local jsFunctionCode += "if(fieldName === '" + fieldName + "' ){ ">
+
+                    <#if messagesPerField.existsError('${fieldName}')>
+                        <#local jsFunctionCode += 'return true; '>
+                    <#else>
+                        <#local jsFunctionCode += "return false; ">
+                    </#if>
+
+                    <#local jsFunctionCode += "}">
+
+                </#list>
+
+                <#local jsFunctionCode += "}">
+
+                <#return jsFunctionCode>
+
+            </#if>
+
+            <#return "ABORT: It's a method">
+        </#if>
+
+        <#local isBoolean = "">
+        <#attempt>
+            <#local isBoolean = object?is_boolean>
+        <#recover>
+            <#return "ABORT: Can't test if it's a boolean">
+        </#attempt>
+
+        <#if isBoolean>
+            <#return object?c>
+        </#if>
+
+        <#local isEnumerable = "">
+        <#attempt>
+            <#local isEnumerable = object?is_enumerable>
+        <#recover>
+            <#return "ABORT: Can't test if it's an enumerable">
+        </#attempt>
+
+
+        <#if isEnumerable>
+
+            <#local out_seq = []>
+
+            <#local i = 0>
+
+            <#list object as array_item>
+
+                <#if !array_item??>
+                    <#local out_seq += ["null,"]>
+                    <#continue>
                 </#if>
 
-                <#continue>
-            </#if>
+                <#local rec_out = ftl_object_to_js_code_declaring_an_object(array_item, path + [ i ])>
 
-            <#local outSeq += [recOut + ","]>
+                <#local i = i + 1>
 
-        </#list>
+                <#if rec_out?starts_with("ABORT:")>
 
-        <#return (["["] + outSeq?map(str -> ""?right_pad(4 * (path?size + 1)) + str) + [ ""?right_pad(4 * path?size) + "]"])?join("\n")>
+                    <#local errorMessage = rec_out?remove_beginning("ABORT:")>
 
-    </#if>
+                    <#if errorMessage != " It's a method" >
+                        <#local out_seq += ["/*" + i?string + ": " + errorMessage + "*/"]>
+                    </#if>
 
-    <#local isDate = -1>
-    <#attempt>
-        <#local isDate = object?is_date_like>
-    <#recover>
-        <#return "ABORT: Can't test if it's a date">
-    </#attempt>
+                    <#continue>
+                </#if>
 
-    <#if isDate>
-        <#return '"' + object?datetime?iso_utc + '"'>
-    </#if>
+                <#local out_seq += [rec_out + ","]>
 
-    <#local isNumber = -1>
-    <#attempt>
-        <#local isNumber = object?is_number>
-    <#recover>
-        <#return "ABORT: Can't test if it's a number">
-    </#attempt>
+            </#list>
 
-    <#if isNumber>
-        <#return object?c>
-    </#if>
+            <#return (["["] + out_seq?map(str -> ""?right_pad(4 * (path?size + 1)) + str) + [ ""?right_pad(4 * path?size) + "]"])?join("\n")>
 
-    <#local isString = -1>
-    <#attempt>
-        <#local isString = object?is_string>
-    <#recover>
-        <#return "ABORT: Can't test if it's a string">
-    </#attempt>
+        </#if>
 
-    <#if isString>
-        <@addToXKeycloakifyMessagesIfMessageKey str=object />
-    </#if>
+        <#local isDate = "">
+        <#attempt>
+            <#local isDate = object?is_date_like>
+        <#recover>
+            <#return "ABORT: Can't test if it's a date">
+        </#attempt>
 
-    <#attempt>
-        <#return '"' + object?js_string + '"'>;
-    <#recover>
-    </#attempt>
+        <#if isDate>
+            <#return '"' + object?datetime?iso_utc + '"'>
+        </#if>
 
-    <#return "ABORT: Couldn't convert into string non hash, non method, non boolean, non number, non enumerable object">
+        <#local isNumber = "">
+        <#attempt>
+            <#local isNumber = object?is_number>
+        <#recover>
+            <#return "ABORT: Can't test if it's a number">
+        </#attempt>
+
+        <#if isNumber>
+            <#return object?c>
+        </#if>
+
+        <#attempt>
+            <#return '"' + object?js_string + '"'>;
+        <#recover>
+        </#attempt>
+
+        <#return "ABORT: Couldn't convert into string non hash, non method, non boolean, non number, non enumerable object">
 
 </#function>
-<#function isSubpath path searchedPath>
+<#function is_subpath path searchedPath>
 
     <#if path?size < searchedPath?size>
         <#return false>
@@ -581,75 +555,6 @@ function decodeHtmlEntities(htmlStr){
 
 </#function>
 
-<#function areSamePath path searchedPath>
-    <#return path?size == searchedPath?size && isSubpath(path, searchedPath)>
-</#function>
-
-<#macro addToXKeycloakifyMessagesIfMessageKey str>
-    <#if !msg?? || !msg?is_method>
-        <#return>
-    </#if>
-    <#if (str?length > 200)>
-        <#return>
-    </#if>
-    <#local key=removeBrackets(str)>
-    <#if key?length==0>
-        <#return>
-    </#if>
-    <#if !(key?matches(r"^[a-zA-Z0-9-_.]*$"))>
-        <#return>
-    </#if>
-    <#local resolvedMsg=msg(key)>
-    <#if resolvedMsg==key>
-        <#return>
-    </#if>
-    <#local messages=xKeycloakify.messages>
-    <#local messages = messages + { key: resolvedMsg }>
-    <#assign xKeycloakify = xKeycloakify + { "messages": messages }>
-</#macro>
-
-<#function removeBrackets str>
-    <#if str?starts_with("${") && str?ends_with("}")>
-        <#return str[2..(str?length-2)]>
-    <#else>
-        <#return str>
-    </#if>
-</#function>
-
-<#macro addNonAutomaticallyGatherableMessagesToXKeycloakifyMessages>
-    <#if profile?? && profile?is_hash && profile.attributes?? && profile.attributes?is_enumerable>
-        <#list profile.attributes as attribute>
-            <#if !(
-                attribute.annotations?? && attribute.annotations?is_hash &&
-                attribute.annotations.inputOptionLabelsI18nPrefix?? && attribute.annotations.inputOptionLabelsI18nPrefix?is_string
-            )>
-                <#continue>
-            </#if>
-            <#local prefix=attribute.annotations.inputOptionLabelsI18nPrefix>
-            <#if !(
-                attribute.validators?? && attribute.validators?is_hash &&
-                attribute.validators.options?? && attribute.validators.options?is_hash &&
-                attribute.validators.options.options?? && attribute.validators.options.options?is_enumerable
-            )>
-                <#continue>
-            </#if>
-            <#list attribute.validators.options.options as option>
-                <#if !option?is_string>
-                    <#continue>
-                </#if>
-                <@addToXKeycloakifyMessagesIfMessageKey str="${prefix}.${option}" />
-            </#list>
-        </#list>
-    </#if>
-    <#if xKeycloakify.pageId == "terms.ftl" || termsAcceptanceRequired?? && termsAcceptanceRequired>
-        <@addToXKeycloakifyMessagesIfMessageKey str="termsText" />
-    </#if>
-    <#if requiredActions?? && requiredActions?is_enumerable>
-        <#list requiredActions as requiredAction>
-            <#if !requiredAction?is_string>
-                <#continue>
-            </#if>
-            <@addToXKeycloakifyMessagesIfMessageKey str="requiredAction.${requiredAction}" />
-        </#list>
-    </#if>
-</#macro>
+<#function are_same_path path searchedPath>
+    <#return path?size == searchedPath?size && is_subpath(path, searchedPath)>
+</#function>

src/bin/keycloakify/generateResources/bringInAccountV1.ts

@@ -3,9 +3,9 @@ import { join as pathJoin } from "path";
 import { assert } from "tsafe/assert";
 import type { BuildContext } from "../../shared/buildContext";
 import {
-    RESOURCES_COMMON,
-    LAST_KEYCLOAK_VERSION_WITH_ACCOUNT_V1,
-    ACCOUNT_V1_THEME_NAME
+    resources_common,
+    lastKeycloakVersionWithAccountV1,
+    accountV1ThemeName
 } from "../../shared/constants";
 import {
     downloadKeycloakDefaultTheme,
@@ -24,14 +24,14 @@ export async function bringInAccountV1(params: {
     const { resourcesDirPath, buildContext } = params;
 
     const { defaultThemeDirPath } = await downloadKeycloakDefaultTheme({
-        keycloakVersion: LAST_KEYCLOAK_VERSION_WITH_ACCOUNT_V1,
+        keycloakVersion: lastKeycloakVersionWithAccountV1,
         buildContext
     });
 
     const accountV1DirPath = pathJoin(
         resourcesDirPath,
         "theme",
-        ACCOUNT_V1_THEME_NAME,
+        accountV1ThemeName,
         "account"
     );
 
@@ -47,7 +47,7 @@ export async function bringInAccountV1(params: {
 
     transformCodebase({
         srcDirPath: pathJoin(defaultThemeDirPath, "keycloak", "common", "resources"),
-        destDirPath: pathJoin(accountV1DirPath, "resources", RESOURCES_COMMON)
+        destDirPath: pathJoin(accountV1DirPath, "resources", resources_common)
     });
 
     fs.writeFileSync(
@@ -69,7 +69,7 @@ export async function bringInAccountV1(params: {
                             "patternfly-additions.min.css"
                         ].map(
                             fileBasename =>
-                                `${RESOURCES_COMMON}/node_modules/patternfly/dist/css/${fileBasename}`
+                                `${resources_common}/node_modules/patternfly/dist/css/${fileBasename}`
                         )
                     ].join(" "),
                 "",

src/bin/keycloakify/generateResources/generateMessageProperties.ts

@@ -1,4 +1,4 @@
-import { type ThemeType, FALLBACK_LANGUAGE_TAG } from "../../shared/constants";
+import { type ThemeType, fallbackLanguageTag } from "../../shared/constants";
 import { crawl } from "../../tools/crawl";
 import { join as pathJoin } from "path";
 import { symToStr } from "tsafe/symToStr";
@@ -22,7 +22,7 @@ export function generateMessageProperties(params: {
         "src",
         themeType,
         "i18n",
-        "messages_defaultSet"
+        "baseMessages"
     );
 
     const baseMessageBundle: { [languageTag: string]: Record<string, string> } =
@@ -168,7 +168,7 @@ export function generateMessageProperties(params: {
                     ...(messageBundle === undefined
                         ? {}
                         : messageBundle[languageTag] ??
-                          messageBundle[FALLBACK_LANGUAGE_TAG] ??
+                          messageBundle[fallbackLanguageTag] ??
                           messageBundle[Object.keys(messageBundle)[0]] ??
                           {})
                 }

src/bin/keycloakify/generateResources/generateResourcesForMainTheme.ts

@@ -4,8 +4,7 @@ import {
     join as pathJoin,
     resolve as pathResolve,
     relative as pathRelative,
-    dirname as pathDirname,
-    basename as pathBasename
+    dirname as pathDirname
 } from "path";
 import { replaceImportsInJsCode } from "../replacers/replaceImportsInJsCode";
 import { replaceImportsInCssCode } from "../replacers/replaceImportsInCssCode";
@@ -15,12 +14,12 @@ import {
 } from "../generateFtl";
 import {
     type ThemeType,
-    LAST_KEYCLOAK_VERSION_WITH_ACCOUNT_V1,
-    KEYCLOAK_RESOURCES,
-    ACCOUNT_V1_THEME_NAME,
-    BASENAME_OF_KEYCLOAKIFY_RESOURCES_DIR,
-    LOGIN_THEME_PAGE_IDS,
-    ACCOUNT_THEME_PAGE_IDS
+    lastKeycloakVersionWithAccountV1,
+    keycloak_resources,
+    accountV1ThemeName,
+    basenameOfTheKeycloakifyResourcesDir,
+    loginThemePageIds,
+    accountThemePageIds
 } from "../../shared/constants";
 import type { BuildContext } from "../../shared/buildContext";
 import { assert, type Equals } from "tsafe/assert";
@@ -43,7 +42,6 @@ import {
 } from "../../shared/metaInfKeycloakThemes";
 import { objectEntries } from "tsafe/objectEntries";
 import { escapeStringForPropertiesFile } from "../../tools/escapeStringForPropertiesFile";
-import { downloadAndExtractArchive } from "../../tools/downloadAndExtractArchive";
 
 export type BuildContextLike = BuildContextLike_kcContextExclusionsFtlCode &
     BuildContextLike_downloadKeycloakStaticResources &
@@ -53,9 +51,8 @@ export type BuildContextLike = BuildContextLike_kcContextExclusionsFtlCode &
         projectDirPath: string;
         projectBuildDirPath: string;
         environmentVariables: { name: string; default: string }[];
-        implementedThemeTypes: BuildContext["implementedThemeTypes"];
+        recordIsImplementedByThemeType: BuildContext["recordIsImplementedByThemeType"];
         themeSrcDirPath: string;
-        bundler: "vite" | "webpack";
     };
 
 assert<BuildContext extends BuildContextLike ? true : false>();
@@ -73,22 +70,17 @@ export async function generateResourcesForMainTheme(params: {
     };
 
     for (const themeType of ["login", "account"] as const) {
-        if (!buildContext.implementedThemeTypes[themeType].isImplemented) {
+        if (!buildContext.recordIsImplementedByThemeType[themeType]) {
             continue;
         }
 
-        const isForAccountSpa =
-            themeType === "account" &&
-            (assert(buildContext.implementedThemeTypes.account.isImplemented),
-            buildContext.implementedThemeTypes.account.type === "Single-Page");
-
         const themeTypeDirPath = getThemeTypeDirPath({ themeType });
 
         apply_replacers_and_move_to_theme_resources: {
             const destDirPath = pathJoin(
                 themeTypeDirPath,
                 "resources",
-                BASENAME_OF_KEYCLOAKIFY_RESOURCES_DIR
+                basenameOfTheKeycloakifyResourcesDir
             );
 
             // NOTE: Prevent accumulation of files in the assets dir, as names are hashed they pile up.
@@ -96,7 +88,7 @@ export async function generateResourcesForMainTheme(params: {
 
             if (
                 themeType === "account" &&
-                buildContext.implementedThemeTypes.login.isImplemented
+                buildContext.recordIsImplementedByThemeType.login
             ) {
                 // NOTE: We prevent doing it twice, it has been done for the login theme.
 
@@ -106,7 +98,7 @@ export async function generateResourcesForMainTheme(params: {
                             themeType: "login"
                         }),
                         "resources",
-                        BASENAME_OF_KEYCLOAKIFY_RESOURCES_DIR
+                        basenameOfTheKeycloakifyResourcesDir
                     ),
                     destDirPath
                 });
@@ -117,7 +109,7 @@ export async function generateResourcesForMainTheme(params: {
             {
                 const dirPath = pathJoin(
                     buildContext.projectBuildDirPath,
-                    KEYCLOAK_RESOURCES
+                    keycloak_resources
                 );
 
                 if (fs.existsSync(dirPath)) {
@@ -125,7 +117,7 @@ export async function generateResourcesForMainTheme(params: {
 
                     throw new Error(
                         [
-                            `Keycloakify build error: The ${KEYCLOAK_RESOURCES} directory shouldn't exist in your build directory.`,
+                            `Keycloakify build error: The ${keycloak_resources} directory shouldn't exist in your build directory.`,
                             `(${pathRelative(process.cwd(), dirPath)}).\n`,
                             `Theses assets are only required for local development with Storybook.",
                             "Please remove this directory as an additional step of your command.\n`,
@@ -185,17 +177,15 @@ export async function generateResourcesForMainTheme(params: {
             ...(() => {
                 switch (themeType) {
                     case "login":
-                        return LOGIN_THEME_PAGE_IDS;
+                        return loginThemePageIds;
                     case "account":
-                        return isForAccountSpa ? ["index.ftl"] : ACCOUNT_THEME_PAGE_IDS;
+                        return accountThemePageIds;
                 }
             })(),
-            ...(isForAccountSpa
-                ? []
-                : readExtraPagesNames({
-                      themeType,
-                      themeSrcDirPath: buildContext.themeSrcDirPath
-                  }))
+            ...readExtraPagesNames({
+                themeType,
+                themeSrcDirPath: buildContext.themeSrcDirPath
+            })
         ].forEach(pageId => {
             const { ftlCode } = generateFtlFilesCode({ pageId });
 
@@ -205,52 +195,40 @@ export async function generateResourcesForMainTheme(params: {
             );
         });
 
-        i18n_messages_generation: {
-            if (isForAccountSpa) {
-                break i18n_messages_generation;
-            }
+        generateMessageProperties({
+            themeSrcDirPath: buildContext.themeSrcDirPath,
+            themeType
+        }).forEach(({ languageTag, propertiesFileSource }) => {
+            const messagesDirPath = pathJoin(themeTypeDirPath, "messages");
 
-            generateMessageProperties({
-                themeSrcDirPath: buildContext.themeSrcDirPath,
-                themeType
-            }).forEach(({ languageTag, propertiesFileSource }) => {
-                const messagesDirPath = pathJoin(themeTypeDirPath, "messages");
-
-                fs.mkdirSync(pathJoin(themeTypeDirPath, "messages"), {
-                    recursive: true
-                });
-
-                const propertiesFilePath = pathJoin(
-                    messagesDirPath,
-                    `messages_${languageTag}.properties`
-                );
-
-                fs.writeFileSync(
-                    propertiesFilePath,
-                    Buffer.from(propertiesFileSource, "utf8")
-                );
+            fs.mkdirSync(pathJoin(themeTypeDirPath, "messages"), {
+                recursive: true
             });
-        }
 
-        keycloak_static_resources: {
-            if (isForAccountSpa) {
-                break keycloak_static_resources;
-            }
+            const propertiesFilePath = pathJoin(
+                messagesDirPath,
+                `messages_${languageTag}.properties`
+            );
 
-            await downloadKeycloakStaticResources({
-                keycloakVersion: (() => {
-                    switch (themeType) {
-                        case "account":
-                            return LAST_KEYCLOAK_VERSION_WITH_ACCOUNT_V1;
-                        case "login":
-                            return buildContext.loginThemeResourcesFromKeycloakVersion;
-                    }
-                })(),
-                themeDirPath: pathResolve(pathJoin(themeTypeDirPath, "..")),
-                themeType,
-                buildContext
-            });
-        }
+            fs.writeFileSync(
+                propertiesFilePath,
+                Buffer.from(propertiesFileSource, "utf8")
+            );
+        });
+
+        await downloadKeycloakStaticResources({
+            keycloakVersion: (() => {
+                switch (themeType) {
+                    case "account":
+                        return lastKeycloakVersionWithAccountV1;
+                    case "login":
+                        return buildContext.loginThemeResourcesFromKeycloakVersion;
+                }
+            })(),
+            themeDirPath: pathResolve(pathJoin(themeTypeDirPath, "..")),
+            themeType,
+            buildContext
+        });
 
         fs.writeFileSync(
             pathJoin(themeTypeDirPath, "theme.properties"),
@@ -259,13 +237,12 @@ export async function generateResourcesForMainTheme(params: {
                     `parent=${(() => {
                         switch (themeType) {
                             case "account":
-                                return isForAccountSpa ? "base" : ACCOUNT_V1_THEME_NAME;
+                                return accountV1ThemeName;
                             case "login":
                                 return "keycloak";
                         }
                         assert<Equals<typeof themeType, never>>(false);
                     })()}`,
-                    ...(isForAccountSpa ? ["deprecatedMode=false"] : []),
                     ...(buildContext.extraThemeProperties ?? []),
                     ...buildContext.environmentVariables.map(
                         ({ name, default: defaultValue }) =>
@@ -278,7 +255,7 @@ export async function generateResourcesForMainTheme(params: {
     }
 
     email: {
-        if (!buildContext.implementedThemeTypes.email.isImplemented) {
+        if (!buildContext.recordIsImplementedByThemeType.email) {
             break email;
         }
 
@@ -290,70 +267,26 @@ export async function generateResourcesForMainTheme(params: {
         });
     }
 
-    bring_in_account_v1: {
-        if (!buildContext.implementedThemeTypes.account.isImplemented) {
-            break bring_in_account_v1;
-        }
-
-        if (buildContext.implementedThemeTypes.account.type !== "Multi-Page") {
-            break bring_in_account_v1;
-        }
-
+    if (buildContext.recordIsImplementedByThemeType.account) {
         await bringInAccountV1({
             resourcesDirPath,
             buildContext
         });
     }
 
-    bring_in_account_v3_i18n_messages: {
-        if (!buildContext.implementedThemeTypes.account.isImplemented) {
-            break bring_in_account_v3_i18n_messages;
-        }
-        if (buildContext.implementedThemeTypes.account.type !== "Single-Page") {
-            break bring_in_account_v3_i18n_messages;
-        }
-
-        const { extractedDirPath } = await downloadAndExtractArchive({
-            url: "https://repo1.maven.org/maven2/org/keycloak/keycloak-account-ui/25.0.1/keycloak-account-ui-25.0.1.jar",
-            cacheDirPath: buildContext.cacheDirPath,
-            fetchOptions: buildContext.fetchOptions,
-            uniqueIdOfOnArchiveFile: "bring_in_account_v3_i18n_messages",
-            onArchiveFile: async ({ fileRelativePath, writeFile }) => {
-                if (
-                    !fileRelativePath.startsWith(
-                        pathJoin("theme", "keycloak.v3", "account", "messages")
-                    )
-                ) {
-                    return;
-                }
-                await writeFile({
-                    fileRelativePath: pathBasename(fileRelativePath)
-                });
-            }
-        });
-
-        transformCodebase({
-            srcDirPath: extractedDirPath,
-            destDirPath: pathJoin(
-                getThemeTypeDirPath({ themeType: "account" }),
-                "messages"
-            )
-        });
-    }
-
     {
         const metaInfKeycloakThemes: MetaInfKeycloakTheme = { themes: [] };
 
         metaInfKeycloakThemes.themes.push({
             name: themeName,
-            types: objectEntries(buildContext.implementedThemeTypes)
-                .filter(([, { isImplemented }]) => isImplemented)
+            types: objectEntries(buildContext.recordIsImplementedByThemeType)
+                .filter(([, isImplemented]) => isImplemented)
                 .map(([themeType]) => themeType)
         });
 
-        if (buildContext.implementedThemeTypes.account.isImplemented) {
+        if (buildContext.recordIsImplementedByThemeType.account) {
             metaInfKeycloakThemes.themes.push({
-                name: ACCOUNT_V1_THEME_NAME,
+                name: accountV1ThemeName,
                 types: ["account"]
             });
         }

src/bin/keycloakify/generateResources/generateResourcesForThemeVariant.ts

@@ -31,8 +31,8 @@ export function generateResourcesForThemeVariant(params: {
                     Buffer.from(sourceCode)
                         .toString("utf-8")
                         .replace(
-                            `"themeName": "${themeName}"`,
-                            `"themeName": "${themeVariantName}"`
+                            `kcContext.themeName = "${themeName}";`,
+                            `kcContext.themeName = "${themeVariantName}";`
                         ),
                     "utf8"
                 );

src/bin/keycloakify/generateResources/readExtraPageNames.ts

@@ -5,8 +5,8 @@ import * as fs from "fs";
 import { join as pathJoin } from "path";
 import {
     type ThemeType,
-    ACCOUNT_THEME_PAGE_IDS,
-    LOGIN_THEME_PAGE_IDS
+    accountThemePageIds,
+    loginThemePageIds
 } from "../../shared/constants";
 
 export function readExtraPagesNames(params: {
@@ -34,16 +34,19 @@ export function readExtraPagesNames(params: {
         const rawSourceFile = fs.readFileSync(candidateFilPath).toString("utf8");
 
         extraPages.push(
-            ...Array.from(rawSourceFile.matchAll(/["']([^.\s]+.ftl)["']:/g), m => m[1])
+            ...Array.from(
+                rawSourceFile.matchAll(/["']?pageId["']?\s*:\s*["']([^.]+.ftl)["']/g),
+                m => m[1]
+            )
         );
     }
 
     return extraPages.reduce(...removeDuplicates<string>()).filter(pageId => {
         switch (themeType) {
             case "account":
-                return !id<readonly string[]>(ACCOUNT_THEME_PAGE_IDS).includes(pageId);
+                return !id<readonly string[]>(accountThemePageIds).includes(pageId);
             case "login":
-                return !id<readonly string[]>(LOGIN_THEME_PAGE_IDS).includes(pageId);
+                return !id<readonly string[]>(loginThemePageIds).includes(pageId);
         }
     });
 }

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 { getBuildContext } from "../shared/buildContext";
-import { VITE_PLUGIN_SUB_SCRIPTS_ENV_NAMES } from "../shared/constants";
+import { vitePluginSubScriptEnvNames } from "../shared/constants";
 import { buildJars } from "./buildJars";
 import type { CliCommandOptions } from "../main";
 import chalk from "chalk";
@@ -12,6 +12,12 @@ import * as os from "os";
 import { rmSync } from "../tools/fs.rmSync";
 
 export async function command(params: { cliCommandOptions: CliCommandOptions }) {
+    console.log("DEBUG:", {
+        __filename,
+        __dirname,
+        "process.cwd()": process.cwd()
+    });
+
     exit_if_maven_not_installed: {
         let commandOutput: Buffer | undefined = undefined;
 
@@ -93,12 +99,10 @@ export async function command(params: { cliCommandOptions: CliCommandOptions })
             cwd: buildContext.projectDirPath,
             env: {
                 ...process.env,
-                [VITE_PLUGIN_SUB_SCRIPTS_ENV_NAMES.RUN_POST_BUILD_SCRIPT]: JSON.stringify(
-                    {
-                        resourcesDirPath,
-                        buildContext
-                    }
-                )
+                [vitePluginSubScriptEnvNames.runPostBuildScript]: JSON.stringify({
+                    resourcesDirPath,
+                    buildContext
+                })
             }
         });
     }

src/bin/keycloakify/replacers/replaceImportsInCssCode.ts

@@ -1,5 +1,5 @@
 import type { BuildContext } from "../../shared/buildContext";
-import { BASENAME_OF_KEYCLOAKIFY_RESOURCES_DIR } from "../../shared/constants";
+import { basenameOfTheKeycloakifyResourcesDir } from "../../shared/constants";
 import { assert } from "tsafe/assert";
 import { posix } from "path";
 
@@ -18,49 +18,35 @@ export function replaceImportsInCssCode(params: {
 } {
     const { cssCode, cssFileRelativeDirPath, buildContext } = params;
 
-    let fixedCssCode = cssCode;
-
-    [
-        /url\("(\/[^/][^"]+)"\)/g,
-        /url\('(\/[^/][^']+)'\)/g,
-        /url\((\/[^/][^)]+)\)/g
-    ].forEach(
-        regex =>
-            (fixedCssCode = fixedCssCode.replace(
-                regex,
-                (match, assetFileAbsoluteUrlPathname) => {
-                    if (buildContext.urlPathname !== undefined) {
-                        if (
-                            !assetFileAbsoluteUrlPathname.startsWith(
-                                buildContext.urlPathname
-                            )
-                        ) {
-                            // NOTE: Should never happen
-                            return match;
-                        }
-                        assetFileAbsoluteUrlPathname =
-                            assetFileAbsoluteUrlPathname.replace(
-                                buildContext.urlPathname,
-                                "/"
-                            );
-                    }
-
-                    inline_style_in_html: {
-                        if (cssFileRelativeDirPath !== undefined) {
-                            break inline_style_in_html;
-                        }
-
-                        return `url("\${xKeycloakify.resourcesPath}/${BASENAME_OF_KEYCLOAKIFY_RESOURCES_DIR}${assetFileAbsoluteUrlPathname}")`;
-                    }
-
-                    const assetFileRelativeUrlPathname = posix.relative(
-                        cssFileRelativeDirPath.replace(/\\/g, "/"),
-                        assetFileAbsoluteUrlPathname.replace(/^\//, "")
-                    );
-
-                    return `url("${assetFileRelativeUrlPathname}")`;
+    const fixedCssCode = cssCode.replace(
+        /url\(["']?(\/[^/][^)"']+)["']?\)/g,
+        (match, assetFileAbsoluteUrlPathname) => {
+            if (buildContext.urlPathname !== undefined) {
+                if (!assetFileAbsoluteUrlPathname.startsWith(buildContext.urlPathname)) {
+                    // NOTE: Should never happen
+                    return match;
                 }
-            ))
+                assetFileAbsoluteUrlPathname = assetFileAbsoluteUrlPathname.replace(
+                    buildContext.urlPathname,
+                    "/"
+                );
+            }
+
+            inline_style_in_html: {
+                if (cssFileRelativeDirPath !== undefined) {
+                    break inline_style_in_html;
+                }
+
+                return `url(\${url.resourcesPath}/${basenameOfTheKeycloakifyResourcesDir}${assetFileAbsoluteUrlPathname})`;
+            }
+
+            const assetFileRelativeUrlPathname = posix.relative(
+                cssFileRelativeDirPath.replace(/\\/g, "/"),
+                assetFileAbsoluteUrlPathname.replace(/^\//, "")
+            );
+
+            return `url(${assetFileRelativeUrlPathname})`;
+        }
     );
 
     return { fixedCssCode };

src/bin/keycloakify/replacers/replaceImportsInJsCode/vite.ts

@@ -1,4 +1,4 @@
-import { BASENAME_OF_KEYCLOAKIFY_RESOURCES_DIR } from "../../../shared/constants";
+import { basenameOfTheKeycloakifyResourcesDir } from "../../../shared/constants";
 import { assert } from "tsafe/assert";
 import type { BuildContext } from "../../../shared/buildContext";
 import * as nodePath from "path";
@@ -31,13 +31,13 @@ export function replaceImportsInJsCode_vite(params: {
 
     let fixedJsCode = jsCode;
 
-    replace_base_js_import: {
+    replace_base_javacript_import: {
         if (buildContext.urlPathname === undefined) {
-            break replace_base_js_import;
+            break replace_base_javacript_import;
         }
         // Optimization
         if (!jsCode.includes(buildContext.urlPathname)) {
-            break replace_base_js_import;
+            break replace_base_javacript_import;
         }
 
         // Replace `Hv=function(e){return"/abcde12345/"+e}` by `Hv=function(e){return"/"+e}`
@@ -85,13 +85,13 @@ export function replaceImportsInJsCode_vite(params: {
                 fixedJsCode = replaceAll(
                     fixedJsCode,
                     `"${relativePathOfAssetFile}"`,
-                    `(window.kcContext["x-keycloakify"].resourcesPath.substring(1) + "/${BASENAME_OF_KEYCLOAKIFY_RESOURCES_DIR}/${relativePathOfAssetFile}")`
+                    `(window.kcContext.url.resourcesPath.substring(1) + "/${basenameOfTheKeycloakifyResourcesDir}/${relativePathOfAssetFile}")`
                 );
 
                 fixedJsCode = replaceAll(
                     fixedJsCode,
                     `"${buildContext.urlPathname ?? "/"}${relativePathOfAssetFile}"`,
-                    `(window.kcContext["x-keycloakify"].resourcesPath + "/${BASENAME_OF_KEYCLOAKIFY_RESOURCES_DIR}/${relativePathOfAssetFile}")`
+                    `(window.kcContext.url.resourcesPath + "/${basenameOfTheKeycloakifyResourcesDir}/${relativePathOfAssetFile}")`
                 );
             });
     }

src/bin/keycloakify/replacers/replaceImportsInJsCode/webpack.ts

@@ -1,4 +1,4 @@
-import { BASENAME_OF_KEYCLOAKIFY_RESOURCES_DIR } from "../../../shared/constants";
+import { basenameOfTheKeycloakifyResourcesDir } from "../../../shared/constants";
 import { assert } from "tsafe/assert";
 import type { BuildContext } from "../../../shared/buildContext";
 import * as nodePath from "path";
@@ -83,14 +83,14 @@ export function replaceImportsInJsCode_webpack(params: {
                 var pd = Object.getOwnPropertyDescriptor(${n}, "p");
                 if( pd === undefined || pd.configurable ){
                     Object.defineProperty(${n}, "p", {
-                        get: function() { return window.kcContext["x-keycloakify"].resourcesPath; },
+                        get: function() { return window.kcContext.url.resourcesPath; },
                         set: function() {}
                     });
                 }
                 return "${u}";
             })()] = ${
                 isArrowFunction ? `${e} =>` : `function(${e}) { return `
-            } "/${BASENAME_OF_KEYCLOAKIFY_RESOURCES_DIR}/${staticDir}${language}/"`
+            } "/${basenameOfTheKeycloakifyResourcesDir}/${staticDir}${language}/"`
                 .replace(/\s+/g, " ")
                 .trim();
         }
@@ -104,7 +104,7 @@ export function replaceImportsInJsCode_webpack(params: {
                 `[a-zA-Z]+\\.[a-zA-Z]+\\+"${staticDir.replace(/\//g, "\\/")}`,
                 "g"
             ),
-            `window.kcContext["x-keycloakify"].resourcesPath + "/${BASENAME_OF_KEYCLOAKIFY_RESOURCES_DIR}/${staticDir}`
+            `window.kcContext.url.resourcesPath + "/${basenameOfTheKeycloakifyResourcesDir}/${staticDir}`
         );
 
     return { fixedJsCode };

src/bin/main.ts

@@ -3,14 +3,11 @@
 import { termost } from "termost";
 import { readThisNpmPackageVersion } from "./tools/readThisNpmPackageVersion";
 import * as child_process from "child_process";
-import { assertNoPnpmDlx } from "./tools/assertNoPnpmDlx";
 
 export type CliCommandOptions = {
     projectDirPath: string | undefined;
 };
 
-assertNoPnpmDlx();
-
 const program = termost<CliCommandOptions>(
     {
         name: "keycloakify",
@@ -179,20 +176,6 @@ program
         }
     });
 
-program
-    .command({
-        name: "initialize-account-theme",
-        description: "Initialize the account theme."
-    })
-    .task({
-        skip,
-        handler: async cliCommandOptions => {
-            const { command } = await import("./initialize-account-theme");
-
-            await command({ cliCommandOptions });
-        }
-    });
-
 program
     .command({
         name: "copy-keycloak-resources-to-public",

src/bin/shared/KeycloakVersionRange.ts

@@ -1,9 +1,9 @@
 export type KeycloakVersionRange =
-    | KeycloakVersionRange.WithAccountV1Theme
-    | KeycloakVersionRange.WithoutAccountV1Theme;
+    | KeycloakVersionRange.WithAccountTheme
+    | KeycloakVersionRange.WithoutAccountTheme;
 
 export namespace KeycloakVersionRange {
-    export type WithoutAccountV1Theme = "21-and-below" | "22-and-above";
+    export type WithoutAccountTheme = "21-and-below" | "22-and-above";
 
-    export type WithAccountV1Theme = "21-and-below" | "23" | "24" | "25-and-above";
+    export type WithAccountTheme = "21-and-below" | "23" | "24" | "25-and-above";
 }

src/bin/shared/buildContext.ts

@@ -1,33 +1,29 @@
 import { parse as urlParse } from "url";
-import {
-    join as pathJoin,
-    sep as pathSep,
-    relative as pathRelative,
-    resolve as pathResolve,
-    dirname as pathDirname
-} from "path";
+import { join as pathJoin } from "path";
 import { getAbsoluteAndInOsFormatPath } from "../tools/getAbsoluteAndInOsFormatPath";
+import { getNpmWorkspaceRootDirPath } from "../tools/getNpmWorkspaceRootDirPath";
 import type { CliCommandOptions } from "../main";
 import { z } from "zod";
 import * as fs from "fs";
 import { assert, type Equals } from "tsafe/assert";
 import * as child_process from "child_process";
 import {
-    VITE_PLUGIN_SUB_SCRIPTS_ENV_NAMES,
-    BUILD_FOR_KEYCLOAK_MAJOR_VERSION_ENV_NAME,
-    LOGIN_THEME_RESOURCES_FROMkEYCLOAK_VERSION_DEFAULT
+    vitePluginSubScriptEnvNames,
+    buildForKeycloakMajorVersionEnvName
 } from "./constants";
 import type { KeycloakVersionRange } from "./KeycloakVersionRange";
 import { exclude } from "tsafe";
 import { crawl } from "../tools/crawl";
-import { THEME_TYPES } from "./constants";
+import { themeTypes } from "./constants";
+import { objectFromEntries } from "tsafe/objectFromEntries";
 import { objectEntries } from "tsafe/objectEntries";
 import { type ThemeType } from "./constants";
 import { id } from "tsafe/id";
+import { symToStr } from "tsafe/symToStr";
 import chalk from "chalk";
-import { getProxyFetchOptions, type ProxyFetchOptions } from "../tools/fetchProxyOptions";
 
 export type BuildContext = {
+    bundler: "vite" | "webpack";
     themeVersion: string;
     themeNames: [string, ...string[]];
     extraThemeProperties: string[] | undefined;
@@ -44,27 +40,17 @@ export type BuildContext = {
      * In this case the urlPathname will be "/my-app/" */
     urlPathname: string | undefined;
     assetsDirPath: string;
-    fetchOptions: ProxyFetchOptions;
+    npmWorkspaceRootDirPath: string;
     kcContextExclusionsFtlCode: string | undefined;
     environmentVariables: { name: string; default: string }[];
     themeSrcDirPath: string;
-    implementedThemeTypes: {
-        login: { isImplemented: boolean };
-        email: { isImplemented: boolean };
-        account:
-            | { isImplemented: false }
-            | { isImplemented: true; type: "Single-Page" | "Multi-Page" };
-    };
-    packageJsonFilePath: string;
-    bundler: "vite" | "webpack";
+    recordIsImplementedByThemeType: Readonly<Record<ThemeType | "email", boolean>>;
     jarTargets: {
         keycloakVersionRange: KeycloakVersionRange;
         jarFileBasename: string;
     }[];
 };
 
-assert<Equals<keyof BuildContext["implementedThemeTypes"], ThemeType | "email">>();
-
 export type BuildOptions = {
     themeName?: string | string[];
     themeVersion?: string;
@@ -75,30 +61,20 @@ export type BuildOptions = {
     loginThemeResourcesFromKeycloakVersion?: string;
     keycloakifyBuildDirPath?: string;
     kcContextExclusionsFtl?: string;
-} & BuildOptions.AccountThemeImplAndKeycloakVersionTargets;
+    /** https://docs.keycloakify.dev/v/v10/targetting-specific-keycloak-versions */
+    keycloakVersionTargets?: BuildOptions.KeycloakVersionTargets;
+};
 
 export namespace BuildOptions {
-    export type AccountThemeImplAndKeycloakVersionTargets =
-        | AccountThemeImplAndKeycloakVersionTargets.MultiPageApp
-        | AccountThemeImplAndKeycloakVersionTargets.SinglePageAppOrNone;
-
-    export namespace AccountThemeImplAndKeycloakVersionTargets {
-        export type MultiPageApp = {
-            accountThemeImplementation: "Multi-Page";
-            keycloakVersionTargets?: Record<
-                KeycloakVersionRange.WithAccountV1Theme,
-                string | boolean
-            >;
-        };
-
-        export type SinglePageAppOrNone = {
-            accountThemeImplementation: "Single-Page" | "none";
-            keycloakVersionTargets?: Record<
-                KeycloakVersionRange.WithoutAccountV1Theme,
-                string | boolean
-            >;
-        };
-    }
+    export type KeycloakVersionTargets =
+        | ({ hasAccountTheme: true } & Record<
+              KeycloakVersionRange.WithAccountTheme,
+              string | boolean
+          >)
+        | ({ hasAccountTheme: false } & Record<
+              KeycloakVersionRange.WithoutAccountTheme,
+              string | boolean
+          >);
 }
 
 export type ResolvedViteConfig = {
@@ -114,13 +90,165 @@ export function getBuildContext(params: {
 }): BuildContext {
     const { cliCommandOptions } = params;
 
-    const projectDirPath =
-        cliCommandOptions.projectDirPath !== undefined
-            ? getAbsoluteAndInOsFormatPath({
-                  pathIsh: cliCommandOptions.projectDirPath,
-                  cwd: process.cwd()
-              })
-            : process.cwd();
+    console.log("DEBUG:", { cliCommandOptions });
+
+    const projectDirPath = (() => {
+        if (cliCommandOptions.projectDirPath === undefined) {
+            return process.cwd();
+        }
+
+        return getAbsoluteAndInOsFormatPath({
+            pathIsh: cliCommandOptions.projectDirPath,
+            cwd: process.cwd()
+        });
+    })();
+
+    console.log("DEBUG:", { projectDirPath });
+
+    const { resolvedViteConfig } = (() => {
+        if (
+            fs
+                .readdirSync(projectDirPath)
+                .find(fileBasename => fileBasename.startsWith("vite.config")) ===
+            undefined
+        ) {
+            return { resolvedViteConfig: undefined };
+        }
+
+        const output = child_process
+            .execSync("npx vite", {
+                cwd: projectDirPath,
+                env: {
+                    ...process.env,
+                    [vitePluginSubScriptEnvNames.resolveViteConfig]: "true"
+                }
+            })
+            .toString("utf8");
+
+        assert(
+            output.includes(vitePluginSubScriptEnvNames.resolveViteConfig),
+            "Seems like the Keycloakify's Vite plugin is not installed."
+        );
+
+        const resolvedViteConfigStr = output
+            .split(vitePluginSubScriptEnvNames.resolveViteConfig)
+            .reverse()[0];
+
+        const resolvedViteConfig: ResolvedViteConfig = JSON.parse(resolvedViteConfigStr);
+
+        return { resolvedViteConfig };
+    })();
+
+    console.log("DEBUG:", { resolvedViteConfig });
+
+    const parsedPackageJson = (() => {
+        type BuildOptions_packageJson = BuildOptions & {
+            projectBuildDirPath?: string;
+            staticDirPathInProjectBuildDirPath?: string;
+            publicDirPath?: string;
+        };
+
+        type ParsedPackageJson = {
+            name: string;
+            version?: string;
+            homepage?: string;
+            keycloakify?: BuildOptions_packageJson;
+        };
+
+        const zParsedPackageJson = z.object({
+            name: z.string(),
+            version: z.string().optional(),
+            homepage: z.string().optional(),
+            keycloakify: id<z.ZodType<BuildOptions_packageJson>>(
+                (() => {
+                    const zBuildOptions_packageJson = z.object({
+                        extraThemeProperties: z.array(z.string()).optional(),
+                        artifactId: z.string().optional(),
+                        groupId: z.string().optional(),
+                        loginThemeResourcesFromKeycloakVersion: z.string().optional(),
+                        projectBuildDirPath: z.string().optional(),
+                        keycloakifyBuildDirPath: z.string().optional(),
+                        kcContextExclusionsFtl: z.string().optional(),
+                        environmentVariables: z
+                            .array(
+                                z.object({
+                                    name: z.string(),
+                                    default: z.string()
+                                })
+                            )
+                            .optional(),
+                        themeName: z.union([z.string(), z.array(z.string())]).optional(),
+                        themeVersion: z.string().optional(),
+                        staticDirPathInProjectBuildDirPath: z.string().optional(),
+                        publicDirPath: z.string().optional(),
+                        keycloakVersionTargets: id<
+                            z.ZodType<BuildOptions.KeycloakVersionTargets>
+                        >(
+                            (() => {
+                                const zKeycloakVersionTargets = z.union([
+                                    z.object({
+                                        hasAccountTheme: z.literal(true),
+                                        "21-and-below": z.union([
+                                            z.boolean(),
+                                            z.string()
+                                        ]),
+                                        "23": z.union([z.boolean(), z.string()]),
+                                        "24": z.union([z.boolean(), z.string()]),
+                                        "25-and-above": z.union([z.boolean(), z.string()])
+                                    }),
+                                    z.object({
+                                        hasAccountTheme: z.literal(false),
+                                        "21-and-below": z.union([
+                                            z.boolean(),
+                                            z.string()
+                                        ]),
+                                        "22-and-above": z.union([z.boolean(), z.string()])
+                                    })
+                                ]);
+
+                                {
+                                    type Got = z.infer<typeof zKeycloakVersionTargets>;
+                                    type Expected = BuildOptions.KeycloakVersionTargets;
+                                    assert<Equals<Got, Expected>>();
+                                }
+
+                                return zKeycloakVersionTargets;
+                            })()
+                        ).optional()
+                    });
+
+                    {
+                        type Got = z.infer<typeof zBuildOptions_packageJson>;
+                        type Expected = BuildOptions_packageJson;
+                        assert<Equals<Got, Expected>>();
+                    }
+
+                    return zBuildOptions_packageJson;
+                })()
+            ).optional()
+        });
+
+        {
+            type Got = z.infer<typeof zParsedPackageJson>;
+            type Expected = ParsedPackageJson;
+            assert<Equals<Got, Expected>>();
+        }
+
+        return zParsedPackageJson.parse(
+            JSON.parse(
+                fs.readFileSync(pathJoin(projectDirPath, "package.json")).toString("utf8")
+            )
+        );
+    })();
+
+    console.log("DEBUG:", { parsedPackageJson });
+
+    const buildOptions = {
+        ...parsedPackageJson.keycloakify,
+        ...resolvedViteConfig?.buildOptions
+    };
+
+    console.log("DEBUG:", { buildOptions });
 
     const { themeSrcDirPath } = (() => {
         const srcDirPath = pathJoin(projectDirPath, "src");
@@ -144,7 +272,7 @@ export function getBuildContext(params: {
             return { themeSrcDirPath };
         }
 
-        for (const themeType of [...THEME_TYPES, "email"]) {
+        for (const themeType of [...themeTypes, "email"]) {
             if (!fs.existsSync(pathJoin(srcDirPath, themeType))) {
                 continue;
             }
@@ -154,9 +282,8 @@ export function getBuildContext(params: {
         console.log(
             chalk.red(
                 [
-                    `Can't locate your Keycloak theme source directory in .${pathSep}${pathRelative(process.cwd(), srcDirPath)}`,
-                    `Make sure to either use the Keycloakify CLI in the root of your Keycloakify project or use the --project CLI option`,
-                    `If you are collocating your Keycloak theme with your app you must have a directory named 'keycloak-theme' or 'keycloak_theme' in your 'src' directory`
+                    "Can't locate your keycloak theme source directory.",
+                    "See: https://docs.keycloakify.dev/v/v10/keycloakify-in-my-app/collocation"
                 ].join("\n")
             )
         );
@@ -164,286 +291,23 @@ export function getBuildContext(params: {
         process.exit(1);
     })();
 
-    const { resolvedViteConfig } = (() => {
-        if (
-            fs
-                .readdirSync(projectDirPath)
-                .find(fileBasename => fileBasename.startsWith("vite.config")) ===
-            undefined
-        ) {
-            return { resolvedViteConfig: undefined };
-        }
+    const recordIsImplementedByThemeType = objectFromEntries(
+        (["login", "account", "email"] as const).map(themeType => [
+            themeType,
+            fs.existsSync(pathJoin(themeSrcDirPath, themeType))
+        ])
+    );
 
-        const output = child_process
-            .execSync("npx vite", {
-                cwd: projectDirPath,
-                env: {
-                    ...process.env,
-                    [VITE_PLUGIN_SUB_SCRIPTS_ENV_NAMES.RESOLVE_VITE_CONFIG]: "true"
-                }
-            })
-            .toString("utf8");
-
-        assert(
-            output.includes(VITE_PLUGIN_SUB_SCRIPTS_ENV_NAMES.RESOLVE_VITE_CONFIG),
-            "Seems like the Keycloakify's Vite plugin is not installed."
-        );
-
-        const resolvedViteConfigStr = output
-            .split(VITE_PLUGIN_SUB_SCRIPTS_ENV_NAMES.RESOLVE_VITE_CONFIG)
-            .reverse()[0];
-
-        const resolvedViteConfig: ResolvedViteConfig = JSON.parse(resolvedViteConfigStr);
-
-        return { resolvedViteConfig };
-    })();
-
-    const packageJsonFilePath = (function getPackageJSonDirPath(upCount: number): string {
-        const dirPath = pathResolve(
-            pathJoin(...[projectDirPath, ...Array(upCount).fill("..")])
-        );
-
-        assert(dirPath !== pathSep, "Root package.json not found");
-
-        success: {
-            const packageJsonFilePath = pathJoin(dirPath, "package.json");
-
-            if (!fs.existsSync(packageJsonFilePath)) {
-                break success;
-            }
-
-            const parsedPackageJson = z
-                .object({
-                    name: z.string().optional(),
-                    dependencies: z.record(z.string()).optional(),
-                    devDependencies: z.record(z.string()).optional()
-                })
-                .parse(JSON.parse(fs.readFileSync(packageJsonFilePath).toString("utf8")));
-
-            if (
-                parsedPackageJson.dependencies?.keycloakify === undefined &&
-                parsedPackageJson.devDependencies?.keycloakify === undefined &&
-                parsedPackageJson.name !== "keycloakify" // NOTE: For local storybook build
-            ) {
-                break success;
-            }
-
-            return packageJsonFilePath;
-        }
-
-        return getPackageJSonDirPath(upCount + 1);
-    })(0);
-
-    const parsedPackageJson = (() => {
-        type BuildOptions_packageJson = BuildOptions & {
-            projectBuildDirPath?: string;
-            staticDirPathInProjectBuildDirPath?: string;
-            publicDirPath?: string;
-        };
-
-        type ParsedPackageJson = {
-            name?: string;
-            version?: string;
-            homepage?: string;
-            keycloakify?: BuildOptions_packageJson;
-        };
-
-        const zMultiPageApp = (() => {
-            type TargetType =
-                BuildOptions.AccountThemeImplAndKeycloakVersionTargets.MultiPageApp;
-
-            const zTargetType = z.object({
-                accountThemeImplementation: z.literal("Multi-Page"),
-                keycloakVersionTargets: z
-                    .object({
-                        "21-and-below": z.union([z.boolean(), z.string()]),
-                        "23": z.union([z.boolean(), z.string()]),
-                        "24": z.union([z.boolean(), z.string()]),
-                        "25-and-above": z.union([z.boolean(), z.string()])
-                    })
-                    .optional()
-            });
-
-            assert<Equals<z.infer<typeof zTargetType>, TargetType>>();
-
-            return id<z.ZodType<TargetType>>(zTargetType);
-        })();
-
-        const zSinglePageApp = (() => {
-            type TargetType =
-                BuildOptions.AccountThemeImplAndKeycloakVersionTargets.SinglePageAppOrNone;
-
-            const zTargetType = z.object({
-                accountThemeImplementation: z.union([
-                    z.literal("Single-Page"),
-                    z.literal("none")
-                ]),
-                keycloakVersionTargets: z
-                    .object({
-                        "21-and-below": z.union([z.boolean(), z.string()]),
-                        "22-and-above": z.union([z.boolean(), z.string()])
-                    })
-                    .optional()
-            });
-
-            assert<Equals<z.infer<typeof zTargetType>, TargetType>>();
-
-            return id<z.ZodType<TargetType>>(zTargetType);
-        })();
-
-        const zAccountThemeImplAndKeycloakVersionTargets = (() => {
-            type TargetType = BuildOptions.AccountThemeImplAndKeycloakVersionTargets;
-
-            const zTargetType = z.union([zMultiPageApp, zSinglePageApp]);
-
-            assert<Equals<z.infer<typeof zTargetType>, TargetType>>();
-
-            return id<z.ZodType<TargetType>>(zTargetType);
-        })();
-
-        const zBuildOptions = (() => {
-            type TargetType = BuildOptions;
-
-            const zTargetType = z.intersection(
-                z.object({
-                    themeName: z.union([z.string(), z.array(z.string())]).optional(),
-                    themeVersion: z.string().optional(),
-                    environmentVariables: z
-                        .array(
-                            z.object({
-                                name: z.string(),
-                                default: z.string()
-                            })
-                        )
-                        .optional(),
-                    extraThemeProperties: z.array(z.string()).optional(),
-                    artifactId: z.string().optional(),
-                    groupId: z.string().optional(),
-                    loginThemeResourcesFromKeycloakVersion: z.string().optional(),
-                    keycloakifyBuildDirPath: z.string().optional(),
-                    kcContextExclusionsFtl: z.string().optional()
-                }),
-                zAccountThemeImplAndKeycloakVersionTargets
-            );
-
-            assert<Equals<z.infer<typeof zTargetType>, TargetType>>();
-
-            return id<z.ZodType<TargetType>>(zTargetType);
-        })();
-
-        const zBuildOptions_packageJson = (() => {
-            type TargetType = BuildOptions_packageJson;
-
-            const zTargetType = z.intersection(
-                zBuildOptions,
-                z.object({
-                    projectBuildDirPath: z.string().optional(),
-                    staticDirPathInProjectBuildDirPath: z.string().optional(),
-                    publicDirPath: z.string().optional()
-                })
-            );
-
-            assert<Equals<z.infer<typeof zTargetType>, TargetType>>();
-
-            return id<z.ZodType<TargetType>>(zTargetType);
-        })();
-
-        const zParsedPackageJson = (() => {
-            type TargetType = ParsedPackageJson;
-
-            const zTargetType = z.object({
-                name: z.string().optional(),
-                version: z.string().optional(),
-                homepage: z.string().optional(),
-                keycloakify: zBuildOptions_packageJson.optional()
-            });
-
-            assert<Equals<z.infer<typeof zTargetType>, TargetType>>();
-
-            return id<z.ZodType<TargetType>>(zTargetType);
-        })();
-
-        const configurationPackageJsonFilePath = (() => {
-            const rootPackageJsonFilePath = pathJoin(projectDirPath, "package.json");
-
-            return fs.existsSync(rootPackageJsonFilePath)
-                ? rootPackageJsonFilePath
-                : packageJsonFilePath;
-        })();
-
-        return zParsedPackageJson.parse(
-            JSON.parse(fs.readFileSync(configurationPackageJsonFilePath).toString("utf8"))
-        );
-    })();
-
-    const bundler = resolvedViteConfig !== undefined ? "vite" : "webpack";
-
-    if (bundler === "vite" && parsedPackageJson.keycloakify !== undefined) {
-        console.error(
-            chalk.red(
-                `In vite projects, provide your Keycloakify options in vite.config.ts, not in package.json`
-            )
-        );
-        process.exit(-1);
-    }
-
-    const buildOptions: BuildOptions = (() => {
-        switch (bundler) {
-            case "vite":
-                assert(resolvedViteConfig !== undefined);
-                return resolvedViteConfig.buildOptions;
-            case "webpack":
-                assert(parsedPackageJson.keycloakify !== undefined);
-                return parsedPackageJson.keycloakify;
-        }
-        assert<Equals<typeof bundler, never>>(false);
-    })();
-
-    const implementedThemeTypes: BuildContext["implementedThemeTypes"] = {
-        login: {
-            isImplemented: fs.existsSync(pathJoin(themeSrcDirPath, "login"))
-        },
-        email: {
-            isImplemented: fs.existsSync(pathJoin(themeSrcDirPath, "email"))
-        },
-        account: (() => {
-            if (buildOptions.accountThemeImplementation === "none") {
-                return { isImplemented: false };
-            }
-
-            return {
-                isImplemented: true,
-                type: buildOptions.accountThemeImplementation
-            };
-        })()
-    };
-
-    if (
-        implementedThemeTypes.account.isImplemented &&
-        !fs.existsSync(pathJoin(themeSrcDirPath, "account"))
-    ) {
-        console.error(
-            chalk.red(
-                [
-                    `You have set 'accountThemeImplementation' to '${implementedThemeTypes.account.type}'`,
-                    `but the 'account' directory is missing in your theme source directory`,
-                    "Use the `npx keycloakify initialize-account-theme` command to create it"
-                ].join(" ")
-            )
-        );
-        process.exit(-1);
-    }
+    console.log("DEBUG:", { themeSrcDirPath });
 
     const themeNames = ((): [string, ...string[]] => {
         if (buildOptions.themeName === undefined) {
-            return parsedPackageJson.name === undefined
-                ? ["keycloakify"]
-                : [
-                      parsedPackageJson.name
-                          .replace(/^@(.*)/, "$1")
-                          .split("/")
-                          .join("-")
-                  ];
+            return [
+                parsedPackageJson.name
+                    .replace(/^@(.*)/, "$1")
+                    .split("/")
+                    .join("-")
+            ];
         }
 
         if (typeof buildOptions.themeName === "string") {
@@ -457,17 +321,17 @@ export function getBuildContext(params: {
         return [mainThemeName, ...themeVariantNames];
     })();
 
+    console.log("DEBUG:", { themeNames });
+
     const projectBuildDirPath = (() => {
         webpack: {
-            if (bundler !== "webpack") {
+            if (resolvedViteConfig !== undefined) {
                 break webpack;
             }
 
-            assert(parsedPackageJson.keycloakify !== undefined);
-
-            if (parsedPackageJson.keycloakify.projectBuildDirPath !== undefined) {
+            if (buildOptions.projectBuildDirPath !== undefined) {
                 return getAbsoluteAndInOsFormatPath({
-                    pathIsh: parsedPackageJson.keycloakify.projectBuildDirPath,
+                    pathIsh: buildOptions.projectBuildDirPath,
                     cwd: projectDirPath
                 });
             }
@@ -475,15 +339,22 @@ export function getBuildContext(params: {
             return pathJoin(projectDirPath, "build");
         }
 
-        assert(bundler === "vite");
-        assert(resolvedViteConfig !== undefined);
-
         return pathJoin(projectDirPath, resolvedViteConfig.buildDir);
     })();
 
-    return {
+    console.log("DEBUG:", { projectBuildDirPath });
+
+    const { npmWorkspaceRootDirPath } = getNpmWorkspaceRootDirPath({
+        projectDirPath,
+        dependencyExpected: "keycloakify"
+    });
+
+    console.log("DEBUG:", { npmWorkspaceRootDirPath });
+
+    const bundler = resolvedViteConfig !== undefined ? "vite" : "webpack";
+
+    const buildContext: BuildContext = {
         bundler,
-        packageJsonFilePath,
         themeVersion: buildOptions.themeVersion ?? parsedPackageJson.version ?? "0.0.0",
         themeNames,
         extraThemeProperties: buildOptions.extraThemeProperties,
@@ -507,8 +378,7 @@ export function getBuildContext(params: {
             buildOptions.artifactId ??
             `${themeNames[0]}-keycloak-theme`,
         loginThemeResourcesFromKeycloakVersion:
-            buildOptions.loginThemeResourcesFromKeycloakVersion ??
-            LOGIN_THEME_RESOURCES_FROMkEYCLOAK_VERSION_DEFAULT,
+            buildOptions.loginThemeResourcesFromKeycloakVersion ?? "24.0.4",
         projectDirPath,
         projectBuildDirPath,
         keycloakifyBuildDirPath: (() => {
@@ -535,15 +405,13 @@ export function getBuildContext(params: {
             }
 
             webpack: {
-                if (bundler !== "webpack") {
+                if (resolvedViteConfig !== undefined) {
                     break webpack;
                 }
 
-                assert(parsedPackageJson.keycloakify !== undefined);
-
-                if (parsedPackageJson.keycloakify.publicDirPath !== undefined) {
+                if (buildOptions.publicDirPath !== undefined) {
                     return getAbsoluteAndInOsFormatPath({
-                        pathIsh: parsedPackageJson.keycloakify.publicDirPath,
+                        pathIsh: buildOptions.publicDirPath,
                         cwd: projectDirPath
                     });
                 }
@@ -551,31 +419,28 @@ export function getBuildContext(params: {
                 return pathJoin(projectDirPath, "public");
             }
 
-            assert(bundler === "vite");
-            assert(resolvedViteConfig !== undefined);
-
             return pathJoin(projectDirPath, resolvedViteConfig.publicDir);
         })(),
-        cacheDirPath: pathJoin(
-            (() => {
-                if (process.env.XDG_CACHE_HOME !== undefined) {
-                    return getAbsoluteAndInOsFormatPath({
-                        pathIsh: process.env.XDG_CACHE_HOME,
-                        cwd: process.cwd()
-                    });
-                }
+        cacheDirPath: (() => {
+            const cacheDirPath = pathJoin(
+                (() => {
+                    if (process.env.XDG_CACHE_HOME !== undefined) {
+                        return getAbsoluteAndInOsFormatPath({
+                            pathIsh: process.env.XDG_CACHE_HOME,
+                            cwd: process.cwd()
+                        });
+                    }
 
-                return pathJoin(
-                    pathDirname(packageJsonFilePath),
-                    "node_modules",
-                    ".cache"
-                );
-            })(),
-            "keycloakify"
-        ),
+                    return pathJoin(npmWorkspaceRootDirPath, "node_modules", ".cache");
+                })(),
+                "keycloakify"
+            );
+
+            return cacheDirPath;
+        })(),
         urlPathname: (() => {
             webpack: {
-                if (bundler !== "webpack") {
+                if (resolvedViteConfig !== undefined) {
                     break webpack;
                 }
 
@@ -595,38 +460,27 @@ export function getBuildContext(params: {
                 return out === "/" ? undefined : out;
             }
 
-            assert(bundler === "vite");
-            assert(resolvedViteConfig !== undefined);
-
             return resolvedViteConfig.urlPathname;
         })(),
         assetsDirPath: (() => {
             webpack: {
-                if (bundler !== "webpack") {
+                if (resolvedViteConfig !== undefined) {
                     break webpack;
                 }
 
-                assert(parsedPackageJson.keycloakify !== undefined);
-
-                if (
-                    parsedPackageJson.keycloakify.staticDirPathInProjectBuildDirPath !==
-                    undefined
-                ) {
+                if (buildOptions.staticDirPathInProjectBuildDirPath !== undefined) {
                     getAbsoluteAndInOsFormatPath({
-                        pathIsh:
-                            parsedPackageJson.keycloakify
-                                .staticDirPathInProjectBuildDirPath,
+                        pathIsh: buildOptions.staticDirPathInProjectBuildDirPath,
                         cwd: projectBuildDirPath
                     });
                 }
 
                 return pathJoin(projectBuildDirPath, "static");
             }
-            assert(bundler === "vite");
-            assert(resolvedViteConfig !== undefined);
 
             return pathJoin(projectBuildDirPath, resolvedViteConfig.assetsDir);
         })(),
+        npmWorkspaceRootDirPath,
         kcContextExclusionsFtlCode: (() => {
             if (buildOptions.kcContextExclusionsFtl === undefined) {
                 return undefined;
@@ -644,43 +498,15 @@ export function getBuildContext(params: {
             return buildOptions.kcContextExclusionsFtl;
         })(),
         environmentVariables: buildOptions.environmentVariables ?? [],
-        implementedThemeTypes,
+        recordIsImplementedByThemeType,
         themeSrcDirPath,
-        fetchOptions: getProxyFetchOptions({
-            npmConfigGetCwd: (function callee(upCount: number): string {
-                const dirPath = pathResolve(
-                    pathJoin(...[projectDirPath, ...Array(upCount).fill("..")])
-                );
-
-                assert(
-                    dirPath !== pathSep,
-                    "Couldn't find a place to run 'npm config get'"
-                );
-
-                try {
-                    child_process.execSync("npm config get", {
-                        cwd: dirPath,
-                        stdio: "pipe"
-                    });
-                } catch (error) {
-                    if (String(error).includes("ENOWORKSPACES")) {
-                        return callee(upCount + 1);
-                    }
-
-                    throw error;
-                }
-
-                return dirPath;
-            })(0)
-        }),
         jarTargets: (() => {
             const getDefaultJarFileBasename = (range: string) =>
                 `keycloak-theme-for-kc-${range}.jar`;
 
             build_for_specific_keycloak_major_version: {
                 const buildForKeycloakMajorVersionNumber = (() => {
-                    const envValue =
-                        process.env[BUILD_FOR_KEYCLOAK_MAJOR_VERSION_ENV_NAME];
+                    const envValue = process.env[buildForKeycloakMajorVersionEnvName];
 
                     if (envValue === undefined) {
                         return undefined;
@@ -698,10 +524,10 @@ export function getBuildContext(params: {
                 }
 
                 const keycloakVersionRange: KeycloakVersionRange = (() => {
-                    if (
-                        implementedThemeTypes.account.isImplemented &&
-                        implementedThemeTypes.account.type === "Multi-Page"
-                    ) {
+                    const doesImplementAccountTheme =
+                        recordIsImplementedByThemeType.account;
+
+                    if (doesImplementAccountTheme) {
                         const keycloakVersionRange = (() => {
                             if (buildForKeycloakMajorVersionNumber <= 21) {
                                 return "21-and-below" as const;
@@ -723,7 +549,7 @@ export function getBuildContext(params: {
                         assert<
                             Equals<
                                 typeof keycloakVersionRange,
-                                KeycloakVersionRange.WithAccountV1Theme
+                                KeycloakVersionRange.WithAccountTheme
                             >
                         >();
 
@@ -740,7 +566,7 @@ export function getBuildContext(params: {
                         assert<
                             Equals<
                                 typeof keycloakVersionRange,
-                                KeycloakVersionRange.WithoutAccountV1Theme
+                                KeycloakVersionRange.WithoutAccountTheme
                             >
                         >();
 
@@ -788,10 +614,7 @@ export function getBuildContext(params: {
             const jarTargets_default = (() => {
                 const jarTargets: BuildContext["jarTargets"] = [];
 
-                if (
-                    implementedThemeTypes.account.isImplemented &&
-                    implementedThemeTypes.account.type === "Multi-Page"
-                ) {
+                if (recordIsImplementedByThemeType.account) {
                     for (const keycloakVersionRange of [
                         "21-and-below",
                         "23",
@@ -801,7 +624,7 @@ export function getBuildContext(params: {
                         assert<
                             Equals<
                                 typeof keycloakVersionRange,
-                                KeycloakVersionRange.WithAccountV1Theme
+                                KeycloakVersionRange.WithAccountTheme
                             >
                         >(true);
                         jarTargets.push({
@@ -818,7 +641,7 @@ export function getBuildContext(params: {
                         assert<
                             Equals<
                                 typeof keycloakVersionRange,
-                                KeycloakVersionRange.WithoutAccountV1Theme
+                                KeycloakVersionRange.WithoutAccountTheme
                             >
                         >(true);
                         jarTargets.push({
@@ -836,11 +659,78 @@ export function getBuildContext(params: {
                 return jarTargets_default;
             }
 
+            if (
+                buildOptions.keycloakVersionTargets.hasAccountTheme !==
+                recordIsImplementedByThemeType.account
+            ) {
+                console.log(
+                    chalk.red(
+                        (() => {
+                            const { keycloakVersionTargets } = buildOptions;
+
+                            let message = `Bad ${symToStr({ keycloakVersionTargets })} configuration.\n`;
+
+                            if (keycloakVersionTargets.hasAccountTheme) {
+                                message +=
+                                    "Your codebase does not seem to implement an account theme ";
+                            } else {
+                                message += "Your codebase implements an account theme ";
+                            }
+
+                            const { hasAccountTheme } = keycloakVersionTargets;
+
+                            message += `but you have set ${symToStr({ keycloakVersionTargets })}.${symToStr({ hasAccountTheme })}`;
+                            message += ` to ${hasAccountTheme} in your `;
+                            message += (() => {
+                                switch (bundler) {
+                                    case "vite":
+                                        return "vite.config.ts";
+                                    case "webpack":
+                                        return "package.json";
+                                }
+                                assert<Equals<typeof bundler, never>>(false);
+                            })();
+                            message += `. Please set it to ${!hasAccountTheme} `;
+                            message +=
+                                "and fill up the relevant keycloak version ranges.\n";
+                            message += "Example:\n";
+                            message += JSON.stringify(
+                                id<Pick<BuildOptions, "keycloakVersionTargets">>({
+                                    keycloakVersionTargets: {
+                                        hasAccountTheme:
+                                            recordIsImplementedByThemeType.account,
+                                        ...objectFromEntries(
+                                            jarTargets_default.map(
+                                                ({
+                                                    keycloakVersionRange,
+                                                    jarFileBasename
+                                                }) => [
+                                                    keycloakVersionRange,
+                                                    jarFileBasename
+                                                ]
+                                            )
+                                        )
+                                    }
+                                }),
+                                null,
+                                2
+                            );
+                            message +=
+                                "\nSee: https://docs.keycloakify.dev/v/v10/targetting-specific-keycloak-versions";
+
+                            return message;
+                        })()
+                    )
+                );
+
+                process.exit(1);
+            }
+
             const jarTargets: BuildContext["jarTargets"] = [];
 
-            for (const [keycloakVersionRange, jarNameOrBoolean] of objectEntries(
-                buildOptions.keycloakVersionTargets
-            )) {
+            const { hasAccountTheme, ...rest } = buildOptions.keycloakVersionTargets;
+
+            for (const [keycloakVersionRange, jarNameOrBoolean] of objectEntries(rest)) {
                 if (jarNameOrBoolean === false) {
                     continue;
                 }
@@ -893,4 +783,8 @@ export function getBuildContext(params: {
             return jarTargets;
         })()
     };
+
+    console.log("DEBUG:", JSON.stringify({ buildContext }, null, 2));
+
+    return buildContext;
 }

src/bin/shared/constants.ts

@@ -1,22 +1,22 @@
-export const KEYCLOAK_RESOURCES = "keycloak-resources";
-export const RESOURCES_COMMON = "resources-common";
-export const LAST_KEYCLOAK_VERSION_WITH_ACCOUNT_V1 = "21.1.2";
-export const BASENAME_OF_KEYCLOAKIFY_RESOURCES_DIR = "dist";
+export const keycloak_resources = "keycloak-resources";
+export const resources_common = "resources-common";
+export const lastKeycloakVersionWithAccountV1 = "21.1.2";
+export const basenameOfTheKeycloakifyResourcesDir = "dist";
 
-export const THEME_TYPES = ["login", "account"] as const;
-export const ACCOUNT_V1_THEME_NAME = "account-v1";
+export const themeTypes = ["login", "account"] as const;
+export const accountV1ThemeName = "account-v1";
 
-export type ThemeType = (typeof THEME_TYPES)[number];
+export type ThemeType = (typeof themeTypes)[number];
 
-export const VITE_PLUGIN_SUB_SCRIPTS_ENV_NAMES = {
-    RUN_POST_BUILD_SCRIPT: "KEYCLOAKIFY_RUN_POST_BUILD_SCRIPT",
-    RESOLVE_VITE_CONFIG: "KEYCLOAKIFY_RESOLVE_VITE_CONFIG"
+export const vitePluginSubScriptEnvNames = {
+    runPostBuildScript: "KEYCLOAKIFY_RUN_POST_BUILD_SCRIPT",
+    resolveViteConfig: "KEYCLOAKIFY_RESOLVE_VITE_CONFIG"
 } as const;
 
-export const BUILD_FOR_KEYCLOAK_MAJOR_VERSION_ENV_NAME =
+export const buildForKeycloakMajorVersionEnvName =
     "KEYCLOAKIFY_BUILD_FOR_KEYCLOAK_MAJOR_VERSION";
 
-export const LOGIN_THEME_PAGE_IDS = [
+export const loginThemePageIds = [
     "login.ftl",
     "login-username.ftl",
     "login-password.ftl",
@@ -53,7 +53,7 @@ export const LOGIN_THEME_PAGE_IDS = [
     "webauthn-error.ftl"
 ] as const;
 
-export const ACCOUNT_THEME_PAGE_IDS = [
+export const accountThemePageIds = [
     "password.ftl",
     "account.ftl",
     "sessions.ftl",
@@ -63,11 +63,9 @@ export const ACCOUNT_THEME_PAGE_IDS = [
     "federatedIdentity.ftl"
 ] as const;
 
-export type LoginThemePageId = (typeof LOGIN_THEME_PAGE_IDS)[number];
-export type AccountThemePageId = (typeof ACCOUNT_THEME_PAGE_IDS)[number];
+export type LoginThemePageId = (typeof loginThemePageIds)[number];
+export type AccountThemePageId = (typeof accountThemePageIds)[number];
 
-export const CONTAINER_NAME = "keycloak-keycloakify";
+export const containerName = "keycloak-keycloakify";
 
-export const FALLBACK_LANGUAGE_TAG = "en";
-
-export const LOGIN_THEME_RESOURCES_FROMkEYCLOAK_VERSION_DEFAULT = "24.0.4";
+export const fallbackLanguageTag = "en";

src/bin/shared/copyKeycloakResourcesToPublic.ts

@@ -4,9 +4,9 @@ import {
 } from "./downloadKeycloakStaticResources";
 import { join as pathJoin, relative as pathRelative } from "path";
 import {
-    THEME_TYPES,
-    KEYCLOAK_RESOURCES,
-    LAST_KEYCLOAK_VERSION_WITH_ACCOUNT_V1
+    themeTypes,
+    keycloak_resources,
+    lastKeycloakVersionWithAccountV1
 } from "../shared/constants";
 import { readThisNpmPackageVersion } from "../tools/readThisNpmPackageVersion";
 import { assert } from "tsafe/assert";
@@ -26,7 +26,7 @@ export async function copyKeycloakResourcesToPublic(params: {
 }) {
     const { buildContext } = params;
 
-    const destDirPath = pathJoin(buildContext.publicDirPath, KEYCLOAK_RESOURCES);
+    const destDirPath = pathJoin(buildContext.publicDirPath, keycloak_resources);
 
     const keycloakifyBuildinfoFilePath = pathJoin(destDirPath, "keycloakify.buildinfo");
 
@@ -37,7 +37,10 @@ export async function copyKeycloakResourcesToPublic(params: {
             buildContext: {
                 loginThemeResourcesFromKeycloakVersion: readThisNpmPackageVersion(),
                 cacheDirPath: pathRelative(destDirPath, buildContext.cacheDirPath),
-                fetchOptions: buildContext.fetchOptions
+                npmWorkspaceRootDirPath: pathRelative(
+                    destDirPath,
+                    buildContext.npmWorkspaceRootDirPath
+                )
             }
         },
         null,
@@ -66,14 +69,14 @@ export async function copyKeycloakResourcesToPublic(params: {
 
     fs.writeFileSync(pathJoin(destDirPath, ".gitignore"), Buffer.from("*", "utf8"));
 
-    for (const themeType of THEME_TYPES) {
+    for (const themeType of themeTypes) {
         await downloadKeycloakStaticResources({
             keycloakVersion: (() => {
                 switch (themeType) {
                     case "login":
                         return buildContext.loginThemeResourcesFromKeycloakVersion;
                     case "account":
-                        return LAST_KEYCLOAK_VERSION_WITH_ACCOUNT_V1;
+                        return lastKeycloakVersionWithAccountV1;
                 }
             })(),
             themeType,

src/bin/shared/downloadKeycloakDefaultTheme.ts

@@ -1,12 +1,12 @@
 import { join as pathJoin, relative as pathRelative } from "path";
 import { type BuildContext } from "./buildContext";
 import { assert } from "tsafe/assert";
-import { LAST_KEYCLOAK_VERSION_WITH_ACCOUNT_V1 } from "./constants";
+import { lastKeycloakVersionWithAccountV1 } from "./constants";
 import { downloadAndExtractArchive } from "../tools/downloadAndExtractArchive";
 
 export type BuildContextLike = {
     cacheDirPath: string;
-    fetchOptions: BuildContext["fetchOptions"];
+    npmWorkspaceRootDirPath: string;
 };
 
 assert<BuildContext extends BuildContextLike ? true : false>();
@@ -17,14 +17,14 @@ export async function downloadKeycloakDefaultTheme(params: {
 }): Promise<{ defaultThemeDirPath: string }> {
     const { keycloakVersion, buildContext } = params;
 
-    let kcNodeModulesKeepFilePaths: Set<string> | undefined = undefined;
-    let kcNodeModulesKeepFilePaths_lastAccountV1: Set<string> | undefined = undefined;
+    let kcNodeModulesKeepFilePaths: string[] | undefined = undefined;
+    let kcNodeModulesKeepFilePaths_lastAccountV1: string[] | undefined = undefined;
 
     const { extractedDirPath } = await downloadAndExtractArchive({
         url: `https://repo1.maven.org/maven2/org/keycloak/keycloak-themes/${keycloakVersion}/keycloak-themes-${keycloakVersion}.jar`,
         cacheDirPath: buildContext.cacheDirPath,
-        fetchOptions: buildContext.fetchOptions,
-        uniqueIdOfOnArchiveFile: "downloadKeycloakDefaultTheme",
+        npmWorkspaceRootDirPath: buildContext.npmWorkspaceRootDirPath,
+        uniqueIdOfOnOnArchiveFile: "downloadKeycloakDefaultTheme",
         onArchiveFile: async params => {
             const fileRelativePath = pathRelative("theme", params.fileRelativePath);
 
@@ -43,7 +43,7 @@ export async function downloadKeycloakDefaultTheme(params: {
             }
 
             last_account_v1_transformations: {
-                if (LAST_KEYCLOAK_VERSION_WITH_ACCOUNT_V1 !== keycloakVersion) {
+                if (lastKeycloakVersionWithAccountV1 !== keycloakVersion) {
                     break last_account_v1_transformations;
                 }
 
@@ -72,19 +72,16 @@ export async function downloadKeycloakDefaultTheme(params: {
                 }
 
                 skip_node_modules: {
-                    const nodeModulesRelativeDirPath = pathJoin(
-                        "keycloak",
-                        "common",
-                        "resources",
-                        "node_modules"
-                    );
-
-                    if (!fileRelativePath.startsWith(nodeModulesRelativeDirPath)) {
+                    if (
+                        !fileRelativePath.startsWith(
+                            pathJoin("keycloak", "common", "resources", "node_modules")
+                        )
+                    ) {
                         break skip_node_modules;
                     }
 
                     if (kcNodeModulesKeepFilePaths_lastAccountV1 === undefined) {
-                        kcNodeModulesKeepFilePaths_lastAccountV1 = new Set([
+                        kcNodeModulesKeepFilePaths_lastAccountV1 = [
                             pathJoin("patternfly", "dist", "css", "patternfly.min.css"),
                             pathJoin(
                                 "patternfly",
@@ -128,19 +125,13 @@ export async function downloadKeycloakDefaultTheme(params: {
                                 "fonts",
                                 "PatternFlyIcons-webfont.woff"
                             )
-                        ]);
+                        ];
                     }
 
-                    const fileRelativeToNodeModulesPath = fileRelativePath.substring(
-                        nodeModulesRelativeDirPath.length + 1
-                    );
-
-                    if (
-                        kcNodeModulesKeepFilePaths_lastAccountV1.has(
-                            fileRelativeToNodeModulesPath
-                        )
-                    ) {
-                        break skip_node_modules;
+                    for (const keepPath of kcNodeModulesKeepFilePaths_lastAccountV1) {
+                        if (fileRelativePath.endsWith(keepPath)) {
+                            break skip_node_modules;
+                        }
                     }
 
                     return;
@@ -174,19 +165,16 @@ export async function downloadKeycloakDefaultTheme(params: {
                 }
 
                 skip_node_modules: {
-                    const nodeModulesRelativeDirPath = pathJoin(
-                        "keycloak",
-                        "common",
-                        "resources",
-                        "node_modules"
-                    );
-
-                    if (!fileRelativePath.startsWith(nodeModulesRelativeDirPath)) {
+                    if (
+                        !fileRelativePath.startsWith(
+                            pathJoin("keycloak", "common", "resources", "node_modules")
+                        )
+                    ) {
                         break skip_node_modules;
                     }
 
                     if (kcNodeModulesKeepFilePaths === undefined) {
-                        kcNodeModulesKeepFilePaths = new Set([
+                        kcNodeModulesKeepFilePaths = [
                             pathJoin("@patternfly", "patternfly", "patternfly.min.css"),
                             pathJoin("patternfly", "dist", "css", "patternfly.min.css"),
                             pathJoin(
@@ -243,23 +231,14 @@ export async function downloadKeycloakDefaultTheme(params: {
                                 "fonts",
                                 "PatternFlyIcons-webfont.woff"
                             ),
-                            pathJoin(
-                                "patternfly",
-                                "dist",
-                                "fonts",
-                                "OpenSans-Semibold-webfont.woff2"
-                            ),
-                            pathJoin("patternfly", "dist", "img", "bg-login.jpg"),
                             pathJoin("jquery", "dist", "jquery.min.js")
-                        ]);
+                        ];
                     }
 
-                    const fileRelativeToNodeModulesPath = fileRelativePath.substring(
-                        nodeModulesRelativeDirPath.length + 1
-                    );
-
-                    if (kcNodeModulesKeepFilePaths.has(fileRelativeToNodeModulesPath)) {
-                        break skip_node_modules;
+                    for (const keepPath of kcNodeModulesKeepFilePaths) {
+                        if (fileRelativePath.endsWith(keepPath)) {
+                            break skip_node_modules;
+                        }
                     }
 
                     return;

src/bin/shared/downloadKeycloakStaticResources.ts

@@ -4,7 +4,7 @@ import {
     downloadKeycloakDefaultTheme,
     type BuildContextLike as BuildContextLike_downloadKeycloakDefaultTheme
 } from "./downloadKeycloakDefaultTheme";
-import { RESOURCES_COMMON, type ThemeType } from "./constants";
+import { resources_common, type ThemeType } from "./constants";
 import type { BuildContext } from "./buildContext";
 import { assert } from "tsafe/assert";
 import { existsAsync } from "../tools/fs.existsAsync";
@@ -48,6 +48,6 @@ export async function downloadKeycloakStaticResources(params: {
 
     transformCodebase({
         srcDirPath: pathJoin(defaultThemeDirPath, "keycloak", "common", "resources"),
-        destDirPath: pathJoin(resourcesDirPath, RESOURCES_COMMON)
+        destDirPath: pathJoin(resourcesDirPath, resources_common)
     });
 }

src/bin/shared/getLatestsSemVersionedTag.ts

@@ -1,180 +0,0 @@
-import { getLatestsSemVersionedTagFactory } from "../tools/octokit-addons/getLatestsSemVersionedTag";
-import { Octokit } from "@octokit/rest";
-import type { ReturnType } from "tsafe";
-import type { Param0 } from "tsafe";
-import { join as pathJoin, dirname as pathDirname } from "path";
-import * as fs from "fs";
-import { z } from "zod";
-import { assert, type Equals } from "tsafe/assert";
-import { id } from "tsafe/id";
-import type { SemVer } from "../tools/SemVer";
-import { same } from "evt/tools/inDepth/same";
-
-type GetLatestsSemVersionedTag = ReturnType<
-    typeof getLatestsSemVersionedTagFactory
->["getLatestsSemVersionedTag"];
-
-type Params = Param0<GetLatestsSemVersionedTag>;
-type R = ReturnType<GetLatestsSemVersionedTag>;
-
-let getLatestsSemVersionedTag_stateless: GetLatestsSemVersionedTag | undefined =
-    undefined;
-
-const CACHE_VERSION = 1;
-
-type Cache = {
-    version: typeof CACHE_VERSION;
-    entries: {
-        time: number;
-        params: Params;
-        result: R;
-    }[];
-};
-
-export async function getLatestsSemVersionedTag({
-    cacheDirPath,
-    ...params
-}: Params & { cacheDirPath: string }): Promise<R> {
-    const cacheFilePath = pathJoin(cacheDirPath, "latest-sem-versioned-tags.json");
-
-    const cacheLookupResult = (() => {
-        const getResult_currentCache = (currentCacheEntries: Cache["entries"]) => ({
-            hasCachedResult: false as const,
-            currentCache: {
-                version: CACHE_VERSION,
-                entries: currentCacheEntries
-            }
-        });
-
-        if (!fs.existsSync(cacheFilePath)) {
-            return getResult_currentCache([]);
-        }
-
-        let cache_json;
-
-        try {
-            cache_json = fs.readFileSync(cacheFilePath).toString("utf8");
-        } catch {
-            return getResult_currentCache([]);
-        }
-
-        let cache_json_parsed: unknown;
-
-        try {
-            cache_json_parsed = JSON.parse(cache_json);
-        } catch {
-            return getResult_currentCache([]);
-        }
-
-        const zSemVer = (() => {
-            type TargetType = SemVer;
-
-            const zTargetType = z.object({
-                major: z.number(),
-                minor: z.number(),
-                patch: z.number(),
-                rc: z.number().optional(),
-                parsedFrom: z.string()
-            });
-
-            assert<Equals<z.infer<typeof zTargetType>, TargetType>>();
-
-            return id<z.ZodType<TargetType>>(zTargetType);
-        })();
-
-        const zCache = (() => {
-            type TargetType = Cache;
-
-            const zTargetType = z.object({
-                version: z.literal(CACHE_VERSION),
-                entries: z.array(
-                    z.object({
-                        time: z.number(),
-                        params: z.object({
-                            owner: z.string(),
-                            repo: z.string(),
-                            count: z.number(),
-                            doIgnoreReleaseCandidates: z.boolean()
-                        }),
-                        result: z.array(
-                            z.object({
-                                tag: z.string(),
-                                version: zSemVer
-                            })
-                        )
-                    })
-                )
-            });
-
-            assert<Equals<z.infer<typeof zTargetType>, TargetType>>();
-
-            return id<z.ZodType<TargetType>>(zTargetType);
-        })();
-
-        let cache: Cache;
-
-        try {
-            cache = zCache.parse(cache_json_parsed);
-        } catch {
-            return getResult_currentCache([]);
-        }
-
-        const cacheEntry = cache.entries.find(e => same(e.params, params));
-
-        if (cacheEntry === undefined) {
-            return getResult_currentCache(cache.entries);
-        }
-
-        if (Date.now() - cacheEntry.time > 3_600_000) {
-            return getResult_currentCache(cache.entries.filter(e => e !== cacheEntry));
-        }
-        return {
-            hasCachedResult: true as const,
-            cachedResult: cacheEntry.result
-        };
-    })();
-
-    if (cacheLookupResult.hasCachedResult) {
-        return cacheLookupResult.cachedResult;
-    }
-
-    const { currentCache } = cacheLookupResult;
-
-    getLatestsSemVersionedTag_stateless ??= (() => {
-        const octokit = (() => {
-            const githubToken = process.env.GITHUB_TOKEN;
-
-            const octokit = new Octokit(
-                githubToken === undefined ? undefined : { auth: githubToken }
-            );
-
-            return octokit;
-        })();
-
-        const { getLatestsSemVersionedTag } = getLatestsSemVersionedTagFactory({
-            octokit
-        });
-
-        return getLatestsSemVersionedTag;
-    })();
-
-    const result = await getLatestsSemVersionedTag_stateless(params);
-
-    currentCache.entries.push({
-        time: Date.now(),
-        params,
-        result
-    });
-
-    {
-        const dirPath = pathDirname(cacheFilePath);
-
-        if (!fs.existsSync(dirPath)) {
-            fs.mkdirSync(dirPath, { recursive: true });
-        }
-    }
-
-    fs.writeFileSync(cacheFilePath, JSON.stringify(currentCache, null, 2));
-
-    return result;
-}

src/bin/shared/promptKeycloakVersion.ts

@@ -1,6 +1,11 @@
-import { getLatestsSemVersionedTag } from "./getLatestsSemVersionedTag";
+import { getLatestsSemVersionedTagFactory } from "../tools/octokit-addons/getLatestsSemVersionedTag";
+import { Octokit } from "@octokit/rest";
 import cliSelect from "cli-select";
 import { SemVer } from "../tools/SemVer";
+import { join as pathJoin, dirname as pathDirname } from "path";
+import * as fs from "fs";
+import type { ReturnType } from "tsafe";
+import { id } from "tsafe/id";
 
 export async function promptKeycloakVersion(params: {
     startingFromMajor: number | undefined;
@@ -9,15 +14,79 @@ export async function promptKeycloakVersion(params: {
 }) {
     const { startingFromMajor, excludeMajorVersions, cacheDirPath } = params;
 
+    const { getLatestsSemVersionedTag } = (() => {
+        const { octokit } = (() => {
+            const githubToken = process.env.GITHUB_TOKEN;
+
+            const octokit = new Octokit(
+                githubToken === undefined ? undefined : { auth: githubToken }
+            );
+
+            return { octokit };
+        })();
+
+        const { getLatestsSemVersionedTag } = getLatestsSemVersionedTagFactory({
+            octokit
+        });
+
+        return { getLatestsSemVersionedTag };
+    })();
+
     const semVersionedTagByMajor = new Map<number, { tag: string; version: SemVer }>();
 
-    const semVersionedTags = await getLatestsSemVersionedTag({
-        cacheDirPath,
-        count: 50,
-        owner: "keycloak",
-        repo: "keycloak",
-        doIgnoreReleaseCandidates: true
-    });
+    const semVersionedTags = await (async () => {
+        const cacheFilePath = pathJoin(cacheDirPath, "keycloak-versions.json");
+
+        type Cache = {
+            time: number;
+            semVersionedTags: ReturnType<typeof getLatestsSemVersionedTag>;
+        };
+
+        use_cache: {
+            if (!fs.existsSync(cacheFilePath)) {
+                break use_cache;
+            }
+
+            const cache: Cache = JSON.parse(
+                fs.readFileSync(cacheFilePath).toString("utf8")
+            );
+
+            if (Date.now() - cache.time > 3_600_000) {
+                fs.unlinkSync(cacheFilePath);
+                break use_cache;
+            }
+
+            return cache.semVersionedTags;
+        }
+
+        const semVersionedTags = await getLatestsSemVersionedTag({
+            count: 50,
+            owner: "keycloak",
+            repo: "keycloak"
+        });
+
+        {
+            const dirPath = pathDirname(cacheFilePath);
+
+            if (!fs.existsSync(dirPath)) {
+                fs.mkdirSync(dirPath, { recursive: true });
+            }
+        }
+
+        fs.writeFileSync(
+            cacheFilePath,
+            JSON.stringify(
+                id<Cache>({
+                    time: Date.now(),
+                    semVersionedTags
+                }),
+                null,
+                2
+            )
+        );
+
+        return semVersionedTags;
+    })();
 
     semVersionedTags.forEach(semVersionedTag => {
         if (

src/bin/start-keycloak/appBuild.ts

@@ -1,19 +1,17 @@
 import * as child_process from "child_process";
 import { Deferred } from "evt/tools/Deferred";
 import { assert } from "tsafe/assert";
+import { is } from "tsafe/is";
 import type { BuildContext } from "../shared/buildContext";
-import chalk from "chalk";
-import { sep as pathSep, join as pathJoin } from "path";
-import { getAbsoluteAndInOsFormatPath } from "../tools/getAbsoluteAndInOsFormatPath";
 import * as fs from "fs";
-import { dirname as pathDirname, relative as pathRelative } from "path";
+import { join as pathJoin } from "path";
 
 export type BuildContextLike = {
     projectDirPath: string;
     keycloakifyBuildDirPath: string;
-    bundler: BuildContext["bundler"];
+    bundler: "vite" | "webpack";
+    npmWorkspaceRootDirPath: string;
     projectBuildDirPath: string;
-    packageJsonFilePath: string;
 };
 
 assert<BuildContext extends BuildContextLike ? true : false>();
@@ -23,29 +21,95 @@ export async function appBuild(params: {
 }): Promise<{ isAppBuildSuccess: boolean }> {
     const { buildContext } = params;
 
-    switch (buildContext.bundler) {
-        case "vite":
-            return appBuild_vite({ buildContext });
-        case "webpack":
-            return appBuild_webpack({ buildContext });
-    }
-}
+    const { bundler } = buildContext;
 
-async function appBuild_vite(params: {
-    buildContext: BuildContextLike;
-}): Promise<{ isAppBuildSuccess: boolean }> {
-    const { buildContext } = params;
+    const { command, args, cwd } = (() => {
+        switch (bundler) {
+            case "vite":
+                return {
+                    command: "npx",
+                    args: ["vite", "build"],
+                    cwd: buildContext.projectDirPath
+                };
+            case "webpack": {
+                for (const dirPath of [
+                    buildContext.projectDirPath,
+                    buildContext.npmWorkspaceRootDirPath
+                ]) {
+                    try {
+                        const parsedPackageJson = JSON.parse(
+                            fs
+                                .readFileSync(pathJoin(dirPath, "package.json"))
+                                .toString("utf8")
+                        );
 
-    assert(buildContext.bundler === "vite");
+                        const [scriptName] =
+                            Object.entries(parsedPackageJson.scripts).find(
+                                ([, scriptValue]) => {
+                                    assert(is<string>(scriptValue));
+                                    if (
+                                        scriptValue.includes("webpack") &&
+                                        scriptValue.includes("--mode production")
+                                    ) {
+                                        return true;
+                                    }
 
-    const dIsSuccess = new Deferred<boolean>();
+                                    if (
+                                        scriptValue.includes("react-scripts") &&
+                                        scriptValue.includes("build")
+                                    ) {
+                                        return true;
+                                    }
 
-    console.log(chalk.blue("Running: 'npx vite build'"));
+                                    if (
+                                        scriptValue.includes("react-app-rewired") &&
+                                        scriptValue.includes("build")
+                                    ) {
+                                        return true;
+                                    }
 
-    const child = child_process.spawn("npx", ["vite", "build"], {
-        cwd: buildContext.projectDirPath,
-        shell: true
-    });
+                                    if (
+                                        scriptValue.includes("craco") &&
+                                        scriptValue.includes("build")
+                                    ) {
+                                        return true;
+                                    }
+
+                                    if (
+                                        scriptValue.includes("ng") &&
+                                        scriptValue.includes("build")
+                                    ) {
+                                        return true;
+                                    }
+
+                                    return false;
+                                }
+                            ) ?? [];
+
+                        if (scriptName === undefined) {
+                            continue;
+                        }
+
+                        return {
+                            command: "npm",
+                            args: ["run", scriptName],
+                            cwd: dirPath
+                        };
+                    } catch {
+                        continue;
+                    }
+                }
+
+                throw new Error(
+                    "Keycloakify was unable to determine which script is responsible for building the app."
+                );
+            }
+        }
+    })();
+
+    const dResult = new Deferred<{ isSuccess: boolean }>();
+
+    const child = child_process.spawn(command, args, { cwd, shell: true });
 
     child.stdout.on("data", data => {
         if (data.toString("utf8").includes("gzip:")) {
@@ -57,128 +121,9 @@ async function appBuild_vite(params: {
 
     child.stderr.on("data", data => process.stderr.write(data));
 
-    child.on("exit", code => dIsSuccess.resolve(code === 0));
+    child.on("exit", code => dResult.resolve({ isSuccess: code === 0 }));
 
-    const isSuccess = await dIsSuccess.pr;
+    const { isSuccess } = await dResult.pr;
 
     return { isAppBuildSuccess: isSuccess };
 }
-
-async function appBuild_webpack(params: {
-    buildContext: BuildContextLike;
-}): Promise<{ isAppBuildSuccess: boolean }> {
-    const { buildContext } = params;
-
-    assert(buildContext.bundler === "webpack");
-
-    const entries = Object.entries(
-        (JSON.parse(fs.readFileSync(buildContext.packageJsonFilePath).toString("utf8"))
-            .scripts ?? {}) as Record<string, string>
-    ).filter(([, scriptCommand]) => scriptCommand.includes("keycloakify build"));
-
-    if (entries.length === 0) {
-        console.log(
-            chalk.red(
-                [
-                    `You should have a script in your package.json at ${pathRelative(process.cwd(), pathDirname(buildContext.packageJsonFilePath))}`,
-                    `that includes the 'keycloakify build' command`
-                ].join(" ")
-            )
-        );
-        process.exit(-1);
-    }
-
-    const entry =
-        entries.length === 1
-            ? entries[0]
-            : entries.find(([scriptName]) => scriptName === "build-keycloak-theme");
-
-    if (entry === undefined) {
-        console.log(
-            chalk.red(
-                "There's multiple candidate script for building your app, name one 'build-keycloak-theme'"
-            )
-        );
-        process.exit(-1);
-    }
-
-    const [scriptName, scriptCommand] = entry;
-
-    const { appBuildSubCommands } = (() => {
-        const appBuildSubCommands: string[] = [];
-
-        for (const subCmd of scriptCommand.split("&&").map(s => s.trim())) {
-            if (subCmd.includes("keycloakify build")) {
-                break;
-            }
-
-            appBuildSubCommands.push(subCmd);
-        }
-
-        return { appBuildSubCommands };
-    })();
-
-    if (appBuildSubCommands.length === 0) {
-        console.log(
-            chalk.red(
-                `Your ${scriptName} script should look like "... && keycloakify build ..."`
-            )
-        );
-        process.exit(-1);
-    }
-
-    let commandCwd = pathDirname(buildContext.packageJsonFilePath);
-
-    for (const subCommand of appBuildSubCommands) {
-        const dIsSuccess = new Deferred<boolean>();
-
-        const [command, ...args] = subCommand.split(" ");
-
-        if (command === "cd") {
-            const [pathIsh] = args;
-
-            commandCwd = getAbsoluteAndInOsFormatPath({
-                pathIsh,
-                cwd: commandCwd
-            });
-
-            continue;
-        }
-
-        console.log(chalk.blue(`Running: '${subCommand}'`));
-
-        const child = child_process.spawn(command, args, {
-            cwd: commandCwd,
-            env: {
-                ...process.env,
-                PATH: (() => {
-                    const separator = pathSep === "/" ? ":" : ";";
-
-                    return [
-                        pathJoin(
-                            pathDirname(buildContext.packageJsonFilePath),
-                            "node_modules",
-                            ".bin"
-                        ),
-                        ...(process.env.PATH ?? "").split(separator)
-                    ].join(separator);
-                })()
-            },
-            shell: true
-        });
-
-        child.stdout.on("data", data => process.stdout.write(data));
-
-        child.stderr.on("data", data => process.stderr.write(data));
-
-        child.on("exit", code => dIsSuccess.resolve(code === 0));
-
-        const isSuccess = await dIsSuccess.pr;
-
-        if (!isSuccess) {
-            return { isAppBuildSuccess: false };
-        }
-    }
-
-    return { isAppBuildSuccess: true };
-}

src/bin/start-keycloak/keycloakifyBuild.ts

@@ -1,13 +1,13 @@
-import { BUILD_FOR_KEYCLOAK_MAJOR_VERSION_ENV_NAME } from "../shared/constants";
+import { buildForKeycloakMajorVersionEnvName } from "../shared/constants";
 import * as child_process from "child_process";
 import { Deferred } from "evt/tools/Deferred";
 import { assert } from "tsafe/assert";
 import type { BuildContext } from "../shared/buildContext";
-import chalk from "chalk";
 
 export type BuildContextLike = {
     projectDirPath: string;
     keycloakifyBuildDirPath: string;
+    bundler: "vite" | "webpack";
 };
 
 assert<BuildContext extends BuildContextLike ? true : false>();
@@ -20,13 +20,11 @@ export async function keycloakifyBuild(params: {
 
     const dResult = new Deferred<{ isSuccess: boolean }>();
 
-    console.log(chalk.blue("Running: 'npx keycloakify build'"));
-
     const child = child_process.spawn("npx", ["keycloakify", "build"], {
         cwd: buildContext.projectDirPath,
         env: {
             ...process.env,
-            [BUILD_FOR_KEYCLOAK_MAJOR_VERSION_ENV_NAME]: `${buildForKeycloakMajorVersionNumber}`
+            [buildForKeycloakMajorVersionEnvName]: `${buildForKeycloakMajorVersionNumber}`
         },
         shell: true
     });

src/bin/start-keycloak/start-keycloak.ts

@@ -2,7 +2,7 @@ import { getBuildContext } from "../shared/buildContext";
 import { exclude } from "tsafe/exclude";
 import type { CliCommandOptions as CliCommandOptions_common } from "../main";
 import { promptKeycloakVersion } from "../shared/promptKeycloakVersion";
-import { ACCOUNT_V1_THEME_NAME, CONTAINER_NAME } from "../shared/constants";
+import { accountV1ThemeName, containerName } from "../shared/constants";
 import { SemVer } from "../tools/SemVer";
 import { assert } from "tsafe/assert";
 import * as fs from "fs";
@@ -121,7 +121,7 @@ export async function command(params: { cliCommandOptions: CliCommandOptions })
         if (!isAppBuildSuccess) {
             console.log(
                 chalk.red(
-                    `App build failed, exiting. Try building your app (e.g 'npm run build') and see what's wrong.`
+                    `App build failed, exiting. Try running 'npm run build' and see what's wrong.`
                 )
             );
             process.exit(1);
@@ -269,7 +269,7 @@ export async function command(params: { cliCommandOptions: CliCommandOptions })
     fs.copyFileSync(jarFilePath, jarFilePath_cacheDir);
 
     try {
-        child_process.execSync(`docker rm --force ${CONTAINER_NAME}`, {
+        child_process.execSync(`docker rm --force ${containerName}`, {
             stdio: "ignore"
         });
     } catch {}
@@ -279,7 +279,7 @@ export async function command(params: { cliCommandOptions: CliCommandOptions })
         [
             "run",
             ...["-p", `${cliCommandOptions.port}:8080`],
-            ...["--name", CONTAINER_NAME],
+            ...["--name", containerName],
             ...["-e", "KEYCLOAK_ADMIN=admin"],
             ...["-e", "KEYCLOAK_ADMIN_PASSWORD=admin"],
             ...(realmJsonFilePath === undefined
@@ -301,10 +301,10 @@ export async function command(params: { cliCommandOptions: CliCommandOptions })
                     pathJoin(
                         buildContext.keycloakifyBuildDirPath,
                         "theme",
-                        ACCOUNT_V1_THEME_NAME
+                        accountV1ThemeName
                     )
                 )
-                    ? [ACCOUNT_V1_THEME_NAME]
+                    ? [accountV1ThemeName]
                     : [])
             ]
                 .map(themeName => ({

src/bin/tools/assertNoPnpmDlx.ts

@@ -1,15 +0,0 @@
-import { sep as pathSep } from "path";
-import chalk from "chalk";
-
-export function assertNoPnpmDlx() {
-    if (__dirname.includes(`${pathSep}pnpm${pathSep}dlx${pathSep}`)) {
-        console.log(
-            [
-                chalk.red("Please don't use `pnpm dlx keycloakify`"),
-                "\nUse `npx keycloakify` or `pnpm exec keycloakify` instead since you want to use the keycloakify",
-                "version that is installed in your project and not the latest version on NPM."
-            ].join(" ")
-        );
-        process.exit(1);
-    }
-}

src/bin/tools/downloadAndExtractArchive/downloadAndExtractArchive.ts

@@ -1,16 +1,16 @@
-import fetch, { type FetchOptions } from "make-fetch-happen";
+import fetch from "make-fetch-happen";
 import { mkdir, unlink, writeFile, readdir, readFile } from "fs/promises";
 import { dirname as pathDirname, join as pathJoin } from "path";
 import { assert } from "tsafe/assert";
-import { extractArchive } from "./extractArchive";
-import { existsAsync } from "./fs.existsAsync";
-
+import { extractArchive } from "../extractArchive";
+import { existsAsync } from "../fs.existsAsync";
+import { getProxyFetchOptions } from "./fetchProxyOptions";
 import * as crypto from "crypto";
-import { rm } from "./fs.rm";
+import { rm } from "../fs.rm";
 
 export async function downloadAndExtractArchive(params: {
     url: string;
-    uniqueIdOfOnArchiveFile: string;
+    uniqueIdOfOnOnArchiveFile: string;
     onArchiveFile: (params: {
         fileRelativePath: string;
         readFile: () => Promise<Buffer>;
@@ -20,10 +20,15 @@ export async function downloadAndExtractArchive(params: {
         }) => Promise<void>;
     }) => Promise<void>;
     cacheDirPath: string;
-    fetchOptions: FetchOptions | undefined;
+    npmWorkspaceRootDirPath: string;
 }): Promise<{ extractedDirPath: string }> {
-    const { url, uniqueIdOfOnArchiveFile, onArchiveFile, cacheDirPath, fetchOptions } =
-        params;
+    const {
+        url,
+        uniqueIdOfOnOnArchiveFile,
+        onArchiveFile,
+        cacheDirPath,
+        npmWorkspaceRootDirPath
+    } = params;
 
     const archiveFileBasename = url.split("?")[0].split("/").reverse()[0];
 
@@ -50,7 +55,10 @@ export async function downloadAndExtractArchive(params: {
 
         await mkdir(pathDirname(archiveFilePath), { recursive: true });
 
-        const response = await fetch(url, fetchOptions);
+        const response = await fetch(
+            url,
+            await getProxyFetchOptions({ npmWorkspaceRootDirPath })
+        );
 
         response.body?.setMaxListeners(Number.MAX_VALUE);
         assert(typeof response.body !== "undefined" && response.body != null);
@@ -63,7 +71,7 @@ export async function downloadAndExtractArchive(params: {
         });
     }
 
-    const extractDirBasename = `${archiveFileBasename.replace(/\.([^.]+)$/, (...[, ext]) => `_${ext}`)}_${uniqueIdOfOnArchiveFile}_${crypto
+    const extractDirBasename = `${archiveFileBasename.split(".")[0]}_${uniqueIdOfOnOnArchiveFile}_${crypto
         .createHash("sha256")
         .update(onArchiveFile.toString())
         .digest("hex")
@@ -85,9 +93,7 @@ export async function downloadAndExtractArchive(params: {
                 })()
             )
             .map(async extractDirBasename => {
-                await rm(pathJoin(cacheDirPath, extractDirBasename), {
-                    recursive: true
-                });
+                await rm(pathJoin(cacheDirPath, extractDirBasename), { recursive: true });
                 await SuccessTracker.removeFromExtracted({
                     cacheDirPath,
                     extractDirBasename

src/bin/tools/downloadAndExtractArchive/fetchProxyOptions.ts

@@ -1,40 +1,61 @@
+import { exec as execCallback } from "child_process";
+import { readFile } from "fs/promises";
 import { type FetchOptions } from "make-fetch-happen";
-import * as child_process from "child_process";
-import * as fs from "fs";
+import { promisify } from "util";
+
+function ensureArray<T>(arg0: T | T[]) {
+    return Array.isArray(arg0) ? arg0 : typeof arg0 === "undefined" ? [] : [arg0];
+}
+
+function ensureSingleOrNone<T>(arg0: T | T[]) {
+    if (!Array.isArray(arg0)) return arg0;
+    if (arg0.length === 0) return undefined;
+    if (arg0.length === 1) return arg0[0];
+    throw new Error(
+        "Illegal configuration, expected a single value but found multiple: " +
+            arg0.map(String).join(", ")
+    );
+}
+
+type NPMConfig = Record<string, string | string[]>;
+
+/**
+ * Get npm configuration as map
+ */
+async function getNmpConfig(params: { npmWorkspaceRootDirPath: string }) {
+    const { npmWorkspaceRootDirPath } = params;
+
+    const exec = promisify(execCallback);
+
+    const stdout = await exec("npm config get", {
+        encoding: "utf8",
+        cwd: npmWorkspaceRootDirPath
+    }).then(({ stdout }) => stdout);
+
+    const npmConfigReducer = (cfg: NPMConfig, [key, value]: [string, string]) =>
+        key in cfg
+            ? { ...cfg, [key]: [...ensureArray(cfg[key]), value] }
+            : { ...cfg, [key]: value };
+
+    return stdout
+        .split("\n")
+        .filter(line => !line.startsWith(";"))
+        .map(line => line.trim())
+        .map(line => line.split("=", 2) as [string, string])
+        .reduce(npmConfigReducer, {} as NPMConfig);
+}
 
 export type ProxyFetchOptions = Pick<
     FetchOptions,
     "proxy" | "noProxy" | "strictSSL" | "cert" | "ca"
 >;
 
-export function getProxyFetchOptions(params: {
-    npmConfigGetCwd: string;
-}): ProxyFetchOptions {
-    const { npmConfigGetCwd } = params;
+export async function getProxyFetchOptions(params: {
+    npmWorkspaceRootDirPath: string;
+}): Promise<ProxyFetchOptions> {
+    const { npmWorkspaceRootDirPath } = params;
 
-    const cfg = (() => {
-        const output = child_process
-            .execSync("npm config get", {
-                cwd: npmConfigGetCwd
-            })
-            .toString("utf8");
-
-        return output
-            .split("\n")
-            .filter(line => !line.startsWith(";"))
-            .map(line => line.trim())
-            .map(line => line.split("=", 2) as [string, string])
-            .reduce(
-                (
-                    cfg: Record<string, string | string[]>,
-                    [key, value]: [string, string]
-                ) =>
-                    key in cfg
-                        ? { ...cfg, [key]: [...ensureArray(cfg[key]), value] }
-                        : { ...cfg, [key]: value },
-                {}
-            );
-    })();
+    const cfg = await getNmpConfig({ npmWorkspaceRootDirPath });
 
     const proxy = ensureSingleOrNone(cfg["https-proxy"] ?? cfg["proxy"]);
     const noProxy = cfg["noproxy"] ?? cfg["no-proxy"];
@@ -50,15 +71,16 @@ export function getProxyFetchOptions(params: {
 
     if (typeof cafile !== "undefined" && cafile !== "null") {
         ca.push(
-            ...(() => {
-                const cafileContent = fs.readFileSync(cafile).toString("utf8");
-
-                const newLinePlaceholder = "NEW_LINE_PLACEHOLDER_xIsPsK23svt";
-
-                const chunks = <T>(arr: T[], size: number = 2) =>
-                    arr
+            ...(await (async () => {
+                function chunks<T>(arr: T[], size: number = 2) {
+                    return arr
                         .map((_, i) => i % size == 0 && arr.slice(i, i + size))
                         .filter(Boolean) as T[][];
+                }
+
+                const cafileContent = await readFile(cafile, "utf-8");
+
+                const newLinePlaceholder = "NEW_LINE_PLACEHOLDER_xIsPsK23svt";
 
                 return chunks(cafileContent.split(/(-----END CERTIFICATE-----)/), 2).map(
                     ca =>
@@ -68,7 +90,7 @@ export function getProxyFetchOptions(params: {
                             .replace(new RegExp(`^${newLinePlaceholder}`), "")
                             .replace(new RegExp(newLinePlaceholder, "g"), "\\n")
                 );
-            })()
+            })())
         );
     }
 
@@ -80,17 +102,3 @@ export function getProxyFetchOptions(params: {
         ca: ca.length === 0 ? undefined : ca
     };
 }
-
-function ensureArray<T>(arg0: T | T[]) {
-    return Array.isArray(arg0) ? arg0 : typeof arg0 === "undefined" ? [] : [arg0];
-}
-
-function ensureSingleOrNone<T>(arg0: T | T[]) {
-    if (!Array.isArray(arg0)) return arg0;
-    if (arg0.length === 0) return undefined;
-    if (arg0.length === 1) return arg0[0];
-    throw new Error(
-        "Illegal configuration, expected a single value but found multiple: " +
-            arg0.map(String).join(", ")
-    );
-}

src/bin/tools/downloadAndExtractArchive/index.ts

@@ -0,0 +1 @@
+export * from "./downloadAndExtractArchive";

src/bin/tools/getNpmWorkspaceRootDirPath.ts

@@ -0,0 +1,84 @@
+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: {
+    projectDirPath: string;
+    dependencyExpected: string;
+}) {
+    const { projectDirPath, dependencyExpected } = params;
+
+    console.log("DEBUG getNpmWorkspaceRootDirPath:", {
+        projectDirPath,
+        dependencyExpected
+    });
+
+    const npmWorkspaceRootDirPath = (function callee(depth: number): string {
+        const cwd = pathResolve(
+            pathJoin(...[projectDirPath, ...Array(depth).fill("..")])
+        );
+
+        console.log("DEBUG getNpmWorkspaceRootDirPath:", { cwd });
+
+        assert(cwd !== pathSep, "NPM workspace not found");
+
+        try {
+            child_process.execSync("npm config get", {
+                cwd,
+                stdio: "ignore"
+            });
+        } catch (error) {
+            console.log("DEBUG getNpmWorkspaceRootDirPath: got error npm config get");
+
+            if (String(error).includes("ENOWORKSPACES")) {
+                return callee(depth + 1);
+            }
+
+            throw error;
+        }
+
+        console.log("DEBUG getNpmWorkspaceRootDirPath: npm workspace found");
+
+        const packageJsonFilePath = pathJoin(cwd, "package.json");
+
+        if (!fs.existsSync(packageJsonFilePath)) {
+            return callee(depth + 1);
+        }
+
+        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;
+        }
+
+        if (!isExpectedDependencyFound && parsedPackageJson.name !== dependencyExpected) {
+            return callee(depth + 1);
+        }
+
+        return cwd;
+    })(0);
+
+    return { npmWorkspaceRootDirPath };
+}

src/bin/tools/npmInstall.ts

@@ -1,63 +0,0 @@
-import * as fs from "fs";
-import { join as pathJoin } from "path";
-import * as child_process from "child_process";
-import chalk from "chalk";
-
-export function npmInstall(params: { packageJsonDirPath: string }) {
-    const { packageJsonDirPath } = params;
-
-    const packageManagerBinName = (() => {
-        const packageMangers = [
-            {
-                binName: "yarn",
-                lockFileBasename: "yarn.lock"
-            },
-            {
-                binName: "npm",
-                lockFileBasename: "package-lock.json"
-            },
-            {
-                binName: "pnpm",
-                lockFileBasename: "pnpm-lock.yaml"
-            },
-            {
-                binName: "bun",
-                lockFileBasename: "bun.lockdb"
-            }
-        ] as const;
-
-        for (const packageManager of packageMangers) {
-            if (
-                fs.existsSync(
-                    pathJoin(packageJsonDirPath, packageManager.lockFileBasename)
-                ) ||
-                fs.existsSync(pathJoin(process.cwd(), packageManager.lockFileBasename))
-            ) {
-                return packageManager.binName;
-            }
-        }
-
-        return undefined;
-    })();
-
-    install_dependencies: {
-        if (packageManagerBinName === undefined) {
-            break install_dependencies;
-        }
-
-        console.log(`Installing the new dependencies...`);
-
-        try {
-            child_process.execSync(`${packageManagerBinName} install`, {
-                cwd: packageJsonDirPath,
-                stdio: "inherit"
-            });
-        } catch {
-            console.log(
-                chalk.yellow(
-                    `\`${packageManagerBinName} install\` failed, continuing anyway...`
-                )
-            );
-        }
-    }
-}

src/bin/tools/octokit-addons/getLatestsSemVersionedTag.ts

@@ -9,14 +9,13 @@ export function getLatestsSemVersionedTagFactory(params: { octokit: Octokit }) {
         owner: string;
         repo: string;
         count: number;
-        doIgnoreReleaseCandidates: boolean;
     }): Promise<
         {
             tag: string;
             version: SemVer;
         }[]
     > {
-        const { owner, repo, count, doIgnoreReleaseCandidates } = params;
+        const { owner, repo, count } = params;
 
         const semVersionedTags: { tag: string; version: SemVer }[] = [];
 
@@ -31,7 +30,7 @@ export function getLatestsSemVersionedTagFactory(params: { octokit: Octokit }) {
                 continue;
             }
 
-            if (doIgnoreReleaseCandidates && version.rc !== undefined) {
+            if (version.rc !== undefined) {
                 continue;
             }
 

src/bin/tsconfig.json

@@ -8,7 +8,5 @@
         "moduleResolution": "node",
         "outDir": "../../dist/bin",
         "rootDir": "."
-    },
-    "include": ["**/*.ts", "**/*.tsx"],
-    "exclude": ["initialize-account-theme/src"]
+    }
 }

src/lib/getKcClsx.ts

@@ -73,8 +73,8 @@ export function createGetKcClsx<ClassKey extends string>(params: {
 
                     return clsx(
                         classKey,
-                        classes?.[classKey] ??
-                            (doUseDefaultCss ? defaultClasses[classKey] : undefined)
+                        doUseDefaultCss ? defaultClasses[classKey] : undefined,
+                        classes?.[classKey]
                     );
                 }
             });

src/login/KcContext/KcContext.ts

@@ -1,8 +1,9 @@
 import type { ThemeType, LoginThemePageId } from "keycloakify/bin/shared/constants";
+import type { ExtractAfterStartingWith } from "keycloakify/tools/ExtractAfterStartingWith";
 import type { ValueOf } from "keycloakify/tools/ValueOf";
 import { assert } from "tsafe/assert";
 import type { Equals } from "tsafe";
-import type { ClassKey } from "keycloakify/login/TemplateProps";
+import type { MessageKey } from "../i18n/i18n";
 
 export type ExtendKcContext<
     KcContextExtension extends { properties?: Record<string, string | undefined> },
@@ -154,7 +155,8 @@ export declare namespace KcContext {
         };
         properties: {};
         "x-keycloakify": {
-            messages: Record<string, string>;
+            realmMessageBundleUserProfile: Record<string, string> | undefined;
+            realmMessageBundleTermsText: string | undefined;
         };
     };
 
@@ -219,7 +221,7 @@ export declare namespace KcContext {
     export type Info = Common & {
         pageId: "info.ftl";
         messageHeader?: string;
-        requiredActions?: string[];
+        requiredActions?: ExtractAfterStartingWith<"requiredAction.", MessageKey>[];
         skipLink: boolean;
         pageRedirectUri?: string;
         actionUri?: string;
@@ -382,7 +384,7 @@ export declare namespace KcContext {
             credentialId: string;
             transports: {
                 iconClass: string;
-                displayNameProperties?: string[];
+                displayNameProperties?: MessageKey[];
             };
             label: string;
             createdAt: string;
@@ -499,9 +501,26 @@ export declare namespace KcContext {
     export namespace SelectAuthenticator {
         export type AuthenticationSelection = {
             authExecId: string;
-            displayName: string;
-            helpText: string;
-            iconCssClass?: ClassKey;
+            displayName:
+                | "otp-display-name"
+                | "password-display-name"
+                | "auth-username-form-display-name"
+                | "auth-username-password-form-display-name"
+                | "webauthn-display-name"
+                | "webauthn-passwordless-display-name";
+            helpText:
+                | "otp-help-text"
+                | "password-help-text"
+                | "auth-username-form-help-text"
+                | "auth-username-password-form-help-text"
+                | "webauthn-help-text"
+                | "webauthn-passwordless-help-text";
+            iconCssClass?:
+                | "kcAuthenticatorDefaultClass"
+                | "kcAuthenticatorPasswordClass"
+                | "kcAuthenticatorOTPClass"
+                | "kcAuthenticatorWebAuthnClass"
+                | "kcAuthenticatorWebAuthnPasswordlessClass";
         };
     }
 
@@ -591,7 +610,6 @@ export type Attribute = {
     value?: string;
     values?: string[];
     group?: {
-        annotations: Record<string, string>;
         html5DataAnnotations: Record<string, string>;
         displayHeader?: string;
         name: string;

src/login/KcContext/kcContextMocks.ts

@@ -1,8 +1,8 @@
 import "keycloakify/tools/Object.fromEntries";
 import type { KcContext, Attribute } from "./KcContext";
 import {
-    RESOURCES_COMMON,
-    KEYCLOAK_RESOURCES,
+    resources_common,
+    keycloak_resources,
     type LoginThemePageId
 } from "keycloakify/bin/shared/constants";
 import { id } from "tsafe/id";
@@ -76,7 +76,7 @@ const attributesByName = Object.fromEntries(
     ]).map(attribute => [attribute.name, attribute])
 );
 
-const resourcesPath = `${BASE_URL}${KEYCLOAK_RESOURCES}/login/resources`;
+const resourcesPath = `${BASE_URL}${keycloak_resources}/login/resources`;
 
 export const kcContextCommonMock: KcContext.Common = {
     themeVersion: "0.0.0",
@@ -86,7 +86,7 @@ export const kcContextCommonMock: KcContext.Common = {
     url: {
         loginAction: "#",
         resourcesPath,
-        resourcesCommonPath: `${resourcesPath}/${RESOURCES_COMMON}`,
+        resourcesCommonPath: `${resourcesPath}/${resources_common}`,
         loginRestartFlowUrl: "#",
         loginUrl: "#",
         ssoLoginInOtherTabsUrl: "#"
@@ -162,7 +162,8 @@ export const kcContextCommonMock: KcContext.Common = {
     isAppInitiatedAction: false,
     properties: {},
     "x-keycloakify": {
-        messages: {}
+        realmMessageBundleUserProfile: undefined,
+        realmMessageBundleTermsText: undefined
     }
 };
 

src/login/Template.tsx

@@ -15,6 +15,7 @@ export default function Template(props: TemplateProps<KcContext, I18n>) {
         displayMessage = true,
         displayRequiredFields = false,
         headerNode,
+        showUsernameNode = null,
         socialProvidersNode = null,
         infoNode = null,
         documentTitle,
@@ -163,10 +164,45 @@ export default function Template(props: TemplateProps<KcContext, I18n>) {
                             </div>
                         </div>
                     )}
-                    {(() => {
-                        const node = !(auth !== undefined && auth.showUsername && !auth.showResetCredentials) ? (
-                            <h1 id="kc-page-title">{headerNode}</h1>
+                    {!(auth !== undefined && auth.showUsername && !auth.showResetCredentials) ? (
+                        displayRequiredFields ? (
+                            <div className={kcClsx("kcContentWrapperClass")}>
+                                <div className={clsx(kcClsx("kcLabelWrapperClass"), "subtitle")}>
+                                    <span className="subtitle">
+                                        <span className="required">*</span>
+                                        {msg("requiredFields")}
+                                    </span>
+                                </div>
+                                <div className="col-md-10">
+                                    <h1 id="kc-page-title">{headerNode}</h1>
+                                </div>
+                            </div>
                         ) : (
+                            <h1 id="kc-page-title">{headerNode}</h1>
+                        )
+                    ) : displayRequiredFields ? (
+                        <div className={kcClsx("kcContentWrapperClass")}>
+                            <div className={clsx(kcClsx("kcLabelWrapperClass"), "subtitle")}>
+                                <span className="subtitle">
+                                    <span className="required">*</span> {msg("requiredFields")}
+                                </span>
+                            </div>
+                            <div className="col-md-10">
+                                {showUsernameNode}
+                                <div id="kc-username" className={kcClsx("kcFormGroupClass")}>
+                                    <label id="kc-attempted-username">{auth.attemptedUsername}</label>
+                                    <a id="reset-login" href={url.loginRestartFlowUrl} aria-label={msgStr("restartLoginTooltip")}>
+                                        <div className="kc-login-tooltip">
+                                            <i className={kcClsx("kcResetFlowIcon")}></i>
+                                            <span className="kc-tooltip-text">{msg("restartLoginTooltip")}</span>
+                                        </div>
+                                    </a>
+                                </div>
+                            </div>
+                        </div>
+                    ) : (
+                        <>
+                            {showUsernameNode}
                             <div id="kc-username" className={kcClsx("kcFormGroupClass")}>
                                 <label id="kc-attempted-username">{auth.attemptedUsername}</label>
                                 <a id="reset-login" href={url.loginRestartFlowUrl} aria-label={msgStr("restartLoginTooltip")}>
@@ -176,24 +212,8 @@ export default function Template(props: TemplateProps<KcContext, I18n>) {
                                     </div>
                                 </a>
                             </div>
-                        );
-
-                        if (displayRequiredFields) {
-                            return (
-                                <div className={kcClsx("kcContentWrapperClass")}>
-                                    <div className={clsx(kcClsx("kcLabelWrapperClass"), "subtitle")}>
-                                        <span className="subtitle">
-                                            <span className="required">*</span>
-                                            {msg("requiredFields")}
-                                        </span>
-                                    </div>
-                                    <div className="col-md-10">{node}</div>
-                                </div>
-                            );
-                        }
-
-                        return node;
-                    })()}
+                        </>
+                    )}
                 </header>
                 <div id="kc-content">
                     <div id="kc-content-wrapper">

src/login/TemplateProps.ts

@@ -12,6 +12,7 @@ export type TemplateProps<KcContext, I18n> = {
     displayRequiredFields?: boolean;
     showAnotherWayIfPresent?: boolean;
     headerNode: ReactNode;
+    showUsernameNode?: ReactNode;
     socialProvidersNode?: ReactNode;
     infoNode?: ReactNode;
     documentTitle?: string;

src/login/UserProfileFormFields.tsx

@@ -1,5 +1,5 @@
 import { useEffect, useReducer, Fragment } from "react";
-import { assert } from "keycloakify/tools/assert";
+import { assert } from "tsafe/assert";
 import type { KcClsx } from "keycloakify/login/lib/kcClsx";
 import {
     useUserProfileForm,
@@ -70,7 +70,7 @@ export default function UserProfileFormFields(props: UserProfileFormFieldsProps<
                                         {advancedMsg(attribute.annotations.inputHelperTextBefore)}
                                     </div>
                                 )}
-                                <InputFieldByType
+                                <InputFiledByType
                                     attribute={attribute}
                                     valueOrValues={valueOrValues}
                                     displayableErrors={displayableErrors}
@@ -188,7 +188,7 @@ function FieldErrors(props: { attribute: Attribute; displayableErrors: FormField
                 .filter(error => error.fieldIndex === fieldIndex)
                 .map(({ errorMessage }, i, arr) => (
                     <Fragment key={i}>
-                        {errorMessage}
+                        <span key={i}>{errorMessage}</span>
                         {arr.length - 1 !== i && <br />}
                     </Fragment>
                 ))}
@@ -196,7 +196,7 @@ function FieldErrors(props: { attribute: Attribute; displayableErrors: FormField
     );
 }
 
-type InputFieldByTypeProps = {
+type InputFiledByTypeProps = {
     attribute: Attribute;
     valueOrValues: string | string[];
     displayableErrors: FormFieldError[];
@@ -205,7 +205,7 @@ type InputFieldByTypeProps = {
     kcClsx: KcClsx;
 };
 
-function InputFieldByType(props: InputFieldByTypeProps) {
+function InputFiledByType(props: InputFiledByTypeProps) {
     const { attribute, valueOrValues } = props;
 
     switch (attribute.annotations.inputType) {
@@ -274,11 +274,9 @@ function PasswordWrapper(props: { kcClsx: KcClsx; i18n: I18n; passwordInputId: s
     );
 }
 
-function InputTag(props: InputFieldByTypeProps & { fieldIndex: number | undefined }) {
+function InputTag(props: InputFiledByTypeProps & { fieldIndex: number | undefined }) {
     const { attribute, fieldIndex, kcClsx, dispatchFormAction, valueOrValues, i18n, displayableErrors } = props;
 
-    const { advancedMsgStr } = i18n;
-
     return (
         <>
             <input
@@ -307,9 +305,7 @@ function InputTag(props: InputFieldByTypeProps & { fieldIndex: number | undefine
                 aria-invalid={displayableErrors.find(error => error.fieldIndex === fieldIndex) !== undefined}
                 disabled={attribute.readOnly}
                 autoComplete={attribute.autocomplete}
-                placeholder={
-                    attribute.annotations.inputTypePlaceholder === undefined ? undefined : advancedMsgStr(attribute.annotations.inputTypePlaceholder)
-                }
+                placeholder={attribute.annotations.inputTypePlaceholder}
                 pattern={attribute.annotations.inputTypePattern}
                 size={attribute.annotations.inputTypeSize === undefined ? undefined : parseInt(`${attribute.annotations.inputTypeSize}`)}
                 maxLength={
@@ -433,7 +429,7 @@ function AddRemoveButtonsMultiValuedAttribute(props: {
     );
 }
 
-function InputTagSelects(props: InputFieldByTypeProps) {
+function InputTagSelects(props: InputFiledByTypeProps) {
     const { attribute, dispatchFormAction, kcClsx, valueOrValues } = props;
 
     const { advancedMsg } = props.i18n;
@@ -541,7 +537,7 @@ function InputTagSelects(props: InputFieldByTypeProps) {
     );
 }
 
-function TextareaTag(props: InputFieldByTypeProps) {
+function TextareaTag(props: InputFiledByTypeProps) {
     const { attribute, dispatchFormAction, kcClsx, displayableErrors, valueOrValues } = props;
 
     assert(typeof valueOrValues === "string");
@@ -577,7 +573,7 @@ function TextareaTag(props: InputFieldByTypeProps) {
     );
 }
 
-function SelectTag(props: InputFieldByTypeProps) {
+function SelectTag(props: InputFiledByTypeProps) {
     const { attribute, dispatchFormAction, kcClsx, displayableErrors, i18n, valueOrValues } = props;
 
     const { advancedMsg } = i18n;

src/login/i18n/GenericI18n.tsx

@@ -1,6 +0,0 @@
-import type { GenericI18n_noJsx } from "./i18n";
-
-export type GenericI18n<MessageKey extends string> = GenericI18n_noJsx<MessageKey> & {
-    msg: (key: MessageKey, ...args: (string | undefined)[]) => JSX.Element;
-    advancedMsg: (key: string, ...args: (string | undefined)[]) => JSX.Element;
-};

src/login/i18n/i18n.tsx

@@ -1,10 +1,9 @@
 import "keycloakify/tools/Object.fromEntries";
 import { assert } from "tsafe/assert";
-import messages_defaultSet_fallbackLanguage from "./messages_defaultSet/en";
-import { fetchMessages_defaultSet } from "./messages_defaultSet";
+import messages_fallbackLanguage from "./baseMessages/en";
+import { getMessages } from "./baseMessages";
 import type { KcContext } from "../KcContext";
-import { FALLBACK_LANGUAGE_TAG } from "keycloakify/bin/shared/constants";
-import { id } from "tsafe/id";
+import { fallbackLanguageTag } from "keycloakify/bin/shared/constants";
 
 export type KcContextLike = {
     locale?: {
@@ -12,13 +11,16 @@ export type KcContextLike = {
         supported: { languageTag: string; url: string; label: string }[];
     };
     "x-keycloakify": {
-        messages: Record<string, string>;
+        realmMessageBundleUserProfile: Record<string, string> | undefined;
+        realmMessageBundleTermsText: string | undefined;
     };
 };
 
 assert<KcContext extends KcContextLike ? true : false>();
 
-export type GenericI18n_noJsx<MessageKey extends string> = {
+export type MessageKey = keyof typeof messages_fallbackLanguage;
+
+export type GenericI18n<MessageKey extends string> = {
     /**
      * e.g: "en", "fr", "zh-CN"
      *
@@ -38,21 +40,16 @@ export type GenericI18n_noJsx<MessageKey extends string> = {
      * */
     labelBySupportedLanguageTag: Record<string, string>;
     /**
-     *
      * Examples assuming currentLanguageTag === "en"
-     * {
-     *   en: {
-     *     "access-denied": "Access denied",
-     *     "impersonateTitleHtml": "<strong>{0}</strong> Impersonate User",
-     *     "bar": "Bar {0}"
-     *   }
-     * }
      *
-     * msgStr("access-denied") === "Access denied"
-     * msgStr("not-a-message-key") Throws an error
+     * msg("access-denied") === <span>Access denied</span>
+     * msg("impersonateTitleHtml", "Foo") === <span><strong>Foo</strong> Impersonate User</span>
+     */
+    msg: (key: MessageKey, ...args: (string | undefined)[]) => JSX.Element;
+    /**
+     * It's the same thing as msg() but instead of returning a JSX.Element it returns a string.
+     * It can be more convenient to manipulate strings but if there are HTML tags it wont render.
      * msgStr("impersonateTitleHtml", "Foo") === "<strong>Foo</strong> Impersonate User"
-     * msgStr("${bar}", "<strong>c</strong>") === "Bar &lt;strong&gt;XXX&lt;/strong&gt;"
-     *  The html in the arg is partially escaped for security reasons, it might come from an untrusted source, it's not safe to render it as html.
      */
     msgStr: (key: MessageKey, ...args: (string | undefined)[]) => string;
     /**
@@ -63,11 +60,24 @@ export type GenericI18n_noJsx<MessageKey extends string> = {
      * {
      *   en: {
      *     "access-denied": "Access denied",
+     *     "foo": "Foo {0} {1}",
+     *     "bar": "Bar {0}"
      *   }
      * }
      *
-     * advancedMsgStr("${access-denied}") === advancedMsgStr("access-denied") === msgStr("access-denied") === "Access denied"
-     * advancedMsgStr("${not-a-message-key}") === advancedMsgStr("not-a-message-key") === "not-a-message-key"
+     * advancedMsg("${access-denied} foo bar") === <span>{msgStr("access-denied")} foo bar<span> === <span>Access denied foo bar</span>
+     * advancedMsg("${access-denied}") === advancedMsg("access-denied") === msg("access-denied") === <span>Access denied</span>
+     * advancedMsg("${not-a-message-key}") === advancedMsg(not-a-message-key") === <span>not-a-message-key</span>
+     * advancedMsg("${bar}", "<strong>c</strong>")
+     *    === <span>{msgStr("bar", "<strong>XXX</strong>")}<span>
+     *    === <span>Bar &lt;strong&gt;XXX&lt;/strong&gt;</span> (The html in the arg is partially escaped for security reasons, it might be untrusted)
+     * advancedMsg("${foo} xx ${bar}", "a", "b", "c")
+     *    === <span>{msgStr("foo", "a", "b")} xx {msgStr("bar")}<span>
+     *    === <span>Foo a b xx Bar {0}</span> (The substitution are only applied in the first message)
+     */
+    advancedMsg: (key: string, ...args: (string | undefined)[]) => JSX.Element;
+    /**
+     * See advancedMsg() but instead of returning a JSX.Element it returns a string.
      */
     advancedMsgStr: (key: string, ...args: (string | undefined)[]) => string;
 
@@ -79,12 +89,10 @@ export type GenericI18n_noJsx<MessageKey extends string> = {
     isFetchingTranslations: boolean;
 };
 
-export type MessageKey_defaultSet = keyof typeof messages_defaultSet_fallbackLanguage;
-
-export function createGetI18n<MessageKey_themeDefined extends string = never>(messagesByLanguageTag_themeDefined: {
-    [languageTag: string]: { [key in MessageKey_themeDefined]: string };
+export function createGetI18n<ExtraMessageKey extends string = never>(messageBundle: {
+    [languageTag: string]: { [key in ExtraMessageKey]: string };
 }) {
-    type I18n = GenericI18n_noJsx<MessageKey_defaultSet | MessageKey_themeDefined>;
+    type I18n = GenericI18n<MessageKey | ExtraMessageKey>;
 
     type Result = { i18n: I18n; prI18n_currentLanguage: Promise<I18n> | undefined };
 
@@ -104,7 +112,7 @@ export function createGetI18n<MessageKey_themeDefined extends string = never>(me
         }
 
         const partialI18n: Pick<I18n, "currentLanguageTag" | "getChangeLocaleUrl" | "labelBySupportedLanguageTag"> = {
-            currentLanguageTag: kcContext.locale?.currentLanguageTag ?? FALLBACK_LANGUAGE_TAG,
+            currentLanguageTag: kcContext.locale?.currentLanguageTag ?? fallbackLanguageTag,
             getChangeLocaleUrl: newLanguageTag => {
                 const { locale } = kcContext;
 
@@ -119,38 +127,32 @@ export function createGetI18n<MessageKey_themeDefined extends string = never>(me
             labelBySupportedLanguageTag: Object.fromEntries((kcContext.locale?.supported ?? []).map(({ languageTag, label }) => [languageTag, label]))
         };
 
-        const { createI18nTranslationFunctions } = createI18nTranslationFunctionsFactory<MessageKey_themeDefined>({
-            messages_themeDefined:
-                messagesByLanguageTag_themeDefined[partialI18n.currentLanguageTag] ??
-                messagesByLanguageTag_themeDefined[FALLBACK_LANGUAGE_TAG] ??
-                (() => {
-                    const firstLanguageTag = Object.keys(messagesByLanguageTag_themeDefined)[0];
-                    if (firstLanguageTag === undefined) {
-                        return undefined;
-                    }
-                    return messagesByLanguageTag_themeDefined[firstLanguageTag];
-                })(),
-            messages_fromKcServer: kcContext["x-keycloakify"].messages
+        const { createI18nTranslationFunctions } = createI18nTranslationFunctionsFactory<MessageKey, ExtraMessageKey>({
+            messages_fallbackLanguage,
+            messageBundle_fallbackLanguage: messageBundle[fallbackLanguageTag],
+            messageBundle_currentLanguage: messageBundle[partialI18n.currentLanguageTag],
+            realmMessageBundleUserProfile: kcContext["x-keycloakify"].realmMessageBundleUserProfile,
+            realmMessageBundleTermsText: kcContext["x-keycloakify"].realmMessageBundleTermsText
         });
 
-        const isCurrentLanguageFallbackLanguage = partialI18n.currentLanguageTag === FALLBACK_LANGUAGE_TAG;
+        const isCurrentLanguageFallbackLanguage = partialI18n.currentLanguageTag === fallbackLanguageTag;
 
         const result: Result = {
             i18n: {
                 ...partialI18n,
                 ...createI18nTranslationFunctions({
-                    messages_defaultSet_currentLanguage: isCurrentLanguageFallbackLanguage ? messages_defaultSet_fallbackLanguage : undefined
+                    messages_currentLanguage: isCurrentLanguageFallbackLanguage ? messages_fallbackLanguage : undefined
                 }),
                 isFetchingTranslations: !isCurrentLanguageFallbackLanguage
             },
             prI18n_currentLanguage: isCurrentLanguageFallbackLanguage
                 ? undefined
                 : (async () => {
-                      const messages_defaultSet_currentLanguage = await fetchMessages_defaultSet(partialI18n.currentLanguageTag);
+                      const messages_currentLanguage = await getMessages(partialI18n.currentLanguageTag);
 
                       const i18n_currentLanguage: I18n = {
                           ...partialI18n,
-                          ...createI18nTranslationFunctions({ messages_defaultSet_currentLanguage }),
+                          ...createI18nTranslationFunctions({ messages_currentLanguage }),
                           isFetchingTranslations: false
                       };
 
@@ -173,72 +175,143 @@ export function createGetI18n<MessageKey_themeDefined extends string = never>(me
     return { getI18n };
 }
 
-function createI18nTranslationFunctionsFactory<MessageKey_themeDefined extends string>(params: {
-    messages_themeDefined: Record<MessageKey_themeDefined, string> | undefined;
-    messages_fromKcServer: Record<string, string>;
+function createI18nTranslationFunctionsFactory<MessageKey extends string, ExtraMessageKey extends string>(params: {
+    messages_fallbackLanguage: Record<MessageKey, string>;
+    messageBundle_fallbackLanguage: Record<ExtraMessageKey, string> | undefined;
+    messageBundle_currentLanguage: Partial<Record<ExtraMessageKey, string>> | undefined;
+    realmMessageBundleUserProfile: Record<string, string> | undefined;
+    realmMessageBundleTermsText: string | undefined;
 }) {
-    const { messages_themeDefined, messages_fromKcServer } = params;
+    const { messageBundle_currentLanguage, realmMessageBundleUserProfile, realmMessageBundleTermsText } = params;
+
+    const messages_fallbackLanguage = {
+        ...params.messages_fallbackLanguage,
+        ...params.messageBundle_fallbackLanguage
+    };
 
     function createI18nTranslationFunctions(params: {
-        messages_defaultSet_currentLanguage: Partial<Record<MessageKey_defaultSet, string>> | undefined;
-    }): Pick<GenericI18n_noJsx<MessageKey_defaultSet | MessageKey_themeDefined>, "msgStr" | "advancedMsgStr"> {
-        const { messages_defaultSet_currentLanguage } = params;
+        messages_currentLanguage: Partial<Record<MessageKey, string>> | undefined;
+    }): Pick<GenericI18n<MessageKey | ExtraMessageKey>, "msg" | "msgStr" | "advancedMsg" | "advancedMsgStr"> {
+        const messages_currentLanguage = {
+            ...params.messages_currentLanguage,
+            ...messageBundle_currentLanguage
+        };
 
-        function resolveMsg(props: { key: string; args: (string | undefined)[] }): string | undefined {
-            const { key, args } = props;
+        function resolveMsg(props: { key: string; args: (string | undefined)[]; doRenderAsHtml: boolean }): string | JSX.Element | undefined {
+            const { key, args, doRenderAsHtml } = props;
 
-            const message =
-                id<Record<string, string | undefined>>(messages_fromKcServer)[key] ??
-                id<Record<string, string | undefined> | undefined>(messages_themeDefined)?.[key] ??
-                id<Record<string, string | undefined> | undefined>(messages_defaultSet_currentLanguage)?.[key] ??
-                id<Record<string, string | undefined>>(messages_defaultSet_fallbackLanguage)[key];
+            const messageOrUndefined: string | undefined = (() => {
+                const messageOrUndefined = (messages_currentLanguage as any)[key] ?? (messages_fallbackLanguage as any)[key];
 
-            if (message === undefined) {
+                if (key === "termsText" && realmMessageBundleTermsText !== undefined) {
+                    return realmMessageBundleTermsText;
+                }
+
+                return messageOrUndefined;
+            })();
+
+            if (messageOrUndefined === undefined) {
                 return undefined;
             }
 
-            const startIndex = message
-                .match(/{[0-9]+}/g)
-                ?.map(g => g.match(/{([0-9]+)}/)![1])
-                .map(indexStr => parseInt(indexStr))
-                .sort((a, b) => a - b)[0];
+            const message = messageOrUndefined;
 
-            if (startIndex === undefined) {
-                // No {0} in message (no arguments expected)
-                return message;
-            }
+            const messageWithArgsInjectedIfAny = (() => {
+                const startIndex = message
+                    .match(/{[0-9]+}/g)
+                    ?.map(g => g.match(/{([0-9]+)}/)![1])
+                    .map(indexStr => parseInt(indexStr))
+                    .sort((a, b) => a - b)[0];
 
-            let messageWithArgsInjected = message;
-
-            args.forEach((arg, i) => {
-                if (arg === undefined) {
-                    return;
+                if (startIndex === undefined) {
+                    // No {0} in message (no arguments expected)
+                    return message;
                 }
 
-                messageWithArgsInjected = messageWithArgsInjected.replace(
-                    new RegExp(`\\{${i + startIndex}\\}`, "g"),
-                    arg.replace(/</g, "&lt;").replace(/>/g, "&gt;")
-                );
-            });
+                let messageWithArgsInjected = message;
 
-            return messageWithArgsInjected;
+                args.forEach((arg, i) => {
+                    if (arg === undefined) {
+                        return;
+                    }
+
+                    messageWithArgsInjected = messageWithArgsInjected.replace(
+                        new RegExp(`\\{${i + startIndex}\\}`, "g"),
+                        arg.replace(/</g, "&lt;").replace(/>/g, "&gt;")
+                    );
+                });
+
+                return messageWithArgsInjected;
+            })();
+
+            return doRenderAsHtml ? (
+                <span
+                    // NOTE: The message is trusted. The arguments are not but are escaped.
+                    dangerouslySetInnerHTML={{
+                        __html: messageWithArgsInjectedIfAny
+                    }}
+                />
+            ) : (
+                messageWithArgsInjectedIfAny
+            );
         }
 
-        function resolveMsgAdvanced(props: { key: string; args: (string | undefined)[] }): string {
-            const { key, args } = props;
+        function resolveMsgAdvanced(props: { key: string; args: (string | undefined)[]; doRenderAsHtml: boolean }): JSX.Element | string {
+            const { key, args, doRenderAsHtml } = props;
 
-            const match = key.match(/^\$\{(.+)\}$/);
+            if (realmMessageBundleUserProfile !== undefined && key in realmMessageBundleUserProfile) {
+                const resolvedMessage = realmMessageBundleUserProfile[key];
 
-            return resolveMsg({ key: match !== null ? match[1] : key, args }) ?? key;
+                return doRenderAsHtml ? (
+                    <span
+                        // NOTE: The message is trusted. The arguments are not but are escaped.
+                        dangerouslySetInnerHTML={{
+                            __html: resolvedMessage
+                        }}
+                    />
+                ) : (
+                    resolvedMessage
+                );
+            }
+
+            if (!/\$\{[^}]+\}/.test(key)) {
+                const resolvedMessage = resolveMsg({ key, args, doRenderAsHtml });
+
+                if (resolvedMessage === undefined) {
+                    return doRenderAsHtml ? <span dangerouslySetInnerHTML={{ __html: key }} /> : key;
+                }
+
+                return resolvedMessage;
+            }
+
+            let isFirstMatch = true;
+
+            const resolvedComplexMessage = key.replace(/\$\{([^}]+)\}/g, (...[, key_i]) => {
+                const replaceBy = resolveMsg({ key: key_i, args: isFirstMatch ? args : [], doRenderAsHtml: false }) ?? key_i;
+
+                isFirstMatch = false;
+
+                return replaceBy;
+            });
+
+            return doRenderAsHtml ? <span dangerouslySetInnerHTML={{ __html: resolvedComplexMessage }} /> : resolvedComplexMessage;
         }
 
         return {
-            msgStr: (key, ...args) => {
-                const resolvedMessage = resolveMsg({ key, args });
-                assert(resolvedMessage !== undefined, `Message with key "${key}" not found`);
-                return resolvedMessage;
-            },
-            advancedMsgStr: (key, ...args) => resolveMsgAdvanced({ key, args })
+            msgStr: (key, ...args) => resolveMsg({ key, args, doRenderAsHtml: false }) as string,
+            msg: (key, ...args) => resolveMsg({ key, args, doRenderAsHtml: true }) as JSX.Element,
+            advancedMsg: (key, ...args) =>
+                resolveMsgAdvanced({
+                    key,
+                    args,
+                    doRenderAsHtml: true
+                }) as JSX.Element,
+            advancedMsgStr: (key, ...args) =>
+                resolveMsgAdvanced({
+                    key,
+                    args,
+                    doRenderAsHtml: false
+                }) as string
         };
     }
 

src/login/i18n/index.ts

@@ -1,5 +1,4 @@
-import type { GenericI18n } from "./GenericI18n";
-import type { MessageKey_defaultSet, KcContextLike } from "./i18n";
-export type { MessageKey_defaultSet, KcContextLike };
-export type I18n = GenericI18n<MessageKey_defaultSet>;
+import type { GenericI18n, MessageKey, KcContextLike } from "./i18n";
+export type { MessageKey, KcContextLike };
+export type I18n = GenericI18n<MessageKey>;
 export { createUseI18n } from "./useI18n";

src/login/i18n/useI18n.ts

@@ -0,0 +1,44 @@
+import { useEffect, useState } from "react";
+import {
+    createGetI18n,
+    type GenericI18n,
+    type MessageKey,
+    type KcContextLike
+} from "./i18n";
+import { Reflect } from "tsafe/Reflect";
+
+export function createUseI18n<ExtraMessageKey extends string = never>(messageBundle: {
+    [languageTag: string]: { [key in ExtraMessageKey]: string };
+}) {
+    type I18n = GenericI18n<MessageKey | ExtraMessageKey>;
+
+    const { getI18n } = createGetI18n(messageBundle);
+
+    function useI18n(params: { kcContext: KcContextLike }): { i18n: I18n } {
+        const { kcContext } = params;
+
+        const { i18n, prI18n_currentLanguage } = getI18n({ kcContext });
+
+        const [i18n_toReturn, setI18n_toReturn] = useState<I18n>(i18n);
+
+        useEffect(() => {
+            let isActive = true;
+
+            prI18n_currentLanguage?.then(i18n => {
+                if (!isActive) {
+                    return;
+                }
+
+                setI18n_toReturn(i18n);
+            });
+
+            return () => {
+                isActive = false;
+            };
+        }, []);
+
+        return { i18n: i18n_toReturn };
+    }
+
+    return { useI18n, ofTypeI18n: Reflect<I18n>() };
+}

src/login/i18n/useI18n.tsx

@@ -1,95 +0,0 @@
-import { useEffect, useState } from "react";
-import { createGetI18n, type GenericI18n_noJsx, type KcContextLike, type MessageKey_defaultSet } from "./i18n";
-import { GenericI18n } from "./GenericI18n";
-import { Reflect } from "tsafe/Reflect";
-
-export function createUseI18n<MessageKey_themeDefined extends string = never>(messagesByLanguageTag: {
-    [languageTag: string]: { [key in MessageKey_themeDefined]: string };
-}) {
-    type MessageKey = MessageKey_defaultSet | MessageKey_themeDefined;
-
-    type I18n = GenericI18n<MessageKey>;
-
-    const { withJsx } = (() => {
-        const cache = new WeakMap<GenericI18n_noJsx<MessageKey>, GenericI18n<MessageKey>>();
-
-        function renderHtmlString(params: { htmlString: string; msgKey: string }): JSX.Element {
-            const { htmlString, msgKey } = params;
-            return (
-                <div
-                    data-kc-msg={msgKey}
-                    dangerouslySetInnerHTML={{
-                        __html: htmlString
-                    }}
-                />
-            );
-        }
-
-        function withJsx(i18n_noJsx: GenericI18n_noJsx<MessageKey>): I18n {
-            use_cache: {
-                const i18n = cache.get(i18n_noJsx);
-
-                if (i18n === undefined) {
-                    break use_cache;
-                }
-
-                return i18n;
-            }
-
-            const i18n: I18n = {
-                ...i18n_noJsx,
-                msg: (msgKey, ...args) => renderHtmlString({ htmlString: i18n_noJsx.msgStr(msgKey, ...args), msgKey }),
-                advancedMsg: (msgKey, ...args) => renderHtmlString({ htmlString: i18n_noJsx.advancedMsgStr(msgKey, ...args), msgKey })
-            };
-
-            cache.set(i18n_noJsx, i18n);
-
-            return i18n;
-        }
-
-        return { withJsx };
-    })();
-
-    add_style: {
-        const attributeName = "data-kc-i18n";
-
-        // Check if already exists in head
-        if (document.querySelector(`style[${attributeName}]`) !== null) {
-            break add_style;
-        }
-
-        const styleElement = document.createElement("style");
-        styleElement.attributes.setNamedItem(document.createAttribute(attributeName));
-        (styleElement.textContent = `[data-kc-msg] { display: inline-block; }`), document.head.prepend(styleElement);
-    }
-
-    const { getI18n } = createGetI18n(messagesByLanguageTag);
-
-    function useI18n(params: { kcContext: KcContextLike }): { i18n: I18n } {
-        const { kcContext } = params;
-
-        const { i18n, prI18n_currentLanguage } = getI18n({ kcContext });
-
-        const [i18n_toReturn, setI18n_toReturn] = useState<I18n>(withJsx(i18n));
-
-        useEffect(() => {
-            let isActive = true;
-
-            prI18n_currentLanguage?.then(i18n => {
-                if (!isActive) {
-                    return;
-                }
-
-                setI18n_toReturn(withJsx(i18n));
-            });
-
-            return () => {
-                isActive = false;
-            };
-        }, []);
-
-        return { i18n: i18n_toReturn };
-    }
-
-    return { useI18n, ofTypeI18n: Reflect<I18n>() };
-}

src/login/lib/useUserProfileForm.tsx

@@ -9,7 +9,7 @@ import { formatNumber } from "keycloakify/tools/formatNumber";
 import { useInsertScriptTags } from "keycloakify/tools/useInsertScriptTags";
 import type { PasswordPolicies, Attribute, Validators } from "keycloakify/login/KcContext";
 import type { KcContext } from "../KcContext";
-import type { MessageKey_defaultSet } from "keycloakify/login/i18n";
+import type { MessageKey } from "keycloakify/login/i18n";
 import { KcContextLike as KcContextLike_i18n } from "keycloakify/login/i18n";
 import type { I18n } from "../i18n";
 
@@ -148,7 +148,7 @@ export function useUserProfileForm(params: UseUserProfileFormParams): ReturnType
                         .map(name =>
                             id<Attribute>({
                                 name: name,
-                                displayName: id<`\${${MessageKey_defaultSet}}`>(`\${${name}}`),
+                                displayName: id<`\${${MessageKey}}`>(`\${${name}}`),
                                 required: true,
                                 value: (kcContext.register as any).formData[name] ?? "",
                                 html5DataAnnotations: {},
@@ -176,7 +176,7 @@ export function useUserProfileForm(params: UseUserProfileFormParams): ReturnType
                         .map(name =>
                             id<Attribute>({
                                 name: name,
-                                displayName: id<`\${${MessageKey_defaultSet}}`>(`\${${name}}`),
+                                displayName: id<`\${${MessageKey}}`>(`\${${name}}`),
                                 required: true,
                                 value: (kcContext as any).user[name] ?? "",
                                 html5DataAnnotations: {},
@@ -202,7 +202,7 @@ export function useUserProfileForm(params: UseUserProfileFormParams): ReturnType
                     return [
                         id<Attribute>({
                             name: "email",
-                            displayName: id<`\${${MessageKey_defaultSet}}`>(`\${email}`),
+                            displayName: id<`\${${MessageKey}}`>(`\${email}`),
                             required: true,
                             value: (kcContext.email as any).value ?? "",
                             html5DataAnnotations: {},
@@ -227,7 +227,7 @@ export function useUserProfileForm(params: UseUserProfileFormParams): ReturnType
                     break patch_legacy_group;
                 }
 
-                const { group, groupDisplayHeader, groupDisplayDescription, groupAnnotations } = attribute as Attribute & {
+                const { group, groupDisplayHeader, groupDisplayDescription /*, groupAnnotations*/ } = attribute as Attribute & {
                     group: string;
                     groupDisplayHeader?: string;
                     groupDisplayDescription?: string;
@@ -250,7 +250,6 @@ export function useUserProfileForm(params: UseUserProfileFormParams): ReturnType
                     name: group,
                     displayHeader: groupDisplayHeader,
                     displayDescription: groupDisplayDescription,
-                    annotations: groupAnnotations,
                     html5DataAnnotations: {}
                 };
             }
@@ -293,7 +292,7 @@ export function useUserProfileForm(params: UseUserProfileFormParams): ReturnType
                     0,
                     {
                         name: "password",
-                        displayName: id<`\${${MessageKey_defaultSet}}`>("${password}"),
+                        displayName: id<`\${${MessageKey}}`>("${password}"),
                         required: true,
                         readOnly: false,
                         validators: {},
@@ -303,7 +302,7 @@ export function useUserProfileForm(params: UseUserProfileFormParams): ReturnType
                     },
                     {
                         name: "password-confirm",
-                        displayName: id<`\${${MessageKey_defaultSet}}`>("${passwordConfirm}"),
+                        displayName: id<`\${${MessageKey}}`>("${passwordConfirm}"),
                         required: true,
                         readOnly: false,
                         validators: {},
@@ -429,28 +428,6 @@ export function useUserProfileForm(params: UseUserProfileFormParams): ReturnType
                         });
                     }
 
-                    trigger_password_confirm_validation_on_password_change: {
-                        if (!doMakeUserConfirmPassword) {
-                            break trigger_password_confirm_validation_on_password_change;
-                        }
-
-                        if (formAction.name !== "password") {
-                            break trigger_password_confirm_validation_on_password_change;
-                        }
-
-                        state = reducer(state, {
-                            action: "update",
-                            name: "password-confirm",
-                            valueOrValues: (() => {
-                                const formFieldState = state.formFieldStates.find(({ attribute }) => attribute.name === "password-confirm");
-
-                                assert(formFieldState !== undefined);
-
-                                return formFieldState.valueOrValues;
-                            })()
-                        });
-                    }
-
                     return;
                 case "focus lost":
                     if (formFieldState.hasLostFocusAtLeastOnce instanceof Array) {
@@ -635,14 +612,7 @@ function useGetErrors(params: { kcContext: KcContextLike_useGetErrors; i18n: I18
                 return [
                     {
                         errorMessageStr,
-                        errorMessage: (
-                            <span
-                                key={0}
-                                dangerouslySetInnerHTML={{
-                                    __html: errorMessageStr
-                                }}
-                            />
-                        ),
+                        errorMessage: <span key={0}>{errorMessageStr}</span>,
                         fieldIndex: undefined,
                         source: {
                             type: "server"
@@ -1156,7 +1126,7 @@ function useGetErrors(params: { kcContext: KcContextLike_useGetErrors; i18n: I18
                     break validator_x;
                 }
 
-                const msgArgs = [errorMessageKey ?? id<MessageKey_defaultSet>("shouldMatchPattern"), pattern] as const;
+                const msgArgs = [errorMessageKey ?? id<MessageKey>("shouldMatchPattern"), pattern] as const;
 
                 errors.push({
                     errorMessage: <Fragment key={`${attributeName}-${errors.length}`}>{advancedMsg(...msgArgs)}</Fragment>,
@@ -1195,7 +1165,7 @@ function useGetErrors(params: { kcContext: KcContextLike_useGetErrors; i18n: I18
                     break validator_x;
                 }
 
-                const msgArgs = [id<MessageKey_defaultSet>("invalidEmailMessage")] as const;
+                const msgArgs = [id<MessageKey>("invalidEmailMessage")] as const;
 
                 errors.push({
                     errorMessage: <Fragment key={`${attributeName}-${errors.length}`}>{msg(...msgArgs)}</Fragment>,
@@ -1287,11 +1257,11 @@ function useGetErrors(params: { kcContext: KcContextLike_useGetErrors; i18n: I18
                     break validator_x;
                 }
 
-                const msgArgs = [id<MessageKey_defaultSet>("notAValidOption")] as const;
+                const msgArgs = [id<MessageKey>("notAValidOption")] as const;
 
                 errors.push({
-                    errorMessage: <Fragment key={`${attributeName}-${errors.length}`}>{msg(...msgArgs)}</Fragment>,
-                    errorMessageStr: msgStr(...msgArgs),
+                    errorMessage: <Fragment key={`${attributeName}-${errors.length}`}>{advancedMsg(...msgArgs)}</Fragment>,
+                    errorMessageStr: advancedMsgStr(...msgArgs),
                     fieldIndex: undefined,
                     source: {
                         type: "validator",

src/login/pages/Error.tsx

@@ -19,7 +19,7 @@ export default function Error(props: PageProps<Extract<KcContext, { pageId: "err
             headerNode={msg("errorTitle")}
         >
             <div id="kc-error-message">
-                <p className="instruction" dangerouslySetInnerHTML={{ __html: message.summary }} />
+                <p className="instruction">{message.summary}</p>
                 {!skipLink && client !== undefined && client.baseUrl !== undefined && (
                     <p>
                         <a id="backToApplication" href={client.baseUrl}>

src/login/pages/Info.tsx

@@ -5,7 +5,7 @@ import type { I18n } from "../i18n";
 export default function Info(props: PageProps<Extract<KcContext, { pageId: "info.ftl" }>, I18n>) {
     const { kcContext, i18n, doUseDefaultCss, Template, classes } = props;
 
-    const { advancedMsgStr, msg } = i18n;
+    const { msgStr, msg } = i18n;
 
     const { messageHeader, message, requiredActions, skipLink, pageRedirectUri, actionUri, client } = kcContext;
 
@@ -16,33 +16,13 @@ export default function Info(props: PageProps<Extract<KcContext, { pageId: "info
             doUseDefaultCss={doUseDefaultCss}
             classes={classes}
             displayMessage={false}
-            headerNode={
-                <span
-                    dangerouslySetInnerHTML={{
-                        __html: messageHeader ?? message.summary
-                    }}
-                />
-            }
+            headerNode={messageHeader !== undefined ? <>{messageHeader}</> : <>{message.summary}</>}
         >
             <div id="kc-info-message">
-                <p
-                    className="instruction"
-                    dangerouslySetInnerHTML={{
-                        __html: (() => {
-                            let html = message.summary;
-
-                            if (requiredActions) {
-                                html += "<b>";
-
-                                html += requiredActions.map(requiredAction => advancedMsgStr(`requiredAction.${requiredAction}`)).join(", ");
-
-                                html += "</b>";
-                            }
-
-                            return html;
-                        })()
-                    }}
-                />
+                <p className="instruction">
+                    {message.summary}
+                    {requiredActions && <b>{requiredActions.map(requiredAction => msgStr(`requiredAction.${requiredAction}` as const)).join(",")}</b>}
+                </p>
                 {(() => {
                     if (skipLink) {
                         return null;

src/login/pages/Login.tsx

@@ -60,10 +60,9 @@ export default function Login(props: PageProps<Extract<KcContext, { pageId: "log
                                             href={p.loginUrl}
                                         >
                                             {p.iconClasses && <i className={clsx(kcClsx("kcCommonLogoIdP"), p.iconClasses)} aria-hidden="true"></i>}
-                                            <span
-                                                className={clsx(kcClsx("kcFormSocialAccountNameClass"), p.iconClasses && "kc-social-icon-text")}
-                                                dangerouslySetInnerHTML={{ __html: p.displayName }}
-                                            ></span>
+                                            <span className={clsx(kcClsx("kcFormSocialAccountNameClass"), p.iconClasses && "kc-social-icon-text")}>
+                                                {p.displayName}
+                                            </span>
                                         </a>
                                     </li>
                                 ))}
@@ -106,14 +105,9 @@ export default function Login(props: PageProps<Extract<KcContext, { pageId: "log
                                         aria-invalid={messagesPerField.existsError("username", "password")}
                                     />
                                     {messagesPerField.existsError("username", "password") && (
-                                        <span
-                                            id="input-error"
-                                            className={kcClsx("kcInputErrorMessageClass")}
-                                            aria-live="polite"
-                                            dangerouslySetInnerHTML={{
-                                                __html: messagesPerField.getFirstError("username", "password")
-                                            }}
-                                        />
+                                        <span id="input-error" className={kcClsx("kcInputErrorMessageClass")} aria-live="polite">
+                                            {messagesPerField.getFirstError("username", "password")}
+                                        </span>
                                     )}
                                 </div>
                             )}
@@ -134,14 +128,9 @@ export default function Login(props: PageProps<Extract<KcContext, { pageId: "log
                                     />
                                 </PasswordWrapper>
                                 {usernameHidden && messagesPerField.existsError("username", "password") && (
-                                    <span
-                                        id="input-error"
-                                        className={kcClsx("kcInputErrorMessageClass")}
-                                        aria-live="polite"
-                                        dangerouslySetInnerHTML={{
-                                            __html: messagesPerField.getFirstError("username", "password")
-                                        }}
-                                    />
+                                    <span id="input-error" className={kcClsx("kcInputErrorMessageClass")} aria-live="polite">
+                                        {messagesPerField.getFirstError("username", "password")}
+                                    </span>
                                 )}
                             </div>
 

src/login/pages/LoginConfigTotp.tsx

@@ -112,14 +112,9 @@ export default function LoginConfigTotp(props: PageProps<Extract<KcContext, { pa
                             />
 
                             {messagesPerField.existsError("totp") && (
-                                <span
-                                    id="input-error-otp-code"
-                                    className={kcClsx("kcInputErrorMessageClass")}
-                                    aria-live="polite"
-                                    dangerouslySetInnerHTML={{
-                                        __html: messagesPerField.get("totp")
-                                    }}
-                                />
+                                <span id="input-error-otp-code" className={kcClsx("kcInputErrorMessageClass")} aria-live="polite">
+                                    {messagesPerField.get("totp")}
+                                </span>
                             )}
                         </div>
                         <input type="hidden" id="totpSecret" name="totpSecret" value={totp.totpSecret} />
@@ -143,14 +138,9 @@ export default function LoginConfigTotp(props: PageProps<Extract<KcContext, { pa
                                 aria-invalid={messagesPerField.existsError("userLabel")}
                             />
                             {messagesPerField.existsError("userLabel") && (
-                                <span
-                                    id="input-error-otp-label"
-                                    className={kcClsx("kcInputErrorMessageClass")}
-                                    aria-live="polite"
-                                    dangerouslySetInnerHTML={{
-                                        __html: messagesPerField.get("userLabel")
-                                    }}
-                                />
+                                <span id="input-error-otp-label" className={kcClsx("kcInputErrorMessageClass")} aria-live="polite">
+                                    {messagesPerField.get("userLabel")}
+                                </span>
                             )}
                         </div>
                     </div>

src/login/pages/LoginOtp.tsx

@@ -70,14 +70,9 @@ export default function LoginOtp(props: PageProps<Extract<KcContext, { pageId: "
                             aria-invalid={messagesPerField.existsError("totp")}
                         />
                         {messagesPerField.existsError("totp") && (
-                            <span
-                                id="input-error-otp-code"
-                                className={kcClsx("kcInputErrorMessageClass")}
-                                aria-live="polite"
-                                dangerouslySetInnerHTML={{
-                                    __html: messagesPerField.get("totp")
-                                }}
-                            />
+                            <span id="input-error-otp-code" className={kcClsx("kcInputErrorMessageClass")} aria-live="polite">
+                                {messagesPerField.get("totp")}
+                            </span>
                         )}
                     </div>
                 </div>

src/login/pages/LoginPassword.tsx

@@ -60,14 +60,9 @@ export default function LoginPassword(props: PageProps<Extract<KcContext, { page
                             </PasswordWrapper>
 
                             {messagesPerField.existsError("password") && (
-                                <span
-                                    id="input-error-password"
-                                    className={kcClsx("kcInputErrorMessageClass")}
-                                    aria-live="polite"
-                                    dangerouslySetInnerHTML={{
-                                        __html: messagesPerField.get("password")
-                                    }}
-                                />
+                                <span id="input-error-password" className={kcClsx("kcInputErrorMessageClass")} aria-live="polite">
+                                    {messagesPerField.get("password")}
+                                </span>
                             )}
                         </div>
                         <div className={kcClsx("kcFormGroupClass", "kcFormSettingClass")}>

src/login/pages/LoginRecoveryAuthnCodeInput.tsx

@@ -43,14 +43,9 @@ export default function LoginRecoveryAuthnCodeInput(props: PageProps<Extract<KcC
                             autoFocus
                         />
                         {messagesPerField.existsError("recoveryCodeInput") && (
-                            <span
-                                id="input-error"
-                                className={kcClsx("kcInputErrorMessageClass")}
-                                aria-live="polite"
-                                dangerouslySetInnerHTML={{
-                                    __html: messagesPerField.get("recoveryCodeInput")
-                                }}
-                            />
+                            <span id="input-error" className={kcClsx("kcInputErrorMessageClass")} aria-live="polite">
+                                {messagesPerField.get("recoveryCodeInput")}
+                            </span>
                         )}
                     </div>
                 </div>

src/login/pages/LoginResetPassword.tsx

@@ -48,14 +48,9 @@ export default function LoginResetPassword(props: PageProps<Extract<KcContext, {
                             aria-invalid={messagesPerField.existsError("username")}
                         />
                         {messagesPerField.existsError("username") && (
-                            <span
-                                id="input-error-username"
-                                className={kcClsx("kcInputErrorMessageClass")}
-                                aria-live="polite"
-                                dangerouslySetInnerHTML={{
-                                    __html: messagesPerField.get("username")
-                                }}
-                            />
+                            <span id="input-error-username" className={kcClsx("kcInputErrorMessageClass")} aria-live="polite">
+                                {messagesPerField.get("username")}
+                            </span>
                         )}
                     </div>
                 </div>

src/login/pages/LoginUpdatePassword.tsx

@@ -32,30 +32,25 @@ export default function LoginUpdatePassword(props: PageProps<Extract<KcContext,
                         <label htmlFor="password-new" className={kcClsx("kcLabelClass")}>
                             {msg("passwordNew")}
                         </label>
-                    </div>
-                    <div className={kcClsx("kcInputWrapperClass")}>
-                        <PasswordWrapper kcClsx={kcClsx} i18n={i18n} passwordInputId="password-new">
-                            <input
-                                type="password"
-                                id="password-new"
-                                name="password-new"
-                                className={kcClsx("kcInputClass")}
-                                autoFocus
-                                autoComplete="new-password"
-                                aria-invalid={messagesPerField.existsError("password", "password-confirm")}
-                            />
-                        </PasswordWrapper>
+                        <div className={kcClsx("kcInputWrapperClass")}>
+                            <PasswordWrapper kcClsx={kcClsx} i18n={i18n} passwordInputId="password-new">
+                                <input
+                                    type="password"
+                                    id="password-new"
+                                    name="password-new"
+                                    className={kcClsx("kcInputClass")}
+                                    autoFocus
+                                    autoComplete="new-password"
+                                    aria-invalid={messagesPerField.existsError("password", "password-confirm")}
+                                />
+                            </PasswordWrapper>
 
-                        {messagesPerField.existsError("password") && (
-                            <span
-                                id="input-error-password"
-                                className={kcClsx("kcInputErrorMessageClass")}
-                                aria-live="polite"
-                                dangerouslySetInnerHTML={{
-                                    __html: messagesPerField.get("password")
-                                }}
-                            />
-                        )}
+                            {messagesPerField.existsError("password") && (
+                                <span id="input-error-password" className={kcClsx("kcInputErrorMessageClass")} aria-live="polite">
+                                    {messagesPerField.get("password")}
+                                </span>
+                            )}
+                        </div>
                     </div>
                 </div>
 
@@ -79,40 +74,37 @@ export default function LoginUpdatePassword(props: PageProps<Extract<KcContext,
                         </PasswordWrapper>
 
                         {messagesPerField.existsError("password-confirm") && (
-                            <span
-                                id="input-error-password-confirm"
-                                className={kcClsx("kcInputErrorMessageClass")}
-                                aria-live="polite"
-                                dangerouslySetInnerHTML={{
-                                    __html: messagesPerField.get("password-confirm")
-                                }}
-                            />
+                            <span id="input-error-password-confirm" className={kcClsx("kcInputErrorMessageClass")} aria-live="polite">
+                                {messagesPerField.get("password-confirm")}
+                            </span>
                         )}
                     </div>
-                </div>
-                <div className={kcClsx("kcFormGroupClass")}>
-                    <LogoutOtherSessions kcClsx={kcClsx} i18n={i18n} />
-                    <div id="kc-form-buttons" className={kcClsx("kcFormButtonsClass")}>
-                        <input
-                            className={kcClsx(
-                                "kcButtonClass",
-                                "kcButtonPrimaryClass",
-                                !isAppInitiatedAction && "kcButtonBlockClass",
-                                "kcButtonLargeClass"
-                            )}
-                            type="submit"
-                            value={msgStr("doSubmit")}
-                        />
-                        {isAppInitiatedAction && (
-                            <button
-                                className={kcClsx("kcButtonClass", "kcButtonDefaultClass", "kcButtonLargeClass")}
+
+                    <div className={kcClsx("kcFormGroupClass")}>
+                        <LogoutOtherSessions kcClsx={kcClsx} i18n={i18n} />
+
+                        <div id="kc-form-buttons" className={kcClsx("kcFormButtonsClass")}>
+                            <input
+                                className={kcClsx(
+                                    "kcButtonClass",
+                                    "kcButtonPrimaryClass",
+                                    isAppInitiatedAction && "kcButtonBlockClass",
+                                    "kcButtonLargeClass"
+                                )}
                                 type="submit"
-                                name="cancel-aia"
-                                value="true"
-                            >
-                                {msg("doCancel")}
-                            </button>
-                        )}
+                                value={msgStr("doSubmit")}
+                            />
+                            {isAppInitiatedAction && (
+                                <button
+                                    className={kcClsx("kcButtonClass", "kcButtonDefaultClass", "kcButtonLargeClass")}
+                                    type="submit"
+                                    name="cancel-aia"
+                                    value="true"
+                                >
+                                    {msg("doCancel")}
+                                </button>
+                            )}
+                        </div>
                     </div>
                 </div>
             </form>

src/login/pages/Register.tsx

@@ -24,7 +24,6 @@ export default function Register(props: RegisterProps) {
     const { msg, msgStr } = i18n;
 
     const [isFormSubmittable, setIsFormSubmittable] = useState(false);
-    const [areTermsAccepted, setAreTermsAccepted] = useState(false);
 
     return (
         <Template
@@ -44,15 +43,7 @@ export default function Register(props: RegisterProps) {
                     onIsFormSubmittableValueChange={setIsFormSubmittable}
                     doMakeUserConfirmPassword={doMakeUserConfirmPassword}
                 />
-                {termsAcceptanceRequired && (
-                    <TermsAcceptance
-                        i18n={i18n}
-                        kcClsx={kcClsx}
-                        messagesPerField={messagesPerField}
-                        areTermsAccepted={areTermsAccepted}
-                        onAreTermsAcceptedValueChange={setAreTermsAccepted}
-                    />
-                )}
+                {termsAcceptanceRequired && <TermsAcceptance i18n={i18n} kcClsx={kcClsx} messagesPerField={messagesPerField} />}
                 {recaptchaRequired && (
                     <div className="form-group">
                         <div className={kcClsx("kcInputWrapperClass")}>
@@ -70,7 +61,7 @@ export default function Register(props: RegisterProps) {
                     </div>
                     <div id="kc-form-buttons" className={kcClsx("kcFormButtonsClass")}>
                         <input
-                            disabled={!isFormSubmittable || (termsAcceptanceRequired && !areTermsAccepted)}
+                            disabled={!isFormSubmittable}
                             className={kcClsx("kcButtonClass", "kcButtonPrimaryClass", "kcButtonBlockClass", "kcButtonLargeClass")}
                             type="submit"
                             value={msgStr("doRegister")}
@@ -82,14 +73,8 @@ export default function Register(props: RegisterProps) {
     );
 }
 
-function TermsAcceptance(props: {
-    i18n: I18n;
-    kcClsx: KcClsx;
-    messagesPerField: Pick<KcContext["messagesPerField"], "existsError" | "get">;
-    areTermsAccepted: boolean;
-    onAreTermsAcceptedValueChange: (areTermsAccepted: boolean) => void;
-}) {
-    const { i18n, kcClsx, messagesPerField, areTermsAccepted, onAreTermsAcceptedValueChange } = props;
+function TermsAcceptance(props: { i18n: I18n; kcClsx: KcClsx; messagesPerField: Pick<KcContext["messagesPerField"], "existsError" | "get"> }) {
+    const { i18n, kcClsx, messagesPerField } = props;
 
     const { msg } = i18n;
 
@@ -108,8 +93,6 @@ function TermsAcceptance(props: {
                         id="termsAccepted"
                         name="termsAccepted"
                         className={kcClsx("kcCheckboxInputClass")}
-                        checked={areTermsAccepted}
-                        onChange={e => onAreTermsAcceptedValueChange(e.target.checked)}
                         aria-invalid={messagesPerField.existsError("termsAccepted")}
                     />
                     <label htmlFor="termsAccepted" className={kcClsx("kcLabelClass")}>
@@ -118,14 +101,9 @@ function TermsAcceptance(props: {
                 </div>
                 {messagesPerField.existsError("termsAccepted") && (
                     <div className={kcClsx("kcLabelWrapperClass")}>
-                        <span
-                            id="input-error-terms-accepted"
-                            className={kcClsx("kcInputErrorMessageClass")}
-                            aria-live="polite"
-                            dangerouslySetInnerHTML={{
-                                __html: messagesPerField.get("termsAccepted")
-                            }}
-                        />
+                        <span id="input-error-terms-accepted" className={kcClsx("kcInputErrorMessageClass")} aria-live="polite">
+                            {messagesPerField.get("termsAccepted")}
+                        </span>
                     </div>
                 )}
             </div>

src/login/pages/SamlPostForm.tsx

@@ -18,7 +18,7 @@ export default function SamlPostForm(props: PageProps<Extract<KcContext, { pageI
         }
 
         // Storybook
-        if (samlPost.url === "#") {
+        if (samlPost.url === "") {
             alert("In a real Keycloak the user would be redirected immediately");
             return;
         }

src/login/pages/SelectAuthenticator.tsx

@@ -8,7 +8,7 @@ export default function SelectAuthenticator(props: PageProps<Extract<KcContext,
     const { url, auth } = kcContext;
 
     const { kcClsx } = getKcClsx({ doUseDefaultCss, classes });
-    const { msg, advancedMsg } = i18n;
+    const { msg } = i18n;
 
     return (
         <Template
@@ -30,11 +30,11 @@ export default function SelectAuthenticator(props: PageProps<Extract<KcContext,
                             value={authenticationSelection.authExecId}
                         >
                             <div className={kcClsx("kcSelectAuthListItemIconClass")}>
-                                <i className={kcClsx("kcSelectAuthListItemIconPropertyClass", authenticationSelection.iconCssClass)} />
+                                <i className={kcClsx(authenticationSelection.iconCssClass, "kcSelectAuthListItemIconPropertyClass")} />
                             </div>
                             <div className={kcClsx("kcSelectAuthListItemBodyClass")}>
-                                <div className={kcClsx("kcSelectAuthListItemHeadingClass")}>{advancedMsg(authenticationSelection.displayName)}</div>
-                                <div className={kcClsx("kcSelectAuthListItemDescriptionClass")}>{advancedMsg(authenticationSelection.helpText)}</div>
+                                <div className={kcClsx("kcSelectAuthListItemHeadingClass")}>{msg(authenticationSelection.displayName)}</div>
+                                <div className={kcClsx("kcSelectAuthListItemDescriptionClass")}>{msg(authenticationSelection.helpText)}</div>
                             </div>
                             <div className={kcClsx("kcSelectAuthListItemFillClass")} />
                             <div className={kcClsx("kcSelectAuthListItemArrowClass")}>

src/login/pages/WebauthnAuthenticate.tsx

@@ -204,13 +204,13 @@ export default function WebauthnAuthenticate(props: PageProps<Extract<KcContext,
                                                             className={kcClsx("kcSelectAuthListItemDescriptionClass")}
                                                         >
                                                             {authenticator.transports.displayNameProperties
-                                                                .map((displayNameProperty, i, arr) => ({
-                                                                    displayNameProperty,
+                                                                .map((nameProperty, i, arr) => ({
+                                                                    nameProperty,
                                                                     hasNext: i !== arr.length - 1
                                                                 }))
-                                                                .map(({ displayNameProperty, hasNext }) => (
-                                                                    <Fragment key={displayNameProperty}>
-                                                                        {advancedMsg(displayNameProperty)}
+                                                                .map(({ nameProperty, hasNext }) => (
+                                                                    <Fragment key={nameProperty}>
+                                                                        <span>{msg(nameProperty)}</span>
                                                                         {hasNext && <span>, </span>}
                                                                     </Fragment>
                                                                 ))}

src/tools/ExtractAfterStartingWith.ts

@@ -0,0 +1,4 @@
+export type ExtractAfterStartingWith<
+    Prefix extends string,
+    StrEnum
+> = StrEnum extends `${Prefix}${infer U}` ? U : never;

src/vite-plugin/vite-plugin.ts

@@ -1,9 +1,9 @@
 import { join as pathJoin, relative as pathRelative, sep as pathSep } from "path";
 import type { Plugin } from "vite";
 import {
-    BASENAME_OF_KEYCLOAKIFY_RESOURCES_DIR,
-    KEYCLOAK_RESOURCES,
-    VITE_PLUGIN_SUB_SCRIPTS_ENV_NAMES
+    basenameOfTheKeycloakifyResourcesDir,
+    keycloak_resources,
+    vitePluginSubScriptEnvNames
 } from "../bin/shared/constants";
 import { id } from "tsafe/id";
 import { rm } from "../bin/tools/fs.rm";
@@ -18,14 +18,12 @@ import {
 import MagicString from "magic-string";
 import { generateKcGenTs } from "../bin/shared/generateKcGenTs";
 
-export namespace keycloakify {
-    export type Params = BuildOptions & {
-        postBuild?: (buildContext: Omit<BuildContext, "bundler">) => Promise<void>;
-    };
-}
+export type Params = BuildOptions & {
+    postBuild?: (buildContext: Omit<BuildContext, "bundler">) => Promise<void>;
+};
 
-export function keycloakify(params: keycloakify.Params) {
-    const { postBuild, ...buildOptions } = params;
+export function keycloakify(params?: Params) {
+    const { postBuild, ...buildOptions } = params ?? {};
 
     let projectDirPath: string | undefined = undefined;
     let urlPathname: string | undefined = undefined;
@@ -40,7 +38,7 @@ export function keycloakify(params: keycloakify.Params) {
 
             run_post_build_script_case: {
                 const envValue =
-                    process.env[VITE_PLUGIN_SUB_SCRIPTS_ENV_NAMES.RUN_POST_BUILD_SCRIPT];
+                    process.env[vitePluginSubScriptEnvNames.runPostBuildScript];
 
                 if (envValue === undefined) {
                     break run_post_build_script_case;
@@ -96,13 +94,13 @@ export function keycloakify(params: keycloakify.Params) {
 
             resolve_vite_config_case: {
                 const envValue =
-                    process.env[VITE_PLUGIN_SUB_SCRIPTS_ENV_NAMES.RESOLVE_VITE_CONFIG];
+                    process.env[vitePluginSubScriptEnvNames.resolveViteConfig];
 
                 if (envValue === undefined) {
                     break resolve_vite_config_case;
                 }
 
-                console.log(VITE_PLUGIN_SUB_SCRIPTS_ENV_NAMES.RESOLVE_VITE_CONFIG);
+                console.log(vitePluginSubScriptEnvNames.resolveViteConfig);
 
                 console.log(
                     JSON.stringify(
@@ -174,7 +172,7 @@ export function keycloakify(params: keycloakify.Params) {
                     `(`,
                     `(window.kcContext === undefined || import.meta.env.MODE === "development")?`,
                     `"${urlPathname ?? "/"}":`,
-                    `(window.kcContext["x-keycloakify"].resourcesPath + "/${BASENAME_OF_KEYCLOAKIFY_RESOURCES_DIR}/")`,
+                    `(window.kcContext.url.resourcesPath + "/${basenameOfTheKeycloakifyResourcesDir}/")`,
                     `)`
                 ].join("")
             );
@@ -207,7 +205,7 @@ export function keycloakify(params: keycloakify.Params) {
 
             assert(buildDirPath !== undefined);
 
-            await rm(pathJoin(buildDirPath, KEYCLOAK_RESOURCES), {
+            await rm(pathJoin(buildDirPath, keycloak_resources), {
                 recursive: true,
                 force: true
             });