keycloakify 10.0.0-rc.44 → 10.0.0-rc.46

package/bin/{944.index.js → 991.index.js}

@@ -1,6 +1,6 @@
 "use strict";
-exports.id = 944;
-exports.ids = [944];
+exports.id = 991;
+exports.ids = [991];
 exports.modules = {
 
 /***/ 87751:
@@ -156,7 +156,9 @@ function getBuildContext(params) {
         if (typeof buildOptions.themeName === "string") {
             return [buildOptions.themeName];
         }
-        return buildOptions.themeName;
+        const [mainThemeName, ...themeVariantNames] = buildOptions.themeName;
+        (0,tsafe.assert)(mainThemeName !== undefined);
+        return [mainThemeName, ...themeVariantNames];
     })();
     const projectBuildDirPath = (() => {
         var _a;
@@ -285,6 +287,7 @@ function getBuildContext(params) {
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
 
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
+/* harmony export */   "Dv": () => (/* binding */ onlyBuildJarFileBasenameEnvName),
 /* harmony export */   "M": () => (/* binding */ basenameOfTheKeycloakifyResourcesDir),
 /* harmony export */   "N$": () => (/* binding */ keycloak_resources),
 /* harmony export */   "UX": () => (/* binding */ accountThemePageIds),
@@ -294,7 +297,6 @@ function getBuildContext(params) {
 /* harmony export */   "lg": () => (/* binding */ nameOfTheLocalizationRealmOverridesUserProfileProperty),
 /* harmony export */   "rO": () => (/* binding */ themeTypes),
 /* harmony export */   "sj": () => (/* binding */ loginThemePageIds),
-/* harmony export */   "uo": () => (/* binding */ skipBuildJarsEnvName),
 /* harmony export */   "v$": () => (/* binding */ lastKeycloakVersionWithAccountV1),
 /* harmony export */   "y_": () => (/* binding */ accountV1ThemeName),
 /* harmony export */   "z0": () => (/* binding */ resources_common)
@@ -311,7 +313,7 @@ const vitePluginSubScriptEnvNames = {
     runPostBuildScript: "KEYCLOAKIFY_RUN_POST_BUILD_SCRIPT",
     resolveViteConfig: "KEYCLOAKIFY_RESOLVE_VITE_CONFIG"
 };
-const skipBuildJarsEnvName = "KEYCLOAKIFY_SKIP_BUILD_JAR";
+const onlyBuildJarFileBasenameEnvName = "KEYCLOAKIFY_ONLY_BUILD_JAR_FILE_BASENAME";
 const loginThemePageIds = [
     "login.ftl",
     "login-username.ftl",
@@ -587,6 +589,56 @@ async function existsAsync(path) {
 
 /***/ }),
 
+/***/ 8699:
+/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
+
+/* harmony export */ __webpack_require__.d(__webpack_exports__, {
+/* harmony export */   "rm": () => (/* binding */ rm)
+/* harmony export */ });
+/* harmony import */ var fs_promises__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(73292);
+/* harmony import */ var fs_promises__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(fs_promises__WEBPACK_IMPORTED_MODULE_0__);
+/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(71017);
+/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(path__WEBPACK_IMPORTED_MODULE_1__);
+/* harmony import */ var _SemVer__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(12171);
+
+
+
+/**
+ * Polyfill of fs.rm(dirPath, { "recursive": true })
+ * For older version of Node
+ */
+async function rm(dirPath, options) {
+    if (_SemVer__WEBPACK_IMPORTED_MODULE_2__/* .SemVer.compare */ .h.compare(_SemVer__WEBPACK_IMPORTED_MODULE_2__/* .SemVer.parse */ .h.parse(process.version), _SemVer__WEBPACK_IMPORTED_MODULE_2__/* .SemVer.parse */ .h.parse("14.14.0")) > 0) {
+        return fs_promises__WEBPACK_IMPORTED_MODULE_0__.rm(dirPath, options);
+    }
+    const { force = true } = options;
+    if (force && !(await checkDirExists(dirPath))) {
+        return;
+    }
+    const removeDir_rec = async (dirPath) => Promise.all((await fs_promises__WEBPACK_IMPORTED_MODULE_0__.readdir(dirPath)).map(async (basename) => {
+        const fileOrDirpath = (0,path__WEBPACK_IMPORTED_MODULE_1__.join)(dirPath, basename);
+        if ((await fs_promises__WEBPACK_IMPORTED_MODULE_0__.lstat(fileOrDirpath)).isDirectory()) {
+            await removeDir_rec(fileOrDirpath);
+        }
+        else {
+            await fs_promises__WEBPACK_IMPORTED_MODULE_0__.unlink(fileOrDirpath);
+        }
+    }));
+    await removeDir_rec(dirPath);
+}
+async function checkDirExists(dirPath) {
+    try {
+        await fs_promises__WEBPACK_IMPORTED_MODULE_0__.access(dirPath, fs_promises__WEBPACK_IMPORTED_MODULE_0__.constants.F_OK);
+        return true;
+    }
+    catch (_a) {
+        return false;
+    }
+}
+//# sourceMappingURL=fs.rm.js.map
+
+/***/ }),
+
 /***/ 86644:
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
 
@@ -615,6 +667,23 @@ function getAbsoluteAndInOsFormatPath(params) {
 }
 //# sourceMappingURL=getAbsoluteAndInOsFormatPath.js.map
 
+/***/ }),
+
+/***/ 90665:
+/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
+
+/* harmony export */ __webpack_require__.d(__webpack_exports__, {
+/* harmony export */   "V": () => (/* binding */ isInside)
+/* harmony export */ });
+/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(71017);
+/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(path__WEBPACK_IMPORTED_MODULE_0__);
+
+function isInside(params) {
+    const { dirPath, filePath } = params;
+    return !(0,path__WEBPACK_IMPORTED_MODULE_0__.relative)(dirPath, filePath).startsWith("..");
+}
+//# sourceMappingURL=isInside.js.map
+
 /***/ })
 
 };

