keycloakify 10.0.0-rc.15 → 10.0.0-rc.17

package/src/bin/start-keycloak.ts

@@ -2,15 +2,19 @@ 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 } from "./shared/constants";
+import { accountV1ThemeName, skipBuildJarsEnvName } from "./shared/constants";
 import { SemVer } from "./tools/SemVer";
 import type { KeycloakVersionRange } from "./shared/KeycloakVersionRange";
 import { getJarFileBasename } from "./shared/getJarFileBasename";
 import { assert, type Equals } from "tsafe/assert";
 import * as fs from "fs";
-import { join as pathJoin, posix as pathPosix } from "path";
+import { join as pathJoin, relative as pathRelative, sep as pathSep, posix as pathPosix } from "path";
 import * as child_process from "child_process";
 import chalk from "chalk";
+import chokidar from "chokidar";
+import { waitForDebounceFactory } from "powerhooks/tools/waitForDebounce";
+import { getThemeSrcDirPath } from "./shared/getThemeSrcDirPath";
+import { Deferred } from "evt/tools/Deferred";
 
 export type CliCommandOptions = CliCommandOptions_common & {
     port: number;
@@ -91,13 +95,15 @@ export async function command(params: { cliCommandOptions: CliCommandOptions })
             };
         }
 
-        console.log("On which version of Keycloak do you want to test your theme?");
+        console.log(chalk.cyan("On which version of Keycloak do you want to test your theme?"));
 
         const { keycloakVersion } = await promptKeycloakVersion({
             "startingFromMajor": 17,
             "cacheDirPath": buildOptions.cacheDirPath
         });
 
