keycloakify 11.3.20 → 11.3.21

package/bin/124.index.js

@@ -34,6 +34,8 @@ var same = __webpack_require__(33805);
 var runPrettier = __webpack_require__(48433);
 // EXTERNAL MODULE: ./dist/bin/tools/npmInstall.js + 1 modules
 var npmInstall = __webpack_require__(63046);
+// EXTERNAL MODULE: external "path"
+var external_path_ = __webpack_require__(71017);
 ;// CONCATENATED MODULE: ./dist/bin/postinstall/installUiModulesPeerDependencies.js
 
 
@@ -44,6 +46,7 @@ var npmInstall = __webpack_require__(63046);
 
 
 
+
 (0,assert/* assert */.h)();
 (0,assert/* assert */.h)();
 async function installUiModulesPeerDependencies(params) {
@@ -126,15 +129,13 @@ async function installUiModulesPeerDependencies(params) {
     }
     await promises_.writeFile(buildContext.packageJsonFilePath, packageJsonContentStr);
     (0,npmInstall/* npmInstall */.c)({
-        packageJsonDirPath: buildContext.packageJsonFilePath
+        packageJsonDirPath: (0,external_path_.dirname)(buildContext.packageJsonFilePath)
     });
     process.exit(0);
 }
 //# sourceMappingURL=installUiModulesPeerDependencies.js.map
 // EXTERNAL MODULE: ./dist/bin/postinstall/managedGitignoreFile.js
 var managedGitignoreFile = __webpack_require__(36843);
-// EXTERNAL MODULE: external "path"
-var external_path_ = __webpack_require__(71017);
 // EXTERNAL MODULE: ./dist/bin/tools/fs.existsAsync.js
 var fs_existsAsync = __webpack_require__(43765);
 ;// CONCATENATED MODULE: ./dist/bin/postinstall/postinstall.js

package/bin/356.index.js

@@ -29,20 +29,22 @@ async function getUiModuleFileSourceCodeReadyToBeCopied(params) {
         if (isForEjection) {
             return [
                 `/*`,
-                `This file was ejected from ${uiModuleName} version ${uiModuleVersion}.`,
-                `*/`
+                ` * This file was ejected from ${uiModuleName} version ${uiModuleVersion}.`,
+                ` */`
             ].join("\n");
         }
         else {
             return [
                 `/*`,
-                `WARNING: Before modifying this file run the following command:`,
-                ``,
-                `npx keycloakify eject-file --file ${fileRelativePath.split(path__WEBPACK_IMPORTED_MODULE_2__.sep).join("/")}\``,
-                ``,
-                `This file comes from ${uiModuleName} version ${uiModuleVersion}.`,
-                `*/`
-            ];
+                ` *`,
+                ` * WARNING: Before modifying this file run the following command:`,
+                ` * `,
+                ` * $ npx keycloakify eject-file --file ${fileRelativePath.split(path__WEBPACK_IMPORTED_MODULE_2__.sep).join("/")}`,
+                ` * `,
+                ` * This file comes from ${uiModuleName} version ${uiModuleVersion}.`,
+                ` *`,
+                ` */`
+            ].join("\n");
         }
     })();
     sourceCode = [comment, ``, sourceCode].join("\n");