package/bin/main.js

@@ -9213,7 +9213,7 @@ program
     .task({
     skip,
     handler: async (cliCommandOptions) => {
-        const { command } = await Promise.all(/* import() */[__nccwpck_require__.e(941), __nccwpck_require__.e(214), __nccwpck_require__.e(818), __nccwpck_require__.e(525), __nccwpck_require__.e(246), __nccwpck_require__.e(944), __nccwpck_require__.e(322), __nccwpck_require__.e(3)]).then(__nccwpck_require__.bind(__nccwpck_require__, 56003));
+        const { command } = await Promise.all(/* import() */[__nccwpck_require__.e(941), __nccwpck_require__.e(214), __nccwpck_require__.e(818), __nccwpck_require__.e(525), __nccwpck_require__.e(246), __nccwpck_require__.e(991), __nccwpck_require__.e(190), __nccwpck_require__.e(3)]).then(__nccwpck_require__.bind(__nccwpck_require__, 56003));
         await command({ cliCommandOptions });
     }
 });
@@ -9261,19 +9261,7 @@ program
     .task({
     skip,
     handler: async (cliCommandOptions) => {
-        const { command } = await Promise.all(/* import() */[__nccwpck_require__.e(941), __nccwpck_require__.e(214), __nccwpck_require__.e(818), __nccwpck_require__.e(180), __nccwpck_require__.e(36), __nccwpck_require__.e(944), __nccwpck_require__.e(526)]).then(__nccwpck_require__.bind(__nccwpck_require__, 80526));
-        await command({ cliCommandOptions });
-    }
-});
-program
-    .command({
-    name: "download-keycloak-default-theme",
-    description: "Download the built-in Keycloak theme."
-})
-    .task({
-    skip,
-    handler: async (cliCommandOptions) => {
-        const { command } = await Promise.all(/* import() */[__nccwpck_require__.e(941), __nccwpck_require__.e(214), __nccwpck_require__.e(818), __nccwpck_require__.e(525), __nccwpck_require__.e(180), __nccwpck_require__.e(944), __nccwpck_require__.e(322), __nccwpck_require__.e(961)]).then(__nccwpck_require__.bind(__nccwpck_require__, 27961));
+        const { command } = await Promise.all(/* import() */[__nccwpck_require__.e(941), __nccwpck_require__.e(214), __nccwpck_require__.e(818), __nccwpck_require__.e(180), __nccwpck_require__.e(36), __nccwpck_require__.e(991), __nccwpck_require__.e(526)]).then(__nccwpck_require__.bind(__nccwpck_require__, 80526));
         await command({ cliCommandOptions });
     }
 });