+        console.log(`→ ${keycloakVersion}`);
+
         const keycloakMajorNumber = SemVer.parse(keycloakVersion).major;
 
         if (doesImplementAccountTheme && keycloakMajorNumber === 22) {
@@ -149,6 +155,8 @@ export async function command(params: { cliCommandOptions: CliCommandOptions })
 
     const { jarFileBasename } = getJarFileBasename({ keycloakVersionRange });
 
+    console.log(`Using Keycloak ${chalk.bold(jarFileBasename)}`);
+
     const mountTargets = buildOptions.themeNames
         .map(themeName => {
             const themeEntry = metaInfKeycloakThemes.themes.find(({ name }) => name === themeName);
@@ -182,10 +190,10 @@ export async function command(params: { cliCommandOptions: CliCommandOptions })
     const containerName = "keycloak-keycloakify";
 
     try {
-        child_process.execSync(`docker rm ${containerName}`, { "stdio": "ignore" });
+        child_process.execSync(`docker rm --force ${containerName}`, { "stdio": "ignore" });
     } catch {}
 
-    const child = child_process.spawn(
+    const spawnParams = [
         "docker",
         [
             "run",
@@ -203,12 +211,18 @@ export async function command(params: { cliCommandOptions: CliCommandOptions })
         {
             "cwd": buildOptions.keycloakifyBuildDirPath
         }
-    );
+    ] as const;
+
+    const child = child_process.spawn(...spawnParams);
 
     child.stdout.on("data", data => process.stdout.write(data));
 
     child.stderr.on("data", data => process.stderr.write(data));
 
+    child.on("exit", process.exit);
+
+    const { themeSrcDirPath } = getThemeSrcDirPath({ "reactAppRootDirPath": buildOptions.reactAppRootDirPath });
+
     {
         const handler = async (data: Buffer) => {
             if (!data.toString("utf8").includes("Listening on: http://0.0.0.0:8080")) {
@@ -224,7 +238,12 @@ export async function command(params: { cliCommandOptions: CliCommandOptions })
                     "",
                     `${chalk.green("Your theme is accessible at:")}`,
                     `${chalk.green("➜")} ${chalk.cyan.bold("https://test.keycloakify.dev/")}`,
-                    ""
+                    "",
+                    `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(), themeSrcDirPath)}`)} ...`
                 ].join("\n")
             );
         };
@@ -232,5 +251,59 @@ export async function command(params: { cliCommandOptions: CliCommandOptions })
         child.stdout.on("data", handler);
     }
 
-    child.on("exit", process.exit);
+    {
+        const { waitForDebounce } = waitForDebounceFactory({ "delay": 400 });
+
+        chokidar.watch(themeSrcDirPath, { "ignoreInitial": true }).on("all", async (...eventArgs) => {
+            console.log({ eventArgs });
+
+            await waitForDebounce();
+
+            console.log(chalk.cyan("Detected changes in the theme. Rebuilding ..."));
+
+            const dViteBuildDone = new Deferred<void>();
+
+            {
+                const child = child_process.spawn("npx", ["vite", "build"], {
+                    "cwd": buildOptions.reactAppRootDirPath,
+                    "env": process.env
+                });
+
+                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) {
+                        dViteBuildDone.resolve();
+                    }
+                });
+            }
+
+            await dViteBuildDone.pr;
+
+            {
+                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"));
+                });
+            }
+        });
+    }
 }

package/src/bin/tools/getNpmWorkspaceRootDirPath.ts

@@ -1,9 +1,10 @@
 import * as child_process from "child_process";
 import { join as pathJoin, resolve as pathResolve, sep as pathSep } from "path";
 import { assert } from "tsafe/assert";
+import * as fs from "fs";
 
-export function getNpmWorkspaceRootDirPath(params: { reactAppRootDirPath: string }) {
-    const { reactAppRootDirPath } = params;
+export function getNpmWorkspaceRootDirPath(params: { reactAppRootDirPath: string; dependencyExpected: string }) {
+    const { reactAppRootDirPath, dependencyExpected } = params;
 
     const npmWorkspaceRootDirPath = (function callee(depth: number): string {
         const cwd = pathResolve(pathJoin(...[reactAppRootDirPath, ...Array(depth).fill("..")]));
@@ -20,6 +21,38 @@ export function getNpmWorkspaceRootDirPath(params: { reactAppRootDirPath: string
             throw error;
         }
 
+        const { isExpectedDependencyFound } = (() => {
+            const packageJsonFilePath = pathJoin(cwd, "package.json");
+
+            assert(fs.existsSync(packageJsonFilePath));
+
+            const parsedPackageJson = JSON.parse(fs.readFileSync(packageJsonFilePath).toString("utf8"));
+
+            let isExpectedDependencyFound = false;
+
+            for (const dependenciesOrDevDependencies of ["dependencies", "devDependencies"] as const) {
+                const dependencies = parsedPackageJson[dependenciesOrDevDependencies];
+
+                if (dependencies === undefined) {
+                    continue;
+                }
+
+                assert(dependencies instanceof Object);
+
+                if (dependencies[dependencyExpected] === undefined) {
+                    continue;
+                }
+
+                isExpectedDependencyFound = true;
+            }
+
+            return { isExpectedDependencyFound };
+        })();
+
+        if (!isExpectedDependencyFound) {
+            return callee(depth + 1);
+        }
+
         return cwd;
     })(0);
 

package/vite-plugin/index.js

@@ -133,7 +133,10 @@ function readBuildOptions(params) {
         }
         return (0, path_1.join)(reactAppRootDirPath, resolvedViteConfig.buildDir);
     })();
-    var npmWorkspaceRootDirPath = (0, getNpmWorkspaceRootDirPath_1.getNpmWorkspaceRootDirPath)({ reactAppRootDirPath: reactAppRootDirPath }).npmWorkspaceRootDirPath;
+    var npmWorkspaceRootDirPath = (0, getNpmWorkspaceRootDirPath_1.getNpmWorkspaceRootDirPath)({
+        reactAppRootDirPath: reactAppRootDirPath,
+        "dependencyExpected": "keycloakify"
+    }).npmWorkspaceRootDirPath;
     return {
         "bundler": resolvedViteConfig !== undefined ? "vite" : "webpack",
         "themeVersion": (_b = (_a = process.env.KEYCLOAKIFY_THEME_VERSION) !== null && _a !== void 0 ? _a : parsedPackageJson.version) !== null && _b !== void 0 ? _b : "0.0.0",
@@ -228,7 +231,7 @@ exports.readBuildOptions = readBuildOptions;
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.accountThemePageIds = exports.loginThemePageIds = exports.vitePluginSubScriptEnvNames = exports.accountV1ThemeName = exports.themeTypes = exports.basenameOfTheKeycloakifyResourcesDir = exports.lastKeycloakVersionWithAccountV1 = exports.resources_common = exports.keycloak_resources = exports.nameOfTheGlobal = void 0;
+exports.accountThemePageIds = exports.loginThemePageIds = exports.skipBuildJarsEnvName = exports.vitePluginSubScriptEnvNames = exports.accountV1ThemeName = exports.themeTypes = exports.basenameOfTheKeycloakifyResourcesDir = exports.lastKeycloakVersionWithAccountV1 = exports.resources_common = exports.keycloak_resources = exports.nameOfTheGlobal = void 0;
 exports.nameOfTheGlobal = "kcContext";
 exports.keycloak_resources = "keycloak-resources";
 exports.resources_common = "resources-common";
@@ -240,6 +243,7 @@ exports.vitePluginSubScriptEnvNames = {
     "runPostBuildScript": "KEYCLOAKIFY_RUN_POST_BUILD_SCRIPT",
     "resolveViteConfig": "KEYCLOAKIFY_RESOLVE_VITE_CONFIG"
 };
+exports.skipBuildJarsEnvName = "KEYCLOAKIFY_SKIP_BUILD_JAR";
 exports.loginThemePageIds = [
     "login.ftl",
     "login-username.ftl",
@@ -660,10 +664,10 @@ function downloadAndUnzip(params) {
                     return [4 /*yield*/, (0, fs_rm_1.rm)(extractDirPath, { "recursive": true })];
                 case 13:
                     _d.sent();
-                    upload_to_remot_cache_if_admin: {
+                    upload_to_remote_cache_if_admin: {
                         githubToken = process.env["KEYCLOAKIFY_ADMIN_GITHUB_PERSONAL_ACCESS_TOKEN"];
-                        if (githubToken === undefined) {
-                            break upload_to_remot_cache_if_admin;
+                        if (!githubToken) {
+                            break upload_to_remote_cache_if_admin;
                         }
                         console.log("uploading to remote cache");
                         try {
@@ -735,7 +739,7 @@ function generateFileNameFromURL(params) {
 
 /***/ }),
 
-/***/ 6800:
+/***/ 597:
 /***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
 
 "use strict";
@@ -825,7 +829,7 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
     return to.concat(ar || Array.prototype.slice.call(from));
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.downloadBuiltinKeycloakTheme = void 0;
+exports.downloadKeycloakDefaultTheme = void 0;
 var path_1 = __nccwpck_require__(1017);
 var downloadAndUnzip_1 = __nccwpck_require__(8469);
 var assert_1 = __nccwpck_require__(8078);
@@ -835,7 +839,7 @@ var fs_rmSync_1 = __nccwpck_require__(9693);
 var constants_1 = __nccwpck_require__(173);
 var transformCodebase_1 = __nccwpck_require__(332);
 (0, assert_1.assert)();
-function downloadBuiltinKeycloakTheme(params) {
+function downloadKeycloakDefaultTheme(params) {
     return __awaiter(this, void 0, void 0, function () {
         var keycloakVersion, destDirPath, buildOptions;
         var _this = this;
@@ -1053,8 +1057,8 @@ function downloadBuiltinKeycloakTheme(params) {
         });
     });
 }
-exports.downloadBuiltinKeycloakTheme = downloadBuiltinKeycloakTheme;
-//# sourceMappingURL=downloadBuiltinKeycloakTheme.js.map
+exports.downloadKeycloakDefaultTheme = downloadKeycloakDefaultTheme;
+//# sourceMappingURL=downloadKeycloakDefaultTheme.js.map
 
 /***/ }),
 
@@ -1126,7 +1130,7 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.downloadKeycloakStaticResources = void 0;
 var transformCodebase_1 = __nccwpck_require__(332);
 var path_1 = __nccwpck_require__(1017);
-var downloadBuiltinKeycloakTheme_1 = __nccwpck_require__(6800);
+var downloadKeycloakDefaultTheme_1 = __nccwpck_require__(597);
 var constants_1 = __nccwpck_require__(173);
 var assert_1 = __nccwpck_require__(8078);
 var crypto = __importStar(__nccwpck_require__(6113));
@@ -1140,7 +1144,7 @@ function downloadKeycloakStaticResources(params) {
                 case 0:
                     themeType = params.themeType, themeDirPath = params.themeDirPath, keycloakVersion = params.keycloakVersion, buildOptions = params.buildOptions;
                     tmpDirPath = (0, path_1.join)(buildOptions.cacheDirPath, "downloadKeycloakStaticResources_tmp_".concat(crypto.createHash("sha256").update("".concat(themeType, "-").concat(keycloakVersion)).digest("hex").slice(0, 8)));
-                    return [4 /*yield*/, (0, downloadBuiltinKeycloakTheme_1.downloadBuiltinKeycloakTheme)({
+                    return [4 /*yield*/, (0, downloadKeycloakDefaultTheme_1.downloadKeycloakDefaultTheme)({
                             keycloakVersion: keycloakVersion,
                             "destDirPath": tmpDirPath,
                             buildOptions: buildOptions
@@ -1973,13 +1977,25 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
     }
     return to.concat(ar || Array.prototype.slice.call(from));
 };
+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.");
+};
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.getNpmWorkspaceRootDirPath = void 0;
 var child_process = __importStar(__nccwpck_require__(2081));
 var path_1 = __nccwpck_require__(1017);
 var assert_1 = __nccwpck_require__(8078);
+var fs = __importStar(__nccwpck_require__(7147));
 function getNpmWorkspaceRootDirPath(params) {
-    var reactAppRootDirPath = params.reactAppRootDirPath;
+    var reactAppRootDirPath = params.reactAppRootDirPath, dependencyExpected = params.dependencyExpected;
     var npmWorkspaceRootDirPath = (function callee(depth) {
         var cwd = (0, path_1.resolve)(path_1.join.apply(void 0, __spreadArray([], __read(__spreadArray([reactAppRootDirPath], __read(Array(depth).fill("..")), false)), false)));
         try {
@@ -1992,6 +2008,38 @@ function getNpmWorkspaceRootDirPath(params) {
             }
             throw error;
         }
+        var isExpectedDependencyFound = (function () {
+            var e_1, _a;
+            var packageJsonFilePath = (0, path_1.join)(cwd, "package.json");
+            (0, assert_1.assert)(fs.existsSync(packageJsonFilePath));
+            var parsedPackageJson = JSON.parse(fs.readFileSync(packageJsonFilePath).toString("utf8"));
+            var isExpectedDependencyFound = false;
+            try {
+                for (var _b = __values(["dependencies", "devDependencies"]), _c = _b.next(); !_c.done; _c = _b.next()) {
+                    var dependenciesOrDevDependencies = _c.value;
+                    var dependencies = parsedPackageJson[dependenciesOrDevDependencies];
+                    if (dependencies === undefined) {
+                        continue;
+                    }
+                    (0, assert_1.assert)(dependencies instanceof Object);
+                    if (dependencies[dependencyExpected] === undefined) {
+                        continue;
+                    }
+                    isExpectedDependencyFound = true;
+                }
+            }
+            catch (e_1_1) { e_1 = { error: e_1_1 }; }
+            finally {
+                try {
+                    if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+                }
+                finally { if (e_1) throw e_1.error; }
+            }
+            return { isExpectedDependencyFound: isExpectedDependencyFound };
+        })().isExpectedDependencyFound;
+        if (!isExpectedDependencyFound) {
+            return callee(depth + 1);
+        }
         return cwd;
     })(0);
     return { npmWorkspaceRootDirPath: npmWorkspaceRootDirPath };

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

@@ -1,30 +0,0 @@
-import { join as pathJoin } from "path";
-import { promptKeycloakVersion } from "./shared/promptKeycloakVersion";
-import { readBuildOptions } from "./shared/buildOptions";
-import { downloadBuiltinKeycloakTheme } from "./shared/downloadBuiltinKeycloakTheme";
-import type { CliCommandOptions } from "./main";
-
-export async function command(params: { cliCommandOptions: CliCommandOptions }) {
-    const { cliCommandOptions } = params;
-
-    const buildOptions = readBuildOptions({
-        cliCommandOptions
-    });
-
-    console.log("Select the Keycloak version from which you want to download the builtins theme:");
-
-    const { keycloakVersion } = await promptKeycloakVersion({
-        "startingFromMajor": undefined,
-        "cacheDirPath": buildOptions.cacheDirPath
-    });
-
-    const destDirPath = pathJoin(buildOptions.keycloakifyBuildDirPath, "src", "main", "resources", "theme");
-
-    console.log(`Downloading builtins theme of Keycloak ${keycloakVersion} here ${destDirPath}`);
-
-    await downloadBuiltinKeycloakTheme({
-        keycloakVersion,
-        destDirPath,
-        buildOptions
-    });
-}