keycloakify 11.6.2 → 11.7.1

package/bin/{921.index.js → 780.index.js}

@@ -1,9 +1,9 @@
 "use strict";
-exports.id = 921;
-exports.ids = [921,786];
+exports.id = 780;
+exports.ids = [780,786];
 exports.modules = {
 
-/***/ 21921:
+/***/ 75780:
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
 
 // ESM COMPAT FLAG
@@ -85,38 +85,10 @@ function updateAccountThemeImplementationInConfig(params) {
 var update_kc_gen = __webpack_require__(10786);
 // EXTERNAL MODULE: ./dist/bin/shared/customHandler_delegate.js + 1 modules
 var customHandler_delegate = __webpack_require__(72138);
-// EXTERNAL MODULE: external "child_process"
-var external_child_process_ = __webpack_require__(32081);
-var external_child_process_default = /*#__PURE__*/__webpack_require__.n(external_child_process_);
-;// CONCATENATED MODULE: ./dist/bin/shared/exitIfUncommittedChanges.js
-
-
-function exitIfUncommittedChanges(params) {
-    const { projectDirPath } = params;
-    let hasUncommittedChanges = undefined;
-    try {
-        hasUncommittedChanges =
-            external_child_process_default().execSync(`git status --porcelain`, {
-                cwd: projectDirPath
-            })
-                .toString()
-                .trim() !== "";
-    }
-    catch (_a) {
-        // Probably not a git repository
-        return;
-    }
-    if (!hasUncommittedChanges) {
-        return;
-    }
-    console.warn([
-        source_default().red("Please commit or stash your changes before running this command.\n"),
-        "This command will modify your project's files so it's better to have a clean working directory",
-        "so that you can easily see what has been changed and revert if needed."
-    ].join(" "));
-    process.exit(-1);
-}
-//# sourceMappingURL=exitIfUncommittedChanges.js.map
+// EXTERNAL MODULE: ./dist/bin/shared/exitIfUncommittedChanges.js
+var exitIfUncommittedChanges = __webpack_require__(22058);
+// EXTERNAL MODULE: ./dist/bin/tools/getThisCodebaseRootDirPath.js
+var getThisCodebaseRootDirPath = __webpack_require__(58822);
 ;// CONCATENATED MODULE: ./dist/bin/initialize-account-theme/initialize-account-theme.js
 
 
@@ -126,6 +98,7 @@ function exitIfUncommittedChanges(params) {
 
 
 
+
 async function command(params) {
     const { buildContext } = params;
     const { hasBeenHandled } = (0,customHandler_delegate/* maybeDelegateCommandToCustomHandler */.q)({
@@ -141,7 +114,7 @@ async function command(params) {
         console.warn(source_default().red(`There is already a ${(0,external_path_.relative)(process.cwd(), accountThemeSrcDirPath)} directory in your project. Aborting.`));
         process.exit(-1);
     }
-    exitIfUncommittedChanges({
+    (0,exitIfUncommittedChanges/* exitIfUncommittedChanges */.l)({
         projectDirPath: buildContext.projectDirPath
     });
     const { value: accountThemeType } = await dist_default()({
@@ -151,18 +124,13 @@ async function command(params) {
     });
     switch (accountThemeType) {
         case "Multi-Page":
-            {
-                const { initializeAccountTheme_multiPage } = await __webpack_require__.e(/* import() */ 743).then(__webpack_require__.bind(__webpack_require__, 22743));
-                await initializeAccountTheme_multiPage({
-                    accountThemeSrcDirPath
-                });
-            }
+            external_fs_.cpSync((0,external_path_.join)((0,getThisCodebaseRootDirPath/* getThisCodebaseRootDirPath */.e)(), "src", "bin", "initialize-account-theme", "multi-page-boilerplate"), accountThemeSrcDirPath, { recursive: true });
             break;
         case "Single-Page":
             {
-                const { initializeAccountTheme_singlePage } = await Promise.all(/* import() */[__webpack_require__.e(174), __webpack_require__.e(525), __webpack_require__.e(375), __webpack_require__.e(735)]).then(__webpack_require__.bind(__webpack_require__, 84735));
-                await initializeAccountTheme_singlePage({
-                    accountThemeSrcDirPath,
+                const { initializeSpa } = await __webpack_require__.e(/* import() */ 288).then(__webpack_require__.bind(__webpack_require__, 27288));
+                await initializeSpa({
+                    themeType: "account",
                     buildContext
                 });
             }
@@ -256,6 +224,47 @@ function maybeDelegateCommandToCustomHandler(params) {
 
 /***/ }),
 
+/***/ 22058:
+/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
+
+/* harmony export */ __webpack_require__.d(__webpack_exports__, {
+/* harmony export */   "l": () => (/* binding */ exitIfUncommittedChanges)
+/* harmony export */ });
+/* harmony import */ var child_process__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(32081);
+/* harmony import */ var child_process__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(child_process__WEBPACK_IMPORTED_MODULE_0__);
+/* harmony import */ var chalk__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(78818);
+/* harmony import */ var chalk__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(chalk__WEBPACK_IMPORTED_MODULE_1__);
+
+
+function exitIfUncommittedChanges(params) {
+    const { projectDirPath } = params;
+    let hasUncommittedChanges = undefined;
+    try {
+        hasUncommittedChanges =
+            child_process__WEBPACK_IMPORTED_MODULE_0___default().execSync(`git status --porcelain`, {
+                cwd: projectDirPath
+            })
+                .toString()
+                .trim() !== "";
+    }
+    catch (_a) {
+        // Probably not a git repository
+        return;
+    }
+    if (!hasUncommittedChanges) {
+        return;
+    }
+    console.warn([
+        chalk__WEBPACK_IMPORTED_MODULE_1___default().red("Please commit or stash your changes before running this command.\n"),
+        "This command will modify your project's files so it's better to have a clean working directory",
+        "so that you can easily see what has been changed and revert if needed."
+    ].join(" "));
+    process.exit(-1);
+}
+//# sourceMappingURL=exitIfUncommittedChanges.js.map
+
+/***/ }),
+
 /***/ 43765:
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
 

package/bin/880.index.js

@@ -782,9 +782,6 @@ function writeMetaInfKeycloakThemes(params) {
 var objectEntries = __webpack_require__(91040);
 // EXTERNAL MODULE: ./dist/bin/tools/escapeStringForPropertiesFile.js
 var escapeStringForPropertiesFile = __webpack_require__(27190);
-// EXTERNAL MODULE: external "child_process"
-var external_child_process_ = __webpack_require__(32081);
-var external_child_process_default = /*#__PURE__*/__webpack_require__.n(external_child_process_);
 // EXTERNAL MODULE: ./node_modules/properties-parser/index.js
 var properties_parser = __webpack_require__(44414);
 var properties_parser_default = /*#__PURE__*/__webpack_require__.n(properties_parser);
@@ -848,6 +845,8 @@ function createObjectWithSomePropertiesThatThrowIfAccessed(obj, debugMessage) {
     })));
 }
 //# sourceMappingURL=createObjectThatThrowsIfAccessed.js.map
+// EXTERNAL MODULE: ./dist/bin/tools/listInstalledModules.js
+var listInstalledModules = __webpack_require__(75564);
 ;// CONCATENATED MODULE: ./dist/bin/keycloakify/generateResources/generateResources.js
 
 
@@ -997,9 +996,9 @@ async function generateResources(params) {
             external_fs_default().writeFileSync((0,external_path_.join)(themeTypeDirPath, pageId), Buffer.from(ftlCode, "utf8"));
         });
         let languageTags = undefined;
-        i18n_messages_generation: {
+        i18n_multi_page: {
             if (isSpa) {
-                break i18n_messages_generation;
+                break i18n_multi_page;
             }
             (0,assert/* assert */.h)(themeType !== "admin");
             const wrap = (0,generateMessageProperties/* generateMessageProperties */.k)({
@@ -1011,22 +1010,37 @@ async function generateResources(params) {
             writeMessagePropertiesFilesByThemeType[themeType] =
                 writeMessagePropertiesFiles;
         }
-        bring_in_account_spa_messages: {
+        let isLegacyAccountSpa = false;
+        // NOTE: Eventually remove this block.
+        i18n_single_page_account_legacy: {
             if (!isSpa) {
-                break bring_in_account_spa_messages;
+                break i18n_single_page_account_legacy;
             }
             if (themeType !== "account") {
-                break bring_in_account_spa_messages;
+                break i18n_single_page_account_legacy;
             }
-            const accountUiDirPath = external_child_process_.execSync(`npm list @keycloakify/keycloak-account-ui --parseable`, {
-                cwd: (0,external_path_.dirname)(buildContext.packageJsonFilePath)
-            })
-                .toString("utf8")
-                .trim();
-            const messageDirPath_defaults = (0,external_path_.join)(accountUiDirPath, "messages");
+            const [moduleMeta] = await (0,listInstalledModules/* listInstalledModules */.P)({
+                packageJsonFilePath: buildContext.packageJsonFilePath,
+                filter: ({ moduleName }) => moduleName === "@keycloakify/keycloak-account-ui"
+            });
+            (0,assert/* assert */.h)(moduleMeta !== undefined, `@keycloakify/keycloak-account-ui is supposed to be installed`);
+            {
+                const [majorStr] = moduleMeta.version.split(".");
+                if (majorStr.length === 6) {
+                    // NOTE: Now we use the format MMmmpp (Major, minor, patch) for example for
+                    // 26.0.7 it would be 260007.
+                    break i18n_single_page_account_legacy;
+                }
+                else {
+                    // 25.0.4-rc.5 or later
+                    isLegacyAccountSpa = true;
+                }
+            }
+            const messageDirPath_defaults = (0,external_path_.join)(moduleMeta.dirPath, "messages");
             if (!external_fs_default().existsSync(messageDirPath_defaults)) {
                 throw new Error(`Please update @keycloakify/keycloak-account-ui to 25.0.4-rc.5 or later.`);
             }
+            isLegacyAccountSpa = true;
             const messagesDirPath_dest = (0,external_path_.join)(getThemeTypeDirPath({ themeName, themeType: "account" }), "messages");
             (0,transformCodebase/* transformCodebase */.N)({
                 srcDirPath: messageDirPath_defaults,
@@ -1056,11 +1070,15 @@ async function generateResources(params) {
             languageTags = external_fs_default().readdirSync(messagesDirPath_dest)
                 .map(basename => basename.replace(/^messages_/, "").replace(/\.properties$/, ""));
         }
-        bring_in_admin_messages: {
-            if (themeType !== "admin") {
-                break bring_in_admin_messages;
+        i18n_single_page: {
+            if (!isSpa) {
+                break i18n_single_page;
+            }
+            if (isLegacyAccountSpa) {
+                break i18n_single_page;
             }
-            const messagesDirPath_theme = (0,external_path_.join)(buildContext.themeSrcDirPath, "admin", "i18n");
+            (0,assert/* assert */.h)(themeType === "account" || themeType === "admin");
+            const messagesDirPath_theme = (0,external_path_.join)(buildContext.themeSrcDirPath, themeType, "i18n");
             (0,assert/* assert */.h)(external_fs_default().existsSync(messagesDirPath_theme), `${messagesDirPath_theme} is supposed to exist`);
             const propertiesByLang = {};
             external_fs_default().readdirSync(messagesDirPath_theme).forEach(basename => {
@@ -1100,7 +1118,7 @@ async function generateResources(params) {
                 }
                 (_a = propertiesByLang[_b = parsedBasename.lang]) !== null && _a !== void 0 ? _a : (propertiesByLang[_b] = {
                     base: createObjectThatThrowsIfAccessed({
-                        debugMessage: `No base ${parsedBasename.lang} translation for admin theme`
+                        debugMessage: `No base ${parsedBasename.lang} translation for ${themeType} theme`
                     }),
                     override: undefined,
                     overrideByThemeName: {}
@@ -1116,12 +1134,12 @@ async function generateResources(params) {
                 }
                 propertiesByLang[parsedBasename.lang].overrideByThemeName[parsedBasename.themeName] = buffer;
             });
-            writeMessagePropertiesFilesByThemeType.admin = ({ messageDirPath, themeName }) => {
+            languageTags = Object.keys(propertiesByLang);
+            writeMessagePropertiesFilesByThemeType[themeType] = ({ messageDirPath, themeName }) => {
                 if (!external_fs_default().existsSync(messageDirPath)) {
                     external_fs_default().mkdirSync(messageDirPath, { recursive: true });
                 }
                 Object.entries(propertiesByLang).forEach(([lang, { base, override, overrideByThemeName }]) => {
-                    (languageTags !== null && languageTags !== void 0 ? languageTags : (languageTags = [])).push(lang);
                     const messages = properties_parser_default().parse(base.toString("utf8"));
                     if (override !== undefined) {
                         const overrideMessages = properties_parser_default().parse(override.toString("utf8"));
@@ -1287,6 +1305,9 @@ async function generateResources(params) {
 ;// CONCATENATED MODULE: ./dist/bin/keycloakify/generateResources/index.js
 
 //# sourceMappingURL=index.js.map
+// EXTERNAL MODULE: external "child_process"
+var external_child_process_ = __webpack_require__(32081);
+var external_child_process_default = /*#__PURE__*/__webpack_require__.n(external_child_process_);
 ;// CONCATENATED MODULE: ./dist/bin/keycloakify/buildJars/extensionVersions.js
 // NOTE: v0.5 is a dummy version.
 const keycloakAccountV1Versions = [null, "0.3", "0.4", "0.6"];
@@ -1904,6 +1925,82 @@ function rmSync(dirPath, options) {
 
 /***/ }),
 
+/***/ 93721:
+/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
+
+
+// EXPORTS
+__webpack_require__.d(__webpack_exports__, {
+  "p": () => (/* binding */ getInstalledModuleDirPath)
+});
+
+// EXTERNAL MODULE: external "path"
+var external_path_ = __webpack_require__(71017);
+// EXTERNAL MODULE: ./dist/bin/tools/fs.existsAsync.js
+var fs_existsAsync = __webpack_require__(43765);
+// EXTERNAL MODULE: external "child_process"
+var external_child_process_ = __webpack_require__(32081);
+// EXTERNAL MODULE: ./node_modules/tsafe/esm/assert.mjs + 1 modules
+var assert = __webpack_require__(29041);
+;// CONCATENATED MODULE: ./dist/bin/tools/isRootPath.js
+
+function getIsRootPath(filePath) {
+    const path_normalized = (0,external_path_.normalize)(filePath);
+    // Unix-like root ("/")
+    if (path_normalized === "/") {
+        return true;
+    }
+    // Check for Windows drive root (e.g., "C:\\")
+    if (/^[a-zA-Z]:\\$/.test(path_normalized)) {
+        return true;
+    }
+    // Check for UNC root (e.g., "\\server\share")
+    if (/^\\\\[^\\]+\\[^\\]+\\?$/.test(path_normalized)) {
+        return true;
+    }
+    return false;
+}
+//# sourceMappingURL=isRootPath.js.map
+;// CONCATENATED MODULE: ./dist/bin/tools/getInstalledModuleDirPath.js
+
+
+
+
+
+async function getInstalledModuleDirPath(params) {
+    const { moduleName, packageJsonDirPath } = params;
+    {
+        let dirPath = packageJsonDirPath;
+        while (true) {
+            const dirPath_candidate = (0,external_path_.join)(dirPath, "node_modules", ...moduleName.split("/"));
+            let doesExist;
+            try {
+                doesExist = await (0,fs_existsAsync/* existsAsync */.o)(dirPath_candidate);
+            }
+            catch (_a) {
+                doesExist = false;
+            }
+            if (doesExist) {
+                return dirPath_candidate;
+            }
+            if (getIsRootPath(dirPath)) {
+                break;
+            }
+            dirPath = (0,external_path_.join)(dirPath, "..");
+        }
+    }
+    const dirPath = external_child_process_.execSync(`npm list ${moduleName}`, {
+        cwd: packageJsonDirPath
+    })
+        .toString("utf8")
+        .trim();
+    (0,assert/* assert */.h)(dirPath !== "");
+    return dirPath;
+}
+//# sourceMappingURL=getInstalledModuleDirPath.js.map
+
+/***/ }),
+
 /***/ 90665:
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
 
@@ -1921,6 +2018,94 @@ function isInside(params) {
 
 /***/ }),
 
+/***/ 75564:
+/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
+
+/* harmony export */ __webpack_require__.d(__webpack_exports__, {
+/* harmony export */   "P": () => (/* binding */ listInstalledModules)
+/* harmony export */ });
+/* harmony import */ var tsafe_assert__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(29041);
+/* harmony import */ var tsafe_id__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(38469);
+/* harmony import */ var zod__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(52300);
+/* 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 fs_promises__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(73292);
+/* harmony import */ var fs_promises__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(fs_promises__WEBPACK_IMPORTED_MODULE_2__);
+/* harmony import */ var _tools_getInstalledModuleDirPath__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(93721);
+/* harmony import */ var tsafe_exclude__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(83101);
+
+
+
+
+
+
+
+async function listInstalledModules(params) {
+    const { packageJsonFilePath, filter } = params;
+    const parsedPackageJson = await readPackageJsonDependencies({
+        packageJsonFilePath
+    });
+    const extensionModuleNames = [parsedPackageJson.dependencies, parsedPackageJson.devDependencies]
+        .filter((0,tsafe_exclude__WEBPACK_IMPORTED_MODULE_4__/* .exclude */ .D)(undefined))
+        .map(obj => Object.keys(obj))
+        .flat()
+        .filter(moduleName => filter({ moduleName }));
+    const result = await Promise.all(extensionModuleNames.map(async (moduleName) => {
+        const dirPath = await (0,_tools_getInstalledModuleDirPath__WEBPACK_IMPORTED_MODULE_3__/* .getInstalledModuleDirPath */ .p)({
+            moduleName,
+            packageJsonDirPath: (0,path__WEBPACK_IMPORTED_MODULE_1__.dirname)(packageJsonFilePath)
+        });
+        const { version, peerDependencies } = await readPackageJsonVersionAndPeerDependencies({
+            packageJsonFilePath: (0,path__WEBPACK_IMPORTED_MODULE_1__.join)(dirPath, "package.json")
+        });
+        return { moduleName, version, peerDependencies, dirPath };
+    }));
+    return result;
+}
+const { readPackageJsonDependencies } = (() => {
+    const zParsedPackageJson = (() => {
+        const zTargetType = zod__WEBPACK_IMPORTED_MODULE_5__.z.object({
+            dependencies: zod__WEBPACK_IMPORTED_MODULE_5__.z.record(zod__WEBPACK_IMPORTED_MODULE_5__.z.string()).optional(),
+            devDependencies: zod__WEBPACK_IMPORTED_MODULE_5__.z.record(zod__WEBPACK_IMPORTED_MODULE_5__.z.string()).optional()
+        });
+        (0,tsafe_assert__WEBPACK_IMPORTED_MODULE_0__/* .assert */ .h)();
+        return (0,tsafe_id__WEBPACK_IMPORTED_MODULE_6__.id)(zTargetType);
+    })();
+    async function readPackageJsonDependencies(params) {
+        const { packageJsonFilePath } = params;
+        const parsedPackageJson = JSON.parse((await fs_promises__WEBPACK_IMPORTED_MODULE_2__.readFile(packageJsonFilePath)).toString("utf8"));
+        zParsedPackageJson.parse(parsedPackageJson);
+        (0,tsafe_assert__WEBPACK_IMPORTED_MODULE_0__/* .assert */ .h)((0,tsafe_assert__WEBPACK_IMPORTED_MODULE_0__.is)(parsedPackageJson));
+        return parsedPackageJson;
+    }
+    return { readPackageJsonDependencies };
+})();
+const { readPackageJsonVersionAndPeerDependencies } = (() => {
+    const zParsedPackageJson = (() => {
+        const zTargetType = zod__WEBPACK_IMPORTED_MODULE_5__.z.object({
+            version: zod__WEBPACK_IMPORTED_MODULE_5__.z.string(),
+            peerDependencies: zod__WEBPACK_IMPORTED_MODULE_5__.z.record(zod__WEBPACK_IMPORTED_MODULE_5__.z.string()).optional()
+        });
+        (0,tsafe_assert__WEBPACK_IMPORTED_MODULE_0__/* .assert */ .h)();
+        return (0,tsafe_id__WEBPACK_IMPORTED_MODULE_6__.id)(zTargetType);
+    })();
+    async function readPackageJsonVersionAndPeerDependencies(params) {
+        var _a;
+        const { packageJsonFilePath } = params;
+        const parsedPackageJson = JSON.parse((await fs_promises__WEBPACK_IMPORTED_MODULE_2__.readFile(packageJsonFilePath)).toString("utf8"));
+        zParsedPackageJson.parse(parsedPackageJson);
+        (0,tsafe_assert__WEBPACK_IMPORTED_MODULE_0__/* .assert */ .h)((0,tsafe_assert__WEBPACK_IMPORTED_MODULE_0__.is)(parsedPackageJson));
+        return {
+            version: parsedPackageJson.version,
+            peerDependencies: (_a = parsedPackageJson.peerDependencies) !== null && _a !== void 0 ? _a : {}
+        };
+    }
+    return { readPackageJsonVersionAndPeerDependencies };
+})();
+//# sourceMappingURL=listInstalledModules.js.map
+
+/***/ }),
+
 /***/ 60332:
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {