keycloakify 10.0.0-rc.37 → 10.0.0-rc.39

package/login/pages/WebauthnError.js

@@ -1,21 +1,21 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { clsx } from "../../tools/clsx";
-import { useGetClassName } from "../../login/lib/useGetClassName";
+import { getKcClsx } from "../../login/lib/kcClsx";
+import { useI18n } from "../i18n";
 export default function WebauthnError(props) {
-    const { kcContext, i18n, doUseDefaultCss, Template, classes } = props;
+    const { kcContext, doUseDefaultCss, Template, classes } = props;
     const { url, isAppInitiatedAction } = kcContext;
-    const { msg, msgStr } = i18n;
-    const { getClassName } = useGetClassName({
+    const { msg, msgStr } = useI18n({ kcContext });
+    const { kcClsx } = getKcClsx({
         doUseDefaultCss,
         classes
     });
-    return (_jsxs(Template, Object.assign({}, { kcContext, i18n, doUseDefaultCss, classes }, { displayMessage: true, headerNode: msg("webauthn-error-title") }, { children: [_jsxs("form", Object.assign({ id: "kc-error-credential-form", className: getClassName("kcFormClass"), action: url.loginAction, method: "post" }, { children: [_jsx("input", { type: "hidden", id: "executionValue", name: "authenticationExecution" }), _jsx("input", { type: "hidden", id: "isSetRetry", name: "isSetRetry" })] })), _jsx("input", { tabIndex: 4, onClick: () => {
+    return (_jsxs(Template, Object.assign({ kcContext: kcContext, doUseDefaultCss: doUseDefaultCss, classes: classes, displayMessage: true, headerNode: msg("webauthn-error-title") }, { children: [_jsxs("form", Object.assign({ id: "kc-error-credential-form", className: kcClsx("kcFormClass"), action: url.loginAction, method: "post" }, { children: [_jsx("input", { type: "hidden", id: "executionValue", name: "authenticationExecution" }), _jsx("input", { type: "hidden", id: "isSetRetry", name: "isSetRetry" })] })), _jsx("input", { tabIndex: 4, onClick: () => {
                     // @ts-expect-error: Trusted Keycloak's code
                     document.getElementById("isSetRetry").value = "retry";
                     // @ts-expect-error: Trusted Keycloak's code
                     document.getElementById("executionValue").value = "${execution}";
                     // @ts-expect-error: Trusted Keycloak's code
                     document.getElementById("kc-error-credential-form").submit();
-                }, type: "button", className: clsx(getClassName("kcButtonClass"), getClassName("kcButtonPrimaryClass"), getClassName("kcButtonBlockClass"), getClassName("kcButtonLargeClass")), name: "try-again", id: "kc-try-again", value: msgStr("doTryAgain") }), isAppInitiatedAction && (_jsx("form", Object.assign({ action: url.loginAction, className: getClassName("kcFormClass"), id: "kc-webauthn-settings-form", method: "post" }, { children: _jsx("button", Object.assign({ type: "submit", className: clsx(getClassName("kcButtonClass"), getClassName("kcButtonDefaultClass"), getClassName("kcButtonBlockClass"), getClassName("kcButtonLargeClass")), id: "cancelWebAuthnAIA", name: "cancel-aia", value: "true" }, { children: msgStr("doCancel") })) })))] })));
+                }, type: "button", className: kcClsx("kcButtonClass", "kcButtonPrimaryClass", "kcButtonBlockClass", "kcButtonLargeClass"), name: "try-again", id: "kc-try-again", value: msgStr("doTryAgain") }), isAppInitiatedAction && (_jsx("form", Object.assign({ action: url.loginAction, className: kcClsx("kcFormClass"), id: "kc-webauthn-settings-form", method: "post" }, { children: _jsx("button", Object.assign({ type: "submit", className: kcClsx("kcButtonClass", "kcButtonDefaultClass", "kcButtonBlockClass", "kcButtonLargeClass"), id: "cancelWebAuthnAIA", name: "cancel-aia", value: "true" }, { children: msgStr("doCancel") })) })))] })));
 }
 //# sourceMappingURL=WebauthnError.js.map

package/login/pages/WebauthnError.js.map

@@ -1 +1 @@
-{"version":3,"file":"WebauthnError.js","sourceRoot":"","sources":["../../src/login/pages/WebauthnError.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,wBAAwB,CAAC;AAC9C,OAAO,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;AAKxE,MAAM,CAAC,OAAO,UAAU,aAAa,CAAC,KAA4E;IAC9G,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,eAAe,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,KAAK,CAAC;IAEtE,MAAM,EAAE,GAAG,EAAE,oBAAoB,EAAE,GAAG,SAAS,CAAC;IAEhD,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;IAE7B,MAAM,EAAE,YAAY,EAAE,GAAG,eAAe,CAAC;QACrC,eAAe;QACf,OAAO;KACV,CAAC,CAAC;IAEH,OAAO,CACH,MAAC,QAAQ,oBAAK,EAAE,SAAS,EAAE,IAAI,EAAE,eAAe,EAAE,OAAO,EAAE,IAAE,cAAc,QAAC,UAAU,EAAE,GAAG,CAAC,sBAAsB,CAAC,iBAC/G,8BAAM,EAAE,EAAC,0BAA0B,EAAC,SAAS,EAAE,YAAY,CAAC,aAAa,CAAC,EAAE,MAAM,EAAE,GAAG,CAAC,WAAW,EAAE,MAAM,EAAC,MAAM,iBAC9G,gBAAO,IAAI,EAAC,QAAQ,EAAC,EAAE,EAAC,gBAAgB,EAAC,IAAI,EAAC,yBAAyB,GAAG,EAC1E,gBAAO,IAAI,EAAC,QAAQ,EAAC,EAAE,EAAC,YAAY,EAAC,IAAI,EAAC,YAAY,GAAG,KACtD,EACP,gBACI,QAAQ,EAAE,CAAC,EACX,OAAO,EAAE,GAAG,EAAE;oBACV,4CAA4C;oBAC5C,QAAQ,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC,KAAK,GAAG,OAAO,CAAC;oBACtD,4CAA4C;oBAC5C,QAAQ,CAAC,cAAc,CAAC,gBAAgB,CAAC,CAAC,KAAK,GAAG,cAAc,CAAC;oBACjE,4CAA4C;oBAC5C,QAAQ,CAAC,cAAc,CAAC,0BAA0B,CAAC,CAAC,MAAM,EAAE,CAAC;gBACjE,CAAC,EACD,IAAI,EAAC,QAAQ,EACb,SAAS,EAAE,IAAI,CACX,YAAY,CAAC,eAAe,CAAC,EAC7B,YAAY,CAAC,sBAAsB,CAAC,EACpC,YAAY,CAAC,oBAAoB,CAAC,EAClC,YAAY,CAAC,oBAAoB,CAAC,CACrC,EACD,IAAI,EAAC,WAAW,EAChB,EAAE,EAAC,cAAc,EACjB,KAAK,EAAE,MAAM,CAAC,YAAY,CAAC,GAC7B,EACD,oBAAoB,IAAI,CACrB,6BAAM,MAAM,EAAE,GAAG,CAAC,WAAW,EAAE,SAAS,EAAE,YAAY,CAAC,aAAa,CAAC,EAAE,EAAE,EAAC,2BAA2B,EAAC,MAAM,EAAC,MAAM,gBAC/G,+BACI,IAAI,EAAC,QAAQ,EACb,SAAS,EAAE,IAAI,CACX,YAAY,CAAC,eAAe,CAAC,EAC7B,YAAY,CAAC,sBAAsB,CAAC,EACpC,YAAY,CAAC,oBAAoB,CAAC,EAClC,YAAY,CAAC,oBAAoB,CAAC,CACrC,EACD,EAAE,EAAC,mBAAmB,EACtB,IAAI,EAAC,YAAY,EACjB,KAAK,EAAC,MAAM,gBAEX,MAAM,CAAC,UAAU,CAAC,IACd,IACN,CACV,KACM,CACd,CAAC;AACN,CAAC"}
+{"version":3,"file":"WebauthnError.js","sourceRoot":"","sources":["../../src/login/pages/WebauthnError.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AAGzD,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAElC,MAAM,CAAC,OAAO,UAAU,aAAa,CAAC,KAAsE;IACxG,MAAM,EAAE,SAAS,EAAE,eAAe,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,KAAK,CAAC;IAEhE,MAAM,EAAE,GAAG,EAAE,oBAAoB,EAAE,GAAG,SAAS,CAAC;IAEhD,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC;IAE/C,MAAM,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC;QACzB,eAAe;QACf,OAAO;KACV,CAAC,CAAC;IAEH,OAAO,CACH,MAAC,QAAQ,kBAAC,SAAS,EAAE,SAAS,EAAE,eAAe,EAAE,eAAe,EAAE,OAAO,EAAE,OAAO,EAAE,cAAc,QAAC,UAAU,EAAE,GAAG,CAAC,sBAAsB,CAAC,iBACtI,8BAAM,EAAE,EAAC,0BAA0B,EAAC,SAAS,EAAE,MAAM,CAAC,aAAa,CAAC,EAAE,MAAM,EAAE,GAAG,CAAC,WAAW,EAAE,MAAM,EAAC,MAAM,iBACxG,gBAAO,IAAI,EAAC,QAAQ,EAAC,EAAE,EAAC,gBAAgB,EAAC,IAAI,EAAC,yBAAyB,GAAG,EAC1E,gBAAO,IAAI,EAAC,QAAQ,EAAC,EAAE,EAAC,YAAY,EAAC,IAAI,EAAC,YAAY,GAAG,KACtD,EACP,gBACI,QAAQ,EAAE,CAAC,EACX,OAAO,EAAE,GAAG,EAAE;oBACV,4CAA4C;oBAC5C,QAAQ,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC,KAAK,GAAG,OAAO,CAAC;oBACtD,4CAA4C;oBAC5C,QAAQ,CAAC,cAAc,CAAC,gBAAgB,CAAC,CAAC,KAAK,GAAG,cAAc,CAAC;oBACjE,4CAA4C;oBAC5C,QAAQ,CAAC,cAAc,CAAC,0BAA0B,CAAC,CAAC,MAAM,EAAE,CAAC;gBACjE,CAAC,EACD,IAAI,EAAC,QAAQ,EACb,SAAS,EAAE,MAAM,CAAC,eAAe,EAAE,sBAAsB,EAAE,oBAAoB,EAAE,oBAAoB,CAAC,EACtG,IAAI,EAAC,WAAW,EAChB,EAAE,EAAC,cAAc,EACjB,KAAK,EAAE,MAAM,CAAC,YAAY,CAAC,GAC7B,EACD,oBAAoB,IAAI,CACrB,6BAAM,MAAM,EAAE,GAAG,CAAC,WAAW,EAAE,SAAS,EAAE,MAAM,CAAC,aAAa,CAAC,EAAE,EAAE,EAAC,2BAA2B,EAAC,MAAM,EAAC,MAAM,gBACzG,+BACI,IAAI,EAAC,QAAQ,EACb,SAAS,EAAE,MAAM,CAAC,eAAe,EAAE,sBAAsB,EAAE,oBAAoB,EAAE,oBAAoB,CAAC,EACtG,EAAE,EAAC,mBAAmB,EACtB,IAAI,EAAC,YAAY,EACjB,KAAK,EAAC,MAAM,gBAEX,MAAM,CAAC,UAAU,CAAC,IACd,IACN,CACV,KACM,CACd,CAAC;AACN,CAAC"}

package/login/pages/WebauthnRegister.d.ts

@@ -1,7 +1,6 @@
 /// <reference types="react" />
 import type { PageProps } from "../../login/pages/PageProps";
 import type { KcContext } from "../KcContext";
-import type { I18n } from "../i18n";
 export default function WebauthnRegister(props: PageProps<Extract<KcContext, {
     pageId: "webauthn-register.ftl";
-}>, I18n>): JSX.Element;
+}>>): JSX.Element;

package/login/pages/WebauthnRegister.js

@@ -1,13 +1,14 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import { useEffect } from "react";
 import { assert } from "tsafe/assert";
-import { clsx } from "../../tools/clsx";
-import { useGetClassName } from "../../login/lib/useGetClassName";
+import { getKcClsx } from "../../login/lib/kcClsx";
 import { useInsertScriptTags } from "../../tools/useInsertScriptTags";
+import { useI18n } from "../i18n";
 export default function WebauthnRegister(props) {
-    const { kcContext, i18n, doUseDefaultCss, Template, classes } = props;
-    const { getClassName } = useGetClassName({ doUseDefaultCss, classes });
+    const { kcContext, doUseDefaultCss, Template, classes } = props;
+    const { kcClsx } = getKcClsx({ doUseDefaultCss, classes });
     const { url, challenge, userid, username, signatureAlgorithms, rpEntityName, rpId, attestationConveyancePreference, authenticatorAttachment, requireResidentKey, userVerificationRequirement, createTimeout, excludeCredentialIds, isSetRetry, isAppInitiatedAction } = kcContext;
+    const i18n = useI18n({ kcContext });
     const { msg, msgStr } = i18n;
     const { insertScriptTags } = useInsertScriptTags({
         componentOrHookName: "WebauthnRegister",
@@ -179,15 +180,15 @@ export default function WebauthnRegister(props) {
     useEffect(() => {
         insertScriptTags();
     }, []);
-    return (_jsxs(Template, Object.assign({}, { kcContext, i18n, doUseDefaultCss, classes }, { headerNode: _jsxs(_Fragment, { children: [_jsx("span", { className: getClassName("kcWebAuthnKeyIcon") }), msg("webauthn-registration-title")] }) }, { children: [_jsx("form", Object.assign({ id: "register", className: getClassName("kcFormClass"), action: url.loginAction, method: "post" }, { children: _jsxs("div", Object.assign({ className: getClassName("kcFormGroupClass") }, { children: [_jsx("input", { type: "hidden", id: "clientDataJSON", name: "clientDataJSON" }), _jsx("input", { type: "hidden", id: "attestationObject", name: "attestationObject" }), _jsx("input", { type: "hidden", id: "publicKeyCredentialId", name: "publicKeyCredentialId" }), _jsx("input", { type: "hidden", id: "authenticatorLabel", name: "authenticatorLabel" }), _jsx("input", { type: "hidden", id: "transports", name: "transports" }), _jsx("input", { type: "hidden", id: "error", name: "error" }), _jsx(LogoutOtherSessions, Object.assign({}, { i18n, getClassName }))] })) })), _jsx("input", { type: "submit", className: clsx(getClassName("kcButtonClass"), getClassName("kcButtonPrimaryClass"), getClassName("kcButtonBlockClass"), getClassName("kcButtonLargeClass")), id: "registerWebAuthn", value: msgStr("doRegisterSecurityKey"), onClick: () => {
+    return (_jsxs(Template, Object.assign({ kcContext: kcContext, doUseDefaultCss: doUseDefaultCss, classes: classes, headerNode: _jsxs(_Fragment, { children: [_jsx("span", { className: kcClsx("kcWebAuthnKeyIcon") }), msg("webauthn-registration-title")] }) }, { children: [_jsx("form", Object.assign({ id: "register", className: kcClsx("kcFormClass"), action: url.loginAction, method: "post" }, { children: _jsxs("div", Object.assign({ className: kcClsx("kcFormGroupClass") }, { children: [_jsx("input", { type: "hidden", id: "clientDataJSON", name: "clientDataJSON" }), _jsx("input", { type: "hidden", id: "attestationObject", name: "attestationObject" }), _jsx("input", { type: "hidden", id: "publicKeyCredentialId", name: "publicKeyCredentialId" }), _jsx("input", { type: "hidden", id: "authenticatorLabel", name: "authenticatorLabel" }), _jsx("input", { type: "hidden", id: "transports", name: "transports" }), _jsx("input", { type: "hidden", id: "error", name: "error" }), _jsx(LogoutOtherSessions, { kcClsx: kcClsx, i18n: i18n })] })) })), _jsx("input", { type: "submit", className: kcClsx("kcButtonClass", "kcButtonPrimaryClass", "kcButtonBlockClass", "kcButtonLargeClass"), id: "registerWebAuthn", value: msgStr("doRegisterSecurityKey"), onClick: () => {
                     assert("registerSecurityKey" in window);
                     assert(typeof window.registerSecurityKey === "function");
                     window.registerSecurityKey();
-                } }), !isSetRetry && isAppInitiatedAction && (_jsx("form", Object.assign({ action: url.loginAction, className: getClassName("kcFormClass"), id: "kc-webauthn-settings-form", method: "post" }, { children: _jsx("button", Object.assign({ type: "submit", className: clsx(getClassName("kcButtonClass"), getClassName("kcButtonDefaultClass"), getClassName("kcButtonBlockClass"), getClassName("kcButtonLargeClass")), id: "cancelWebAuthnAIA", name: "cancel-aia", value: "true" }, { children: msg("doCancel") })) })))] })));
+                } }), !isSetRetry && isAppInitiatedAction && (_jsx("form", Object.assign({ action: url.loginAction, className: kcClsx("kcFormClass"), id: "kc-webauthn-settings-form", method: "post" }, { children: _jsx("button", Object.assign({ type: "submit", className: kcClsx("kcButtonClass", "kcButtonDefaultClass", "kcButtonBlockClass", "kcButtonLargeClass"), id: "cancelWebAuthnAIA", name: "cancel-aia", value: "true" }, { children: msg("doCancel") })) })))] })));
 }
 function LogoutOtherSessions(props) {
-    const { getClassName, i18n } = props;
+    const { kcClsx, i18n } = props;
     const { msg } = i18n;
-    return (_jsx("div", Object.assign({ id: "kc-form-options", className: getClassName("kcFormOptionsClass") }, { children: _jsx("div", Object.assign({ className: getClassName("kcFormOptionsWrapperClass") }, { children: _jsx("div", Object.assign({ className: "checkbox" }, { children: _jsxs("label", { children: [_jsx("input", { type: "checkbox", id: "logout-sessions", name: "logout-sessions", value: "on", defaultChecked: true }), msg("logoutOtherSessions")] }) })) })) })));
+    return (_jsx("div", Object.assign({ id: "kc-form-options", className: kcClsx("kcFormOptionsClass") }, { children: _jsx("div", Object.assign({ className: kcClsx("kcFormOptionsWrapperClass") }, { children: _jsx("div", Object.assign({ className: "checkbox" }, { children: _jsxs("label", { children: [_jsx("input", { type: "checkbox", id: "logout-sessions", name: "logout-sessions", value: "on", defaultChecked: true }), msg("logoutOtherSessions")] }) })) })) })));
 }
 //# sourceMappingURL=WebauthnRegister.js.map

package/login/pages/WebauthnRegister.js.map

@@ -1 +1 @@
-{"version":3,"file":"WebauthnRegister.js","sourceRoot":"","sources":["../../src/login/pages/WebauthnRegister.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"WebauthnRegister.js","sourceRoot":"","sources":["../../src/login/pages/WebauthnRegister.tsx"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "keycloakify",
-    "version": "10.0.0-rc.37",
+    "version": "10.0.0-rc.39",
     "description": "Create Keycloak themes using React",
     "repository": {
         "type": "git",
@@ -139,9 +139,9 @@
         "account/index.d.ts",
         "account/index.js",
         "account/index.js.map",
-        "account/lib/useGetClassName.d.ts",
-        "account/lib/useGetClassName.js",
-        "account/lib/useGetClassName.js.map",
+        "account/lib/kcClsx.d.ts",
+        "account/lib/kcClsx.js",
+        "account/lib/kcClsx.js.map",
         "account/pages/Account.d.ts",
         "account/pages/Account.js",
         "account/pages/Account.js.map",
@@ -169,12 +169,9 @@
         "lib/BASE_URL.d.ts",
         "lib/BASE_URL.js",
         "lib/BASE_URL.js.map",
-        "lib/isStorybook.d.ts",
-        "lib/isStorybook.js",
-        "lib/isStorybook.js.map",
-        "lib/useGetClassName.d.ts",
-        "lib/useGetClassName.js",
-        "lib/useGetClassName.js.map",
+        "lib/getKcClsx.d.ts",
+        "lib/getKcClsx.js",
+        "lib/getKcClsx.js.map",
         "login/Fallback.d.ts",
         "login/Fallback.js",
         "login/Fallback.js.map",
@@ -292,12 +289,12 @@
         "login/index.d.ts",
         "login/index.js",
         "login/index.js.map",
+        "login/lib/kcClsx.d.ts",
+        "login/lib/kcClsx.js",
+        "login/lib/kcClsx.js.map",
         "login/lib/useDownloadTerms.d.ts",
         "login/lib/useDownloadTerms.js",
         "login/lib/useDownloadTerms.js.map",
-        "login/lib/useGetClassName.d.ts",
-        "login/lib/useGetClassName.js",
-        "login/lib/useGetClassName.js.map",
         "login/lib/useUserProfileForm.d.ts",
         "login/lib/useUserProfileForm.js",
         "login/lib/useUserProfileForm.js.map",
@@ -445,7 +442,7 @@
         "src/account/i18n/i18n.tsx",
         "src/account/i18n/index.ts",
         "src/account/index.ts",
-        "src/account/lib/useGetClassName.ts",
+        "src/account/lib/kcClsx.ts",
         "src/account/pages/Account.tsx",
         "src/account/pages/Applications.tsx",
         "src/account/pages/FederatedIdentity.tsx",
@@ -487,11 +484,12 @@
         "src/bin/keycloakify/replacers/replaceImportsInJsCode/webpack.ts",
         "src/bin/main.ts",
         "src/bin/shared/KeycloakVersionRange.ts",
-        "src/bin/shared/buildOptions.ts",
+        "src/bin/shared/buildContext.ts",
         "src/bin/shared/constants.ts",
         "src/bin/shared/copyKeycloakResourcesToPublic.ts",
         "src/bin/shared/downloadKeycloakDefaultTheme.ts",
         "src/bin/shared/downloadKeycloakStaticResources.ts",
+        "src/bin/shared/generateKcGenTs.ts",
         "src/bin/shared/getJarFileBasename.ts",
         "src/bin/shared/getThemeSrcDirPath.ts",
         "src/bin/shared/metaInfKeycloakThemes.ts",
@@ -511,6 +509,7 @@
         "src/bin/tools/downloadAndExtractArchive/downloadAndExtractArchive.ts",
         "src/bin/tools/downloadAndExtractArchive/fetchProxyOptions.ts",
         "src/bin/tools/downloadAndExtractArchive/index.ts",
+        "src/bin/tools/escapeStringForPropertiesFile.ts",
         "src/bin/tools/extractArchive.ts",
         "src/bin/tools/fetchProxyOptions.ts",
         "src/bin/tools/fs.existsAsync.ts",
@@ -529,9 +528,9 @@
         "src/bin/tools/transformCodebase.ts",
         "src/bin/tools/trimIndent.ts",
         "src/bin/tsconfig.json",
+        "src/bin/update-kc-gen.ts",
         "src/lib/BASE_URL.ts",
-        "src/lib/isStorybook.ts",
-        "src/lib/useGetClassName.ts",
+        "src/lib/getKcClsx.ts",
         "src/login/Fallback.tsx",
         "src/login/KcContext/KcContext.ts",
         "src/login/KcContext/getKcContextMock.ts",
@@ -571,8 +570,8 @@
         "src/login/i18n/i18n.tsx",
         "src/login/i18n/index.ts",
         "src/login/index.ts",
+        "src/login/lib/kcClsx.ts",
         "src/login/lib/useDownloadTerms.ts",
-        "src/login/lib/useGetClassName.ts",
         "src/login/lib/useUserProfileForm.tsx",
         "src/login/pages/Code.tsx",
         "src/login/pages/DeleteAccountConfirm.tsx",
@@ -625,6 +624,7 @@
         "src/tools/ValueOf.ts",
         "src/tools/assert.ts",
         "src/tools/clsx.ts",
+        "src/tools/clsx_withTransform.ts",
         "src/tools/deepAssign.ts",
         "src/tools/emailRegExp.ts",
         "src/tools/formatNumber.ts",
@@ -726,6 +726,9 @@
         "tools/clsx.d.ts",
         "tools/clsx.js",
         "tools/clsx.js.map",
+        "tools/clsx_withTransform.d.ts",
+        "tools/clsx_withTransform.js",
+        "tools/clsx_withTransform.js.map",
         "tools/deepAssign.d.ts",
         "tools/deepAssign.js",
         "tools/deepAssign.js.map",
@@ -762,24 +765,26 @@
         "bin/main.js",
         "bin/180.index.js",
         "bin/193.index.js",
+        "bin/214.index.js",
         "bin/246.index.js",
         "bin/3.index.js",
-        "bin/314.index.js",
+        "bin/322.index.js",
         "bin/36.index.js",
         "bin/420.index.js",
-        "bin/430.index.js",
         "bin/453.index.js",
         "bin/480.index.js",
         "bin/509.index.js",
         "bin/525.index.js",
         "bin/526.index.js",
+        "bin/538.index.js",
         "bin/772.index.js",
-        "bin/795.index.js",
         "bin/818.index.js",
-        "bin/890.index.js",
         "bin/932.index.js",
+        "bin/941.index.js",
+        "bin/944.index.js",
         "bin/961.index.js",
         "bin/97.index.js",
+        "bin/98.index.js",
         "bin/shared/constants.js",
         "bin/shared/constants.d.ts",
         "bin/shared/constants.js.map",

package/src/account/Fallback.tsx

@@ -2,7 +2,6 @@ import { lazy, Suspense } from "react";
 import { assert, type Equals } from "tsafe/assert";
 import type { PageProps } from "keycloakify/account/pages/PageProps";
 import type { KcContext } from "./KcContext";
-import type { I18n } from "./i18n";
 
 const Password = lazy(() => import("keycloakify/account/pages/Password"));
 const Account = lazy(() => import("keycloakify/account/pages/Account"));
@@ -12,7 +11,7 @@ const Applications = lazy(() => import("keycloakify/account/pages/Applications")
 const Log = lazy(() => import("keycloakify/account/pages/Log"));
 const FederatedIdentity = lazy(() => import("keycloakify/account/pages/FederatedIdentity"));
 
-export default function Fallback(props: PageProps<KcContext, I18n>) {
+export default function Fallback(props: PageProps<KcContext>) {
     const { kcContext, ...rest } = props;
 
     return (

package/src/account/KcContext/KcContext.ts

@@ -4,20 +4,20 @@ import { assert } from "tsafe/assert";
 import type { Equals } from "tsafe";
 
 export type ExtendKcContext<
-    KcContextExtraProperties extends { properties?: Record<string, string | undefined> },
-    KcContextExtraPropertiesPerPage extends Record<string, Record<string, unknown>>
+    KcContextExtension extends { properties?: Record<string, string | undefined> },
+    KcContextExtensionPerPage extends Record<string, Record<string, unknown>>
 > = ValueOf<{
-    [PageId in keyof KcContextExtraPropertiesPerPage | KcContext["pageId"]]: Extract<
+    [PageId in keyof KcContextExtensionPerPage | KcContext["pageId"]]: Extract<
         KcContext,
         { pageId: PageId }
     > extends never
         ? KcContext.Common &
-              KcContextExtraProperties & {
+              KcContextExtension & {
                   pageId: PageId;
-              } & KcContextExtraPropertiesPerPage[PageId]
+              } & KcContextExtensionPerPage[PageId]
         : Extract<KcContext, { pageId: PageId }> &
-              KcContextExtraProperties &
-              KcContextExtraPropertiesPerPage[PageId];
+              KcContextExtension &
+              KcContextExtensionPerPage[PageId];
 }>;
 
 export type KcContext =

package/src/account/KcContext/getKcContextMock.ts

@@ -7,43 +7,32 @@ import { kcContextMocks, kcContextCommonMock } from "./kcContextMocks";
 import { exclude } from "tsafe/exclude";
 
 export function createGetKcContextMock<
-    KcContextExtraProperties extends { properties?: Record<string, string | undefined> },
-    KcContextExtraPropertiesPerPage extends Record<
-        `${string}.ftl`,
-        Record<string, unknown>
-    >
+    KcContextExtension extends { properties?: Record<string, string | undefined> },
+    KcContextExtensionPerPage extends Record<`${string}.ftl`, Record<string, unknown>>
 >(params: {
-    kcContextExtraProperties: KcContextExtraProperties;
-    kcContextExtraPropertiesPerPage: KcContextExtraPropertiesPerPage;
-    overrides?: DeepPartial<KcContextExtraProperties & KcContextBase.Common>;
+    kcContextExtension: KcContextExtension;
+    kcContextExtensionPerPage: KcContextExtensionPerPage;
+    overrides?: DeepPartial<KcContextExtension & KcContextBase.Common>;
     overridesPerPage?: {
-        [PageId in
-            | AccountThemePageId
-            | keyof KcContextExtraPropertiesPerPage]?: DeepPartial<
+        [PageId in AccountThemePageId | keyof KcContextExtensionPerPage]?: DeepPartial<
             Extract<
-                ExtendKcContext<
-                    KcContextExtraProperties,
-                    KcContextExtraPropertiesPerPage
-                >,
+                ExtendKcContext<KcContextExtension, KcContextExtensionPerPage>,
                 { pageId: PageId }
             >
         >;
     };
 }) {
     const {
-        kcContextExtraProperties,
-        kcContextExtraPropertiesPerPage,
+        kcContextExtension,
+        kcContextExtensionPerPage,
         overrides: overrides_global,
         overridesPerPage: overridesPerPage_global
     } = params;
 
-    type KcContext = ExtendKcContext<
-        KcContextExtraProperties,
-        KcContextExtraPropertiesPerPage
-    >;
+    type KcContext = ExtendKcContext<KcContextExtension, KcContextExtensionPerPage>;
 
     function getKcContextMock<
-        PageId extends AccountThemePageId | keyof KcContextExtraPropertiesPerPage
+        PageId extends AccountThemePageId | keyof KcContextExtensionPerPage
     >(params: {
         pageId: PageId;
         overrides?: DeepPartial<Extract<KcContext, { pageId: PageId }>>;
@@ -58,8 +47,8 @@ export function createGetKcContextMock<
         );
 
         [
-            kcContextExtraProperties,
-            kcContextExtraPropertiesPerPage[pageId],
+            kcContextExtension,
+            kcContextExtensionPerPage[pageId],
             overrides_global,
             overridesPerPage_global?.[pageId],
             overrides

package/src/account/Template.tsx

@@ -1,19 +1,19 @@
 import { useEffect } from "react";
 import { assert } from "keycloakify/tools/assert";
 import { clsx } from "keycloakify/tools/clsx";
-import { useGetClassName } from "keycloakify/account/lib/useGetClassName";
+import { getKcClsx } from "keycloakify/account/lib/kcClsx";
 import { useInsertLinkTags } from "keycloakify/tools/useInsertLinkTags";
 import { useSetClassName } from "keycloakify/tools/useSetClassName";
 import type { TemplateProps } from "keycloakify/account/TemplateProps";
 import type { KcContext } from "./KcContext";
-import type { I18n } from "./i18n";
+import { useI18n } from "./i18n";
 
-export default function Template(props: TemplateProps<KcContext, I18n>) {
-    const { kcContext, i18n, doUseDefaultCss, active, classes, children } = props;
+export default function Template(props: TemplateProps<KcContext>) {
+    const { kcContext, doUseDefaultCss, active, classes, children } = props;
 
-    const { getClassName } = useGetClassName({ doUseDefaultCss, classes });
+    const { kcClsx } = getKcClsx({ doUseDefaultCss, classes });
 
-    const { msg, msgStr, getChangeLocalUrl, labelBySupportedLanguageTag, currentLanguageTag } = i18n;
+    const { msg, msgStr, getChangeLocalUrl, labelBySupportedLanguageTag, currentLanguageTag } = useI18n({ kcContext });
 
     const { locale, url, features, realm, message, referrer } = kcContext;
 
@@ -23,12 +23,12 @@ export default function Template(props: TemplateProps<KcContext, I18n>) {
 
     useSetClassName({
         qualifiedName: "html",
-        className: getClassName("kcHtmlClass")
+        className: kcClsx("kcHtmlClass")
     });
 
     useSetClassName({
         qualifiedName: "body",
-        className: clsx("admin-console", "user", getClassName("kcBodyClass"))
+        className: clsx("admin-console", "user", kcClsx("kcBodyClass"))
     });
 
     useEffect(() => {

package/src/account/TemplateProps.ts

@@ -1,13 +1,8 @@
 import type { ReactNode } from "react";
 import type { KcContext } from "./KcContext";
-import type { I18n } from "./i18n";
 
-export type TemplateProps<
-    KcContext extends KcContext.Common,
-    I18nExtended extends I18n
-> = {
+export type TemplateProps<KcContext extends KcContext.Common> = {
     kcContext: KcContext;
-    i18n: I18nExtended;
     doUseDefaultCss: boolean;
     active: string;
     classes?: Partial<Record<ClassKey, string>>;