keycloakify 11.5.4 → 11.6.1

package/bin/153.index.js

@@ -1317,13 +1317,57 @@ async function command(params) {
             source_default().cyan("On which version of Keycloak do you want to test your theme?"),
             source_default().gray("You can also explicitly provide the version with `npx keycloakify start-keycloak --keycloak-version 26` (or any other version)")
         ].join("\n"));
-        const { value: tag } = await dist_default()({
-            values: latestMajorTags
-        }).catch(() => {
-            process.exit(-1);
-        });
-        console.log(`→ ${tag}`);
-        return { dockerImageTag: tag };
+        const tag_userSelected = await (async () => {
+            let tag;
+            let latestMajorTags_copy = [...latestMajorTags];
+            while (true) {
+                const { value } = await dist_default()({
+                    values: latestMajorTags_copy
+                }).catch(() => {
+                    process.exit(-1);
+                });
+                tag = value;
+                {
+                    const doImplementAccountMpa = buildContext.implementedThemeTypes.account.isImplemented &&
+                        buildContext.implementedThemeTypes.account.type === "Multi-Page";
+                    if (doImplementAccountMpa && tag.startsWith("22.")) {
+                        console.log(source_default().yellow(`You are implementing a Multi-Page Account theme. Keycloak 22 is not supported, select another version`));
+                        latestMajorTags_copy = latestMajorTags_copy.filter(tag => !tag.startsWith("22."));
+                        continue;
+                    }
+                }
+                const readMajor = (tag) => {
+                    const major = parseInt(tag.split(".")[0]);
+                    (0,assert/* assert */.h)(!isNaN(major));
+                    return major;
+                };
+                {
+                    const major = readMajor(tag);
+                    const doImplementAdminTheme = buildContext.implementedThemeTypes.admin.isImplemented;
+                    const getIsSupported = (major) => major >= 23;
+                    if (doImplementAdminTheme && !getIsSupported(major)) {
+                        console.log(source_default().yellow(`You are implementing an Admin theme. Only Keycloak 23 and later are supported, select another version`));
+                        latestMajorTags_copy = latestMajorTags_copy.filter(tag => getIsSupported(readMajor(tag)));
+                        continue;
+                    }
+                }
+                {
+                    const doImplementAccountSpa = buildContext.implementedThemeTypes.account.isImplemented &&
+                        buildContext.implementedThemeTypes.account.type === "Single-Page";
+                    const major = readMajor(tag);
+                    const getIsSupported = (major) => major >= 19;
+                    if (doImplementAccountSpa && !getIsSupported(major)) {
+                        console.log(source_default().yellow(`You are implementing a Single-Page Account theme. Only Keycloak 19 and later are supported, select another version`));
+                        latestMajorTags_copy = latestMajorTags_copy.filter(tag => getIsSupported(readMajor(tag)));
+                        continue;
+                    }
+                }
+                break;
+            }
+            return tag;
+        })();
+        console.log(`→ ${tag_userSelected}`);
+        return { dockerImageTag: tag_userSelected };
     })();
     const keycloakMajorVersionNumber = (() => {
         const [wrap] = getSupportedKeycloakMajorVersions()
@@ -1634,31 +1678,40 @@ async function command(params) {
             ignoreInitial: true
         })
             .on("all", async (...[, filePath]) => {
-            ignore_account_spa: {
-                const doImplementAccountSpa = buildContext.implementedThemeTypes.account.isImplemented &&
-                    buildContext.implementedThemeTypes.account.type === "Single-Page";
-                if (!doImplementAccountSpa) {
-                    break ignore_account_spa;
+            ignore_path_covered_by_hmr: {
+                if (filePath.endsWith(".properties")) {
+                    break ignore_path_covered_by_hmr;
                 }
-                if (!(0,isInside/* isInside */.V)({
-                    dirPath: (0,external_path_.join)(buildContext.themeSrcDirPath, "account"),
-                    filePath
-                })) {
-                    break ignore_account_spa;
+                if (!doStartDevServer) {
+                    break ignore_path_covered_by_hmr;
                 }
-                return;
-            }
-            ignore_admin: {
-                if (!buildContext.implementedThemeTypes.admin.isImplemented) {
-                    break ignore_admin;
+                ignore_account_spa: {
+                    const doImplementAccountSpa = buildContext.implementedThemeTypes.account.isImplemented &&
+                        buildContext.implementedThemeTypes.account.type ===
+                            "Single-Page";
+                    if (!doImplementAccountSpa) {
+                        break ignore_account_spa;
+                    }
+                    if (!(0,isInside/* isInside */.V)({
+                        dirPath: (0,external_path_.join)(buildContext.themeSrcDirPath, "account"),
+                        filePath
+                    })) {
+                        break ignore_account_spa;
+                    }
+                    return;
                 }
-                if (!(0,isInside/* isInside */.V)({
-                    dirPath: (0,external_path_.join)(buildContext.themeSrcDirPath, "admin"),
-                    filePath
-                })) {
-                    break ignore_admin;
+                ignore_admin: {
+                    if (!buildContext.implementedThemeTypes.admin.isImplemented) {
+                        break ignore_admin;
+                    }
+                    if (!(0,isInside/* isInside */.V)({
+                        dirPath: (0,external_path_.join)(buildContext.themeSrcDirPath, "admin"),
+                        filePath
+                    })) {
+                        break ignore_admin;
+                    }
+                    return;
                 }
-                return;
             }
             console.log(`Detected changes in ${filePath}`);
             await waitForDebounce();

package/bin/{805.index.js → 174.index.js}

@@ -1,8 +1,64 @@
 "use strict";
-exports.id = 805;
-exports.ids = [805];
+exports.id = 174;
+exports.ids = [174];
 exports.modules = {
 
+/***/ 50689:
+/***/ (function(__unused_webpack_module, exports, __webpack_require__) {
+
+
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.VoidDeferred = exports.Deferred = void 0;
+var overwriteReadonlyProp_1 = __webpack_require__(47803);
+var Deferred = /** @class */ (function () {
+    function Deferred() {
+        var _this_1 = this;
+        this.isPending = true;
+        var resolve;
+        var reject;
+        this.pr = new Promise(function (resolve_, reject_) {
+            resolve = function (value) {
+                (0, overwriteReadonlyProp_1.overwriteReadonlyProp)(_this_1, "isPending", false);
+                resolve_(value);
+            };
+            reject = function (error) {
+                (0, overwriteReadonlyProp_1.overwriteReadonlyProp)(_this_1, "isPending", false);
+                reject_(error);
+            };
+        });
+        this.resolve = resolve;
+        this.reject = reject;
+    }
+    return Deferred;
+}());
+exports.Deferred = Deferred;
+var VoidDeferred = /** @class */ (function (_super) {
+    __extends(VoidDeferred, _super);
+    function VoidDeferred() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    return VoidDeferred;
+}(Deferred));
+exports.VoidDeferred = VoidDeferred;
+//# sourceMappingURL=Deferred.js.map
+
+/***/ }),
+
 /***/ 53501:
 /***/ (function(__unused_webpack_module, exports) {
 
@@ -653,6 +709,59 @@ exports.Polyfill = typeof Set !== "undefined" ? Set : LightSetImpl;
 
 /***/ }),
 
+/***/ 47803:
+/***/ (function(__unused_webpack_module, exports) {
+
+
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.overwriteReadonlyProp = void 0;
+/**
+ * Assign a value to a property even if the object is freezed or if the property is not writable
+ * Throw if the assignation fail ( for example if the property is non configurable write: false )
+ * */
+var overwriteReadonlyProp = function (obj, propertyName, value) {
+    try {
+        obj[propertyName] = value;
+    }
+    catch (_a) { }
+    if (obj[propertyName] === value) {
+        return value;
+    }
+    var errorDefineProperty = undefined;
+    var propertyDescriptor = Object.getOwnPropertyDescriptor(obj, propertyName) || {
+        "enumerable": true,
+        "configurable": true,
+    };
+    if (!!propertyDescriptor.get) {
+        throw new Error("Probably a wrong ides to overwrite ".concat(String(propertyName), " getter"));
+    }
+    try {
+        Object.defineProperty(obj, propertyName, __assign(__assign({}, propertyDescriptor), { value: value }));
+    }
+    catch (error) {
+        errorDefineProperty = error;
+    }
+    if (obj[propertyName] !== value) {
+        throw errorDefineProperty || new Error("Can't assign");
+    }
+    return value;
+};
+exports.overwriteReadonlyProp = overwriteReadonlyProp;
+//# sourceMappingURL=overwriteReadonlyProp.js.map
+
+/***/ }),
+
 /***/ 47393:
 /***/ ((__unused_webpack_module, exports) => {
 

package/bin/{356.index.js → 300.index.js}

@@ -1,6 +1,6 @@
 "use strict";
-exports.id = 356;
-exports.ids = [356];
+exports.id = 300;
+exports.ids = [300];
 exports.modules = {
 
 /***/ 6385:
@@ -25,31 +25,20 @@ exports.modules = {
 async function getUiModuleFileSourceCodeReadyToBeCopied(params) {
     const { buildContext, uiModuleDirPath, fileRelativePath, isForEjection, uiModuleName, uiModuleVersion } = params;
     let sourceCode = (await fs_promises__WEBPACK_IMPORTED_MODULE_1__.readFile((0,path__WEBPACK_IMPORTED_MODULE_2__.join)(uiModuleDirPath, _shared_constants__WEBPACK_IMPORTED_MODULE_4__/* .KEYCLOAK_THEME */ .PC, fileRelativePath))).toString("utf8");
-    const toComment = (lines) => {
-        for (const ext of [".ts", ".tsx", ".css", ".less", ".sass", ".js", ".jsx"]) {
-            if (!fileRelativePath.endsWith(ext)) {
-                continue;
-            }
-            return [`/**`, ...lines.map(line => ` * ${line}`), ` */`].join("\n");
-        }
-        if (fileRelativePath.endsWith(".html")) {
-            return [`<!--`, ...lines.map(line => ` ${line}`), `-->`].join("\n");
-        }
-        return undefined;
-    };
-    const comment = toComment(isForEjection
-        ? [`This file was ejected from ${uiModuleName} version ${uiModuleVersion}.`]
-        : [
-            `WARNING: Before modifying this file run the following command:`,
-            ``,
-            `$ npx keycloakify eject-file --file ${fileRelativePath.split(path__WEBPACK_IMPORTED_MODULE_2__.sep).join("/")}`,
-            ``,
-            `This file comes from ${uiModuleName} version ${uiModuleVersion}.`,
-            `This file has been copied over to your repo by your postinstall script: \`npx keycloakify postinstall\``
-        ]);
-    if (comment !== undefined) {
-        sourceCode = [comment, ``, sourceCode].join("\n");
-    }
+    sourceCode = addCommentToSourceCode({
+        sourceCode,
+        fileRelativePath,
+        commentLines: isForEjection
+            ? [`This file was ejected from ${uiModuleName} version ${uiModuleVersion}.`]
+            : [
+                `WARNING: Before modifying this file run the following command:`,
+                ``,
+                `$ npx keycloakify eject-file --file '${fileRelativePath.split(path__WEBPACK_IMPORTED_MODULE_2__.sep).join("/")}'`,
+                ``,
+                `This file comes from ${uiModuleName} version ${uiModuleVersion}.`,
+                `This file has been copied over to your repo by your postinstall script: \`npx keycloakify postinstall\``
+            ]
+    });
     const destFilePath = (0,path__WEBPACK_IMPORTED_MODULE_2__.join)(buildContext.themeSrcDirPath, fileRelativePath);
     format: {
         if (!(await (0,_tools_runPrettier__WEBPACK_IMPORTED_MODULE_0__/* .getIsPrettierAvailable */ .MT)())) {
@@ -62,6 +51,40 @@ async function getUiModuleFileSourceCodeReadyToBeCopied(params) {
     }
     return Buffer.from(sourceCode, "utf8");
 }
+function addCommentToSourceCode(params) {
+    const { sourceCode, fileRelativePath, commentLines } = params;
+    const toResult = (comment) => {
+        return [comment, ``, sourceCode].join("\n");
+    };
+    for (const ext of [".ts", ".tsx", ".css", ".less", ".sass", ".js", ".jsx"]) {
+        if (!fileRelativePath.endsWith(ext)) {
+            continue;
+        }
+        return toResult([`/**`, ...commentLines.map(line => ` * ${line}`), ` */`].join("\n"));
+    }
+    if (fileRelativePath.endsWith(".properties")) {
+        return toResult(commentLines.map(line => `# ${line}`).join("\n"));
+    }
+    if (fileRelativePath.endsWith(".html") || fileRelativePath.endsWith(".svg")) {
+        const comment = [
+            `<!--`,
+            ...commentLines.map(line => ` ${line.replace("--file", "-f").replace("Before modifying", "Before modifying or replacing")}`),
+            `-->`
+        ].join("\n");
+        if (fileRelativePath.endsWith(".html") && sourceCode.trim().startsWith("<!")) {
+            const [first, ...rest] = sourceCode.split(">");
+            const last = rest.join(">");
+            return [`${first}>`, comment, last].join("\n");
+        }
+        if (fileRelativePath.endsWith(".svg") && sourceCode.trim().startsWith("<?")) {
+            const [first, ...rest] = sourceCode.split("?>");
+            const last = rest.join("?>");
+            return [`${first}?>`, comment, last].join("\n");
+        }
+        return toResult(comment);
+    }
+    return sourceCode;
+}
 //# sourceMappingURL=getUiModuleFileSourceCodeReadyToBeCopied.js.map
 
 /***/ }),
@@ -166,7 +189,7 @@ async function readManagedGitignoreFile(params) {
 
 /***/ }),
 
-/***/ 5038:
+/***/ 58644:
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
 
 
@@ -310,6 +333,20 @@ var getUiModuleFileSourceCodeReadyToBeCopied = __webpack_require__(6385);
 var external_crypto_ = __webpack_require__(6113);
 // EXTERNAL MODULE: ./dist/bin/shared/constants.js
 var constants = __webpack_require__(173);
+;// CONCATENATED MODULE: ./node_modules/tsafe/esm/isAmong.mjs
+/** https://docs.tsafe.dev/isamong */
+function isAmong(names, value) {
+    for (const name of names) {
+        if (name === value) {
+            return true;
+        }
+    }
+    return false;
+}
+
+
+//# sourceMappingURL=isAmong.mjs.map
+
 ;// CONCATENATED MODULE: ./dist/bin/postinstall/uiModuleMeta.js
 
 
@@ -325,6 +362,7 @@ var constants = __webpack_require__(173);
 
 
 
+
 const zUiModuleMeta = (() => {
     const zTargetType = lib.z.object({
         moduleName: lib.z.string(),
@@ -468,7 +506,7 @@ async function getUiModuleMetas(params) {
             moduleName,
             version,
             files,
-            peerDependencies
+            peerDependencies: Object.fromEntries(Object.entries(peerDependencies).filter(([moduleName]) => !isAmong(["react", "@types/react"], moduleName)))
         });
     }));
     update_cache: {

package/bin/{33.index.js → 568.index.js}

@@ -1,5 +1,5 @@
-exports.id = 33;
-exports.ids = [33];
+exports.id = 568;
+exports.ids = [568];
 exports.modules = {
 
 /***/ 18512:
@@ -695,63 +695,6 @@ exports.withObjectValues = withObjectValues;
 
 /***/ }),
 
-/***/ 50689:
-/***/ (function(__unused_webpack_module, exports, __webpack_require__) {
-
-"use strict";
-
-var __extends = (this && this.__extends) || (function () {
-    var extendStatics = function (d, b) {
-        extendStatics = Object.setPrototypeOf ||
-            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
-        return extendStatics(d, b);
-    };
-    return function (d, b) {
-        if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
-        extendStatics(d, b);
-        function __() { this.constructor = d; }
-        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-    };
-})();
-Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.VoidDeferred = exports.Deferred = void 0;
-var overwriteReadonlyProp_1 = __webpack_require__(47803);
-var Deferred = /** @class */ (function () {
-    function Deferred() {
-        var _this_1 = this;
-        this.isPending = true;
-        var resolve;
-        var reject;
-        this.pr = new Promise(function (resolve_, reject_) {
-            resolve = function (value) {
-                (0, overwriteReadonlyProp_1.overwriteReadonlyProp)(_this_1, "isPending", false);
-                resolve_(value);
-            };
-            reject = function (error) {
-                (0, overwriteReadonlyProp_1.overwriteReadonlyProp)(_this_1, "isPending", false);
-                reject_(error);
-            };
-        });
-        this.resolve = resolve;
-        this.reject = reject;
-    }
-    return Deferred;
-}());
-exports.Deferred = Deferred;
-var VoidDeferred = /** @class */ (function (_super) {
-    __extends(VoidDeferred, _super);
-    function VoidDeferred() {
-        return _super !== null && _super.apply(this, arguments) || this;
-    }
-    return VoidDeferred;
-}(Deferred));
-exports.VoidDeferred = VoidDeferred;
-//# sourceMappingURL=Deferred.js.map
-
-/***/ }),
-
 /***/ 65010:
 /***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
@@ -1115,60 +1058,6 @@ function pendGo(self, fn) {
 }
 
 
-/***/ }),
-
-/***/ 47803:
-/***/ (function(__unused_webpack_module, exports) {
-
-"use strict";
-
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
-Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.overwriteReadonlyProp = void 0;
-/**
- * Assign a value to a property even if the object is freezed or if the property is not writable
- * Throw if the assignation fail ( for example if the property is non configurable write: false )
- * */
-var overwriteReadonlyProp = function (obj, propertyName, value) {
-    try {
-        obj[propertyName] = value;
-    }
-    catch (_a) { }
-    if (obj[propertyName] === value) {
-        return value;
-    }
-    var errorDefineProperty = undefined;
-    var propertyDescriptor = Object.getOwnPropertyDescriptor(obj, propertyName) || {
-        "enumerable": true,
-        "configurable": true,
-    };
-    if (!!propertyDescriptor.get) {
-        throw new Error("Probably a wrong ides to overwrite ".concat(String(propertyName), " getter"));
-    }
-    try {
-        Object.defineProperty(obj, propertyName, __assign(__assign({}, propertyDescriptor), { value: value }));
-    }
-    catch (error) {
-        errorDefineProperty = error;
-    }
-    if (obj[propertyName] !== value) {
-        throw errorDefineProperty || new Error("Can't assign");
-    }
-    return value;
-};
-exports.overwriteReadonlyProp = overwriteReadonlyProp;
-//# sourceMappingURL=overwriteReadonlyProp.js.map
-
 /***/ }),
 
 /***/ 78781: