keycloakify 10.0.0-rc.110 → 10.0.0-rc.112

package/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,
-    lastKeycloakVersionWithAccountV1,
-    accountV1ThemeName
+    RESOURCES_COMMON,
+    LAST_KEYCLOAK_VERSION_WITH_ACCOUNT_V1,
+    ACCOUNT_V1_THEME_NAME
 } from "../../shared/constants";
 import {
     downloadKeycloakDefaultTheme,
@@ -24,14 +24,14 @@ export async function bringInAccountV1(params: {
     const { resourcesDirPath, buildContext } = params;
 
     const { defaultThemeDirPath } = await downloadKeycloakDefaultTheme({
-        keycloakVersion: lastKeycloakVersionWithAccountV1,
+        keycloakVersion: LAST_KEYCLOAK_VERSION_WITH_ACCOUNT_V1,
         buildContext
     });
 
     const accountV1DirPath = pathJoin(
         resourcesDirPath,
         "theme",
-        accountV1ThemeName,
+        ACCOUNT_V1_THEME_NAME,
         "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(" "),
                 "",

package/src/bin/keycloakify/generateResources/generateMessageProperties.ts

@@ -1,4 +1,4 @@
-import { type ThemeType, fallbackLanguageTag } from "../../shared/constants";
+import { type ThemeType, FALLBACK_LANGUAGE_TAG } from "../../shared/constants";
 import { crawl } from "../../tools/crawl";
 import { join as pathJoin } from "path";
 import { symToStr } from "tsafe/symToStr";
@@ -168,7 +168,7 @@ export function generateMessageProperties(params: {
                     ...(messageBundle === undefined
                         ? {}
                         : messageBundle[languageTag] ??
-                          messageBundle[fallbackLanguageTag] ??
+                          messageBundle[FALLBACK_LANGUAGE_TAG] ??
                           messageBundle[Object.keys(messageBundle)[0]] ??
                           {})
                 }

package/src/bin/keycloakify/generateResources/generateResourcesForMainTheme.ts

@@ -15,12 +15,12 @@ import {
 } from "../generateFtl";
 import {
     type ThemeType,
-    lastKeycloakVersionWithAccountV1,
-    keycloak_resources,
-    accountV1ThemeName,
-    basenameOfTheKeycloakifyResourcesDir,
-    loginThemePageIds,
-    accountThemePageIds
+    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
 } from "../../shared/constants";
 import type { BuildContext } from "../../shared/buildContext";
 import { assert, type Equals } from "tsafe/assert";
@@ -85,7 +85,7 @@ export async function generateResourcesForMainTheme(params: {
             const destDirPath = pathJoin(
                 themeTypeDirPath,
                 "resources",
-                basenameOfTheKeycloakifyResourcesDir
+                BASENAME_OF_KEYCLOAKIFY_RESOURCES_DIR
             );
 
             // NOTE: Prevent accumulation of files in the assets dir, as names are hashed they pile up.
@@ -103,7 +103,7 @@ export async function generateResourcesForMainTheme(params: {
                             themeType: "login"
                         }),
                         "resources",
-                        basenameOfTheKeycloakifyResourcesDir
+                        BASENAME_OF_KEYCLOAKIFY_RESOURCES_DIR
                     ),
                     destDirPath
                 });
@@ -114,7 +114,7 @@ export async function generateResourcesForMainTheme(params: {
             {
                 const dirPath = pathJoin(
                     buildContext.projectBuildDirPath,
-                    keycloak_resources
+                    KEYCLOAK_RESOURCES
                 );
 
                 if (fs.existsSync(dirPath)) {
@@ -122,7 +122,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`,
@@ -140,8 +140,7 @@ export async function generateResourcesForMainTheme(params: {
                         const { fixedCssCode } = replaceImportsInCssCode({
                             cssCode: sourceCode.toString("utf8"),
                             cssFileRelativeDirPath: pathDirname(fileRelativePath),
-                            buildContext,
-                            isAccountV3
+                            buildContext
                         });
 
                         return {
@@ -176,17 +175,16 @@ export async function generateResourcesForMainTheme(params: {
             fieldNames: readFieldNameUsage({
                 themeSrcDirPath: buildContext.themeSrcDirPath,
                 themeType
-            }),
-            isAccountV3
+            })
         });
 
         [
             ...(() => {
                 switch (themeType) {
                     case "login":
-                        return loginThemePageIds;
+                        return LOGIN_THEME_PAGE_IDS;
                     case "account":
-                        return isAccountV3 ? ["index.ftl"] : accountThemePageIds;
+                        return isAccountV3 ? ["index.ftl"] : ACCOUNT_THEME_PAGE_IDS;
                 }
             })(),
             ...(isAccountV3
@@ -240,7 +238,7 @@ export async function generateResourcesForMainTheme(params: {
                 keycloakVersion: (() => {
                     switch (themeType) {
                         case "account":
-                            return lastKeycloakVersionWithAccountV1;
+                            return LAST_KEYCLOAK_VERSION_WITH_ACCOUNT_V1;
                         case "login":
                             return buildContext.loginThemeResourcesFromKeycloakVersion;
                     }
@@ -258,7 +256,7 @@ export async function generateResourcesForMainTheme(params: {
                     `parent=${(() => {
                         switch (themeType) {
                             case "account":
-                                return isAccountV3 ? "base" : accountV1ThemeName;
+                                return isAccountV3 ? "base" : ACCOUNT_V1_THEME_NAME;
                             case "login":
                                 return "keycloak";
                         }
@@ -349,7 +347,7 @@ export async function generateResourcesForMainTheme(params: {
 
         if (buildContext.recordIsImplementedByThemeType.account) {
             metaInfKeycloakThemes.themes.push({
-                name: accountV1ThemeName,
+                name: ACCOUNT_V1_THEME_NAME,
                 types: ["account"]
             });
         }

package/src/bin/keycloakify/generateResources/generateResourcesForThemeVariant.ts

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

package/src/bin/keycloakify/generateResources/readExtraPageNames.ts

@@ -5,8 +5,8 @@ import * as fs from "fs";
 import { join as pathJoin } from "path";
 import {
     type ThemeType,
-    accountThemePageIds,
-    loginThemePageIds
+    ACCOUNT_THEME_PAGE_IDS,
+    LOGIN_THEME_PAGE_IDS
 } from "../../shared/constants";
 
 export function readExtraPagesNames(params: {
@@ -41,9 +41,9 @@ export function readExtraPagesNames(params: {
     return extraPages.reduce(...removeDuplicates<string>()).filter(pageId => {
         switch (themeType) {
             case "account":
-                return !id<readonly string[]>(accountThemePageIds).includes(pageId);
+                return !id<readonly string[]>(ACCOUNT_THEME_PAGE_IDS).includes(pageId);
             case "login":
-                return !id<readonly string[]>(loginThemePageIds).includes(pageId);
+                return !id<readonly string[]>(LOGIN_THEME_PAGE_IDS).includes(pageId);
         }
     });
 }

package/src/bin/keycloakify/keycloakify.ts

@@ -3,7 +3,7 @@ import { join as pathJoin, relative as pathRelative, sep as pathSep } from "path
 import * as child_process from "child_process";
 import * as fs from "fs";
 import { getBuildContext } from "../shared/buildContext";
-import { vitePluginSubScriptEnvNames } from "../shared/constants";
+import { VITE_PLUGIN_SUB_SCRIPTS_ENV_NAMES } from "../shared/constants";
 import { buildJars } from "./buildJars";
 import type { CliCommandOptions } from "../main";
 import chalk from "chalk";
@@ -93,10 +93,12 @@ export async function command(params: { cliCommandOptions: CliCommandOptions })
             cwd: buildContext.projectDirPath,
             env: {
                 ...process.env,
-                [vitePluginSubScriptEnvNames.runPostBuildScript]: JSON.stringify({
-                    resourcesDirPath,
-                    buildContext
-                })
+                [VITE_PLUGIN_SUB_SCRIPTS_ENV_NAMES.RUN_POST_BUILD_SCRIPT]: JSON.stringify(
+                    {
+                        resourcesDirPath,
+                        buildContext
+                    }
+                )
             }
         });
     }

package/src/bin/keycloakify/replacers/replaceImportsInCssCode.ts

@@ -1,5 +1,5 @@
 import type { BuildContext } from "../../shared/buildContext";
-import { basenameOfTheKeycloakifyResourcesDir } from "../../shared/constants";
+import { BASENAME_OF_KEYCLOAKIFY_RESOURCES_DIR } from "../../shared/constants";
 import { assert } from "tsafe/assert";
 import { posix } from "path";
 
@@ -12,12 +12,11 @@ assert<BuildContext extends BuildContextLike ? true : false>();
 export function replaceImportsInCssCode(params: {
     cssCode: string;
     cssFileRelativeDirPath: string | undefined;
-    isAccountV3: boolean;
     buildContext: BuildContextLike;
 }): {
     fixedCssCode: string;
 } {
-    const { cssCode, cssFileRelativeDirPath, buildContext, isAccountV3 } = params;
+    const { cssCode, cssFileRelativeDirPath, buildContext } = params;
 
     const fixedCssCode = cssCode.replace(
         /url\(["']?(\/[^/][^)"']+)["']?\)/g,
@@ -38,7 +37,7 @@ export function replaceImportsInCssCode(params: {
                     break inline_style_in_html;
                 }
 
-                return `url(\${${!isAccountV3 ? "url.resourcesPath" : "resourceUrl"}}/${basenameOfTheKeycloakifyResourcesDir}${assetFileAbsoluteUrlPathname})`;
+                return `url(\${xKeycloakify.resourcesPath}/${BASENAME_OF_KEYCLOAKIFY_RESOURCES_DIR}${assetFileAbsoluteUrlPathname})`;
             }
 
             const assetFileRelativeUrlPathname = posix.relative(

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

@@ -1,4 +1,4 @@
-import { basenameOfTheKeycloakifyResourcesDir } from "../../../shared/constants";
+import { BASENAME_OF_KEYCLOAKIFY_RESOURCES_DIR } 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_javacript_import: {
+    replace_base_js_import: {
         if (buildContext.urlPathname === undefined) {
-            break replace_base_javacript_import;
+            break replace_base_js_import;
         }
         // Optimization
         if (!jsCode.includes(buildContext.urlPathname)) {
-            break replace_base_javacript_import;
+            break replace_base_js_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.url.resourcesPath.substring(1) + "/${basenameOfTheKeycloakifyResourcesDir}/${relativePathOfAssetFile}")`
+                    `(window.kcContext["x-keycloakify"].resourcesPath.substring(1) + "/${BASENAME_OF_KEYCLOAKIFY_RESOURCES_DIR}/${relativePathOfAssetFile}")`
                 );
 
                 fixedJsCode = replaceAll(
                     fixedJsCode,
                     `"${buildContext.urlPathname ?? "/"}${relativePathOfAssetFile}"`,
-                    `(window.kcContext.url.resourcesPath + "/${basenameOfTheKeycloakifyResourcesDir}/${relativePathOfAssetFile}")`
+                    `(window.kcContext["x-keycloakify"].resourcesPath + "/${BASENAME_OF_KEYCLOAKIFY_RESOURCES_DIR}/${relativePathOfAssetFile}")`
                 );
             });
     }

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

@@ -1,4 +1,4 @@
-import { basenameOfTheKeycloakifyResourcesDir } from "../../../shared/constants";
+import { BASENAME_OF_KEYCLOAKIFY_RESOURCES_DIR } 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.url.resourcesPath; },
+                        get: function() { return window.kcContext["x-keycloakify"].resourcesPath; },
                         set: function() {}
                     });
                 }
                 return "${u}";
             })()] = ${
                 isArrowFunction ? `${e} =>` : `function(${e}) { return `
-            } "/${basenameOfTheKeycloakifyResourcesDir}/${staticDir}${language}/"`
+            } "/${BASENAME_OF_KEYCLOAKIFY_RESOURCES_DIR}/${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.url.resourcesPath + "/${basenameOfTheKeycloakifyResourcesDir}/${staticDir}`
+            `window.kcContext["x-keycloakify"].resourcesPath + "/${BASENAME_OF_KEYCLOAKIFY_RESOURCES_DIR}/${staticDir}`
         );
 
     return { fixedJsCode };

package/src/bin/shared/buildContext.ts

@@ -13,13 +13,13 @@ import * as fs from "fs";
 import { assert, type Equals } from "tsafe/assert";
 import * as child_process from "child_process";
 import {
-    vitePluginSubScriptEnvNames,
-    buildForKeycloakMajorVersionEnvName
+    VITE_PLUGIN_SUB_SCRIPTS_ENV_NAMES,
+    BUILD_FOR_KEYCLOAK_MAJOR_VERSION_ENV_NAME
 } from "./constants";
 import type { KeycloakVersionRange } from "./KeycloakVersionRange";
 import { exclude } from "tsafe";
 import { crawl } from "../tools/crawl";
-import { themeTypes } from "./constants";
+import { THEME_TYPES } from "./constants";
 import { objectFromEntries } from "tsafe/objectFromEntries";
 import { objectEntries } from "tsafe/objectEntries";
 import { type ThemeType } from "./constants";
@@ -136,7 +136,7 @@ export function getBuildContext(params: {
             return { themeSrcDirPath };
         }
 
-        for (const themeType of [...themeTypes, "email"]) {
+        for (const themeType of [...THEME_TYPES, "email"]) {
             if (!fs.existsSync(pathJoin(srcDirPath, themeType))) {
                 continue;
             }
@@ -171,18 +171,18 @@ export function getBuildContext(params: {
                 cwd: projectDirPath,
                 env: {
                     ...process.env,
-                    [vitePluginSubScriptEnvNames.resolveViteConfig]: "true"
+                    [VITE_PLUGIN_SUB_SCRIPTS_ENV_NAMES.RESOLVE_VITE_CONFIG]: "true"
                 }
             })
             .toString("utf8");
 
         assert(
-            output.includes(vitePluginSubScriptEnvNames.resolveViteConfig),
+            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(vitePluginSubScriptEnvNames.resolveViteConfig)
+            .split(VITE_PLUGIN_SUB_SCRIPTS_ENV_NAMES.RESOLVE_VITE_CONFIG)
             .reverse()[0];
 
         const resolvedViteConfig: ResolvedViteConfig = JSON.parse(resolvedViteConfigStr);
@@ -594,7 +594,8 @@ export function getBuildContext(params: {
 
             build_for_specific_keycloak_major_version: {
                 const buildForKeycloakMajorVersionNumber = (() => {
-                    const envValue = process.env[buildForKeycloakMajorVersionEnvName];
+                    const envValue =
+                        process.env[BUILD_FOR_KEYCLOAK_MAJOR_VERSION_ENV_NAME];
 
                     if (envValue === undefined) {
                         return undefined;

package/src/bin/shared/constants.ts

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

package/src/bin/shared/copyKeycloakResourcesToPublic.ts

@@ -4,9 +4,9 @@ import {
 } from "./downloadKeycloakStaticResources";
 import { join as pathJoin, relative as pathRelative } from "path";
 import {
-    themeTypes,
-    keycloak_resources,
-    lastKeycloakVersionWithAccountV1
+    THEME_TYPES,
+    KEYCLOAK_RESOURCES,
+    LAST_KEYCLOAK_VERSION_WITH_ACCOUNT_V1
 } 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");
 
@@ -66,14 +66,14 @@ export async function copyKeycloakResourcesToPublic(params: {
 
     fs.writeFileSync(pathJoin(destDirPath, ".gitignore"), Buffer.from("*", "utf8"));
 
-    for (const themeType of themeTypes) {
+    for (const themeType of THEME_TYPES) {
         await downloadKeycloakStaticResources({
             keycloakVersion: (() => {
                 switch (themeType) {
                     case "login":
                         return buildContext.loginThemeResourcesFromKeycloakVersion;
                     case "account":
-                        return lastKeycloakVersionWithAccountV1;
+                        return LAST_KEYCLOAK_VERSION_WITH_ACCOUNT_V1;
                 }
             })(),
             themeType,

package/src/bin/shared/downloadKeycloakDefaultTheme.ts

@@ -1,7 +1,7 @@
 import { join as pathJoin, relative as pathRelative } from "path";
 import { type BuildContext } from "./buildContext";
 import { assert } from "tsafe/assert";
-import { lastKeycloakVersionWithAccountV1 } from "./constants";
+import { LAST_KEYCLOAK_VERSION_WITH_ACCOUNT_V1 } from "./constants";
 import { downloadAndExtractArchive } from "../tools/downloadAndExtractArchive";
 
 export type BuildContextLike = {
@@ -43,7 +43,7 @@ export async function downloadKeycloakDefaultTheme(params: {
             }
 
             last_account_v1_transformations: {
-                if (lastKeycloakVersionWithAccountV1 !== keycloakVersion) {
+                if (LAST_KEYCLOAK_VERSION_WITH_ACCOUNT_V1 !== keycloakVersion) {
                     break last_account_v1_transformations;
                 }
 

package/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)
     });
 }

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

@@ -1,4 +1,4 @@
-import { buildForKeycloakMajorVersionEnvName } from "../shared/constants";
+import { BUILD_FOR_KEYCLOAK_MAJOR_VERSION_ENV_NAME } from "../shared/constants";
 import * as child_process from "child_process";
 import { Deferred } from "evt/tools/Deferred";
 import { assert } from "tsafe/assert";
@@ -26,7 +26,7 @@ export async function keycloakifyBuild(params: {
         cwd: buildContext.projectDirPath,
         env: {
             ...process.env,
-            [buildForKeycloakMajorVersionEnvName]: `${buildForKeycloakMajorVersionNumber}`
+            [BUILD_FOR_KEYCLOAK_MAJOR_VERSION_ENV_NAME]: `${buildForKeycloakMajorVersionNumber}`
         },
         shell: true
     });

package/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 { accountV1ThemeName, containerName } from "../shared/constants";
+import { ACCOUNT_V1_THEME_NAME, CONTAINER_NAME } from "../shared/constants";
 import { SemVer } from "../tools/SemVer";
 import { assert } from "tsafe/assert";
 import * as fs from "fs";
@@ -269,7 +269,7 @@ export async function command(params: { cliCommandOptions: CliCommandOptions })
     fs.copyFileSync(jarFilePath, jarFilePath_cacheDir);
 
     try {
-        child_process.execSync(`docker rm --force ${containerName}`, {
+        child_process.execSync(`docker rm --force ${CONTAINER_NAME}`, {
             stdio: "ignore"
         });
     } catch {}
@@ -279,7 +279,7 @@ export async function command(params: { cliCommandOptions: CliCommandOptions })
         [
             "run",
             ...["-p", `${cliCommandOptions.port}:8080`],
-            ...["--name", containerName],
+            ...["--name", CONTAINER_NAME],
             ...["-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",
-                        accountV1ThemeName
+                        ACCOUNT_V1_THEME_NAME
                     )
                 )
-                    ? [accountV1ThemeName]
+                    ? [ACCOUNT_V1_THEME_NAME]
                     : [])
             ]
                 .map(themeName => ({

package/src/lib/getKcClsx.ts

@@ -71,10 +71,14 @@ export function createGetKcClsx<ClassKey extends string>(params: {
                 transform: classKey => {
                     assert(is<ClassKey>(classKey));
 
+                    const className = classes?.[classKey];
+
                     return clsx(
                         classKey,
-                        doUseDefaultCss ? defaultClasses[classKey] : undefined,
-                        classes?.[classKey]
+                        doUseDefaultCss && !className?.split(" ").includes("CLEAR")
+                            ? defaultClasses[classKey]
+                            : undefined,
+                        className
                     );
                 }
             });

package/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: "#"