Release candidate

.all-contributorsrc

@@ -158,34 +158,6 @@
       "contributions": [
         "code"
       ]
-    },
-    {
-      "login": "zavoloklom",
-      "name": "Sergey Kupletsky",
-      "avatar_url": "https://avatars.githubusercontent.com/u/4151869?v=4",
-      "profile": "https://github.com/zavoloklom",
-      "contributions": [
-        "test",
-        "code"
-      ]
-    },
-    {
-      "login": "rome-user",
-      "name": "rome-user",
-      "avatar_url": "https://avatars.githubusercontent.com/u/114131048?v=4",
-      "profile": "https://github.com/rome-user",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "celinepelletier",
-      "name": "Céline Pelletier",
-      "avatar_url": "https://avatars.githubusercontent.com/u/82821620?v=4",
-      "profile": "https://github.com/celinepelletier",
-      "contributions": [
-        "code"
-      ]
     }
   ],
   "contributorsPerLine": 7,
@@ -193,6 +165,5 @@
   "repoType": "github",
   "repoHost": "https://github.com",
   "projectName": "keycloakify",
-  "projectOwner": "keycloakify",
-  "commitType": "docs"
+  "projectOwner": "keycloakify"
 }

.github/workflows/ci.yaml

@@ -3,7 +3,6 @@ on:
   push:
     branches:
       - main
-      - v8
   pull_request:
     branches:
       - main

README.md

