Update dependency powerhooks to ^0.21.0

Pr/lordvlad/221

package.json

@@ -1,6 +1,6 @@
 {
     "name": "keycloakify",
-    "version": "6.8.6",
+    "version": "6.8.13",
     "description": "Keycloak theme generator for Reacts app",
     "repository": {
         "type": "git",
@@ -77,16 +77,16 @@
         "@octokit/rest": "^18.12.0",
         "cheerio": "^1.0.0-rc.5",
         "cli-select": "^1.1.2",
-        "evt": "^2.4.10",
+        "evt": "^2.4.13",
         "memoizee": "^0.4.15",
         "minimal-polyfills": "^2.2.2",
         "minimist": "^1.2.6",
         "path-browserify": "^1.0.1",
-        "powerhooks": "^0.20.24",
+        "powerhooks": "^0.21.0",
         "react-markdown": "^5.0.3",
         "rfc4648": "^1.5.2",
         "scripting-tools": "^0.19.13",
-        "tsafe": "^1.2.1",
+        "tsafe": "^1.4.1",
         "tss-react": "4.4.1-rc.0",
         "zod": "^3.17.10"
     }

src/bin/generate-i18n-messages.ts

@@ -4,7 +4,6 @@ import { join as pathJoin, relative as pathRelative, dirname as pathDirname } fr
 import { crawl } from "./tools/crawl";
 import { downloadBuiltinKeycloakTheme } from "./download-builtin-keycloak-theme";
 import { getProjectRoot } from "./tools/getProjectRoot";
-import { rm_rf, rm_r } from "./tools/rm";
 import { getCliOptions } from "./tools/cliOptions";
 import { getLogger } from "./tools/logger";
 
@@ -22,7 +21,7 @@ for (const keycloakVersion of ["11.0.3", "15.0.2", "18.0.1"]) {
 
     const tmpDirPath = pathJoin(getProjectRoot(), "tmp_xImOef9dOd44");
 
-    rm_rf(tmpDirPath);
+    fs.rmSync(tmpDirPath, { "recursive": true, "force": true });
 
     downloadBuiltinKeycloakTheme({
         keycloakVersion,
@@ -54,7 +53,7 @@ for (const keycloakVersion of ["11.0.3", "15.0.2", "18.0.1"]) {
         });
     }
 
-    rm_r(tmpDirPath);
+    fs.rmSync(tmpDirPath, { recursive: true, force: true });
 
     Object.keys(record).forEach(pageType => {
         const recordForPageType = record[pageType];

src/bin/keycloakify/generateFtl/ftl_object_to_js_code_declaring_an_object.ftl

@@ -36,7 +36,11 @@ ${ftl_object_to_js_code_declaring_an_object(.data_model, [])?no_esc};
                 <#list fieldNames as fieldName>
                     if(fieldName === "${fieldName}" ){
                         <#attempt>
-                            return "${messagesPerField.printIfExists(fieldName,'1')}" ? x : undefined;
+                            <#if '${fieldName}' == 'username' || '${fieldName}' == 'password'>
+                                return <#if messagesPerField.existsError('username', 'password')>x<#else>undefined</#if>;
+                            <#else>
+                                return <#if messagesPerField.existsError('${fieldName}')>x<#else>undefined</#if>;
+                            </#if>
                         <#recover>
                         </#attempt>
                     }
@@ -51,7 +55,11 @@ ${ftl_object_to_js_code_declaring_an_object(.data_model, [])?no_esc};
                 <#list fieldNames as fieldName>
                     if(fieldName === "${fieldName}" ){
                         <#attempt>
-                            return <#if messagesPerField.existsError('${fieldName}')>true<#else>false</#if>;
+                            <#if '${fieldName}' == 'username' || '${fieldName}' == 'password'>
+                                return <#if messagesPerField.existsError('username', 'password')>true<#else>false</#if>;
+                            <#else>
+                                return <#if messagesPerField.existsError('${fieldName}')>true<#else>false</#if>;
+                            </#if>
                         <#recover>
                         </#attempt>
                     }
@@ -66,8 +74,14 @@ ${ftl_object_to_js_code_declaring_an_object(.data_model, [])?no_esc};
                 <#list fieldNames as fieldName>
                     if(fieldName === "${fieldName}" ){
                         <#attempt>
-                            <#if messagesPerField.existsError('${fieldName}')>
-                                return "${messagesPerField.get('${fieldName}')?no_esc}";
+                            <#if '${fieldName}' == 'username' || '${fieldName}' == 'password'>
+                                <#if messagesPerField.existsError('username', 'password')>
+                                    return 'Invalid username or password.';
+                                </#if>
+                            <#else>
+                                <#if messagesPerField.existsError('${fieldName}')>
+                                    return "${messagesPerField.get('${fieldName}')?no_esc}";
+                                </#if>
                             </#if>
                         <#recover>
                         </#attempt>
@@ -83,7 +97,11 @@ ${ftl_object_to_js_code_declaring_an_object(.data_model, [])?no_esc};
                 <#list fieldNames as fieldName>
                     if(fieldName === "${fieldName}" ){
                         <#attempt>
-                            return <#if messagesPerField.exists('${fieldName}')>true<#else>false</#if>;
+                            <#if '${fieldName}' == 'username' || '${fieldName}' == 'password'>
+                                return <#if messagesPerField.exists('username') ||  messagesPerField.exists('password')>true<#else>false</#if>;
+                            <#else>
+                                return <#if messagesPerField.exists('${fieldName}')>true<#else>false</#if>;
+                            </#if>
                         <#recover>
                         </#attempt>
                     }

src/bin/link_in_test_app.ts

@@ -43,7 +43,8 @@ const commonThirdPartyDeps = (() => {
 
 const yarnHomeDirPath = pathJoin(keycloakifyDirPath, ".yarn_home");
 
-execSync(["rm -rf", "mkdir"].map(cmd => `${cmd} ${yarnHomeDirPath}`).join(" && "));
+fs.rmSync(yarnHomeDirPath, { "recursive": true, "force": true });
+fs.mkdirSync(yarnHomeDirPath);
 
 const execYarnLink = (params: { targetModuleName?: string; cwd: string }) => {
     const { targetModuleName, cwd } = params;

src/bin/tools/downloadAndUnzip.ts

@@ -2,7 +2,6 @@ import { basename as pathBasename, join as pathJoin } from "path";
 import { execSync } from "child_process";
 import * as fs from "fs";
 import { transformCodebase } from "./transformCodebase";
-import { rm, rm_rf } from "./rm";
 import * as crypto from "crypto";
 
 /** assert url ends with .zip */
@@ -54,7 +53,7 @@ export function downloadAndUnzip(params: {
             [extractDirPath]: false
         });
 
-        rm_rf(extractDirPath);
+        fs.rmSync(extractDirPath, { "recursive": true, "force": true });
 
         fs.mkdirSync(extractDirPath);
 
@@ -66,7 +65,7 @@ export function downloadAndUnzip(params: {
             "cwd": extractDirPath
         });
 
-        rm(zipFileBasename, { "cwd": extractDirPath });
+        fs.rmSync(pathJoin(extractDirPath, zipFileBasename), { "recursive": true, "force": true });
 
         writeIsSuccessByExtractDirPath({
             ...isSuccessByExtractDirPath,

src/bin/tools/rm.ts

@@ -1,31 +0,0 @@
-import { execSync } from "child_process";
-
-function rmInternal(params: { pathToRemove: string; args: string | undefined; cwd: string | undefined }) {
-    const { pathToRemove, args, cwd } = params;
-
-    execSync(`rm ${args ? `-${args} ` : ""}${pathToRemove.replace(/ /g, "\\ ")}`, cwd !== undefined ? { cwd } : undefined);
-}
-
-export function rm(pathToRemove: string, options?: { cwd: string }) {
-    rmInternal({
-        pathToRemove,
-        "args": undefined,
-        "cwd": options?.cwd
-    });
-}
-
-export function rm_r(pathToRemove: string, options?: { cwd: string }) {
-    rmInternal({
-        pathToRemove,
-        "args": "r",
-        "cwd": options?.cwd
-    });
-}
-
-export function rm_rf(pathToRemove: string, options?: { cwd: string }) {
-    rmInternal({
-        pathToRemove,
-        "args": "rf",
-        "cwd": options?.cwd
-    });
-}

yarn.lock

@@ -972,14 +972,14 @@ event-emitter@^0.3.5:
     d "1"
     es5-ext "~0.10.14"
 
-evt@^2.4.10:
-  version "2.4.10"
-  resolved "https://registry.yarnpkg.com/evt/-/evt-2.4.10.tgz#91b3c10e5ce50112656bdbe6c599c38f72617e51"
-  integrity sha512-HPepROqeyGpl54AvytYMJh+JoB5eGInaRG3Sqr7VAQX69jzWdou6mq8vNvy41lRSSsK2rQ7XJXoyEaqVnLDBSw==
+evt@^2.4.13:
+  version "2.4.13"
+  resolved "https://registry.yarnpkg.com/evt/-/evt-2.4.13.tgz#5ef873159ce62e099d58801a3e4b8e0f5b648017"
+  integrity sha512-haTVOsmjzk+28zpzvVwan9Zw2rLQF2izgi7BKjAPRzZAfcv+8scL0TpM8MzvGNKFYHiy+Bq3r6FYIIUPl9kt3A==
   dependencies:
     minimal-polyfills "^2.2.2"
     run-exclusive "^2.2.18"
-    tsafe "^1.2.1"
+    tsafe "^1.4.1"
 
 execa@^5.1.1:
   version "5.1.1"
@@ -1639,15 +1639,15 @@ please-upgrade-node@^3.2.0:
   dependencies:
     semver-compare "^1.0.0"
 
-powerhooks@^0.20.24:
-  version "0.20.24"
-  resolved "https://registry.yarnpkg.com/powerhooks/-/powerhooks-0.20.24.tgz#d7c6e22b3b0463c5d967b3951dd7c43b06c89959"
-  integrity sha512-hyRfa5rFe5q1A0N8rbjAuM4HDWevpoy65LSAQmZIoBjAjhCUtVyxohUmeCGkDXKjamEf3fCHFxU/qg57iZozWg==
+powerhooks@^0.21.0:
+  version "0.21.0"
+  resolved "https://registry.yarnpkg.com/powerhooks/-/powerhooks-0.21.0.tgz#bafe67c2ce8c4c38cd26dec08de27fdf0d81da70"
+  integrity sha512-O9JG79YKv3yJ6Tkcx+eNWUC/rUKPCFUBkDIDbnoKM29P0+8VAx9pjp/C9eE2qnKNXr5azgnGtEoyLzGB/UKorQ==
   dependencies:
-    evt "^2.4.10"
+    evt "^2.4.13"
     memoizee "^0.4.15"
     resize-observer-polyfill "^1.5.1"
-    tsafe "^1.2.1"
+    tsafe "^1.4.1"
 
 prettier@^2.3.0:
   version "2.7.1"
@@ -1997,10 +1997,10 @@ trough@^1.0.0:
   resolved "https://registry.yarnpkg.com/trough/-/trough-1.0.5.tgz#b8b639cefad7d0bb2abd37d433ff8293efa5f406"
   integrity sha512-rvuRbTarPXmMb79SmzEp8aqXNKcK+y0XaB298IXueQ8I2PsrATcPBCSPyK/dDNa2iWOhKlfNnOjdAOTBU/nkFA==
 
-tsafe@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/tsafe/-/tsafe-1.2.1.tgz#578f7acd22b5ff32b5b820b6eb551af9ad4024da"
-  integrity sha512-fDDbPiAG6xjZuyXXakHZi8ewGx7ERxGVJ3dwFtcoex+9lvp/nHm5ROlFAB6lyZSmspG0cjpYpFxrKyRnniiOdQ==
+tsafe@^1.4.1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/tsafe/-/tsafe-1.4.1.tgz#59cdad8ac41babf88e56dcd1a683ae2fb145d059"
+  integrity sha512-3IDBalvf6SyvHFS14UiwCWzqdSdo+Q0k2J7DZyJYaHW/iraW9DJpaBKDJpry3yQs3o/t/A+oGaRW3iVt2lKxzA==
 
 tslib@^2.1.0:
   version "2.4.0"