@@ -94,7 +96,9 @@ async function writeManagedGitignoreFile(params) {
         `# This file is managed by Keycloakify, do not edit it manually.`,
         ``,
         DELIMITER_START,
-        ...ejectedFilesRelativePaths.map(fileRelativePath => fileRelativePath.split(path__WEBPACK_IMPORTED_MODULE_1__.sep).join("/")),
+        ...ejectedFilesRelativePaths
+            .map(fileRelativePath => fileRelativePath.split(path__WEBPACK_IMPORTED_MODULE_1__.sep).join("/"))
+            .map(line => `# ${line}`),
         DELIMITER_END,
         ``,
         ...uiModuleMetas
@@ -147,6 +151,7 @@ async function readManagedGitignoreFile(params) {
     const ejectedFilesRelativePaths = payload
         .split("\n")
         .map(line => line.trim())
+        .map(line => line.replace(/^# /, ""))
         .filter(line => line !== "")
         .map(line => (0,_tools_getAbsoluteAndInOsFormatPath__WEBPACK_IMPORTED_MODULE_4__/* .getAbsoluteAndInOsFormatPath */ .c)({
         cwd: buildContext.themeSrcDirPath,
@@ -269,13 +274,13 @@ async function crawlAsync(params) {
     const { dirPath, returnedPathsType, onFileFound } = params;
     await crawlAsyncRec({
         dirPath,
-        onFileFound: ({ filePath }) => {
+        onFileFound: async ({ filePath }) => {
             switch (returnedPathsType) {
                 case "absolute":
-                    onFileFound(filePath);
+                    await onFileFound(filePath);
                     return;
                 case "relative to dirPath":
-                    onFileFound((0,external_path_.relative)(dirPath, filePath));
+                    await onFileFound((0,external_path_.relative)(dirPath, filePath));
                     return;
             }
             (0,assert/* assert */.h)();
@@ -292,7 +297,7 @@ async function crawlAsyncRec(params) {
             await crawlAsyncRec({ dirPath: fileOrDirPath, onFileFound });
             return;
         }
-        onFileFound({ filePath: fileOrDirPath });
+        await onFileFound({ filePath: fileOrDirPath });
     }));
 }
 //# sourceMappingURL=crawlAsync.js.map
@@ -321,6 +326,7 @@ var constants = __webpack_require__(173);
 
 
 
+
 const zUiModuleMeta = (() => {
     const zTargetType = lib.z.object({
         moduleName: lib.z.string(),
@@ -364,7 +370,12 @@ async function getUiModuleMetas(params) {
             projectDirPath: buildContext.packageJsonFilePath,
             filter: ({ moduleName }) => moduleName.includes("keycloakify") && moduleName !== "keycloakify"
         });
-        return Promise.all(installedModulesWithKeycloakifyInTheName.filter(async ({ dirPath }) => (0,fs_existsAsync/* existsAsync */.o)((0,external_path_.join)(dirPath, constants/* KEYCLOAK_THEME */.PC))));
+        return (await Promise.all(installedModulesWithKeycloakifyInTheName.map(async (entry) => {
+            if (!(await (0,fs_existsAsync/* existsAsync */.o)((0,external_path_.join)(entry.dirPath, constants/* KEYCLOAK_THEME */.PC)))) {
+                return undefined;
+            }
+            return entry;
+        }))).filter((0,exclude/* exclude */.D)(undefined));
     })();
     const cacheContent = await (async () => {
         if (!(await (0,fs_existsAsync/* existsAsync */.o)(cacheFilePath))) {

package/bin/tools/crawlAsync.d.ts

@@ -2,5 +2,5 @@
 export declare function crawlAsync(params: {
     dirPath: string;
     returnedPathsType: "absolute" | "relative to dirPath";
-    onFileFound: (filePath: string) => void;
+    onFileFound: (filePath: string) => Promise<void>;
 }): Promise<void>;

package/package.json

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

package/src/bin/postinstall/getUiModuleFileSourceCodeReadyToBeCopied.ts

@@ -36,19 +36,21 @@ export async function getUiModuleFileSourceCodeReadyToBeCopied(params: {
         if (isForEjection) {
             return [
                 `/*`,
-                `This file was ejected from ${uiModuleName} version ${uiModuleVersion}.`,
-                `*/`
+                ` * This file was ejected from ${uiModuleName} version ${uiModuleVersion}.`,
+                ` */`
             ].join("\n");
         } else {
             return [
                 `/*`,
-                `WARNING: Before modifying this file run the following command:`,
-                ``,
-                `npx keycloakify eject-file --file ${fileRelativePath.split(pathSep).join("/")}\``,
-                ``,
-                `This file comes from ${uiModuleName} version ${uiModuleVersion}.`,
-                `*/`
-            ];
+                ` *`,
+                ` * WARNING: Before modifying this file run the following command:`,
+                ` * `,
+                ` * $ npx keycloakify eject-file --file ${fileRelativePath.split(pathSep).join("/")}`,
+                ` * `,
+                ` * This file comes from ${uiModuleName} version ${uiModuleVersion}.`,
+                ` *`,
+                ` */`
+            ].join("\n");
         }
     })();
 

package/src/bin/postinstall/installUiModulesPeerDependencies.ts

@@ -9,6 +9,7 @@ import { SemVer } from "../tools/SemVer";
 import { same } from "evt/tools/inDepth/same";
 import { runPrettier, getIsPrettierAvailable } from "../tools/runPrettier";
 import { npmInstall } from "../tools/npmInstall";
+import { dirname as pathDirname } from "path";
 
 export type BuildContextLike = {
     packageJsonFilePath: string;
@@ -150,7 +151,7 @@ export async function installUiModulesPeerDependencies(params: {
     await fsPr.writeFile(buildContext.packageJsonFilePath, packageJsonContentStr);
 
     npmInstall({
-        packageJsonDirPath: buildContext.packageJsonFilePath
+        packageJsonDirPath: pathDirname(buildContext.packageJsonFilePath)
     });
 
     process.exit(0);

package/src/bin/postinstall/managedGitignoreFile.ts

@@ -38,9 +38,9 @@ export async function writeManagedGitignoreFile(params: {
             `# This file is managed by Keycloakify, do not edit it manually.`,
             ``,
             DELIMITER_START,
-            ...ejectedFilesRelativePaths.map(fileRelativePath =>
-                fileRelativePath.split(pathSep).join("/")
-            ),
+            ...ejectedFilesRelativePaths
+                .map(fileRelativePath => fileRelativePath.split(pathSep).join("/"))
+                .map(line => `# ${line}`),
             DELIMITER_END,
             ``,
             ...uiModuleMetas
@@ -122,6 +122,7 @@ export async function readManagedGitignoreFile(params: {
     const ejectedFilesRelativePaths = payload
         .split("\n")
         .map(line => line.trim())
+        .map(line => line.replace(/^# /, ""))
         .filter(line => line !== "")
         .map(line =>
             getAbsoluteAndInOsFormatPath({

package/src/bin/postinstall/uiModuleMeta.ts

@@ -16,6 +16,7 @@ import {
 } from "./getUiModuleFileSourceCodeReadyToBeCopied";
 import * as crypto from "crypto";
 import { KEYCLOAK_THEME } from "../shared/constants";
+import { exclude } from "tsafe/exclude";
 
 export type UiModuleMeta = {
     moduleName: string;
@@ -113,11 +114,16 @@ export async function getUiModuleMetas(params: {
                 moduleName.includes("keycloakify") && moduleName !== "keycloakify"
         });
 
-        return Promise.all(
-            installedModulesWithKeycloakifyInTheName.filter(async ({ dirPath }) =>
-                existsAsync(pathJoin(dirPath, KEYCLOAK_THEME))
+        return (
+            await Promise.all(
+                installedModulesWithKeycloakifyInTheName.map(async entry => {
+                    if (!(await existsAsync(pathJoin(entry.dirPath, KEYCLOAK_THEME)))) {
+                        return undefined;
+                    }
+                    return entry;
+                })
             )
-        );
+        ).filter(exclude(undefined));
     })();
 
     const cacheContent = await (async () => {

package/src/bin/tools/crawlAsync.ts

@@ -6,19 +6,19 @@ import { assert, type Equals } from "tsafe/assert";
 export async function crawlAsync(params: {
     dirPath: string;
     returnedPathsType: "absolute" | "relative to dirPath";
-    onFileFound: (filePath: string) => void;
+    onFileFound: (filePath: string) => Promise<void>;
 }) {
     const { dirPath, returnedPathsType, onFileFound } = params;
 
     await crawlAsyncRec({
         dirPath,
-        onFileFound: ({ filePath }) => {
+        onFileFound: async ({ filePath }) => {
             switch (returnedPathsType) {
                 case "absolute":
-                    onFileFound(filePath);
+                    await onFileFound(filePath);
                     return;
                 case "relative to dirPath":
-                    onFileFound(pathRelative(dirPath, filePath));
+                    await onFileFound(pathRelative(dirPath, filePath));
                     return;
             }
             assert<Equals<typeof returnedPathsType, never>>();
@@ -28,7 +28,7 @@ export async function crawlAsync(params: {
 
 async function crawlAsyncRec(params: {
     dirPath: string;
-    onFileFound: (params: { filePath: string }) => void;
+    onFileFound: (params: { filePath: string }) => Promise<void>;
 }) {
     const { dirPath, onFileFound } = params;
 
@@ -45,7 +45,7 @@ async function crawlAsyncRec(params: {
                 return;
             }
 
-            onFileFound({ filePath: fileOrDirPath });
+            await onFileFound({ filePath: fileOrDirPath });
         })
     );
 }