@@ -47,12 +47,10 @@
 
 > 📣 🛑 Account themes generated by Keycloakify are not currently compatible with Keycloak 22.  
 > We are working on a solution. [Follow progress](https://github.com/keycloakify/keycloakify/issues/389).  
-> **Login and email themes are not affected**.  
-> UPDATE: [The PR](https://github.com/keycloak/keycloak/pull/22317) that should future proof Keycloakify account themes has been
-> merged into Keycloak! 🥳 Credit to @xgp. We are now waiting for a new Keycloak release to be published.
+> Login and email themes are not affected.
 
 Keycloakify is fully compatible with Keycloak, starting from version 11 and is anticipated to maintain compatibility with all future versions.  
-You can update your Keycloak, your Keycloakify generated theme won't break. (Well except for Keycloak 22's Account theme obviously but this was hopefully a one time debacle)  
+You can update your Keycloak, your Keycloakify generated theme won't break.  
 To understand the basis of my confidence in this, you can [visit this discussion thread where I've explained in detail](https://github.com/keycloakify/keycloakify/discussions/346#discussioncomment-5889791).
 
 ## Sponsor 👼
@@ -116,9 +114,6 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
       <td align="center" valign="top" width="14.28%"><a href="https://www.gravitysoftware.be"><img src="https://avatars.githubusercontent.com/u/1140574?v=4?s=100" width="100px;" alt="Thomas Silvestre"/><br /><sub><b>Thomas Silvestre</b></sub></a><br /><a href="https://github.com/keycloakify/keycloakify/commits?author=thosil" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/satanshiro"><img src="https://avatars.githubusercontent.com/u/38865738?v=4?s=100" width="100px;" alt="satanshiro"/><br /><sub><b>satanshiro</b></sub></a><br /><a href="https://github.com/keycloakify/keycloakify/commits?author=satanshiro" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://poelhekke.dev"><img src="https://avatars.githubusercontent.com/u/1632377?v=4?s=100" width="100px;" alt="Koen Poelhekke"/><br /><sub><b>Koen Poelhekke</b></sub></a><br /><a href="https://github.com/keycloakify/keycloakify/commits?author=kpoelhekke" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/zavoloklom"><img src="https://avatars.githubusercontent.com/u/4151869?v=4?s=100" width="100px;" alt="Sergey Kupletsky"/><br /><sub><b>Sergey Kupletsky</b></sub></a><br /><a href="https://github.com/keycloakify/keycloakify/commits?author=zavoloklom" title="Tests">⚠️</a> <a href="https://github.com/keycloakify/keycloakify/commits?author=zavoloklom" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/rome-user"><img src="https://avatars.githubusercontent.com/u/114131048?v=4?s=100" width="100px;" alt="rome-user"/><br /><sub><b>rome-user</b></sub></a><br /><a href="https://github.com/keycloakify/keycloakify/commits?author=rome-user" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/celinepelletier"><img src="https://avatars.githubusercontent.com/u/82821620?v=4?s=100" width="100px;" alt="Céline Pelletier"/><br /><sub><b>Céline Pelletier</b></sub></a><br /><a href="https://github.com/keycloakify/keycloakify/commits?author=celinepelletier" title="Code">💻</a></td>
     </tr>
   </tbody>
 </table>
@@ -130,11 +125,11 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
 
 # Changelog highlights
 
-## 8.0
+## 5.0 (candidate)
 
 -   Much smaller .jar size. 70.2 MB -> 7.8 MB.  
     Keycloakify now detects which of the static resources from the default theme are actually used by your theme and only include those in the .jar.
--   Build time: The first build is slowed but the subsequent build are faster. [Update your CI so that the cache is persisted across CI build](https://github.com/keycloakify/keycloakify-starter/commit/bc378d5afb67e796f520afbc348185f3e319d9d0).
+-   Build time: The first build is slowed but the subsequent build are faster. Update your CI so that nodes_modules/.cache is not deleted between builds.
 
 ### Breaking changes
 
@@ -143,15 +138,11 @@ There are very few breaking changes in this major version.
 -   The [`--external-assets` build option has been removed](https://docs.keycloakify.dev/v/v7/build-options#external-assets-deprecated) it was a performance optimization that is no longer relevant now that
     we have lazy loading.
 
--   `kcContext.usernameEditDisabled` is now `kcContext.usernameHidden`, the type was lying, it has been updated to reflect what's actually on the `kcContext` at runtime.
-    If you want to see in detail what should be updated [see issue](https://github.com/keycloakify/keycloakify/pull/399), or you can search and replace `usernameEditDisabled` -> `usernameHidden` it'll do the trick.
-
 -   The `usePrepareTemplate` prototype has been changed, you can search and replace:
 
 `src/keycloak-theme/login/Template.tsx`
 
 ```ts
-url,
 "stylesCommon": [
     "node_modules/patternfly/dist/css/patternfly.min.css",
     "node_modules/patternfly/dist/css/patternfly-additions.min.css",
@@ -176,7 +167,6 @@ and
 `src/keycloak-theme/account/Template.css`
 
 ```ts
-url,
 "stylesCommon": ["node_modules/patternfly/dist/css/patternfly.min.css", "node_modules/patternfly/dist/css/patternfly-additions.min.css"],
 "styles": ["css/account.css"],
 ```
@@ -196,10 +186,10 @@ by
 -   The i18n messages you defines in your theme are now also maid available to Keycloak.
     In practice this mean that you can now customize the `kcContext.message.summary` that
     display a general alert and the values returned by `kcContext.messagesPerField.get()` that
-    are used to display specific error on some field of the form.
+    are used to display specific error on some field of the form.  
     [See video](https://youtu.be/D6tZcemReTI)
 
-## 7.14
+## 7.14
 
 -   Deprecate the `extraPages` build option. Keycloakify is now able to analyze your code to detect extra pages.
 

package.json

@@ -1,6 +1,6 @@
 {
     "name": "keycloakify",
-    "version": "8.4.2",
+    "version": "8.0.0-rc.1",
     "description": "Create Keycloak themes using React",
     "repository": {
         "type": "git",

src/account/Template.tsx

@@ -22,7 +22,7 @@ export default function Template(props: TemplateProps<KcContext, I18n>) {
             `${url.resourcesCommonPath}/node_modules/patternfly/dist/css/patternfly-additions.min.css`,
             `${url.resourcesPath}/css/account.css`
         ],
-        "htmlClassName": getClassName("kcHtmlClass"),
+        "htmlClassName": undefined,
         "bodyClassName": clsx("admin-console", "user", getClassName("kcBodyClass"))
     });
 

src/account/TemplateProps.ts

@@ -11,4 +11,4 @@ export type TemplateProps<KcContext extends KcContext.Common, I18nExtended exten
     children: ReactNode;
 };
 
-export type ClassKey = "kcHtmlClass" | "kcBodyClass" | "kcButtonClass" | "kcButtonPrimaryClass" | "kcButtonLargeClass" | "kcButtonDefaultClass";
+export type ClassKey = "kcBodyClass" | "kcButtonClass" | "kcButtonPrimaryClass" | "kcButtonLargeClass" | "kcButtonDefaultClass";

src/account/kcContext/KcContext.ts

@@ -6,7 +6,6 @@ export type KcContext = KcContext.Password | KcContext.Account;
 
 export declare namespace KcContext {
     export type Common = {
-        themeVersion: string;
         keycloakifyVersion: string;
         themeType: "account";
         themeName: string;

src/account/kcContext/kcContextMocks.ts

@@ -7,7 +7,6 @@ import type { KcContext } from "./KcContext";
 const PUBLIC_URL = (typeof process !== "object" ? undefined : process.env?.["PUBLIC_URL"]) || "/";
 
 export const kcContextCommonMock: KcContext.Common = {
-    "themeVersion": "0.0.0",
     "keycloakifyVersion": "0.0.0",
     "themeType": "account",
     "themeName": "my-theme-name",

src/account/lib/useGetClassName.ts

@@ -3,7 +3,6 @@ import type { ClassKey } from "keycloakify/account/TemplateProps";
 
 export const { useGetClassName } = createUseClassName<ClassKey>({
     "defaultClasses": {
-        "kcHtmlClass": undefined,
         "kcBodyClass": undefined,
         "kcButtonClass": "btn",
         "kcButtonPrimaryClass": "btn-primary",

src/account/pages/Account.tsx

@@ -51,7 +51,7 @@ export default function Account(props: PageProps<Extract<KcContext, { pageId: "a
                                 id="username"
                                 name="username"
                                 disabled={!realm.editUsernameAllowed}
-                                defaultValue={account.username ?? ""}
+                                value={account.username ?? ""}
                             />
                         </div>
                     </div>
@@ -66,7 +66,7 @@ export default function Account(props: PageProps<Extract<KcContext, { pageId: "a
                     </div>
 
                     <div className="col-sm-10 col-md-10">
-                        <input type="text" className="form-control" id="email" name="email" autoFocus defaultValue={account.email ?? ""} />
+                        <input type="text" className="form-control" id="email" name="email" autoFocus value={account.email ?? ""} />
                     </div>
                 </div>
 
@@ -79,7 +79,7 @@ export default function Account(props: PageProps<Extract<KcContext, { pageId: "a
                     </div>
 
                     <div className="col-sm-10 col-md-10">
-                        <input type="text" className="form-control" id="firstName" name="firstName" defaultValue={account.firstName ?? ""} />
+                        <input type="text" className="form-control" id="firstName" name="firstName" value={account.firstName ?? ""} />
                     </div>
                 </div>
 
@@ -92,7 +92,7 @@ export default function Account(props: PageProps<Extract<KcContext, { pageId: "a
                     </div>
 
                     <div className="col-sm-10 col-md-10">
-                        <input type="text" className="form-control" id="lastName" name="lastName" defaultValue={account.lastName ?? ""} />
+                        <input type="text" className="form-control" id="lastName" name="lastName" value={account.lastName ?? ""} />
                     </div>
                 </div>
 

src/bin/download-builtin-keycloak-theme.ts

@@ -10,6 +10,8 @@ import * as fs from "fs";
 export async function downloadBuiltinKeycloakTheme(params: { projectDirPath: string; keycloakVersion: string; destDirPath: string }) {
     const { projectDirPath, keycloakVersion, destDirPath } = params;
 
+    const start = Date.now();
+
     await downloadAndUnzip({
         "doUseCache": true,
         projectDirPath,
@@ -70,6 +72,8 @@ export async function downloadBuiltinKeycloakTheme(params: { projectDirPath: str
             }
         }
     });
+
+    console.log("Downloaded Keycloak theme in", Date.now() - start, "ms");
 }
 
 async function main() {

src/bin/getSrcDirPath.ts

@@ -4,7 +4,7 @@ import { crawl } from "./tools/crawl";
 import { join as pathJoin } from "path";
 import { themeTypes } from "./keycloakify/generateFtl";
 
-const themeSrcDirBasenames = ["keycloak-theme", "keycloak_theme"];
+const themeSrcDirBasename = "keycloak-theme";
 
 /** Can't catch error, if the directory isn't found, this function will just exit the process with an error message. */
 export function getThemeSrcDirPath(params: { projectDirPath: string }) {
@@ -14,13 +14,13 @@ export function getThemeSrcDirPath(params: { projectDirPath: string }) {
 
     const themeSrcDirPath: string | undefined = crawl({ "dirPath": srcDirPath, "returnedPathsType": "relative to dirPath" })
         .map(fileRelativePath => {
-            for (const themeSrcDirBasename of themeSrcDirBasenames) {
-                const split = fileRelativePath.split(themeSrcDirBasename);
-                if (split.length === 2) {
-                    return pathJoin(srcDirPath, split[0] + themeSrcDirBasename);
-                }
+            const split = fileRelativePath.split(themeSrcDirBasename);
+
+            if (split.length !== 2) {
+                return undefined;
             }
-            return undefined;
+
+            return pathJoin(srcDirPath, split[0] + themeSrcDirBasename);
         })
         .filter(exclude(undefined))[0];
 
@@ -38,7 +38,7 @@ export function getThemeSrcDirPath(params: { projectDirPath: string }) {
     console.error(
         [
             "Can't locate your theme source directory. It should be either: ",
-            "src/ or src/keycloak-theme or src/keycloak_theme.",
+            "src/ or src/keycloak-theme.",
             "Example in the starter: https://github.com/keycloakify/keycloakify-starter/tree/main/src/keycloak-theme"
         ].join("\n")
     );

src/bin/keycloakify/generateFtl/ftl_object_to_js_code_declaring_an_object.ftl

@@ -455,10 +455,9 @@
                         <#-- https://github.com/keycloakify/keycloakify/issues/91#issue-1212319466 (reports with error.ftl and Kc18) -->
                         <#-- https://github.com/keycloakify/keycloakify/issues/109#issuecomment-1134610163 -->
                         <#-- https://github.com/keycloakify/keycloakify/issues/357 -->
-                        <#-- https://github.com/keycloakify/keycloakify/discussions/406#discussioncomment-7514787 -->
                         key == "loginAction" && 
                         are_same_path(path, ["url"]) && 
-                        ["saml-post-form.ftl", "error.ftl", "info.ftl", "login-oauth-grant.ftl", "logout-confirm.ftl", "login-oauth2-device-verify-user-code.ftl"]?seq_contains(pageId) &&
+                        ["saml-post-form.ftl", "error.ftl", "info.ftl", "login-oauth-grant.ftl", "logout-confirm.ftl"]?seq_contains(pageId) &&
                         !(auth?has_content && auth.showTryAnotherWayLink())
                     ) || (
                         <#-- https://github.com/keycloakify/keycloakify/issues/362 -->
@@ -479,33 +478,11 @@
                         "error.ftl" == pageId &&
                         are_same_path(path, ["realm"]) &&
                         !["name", "displayName", "displayNameHtml", "internationalizationEnabled", "registrationEmailAsUsername" ]?seq_contains(key)
-                    ) || (
-                        "applications.ftl" == pageId &&
-                        are_same_path(path, ["applications", "applications", "*", "client", "realm"])
-                    ) || (
-                        "applications.ftl" == pageId &&
-                        "masterAdminClient" == key
                     )
                 >
                     <#local out_seq += ["/*If you need '" + key + "' on " + pageId + ", please submit an issue to the Keycloakify repo*/"]>
                     <#continue>
                 </#if>
-
-                <#-- 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) && 
-                    key == "attemptedUsername" && are_same_path(path, ["auth"])
-                )>
-                    <#attempt>
-                        <#-- https://github.com/keycloak/keycloak/blob/3a2bf0c04bcde185e497aaa32d0bb7ab7520cf4a/themes/src/main/resources/theme/base/login/template.ftl#L63 -->
-                        <#if !(auth?has_content && auth.showUsername() && !auth.showResetCredentials())>
-                            <#local out_seq += ["/*If you need '" + key + "' on " + pageId + ", please submit an issue to the Keycloakify repo*/"]>
-                            <#continue>
-                        </#if>
-                    <#recover>
-                        <#local out_seq += ["/*Testing if attemptedUsername should be skipped throwed an exception */"]>
-                    </#attempt>
-                </#if>
                 
                 <#attempt>
                     <#if !object[key]??>

src/bin/keycloakify/generateFtl/generateFtl.ts

@@ -124,27 +124,6 @@ export function generateFtlFilesCodeFactory(params: {
         ].join("\n")
     );
 
-    // Remove part of the document marked as ignored.
-    {
-        const startTags = $('meta[name="keycloakify-ignore-start"]');
-
-        startTags.each((...[, startTag]) => {
-            const $startTag = $(startTag);
-            const $endTag = $startTag.nextAll('meta[name="keycloakify-ignore-end"]').first();
-
-            if ($endTag.length) {
-                let currentNode = $startTag.next();
-                while (currentNode.length && !currentNode.is($endTag)) {
-                    currentNode.remove();
-                    currentNode = $startTag.next();
-                }
-
-                $startTag.remove();
-                $endTag.remove();
-            }
-        });
-    }
-
     const partiallyFixedIndexHtmlCode = $.html();
 
     function generateFtlFilesCode(params: { pageId: string }): {

src/bin/keycloakify/generateFtl/pageId.ts

@@ -10,8 +10,6 @@ export const loginThemePageIds = [
     "login-reset-password.ftl",
     "login-verify-email.ftl",
     "terms.ftl",
-    "login-oauth2-device-verify-user-code.ftl",
-    "login-oauth-grant.ftl",
     "login-otp.ftl",
     "login-update-profile.ftl",
     "login-update-password.ftl",

src/bin/keycloakify/generateTheme/downloadKeycloakStaticResources.ts

@@ -1,6 +1,6 @@
 import { transformCodebase } from "../../tools/transformCodebase";
 import * as fs from "fs";
-import { join as pathJoin, relative as pathRelative, dirname as pathDirname } from "path";
+import { join as pathJoin, relative as pathRelative } from "path";
 import type { ThemeType } from "../generateFtl";
 import { downloadBuiltinKeycloakTheme } from "../../download-builtin-keycloak-theme";
 import {
@@ -9,7 +9,6 @@ import {
     basenameOfKeycloakDirInPublicDir
 } from "../../mockTestingResourcesPath";
 import * as crypto from "crypto";
-import { assert } from "tsafe/assert";
 
 export async function downloadKeycloakStaticResources(
     // prettier-ignore
@@ -20,35 +19,11 @@ export async function downloadKeycloakStaticResources(
         keycloakVersion: string;
         usedResources: {
             resourcesCommonFilePaths: string[];
+            resourcesFilePaths: string[];
         } | undefined
     }
 ) {
-    const { projectDirPath, themeType, themeDirPath, keycloakVersion } = params;
-
-    // NOTE: Hack for 427
-    const usedResources = (() => {
-        const { usedResources } = params;
-
-        if (usedResources === undefined) {
-            return undefined;
-        }
-
-        assert(usedResources !== undefined);
-
-        return {
-            "resourcesCommonDirPaths": usedResources.resourcesCommonFilePaths.map(filePath => {
-                {
-                    const splitArg = "/dist/";
-
-                    if (filePath.includes(splitArg)) {
-                        return filePath.split(splitArg)[0] + splitArg;
-                    }
-                }
-
-                return pathDirname(filePath);
-            })
-        };
-    })();
+    const { projectDirPath, themeType, themeDirPath, keycloakVersion, usedResources } = params;
 
     const tmpDirPath = pathJoin(
         themeDirPath,
@@ -64,7 +39,17 @@ export async function downloadKeycloakStaticResources(
 
     transformCodebase({
         "srcDirPath": pathJoin(tmpDirPath, "keycloak", themeType, "resources"),
-        "destDirPath": pathJoin(themeDirPath, pathRelative(basenameOfKeycloakDirInPublicDir, resourcesDirPathRelativeToPublicDir))
+        "destDirPath": pathJoin(themeDirPath, pathRelative(basenameOfKeycloakDirInPublicDir, resourcesDirPathRelativeToPublicDir)),
+        "transformSourceCode":
+            usedResources === undefined
+                ? undefined
+                : ({ fileRelativePath, sourceCode }) => {
+                      if (!usedResources.resourcesFilePaths.includes(fileRelativePath)) {
+                          return undefined;
+                      }
+
+                      return { "modifiedSourceCode": sourceCode };
+                  }
     });
 
     transformCodebase({
@@ -74,7 +59,7 @@ export async function downloadKeycloakStaticResources(
             usedResources === undefined
                 ? undefined
                 : ({ fileRelativePath, sourceCode }) => {
-                      if (usedResources.resourcesCommonDirPaths.find(dirPath => fileRelativePath.startsWith(dirPath)) === undefined) {
+                      if (!usedResources.resourcesCommonFilePaths.includes(fileRelativePath)) {
                           return undefined;
                       }
 

src/bin/keycloakify/generateTheme/readStaticResourcesUsage.ts

@@ -1,15 +1,17 @@
 import { crawl } from "../../tools/crawl";
-import { join as pathJoin, sep as pathSep } from "path";
+import { join as pathJoin } from "path";
 import * as fs from "fs";
 import type { ThemeType } from "../generateFtl";
 
 /** Assumes the theme type exists */
 export function readStaticResourcesUsage(params: { keycloakifySrcDirPath: string; themeSrcDirPath: string; themeType: ThemeType }): {
     resourcesCommonFilePaths: string[];
+    resourcesFilePaths: string[];
 } {
     const { keycloakifySrcDirPath, themeSrcDirPath, themeType } = params;
 
     const resourcesCommonFilePaths = new Set<string>();
+    const resourcesFilePaths = new Set<string>();
 
     for (const srcDirPath of [pathJoin(keycloakifySrcDirPath, themeType), pathJoin(themeSrcDirPath, themeType)]) {
         const filePaths = crawl({ "dirPath": srcDirPath, "returnedPathsType": "absolute" }).filter(filePath => /\.(ts|tsx|js|jsx)$/.test(filePath));
@@ -24,53 +26,58 @@ export function readStaticResourcesUsage(params: { keycloakifySrcDirPath: string
             const wrap = readPaths({ rawSourceFile });
 
             wrap.resourcesCommonFilePaths.forEach(filePath => resourcesCommonFilePaths.add(filePath));
+            wrap.resourcesFilePaths.forEach(filePath => resourcesFilePaths.add(filePath));
         }
     }
 
     return {
-        "resourcesCommonFilePaths": Array.from(resourcesCommonFilePaths)
+        "resourcesCommonFilePaths": Array.from(resourcesCommonFilePaths),
+        "resourcesFilePaths": Array.from(resourcesFilePaths)
     };
 }
 
 /** Exported for testing purpose */
 export function readPaths(params: { rawSourceFile: string }): {
     resourcesCommonFilePaths: string[];
+    resourcesFilePaths: string[];
 } {
     const { rawSourceFile } = params;
 
     const resourcesCommonFilePaths = new Set<string>();
+    const resourcesFilePaths = new Set<string>();
 
-    {
-        const regexp = new RegExp(`resourcesCommonPath\\s*}([^\`]+)\``, "g");
+    for (const isCommon of [true, false]) {
+        const set = isCommon ? resourcesCommonFilePaths : resourcesFilePaths;
 
-        const matches = [...rawSourceFile.matchAll(regexp)];
+        {
+            const regexp = new RegExp(`resources${isCommon ? "Common" : ""}Path\\s*}([^\`]+)\``, "g");
 
-        for (const match of matches) {
-            const filePath = match[1];
+            const matches = [...rawSourceFile.matchAll(regexp)];
 
-            resourcesCommonFilePaths.add(filePath);
+            for (const match of matches) {
+                const filePath = match[1];
+
+                set.add(filePath);
+            }
+        }
+
+        {
+            const regexp = new RegExp(`resources${isCommon ? "Common" : ""}Path\\s*[+,]\\s*["']([^"'\`]+)["'\`]`, "g");
+
+            const matches = [...rawSourceFile.matchAll(regexp)];
+
+            for (const match of matches) {
+                const filePath = match[1];
+
+                set.add(filePath);
+            }
         }
     }
 
-    {
-        const regexp = new RegExp(`resourcesCommonPath\\s*[+,]\\s*["']([^"'\`]+)["'\`]`, "g");
-
-        const matches = [...rawSourceFile.matchAll(regexp)];
-
-        for (const match of matches) {
-            const filePath = match[1];
-
-            resourcesCommonFilePaths.add(filePath);
-        }
-    }
-
-    const normalizePath = (filePath: string) => {
-        filePath = filePath.startsWith("/") ? filePath.slice(1) : filePath;
-        filePath = filePath.replace(/\//g, pathSep);
-        return filePath;
-    };
+    const removePrefixSlash = (filePath: string) => (filePath.startsWith("/") ? filePath.slice(1) : filePath);
 
     return {
-        "resourcesCommonFilePaths": Array.from(resourcesCommonFilePaths).map(normalizePath)
+        "resourcesCommonFilePaths": Array.from(resourcesCommonFilePaths).map(removePrefixSlash),
+        "resourcesFilePaths": Array.from(resourcesFilePaths).map(removePrefixSlash)
     };
 }

src/bin/keycloakify/replacers/replaceImportsFromStaticInJsCode.ts

@@ -16,25 +16,18 @@ export function replaceImportsFromStaticInJsCode(params: { jsCode: string }): {
     const { jsCode } = params;
 
     const getReplaceArgs = (language: "js" | "css"): Parameters<typeof String.prototype.replace> => [
-        new RegExp(`([a-zA-Z_]+)\\.([a-zA-Z]+)=(function\\(([a-z]+)\\){return|([a-z]+)=>)"static\\/${language}\\/"`, "g"),
-        (...[, n, u, matchedFunction, eForFunction]) => {
-            const isArrowFunction = matchedFunction.includes("=>");
-            const e = isArrowFunction ? matchedFunction.replace("=>", "").trim() : eForFunction;
-
-            return `
-            ${n}[(function(){
-                var pd = Object.getOwnPropertyDescriptor(${n}, "p");
+        new RegExp(`([a-zA-Z_]+)\\.([a-zA-Z]+)=function\\(([a-zA-Z]+)\\){return"static\\/${language}\\/"`, "g"),
+        (...[, n, u, e]) => `
+			${n}[(function(){
+                var pd= Object.getOwnPropertyDescriptor(${n}, "p");
                 if( pd === undefined || pd.configurable ){
                     Object.defineProperty(${n}, "p", {
                         get: function() { return window.${ftlValuesGlobalName}.url.resourcesPath; },
-                        set: function() {}
+                        set: function (){}
                     });
                 }
-                return "${u}";
-            })()] = ${isArrowFunction ? `${e} =>` : `function(${e}) { return `} "/build/static/${language}/"`
-                .replace(/\s+/g, " ")
-                .trim();
-        }
+				return "${u}";
+			})()] = function(${e}) { return "${true ? "/build/" : ""}static/${language}/"`
     ];
 
     const fixedJsCode = jsCode

src/bin/promptKeycloakVersion.ts

@@ -17,7 +17,7 @@ export async function promptKeycloakVersion() {
         return { getLatestsSemVersionedTag };
     })();
 
-    console.log("Select Keycloak version?");
+    console.log("Initialize the directory with email template from which keycloak version?");
 
     const tags = [
         ...(await getLatestsSemVersionedTag({

src/lib/usePrepareTemplate.ts

@@ -23,21 +23,24 @@ export function usePrepareTemplate(params: {
         const removeArray: (() => void)[] = [];
 
         (async () => {
-            for (const style of [...styles].reverse()) {
+            const prLoadedArray: Promise<void>[] = [];
+
+            styles.reverse().forEach(href => {
                 const { prLoaded, remove } = headInsert({
                     "type": "css",
                     "position": "prepend",
-                    "href": style
+                    href
                 });
 
                 removeArray.push(remove);
 
-                // TODO: Find a way to do that in parallel (without breaking the order)
-                await prLoaded;
+                prLoadedArray.push(prLoaded);
+            });
 
-                if (isUnmounted) {
-                    return;
-                }
+            await Promise.all(prLoadedArray);
+
+            if (isUnmounted) {
+                return;
             }
 
             setReady();

src/login/Fallback.tsx

@@ -12,8 +12,6 @@ const Error = lazy(() => import("keycloakify/login/pages/Error"));
 const LoginResetPassword = lazy(() => import("keycloakify/login/pages/LoginResetPassword"));
 const LoginVerifyEmail = lazy(() => import("keycloakify/login/pages/LoginVerifyEmail"));
 const Terms = lazy(() => import("keycloakify/login/pages/Terms"));
-const LoginDeviceVerifyUserCode = lazy(() => import("keycloakify/login/pages/LoginDeviceVerifyUserCode"));
-const LoginOauthGrant = lazy(() => import("keycloakify/login/pages/LoginOauthGrant"));
 const LoginOtp = lazy(() => import("keycloakify/login/pages/LoginOtp"));
 const LoginPassword = lazy(() => import("keycloakify/login/pages/LoginPassword"));
 const LoginUsername = lazy(() => import("keycloakify/login/pages/LoginUsername"));
@@ -54,10 +52,6 @@ export default function Fallback(props: PageProps<KcContext, I18n>) {
                         return <LoginVerifyEmail kcContext={kcContext} {...rest} />;
                     case "terms.ftl":
                         return <Terms kcContext={kcContext} {...rest} />;
-                    case "login-oauth2-device-verify-user-code.ftl":
-                        return <LoginDeviceVerifyUserCode kcContext={kcContext} {...rest} />;
-                    case "login-oauth-grant.ftl":
-                        return <LoginOauthGrant kcContext={kcContext} {...rest} />;
                     case "login-otp.ftl":
                         return <LoginOtp kcContext={kcContext} {...rest} />;
                     case "login-username.ftl":

src/login/Template.tsx

@@ -38,7 +38,7 @@ export default function Template(props: TemplateProps<KcContext, I18n>) {
             `${url.resourcesPath}/css/login.css`
         ],
         "htmlClassName": getClassName("kcHtmlClass"),
-        "bodyClassName": getClassName("kcBodyClass")
+        "bodyClassName": undefined
     });
 
     if (!isReady) {

src/login/TemplateProps.ts

@@ -21,7 +21,6 @@ export type TemplateProps<KcContext extends KcContext.Common, I18nExtended exten
 };
 
 export type ClassKey =
-    | "kcBodyClass"
     | "kcHtmlClass"
     | "kcLoginClass"
     | "kcHeaderClass"
@@ -94,5 +93,4 @@ export type ClassKey =
     | "kcSelectOTPListItemClass"
     | "kcAuthenticatorOtpCircleClass"
     | "kcSelectOTPItemHeadingClass"
-    | "kcFormOptionsWrapperClass"
-    | "kcFormButtonsWrapperClass";
+    | "kcFormOptionsWrapperClass";

src/login/kcContext/KcContext.ts

@@ -18,8 +18,6 @@ export type KcContext =
     | KcContext.LoginResetPassword
     | KcContext.LoginVerifyEmail
     | KcContext.Terms
-    | KcContext.LoginDeviceVerifyUserCode
-    | KcContext.LoginOauthGrant
     | KcContext.LoginOtp
     | KcContext.LoginUsername
     | KcContext.WebauthnAuthenticate
@@ -39,7 +37,6 @@ export type KcContext =
 
 export declare namespace KcContext {
     export type Common = {
-        themeVersion: string;
         keycloakifyVersion: string;
         themeType: "login";
         themeName: string;
@@ -244,27 +241,6 @@ export declare namespace KcContext {
         pageId: "terms.ftl";
     };
 
-    export type LoginDeviceVerifyUserCode = Common & {
-        pageId: "login-oauth2-device-verify-user-code.ftl";
-        url: {
-            oauth2DeviceVerificationAction: string;
-        };
-    };
-
-    export type LoginOauthGrant = Common & {
-        pageId: "login-oauth-grant.ftl";
-        oauth: {
-            code: string;
-            client: string;
-            clientScopesRequested: {
-                consentScreenText: string;
-            }[];
-        };
-        url: {
-            oauthAction: string;
-        };
-    };
-
     export type LoginOtp = Common & {
         pageId: "login-otp.ftl";
         otpLogin: {

src/login/kcContext/kcContextMocks.ts

@@ -103,7 +103,6 @@ const attributes: Attribute[] = [
 const attributesByName = Object.fromEntries(attributes.map(attribute => [attribute.name, attribute])) as any;
 
 export const kcContextCommonMock: KcContext.Common = {
-    "themeVersion": "0.0.0",
     "keycloakifyVersion": "0.0.0",
     "themeType": "login",
     "themeName": "my-theme-name",
@@ -241,9 +240,7 @@ export const kcContextCommonMock: KcContext.Common = {
 const loginUrl = {
     ...kcContextCommonMock.url,
     "loginResetCredentialsUrl": "/auth/realms/myrealm/login-actions/reset-credentials?client_id=account&tab_id=HoAx28ja4xg",
-    "registrationUrl": "/auth/realms/myrealm/login-actions/registration?client_id=account&tab_id=HoAx28ja4xg",
-    "oauth2DeviceVerificationAction": "/auth/realms/myrealm/device",
-    "oauthAction": "/auth/realms/myrealm/login-actions/consent?client_id=account&tab_id=HoAx28ja4xg"
+    "registrationUrl": "/auth/realms/myrealm/login-actions/registration?client_id=account&tab_id=HoAx28ja4xg"
 };
 
 export const kcContextMocks = [
@@ -347,25 +344,6 @@ export const kcContextMocks = [
         ...kcContextCommonMock,
         "pageId": "terms.ftl"
     }),
-    id<KcContext.LoginDeviceVerifyUserCode>({
-        ...kcContextCommonMock,
-        "pageId": "login-oauth2-device-verify-user-code.ftl",
-        url: loginUrl
-    }),
-    id<KcContext.LoginOauthGrant>({
-        ...kcContextCommonMock,
-        "pageId": "login-oauth-grant.ftl",
-        oauth: {
-            code: "5-1N4CIzfi1aprIQjmylI-9e3spLCWW9i5d-GDcs-Sw",
-            clientScopesRequested: [
-                { consentScreenText: "${profileScopeConsentText}" },
-                { consentScreenText: "${rolesScopeConsentText}" },
-                { consentScreenText: "${emailScopeConsentText}" }
-            ],
-            client: "account"
-        },
-        url: loginUrl
-    }),
     id<KcContext.LoginOtp>({
         ...kcContextCommonMock,
         "pageId": "login-otp.ftl",

src/login/lib/useGetClassName.ts

@@ -3,7 +3,6 @@ import type { ClassKey } from "keycloakify/login/TemplateProps";
 
 export const { useGetClassName } = createUseClassName<ClassKey>({
     "defaultClasses": {
-        "kcBodyClass": undefined,
         "kcHtmlClass": "login-pf",
         "kcLoginClass": "login-pf-page",
         "kcContentWrapperClass": "row",
@@ -45,7 +44,6 @@ export const { useGetClassName } = createUseClassName<ClassKey>({
         "kcInputClass": "form-control",
         "kcInputErrorMessageClass": "pf-c-form__helper-text pf-m-error required kc-feedback-text",
         "kcInputWrapperClass": "col-xs-12 col-sm-12 col-md-12 col-lg-12",
-        "kcFormButtonsWrapperClass": undefined,
         "kcFormOptionsClass": "col-xs-12 col-sm-12 col-md-12 col-lg-12",
         "kcFormButtonsClass": "col-xs-12 col-sm-12 col-md-12 col-lg-12",
         "kcFormSettingClass": "login-pf-settings",

src/login/pages/Info.tsx

@@ -8,10 +8,7 @@ export default function Info(props: PageProps<Extract<KcContext, { pageId: "info
 
     const { msgStr, msg } = i18n;
 
-    assert(
-        kcContext.message !== undefined,
-        "No message in kcContext.message, there will always be a message in production context, add it in your mock"
-    );
+    assert(kcContext.message !== undefined);
 
     const { messageHeader, message, requiredActions, skipLink, pageRedirectUri, actionUri, client } = kcContext;
 

src/login/pages/LoginConfigTotp.tsx

@@ -32,7 +32,7 @@ export default function LoginConfigTotp(props: PageProps<Extract<KcContext, { pa
 
                         <ul id="kc-totp-supported-apps">
                             {totp.supportedApplications.map(app => (
-                                <li>{msg(app as MessageKey)}</li>
+                                <li>{msgStr(app as MessageKey, app)}</li>
                             ))}
                         </ul>
                     </li>

src/login/pages/LoginDeviceVerifyUserCode.tsx

@@ -1,68 +0,0 @@
-import { clsx } from "keycloakify/tools/clsx";
-import Template from "../Template";
-import { I18n } from "../i18n";
-import { KcContext } from "../kcContext";
-import { useGetClassName } from "../lib/useGetClassName";
-import { PageProps } from "./PageProps";
-
-export default function LoginOauthGrant(props: PageProps<Extract<KcContext, { pageId: "login-oauth2-device-verify-user-code.ftl" }>, I18n>) {
-    const { kcContext, i18n, doUseDefaultCss, classes } = props;
-    const { url } = kcContext;
-
-    const { msg, msgStr } = i18n;
-
-    const { getClassName } = useGetClassName({
-        doUseDefaultCss,
-        classes
-    });
-
-    return (
-        <Template {...{ kcContext, i18n, doUseDefaultCss, classes }} headerNode={msg("oauth2DeviceVerificationTitle")}>
-            <form
-                id="kc-user-verify-device-user-code-form"
-                className={getClassName("kcFormClass")}
-                action={url.oauth2DeviceVerificationAction}
-                method="post"
-            >
-                <div className={getClassName("kcFormGroupClass")}>
-                    <div className={getClassName("kcLabelWrapperClass")}>
-                        <label htmlFor="device-user-code" className={getClassName("kcLabelClass")}>
-                            {msg("verifyOAuth2DeviceUserCode")}
-                        </label>
-                    </div>
-
-                    <div className={getClassName("kcInputWrapperClass")}>
-                        <input
-                            id="device-user-code"
-                            name="device_user_code"
-                            autoComplete="off"
-                            type="text"
-                            className={getClassName("kcInputClass")}
-                            autoFocus
-                        />
-                    </div>
-                </div>
-
-                <div className={getClassName("kcFormGroupClass")}>
-                    <div id="kc-form-options" className={getClassName("kcFormOptionsClass")}>
-                        <div className={getClassName("kcFormOptionsWrapperClass")}></div>
-                    </div>
-
-                    <div id="kc-form-buttons" className={getClassName("kcFormButtonsClass")}>
-                        <div className={getClassName("kcFormButtonsWrapperClass")}>
-                            <input
-                                className={clsx(
-                                    getClassName("kcButtonClass"),
-                                    getClassName("kcButtonPrimaryClass"),
-                                    getClassName("kcButtonLargeClass")
-                                )}
-                                type="submit"
-                                value={msgStr("doSubmit")}
-                            />
-                        </div>
-                    </div>
-                </div>
-            </form>
-        </Template>
-    );
-}

src/login/pages/LoginOauthGrant.tsx

@@ -1,73 +0,0 @@
-import { clsx } from "keycloakify/tools/clsx";
-import { PageProps } from "./PageProps";
-import { KcContext } from "../kcContext";
-import { I18n } from "../i18n";
-import Template from "../Template";
-import { useGetClassName } from "keycloakify/login/lib/useGetClassName";
-
-export default function LoginOauthGrant(props: PageProps<Extract<KcContext, { pageId: "login-oauth-grant.ftl" }>, I18n>) {
-    const { kcContext, i18n, doUseDefaultCss, classes } = props;
-    const { url, oauth, client } = kcContext;
-
-    const { msg, msgStr, advancedMsg, advancedMsgStr } = i18n;
-
-    const { getClassName } = useGetClassName({
-        doUseDefaultCss,
-        classes
-    });
-
-    return (
-        <Template
-            {...{ kcContext, i18n, doUseDefaultCss, classes }}
-            headerNode={msg("oauthGrantTitle", client.name ? advancedMsgStr(client.name) : client.clientId)}
-        >
-            <div id="kc-oauth" className="content-area">
-                <h3>{msg("oauthGrantRequest")}</h3>
-                <ul>
-                    {oauth.clientScopesRequested.map(clientScope => (
-                        <li key={clientScope.consentScreenText}>
-                            <span>{advancedMsg(clientScope.consentScreenText)}</span>
-                        </li>
-                    ))}
-                </ul>
-
-                <form className="form-actions" action={url.oauthAction} method="POST">
-                    <input type="hidden" name="code" value={oauth.code} />
-                    <div className={getClassName("kcFormGroupClass")}>
-                        <div id="kc-form-options">
-                            <div className={getClassName("kcFormOptionsWrapperClass")}></div>
-                        </div>
-
-                        <div id="kc-form-buttons">
-                            <div className={getClassName("kcFormButtonsWrapperClass")}>
-                                <input
-                                    className={clsx(
-                                        getClassName("kcButtonClass"),
-                                        getClassName("kcButtonPrimaryClass"),
-                                        getClassName("kcButtonLargeClass")
-                                    )}
-                                    name="accept"
-                                    id="kc-login"
-                                    type="submit"
-                                    value={msgStr("doYes")}
-                                />
-                                <input
-                                    className={clsx(
-                                        getClassName("kcButtonClass"),
-                                        getClassName("kcButtonDefaultClass"),
-                                        getClassName("kcButtonLargeClass")
-                                    )}
-                                    name="cancel"
-                                    id="kc-cancel"
-                                    type="submit"
-                                    value={msgStr("doNo")}
-                                />
-                            </div>
-                        </div>
-                    </div>
-                </form>
-                <div className="clearfix"></div>
-            </div>
-        </Template>
-    );
-}

stories/login/pages/Info.stories.tsx

@@ -21,13 +21,4 @@ const meta: ComponentMeta<any> = {
 
 export default meta;
 
-export const Default = () => (
-    <PageStory
-        kcContext={{
-            message: {
-                summary: "This is the server message",
-                type: "info"
-            }
-        }}
-    />
-);
+export const Default = () => <PageStory />;

stories/login/pages/LoginDeviceVerifyUserCode.stories.tsx

@@ -1,24 +0,0 @@
-import React from "react";
-import type { ComponentMeta } from "@storybook/react";
-import { createPageStory } from "../createPageStory";
-
-const pageId = "login-oauth2-device-verify-user-code.ftl";
-
-const { PageStory } = createPageStory({ pageId });
-
-const meta: ComponentMeta<any> = {
-    title: `login/${pageId}`,
-    component: PageStory,
-    parameters: {
-        viewMode: "story",
-        previewTabs: {
-            "storybook/docs/panel": {
-                "hidden": true
-            }
-        }
-    }
-};
-
-export default meta;
-
-export const Default = () => <PageStory />;

stories/login/pages/LoginOauthGrant.stories.tsx

@@ -1,24 +0,0 @@
-import React from "react";
-import type { ComponentMeta } from "@storybook/react";
-import { createPageStory } from "../createPageStory";
-
-const pageId = "login-oauth-grant.ftl";
-
-const { PageStory } = createPageStory({ pageId });
-
-const meta: ComponentMeta<any> = {
-    title: `login/${pageId}`,
-    component: PageStory,
-    parameters: {
-        viewMode: "story",
-        previewTabs: {
-            "storybook/docs/panel": {
-                "hidden": true
-            }
-        }
-    }
-};
-
-export default meta;
-
-export const Default = () => <PageStory />;

test/bin/readStaticResourcesUsage.spec.ts

@@ -9,7 +9,8 @@ describe("Ensure it's able to extract used Keycloak resources", () => {
             "node_modules/patternfly/dist/css/patternfly-additions.min.css",
             "lib/zocial/zocial.css",
             "node_modules/jquery/dist/jquery.min.js"
-        ]
+        ],
+        "resourcesFilePaths": ["css/login.css"]
     };
 
     it("works with coding style n°1", () => {

test/bin/replaceImportFromStatic.spec.ts

@@ -32,10 +32,6 @@ describe("bin/js-transforms", () => {
                 908:"67c9ed2c"
             }[e]+".chunk.css"
         }
-        
-        n.u=e=>"static/js/"+e+"."+{69:"4f205f87",128:"49264537",453:"b2fed72e",482:"f0106901"}[e]+".chunk.js"
-        
-        t.miniCssF=e=>"static/css/"+e+"."+{164:"dcfd7749",908:"67c9ed2c"}[e]+".chunk.css"
     `;
     it("transforms standalone code properly", () => {
         const { fixedJsCode } = replaceImportsFromStaticInJsCode({
@@ -56,11 +52,11 @@ describe("bin/js-transforms", () => {
             }
 
             __webpack_require__[(function (){
-                var pd = Object.getOwnPropertyDescriptor(__webpack_require__, "p");
+                var pd= Object.getOwnPropertyDescriptor(__webpack_require__, "p");
                 if( pd === undefined || pd.configurable ){
                     Object.defineProperty(__webpack_require__, "p", {
                         get: function() { return window.kcContext.url.resourcesPath; },
-                        set: function() {}
+                        set: function (){}
                     });
                 }
                 return "u";
@@ -73,11 +69,11 @@ describe("bin/js-transforms", () => {
             }
 
             t[(function (){
-                var pd = Object.getOwnPropertyDescriptor(t, "p");
+                var pd= Object.getOwnPropertyDescriptor(t, "p");
                 if( pd === undefined || pd.configurable ){
                     Object.defineProperty(t, "p", {
                         get: function() { return window.kcContext.url.resourcesPath; },
-                        set: function() {}
+                        set: function (){}
                     });
                 }
                 return "miniCssF";
@@ -87,28 +83,7 @@ describe("bin/js-transforms", () => {
                     908:"67c9ed2c"
                 } [e] + ".chunk.css"
             }
-            
-            n[(function(){
-                var pd = Object.getOwnPropertyDescriptor(n, "p");
-                if( pd === undefined || pd.configurable ){
-                    Object.defineProperty(n, "p", {
-                        get: function() { return window.kcContext.url.resourcesPath; },
-                        set: function() {}
-                    });
-                }
-                return "u";
-            })()] = e => "/build/static/js/"+e+"."+{69:"4f205f87",128:"49264537",453:"b2fed72e",482:"f0106901"}[e]+".chunk.js"
-        
-            t[(function(){
-                var pd = Object.getOwnPropertyDescriptor(t, "p");
-                if( pd === undefined || pd.configurable ){
-                    Object.defineProperty(t, "p", {
-                        get: function() { return window.kcContext.url.resourcesPath; },
-                        set: function() {}
-                    });
-                }
-                return "miniCssF";
-            })()] = e => "/build/static/css/"+e+"."+{164:"dcfd7749",908:"67c9ed2c"}[e]+".chunk.css"
+
         `;
 
         expect(isSameCode(fixedJsCode, fixedJsCodeExpected)).toBe(true);