keycloakify 9.6.7 → 10.0.0-rc.1

package/bin/keycloakify/buildOptions/buildOptions.d.ts

@@ -7,7 +7,6 @@ export type BuildOptions = {
     extraThemeProperties: string[] | undefined;
     groupId: string;
     artifactId: string;
-    doCreateJar: boolean;
     loginThemeResourcesFromKeycloakVersion: string;
     reactAppRootDirPath: string;
     reactAppBuildDirPath: string;
@@ -19,7 +18,6 @@ export type BuildOptions = {
      * In this case the urlPathname will be "/my-app/" */
     urlPathname: string | undefined;
     assetsDirPath: string;
-    doBuildRetrocompatAccountTheme: boolean;
     npmWorkspaceRootDirPath: string;
 };
 export declare function readBuildOptions(params: {

package/bin/keycloakify/buildOptions/buildOptions.js

@@ -60,7 +60,7 @@ var getCacheDirPath_1 = require("./getCacheDirPath");
 var getReactAppRootDirPath_1 = require("./getReactAppRootDirPath");
 var getNpmWorkspaceRootDirPath_1 = require("./getNpmWorkspaceRootDirPath");
 function readBuildOptions(params) {
-    var _a, _b, _c, _d, _e, _f, _g;
+    var _a, _b, _c, _d, _e;
     var processArgv = params.processArgv;
     var reactAppRootDirPath = (0, getReactAppRootDirPath_1.getReactAppRootDirPath)({ processArgv: processArgv }).reactAppRootDirPath;
     var cacheDirPath = (0, getCacheDirPath_1.getCacheDirPath)({ reactAppRootDirPath: reactAppRootDirPath }).cacheDirPath;
@@ -68,7 +68,7 @@ function readBuildOptions(params) {
     if (resolvedViteConfig === undefined && fs.existsSync((0, path_1.join)(reactAppRootDirPath, "vite.config.ts"))) {
         throw new Error("Keycloakify's Vite plugin output not found");
     }
-    var _h = (0, parsedPackageJson_1.readParsedPackageJson)({ reactAppRootDirPath: reactAppRootDirPath }), userProvidedBuildOptionsFromPackageJson = _h.keycloakify, parsedPackageJson = __rest(_h, ["keycloakify"]);
+    var _f = (0, parsedPackageJson_1.readParsedPackageJson)({ reactAppRootDirPath: reactAppRootDirPath }), userProvidedBuildOptionsFromPackageJson = _f.keycloakify, parsedPackageJson = __rest(_f, ["keycloakify"]);
     var userProvidedBuildOptions = __assign(__assign({}, userProvidedBuildOptionsFromPackageJson), resolvedViteConfig === null || resolvedViteConfig === void 0 ? void 0 : resolvedViteConfig.userProvidedBuildOptions);
     var themeNames = (function () {
         if (userProvidedBuildOptions.themeName === undefined) {
@@ -116,8 +116,7 @@ function readBuildOptions(params) {
                     .host) === null || _c === void 0 ? void 0 : _c.replace(/:[0-9]+$/, "")) === null || _d === void 0 ? void 0 : _d.split(".").reverse().join(".")) !== null && _e !== void 0 ? _e : fallbackGroupId) + ".keycloak");
         })(),
         "artifactId": (_d = (_c = process.env.KEYCLOAKIFY_ARTIFACT_ID) !== null && _c !== void 0 ? _c : userProvidedBuildOptions.artifactId) !== null && _d !== void 0 ? _d : "".concat(themeNames[0], "-keycloak-theme"),
-        "doCreateJar": (_e = userProvidedBuildOptions.doCreateJar) !== null && _e !== void 0 ? _e : true,
-        "loginThemeResourcesFromKeycloakVersion": (_f = userProvidedBuildOptions.loginThemeResourcesFromKeycloakVersion) !== null && _f !== void 0 ? _f : "11.0.3",
+        "loginThemeResourcesFromKeycloakVersion": (_e = userProvidedBuildOptions.loginThemeResourcesFromKeycloakVersion) !== null && _e !== void 0 ? _e : "24.0.4",
         reactAppRootDirPath: reactAppRootDirPath,
         reactAppBuildDirPath: reactAppBuildDirPath,
         "keycloakifyBuildDirPath": (function () {
@@ -172,7 +171,6 @@ function readBuildOptions(params) {
             }
             return (0, path_1.join)(reactAppBuildDirPath, resolvedViteConfig.assetsDir);
         })(),
-        "doBuildRetrocompatAccountTheme": (_g = userProvidedBuildOptions.doBuildRetrocompatAccountTheme) !== null && _g !== void 0 ? _g : true,
         npmWorkspaceRootDirPath: npmWorkspaceRootDirPath
     };
 }

