keycloakify 11.3.23 → 11.3.24

package/bin/921.index.js

@@ -334,12 +334,15 @@ function getNodeModulesBinDirPath() {
 /* harmony import */ var path__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(path__WEBPACK_IMPORTED_MODULE_1__);
 /* harmony import */ var fs_promises__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(73292);
 /* harmony import */ var fs_promises__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(fs_promises__WEBPACK_IMPORTED_MODULE_2__);
-/* harmony import */ var tsafe_id__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(38469);
+/* harmony import */ var tsafe_id__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(38469);
 /* harmony import */ var tsafe_assert__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(29041);
 /* harmony import */ var chalk__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(78818);
 /* harmony import */ var chalk__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(chalk__WEBPACK_IMPORTED_MODULE_4__);
 /* harmony import */ var crypto__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(6113);
 /* harmony import */ var crypto__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(crypto__WEBPACK_IMPORTED_MODULE_5__);
+/* harmony import */ var tsafe_is__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(16453);
+/* harmony import */ var tsafe_symToStr__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(76030);
+/* harmony import */ var _readThisNpmPackageVersion__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(64795);
 
 
 
@@ -347,7 +350,10 @@ function getNodeModulesBinDirPath() {
 
 
 
-getIsPrettierAvailable.cache = (0,tsafe_id__WEBPACK_IMPORTED_MODULE_6__.id)(undefined);
+
+
+
+getIsPrettierAvailable.cache = (0,tsafe_id__WEBPACK_IMPORTED_MODULE_8__.id)(undefined);
 async function getIsPrettierAvailable() {
     var _a;
     if (getIsPrettierAvailable.cache !== undefined) {
@@ -360,13 +366,25 @@ async function getIsPrettierAvailable() {
     getIsPrettierAvailable.cache = isPrettierAvailable;
     return isPrettierAvailable;
 }
-getPrettier.cache = (0,tsafe_id__WEBPACK_IMPORTED_MODULE_6__.id)(undefined);
+getPrettier.cache = (0,tsafe_id__WEBPACK_IMPORTED_MODULE_8__.id)(undefined);
 async function getPrettier() {
     (0,tsafe_assert__WEBPACK_IMPORTED_MODULE_3__/* .assert */ .h)(getIsPrettierAvailable());
     if (getPrettier.cache !== undefined) {
         return getPrettier.cache;
     }
-    const prettier = await Promise.resolve(/* import() */).then(__webpack_require__.t.bind(__webpack_require__, 79421, 23));
+    let prettier = (0,tsafe_id__WEBPACK_IMPORTED_MODULE_8__.id)(undefined);
+    import_prettier: {
+        // NOTE: When module is linked we want to make sure we import the correct version
+        // of prettier, that is the one of the project, not the one of this repo.
+        // So we do a sketchy eval to bypass ncc.
+        // We make sure to only do that when linking, otherwise we import properly.
+        if ((0,_readThisNpmPackageVersion__WEBPACK_IMPORTED_MODULE_7__/* .readThisNpmPackageVersion */ .K)() === "0.0.0") {
+            eval(`${(0,tsafe_symToStr__WEBPACK_IMPORTED_MODULE_9__/* .symToStr */ .r)({ prettier })} = require("${(0,path__WEBPACK_IMPORTED_MODULE_1__.resolve)((0,path__WEBPACK_IMPORTED_MODULE_1__.join)((0,_nodeModulesBinDirPath__WEBPACK_IMPORTED_MODULE_0__/* .getNodeModulesBinDirPath */ .K)(), "..", "prettier"))}")`);
+            (0,tsafe_assert__WEBPACK_IMPORTED_MODULE_3__/* .assert */ .h)(!(0,tsafe_is__WEBPACK_IMPORTED_MODULE_6__.is)(prettier));
+            break import_prettier;
+        }
+        prettier = await Promise.resolve(/* import() */).then(__webpack_require__.t.bind(__webpack_require__, 79421, 23));
+    }
     const configHash = await (async () => {
         const configFilePath = await prettier.resolveConfigFile((0,path__WEBPACK_IMPORTED_MODULE_1__.join)((0,_nodeModulesBinDirPath__WEBPACK_IMPORTED_MODULE_0__/* .getNodeModulesBinDirPath */ .K)(), ".."));
         if (configFilePath === null) {
@@ -1112,6 +1130,24 @@ const withObjectValues = options => {
 
 exports.withObjectValues = withObjectValues;
 
+/***/ }),
+
+/***/ 76030:
+/***/ ((__unused_webpack___webpack_module__, __webpack_exports__, __webpack_require__) => {
+
+/* harmony export */ __webpack_require__.d(__webpack_exports__, {
+/* harmony export */   "r": () => (/* binding */ symToStr)
+/* harmony export */ });
+/** @see <https://docs.tsafe.dev/main/symtostr> */
+function symToStr(wrap) {
+    // @ts-expect-error: We know better
+    return Object.keys(wrap)[0];
+}
+
+
+//# sourceMappingURL=symToStr.mjs.map
+
+
 /***/ })
 
 };

package/bin/97.index.js

@@ -272,12 +272,15 @@ function getNodeModulesBinDirPath() {
 /* harmony import */ var path__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(path__WEBPACK_IMPORTED_MODULE_1__);
 /* harmony import */ var fs_promises__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(73292);
 /* harmony import */ var fs_promises__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(fs_promises__WEBPACK_IMPORTED_MODULE_2__);
-/* harmony import */ var tsafe_id__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(38469);
+/* harmony import */ var tsafe_id__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(38469);
 /* harmony import */ var tsafe_assert__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(29041);
 /* harmony import */ var chalk__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(78818);
 /* harmony import */ var chalk__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(chalk__WEBPACK_IMPORTED_MODULE_4__);
 /* harmony import */ var crypto__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(6113);
 /* harmony import */ var crypto__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(crypto__WEBPACK_IMPORTED_MODULE_5__);
+/* harmony import */ var tsafe_is__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(16453);
+/* harmony import */ var tsafe_symToStr__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(76030);
+/* harmony import */ var _readThisNpmPackageVersion__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(64795);
 
 
 
@@ -285,7 +288,10 @@ function getNodeModulesBinDirPath() {
 
 
 
-getIsPrettierAvailable.cache = (0,tsafe_id__WEBPACK_IMPORTED_MODULE_6__.id)(undefined);
+
+
+
+getIsPrettierAvailable.cache = (0,tsafe_id__WEBPACK_IMPORTED_MODULE_8__.id)(undefined);
 async function getIsPrettierAvailable() {
     var _a;
     if (getIsPrettierAvailable.cache !== undefined) {
@@ -298,13 +304,25 @@ async function getIsPrettierAvailable() {
     getIsPrettierAvailable.cache = isPrettierAvailable;
     return isPrettierAvailable;
 }
-getPrettier.cache = (0,tsafe_id__WEBPACK_IMPORTED_MODULE_6__.id)(undefined);
+getPrettier.cache = (0,tsafe_id__WEBPACK_IMPORTED_MODULE_8__.id)(undefined);
 async function getPrettier() {
     (0,tsafe_assert__WEBPACK_IMPORTED_MODULE_3__/* .assert */ .h)(getIsPrettierAvailable());
     if (getPrettier.cache !== undefined) {
         return getPrettier.cache;
     }
-    const prettier = await Promise.resolve(/* import() */).then(__webpack_require__.t.bind(__webpack_require__, 79421, 23));
+    let prettier = (0,tsafe_id__WEBPACK_IMPORTED_MODULE_8__.id)(undefined);
+    import_prettier: {
+        // NOTE: When module is linked we want to make sure we import the correct version
+        // of prettier, that is the one of the project, not the one of this repo.
+        // So we do a sketchy eval to bypass ncc.
+        // We make sure to only do that when linking, otherwise we import properly.
+        if ((0,_readThisNpmPackageVersion__WEBPACK_IMPORTED_MODULE_7__/* .readThisNpmPackageVersion */ .K)() === "0.0.0") {
+            eval(`${(0,tsafe_symToStr__WEBPACK_IMPORTED_MODULE_9__/* .symToStr */ .r)({ prettier })} = require("${(0,path__WEBPACK_IMPORTED_MODULE_1__.resolve)((0,path__WEBPACK_IMPORTED_MODULE_1__.join)((0,_nodeModulesBinDirPath__WEBPACK_IMPORTED_MODULE_0__/* .getNodeModulesBinDirPath */ .K)(), "..", "prettier"))}")`);
+            (0,tsafe_assert__WEBPACK_IMPORTED_MODULE_3__/* .assert */ .h)(!(0,tsafe_is__WEBPACK_IMPORTED_MODULE_6__.is)(prettier));
+            break import_prettier;
+        }
+        prettier = await Promise.resolve(/* import() */).then(__webpack_require__.t.bind(__webpack_require__, 79421, 23));
+    }
     const configHash = await (async () => {
         const configFilePath = await prettier.resolveConfigFile((0,path__WEBPACK_IMPORTED_MODULE_1__.join)((0,_nodeModulesBinDirPath__WEBPACK_IMPORTED_MODULE_0__/* .getNodeModulesBinDirPath */ .K)(), ".."));
         if (configFilePath === null) {
@@ -929,6 +947,24 @@ function capitalize(str) {
 //# sourceMappingURL=capitalize.mjs.map
 
 
+/***/ }),
+
+/***/ 76030:
+/***/ ((__unused_webpack___webpack_module__, __webpack_exports__, __webpack_require__) => {
+
+/* harmony export */ __webpack_require__.d(__webpack_exports__, {
+/* harmony export */   "r": () => (/* binding */ symToStr)
+/* harmony export */ });
+/** @see <https://docs.tsafe.dev/main/symtostr> */
+function symToStr(wrap) {
+    // @ts-expect-error: We know better
+    return Object.keys(wrap)[0];
+}
+
+
+//# sourceMappingURL=symToStr.mjs.map
+
+
 /***/ })
 
 };

package/bin/main.js

@@ -16327,7 +16327,7 @@ program
     .task({
     skip,
     handler: async ({ projectDirPath }) => {
-        const { command } = await Promise.all(/* import() */[__nccwpck_require__.e(805), __nccwpck_require__.e(356), __nccwpck_require__.e(124)]).then(__nccwpck_require__.bind(__nccwpck_require__, 67124));
+        const { command } = await Promise.all(/* import() */[__nccwpck_require__.e(805), __nccwpck_require__.e(356), __nccwpck_require__.e(653)]).then(__nccwpck_require__.bind(__nccwpck_require__, 2653));
         await command({ buildContext: getBuildContext({ projectDirPath }) });
     }
 });

package/bin/tools/isTrackedByGit.d.ts

@@ -0,0 +1,3 @@
+export declare function getIsTrackedByGit(params: {
+    filePath: string;
+}): Promise<boolean>;

package/bin/tools/untrackFromGit.d.ts

@@ -0,0 +1,3 @@
+export declare function untrackFromGit(params: {
+    filePath: string;
+}): Promise<void>;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "keycloakify",
-    "version": "11.3.23",
+    "version": "11.3.24",
     "description": "Framework to create custom Keycloak UIs",
     "repository": {
         "type": "git",
@@ -730,6 +730,7 @@
         "src/bin/tools/getInstalledModuleDirPath.ts",
         "src/bin/tools/getThisCodebaseRootDirPath.ts",
         "src/bin/tools/isInside.ts",
+        "src/bin/tools/isTrackedByGit.ts",
         "src/bin/tools/kebabCaseToSnakeCase.ts",
         "src/bin/tools/listInstalledModules.ts",
         "src/bin/tools/nodeModulesBinDirPath.ts",
@@ -742,6 +743,7 @@
         "src/bin/tools/tee.ts",
         "src/bin/tools/transformCodebase.ts",
         "src/bin/tools/trimIndent.ts",
+        "src/bin/tools/untrackFromGit.ts",
         "src/bin/tsconfig.json",
         "src/bin/update-kc-gen.ts",
         "src/lib/BASE_URL.ts",
@@ -1073,6 +1075,7 @@
         "bin/tools/getInstalledModuleDirPath.d.ts",
         "bin/tools/getThisCodebaseRootDirPath.d.ts",
         "bin/tools/isInside.d.ts",
+        "bin/tools/isTrackedByGit.d.ts",
         "bin/tools/kebabCaseToSnakeCase.d.ts",
         "bin/tools/listInstalledModules.d.ts",
         "bin/tools/nodeModulesBinDirPath.d.ts",
@@ -1088,9 +1091,9 @@
         "bin/tools/tee.d.ts",
         "bin/tools/transformCodebase.d.ts",
         "bin/tools/trimIndent.d.ts",
+        "bin/tools/untrackFromGit.d.ts",
         "bin/update-kc-gen.d.ts",
         "bin/main.js",
-        "bin/124.index.js",
         "bin/20.index.js",
         "bin/266.index.js",
         "bin/304.index.js",
@@ -1102,6 +1105,7 @@
         "bin/453.index.js",
         "bin/526.index.js",
         "bin/573.index.js",
+        "bin/653.index.js",
         "bin/720.index.js",
         "bin/735.index.js",
         "bin/743.index.js",

package/src/bin/postinstall/getUiModuleFileSourceCodeReadyToBeCopied.ts

@@ -56,7 +56,8 @@ export async function getUiModuleFileSourceCodeReadyToBeCopied(params: {
                   ``,
                   `$ npx keycloakify eject-file --file ${fileRelativePath.split(pathSep).join("/")}`,
                   ``,
-                  `This file comes from ${uiModuleName} version ${uiModuleVersion}.`
+                  `This file comes from ${uiModuleName} version ${uiModuleVersion}.`,
+                  `This file has been copied over to your repo by your postinstall script: \`npx keycloakify postinstall\``
               ]
     );
 

package/src/bin/postinstall/postinstall.ts

@@ -9,6 +9,8 @@ import { dirname as pathDirname } from "path";
 import { join as pathJoin } from "path";
 import { existsAsync } from "../tools/fs.existsAsync";
 import * as fsPr from "fs/promises";
+import { getIsTrackedByGit } from "../tools/isTrackedByGit";
+import { untrackFromGit } from "../tools/untrackFromGit";
 
 export async function command(params: { buildContext: BuildContext }) {
     const { buildContext } = params;
@@ -45,8 +47,10 @@ export async function command(params: { buildContext: BuildContext }) {
                                 fileRelativePath
                             );
 
+                            const doesFileExist = await existsAsync(destFilePath);
+
                             skip_condition: {
-                                if (!(await existsAsync(destFilePath))) {
+                                if (!doesFileExist) {
                                     break skip_condition;
                                 }
 
@@ -61,6 +65,24 @@ export async function command(params: { buildContext: BuildContext }) {
                                 return;
                             }
 
+                            git_untrack: {
+                                if (!doesFileExist) {
+                                    break git_untrack;
+                                }
+
+                                const isTracked = await getIsTrackedByGit({
+                                    filePath: destFilePath
+                                });
+
+                                if (!isTracked) {
+                                    break git_untrack;
+                                }
+
+                                await untrackFromGit({
+                                    filePath: destFilePath
+                                });
+                            }
+
                             {
                                 const dirName = pathDirname(destFilePath);
 

package/src/bin/tools/isTrackedByGit.ts

@@ -0,0 +1,29 @@
+import * as child_process from "child_process";
+import { dirname as pathDirname, basename as pathBasename } from "path";
+import { Deferred } from "evt/tools/Deferred";
+
+export function getIsTrackedByGit(params: { filePath: string }): Promise<boolean> {
+    const { filePath } = params;
+
+    const dIsTracked = new Deferred<boolean>();
+
+    child_process.exec(
+        `git ls-files --error-unmatch ${pathBasename(filePath)}`,
+        { cwd: pathDirname(filePath) },
+        error => {
+            if (error === null) {
+                dIsTracked.resolve(true);
+                return;
+            }
+
+            if (error.code === 1) {
+                dIsTracked.resolve(false);
+                return;
+            }
+
+            dIsTracked.reject(error);
+        }
+    );
+
+    return dIsTracked.pr;
+}

package/src/bin/tools/runPrettier.ts

@@ -1,10 +1,13 @@
 import { getNodeModulesBinDirPath } from "./nodeModulesBinDirPath";
-import { join as pathJoin } from "path";
+import { join as pathJoin, resolve as pathResolve } from "path";
 import * as fsPr from "fs/promises";
 import { id } from "tsafe/id";
 import { assert } from "tsafe/assert";
 import chalk from "chalk";
 import * as crypto from "crypto";
+import { is } from "tsafe/is";
+import { symToStr } from "tsafe/symToStr";
+import { readThisNpmPackageVersion } from "./readThisNpmPackageVersion";
 
 getIsPrettierAvailable.cache = id<boolean | undefined>(undefined);
 
@@ -40,7 +43,25 @@ export async function getPrettier(): Promise<PrettierAndConfigHash> {
         return getPrettier.cache;
     }
 
-    const prettier = await import("prettier");
+    let prettier = id<typeof import("prettier") | undefined>(undefined);
+
+    import_prettier: {
+        // NOTE: When module is linked we want to make sure we import the correct version
+        // of prettier, that is the one of the project, not the one of this repo.
+        // So we do a sketchy eval to bypass ncc.
+        // We make sure to only do that when linking, otherwise we import properly.
+        if (readThisNpmPackageVersion() === "0.0.0") {
+            eval(
+                `${symToStr({ prettier })} = require("${pathResolve(pathJoin(getNodeModulesBinDirPath(), "..", "prettier"))}")`
+            );
+
+            assert(!is<undefined>(prettier));
+
+            break import_prettier;
+        }
+
+        prettier = await import("prettier");
+    }
 
     const configHash = await (async () => {
         const configFilePath = await prettier.resolveConfigFile(

package/src/bin/tools/untrackFromGit.ts

@@ -0,0 +1,24 @@
+import * as child_process from "child_process";
+import { dirname as pathDirname, basename as pathBasename } from "path";
+import { Deferred } from "evt/tools/Deferred";
+
+export async function untrackFromGit(params: { filePath: string }): Promise<void> {
+    const { filePath } = params;
+
+    const dDone = new Deferred<void>();
+
+    child_process.exec(
+        `git rm --cached ${pathBasename(filePath)}`,
+        { cwd: pathDirname(filePath) },
+        error => {
+            if (error !== null) {
+                dDone.reject(error);
+                return;
+            }
+
+            dDone.resolve();
+        }
+    );
+
+    await dDone.pr;
+}