@@ -9309,7 +9297,7 @@ program
     .task({
     skip,
     handler: async (cliCommandOptions) => {
-        const { command } = await Promise.all(/* import() */[__nccwpck_require__.e(941), __nccwpck_require__.e(214), __nccwpck_require__.e(525), __nccwpck_require__.e(180), __nccwpck_require__.e(944), __nccwpck_require__.e(322), __nccwpck_require__.e(932)]).then(__nccwpck_require__.bind(__nccwpck_require__, 16932));
+        const { command } = await Promise.all(/* import() */[__nccwpck_require__.e(941), __nccwpck_require__.e(214), __nccwpck_require__.e(525), __nccwpck_require__.e(180), __nccwpck_require__.e(991), __nccwpck_require__.e(932)]).then(__nccwpck_require__.bind(__nccwpck_require__, 16932));
         await command({ cliCommandOptions });
     }
 });
@@ -9321,7 +9309,7 @@ program
     .task({
     skip,
     handler: async (cliCommandOptions) => {
-        const { command } = await Promise.all(/* import() */[__nccwpck_require__.e(941), __nccwpck_require__.e(214), __nccwpck_require__.e(525), __nccwpck_require__.e(944), __nccwpck_require__.e(322), __nccwpck_require__.e(193)]).then(__nccwpck_require__.bind(__nccwpck_require__, 23193));
+        const { command } = await Promise.all(/* import() */[__nccwpck_require__.e(941), __nccwpck_require__.e(214), __nccwpck_require__.e(525), __nccwpck_require__.e(991), __nccwpck_require__.e(190), __nccwpck_require__.e(193)]).then(__nccwpck_require__.bind(__nccwpck_require__, 23193));
         await command({ cliCommandOptions });
     }
 });

package/bin/shared/buildContext.d.ts

