keycloakify 10.0.0-rc.110 → 10.0.0-rc.111

package/src/login/i18n/useI18n.tsx

@@ -3,7 +3,7 @@ import { createGetI18n, type GenericI18n_noJsx, type KcContextLike, type Message
 import { GenericI18n } from "./GenericI18n";
 import { Reflect } from "tsafe/Reflect";
 
-export function createUseI18n<MessageKey_themeDefined extends string = never>(messageBundle: {
+export function createUseI18n<MessageKey_themeDefined extends string = never>(messagesByLanguageTag: {
     [languageTag: string]: { [key in MessageKey_themeDefined]: string };
 }) {
     type MessageKey = MessageKey_defaultSet | MessageKey_themeDefined;
@@ -22,15 +22,6 @@ export function createUseI18n<MessageKey_themeDefined extends string = never>(me
                     }}
                 />
             );
-            /*
-            return (
-                <span
-                    dangerouslySetInnerHTML={{
-                        "__html": htmlString
-                    }}
-                />
-            );
-            */
         }
 
         function withJsx(i18n_noJsx: GenericI18n_noJsx<MessageKey>): I18n {
@@ -58,7 +49,7 @@ export function createUseI18n<MessageKey_themeDefined extends string = never>(me
         return { withJsx };
     })();
 
-    const { getI18n } = createGetI18n(messageBundle);
+    const { getI18n } = createGetI18n(messagesByLanguageTag);
 
     function useI18n(params: { kcContext: KcContextLike }): { i18n: I18n } {
         const { kcContext } = params;

package/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 {
-    basenameOfTheKeycloakifyResourcesDir,
-    keycloak_resources,
-    vitePluginSubScriptEnvNames
+    BASENAME_OF_KEYCLOAKIFY_RESOURCES_DIR,
+    KEYCLOAK_RESOURCES,
+    VITE_PLUGIN_SUB_SCRIPTS_ENV_NAMES
 } from "../bin/shared/constants";
 import { id } from "tsafe/id";
 import { rm } from "../bin/tools/fs.rm";
@@ -38,7 +38,7 @@ export function keycloakify(params?: Params) {
 
             run_post_build_script_case: {
                 const envValue =
-                    process.env[vitePluginSubScriptEnvNames.runPostBuildScript];
+                    process.env[VITE_PLUGIN_SUB_SCRIPTS_ENV_NAMES.RUN_POST_BUILD_SCRIPT];
 
                 if (envValue === undefined) {
                     break run_post_build_script_case;
@@ -94,13 +94,13 @@ export function keycloakify(params?: Params) {
 
             resolve_vite_config_case: {
                 const envValue =
-                    process.env[vitePluginSubScriptEnvNames.resolveViteConfig];
+                    process.env[VITE_PLUGIN_SUB_SCRIPTS_ENV_NAMES.RESOLVE_VITE_CONFIG];
 
                 if (envValue === undefined) {
                     break resolve_vite_config_case;
                 }
 
-                console.log(vitePluginSubScriptEnvNames.resolveViteConfig);
+                console.log(VITE_PLUGIN_SUB_SCRIPTS_ENV_NAMES.RESOLVE_VITE_CONFIG);
 
                 console.log(
                     JSON.stringify(
@@ -172,7 +172,7 @@ export function keycloakify(params?: Params) {
                     `(`,
                     `(window.kcContext === undefined || import.meta.env.MODE === "development")?`,
                     `"${urlPathname ?? "/"}":`,
-                    `(window.kcContext.url.resourcesPath + "/${basenameOfTheKeycloakifyResourcesDir}/")`,
+                    `(window.kcContext["x-keycloakify"].resourcesPath + "/${BASENAME_OF_KEYCLOAKIFY_RESOURCES_DIR}/")`,
                     `)`
                 ].join("")
             );
@@ -205,7 +205,7 @@ export function keycloakify(params?: Params) {
 
             assert(buildDirPath !== undefined);
 
-            await rm(pathJoin(buildDirPath, keycloak_resources), {
+            await rm(pathJoin(buildDirPath, KEYCLOAK_RESOURCES), {
                 recursive: true,
                 force: true
             });

package/vite-plugin/index.js

@@ -4136,7 +4136,7 @@ function getBuildContext(params) {
         if (themeSrcDirPath !== undefined) {
             return { themeSrcDirPath };
         }
-        for (const themeType of [...constants.themeTypes, "email"]) {
+        for (const themeType of [...constants.THEME_TYPES, "email"]) {
             if (!external_fs_.existsSync((0,external_path_.join)(srcDirPath, themeType))) {
                 continue;
             }
@@ -4157,12 +4157,12 @@ function getBuildContext(params) {
         }
         const output = external_child_process_namespaceObject.execSync("npx vite", {
             cwd: projectDirPath,
-            env: Object.assign(Object.assign({}, process.env), { [constants.vitePluginSubScriptEnvNames.resolveViteConfig]: "true" })
+            env: Object.assign(Object.assign({}, process.env), { [constants.VITE_PLUGIN_SUB_SCRIPTS_ENV_NAMES.RESOLVE_VITE_CONFIG]: "true" })
         })
             .toString("utf8");
-        (0,assert.assert)(output.includes(constants.vitePluginSubScriptEnvNames.resolveViteConfig), "Seems like the Keycloakify's Vite plugin is not installed.");
+        (0,assert.assert)(output.includes(constants.VITE_PLUGIN_SUB_SCRIPTS_ENV_NAMES.RESOLVE_VITE_CONFIG), "Seems like the Keycloakify's Vite plugin is not installed.");
         const resolvedViteConfigStr = output
-            .split(constants.vitePluginSubScriptEnvNames.resolveViteConfig)
+            .split(constants.VITE_PLUGIN_SUB_SCRIPTS_ENV_NAMES.RESOLVE_VITE_CONFIG)
             .reverse()[0];
         const resolvedViteConfig = JSON.parse(resolvedViteConfigStr);
         return { resolvedViteConfig };
@@ -4445,7 +4445,7 @@ function getBuildContext(params) {
             const getDefaultJarFileBasename = (range) => `keycloak-theme-for-kc-${range}.jar`;
             build_for_specific_keycloak_major_version: {
                 const buildForKeycloakMajorVersionNumber = (() => {
-                    const envValue = process.env[constants.buildForKeycloakMajorVersionEnvName];
+                    const envValue = process.env[constants.BUILD_FOR_KEYCLOAK_MAJOR_VERSION_ENV_NAME];
                     if (envValue === undefined) {
                         return undefined;
                     }
@@ -4635,31 +4635,31 @@ function getBuildContext(params) {
 "use strict";
 __nccwpck_require__.r(__webpack_exports__);
 /* harmony export */ __nccwpck_require__.d(__webpack_exports__, {
-/* harmony export */   "accountThemePageIds": () => (/* binding */ accountThemePageIds),
-/* harmony export */   "accountV1ThemeName": () => (/* binding */ accountV1ThemeName),
-/* harmony export */   "basenameOfTheKeycloakifyResourcesDir": () => (/* binding */ basenameOfTheKeycloakifyResourcesDir),
-/* harmony export */   "buildForKeycloakMajorVersionEnvName": () => (/* binding */ buildForKeycloakMajorVersionEnvName),
-/* harmony export */   "containerName": () => (/* binding */ containerName),
-/* harmony export */   "fallbackLanguageTag": () => (/* binding */ fallbackLanguageTag),
-/* harmony export */   "keycloak_resources": () => (/* binding */ keycloak_resources),
-/* harmony export */   "lastKeycloakVersionWithAccountV1": () => (/* binding */ lastKeycloakVersionWithAccountV1),
-/* harmony export */   "loginThemePageIds": () => (/* binding */ loginThemePageIds),
-/* harmony export */   "resources_common": () => (/* binding */ resources_common),
-/* harmony export */   "themeTypes": () => (/* binding */ themeTypes),
-/* harmony export */   "vitePluginSubScriptEnvNames": () => (/* binding */ vitePluginSubScriptEnvNames)
+/* harmony export */   "ACCOUNT_THEME_PAGE_IDS": () => (/* binding */ ACCOUNT_THEME_PAGE_IDS),
+/* harmony export */   "ACCOUNT_V1_THEME_NAME": () => (/* binding */ ACCOUNT_V1_THEME_NAME),
+/* harmony export */   "BASENAME_OF_KEYCLOAKIFY_RESOURCES_DIR": () => (/* binding */ BASENAME_OF_KEYCLOAKIFY_RESOURCES_DIR),
+/* harmony export */   "BUILD_FOR_KEYCLOAK_MAJOR_VERSION_ENV_NAME": () => (/* binding */ BUILD_FOR_KEYCLOAK_MAJOR_VERSION_ENV_NAME),
+/* harmony export */   "CONTAINER_NAME": () => (/* binding */ CONTAINER_NAME),
+/* harmony export */   "FALLBACK_LANGUAGE_TAG": () => (/* binding */ FALLBACK_LANGUAGE_TAG),
+/* harmony export */   "KEYCLOAK_RESOURCES": () => (/* binding */ KEYCLOAK_RESOURCES),
+/* harmony export */   "LAST_KEYCLOAK_VERSION_WITH_ACCOUNT_V1": () => (/* binding */ LAST_KEYCLOAK_VERSION_WITH_ACCOUNT_V1),
+/* harmony export */   "LOGIN_THEME_PAGE_IDS": () => (/* binding */ LOGIN_THEME_PAGE_IDS),
+/* harmony export */   "RESOURCES_COMMON": () => (/* binding */ RESOURCES_COMMON),
+/* harmony export */   "THEME_TYPES": () => (/* binding */ THEME_TYPES),
+/* harmony export */   "VITE_PLUGIN_SUB_SCRIPTS_ENV_NAMES": () => (/* binding */ VITE_PLUGIN_SUB_SCRIPTS_ENV_NAMES)
 /* harmony export */ });
-const keycloak_resources = "keycloak-resources";
-const resources_common = "resources-common";
-const lastKeycloakVersionWithAccountV1 = "21.1.2";
-const basenameOfTheKeycloakifyResourcesDir = "dist";
-const themeTypes = ["login", "account"];
-const accountV1ThemeName = "account-v1";
-const vitePluginSubScriptEnvNames = {
-    runPostBuildScript: "KEYCLOAKIFY_RUN_POST_BUILD_SCRIPT",
-    resolveViteConfig: "KEYCLOAKIFY_RESOLVE_VITE_CONFIG"
-};
-const buildForKeycloakMajorVersionEnvName = "KEYCLOAKIFY_BUILD_FOR_KEYCLOAK_MAJOR_VERSION";
-const loginThemePageIds = [
+const KEYCLOAK_RESOURCES = "keycloak-resources";
+const RESOURCES_COMMON = "resources-common";
+const LAST_KEYCLOAK_VERSION_WITH_ACCOUNT_V1 = "21.1.2";
+const BASENAME_OF_KEYCLOAKIFY_RESOURCES_DIR = "dist";
+const THEME_TYPES = ["login", "account"];
+const ACCOUNT_V1_THEME_NAME = "account-v1";
+const VITE_PLUGIN_SUB_SCRIPTS_ENV_NAMES = {
+    RUN_POST_BUILD_SCRIPT: "KEYCLOAKIFY_RUN_POST_BUILD_SCRIPT",
+    RESOLVE_VITE_CONFIG: "KEYCLOAKIFY_RESOLVE_VITE_CONFIG"
+};
+const BUILD_FOR_KEYCLOAK_MAJOR_VERSION_ENV_NAME = "KEYCLOAKIFY_BUILD_FOR_KEYCLOAK_MAJOR_VERSION";
+const LOGIN_THEME_PAGE_IDS = [
     "login.ftl",
     "login-username.ftl",
     "login-password.ftl",
@@ -4695,7 +4695,7 @@ const loginThemePageIds = [
     "login-x509-info.ftl",
     "webauthn-error.ftl"
 ];
-const accountThemePageIds = [
+const ACCOUNT_THEME_PAGE_IDS = [
     "password.ftl",
     "account.ftl",
     "sessions.ftl",
@@ -4704,8 +4704,8 @@ const accountThemePageIds = [
     "log.ftl",
     "federatedIdentity.ftl"
 ];
-const containerName = "keycloak-keycloakify";
-const fallbackLanguageTag = "en";
+const CONTAINER_NAME = "keycloak-keycloakify";
+const FALLBACK_LANGUAGE_TAG = "en";
 //# sourceMappingURL=constants.js.map
 
 /***/ }),
@@ -5119,7 +5119,7 @@ async function downloadKeycloakDefaultTheme(params) {
                 return;
             }
             last_account_v1_transformations: {
-                if (constants.lastKeycloakVersionWithAccountV1 !== keycloakVersion) {
+                if (constants.LAST_KEYCLOAK_VERSION_WITH_ACCOUNT_V1 !== keycloakVersion) {
                     break last_account_v1_transformations;
                 }
                 skip_web_modules: {
@@ -5255,7 +5255,7 @@ async function downloadKeycloakStaticResources(params) {
     });
     transformCodebase({
         srcDirPath: (0,external_path_.join)(defaultThemeDirPath, "keycloak", "common", "resources"),
-        destDirPath: (0,external_path_.join)(resourcesDirPath, constants.resources_common)
+        destDirPath: (0,external_path_.join)(resourcesDirPath, constants.RESOURCES_COMMON)
     });
 }
 //# sourceMappingURL=downloadKeycloakStaticResources.js.map
@@ -5299,7 +5299,7 @@ function readThisNpmPackageVersion() {
 (0,assert.assert)();
 async function copyKeycloakResourcesToPublic(params) {
     const { buildContext } = params;
-    const destDirPath = (0,external_path_.join)(buildContext.publicDirPath, constants.keycloak_resources);
+    const destDirPath = (0,external_path_.join)(buildContext.publicDirPath, constants.KEYCLOAK_RESOURCES);
     const keycloakifyBuildinfoFilePath = (0,external_path_.join)(destDirPath, "keycloakify.buildinfo");
     const keycloakifyBuildinfoRaw = JSON.stringify({
         destDirPath,
@@ -5324,14 +5324,14 @@ async function copyKeycloakResourcesToPublic(params) {
     rmSync(destDirPath, { force: true, recursive: true });
     external_fs_.mkdirSync(destDirPath, { recursive: true });
     external_fs_.writeFileSync((0,external_path_.join)(destDirPath, ".gitignore"), Buffer.from("*", "utf8"));
-    for (const themeType of constants.themeTypes) {
+    for (const themeType of constants.THEME_TYPES) {
         await downloadKeycloakStaticResources({
             keycloakVersion: (() => {
                 switch (themeType) {
                     case "login":
                         return buildContext.loginThemeResourcesFromKeycloakVersion;
                     case "account":
-                        return constants.lastKeycloakVersionWithAccountV1;
+                        return constants.LAST_KEYCLOAK_VERSION_WITH_ACCOUNT_V1;
                 }
             })(),
             themeType,
@@ -5669,7 +5669,7 @@ function keycloakify(params) {
         configResolved: async (resolvedConfig) => {
             shouldGenerateSourcemap = resolvedConfig.build.sourcemap !== false;
             run_post_build_script_case: {
-                const envValue = process.env[constants_1.vitePluginSubScriptEnvNames.runPostBuildScript];
+                const envValue = process.env[constants_1.VITE_PLUGIN_SUB_SCRIPTS_ENV_NAMES.RUN_POST_BUILD_SCRIPT];
                 if (envValue === undefined) {
                     break run_post_build_script_case;
                 }
@@ -5704,11 +5704,11 @@ function keycloakify(params) {
             })();
             buildDirPath = (0, path_1.join)(projectDirPath, resolvedConfig.build.outDir);
             resolve_vite_config_case: {
-                const envValue = process.env[constants_1.vitePluginSubScriptEnvNames.resolveViteConfig];
+                const envValue = process.env[constants_1.VITE_PLUGIN_SUB_SCRIPTS_ENV_NAMES.RESOLVE_VITE_CONFIG];
                 if (envValue === undefined) {
                     break resolve_vite_config_case;
                 }
-                console.log(constants_1.vitePluginSubScriptEnvNames.resolveViteConfig);
+                console.log(constants_1.VITE_PLUGIN_SUB_SCRIPTS_ENV_NAMES.RESOLVE_VITE_CONFIG);
                 console.log(JSON.stringify((0, id_1.id)({
                     publicDir: (0, path_1.relative)(projectDirPath, resolvedConfig.publicDir),
                     assetsDir: resolvedConfig.build.assetsDir,
@@ -5757,7 +5757,7 @@ function keycloakify(params) {
                 `(`,
                 `(window.kcContext === undefined || import.meta.env.MODE === "development")?`,
                 `"${urlPathname !== null && urlPathname !== void 0 ? urlPathname : "/"}":`,
-                `(window.kcContext.url.resourcesPath + "/${constants_1.basenameOfTheKeycloakifyResourcesDir}/")`,
+                `(window.kcContext["x-keycloakify"].resourcesPath + "/${constants_1.BASENAME_OF_KEYCLOAKIFY_RESOURCES_DIR}/")`,
                 `)`
             ].join(""));
             if (!transformedCode.hasChanged()) {
@@ -5782,7 +5782,7 @@ function keycloakify(params) {
                 return;
             }
             (0, assert_1.assert)(buildDirPath !== undefined);
-            await (0, fs_rm_1.rm)((0, path_1.join)(buildDirPath, constants_1.keycloak_resources), {
+            await (0, fs_rm_1.rm)((0, path_1.join)(buildDirPath, constants_1.KEYCLOAK_RESOURCES), {
                 recursive: true,
                 force: true
             });