keycloakify 10.0.0-rc.93 → 10.0.0-rc.95

package/bin/440.index.js

@@ -573,7 +573,7 @@ function readExtraPagesNames(params) {
     const extraPages = [];
     for (const candidateFilPath of candidateFilePaths) {
         const rawSourceFile = external_fs_.readFileSync(candidateFilPath).toString("utf8");
-        extraPages.push(...Array.from(rawSourceFile.matchAll(/["']?pageId["']?\s*:\s*["']([^.]+.ftl)["']/g), m => m[1]));
+        extraPages.push(...Array.from(rawSourceFile.matchAll(/["']([^.\s]+.ftl)["']:/g), m => (console.log(m), m[1])));
     }
     return extraPages.reduce(...(0,removeDuplicates.removeDuplicates)()).filter(pageId => {
         switch (themeType) {

package/bin/526.index.js

@@ -370,10 +370,12 @@ async function appBuild_webpack(params) {
 
 
 
+
 (0,assert.assert)();
 async function keycloakifyBuild(params) {
     const { buildForKeycloakMajorVersionNumber, buildContext } = params;
     const dResult = new Deferred.Deferred();
+    console.log(source_default().blue("Running: 'npx keycloakify build'"));
     const child = external_child_process_.spawn("npx", ["keycloakify", "build"], {
         cwd: buildContext.projectDirPath,
         env: Object.assign(Object.assign({}, process.env), { [constants/* buildForKeycloakMajorVersionEnvName */.um]: `${buildForKeycloakMajorVersionNumber}` }),

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "keycloakify",
-    "version": "10.0.0-rc.93",
+    "version": "10.0.0-rc.95",
     "description": "Create Keycloak themes using React",
     "repository": {
         "type": "git",

package/src/bin/keycloakify/generateResources/readExtraPageNames.ts

@@ -35,8 +35,8 @@ export function readExtraPagesNames(params: {
 
         extraPages.push(
             ...Array.from(
-                rawSourceFile.matchAll(/["']?pageId["']?\s*:\s*["']([^.]+.ftl)["']/g),
-                m => m[1]
+                rawSourceFile.matchAll(/["']([^.\s]+.ftl)["']:/g),
+                m => (console.log(m), m[1])
             )
         );
     }

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

@@ -3,6 +3,7 @@ import * as child_process from "child_process";
 import { Deferred } from "evt/tools/Deferred";
 import { assert } from "tsafe/assert";
 import type { BuildContext } from "../shared/buildContext";
+import chalk from "chalk";
 
 export type BuildContextLike = {
     projectDirPath: string;
@@ -19,6 +20,8 @@ export async function keycloakifyBuild(params: {
 
     const dResult = new Deferred<{ isSuccess: boolean }>();
 
+    console.log(chalk.blue("Running: 'npx keycloakify build'"));
+
     const child = child_process.spawn("npx", ["keycloakify", "build"], {
         cwd: buildContext.projectDirPath,
         env: {