keycloakify 10.0.0-rc.18 → 10.0.0-rc.19

package/bin/main.js

@@ -4832,6 +4832,207 @@ exports.promptKeycloakVersion = promptKeycloakVersion;
 
 /***/ }),
 
+/***/ 18170:
+/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
+
+"use strict";
+
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+var __values = (this && this.__values) || function(o) {
+    var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
+    if (m) return m.call(o);
+    if (o && typeof o.length === "number") return {
+        next: function () {
+            if (o && i >= o.length) o = void 0;
+            return { value: o && o[i++], done: !o };
+        }
+    };
+    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
+};
+var __read = (this && this.__read) || function (o, n) {
+    var m = typeof Symbol === "function" && o[Symbol.iterator];
+    if (!m) return o;
+    var i = m.call(o), r, ar = [], e;
+    try {
+        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
+    }
+    catch (error) { e = { error: error }; }
+    finally {
+        try {
+            if (r && !r.done && (m = i["return"])) m.call(i);
+        }
+        finally { if (e) throw e.error; }
+    }
+    return ar;
+};
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.appBuild = void 0;
+var child_process = __importStar(__nccwpck_require__(32081));
+var Deferred_1 = __nccwpck_require__(50689);
+var assert_1 = __nccwpck_require__(88078);
+var is_1 = __nccwpck_require__(94655);
+var fs = __importStar(__nccwpck_require__(57147));
+var path_1 = __nccwpck_require__(71017);
+(0, assert_1.assert)();
+function appBuild(params) {
+    return __awaiter(this, void 0, void 0, function () {
+        var doSkipIfReactAppBuildDirExists, buildOptions, bundler, _a, command, args, cwd, dResult, child, isSuccess;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
+                case 0:
+                    doSkipIfReactAppBuildDirExists = params.doSkipIfReactAppBuildDirExists, buildOptions = params.buildOptions;
+                    if (doSkipIfReactAppBuildDirExists &&
+                        fs.existsSync(buildOptions.reactAppBuildDirPath)) {
+                        return [2 /*return*/, { isAppBuildSuccess: true }];
+                    }
+                    bundler = buildOptions.bundler;
+                    _a = (function () {
+                        var e_1, _a;
+                        var _b;
+                        switch (bundler) {
+                            case "vite":
+                                return {
+                                    command: "npx",
+                                    args: ["vite", "build"],
+                                    cwd: buildOptions.reactAppRootDirPath
+                                };
+                            case "webpack": {
+                                try {
+                                    for (var _c = __values([
+                                        buildOptions.reactAppRootDirPath,
+                                        buildOptions.npmWorkspaceRootDirPath
+                                    ]), _d = _c.next(); !_d.done; _d = _c.next()) {
+                                        var dirPath = _d.value;
+                                        try {
+                                            var parsedPackageJson = JSON.parse(fs
+                                                .readFileSync((0, path_1.join)(dirPath, "package.json"))
+                                                .toString("utf8"));
+                                            var _e = __read((_b = Object.entries(parsedPackageJson.scripts).find(function (_a) {
+                                                var _b = __read(_a, 2), scriptValue = _b[1];
+                                                (0, assert_1.assert)((0, is_1.is)(scriptValue));
+                                                if (scriptValue.includes("webpack") &&
+                                                    scriptValue.includes("--mode production")) {
+                                                    return true;
+                                                }
+                                                if (scriptValue.includes("react-scripts") &&
+                                                    scriptValue.includes("build")) {
+                                                    return true;
+                                                }
+                                                if (scriptValue.includes("react-app-rewired") &&
+                                                    scriptValue.includes("build")) {
+                                                    return true;
+                                                }
+                                                if (scriptValue.includes("craco") &&
+                                                    scriptValue.includes("build")) {
+                                                    return true;
+                                                }
+                                            })) !== null && _b !== void 0 ? _b : [], 1), scriptName = _e[0];
+                                            if (scriptName === undefined) {
+                                                continue;
+                                            }
+                                            return {
+                                                command: "npm",
+                                                args: ["run", scriptName],
+                                                cwd: dirPath
+                                            };
+                                        }
+                                        catch (_f) {
+                                            continue;
+                                        }
+                                    }
+                                }
+                                catch (e_1_1) { e_1 = { error: e_1_1 }; }
+                                finally {
+                                    try {
+                                        if (_d && !_d.done && (_a = _c.return)) _a.call(_c);
+                                    }
+                                    finally { if (e_1) throw e_1.error; }
+                                }
+                                throw new Error("Keycloakify was unable to determine which script is responsible for building the app.");
+                            }
+                        }
+                    })(), command = _a.command, args = _a.args, cwd = _a.cwd;
+                    dResult = new Deferred_1.Deferred();
+                    child = child_process.spawn(command, args, { cwd: cwd });
+                    child.stdout.on("data", function (data) {
+                        if (data.toString("utf8").includes("gzip:")) {
+                            return;
+                        }
+                        process.stdout.write(data);
+                    });
+                    child.stderr.on("data", function (data) { return process.stderr.write(data); });
+                    child.on("exit", function (code) { return dResult.resolve({ isSuccess: code === 0 }); });
+                    return [4 /*yield*/, dResult.pr];
+                case 1:
+                    isSuccess = (_b.sent()).isSuccess;
+                    return [2 /*return*/, { isAppBuildSuccess: isSuccess }];
+            }
+        });
+    });
+}
+exports.appBuild = appBuild;
+//# sourceMappingURL=appBuild.js.map
+
+/***/ }),
+
 /***/ 94229:
 /***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
 
@@ -4857,7 +5058,7 @@ __exportStar(__nccwpck_require__(91864), exports);
 
 /***/ }),
 