@@ -2,7 +2,7 @@ import type { CliCommandOptions } from "../main";
 export type BuildContext = {
     bundler: "vite" | "webpack";
     themeVersion: string;
-    themeNames: string[];
+    themeNames: [string, ...string[]];
     extraThemeProperties: string[] | undefined;
     groupId: string;
     artifactId: string;

package/bin/shared/constants.d.ts

@@ -11,7 +11,7 @@ export declare const vitePluginSubScriptEnvNames: {
     readonly runPostBuildScript: "KEYCLOAKIFY_RUN_POST_BUILD_SCRIPT";
     readonly resolveViteConfig: "KEYCLOAKIFY_RESOLVE_VITE_CONFIG";
 };
-export declare const skipBuildJarsEnvName = "KEYCLOAKIFY_SKIP_BUILD_JAR";
+export declare const onlyBuildJarFileBasenameEnvName = "KEYCLOAKIFY_ONLY_BUILD_JAR_FILE_BASENAME";
 export declare const loginThemePageIds: readonly ["login.ftl", "login-username.ftl", "login-password.ftl", "webauthn-authenticate.ftl", "webauthn-register.ftl", "register.ftl", "info.ftl", "error.ftl", "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", "login-idp-link-confirm.ftl", "login-idp-link-email.ftl", "login-page-expired.ftl", "login-config-totp.ftl", "logout-confirm.ftl", "idp-review-user-profile.ftl", "update-email.ftl", "select-authenticator.ftl", "saml-post-form.ftl", "delete-credential.ftl", "code.ftl", "delete-account-confirm.ftl", "frontchannel-logout.ftl", "login-recovery-authn-code-config.ftl", "login-recovery-authn-code-input.ftl", "login-reset-otp.ftl", "login-x509-info.ftl", "webauthn-error.ftl"];
 export declare const accountThemePageIds: readonly ["password.ftl", "account.ftl", "sessions.ftl", "totp.ftl", "applications.ftl", "log.ftl", "federatedIdentity.ftl"];
 export type LoginThemePageId = (typeof loginThemePageIds)[number];

package/bin/shared/constants.js

@@ -10,7 +10,7 @@ export const vitePluginSubScriptEnvNames = {
     runPostBuildScript: "KEYCLOAKIFY_RUN_POST_BUILD_SCRIPT",
     resolveViteConfig: "KEYCLOAKIFY_RESOLVE_VITE_CONFIG"
 };
-export const skipBuildJarsEnvName = "KEYCLOAKIFY_SKIP_BUILD_JAR";
+export const onlyBuildJarFileBasenameEnvName = "KEYCLOAKIFY_ONLY_BUILD_JAR_FILE_BASENAME";
 export const loginThemePageIds = [
     "login.ftl",
     "login-username.ftl",

package/bin/shared/constants.js.map

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/bin/shared/constants.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,eAAe,GAAG,WAAW,CAAC;AAC3C,MAAM,CAAC,MAAM,sDAAsD,GAC/D,yCAAyC,CAAC;AAC9C,MAAM,CAAC,MAAM,kBAAkB,GAAG,oBAAoB,CAAC;AACvD,MAAM,CAAC,MAAM,gBAAgB,GAAG,kBAAkB,CAAC;AACnD,MAAM,CAAC,MAAM,gCAAgC,GAAG,QAAQ,CAAC;AACzD,MAAM,CAAC,MAAM,oCAAoC,GAAG,OAAO,CAAC;AAE5D,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,OAAO,EAAE,SAAS,CAAU,CAAC;AACxD,MAAM,CAAC,MAAM,kBAAkB,GAAG,YAAY,CAAC;AAI/C,MAAM,CAAC,MAAM,2BAA2B,GAAG;IACvC,kBAAkB,EAAE,mCAAmC;IACvD,iBAAiB,EAAE,iCAAiC;CAC9C,CAAC;AAEX,MAAM,CAAC,MAAM,oBAAoB,GAAG,4BAA4B,CAAC;AAEjE,MAAM,CAAC,MAAM,iBAAiB,GAAG;IAC7B,WAAW;IACX,oBAAoB;IACpB,oBAAoB;IACpB,2BAA2B;IAC3B,uBAAuB;IACvB,cAAc;IACd,UAAU;IACV,WAAW;IACX,0BAA0B;IAC1B,wBAAwB;IACxB,WAAW;IACX,0CAA0C;IAC1C,uBAAuB;IACvB,eAAe;IACf,0BAA0B;IAC1B,2BAA2B;IAC3B,4BAA4B;IAC5B,0BAA0B;IAC1B,wBAAwB;IACxB,uBAAuB;IACvB,oBAAoB;IACpB,6BAA6B;IAC7B,kBAAkB;IAClB,0BAA0B;IAC1B,oBAAoB;IACpB,uBAAuB;IACvB,UAAU;IACV,4BAA4B;IAC5B,yBAAyB;IACzB,sCAAsC;IACtC,qCAAqC;IACrC,qBAAqB;IACrB,qBAAqB;IACrB,oBAAoB;CACd,CAAC;AAEX,MAAM,CAAC,MAAM,mBAAmB,GAAG;IAC/B,cAAc;IACd,aAAa;IACb,cAAc;IACd,UAAU;IACV,kBAAkB;IAClB,SAAS;IACT,uBAAuB;CACjB,CAAC;AAKX,MAAM,CAAC,MAAM,aAAa,GAAG,sBAAsB,CAAC"}
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/bin/shared/constants.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,eAAe,GAAG,WAAW,CAAC;AAC3C,MAAM,CAAC,MAAM,sDAAsD,GAC/D,yCAAyC,CAAC;AAC9C,MAAM,CAAC,MAAM,kBAAkB,GAAG,oBAAoB,CAAC;AACvD,MAAM,CAAC,MAAM,gBAAgB,GAAG,kBAAkB,CAAC;AACnD,MAAM,CAAC,MAAM,gCAAgC,GAAG,QAAQ,CAAC;AACzD,MAAM,CAAC,MAAM,oCAAoC,GAAG,OAAO,CAAC;AAE5D,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,OAAO,EAAE,SAAS,CAAU,CAAC;AACxD,MAAM,CAAC,MAAM,kBAAkB,GAAG,YAAY,CAAC;AAI/C,MAAM,CAAC,MAAM,2BAA2B,GAAG;IACvC,kBAAkB,EAAE,mCAAmC;IACvD,iBAAiB,EAAE,iCAAiC;CAC9C,CAAC;AAEX,MAAM,CAAC,MAAM,+BAA+B,GAAG,0CAA0C,CAAC;AAE1F,MAAM,CAAC,MAAM,iBAAiB,GAAG;IAC7B,WAAW;IACX,oBAAoB;IACpB,oBAAoB;IACpB,2BAA2B;IAC3B,uBAAuB;IACvB,cAAc;IACd,UAAU;IACV,WAAW;IACX,0BAA0B;IAC1B,wBAAwB;IACxB,WAAW;IACX,0CAA0C;IAC1C,uBAAuB;IACvB,eAAe;IACf,0BAA0B;IAC1B,2BAA2B;IAC3B,4BAA4B;IAC5B,0BAA0B;IAC1B,wBAAwB;IACxB,uBAAuB;IACvB,oBAAoB;IACpB,6BAA6B;IAC7B,kBAAkB;IAClB,0BAA0B;IAC1B,oBAAoB;IACpB,uBAAuB;IACvB,UAAU;IACV,4BAA4B;IAC5B,yBAAyB;IACzB,sCAAsC;IACtC,qCAAqC;IACrC,qBAAqB;IACrB,qBAAqB;IACrB,oBAAoB;CACd,CAAC;AAEX,MAAM,CAAC,MAAM,mBAAmB,GAAG;IAC/B,cAAc;IACd,aAAa;IACb,cAAc;IACd,UAAU;IACV,kBAAkB;IAClB,SAAS;IACT,uBAAuB;CACjB,CAAC;AAKX,MAAM,CAAC,MAAM,aAAa,GAAG,sBAAsB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "keycloakify",
-    "version": "10.0.0-rc.44",
+    "version": "10.0.0-rc.46",
     "description": "Create Keycloak themes using React",
     "repository": {
         "type": "git",
@@ -453,7 +453,6 @@
         "src/account/pages/Totp.tsx",
         "src/bin/add-story.ts",
         "src/bin/copy-keycloak-resources-to-public.ts",
-        "src/bin/download-keycloak-default-theme.ts",
         "src/bin/eject-page.ts",
         "src/bin/initialize-email-theme.ts",
         "src/bin/keycloakify/buildJars/buildJar.ts",
@@ -473,7 +472,6 @@
         "src/bin/keycloakify/generateSrcMainResources/index.ts",
         "src/bin/keycloakify/generateSrcMainResources/readExtraPageNames.ts",
         "src/bin/keycloakify/generateSrcMainResources/readFieldNameUsage.ts",
-        "src/bin/keycloakify/generateStartKeycloakTestingContainer.ts",
         "src/bin/keycloakify/index.ts",
         "src/bin/keycloakify/keycloakify.ts",
         "src/bin/keycloakify/replacers/replaceImportsInCssCode.ts",
@@ -764,11 +762,11 @@
         "tools/useSetClassName.js.map",
         "bin/main.js",
         "bin/180.index.js",
+        "bin/190.index.js",
         "bin/193.index.js",
         "bin/214.index.js",
         "bin/246.index.js",
         "bin/3.index.js",
-        "bin/322.index.js",
         "bin/36.index.js",
         "bin/420.index.js",
         "bin/453.index.js",
@@ -781,10 +779,9 @@
         "bin/818.index.js",
         "bin/932.index.js",
         "bin/941.index.js",
-        "bin/944.index.js",
-        "bin/961.index.js",
         "bin/97.index.js",
         "bin/98.index.js",
+        "bin/991.index.js",
         "bin/shared/constants.js",
         "bin/shared/constants.d.ts",
         "bin/shared/constants.js.map",

package/src/bin/keycloakify/buildJars/buildJar.ts

@@ -32,12 +32,14 @@ export async function buildJar(params: {
     jarFileBasename: string;
     keycloakAccountV1Version: KeycloakAccountV1Version;
     keycloakThemeAdditionalInfoExtensionVersion: KeycloakThemeAdditionalInfoExtensionVersion;
+    resourcesDirPath: string;
     buildContext: BuildContextLike;
 }): Promise<void> {
     const {
         jarFileBasename,
         keycloakAccountV1Version,
         keycloakThemeAdditionalInfoExtensionVersion,
+        resourcesDirPath,
         buildContext
     } = params;
 
@@ -57,7 +59,7 @@ export async function buildJar(params: {
 
             if (
                 fileRelativePath ===
-                getMetaInfKeycloakThemesJsonFilePath({ keycloakifyBuildDirPath: "." })
+                getMetaInfKeycloakThemesJsonFilePath({ resourcesDirPath: "." })
             ) {
                 return { modifiedSourceCode: sourceCode };
             }
@@ -65,7 +67,7 @@ export async function buildJar(params: {
             for (const themeName of [...buildContext.themeNames, accountV1ThemeName]) {
                 if (
                     isInside({
-                        dirPath: pathJoin("src", "main", "resources", "theme", themeName),
+                        dirPath: pathJoin("theme", themeName),
                         filePath: fileRelativePath
                     })
                 ) {
@@ -87,13 +89,7 @@ export async function buildJar(params: {
 
                       if (
                           isInside({
-                              dirPath: pathJoin(
-                                  "src",
-                                  "main",
-                                  "resources",
-                                  "theme",
-                                  accountV1ThemeName
-                              ),
+                              dirPath: pathJoin("theme", accountV1ThemeName),
                               filePath: fileRelativePath
                           })
                       ) {
@@ -103,7 +99,7 @@ export async function buildJar(params: {
                       if (
                           fileRelativePath ===
                           getMetaInfKeycloakThemesJsonFilePath({
-                              keycloakifyBuildDirPath: "."
+                              resourcesDirPath: "."
                           })
                       ) {
                           const keycloakThemesJsonParsed = JSON.parse(
@@ -128,15 +124,7 @@ export async function buildJar(params: {
                       for (const themeName of buildContext.themeNames) {
                           if (
                               fileRelativePath ===
-                              pathJoin(
-                                  "src",
-                                  "main",
-                                  "resources",
-                                  "theme",
-                                  themeName,
-                                  "account",
-                                  "theme.properties"
-                              )
+                              pathJoin("theme", themeName, "account", "theme.properties")
                           ) {
                               const modifiedSourceCode = Buffer.from(
                                   sourceCode
@@ -160,8 +148,8 @@ export async function buildJar(params: {
                   };
 
         transformCodebase({
-            srcDirPath: buildContext.keycloakifyBuildDirPath,
-            destDirPath: keycloakifyBuildTmpDirPath,
+            srcDirPath: resourcesDirPath,
+            destDirPath: pathJoin(keycloakifyBuildTmpDirPath, "src", "main", "resources"),
             transformSourceCode: params => {
                 const resultCommon = transformCodebase_common(params);
 

package/src/bin/keycloakify/buildJars/buildJars.ts

@@ -8,7 +8,7 @@ import { getKeycloakVersionRangeForJar } from "./getKeycloakVersionRangeForJar";
 import { buildJar, BuildContextLike as BuildContextLike_buildJar } from "./buildJar";
 import type { BuildContext } from "../../shared/buildContext";
 import { getJarFileBasename } from "../../shared/getJarFileBasename";
-import { readMetaInfKeycloakThemes } from "../../shared/metaInfKeycloakThemes";
+import { readMetaInfKeycloakThemes_fromResourcesDirPath } from "../../shared/metaInfKeycloakThemes";
 import { accountV1ThemeName } from "../../shared/constants";
 
 export type BuildContextLike = BuildContextLike_buildJar & {
@@ -18,12 +18,14 @@ export type BuildContextLike = BuildContextLike_buildJar & {
 assert<BuildContext extends BuildContextLike ? true : false>();
 
 export async function buildJars(params: {
+    resourcesDirPath: string;
+    onlyBuildJarFileBasename: string | undefined;
     buildContext: BuildContextLike;
 }): Promise<void> {
-    const { buildContext } = params;
+    const { onlyBuildJarFileBasename, resourcesDirPath, buildContext } = params;
 
-    const doesImplementAccountTheme = readMetaInfKeycloakThemes({
-        keycloakifyBuildDirPath: buildContext.keycloakifyBuildDirPath
+    const doesImplementAccountTheme = readMetaInfKeycloakThemes_fromResourcesDirPath({
+        resourcesDirPath
     }).themes.some(({ name }) => name === accountV1ThemeName);
 
     await Promise.all(
@@ -56,12 +58,20 @@ export async function buildJars(params: {
                                 keycloakVersionRange
                             });
 
+                            if (
+                                onlyBuildJarFileBasename !== undefined &&
+                                onlyBuildJarFileBasename !== jarFileBasename
+                            ) {
+                                return undefined;
+                            }
+
                             return {
                                 keycloakThemeAdditionalInfoExtensionVersion,
                                 jarFileBasename
                             };
                         }
                     )
+                    .filter(exclude(undefined))
                     .map(
                         ({
                             keycloakThemeAdditionalInfoExtensionVersion,
@@ -71,6 +81,7 @@ export async function buildJars(params: {
                                 jarFileBasename,
                                 keycloakAccountV1Version,
                                 keycloakThemeAdditionalInfoExtensionVersion,
+                                resourcesDirPath,
                                 buildContext
                             })
                     )

package/src/bin/keycloakify/buildJars/extensionVersions.ts

@@ -1,5 +1,5 @@
 // NOTE: v0.5 is a dummy version.
-export const keycloakAccountV1Versions = [null, "0.3", "0.4"] as const;
+export const keycloakAccountV1Versions = [null, "0.3", "0.4", "0.6"] as const;
 
 /**
  * https://central.sonatype.com/artifact/io.phasetwo.keycloak/keycloak-account-v1

package/src/bin/keycloakify/buildJars/getKeycloakVersionRangeForJar.ts

@@ -44,12 +44,20 @@ export function getKeycloakVersionRangeForJar(params: {
                         case null:
                             return undefined;
                         case "1.1.5":
-                            return "24-and-above" as const;
+                            return "24" as const;
                     }
                     assert<
                         Equals<typeof keycloakThemeAdditionalInfoExtensionVersion, never>
                     >(false);
+                case "0.6":
+                    switch (keycloakThemeAdditionalInfoExtensionVersion) {
+                        case null:
+                            return undefined;
+                        case "1.1.5":
+                            return "25-and-above" as const;
+                    }
             }
+            assert<Equals<typeof keycloakAccountV1Version, never>>(false);
         })();
 
         assert<
@@ -65,7 +73,6 @@ export function getKeycloakVersionRangeForJar(params: {
             if (keycloakAccountV1Version !== null) {
                 return undefined;
             }
-
             switch (keycloakThemeAdditionalInfoExtensionVersion) {
                 case null:
                     return "21-and-below";

package/src/bin/keycloakify/generateSrcMainResources/bringInAccountV1.ts

@@ -13,13 +13,15 @@ import { transformCodebase } from "../../tools/transformCodebase";
 export type BuildContextLike = {
     cacheDirPath: string;
     npmWorkspaceRootDirPath: string;
-    keycloakifyBuildDirPath: string;
 };
 
 assert<BuildContext extends BuildContextLike ? true : false>();
 
-export async function bringInAccountV1(params: { buildContext: BuildContextLike }) {
-    const { buildContext } = params;
+export async function bringInAccountV1(params: {
+    resourcesDirPath: string;
+    buildContext: BuildContextLike;
+}) {
+    const { resourcesDirPath, buildContext } = params;
 
     const { defaultThemeDirPath } = await downloadKeycloakDefaultTheme({
         keycloakVersion: lastKeycloakVersionWithAccountV1,
@@ -27,10 +29,7 @@ export async function bringInAccountV1(params: { buildContext: BuildContextLike
     });
 
     const accountV1DirPath = pathJoin(
-        buildContext.keycloakifyBuildDirPath,
-        "src",
-        "main",
-        "resources",
+        resourcesDirPath,
         "theme",
         accountV1ThemeName,
         "account"

package/src/bin/keycloakify/generateSrcMainResources/generateSrcMainResources.ts

@@ -5,6 +5,8 @@ import {
     type BuildContextLike as BuildContextLike_generateSrcMainResourcesForMainTheme
 } from "./generateSrcMainResourcesForMainTheme";
 import { generateSrcMainResourcesForThemeVariant } from "./generateSrcMainResourcesForThemeVariant";
+import fs from "fs";
+import { rmSync } from "../../tools/fs.rmSync";
 
 export type BuildContextLike = BuildContextLike_generateSrcMainResourcesForMainTheme & {
     themeNames: string[];
@@ -14,21 +16,27 @@ assert<BuildContext extends BuildContextLike ? true : false>();
 
 export async function generateSrcMainResources(params: {
     buildContext: BuildContextLike;
+    resourcesDirPath: string;
 }): Promise<void> {
-    const { buildContext } = params;
+    const { resourcesDirPath, buildContext } = params;
 
     const [themeName, ...themeVariantNames] = buildContext.themeNames;
 
+    if (fs.existsSync(resourcesDirPath)) {
+        rmSync(resourcesDirPath, { recursive: true });
+    }
+
     await generateSrcMainResourcesForMainTheme({
+        resourcesDirPath,
         themeName,
         buildContext
     });
 
     for (const themeVariantName of themeVariantNames) {
         generateSrcMainResourcesForThemeVariant({
+            resourcesDirPath,
             themeName,
-            themeVariantName,
-            buildContext
+            themeVariantName
         });
     }
 }

package/src/bin/keycloakify/generateSrcMainResources/generateSrcMainResourcesForMainTheme.ts

@@ -43,14 +43,10 @@ import { escapeStringForPropertiesFile } from "../../tools/escapeStringForProper
 export type BuildContextLike = BuildContextLike_kcContextExclusionsFtlCode &
     BuildContextLike_downloadKeycloakStaticResources &
     BuildContextLike_bringInAccountV1 & {
-        bundler: "vite" | "webpack";
         extraThemeProperties: string[] | undefined;
         loginThemeResourcesFromKeycloakVersion: string;
-        projectBuildDirPath: string;
-        assetsDirPath: string;
-        urlPathname: string | undefined;
         projectDirPath: string;
-        keycloakifyBuildDirPath: string;
+        projectBuildDirPath: string;
         environmentVariables: { name: string; default: string }[];
     };
 
@@ -58,9 +54,10 @@ assert<BuildContext extends BuildContextLike ? true : false>();
 
 export async function generateSrcMainResourcesForMainTheme(params: {
     themeName: string;
+    resourcesDirPath: string;
     buildContext: BuildContextLike;
 }): Promise<void> {
-    const { themeName, buildContext } = params;
+    const { themeName, resourcesDirPath, buildContext } = params;
 
     const { themeSrcDirPath } = getThemeSrcDirPath({
         projectDirPath: buildContext.projectDirPath
@@ -68,15 +65,7 @@ export async function generateSrcMainResourcesForMainTheme(params: {
 
     const getThemeTypeDirPath = (params: { themeType: ThemeType | "email" }) => {
         const { themeType } = params;
-        return pathJoin(
-            buildContext.keycloakifyBuildDirPath,
-            "src",
-            "main",
-            "resources",
-            "theme",
-            themeName,
-            themeType
-        );
+        return pathJoin(resourcesDirPath, "theme", themeName, themeType);
     };
 
     const cssGlobalsToDefine: Record<string, string> = {};
@@ -207,8 +196,6 @@ export async function generateSrcMainResourcesForMainTheme(params: {
         ].forEach(pageId => {
             const { ftlCode } = generateFtlFilesCode({ pageId });
 
-            fs.mkdirSync(themeTypeDirPath, { recursive: true });
-
             fs.writeFileSync(
                 pathJoin(themeTypeDirPath, pageId),
                 Buffer.from(ftlCode, "utf8")
@@ -291,6 +278,7 @@ export async function generateSrcMainResourcesForMainTheme(params: {
 
     if (implementedThemeTypes.account) {
         await bringInAccountV1({
+            resourcesDirPath,
             buildContext
         });
     }
@@ -313,7 +301,7 @@ export async function generateSrcMainResourcesForMainTheme(params: {
         }
 
         writeMetaInfKeycloakThemes({
-            keycloakifyBuildDirPath: buildContext.keycloakifyBuildDirPath,
+            resourcesDirPath,
             metaInfKeycloakThemes
         });
     }

package/src/bin/keycloakify/generateSrcMainResources/generateSrcMainResourcesForThemeVariant.ts

@@ -2,7 +2,7 @@ import { join as pathJoin, extname as pathExtname, sep as pathSep } from "path";
 import { transformCodebase } from "../../tools/transformCodebase";
 import type { BuildContext } from "../../shared/buildContext";
 import {
-    readMetaInfKeycloakThemes,
+    readMetaInfKeycloakThemes_fromResourcesDirPath,
     writeMetaInfKeycloakThemes
 } from "../../shared/metaInfKeycloakThemes";
 import { assert } from "tsafe/assert";
@@ -14,20 +14,13 @@ export type BuildContextLike = {
 assert<BuildContext extends BuildContextLike ? true : false>();
 
 export function generateSrcMainResourcesForThemeVariant(params: {
+    resourcesDirPath: string;
     themeName: string;
     themeVariantName: string;
-    buildContext: BuildContextLike;
 }) {
-    const { themeName, themeVariantName, buildContext } = params;
+    const { resourcesDirPath, themeName, themeVariantName } = params;
 
-    const mainThemeDirPath = pathJoin(
-        buildContext.keycloakifyBuildDirPath,
-        "src",
-        "main",
-        "resources",
-        "theme",
-        themeName
-    );
+    const mainThemeDirPath = pathJoin(resourcesDirPath, "theme", themeName);
 
     transformCodebase({
         srcDirPath: mainThemeDirPath,
@@ -57,9 +50,10 @@ export function generateSrcMainResourcesForThemeVariant(params: {
     });
 
     {
-        const updatedMetaInfKeycloakThemes = readMetaInfKeycloakThemes({
-            keycloakifyBuildDirPath: buildContext.keycloakifyBuildDirPath
-        });
+        const updatedMetaInfKeycloakThemes =
+            readMetaInfKeycloakThemes_fromResourcesDirPath({
+                resourcesDirPath
+            });
 
         updatedMetaInfKeycloakThemes.themes.push({
             name: themeVariantName,
@@ -73,7 +67,7 @@ export function generateSrcMainResourcesForThemeVariant(params: {
         });
 
         writeMetaInfKeycloakThemes({
-            keycloakifyBuildDirPath: buildContext.keycloakifyBuildDirPath,
+            resourcesDirPath,
             metaInfKeycloakThemes: updatedMetaInfKeycloakThemes
         });
     }