package/bin/keycloakify/buildOptions/buildOptions.js.map

@@ -1 +1 @@
-{"version":3,"file":"buildOptions.js","sourceRoot":"","sources":["../../../src/bin/keycloakify/buildOptions/buildOptions.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"buildOptions.js","sourceRoot":"","sources":["../../../src/bin/keycloakify/buildOptions/buildOptions.ts"],"names":[],"mappings":"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"}

package/bin/keycloakify/generateFtl/ftl_object_to_js_code_declaring_an_object.ftl

@@ -30,30 +30,19 @@
                 <#list fieldNames as fieldName>
                     if(fieldName === "${fieldName}" ){
 
-                        <#-- https://github.com/keycloakify/keycloakify/pull/359 Compat with Keycloak prior v12 -->
-                        <#if !messagesPerField.existsError??>
+                        <#-- https://github.com/keycloakify/keycloakify/pull/218 -->
+                        <#if ('${fieldName}' == 'username' || '${fieldName}' == 'password') && pageId != 'register.ftl' && pageId != 'register-user-profile.ftl'>
 
-                            <#-- https://github.com/keycloakify/keycloakify/pull/218 -->
-                            <#if ('${fieldName}' == 'username' || '${fieldName}' == 'password') && pageId != 'register.ftl' && pageId != 'register-user-profile.ftl'>
-
-                                <#assign doExistMessageForUsernameOrPassword = "">
+                            <#assign doExistErrorOnUsernameOrPassword = "">
 
-                                <#attempt>
-                                    <#assign doExistMessageForUsernameOrPassword = messagesPerField.exists('username')>
-                                <#recover>
-                                    <#assign doExistMessageForUsernameOrPassword = true>
-                                </#attempt>
-
-                                <#if !doExistMessageForUsernameOrPassword>
-                                    <#attempt>
-                                        <#assign doExistMessageForUsernameOrPassword = messagesPerField.exists('password')>
-                                    <#recover>
-                                        <#assign doExistMessageForUsernameOrPassword = true>
-                                    </#attempt>
-                                </#if>
-
-                                return <#if doExistMessageForUsernameOrPassword>text<#else>undefined</#if>;
+                            <#attempt>
+                                <#assign doExistErrorOnUsernameOrPassword = messagesPerField.existsError('username', 'password')>
+                            <#recover>
+                                <#assign doExistErrorOnUsernameOrPassword = true>
+                            </#attempt>
 
+                            <#if doExistErrorOnUsernameOrPassword>
+                                return text;
                             <#else>
 
                                 <#assign doExistMessageForField = "">
@@ -70,49 +59,19 @@
 
                         <#else>
 
-                            <#-- https://github.com/keycloakify/keycloakify/pull/218 -->
-                            <#if ('${fieldName}' == 'username' || '${fieldName}' == 'password') && pageId != 'register.ftl' && pageId != 'register-user-profile.ftl'>
-
-                                <#assign doExistErrorOnUsernameOrPassword = "">
-
-                                <#attempt>
-                                    <#assign doExistErrorOnUsernameOrPassword = messagesPerField.existsError('username', 'password')>
-                                <#recover>
-                                    <#assign doExistErrorOnUsernameOrPassword = true>
-                                </#attempt>
-
-                                <#if doExistErrorOnUsernameOrPassword>
-                                    return text;
-                                <#else>
-
-                                    <#assign doExistMessageForField = "">
-
-                                    <#attempt>
-                                        <#assign doExistMessageForField = messagesPerField.exists('${fieldName}')>
-                                    <#recover>
-                                        <#assign doExistMessageForField = true>
-                                    </#attempt>
+                            <#assign doExistMessageForField = "">
 
-                                    return <#if doExistMessageForField>text<#else>undefined</#if>;
+                            <#attempt>
+                                <#assign doExistMessageForField = messagesPerField.exists('${fieldName}')>
+                            <#recover>
+                                <#assign doExistMessageForField = true>
+                            </#attempt>
 
-                                </#if>
-
-                            <#else>
-
-                                <#assign doExistMessageForField = "">
-
-                                <#attempt>
-                                    <#assign doExistMessageForField = messagesPerField.exists('${fieldName}')>
-                                <#recover>
-                                    <#assign doExistMessageForField = true>
-                                </#attempt>
-
-                                return <#if doExistMessageForField>text<#else>undefined</#if>;
-
-                            </#if>
+                            return <#if doExistMessageForField>text<#else>undefined</#if>;
 
                         </#if>
 
+
                     }
                 </#list>
 
@@ -120,53 +79,15 @@
             </#if>
 
         },
-        "existsError": function (fieldName) {
+        "existsError": function (){
 
-            <#if !messagesPerField?? || !(messagesPerField?is_hash)>   
-                throw new Error("You're not supposed to use messagesPerField.printIfExists in this page");
-            <#else>
-                <#list fieldNames as fieldName>
-                    if(fieldName === "${fieldName}" ){
+            function existsError_singleFieldName(fieldName) {
 
-                        <#-- https://github.com/keycloakify/keycloakify/pull/359 Compat with Keycloak prior v12 -->
-                        <#if !messagesPerField.existsError??>
-
-                            <#-- https://github.com/keycloakify/keycloakify/pull/218 -->
-                            <#if ('${fieldName}' == 'username' || '${fieldName}' == 'password') && pageId != 'register.ftl' && pageId != 'register-user-profile.ftl'>
-
-                                <#assign doExistMessageForUsernameOrPassword = "">
-
-                                <#attempt>
-                                    <#assign doExistMessageForUsernameOrPassword = messagesPerField.exists('username')>
-                                <#recover>
-                                    <#assign doExistMessageForUsernameOrPassword = true>
-                                </#attempt>
-
-                                <#if !doExistMessageForUsernameOrPassword>
-                                    <#attempt>
-                                        <#assign doExistMessageForUsernameOrPassword = messagesPerField.exists('password')>
-                                    <#recover>
-                                        <#assign doExistMessageForUsernameOrPassword = true>
-                                    </#attempt>
-                                </#if>
-
-                                return <#if doExistMessageForUsernameOrPassword>true<#else>false</#if>;
-
-                            <#else>
-
-                                <#assign doExistMessageForField = "">
-
-                                <#attempt>
-                                    <#assign doExistMessageForField = messagesPerField.exists('${fieldName}')>
-                                <#recover>
-                                    <#assign doExistMessageForField = true>
-                                </#attempt>
-
-                                return <#if doExistMessageForField>true<#else>false</#if>;
-
-                            </#if>
-
-                        <#else>
+                <#if !messagesPerField?? || !(messagesPerField?is_hash)>   
+                    throw new Error("You're not supposed to use messagesPerField.printIfExists in this page");
+                <#else>
+                    <#list fieldNames as fieldName>
+                        if(fieldName === "${fieldName}" ){
 
                             <#-- https://github.com/keycloakify/keycloakify/pull/218 -->
                             <#if ('${fieldName}' == 'username' || '${fieldName}' == 'password') && pageId != 'register.ftl' && pageId != 'register-user-profile.ftl'>
@@ -195,14 +116,24 @@
 
                             </#if>
 
-                        </#if>
+                        }
+                    </#list>
 
-                    }
-                </#list>
+                    throw new Error(fieldName + "is probably runtime generated, see: https://docs.keycloakify.dev/limitations#field-names-cant-be-runtime-generated");
 
-                throw new Error(fieldName + "is probably runtime generated, see: https://docs.keycloakify.dev/limitations#field-names-cant-be-runtime-generated");
+                </#if>
 
-            </#if>
+            }
+
+            for( let i = 0; i < arguments.length; i++ ){
+
+                if( existsError_singleFieldName(arguments[i]) ){
+                    return true;
+                }
+
+            }
+
+            return false;
 
         },
         "get": function (fieldName) {
@@ -214,88 +145,42 @@
                 <#list fieldNames as fieldName>
                     if(fieldName === "${fieldName}" ){
 
-                        <#-- https://github.com/keycloakify/keycloakify/pull/359 Compat with Keycloak prior v12 -->
-                        <#if !messagesPerField.existsError??>
+                        <#-- https://github.com/keycloakify/keycloakify/pull/218 -->
+                        <#if ('${fieldName}' == 'username' || '${fieldName}' == 'password') && pageId != 'register.ftl' && pageId != 'register-user-profile.ftl'>
 
-                            <#-- https://github.com/keycloakify/keycloakify/pull/218 -->
-                            <#if ('${fieldName}' == 'username' || '${fieldName}' == 'password') && pageId != 'register.ftl' && pageId != 'register-user-profile.ftl'>
+                            <#assign doExistErrorOnUsernameOrPassword = "">
 
-                                <#assign doExistMessageForUsernameOrPassword = "">
+                            <#attempt>
+                                <#assign doExistErrorOnUsernameOrPassword = messagesPerField.existsError('username', 'password')>
+                            <#recover>
+                                <#assign doExistErrorOnUsernameOrPassword = true>
+                            </#attempt>
+
+                            <#if doExistErrorOnUsernameOrPassword>
 
                                 <#attempt>
-                                    <#assign doExistMessageForUsernameOrPassword = messagesPerField.exists('username')>
+                                    return "${kcSanitize(msg('invalidUserMessage'))?no_esc}";
                                 <#recover>
-                                    <#assign doExistMessageForUsernameOrPassword = true>
+                                    return "Invalid username or password.";
                                 </#attempt>
 
-                                <#if !doExistMessageForUsernameOrPassword>
-                                    <#attempt>
-                                        <#assign doExistMessageForUsernameOrPassword = messagesPerField.exists('password')>
-                                    <#recover>
-                                        <#assign doExistMessageForUsernameOrPassword = true>
-                                    </#attempt>
-                                </#if>
-
-                                <#if !doExistMessageForUsernameOrPassword>
-                                    return "";
-                                <#else>
-                                    <#attempt>
-                                        return "${kcSanitize(msg('invalidUserMessage'))?no_esc}";
-                                    <#recover>
-                                        return "Invalid username or password.";
-                                    </#attempt>
-                                </#if>
-
                             <#else>
 
                                 <#attempt>
                                     return "${messagesPerField.get('${fieldName}')?no_esc}";
                                 <#recover>
-                                    return "invalid field";
+                                    return "";
                                 </#attempt>
 
                             </#if>
 
                         <#else>
 
-                            <#-- https://github.com/keycloakify/keycloakify/pull/218 -->
-                            <#if ('${fieldName}' == 'username' || '${fieldName}' == 'password') && pageId != 'register.ftl' && pageId != 'register-user-profile.ftl'>
-
-                                <#assign doExistErrorOnUsernameOrPassword = "">
-
-                                <#attempt>
-                                    <#assign doExistErrorOnUsernameOrPassword = messagesPerField.existsError('username', 'password')>
-                                <#recover>
-                                    <#assign doExistErrorOnUsernameOrPassword = true>
-                                </#attempt>
-
-                                <#if doExistErrorOnUsernameOrPassword>
-
-                                    <#attempt>
-                                        return "${kcSanitize(msg('invalidUserMessage'))?no_esc}";
-                                    <#recover>
-                                        return "Invalid username or password.";
-                                    </#attempt>
-
-                                <#else>
-
-                                    <#attempt>
-                                        return "${messagesPerField.get('${fieldName}')?no_esc}";
-                                    <#recover>
-                                        return "";
-                                    </#attempt>
-
-                                </#if>
-
-                            <#else>
-
-                                <#attempt>
-                                    return "${messagesPerField.get('${fieldName}')?no_esc}";
-                                <#recover>
-                                    return "invalid field";
-                                </#attempt>
-
-                            </#if>
+                            <#attempt>
+                                return "${messagesPerField.get('${fieldName}')?no_esc}";
+                            <#recover>
+                                return "invalid field";
+                            </#attempt>
 
                         </#if>
 
@@ -315,72 +200,30 @@
                 <#list fieldNames as fieldName>
                     if(fieldName === "${fieldName}" ){
 
-                        <#-- https://github.com/keycloakify/keycloakify/pull/359 Compat with Keycloak prior v12 -->
-                        <#if !messagesPerField.existsError??>
-
-                            <#-- https://github.com/keycloakify/keycloakify/pull/218 -->
-                            <#if ('${fieldName}' == 'username' || '${fieldName}' == 'password') && pageId != 'register.ftl' && pageId != 'register-user-profile.ftl'>
-
-                                <#assign doExistMessageForUsernameOrPassword = "">
-
-                                <#attempt>
-                                    <#assign doExistMessageForUsernameOrPassword = messagesPerField.exists('username')>
-                                <#recover>
-                                    <#assign doExistMessageForUsernameOrPassword = true>
-                                </#attempt>
-
-                                <#if !doExistMessageForUsernameOrPassword>
-                                    <#attempt>
-                                        <#assign doExistMessageForUsernameOrPassword = messagesPerField.exists('password')>
-                                    <#recover>
-                                        <#assign doExistMessageForUsernameOrPassword = true>
-                                    </#attempt>
-                                </#if>
-
-                                return <#if doExistMessageForUsernameOrPassword>true<#else>false</#if>;
-
-                            <#else>
-
-                                <#assign doExistMessageForField = "">
+                        <#-- https://github.com/keycloakify/keycloakify/pull/218 -->
+                        <#if ('${fieldName}' == 'username' || '${fieldName}' == 'password') && pageId != 'register.ftl' && pageId != 'register-user-profile.ftl'>
 
-                                <#attempt>
-                                    <#assign doExistMessageForField = messagesPerField.exists('${fieldName}')>
-                                <#recover>
-                                    <#assign doExistMessageForField = true>
-                                </#attempt>
+                            <#assign doExistErrorOnUsernameOrPassword = "">
 
-                                return <#if doExistMessageForField>true<#else>false</#if>;
+                            <#attempt>
+                                <#assign doExistErrorOnUsernameOrPassword = messagesPerField.existsError('username', 'password')>
+                            <#recover>
+                                <#assign doExistErrorOnUsernameOrPassword = true>
+                            </#attempt>
 
-                            </#if>
+                            return <#if doExistErrorOnUsernameOrPassword>true<#else>false</#if>;
 
                         <#else>
 
-                            <#-- https://github.com/keycloakify/keycloakify/pull/218 -->
-                            <#if ('${fieldName}' == 'username' || '${fieldName}' == 'password') && pageId != 'register.ftl' && pageId != 'register-user-profile.ftl'>
+                            <#assign doExistErrorMessageForField = "">
 
-                                <#assign doExistErrorOnUsernameOrPassword = "">
+                            <#attempt>
+                                <#assign doExistErrorMessageForField = messagesPerField.exists('${fieldName}')>
+                            <#recover>
+                                <#assign doExistErrorMessageForField = true>
+                            </#attempt>
 
-                                <#attempt>
-                                    <#assign doExistErrorOnUsernameOrPassword = messagesPerField.existsError('username', 'password')>
-                                <#recover>
-                                    <#assign doExistErrorOnUsernameOrPassword = true>
-                                </#attempt>
-
-                                return <#if doExistErrorOnUsernameOrPassword>true<#else>false</#if>;
-
-                            <#else>
-
-                                <#assign doExistErrorMessageForField = "">
-
-                                <#attempt>
-                                    <#assign doExistErrorMessageForField = messagesPerField.exists('${fieldName}')>
-                                <#recover>
-                                    <#assign doExistErrorMessageForField = true>
-                                </#attempt>
-
-                                return <#if doExistErrorMessageForField>true<#else>false</#if>;
-
-                            </#if>
+                            return <#if doExistErrorMessageForField>true<#else>false</#if>;
 
                         </#if>
 
@@ -390,6 +233,19 @@
                 throw new Error(fieldName + "is probably runtime generated, see: https://docs.keycloakify.dev/limitations#field-names-cant-be-runtime-generated");
             </#if>
 
+        },
+        "getFirstError": function () {
+
+            for( let i = 0; i < arguments.length; i++ ){
+
+                const fieldName = arguments[i];
+
+                if( out.messagesPerField.existsError(fieldName) ){
+                    return out.messagesPerField.get(fieldName);
+                }
+
+            }
+
         }
     };
 
@@ -505,6 +361,10 @@
                         <#-- See: https://github.com/keycloakify/keycloakify/issues/534 -->
                         are_same_path(path, ["login"]) &&
                         key == "password"
+                    ) || (
+                        <#-- Remove realmAttributes added by https://github.com/jcputney/keycloak-theme-additional-info-extension for peace of mind. -->
+                        are_same_path(path, []) &&
+                        key == "realmAttributes"
                     )
                 >
                     <#local out_seq += ["/*If you need '" + path?join(".") + "." + key + "' on " + pageId + ", please submit an issue to the Keycloakify repo*/"]>
@@ -513,7 +373,7 @@
 
                 <#-- https://github.com/keycloakify/keycloakify/discussions/406 -->
                 <#if (
-                    ["register.ftl", "info.ftl", "login.ftl", "login-update-password.ftl", "login-oauth2-device-verify-user-code.ftl"]?seq_contains(pageId) && 
+                    ["register.ftl", "register-user-profile.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>
@@ -523,7 +383,7 @@
                             <#continue>
                         </#if>
                     <#recover>
-                        <#local out_seq += ["/*Testing if attemptedUsername should be skipped throwed an exception */"]>
+                        <#local out_seq += ["/*Accessing attemptedUsername throwed an exception */"]>
                     </#attempt>
                 </#if>
                 
@@ -668,12 +528,23 @@
             <#return '"' + object?datetime?iso_utc + '"'>
         </#if>
 
+        <#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 enumerable object">
+        <#return "ABORT: Couldn't convert into string non hash, non method, non boolean, non number, non enumerable object">
 
 </#function>
 <#function is_subpath path searchedPath>

package/bin/keycloakify/generateFtl/generateFtl.js

@@ -1,15 +1,4 @@
 "use strict";
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     var desc = Object.getOwnPropertyDescriptor(m, k);
@@ -60,7 +49,6 @@ var replaceImportsInCssCode_1 = require("../replacers/replaceImportsInCssCode");
 var replaceImportsInInlineCssCode_1 = require("../replacers/replaceImportsInInlineCssCode");
 var fs = __importStar(require("fs"));
 var path_1 = require("path");
-var objectKeys_1 = require("tsafe/objectKeys");
 var assert_1 = require("tsafe/assert");
 var constants_1 = require("../../constants");
 (0, assert_1.assert)();
@@ -126,32 +114,18 @@ function generateFtlFilesCodeFactory(params) {
         }
     }
     //FTL is no valid html, we can't insert with cheerio, we put placeholder for injecting later.
-    var replaceValueBySearchValue = {
-        '{ "x": "vIdLqMeOed9sdLdIdOxdK0d" }': fs
-            .readFileSync((0, path_1.join)(__dirname, "ftl_object_to_js_code_declaring_an_object.ftl"))
-            .toString("utf8")
-            .match(/^<script>const _=((?:.|\n)+)<\/script>[\n]?$/)[1]
-            .replace("FIELD_NAMES_eKsIY4ZsZ4xeM", fieldNames.map(function (name) { return "\"".concat(name, "\""); }).join(", "))
-            .replace("KEYCLOAKIFY_VERSION_xEdKd3xEdr", keycloakifyVersion)
-            .replace("KEYCLOAKIFY_THEME_VERSION_sIgKd3xEdr3dx", buildOptions.themeVersion)
-            .replace("KEYCLOAKIFY_THEME_TYPE_dExKd3xEdr", themeType)
-            .replace("KEYCLOAKIFY_THEME_NAME_cXxKd3xEer", themeName)
-            .replace("RESOURCES_COMMON_cLsLsMrtDkpVv", constants_1.resources_common),
-        "<!-- xIdLqMeOedErIdLsPdNdI9dSlxI -->": [
-            "<#if scripts??>",
-            "    <#list scripts as script>",
-            '        <script src="${script}" type="text/javascript"></script>',
-            "    </#list>",
-            "</#if>"
-        ].join("\n")
-    };
-    $("head").prepend([
-        "<script>",
-        "    window.".concat(constants_1.nameOfTheGlobal, "= ").concat((0, objectKeys_1.objectKeys)(replaceValueBySearchValue)[0], ";"),
-        "</script>",
-        "",
-        (0, objectKeys_1.objectKeys)(replaceValueBySearchValue)[1]
-    ].join("\n"));
+    var ftlObjectToJsCodeDeclaringAnObject = fs
+        .readFileSync((0, path_1.join)(__dirname, "ftl_object_to_js_code_declaring_an_object.ftl"))
+        .toString("utf8")
+        .match(/^<script>const _=((?:.|\n)+)<\/script>[\n]?$/)[1]
+        .replace("FIELD_NAMES_eKsIY4ZsZ4xeM", fieldNames.map(function (name) { return "\"".concat(name, "\""); }).join(", "))
+        .replace("KEYCLOAKIFY_VERSION_xEdKd3xEdr", keycloakifyVersion)
+        .replace("KEYCLOAKIFY_THEME_VERSION_sIgKd3xEdr3dx", buildOptions.themeVersion)
+        .replace("KEYCLOAKIFY_THEME_TYPE_dExKd3xEdr", themeType)
+        .replace("KEYCLOAKIFY_THEME_NAME_cXxKd3xEer", themeName)
+        .replace("RESOURCES_COMMON_cLsLsMrtDkpVv", constants_1.resources_common);
+    var ftlObjectToJsCodeDeclaringAnObjectPlaceholder = '{ "x": "vIdLqMeOed9sdLdIdOxdK0d" }';
+    $("head").prepend(["<script>", "    window.".concat(constants_1.nameOfTheGlobal, "= ").concat(ftlObjectToJsCodeDeclaringAnObjectPlaceholder, ";"), "</script>"].join("\n"));
     // Remove part of the document marked as ignored.
     {
         var startTags = $('meta[name="keycloakify-ignore-start"]');
@@ -176,10 +150,14 @@ function generateFtlFilesCodeFactory(params) {
     }
     var partiallyFixedIndexHtmlCode = $.html();
     function generateFtlFilesCode(params) {
+        var _a;
         var pageId = params.pageId;
         var $ = cheerio_1.default.load(partiallyFixedIndexHtmlCode);
         var ftlCode = $.html();
-        Object.entries(__assign(__assign({}, replaceValueBySearchValue), { "PAGE_ID_xIgLsPgGId9D8e": pageId })).map(function (_a) {
+        Object.entries((_a = {},
+            _a[ftlObjectToJsCodeDeclaringAnObjectPlaceholder] = ftlObjectToJsCodeDeclaringAnObject,
+            _a["PAGE_ID_xIgLsPgGId9D8e"] = pageId,
+            _a)).map(function (_a) {
             var _b = __read(_a, 2), searchValue = _b[0], replaceValue = _b[1];
             return (ftlCode = ftlCode.replace(searchValue, replaceValue));
         });