-/***/ 91864:
+/***/ 87545:
 /***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
 
 "use strict";
@@ -4873,6 +5074,106 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.keycloakifyBuild = void 0;
+var constants_1 = __nccwpck_require__(173);
+var child_process = __importStar(__nccwpck_require__(32081));
+var Deferred_1 = __nccwpck_require__(50689);
+var assert_1 = __nccwpck_require__(88078);
+(0, assert_1.assert)();
+function keycloakifyBuild(params) {
+    return __awaiter(this, void 0, void 0, function () {
+        var buildOptions, doSkipBuildJars, dResult, child, isSuccess;
+        var _a;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
+                case 0:
+                    buildOptions = params.buildOptions, doSkipBuildJars = params.doSkipBuildJars;
+                    dResult = new Deferred_1.Deferred();
+                    child = child_process.spawn("npx", ["keycloakify", "build"], {
+                        cwd: buildOptions.reactAppRootDirPath,
+                        env: __assign(__assign({}, process.env), (doSkipBuildJars ? (_a = {}, _a[constants_1.skipBuildJarsEnvName] = "true", _a) : {}))
+                    });
+                    child.stdout.on("data", function (data) { return process.stdout.write(data); });
+                    child.stderr.on("data", function (data) { return process.stderr.write(data); });
+                    child.on("exit", function (code) { return dResult.resolve({ isSuccess: code === 0 }); });
+                    return [4 /*yield*/, dResult.pr];
+                case 1:
+                    isSuccess = (_b.sent()).isSuccess;
+                    return [2 /*return*/, { isKeycloakifyBuildSuccess: isSuccess }];
+            }
+        });
+    });
+}
+exports.keycloakifyBuild = keycloakifyBuild;
+//# sourceMappingURL=keycloakifyBuild.js.map
+
+/***/ }),
+
+/***/ 91864:
+/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
+
+"use strict";
+
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     var desc = Object.getOwnPropertyDescriptor(m, k);
@@ -4987,14 +5288,15 @@ var chalk_1 = __importDefault(__nccwpck_require__(78818));
 var chokidar_1 = __importDefault(__nccwpck_require__(42677));
 var waitForDebounce_1 = __nccwpck_require__(18721);
 var getThisCodebaseRootDirPath_1 = __nccwpck_require__(58822);
-var Deferred_1 = __nccwpck_require__(50689);
 var getAbsoluteAndInOsFormatPath_1 = __nccwpck_require__(86644);
 var cli_select_1 = __importDefault(__nccwpck_require__(99398));
 var runExclusive = __importStar(__nccwpck_require__(81708));
 var extractArchive_1 = __nccwpck_require__(29121);
