keycloakify 11.4.0 → 11.4.1

package/bin/392.index.js

@@ -196,11 +196,12 @@ var downloadAndExtractArchive = __webpack_require__(38367);
 
 
 
+
 (0,assert/* assert */.h)();
 function startViteDevServer(params) {
-    const { buildContext, port } = params;
-    console.log(source_default().blue(`$ npx vite dev --port ${port}`));
-    const child = external_child_process_.spawn("npx", ["vite", "dev", "--port", `${port}`], {
+    const { buildContext } = params;
+    console.log(source_default().blue(`$ npx vite dev`));
+    const child = external_child_process_.spawn("npx", ["vite", "dev"], {
         cwd: buildContext.projectDirPath,
         env: Object.assign(Object.assign({}, process.env), { [constants/* VITE_PLUGIN_SUB_SCRIPTS_ENV_NAMES.READ_KC_CONTEXT_FROM_URL */.TE.READ_KC_CONTEXT_FROM_URL]: "true" }),
         shell: true
@@ -212,6 +213,24 @@ function startViteDevServer(params) {
         process.stdout.write(data);
     });
     child.stderr.on("data", data => process.stderr.write(data));
+    const dPort = new Deferred.Deferred();
+    {
+        const onData = (data) => {
+            //Local:   http://localhost:8083/
+            const match = data
+                .toString("utf8")
+                .match(/Local:\s*http:\/\/(?:localhost|127\.0\.0\.1):(\d+)\//);
+            if (match === null) {
+                return;
+            }
+            child.stdout.off("data", onData);
+            const port = parseInt(match[1]);
+            (0,assert/* assert */.h)(!isNaN(port));
+            dPort.resolve(port);
+        };
+        child.stdout.on("data", onData);
+    }
+    return dPort.pr.then(port => ({ port }));
 }
 //# sourceMappingURL=startViteDevServer.js.map
 ;// CONCATENATED MODULE: ./dist/bin/start-keycloak/start-keycloak.js
@@ -452,12 +471,12 @@ async function command(params) {
     catch (_h) { }
     const DEFAULT_PORT = 8080;
     const port = (_c = (_b = cliCommandOptions.port) !== null && _b !== void 0 ? _b : buildContext.startKeycloakOptions.port) !== null && _c !== void 0 ? _c : DEFAULT_PORT;
-    const devServerPort = (() => {
+    const doStartDevServer = (() => {
         const hasSpaUi = buildContext.implementedThemeTypes.admin.isImplemented ||
             (buildContext.implementedThemeTypes.account.isImplemented &&
                 buildContext.implementedThemeTypes.account.type === "Single-Page");
         if (!hasSpaUi) {
-            return undefined;
+            return false;
         }
         if (buildContext.bundler !== "vite") {
             console.log(source_default().yellow([
@@ -465,7 +484,7 @@ async function command(params) {
                 `you'll have to wait serval seconds for the changes you made on your account or admin theme to be reflected in the browser.\n`,
                 `For a better development experience, consider migrating to Vite.`
             ].join(" ")));
-            return undefined;
+            return false;
         }
         if (keycloakMajorVersionNumber < 25) {
             console.log(source_default().yellow([
@@ -473,15 +492,14 @@ async function command(params) {
                 `This mean that you'll have to wait serval seconds for the changes to be reflected in the browser.`,
                 `For a better development experience, select a more recent version of Keycloak.`
             ].join("\n")));
-            return undefined;
+            return false;
         }
-        return port + 1;
+        return true;
     })();
-    if (devServerPort !== undefined) {
-        startViteDevServer({
-            buildContext,
-            port: devServerPort
-        });
+    let devServerPort = undefined;
+    if (doStartDevServer) {
+        const { port } = await startViteDevServer({ buildContext });
+        devServerPort = port;
     }
     const SPACE_PLACEHOLDER = "SPACE_PLACEHOLDER_xKLmdPd";
     const dockerRunArgs = [

package/bin/573.index.js

@@ -602,6 +602,7 @@ function generateFtlFilesCodeFactory(params) {
         .replace("{{themeVersion}}", buildContext.themeVersion)
         .replace("{{fieldNames}}", fieldNames.map(name => `"${name}"`).join(", "))
         .replace("{{RESOURCES_COMMON}}", constants/* WELL_KNOWN_DIRECTORY_BASE_NAME.RESOURCES_COMMON */.Ju.RESOURCES_COMMON)
+        .replace("{{KEYCLOAKIFY_SPA_DEV_SERVER_PORT}}", constants/* KEYCLOAKIFY_SPA_DEV_SERVER_PORT */.Sz)
         .replace("{{userDefinedExclusions}}", (_a = buildContext.kcContextExclusionsFtlCode) !== null && _a !== void 0 ? _a : "");
     const ftlObjectToJsCodeDeclaringAnObjectPlaceholder = '{ "x": "vIdLqMeOed9sdLdIdOxdK0d" }';
     $("head").prepend(`<script>\n${ftlObjectToJsCodeDeclaringAnObjectPlaceholder}\n</script>`);

package/bin/start-keycloak/startViteDevServer.d.ts

@@ -3,5 +3,6 @@ export type BuildContextLike = {
 };
 export declare function startViteDevServer(params: {
     buildContext: BuildContextLike;
+}): Promise<{
     port: number;
-}): void;
+}>;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "keycloakify",
-    "version": "11.4.0",
+    "version": "11.4.1",
     "description": "Framework to create custom Keycloak UIs",
     "repository": {
         "type": "git",

package/src/bin/keycloakify/generateFtl/generateFtl.ts

@@ -11,7 +11,11 @@ import * as fs from "fs";
 import { join as pathJoin } from "path";
 import type { BuildContext } from "../../shared/buildContext";
 import { assert } from "tsafe/assert";
-import { type ThemeType, WELL_KNOWN_DIRECTORY_BASE_NAME } from "../../shared/constants";
+import {
+    type ThemeType,
+    WELL_KNOWN_DIRECTORY_BASE_NAME,
+    KEYCLOAKIFY_SPA_DEV_SERVER_PORT
+} from "../../shared/constants";
 import { getThisCodebaseRootDirPath } from "../../tools/getThisCodebaseRootDirPath";
 
 export type BuildContextLike = BuildContextLike_replaceImportsInJsCode &
@@ -116,6 +120,7 @@ export function generateFtlFilesCodeFactory(params: {
         .replace("{{themeVersion}}", buildContext.themeVersion)
         .replace("{{fieldNames}}", fieldNames.map(name => `"${name}"`).join(", "))
         .replace("{{RESOURCES_COMMON}}", WELL_KNOWN_DIRECTORY_BASE_NAME.RESOURCES_COMMON)
+        .replace("{{KEYCLOAKIFY_SPA_DEV_SERVER_PORT}}", KEYCLOAKIFY_SPA_DEV_SERVER_PORT)
         .replace(
             "{{userDefinedExclusions}}",
             buildContext.kcContextExclusionsFtlCode ?? ""

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

@@ -101,7 +101,7 @@ redirect_to_dev_server: {
             break redirect_to_dev_server;
     }
 
-    const devSeverPort = kcContext.properties.KEYCLOAKIFY_SPA_DEV_SERVER_PORT;
+    const devSeverPort = kcContext.properties.{{KEYCLOAKIFY_SPA_DEV_SERVER_PORT}};
 
     if( !devSeverPort ){
         break redirect_to_dev_server;
@@ -115,7 +115,7 @@ redirect_to_dev_server: {
 
     console.log(kcContext);
 
-    redirectUrl.searchParams.set("kcContext", encodeURIComponent(JSON.stringify(kcContext)) );
+    redirectUrl.searchParams.set("kcContext", encodeURIComponent(JSON.stringify(kcContext)));
 
     window.location.href = redirectUrl.toString();
 

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

@@ -380,14 +380,14 @@ export async function command(params: {
     const port =
         cliCommandOptions.port ?? buildContext.startKeycloakOptions.port ?? DEFAULT_PORT;
 
-    const devServerPort = (() => {
+    const doStartDevServer = (() => {
         const hasSpaUi =
             buildContext.implementedThemeTypes.admin.isImplemented ||
             (buildContext.implementedThemeTypes.account.isImplemented &&
                 buildContext.implementedThemeTypes.account.type === "Single-Page");
 
         if (!hasSpaUi) {
-            return undefined;
+            return false;
         }
 
         if (buildContext.bundler !== "vite") {
@@ -401,7 +401,7 @@ export async function command(params: {
                 )
             );
 
-            return undefined;
+            return false;
         }
 
         if (keycloakMajorVersionNumber < 25) {
@@ -415,17 +415,18 @@ export async function command(params: {
                 )
             );
 
-            return undefined;
+            return false;
         }
 
-        return port + 1;
+        return true;
     })();
 
-    if (devServerPort !== undefined) {
-        startViteDevServer({
-            buildContext,
-            port: devServerPort
-        });
+    let devServerPort: number | undefined = undefined;
+
+    if (doStartDevServer) {
+        const { port } = await startViteDevServer({ buildContext });
+
+        devServerPort = port;
     }
 
     const SPACE_PLACEHOLDER = "SPACE_PLACEHOLDER_xKLmdPd";

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

@@ -3,6 +3,7 @@ import { assert } from "tsafe/assert";
 import type { BuildContext } from "../shared/buildContext";
 import chalk from "chalk";
 import { VITE_PLUGIN_SUB_SCRIPTS_ENV_NAMES } from "../shared/constants";
+import { Deferred } from "evt/tools/Deferred";
 
 export type BuildContextLike = {
     projectDirPath: string;
@@ -12,13 +13,12 @@ assert<BuildContext extends BuildContextLike ? true : false>();
 
 export function startViteDevServer(params: {
     buildContext: BuildContextLike;
-    port: number;
-}): void {
-    const { buildContext, port } = params;
+}): Promise<{ port: number }> {
+    const { buildContext } = params;
 
-    console.log(chalk.blue(`$ npx vite dev --port ${port}`));
+    console.log(chalk.blue(`$ npx vite dev`));
 
-    const child = child_process.spawn("npx", ["vite", "dev", "--port", `${port}`], {
+    const child = child_process.spawn("npx", ["vite", "dev"], {
         cwd: buildContext.projectDirPath,
         env: {
             ...process.env,
@@ -36,4 +36,31 @@ export function startViteDevServer(params: {
     });
 
     child.stderr.on("data", data => process.stderr.write(data));
+
+    const dPort = new Deferred<number>();
+
+    {
+        const onData = (data: Buffer) => {
+            //Local:   http://localhost:8083/
+            const match = data
+                .toString("utf8")
+                .match(/Local:\s*http:\/\/(?:localhost|127\.0\.0\.1):(\d+)\//);
+
+            if (match === null) {
+                return;
+            }
+
+            child.stdout.off("data", onData);
+
+            const port = parseInt(match[1]);
+
+            assert(!isNaN(port));
+
+            dPort.resolve(port);
+        };
+
+        child.stdout.on("data", onData);
+    }
+
+    return dPort.pr.then(port => ({ port }));
 }