+var appBuild_1 = __nccwpck_require__(18170);
+var keycloakifyBuild_1 = __nccwpck_require__(87545);
 function command(params) {
     return __awaiter(this, void 0, void 0, function () {
-        var commandOutput, isDockerRunning, cliCommandOptions, buildOptions, metaInfKeycloakThemes, doesImplementAccountTheme, _a, keycloakVersion, keycloakMajorVersionNumber, keycloakVersionRange, jarFileBasename, realmJsonFilePath, jarFilePath, doLinkAccountV1Theme, spawnArgs, child, srcDirPath, handler_1, runBuildKeycloakTheme_1, waitForDebounce_2;
+        var commandOutput, isDockerRunning, cliCommandOptions, buildOptions, isAppBuildSuccess, isKeycloakifyBuildSuccess, metaInfKeycloakThemes, doesImplementAccountTheme, _a, keycloakVersion, keycloakMajorVersionNumber, keycloakVersionRange, jarFileBasename, realmJsonFilePath, jarFilePath, doUseBuiltInAccountV1Theme, accountThemePropertyPatch, spawnArgs, child, srcDirPath, handler_1, runFullBuild_1, waitForDebounce_2;
         var _this = this;
         return __generator(this, function (_b) {
             switch (_b.label) {
@@ -5037,14 +5339,24 @@ function command(params) {
                     }
                     cliCommandOptions = params.cliCommandOptions;
                     buildOptions = (0, buildOptions_1.readBuildOptions)({ cliCommandOptions: cliCommandOptions });
-                    exit_if_theme_not_built: {
-                        if (fs.existsSync(buildOptions.keycloakifyBuildDirPath)) {
-                            break exit_if_theme_not_built;
-                        }
-                        console.log([
-                            "".concat(chalk_1.default.red("The theme has not been built.")),
-                            "Please run ".concat(chalk_1.default.bold("npx vite && npx keycloakify build"), " first.")
-                        ].join(" "));
+                    return [4 /*yield*/, (0, appBuild_1.appBuild)({
+                            doSkipIfReactAppBuildDirExists: true,
+                            buildOptions: buildOptions
+                        })];
+                case 1:
+                    isAppBuildSuccess = (_b.sent()).isAppBuildSuccess;
+                    if (!isAppBuildSuccess) {
+                        console.log(chalk_1.default.red("App build failed, exiting. Try running 'yarn build-keycloak-theme' and see what's wrong."));
+                        process.exit(1);
+                    }
+                    return [4 /*yield*/, (0, keycloakifyBuild_1.keycloakifyBuild)({
+                            doSkipBuildJars: false,
+                            buildOptions: buildOptions
+                        })];
+                case 2:
+                    isKeycloakifyBuildSuccess = (_b.sent()).isKeycloakifyBuildSuccess;
+                    if (!isKeycloakifyBuildSuccess) {
+                        console.log(chalk_1.default.red("Keycloakify build failed, exiting. Try running 'yarn build-keycloak-theme' and see what's wrong."));
                         process.exit(1);
                     }
                     metaInfKeycloakThemes = (0, metaInfKeycloakThemes_1.readMetaInfKeycloakThemes)({
@@ -5088,7 +5400,7 @@ function command(params) {
                                 });
                             });
                         })()];
-                case 1:
+                case 3:
                     _a = _b.sent(), keycloakVersion = _a.keycloakVersion, keycloakMajorVersionNumber = _a.keycloakMajorNumber;
                     keycloakVersionRange = (function () {
                         if (doesImplementAccountTheme) {
@@ -5118,12 +5430,6 @@ function command(params) {
                     })();
                     jarFileBasename = (0, getJarFileBasename_1.getJarFileBasename)({ keycloakVersionRange: keycloakVersionRange }).jarFileBasename;
                     console.log("Using Keycloak ".concat(chalk_1.default.bold(jarFileBasename)));
-                    try {
-                        child_process.execSync("docker rm --force ".concat(constants_1.containerName), {
-                            stdio: "ignore"
-                        });
-                    }
-                    catch (_e) { }
                     return [4 /*yield*/, (function () { return __awaiter(_this, void 0, void 0, function () {
                             var dirPath, filePath, value;
                             return __generator(this, function (_a) {
@@ -5161,61 +5467,100 @@ function command(params) {
                                 }
                             });
                         }); })()];
-                case 2:
+                case 4:
                     realmJsonFilePath = _b.sent();
                     jarFilePath = (0, path_1.join)(buildOptions.keycloakifyBuildDirPath, jarFileBasename);
-                    doLinkAccountV1Theme = false;
-                    return [4 /*yield*/, (0, extractArchive_1.extractArchive)({
-                            archiveFilePath: jarFilePath,
-                            onArchiveFile: function (_a) { return __awaiter(_this, [_a], void 0, function (_b) {
-                                var _c, _d, themeName, e_1_1;
-                                var e_1, _e;
-                                var relativeFilePathInArchive = _b.relativeFilePathInArchive, readFile = _b.readFile, writeFile = _b.writeFile;
-                                return __generator(this, function (_f) {
-                                    switch (_f.label) {
-                                        case 0:
-                                            _f.trys.push([0, 6, 7, 8]);
-                                            _c = __values(buildOptions.themeNames), _d = _c.next();
-                                            _f.label = 1;
-                                        case 1:
-                                            if (!!_d.done) return [3 /*break*/, 5];
-                                            themeName = _d.value;
-                                            if (!(relativeFilePathInArchive ===
-                                                (0, path_1.join)("theme", themeName, "account", "theme.properties"))) return [3 /*break*/, 4];
-                                            return [4 /*yield*/, readFile()];
-                                        case 2:
-                                            if ((_f.sent())
-                                                .toString("utf8")
-                                                .includes("parent=".concat(constants_1.accountV1ThemeName))) {
-                                                doLinkAccountV1Theme = true;
-                                            }
-                                            return [4 /*yield*/, writeFile({
-                                                    filePath: (0, path_1.join)(buildOptions.keycloakifyBuildDirPath, "src", "main", "resources", "theme", themeName, "account", "theme.properties")
-                                                })];
-                                        case 3:
-                                            _f.sent();
-                                            _f.label = 4;
-                                        case 4:
-                                            _d = _c.next();
-                                            return [3 /*break*/, 1];
-                                        case 5: return [3 /*break*/, 8];
-                                        case 6:
-                                            e_1_1 = _f.sent();
-                                            e_1 = { error: e_1_1 };
-                                            return [3 /*break*/, 8];
-                                        case 7:
-                                            try {
-                                                if (_d && !_d.done && (_e = _c.return)) _e.call(_c);
-                                            }
-                                            finally { if (e_1) throw e_1.error; }
-                                            return [7 /*endfinally*/];
-                                        case 8: return [2 /*return*/];
-                                    }
-                                });
-                            }); }
-                        })];
-                case 3:
-                    _b.sent();
+                    return [4 /*yield*/, (function () { return __awaiter(_this, void 0, void 0, function () {
+                            var doUseBuiltInAccountV1Theme;
+                            var _this = this;
+                            return __generator(this, function (_a) {
+                                switch (_a.label) {
+                                    case 0:
+                                        doUseBuiltInAccountV1Theme = false;
+                                        return [4 /*yield*/, (0, extractArchive_1.extractArchive)({
+                                                archiveFilePath: jarFilePath,
+                                                onArchiveFile: function (_a) { return __awaiter(_this, [_a], void 0, function (_b) {
+                                                    var _c, _d, themeName, e_1_1;
+                                                    var e_1, _e;
+                                                    var relativeFilePathInArchive = _b.relativeFilePathInArchive, readFile = _b.readFile, earlyExit = _b.earlyExit;
+                                                    return __generator(this, function (_f) {
+                                                        switch (_f.label) {
+                                                            case 0:
+                                                                _f.trys.push([0, 5, 6, 7]);
+                                                                _c = __values(buildOptions.themeNames), _d = _c.next();
+                                                                _f.label = 1;
+                                                            case 1:
+                                                                if (!!_d.done) return [3 /*break*/, 4];
+                                                                themeName = _d.value;
+                                                                if (!(relativeFilePathInArchive ===
+                                                                    (0, path_1.join)("theme", themeName, "account", "theme.properties"))) return [3 /*break*/, 3];
+                                                                return [4 /*yield*/, readFile()];
+                                                            case 2:
+                                                                if ((_f.sent())
+                                                                    .toString("utf8")
+                                                                    .includes("parent=keycloak")) {
+                                                                    doUseBuiltInAccountV1Theme = true;
+                                                                }
+                                                                earlyExit();
+                                                                _f.label = 3;
+                                                            case 3:
+                                                                _d = _c.next();
+                                                                return [3 /*break*/, 1];
+                                                            case 4: return [3 /*break*/, 7];
+                                                            case 5:
+                                                                e_1_1 = _f.sent();
+                                                                e_1 = { error: e_1_1 };
+                                                                return [3 /*break*/, 7];
+                                                            case 6:
+                                                                try {
+                                                                    if (_d && !_d.done && (_e = _c.return)) _e.call(_c);
+                                                                }
+                                                                finally { if (e_1) throw e_1.error; }
+                                                                return [7 /*endfinally*/];
+                                                            case 7: return [2 /*return*/];
+                                                        }
+                                                    });
+                                                }); }
+                                            })];
+                                    case 1:
+                                        _a.sent();
+                                        return [2 /*return*/, { doUseBuiltInAccountV1Theme: doUseBuiltInAccountV1Theme }];
+                                }
+                            });
+                        }); })()];
+                case 5:
+                    doUseBuiltInAccountV1Theme = (_b.sent()).doUseBuiltInAccountV1Theme;
+                    accountThemePropertyPatch = !doUseBuiltInAccountV1Theme
+                        ? undefined
+                        : function () {
+                            var e_2, _a;
+                            try {
+                                for (var _b = __values(buildOptions.themeNames), _c = _b.next(); !_c.done; _c = _b.next()) {
+                                    var themeName = _c.value;
+                                    var filePath = (0, path_1.join)(buildOptions.keycloakifyBuildDirPath, "src", "main", "resources", "theme", themeName, "account", "theme.properties");
+                                    var sourceCode = fs.readFileSync(filePath);
+                                    var modifiedSourceCode = Buffer.from(sourceCode
+                                        .toString("utf8")
+                                        .replace("parent=".concat(constants_1.accountV1ThemeName), "parent=keycloak"), "utf8");
+                                    (0, assert_1.assert)(Buffer.compare(modifiedSourceCode, sourceCode) !== 0);
+                                    fs.writeFileSync(filePath, modifiedSourceCode);
+                                }
+                            }
+                            catch (e_2_1) { e_2 = { error: e_2_1 }; }
+                            finally {
+                                try {
+                                    if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+                                }
+                                finally { if (e_2) throw e_2.error; }
+                            }
+                        };
+                    accountThemePropertyPatch === null || accountThemePropertyPatch === void 0 ? void 0 : accountThemePropertyPatch();
+                    try {
+                        child_process.execSync("docker rm --force ".concat(constants_1.containerName), {
+                            stdio: "ignore"
+                        });
+                    }
+                    catch (_e) { }
                     spawnArgs = [
                         "docker",
                         __spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray([
@@ -5227,7 +5572,7 @@ function command(params) {
                                 "".concat(realmJsonFilePath, ":/opt/keycloak/data/import/myrealm-realm.json")
                             ])), false), ["-v", "".concat(jarFilePath, ":/opt/keycloak/providers/keycloak-theme.jar")], false), __read((keycloakMajorVersionNumber <= 20
                             ? ["-e", "JAVA_OPTS=-Dkeycloak.profile=preview"]
-                            : [])), false), __read(__spreadArray(__spreadArray([], __read(buildOptions.themeNames), false), __read((doLinkAccountV1Theme ? [constants_1.accountV1ThemeName] : [])), false).map(function (themeName) { return ({
+                            : [])), false), __read(__spreadArray(__spreadArray([], __read(buildOptions.themeNames), false), __read((doUseBuiltInAccountV1Theme ? [] : [constants_1.accountV1ThemeName])), false).map(function (themeName) { return ({
                             localDirPath: (0, path_1.join)(buildOptions.keycloakifyBuildDirPath, "src", "main", "resources", "theme", themeName),
                             containerDirPath: "/opt/keycloak/themes/".concat(themeName)
                         }); })
@@ -5266,18 +5611,19 @@ function command(params) {
                                     case 1:
                                         _a.sent();
                                         console.log([
+                                            "",
+                                            "Keycloak Admin console: ".concat(chalk_1.default.cyan.bold("http://localhost:".concat(cliCommandOptions.port))),
+                                            "- user:     ".concat(chalk_1.default.cyan.bold("admin")),
+                                            "- password: ".concat(chalk_1.default.cyan.bold("admin")),
+                                            "",
                                             "",
                                             "".concat(chalk_1.default.green("Your theme is accessible at:")),
-                                            "".concat(chalk_1.default.green("➜"), " ").concat(chalk_1.default.cyan.bold("https://my-theme.keycloakify.dev/")),
+                                            "".concat(chalk_1.default.green("➜"), " ").concat(chalk_1.default.cyan.bold("https://my-theme.keycloakify.dev".concat(cliCommandOptions.port === 8080 ? "" : "?port=".concat(cliCommandOptions.port)))),
                                             "",
                                             "You can login with the following credentials:",
                                             "- username: ".concat(chalk_1.default.cyan.bold("testuser")),
                                             "- password: ".concat(chalk_1.default.cyan.bold("password123")),
                                             "",
-                                            "Keycloak Admin console: ".concat(chalk_1.default.cyan.bold("http://localhost:".concat(cliCommandOptions.port))),
-                                            "- user:     ".concat(chalk_1.default.cyan.bold("admin")),
-                                            "- password: ".concat(chalk_1.default.cyan.bold("admin")),
-                                            "",
                                             "Watching for changes in ".concat(chalk_1.default.bold(".".concat(path_1.sep).concat((0, path_1.relative)(process.cwd(), srcDirPath))))
                                         ].join("\n"));
                                         return [2 /*return*/];
@@ -5287,52 +5633,32 @@ function command(params) {
                         child.stdout.on("data", handler_1);
                     }
                     {
-                        runBuildKeycloakTheme_1 = runExclusive.build(function () { return __awaiter(_this, void 0, void 0, function () {
-                            var dResult_1, child_1, isSuccess, dResult_2, child_2, isSuccess;
-                            var _a;
-                            return __generator(this, function (_b) {
-                                switch (_b.label) {
+                        runFullBuild_1 = runExclusive.build(function () { return __awaiter(_this, void 0, void 0, function () {
+                            var isAppBuildSuccess, isKeycloakifyBuildSuccess;
+                            return __generator(this, function (_a) {
+                                switch (_a.label) {
                                     case 0:
                                         console.log(chalk_1.default.cyan("Detected changes in the theme. Rebuilding ..."));
-                                        dResult_1 = new Deferred_1.Deferred();
-                                        child_1 = child_process.spawn("npx", ["vite", "build"], {
-                                            cwd: buildOptions.reactAppRootDirPath
-                                        });
-                                        child_1.stdout.on("data", function (data) {
-                                            if (data.toString("utf8").includes("gzip:")) {
-                                                return;
-                                            }
-                                            process.stdout.write(data);
-                                        });
-                                        child_1.stderr.on("data", function (data) { return process.stderr.write(data); });
-                                        child_1.on("exit", function (code) { return dResult_1.resolve({ isSuccess: code === 0 }); });
-                                        return [4 /*yield*/, dResult_1.pr];
+                                        return [4 /*yield*/, (0, appBuild_1.appBuild)({
+                                                doSkipIfReactAppBuildDirExists: false,
+                                                buildOptions: buildOptions
+                                            })];
                                     case 1:
-                                        isSuccess = (_b.sent()).isSuccess;
-                                        if (!isSuccess) {
+                                        isAppBuildSuccess = (_a.sent()).isAppBuildSuccess;
+                                        if (!isAppBuildSuccess) {
                                             return [2 /*return*/];
                                         }
-                                        dResult_2 = new Deferred_1.Deferred();
-                                        child_2 = child_process.spawn("npx", ["keycloakify", "build"], {
-                                            cwd: buildOptions.reactAppRootDirPath,
-                                            env: __assign(__assign({}, process.env), (_a = {}, _a[constants_1.skipBuildJarsEnvName] = "true", _a))
-                                        });
-                                        child_2.stdout.on("data", function (data) { return process.stdout.write(data); });
-                                        child_2.stderr.on("data", function (data) { return process.stderr.write(data); });
-                                        child_2.on("exit", function (code) {
-                                            if (code !== 0) {
-                                                console.log(chalk_1.default.yellow("Theme not updated, build failed"));
-                                                return;
-                                            }
-                                            console.log(chalk_1.default.green("Rebuild done"));
-                                        });
-                                        child_2.on("exit", function (code) { return dResult_2.resolve({ isSuccess: code === 0 }); });
-                                        return [4 /*yield*/, dResult_2.pr];
+                                        return [4 /*yield*/, (0, keycloakifyBuild_1.keycloakifyBuild)({
+                                                doSkipBuildJars: true,
+                                                buildOptions: buildOptions
+                                            })];
                                     case 2:
-                                        isSuccess = (_b.sent()).isSuccess;
-                                        if (!isSuccess) {
+                                        isKeycloakifyBuildSuccess = (_a.sent()).isKeycloakifyBuildSuccess;
+                                        if (!isKeycloakifyBuildSuccess) {
                                             return [2 /*return*/];
                                         }
+                                        accountThemePropertyPatch === null || accountThemePropertyPatch === void 0 ? void 0 : accountThemePropertyPatch();
+                                        console.log(chalk_1.default.green("Theme rebuilt and updated in Keycloak."));
                                         return [2 /*return*/];
                                 }
                             });
@@ -5348,7 +5674,7 @@ function command(params) {
                                     case 0: return [4 /*yield*/, waitForDebounce_2()];
                                     case 1:
                                         _a.sent();
-                                        runBuildKeycloakTheme_1();
+                                        runFullBuild_1();
                                         return [2 /*return*/];
                                 }
                             });
@@ -6366,6 +6692,7 @@ function extractArchive(params) {
                         });
                     };
                     zipFile.on("entry", function (entry) { return __awaiter(_this, void 0, void 0, function () {
+                        var hasEarlyExitBeenCalled_1;
                         return __generator(this, function (_a) {
                             switch (_a.label) {
                                 case 0:
@@ -6373,13 +6700,22 @@ function extractArchive(params) {
                                     if (entry.fileName.endsWith(path_1.sep)) {
                                         return [3 /*break*/, 2];
                                     }
+                                    hasEarlyExitBeenCalled_1 = false;
                                     return [4 /*yield*/, onArchiveFile({
                                             relativeFilePathInArchive: entry.fileName.split("/").join(path_1.sep),
                                             readFile: function () { return readFile(entry); },
-                                            writeFile: function (params) { return writeFile(entry, params); }
+                                            writeFile: function (params) { return writeFile(entry, params); },
+                                            earlyExit: function () {
+                                                hasEarlyExitBeenCalled_1 = true;
+                                            }
                                         })];
                                 case 1:
                                     _a.sent();
+                                    if (hasEarlyExitBeenCalled_1) {
+                                        zipFile.close();
+                                        dDone.resolve();
+                                        return [2 /*return*/];
+                                    }
                                     _a.label = 2;
                                 case 2:
                                     zipFile.readEntry();

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "keycloakify",
-    "version": "10.0.0-rc.18",
+    "version": "10.0.0-rc.19",
     "description": "Create Keycloak themes using React",
     "repository": {
         "type": "git",
@@ -509,7 +509,9 @@
         "src/bin/shared/getThemeSrcDirPath.ts",
         "src/bin/shared/metaInfKeycloakThemes.ts",
         "src/bin/shared/promptKeycloakVersion.ts",
+        "src/bin/start-keycloak/appBuild.ts",
         "src/bin/start-keycloak/index.ts",
+        "src/bin/start-keycloak/keycloakifyBuild.ts",
         "src/bin/start-keycloak/myrealm-realm-23.json",
         "src/bin/start-keycloak/myrealm-realm-24.json",
         "src/bin/start-keycloak/start-keycloak.ts",

package/src/bin/keycloakify/generateFtl/ftl_object_to_js_code_declaring_an_object.ftl

@@ -2,8 +2,6 @@
 (()=>{
 <#assign pageId="PAGE_ID_xIgLsPgGId9D8e">
 const out = ${ftl_object_to_js_code_declaring_an_object(.data_model, [])?no_esc};
-out["msg"]= function(){ throw new Error("use import { useKcMessage } from 'keycloakify'"); };
-out["advancedMsg"]= function(){ throw new Error("use import { useKcMessage } from 'keycloakify'"); };
 out["messagesPerField"]= {
     <#assign fieldNames = [ FIELD_NAMES_eKsIY4ZsZ4xeM ]>
     <#attempt>
@@ -181,6 +179,26 @@ try {
     out["url"]["resourcesCommonPath"] = out["url"]["resourcesPath"] + "/" + "RESOURCES_COMMON_cLsLsMrtDkpVv";
 } catch(error) { }
 
+<#if profile?? && profile.attributes??>
+    out["__localizationReamlOverrides_userProfile"] = {
+        <#list profile.attributes as attribute>
+            <#if attribute.annotations?? && attribute.displayName??>
+                "${attribute.displayName}xx": "${advancedMsg(attribute.displayName)?no_esc}",
+            </#if>
+            <#if attribute.annotations.inputHelperTextBefore??>
+                "${attribute.annotations.inputHelperTextBefore}": "${advancedMsg(attribute.annotations.inputHelperTextBefore)?no_esc}",
+            </#if>
+            <#if attribute.annotations.inputHelperTextAfter??>
+                "${attribute.annotations.inputHelperTextAfter}": "${advancedMsg(attribute.annotations.inputHelperTextAfter)?no_esc}",
+            </#if>
+            <#if attribute.annotations.inputTypePlaceholder??>
+                "${attribute.annotations.inputTypePlaceholder}": "${advancedMsg(attribute.annotations.inputTypePlaceholder)?no_esc}",
+            </#if>
+        </#list>
+    };
+</#if>
+
+
 return out;
 
 })();

package/src/bin/start-keycloak/appBuild.ts

@@ -0,0 +1,128 @@
+import * as child_process from "child_process";
+import { Deferred } from "evt/tools/Deferred";
+import { assert } from "tsafe/assert";
+import { is } from "tsafe/is";
+import type { BuildOptions } from "../shared/buildOptions";
+import * as fs from "fs";
+import { join as pathJoin } from "path";
+
+export type BuildOptionsLike = {
+    reactAppRootDirPath: string;
+    keycloakifyBuildDirPath: string;
+    bundler: "vite" | "webpack";
+    npmWorkspaceRootDirPath: string;
+    reactAppBuildDirPath: string;
+};
+
+assert<BuildOptions extends BuildOptionsLike ? true : false>();
+
+export async function appBuild(params: {
+    doSkipIfReactAppBuildDirExists: boolean;
+    buildOptions: BuildOptionsLike;
+}): Promise<{ isAppBuildSuccess: boolean }> {
+    const { doSkipIfReactAppBuildDirExists, buildOptions } = params;
+
+    if (
+        doSkipIfReactAppBuildDirExists &&
+        fs.existsSync(buildOptions.reactAppBuildDirPath)
+    ) {
+        return { isAppBuildSuccess: true };
+    }
+
+    const { bundler } = buildOptions;
+
+    const { command, args, cwd } = (() => {
+        switch (bundler) {
+            case "vite":
+                return {
+                    command: "npx",
+                    args: ["vite", "build"],
+                    cwd: buildOptions.reactAppRootDirPath
+                };
+            case "webpack": {
+                for (const dirPath of [
+                    buildOptions.reactAppRootDirPath,
+                    buildOptions.npmWorkspaceRootDirPath
+                ]) {
+                    try {
+                        const parsedPackageJson = JSON.parse(
+                            fs
+                                .readFileSync(pathJoin(dirPath, "package.json"))
+                                .toString("utf8")
+                        );
+
+                        const [scriptName] =
+                            Object.entries(parsedPackageJson.scripts).find(
+                                ([, scriptValue]) => {
+                                    assert(is<string>(scriptValue));
+                                    if (
+                                        scriptValue.includes("webpack") &&
+                                        scriptValue.includes("--mode production")
+                                    ) {
+                                        return true;
+                                    }
+
+                                    if (
+                                        scriptValue.includes("react-scripts") &&
+                                        scriptValue.includes("build")
+                                    ) {
+                                        return true;
+                                    }
+
+                                    if (
+                                        scriptValue.includes("react-app-rewired") &&
+                                        scriptValue.includes("build")
+                                    ) {
+                                        return true;
+                                    }
+
+                                    if (
+                                        scriptValue.includes("craco") &&
+                                        scriptValue.includes("build")
+                                    ) {
+                                        return true;
+                                    }
+                                }
+                            ) ?? [];
+
+                        if (scriptName === undefined) {
+                            continue;
+                        }
+
+                        return {
+                            command: "npm",
+                            args: ["run", scriptName],
+                            cwd: dirPath
+                        };
+                    } catch {
+                        continue;
+                    }
+                }
+
+                throw new Error(
+                    "Keycloakify was unable to determine which script is responsible for building the app."
+                );
+            }
+        }
+    })();
+
+    const dResult = new Deferred<{ isSuccess: boolean }>();
+
+    const child = child_process.spawn(command, args, { cwd });
+
+    child.stdout.on("data", data => {
+        if (data.toString("utf8").includes("gzip:")) {
+            return;
+        }
+
+        process.stdout.write(data);
+    });
+
+    child.stderr.on("data", data => process.stderr.write(data));
+
+    child.on("exit", code => dResult.resolve({ isSuccess: code === 0 }));
+
+    const { isSuccess } = await dResult.pr;
+
+    return { isAppBuildSuccess: isSuccess };
+}

package/src/bin/start-keycloak/keycloakifyBuild.ts

@@ -0,0 +1,41 @@
+import { skipBuildJarsEnvName } from "../shared/constants";
+import * as child_process from "child_process";
+import { Deferred } from "evt/tools/Deferred";
+import { assert } from "tsafe/assert";
+import type { BuildOptions } from "../shared/buildOptions";
+
+export type BuildOptionsLike = {
+    reactAppRootDirPath: string;
+    keycloakifyBuildDirPath: string;
+    bundler: "vite" | "webpack";
+    npmWorkspaceRootDirPath: string;
+};
+
+assert<BuildOptions extends BuildOptionsLike ? true : false>();
+
+export async function keycloakifyBuild(params: {
+    doSkipBuildJars: boolean;
+    buildOptions: BuildOptionsLike;
+}): Promise<{ isKeycloakifyBuildSuccess: boolean }> {
+    const { buildOptions, doSkipBuildJars } = params;
+
+    const dResult = new Deferred<{ isSuccess: boolean }>();
+
+    const child = child_process.spawn("npx", ["keycloakify", "build"], {
+        cwd: buildOptions.reactAppRootDirPath,
+        env: {
+            ...process.env,
+            ...(doSkipBuildJars ? { [skipBuildJarsEnvName]: "true" } : {})
+        }
+    });
+
+    child.stdout.on("data", data => process.stdout.write(data));
+
+    child.stderr.on("data", data => process.stderr.write(data));
+
+    child.on("exit", code => dResult.resolve({ isSuccess: code === 0 }));
+
+    const { isSuccess } = await dResult.pr;
+
+    return { isKeycloakifyBuildSuccess: isSuccess };
+}

package/src/bin/start-keycloak/start-keycloak.ts

@@ -2,11 +2,7 @@ import { readBuildOptions } from "../shared/buildOptions";
 import type { CliCommandOptions as CliCommandOptions_common } from "../main";
 import { promptKeycloakVersion } from "../shared/promptKeycloakVersion";
 import { readMetaInfKeycloakThemes } from "../shared/metaInfKeycloakThemes";
-import {
-    accountV1ThemeName,
-    skipBuildJarsEnvName,
-    containerName
-} from "../shared/constants";
+import { accountV1ThemeName, containerName } from "../shared/constants";
 import { SemVer } from "../tools/SemVer";
 import type { KeycloakVersionRange } from "../shared/KeycloakVersionRange";
 import { getJarFileBasename } from "../shared/getJarFileBasename";
@@ -18,11 +14,12 @@ import chalk from "chalk";
 import chokidar from "chokidar";
 import { waitForDebounceFactory } from "powerhooks/tools/waitForDebounce";
 import { getThisCodebaseRootDirPath } from "../tools/getThisCodebaseRootDirPath";
-import { Deferred } from "evt/tools/Deferred";
 import { getAbsoluteAndInOsFormatPath } from "../tools/getAbsoluteAndInOsFormatPath";
 import cliSelect from "cli-select";
 import * as runExclusive from "run-exclusive";
 import { extractArchive } from "../tools/extractArchive";
+import { appBuild } from "./appBuild";
+import { keycloakifyBuild } from "./keycloakifyBuild";
 
 export type CliCommandOptions = CliCommandOptions_common & {
     port: number;
@@ -85,18 +82,34 @@ export async function command(params: { cliCommandOptions: CliCommandOptions })
 
     const buildOptions = readBuildOptions({ cliCommandOptions });
 
-    exit_if_theme_not_built: {
-        if (fs.existsSync(buildOptions.keycloakifyBuildDirPath)) {
-            break exit_if_theme_not_built;
+    {
+        const { isAppBuildSuccess } = await appBuild({
+            doSkipIfReactAppBuildDirExists: true,
+            buildOptions
+        });
+
+        if (!isAppBuildSuccess) {
+            console.log(
+                chalk.red(
+                    `App build failed, exiting. Try running 'yarn build-keycloak-theme' and see what's wrong.`
+                )
+            );
+            process.exit(1);
         }
 
-        console.log(
-            [
-                `${chalk.red("The theme has not been built.")}`,
-                `Please run ${chalk.bold("npx vite && npx keycloakify build")} first.`
-            ].join(" ")
-        );
-        process.exit(1);
+        const { isKeycloakifyBuildSuccess } = await keycloakifyBuild({
+            doSkipBuildJars: false,
+            buildOptions
+        });
+
+        if (!isKeycloakifyBuildSuccess) {
+            console.log(
+                chalk.red(
+                    `Keycloakify build failed, exiting. Try running 'yarn build-keycloak-theme' and see what's wrong.`
+                )
+            );
+            process.exit(1);
+        }
     }
 
     const metaInfKeycloakThemes = readMetaInfKeycloakThemes({
@@ -191,12 +204,6 @@ export async function command(params: { cliCommandOptions: CliCommandOptions })
 
     console.log(`Using Keycloak ${chalk.bold(jarFileBasename)}`);
 
-    try {
-        child_process.execSync(`docker rm --force ${containerName}`, {
-            stdio: "ignore"
-        });
-    } catch {}
-
     const realmJsonFilePath = await (async () => {
         if (cliCommandOptions.realmJsonFilePath !== undefined) {
             console.log(
@@ -255,40 +262,71 @@ export async function command(params: { cliCommandOptions: CliCommandOptions })
 
     const jarFilePath = pathJoin(buildOptions.keycloakifyBuildDirPath, jarFileBasename);
 
-    let doLinkAccountV1Theme = false;
+    const { doUseBuiltInAccountV1Theme } = await (async () => {
+        let doUseBuiltInAccountV1Theme = false;
 
-    await extractArchive({
-        archiveFilePath: jarFilePath,
-        onArchiveFile: async ({ relativeFilePathInArchive, readFile, writeFile }) => {
-            for (const themeName of buildOptions.themeNames) {
-                if (
-                    relativeFilePathInArchive ===
-                    pathJoin("theme", themeName, "account", "theme.properties")
-                ) {
+        await extractArchive({
+            archiveFilePath: jarFilePath,
+            onArchiveFile: async ({ relativeFilePathInArchive, readFile, earlyExit }) => {
+                for (const themeName of buildOptions.themeNames) {
                     if (
-                        (await readFile())
-                            .toString("utf8")
-                            .includes(`parent=${accountV1ThemeName}`)
+                        relativeFilePathInArchive ===
+                        pathJoin("theme", themeName, "account", "theme.properties")
                     ) {
-                        doLinkAccountV1Theme = true;
+                        if (
+                            (await readFile())
+                                .toString("utf8")
+                                .includes("parent=keycloak")
+                        ) {
+                            doUseBuiltInAccountV1Theme = true;
+                        }
+
+                        earlyExit();
                     }
-
-                    await writeFile({
-                        filePath: pathJoin(
-                            buildOptions.keycloakifyBuildDirPath,
-                            "src",
-                            "main",
-                            "resources",
-                            "theme",
-                            themeName,
-                            "account",
-                            "theme.properties"
-                        )
-                    });
                 }
             }
-        }
-    });
+        });
+
+        return { doUseBuiltInAccountV1Theme };
+    })();
+
+    const accountThemePropertyPatch = !doUseBuiltInAccountV1Theme
+        ? undefined
+        : () => {
+              for (const themeName of buildOptions.themeNames) {
+                  const filePath = pathJoin(
+                      buildOptions.keycloakifyBuildDirPath,
+                      "src",
+                      "main",
+                      "resources",
+                      "theme",
+                      themeName,
+                      "account",
+                      "theme.properties"
+                  );
+
+                  const sourceCode = fs.readFileSync(filePath);
+
+                  const modifiedSourceCode = Buffer.from(
+                      sourceCode
+                          .toString("utf8")
+                          .replace(`parent=${accountV1ThemeName}`, "parent=keycloak"),
+                      "utf8"
+                  );
+
+                  assert(Buffer.compare(modifiedSourceCode, sourceCode) !== 0);
+
+                  fs.writeFileSync(filePath, modifiedSourceCode);
+              }
+          };
+
+    accountThemePropertyPatch?.();
+
+    try {
+        child_process.execSync(`docker rm --force ${containerName}`, {
+            stdio: "ignore"
+        });
+    } catch {}
 
     const spawnArgs = [
         "docker",
@@ -310,7 +348,7 @@ export async function command(params: { cliCommandOptions: CliCommandOptions })
                 : []),
             ...[
                 ...buildOptions.themeNames,
-                ...(doLinkAccountV1Theme ? [accountV1ThemeName] : [])
+                ...(doUseBuiltInAccountV1Theme ? [] : [accountV1ThemeName])
             ]
                 .map(themeName => ({
                     localDirPath: pathJoin(
@@ -362,22 +400,23 @@ export async function command(params: { cliCommandOptions: CliCommandOptions })
 
             console.log(
                 [
+                    "",
+                    `Keycloak Admin console: ${chalk.cyan.bold(
+                        `http://localhost:${cliCommandOptions.port}`
+                    )}`,
+                    `- user:     ${chalk.cyan.bold("admin")}`,
+                    `- password: ${chalk.cyan.bold("admin")}`,
+                    "",
                     "",
                     `${chalk.green("Your theme is accessible at:")}`,
                     `${chalk.green("➜")} ${chalk.cyan.bold(
-                        "https://my-theme.keycloakify.dev/"
+                        `https://my-theme.keycloakify.dev${cliCommandOptions.port === 8080 ? "" : `?port=${cliCommandOptions.port}`}`
                     )}`,
                     "",
                     "You can login with the following credentials:",
                     `- username: ${chalk.cyan.bold("testuser")}`,
                     `- password: ${chalk.cyan.bold("password123")}`,
                     "",
-                    `Keycloak Admin console: ${chalk.cyan.bold(
-                        `http://localhost:${cliCommandOptions.port}`
-                    )}`,
-                    `- user:     ${chalk.cyan.bold("admin")}`,
-                    `- password: ${chalk.cyan.bold("admin")}`,
-                    "",
                     `Watching for changes in ${chalk.bold(
                         `.${pathSep}${pathRelative(process.cwd(), srcDirPath)}`
                     )}`
@@ -389,67 +428,30 @@ export async function command(params: { cliCommandOptions: CliCommandOptions })
     }
 
     {
-        const runBuildKeycloakTheme = runExclusive.build(async () => {
+        const runFullBuild = runExclusive.build(async () => {
             console.log(chalk.cyan("Detected changes in the theme. Rebuilding ..."));
 
-            {
-                const dResult = new Deferred<{ isSuccess: boolean }>();
-
-                const child = child_process.spawn("npx", ["vite", "build"], {
-                    cwd: buildOptions.reactAppRootDirPath
-                });
-
-                child.stdout.on("data", data => {
-                    if (data.toString("utf8").includes("gzip:")) {
-                        return;
-                    }
-
-                    process.stdout.write(data);
-                });
-
-                child.stderr.on("data", data => process.stderr.write(data));
-
-                child.on("exit", code => dResult.resolve({ isSuccess: code === 0 }));
-
-                const { isSuccess } = await dResult.pr;
+            const { isAppBuildSuccess } = await appBuild({
+                doSkipIfReactAppBuildDirExists: false,
+                buildOptions
+            });
 
-                if (!isSuccess) {
-                    return;
-                }
+            if (!isAppBuildSuccess) {
+                return;
             }
 
-            {
-                const dResult = new Deferred<{ isSuccess: boolean }>();
-
-                const child = child_process.spawn("npx", ["keycloakify", "build"], {
-                    cwd: buildOptions.reactAppRootDirPath,
-                    env: {
-                        ...process.env,
-                        [skipBuildJarsEnvName]: "true"
-                    }
-                });
-
-                child.stdout.on("data", data => process.stdout.write(data));
-
-                child.stderr.on("data", data => process.stderr.write(data));
-
-                child.on("exit", code => {
-                    if (code !== 0) {
-                        console.log(chalk.yellow("Theme not updated, build failed"));
-                        return;
-                    }
-
-                    console.log(chalk.green("Rebuild done"));
-                });
+            const { isKeycloakifyBuildSuccess } = await keycloakifyBuild({
+                doSkipBuildJars: true,
+                buildOptions
+            });
 
-                child.on("exit", code => dResult.resolve({ isSuccess: code === 0 }));
+            if (!isKeycloakifyBuildSuccess) {
+                return;
+            }
 
-                const { isSuccess } = await dResult.pr;
+            accountThemePropertyPatch?.();
 
-                if (!isSuccess) {
-                    return;
-                }
-            }
+            console.log(chalk.green("Theme rebuilt and updated in Keycloak."));
         });
 
         const { waitForDebounce } = waitForDebounceFactory({ delay: 400 });
@@ -461,7 +463,7 @@ export async function command(params: { cliCommandOptions: CliCommandOptions })
             .on("all", async () => {
                 await waitForDebounce();
 
-                runBuildKeycloakTheme();
+                runFullBuild();
             });
     }
 }

package/src/bin/tools/extractArchive.ts

@@ -11,6 +11,7 @@ export async function extractArchive(params: {
         relativeFilePathInArchive: string;
         readFile: () => Promise<Buffer>;
         writeFile: (params: { filePath: string; modifiedData?: Buffer }) => Promise<void>;
+        earlyExit: () => void;
     }) => Promise<void>;
 }) {
     const { archiveFilePath, onArchiveFile } = params;
@@ -104,11 +105,22 @@ export async function extractArchive(params: {
                 break handle_file;
             }
 
+            let hasEarlyExitBeenCalled = false;
+
             await onArchiveFile({
                 relativeFilePathInArchive: entry.fileName.split("/").join(pathSep),
                 readFile: () => readFile(entry),
-                writeFile: params => writeFile(entry, params)
+                writeFile: params => writeFile(entry, params),
+                earlyExit: () => {
+                    hasEarlyExitBeenCalled = true;
+                }
             });
+
+            if (hasEarlyExitBeenCalled) {
+                zipFile.close();
+                dDone.resolve();
+                return;
+            }
         }
 
         zipFile.readEntry();

package/vite-plugin/index.js

@@ -1799,6 +1799,7 @@ function extractArchive(params) {
                         });
                     };
                     zipFile.on("entry", function (entry) { return __awaiter(_this, void 0, void 0, function () {
+                        var hasEarlyExitBeenCalled_1;
                         return __generator(this, function (_a) {
                             switch (_a.label) {
                                 case 0:
@@ -1806,13 +1807,22 @@ function extractArchive(params) {
                                     if (entry.fileName.endsWith(path_1.sep)) {
                                         return [3 /*break*/, 2];
                                     }
+                                    hasEarlyExitBeenCalled_1 = false;
                                     return [4 /*yield*/, onArchiveFile({
                                             relativeFilePathInArchive: entry.fileName.split("/").join(path_1.sep),
                                             readFile: function () { return readFile(entry); },
-                                            writeFile: function (params) { return writeFile(entry, params); }
+                                            writeFile: function (params) { return writeFile(entry, params); },
+                                            earlyExit: function () {
+                                                hasEarlyExitBeenCalled_1 = true;
+                                            }
                                         })];
                                 case 1:
                                     _a.sent();
+                                    if (hasEarlyExitBeenCalled_1) {
+                                        zipFile.close();
+                                        dDone.resolve();
+                                        return [2 /*return*/];
+                                    }
                                     _a.label = 2;
                                 case 2:
                                     zipFile.readEntry();