keycloakify 11.4.0-rc.0 → 11.4.1

package/bin/356.index.js

@@ -25,27 +25,31 @@ exports.modules = {
 async function getUiModuleFileSourceCodeReadyToBeCopied(params) {
     const { buildContext, uiModuleDirPath, fileRelativePath, isForEjection, uiModuleName, uiModuleVersion } = params;
     let sourceCode = (await fs_promises__WEBPACK_IMPORTED_MODULE_1__.readFile((0,path__WEBPACK_IMPORTED_MODULE_2__.join)(uiModuleDirPath, _shared_constants__WEBPACK_IMPORTED_MODULE_4__/* .KEYCLOAK_THEME */ .PC, fileRelativePath))).toString("utf8");
-    const comment = (() => {
-        if (isForEjection) {
-            return [
-                `/*`,
-                `This file was ejected from ${uiModuleName} version ${uiModuleVersion}.`,
-                `*/`
-            ].join("\n");
+    const toComment = (lines) => {
+        for (const ext of [".ts", ".tsx", ".css", ".less", ".sass", ".js", ".jsx"]) {
+            if (!fileRelativePath.endsWith(ext)) {
+                continue;
+            }
+            return [`/**`, ...lines.map(line => ` * ${line}`), ` */`].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}.`,
-                `*/`
-            ];
+        if (fileRelativePath.endsWith(".html")) {
+            return [`<!--`, ...lines.map(line => ` ${line}`), `-->`].join("\n");
         }
-    })();
-    sourceCode = [comment, ``, sourceCode].join("\n");
+        return undefined;
+    };
+    const comment = toComment(isForEjection
+        ? [`This file was ejected 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}.`,
+            `This file has been copied over to your repo by your postinstall script: \`npx keycloakify postinstall\``
+        ]);
+    if (comment !== undefined) {
+        sourceCode = [comment, ``, sourceCode].join("\n");
+    }
     const destFilePath = (0,path__WEBPACK_IMPORTED_MODULE_2__.join)(buildContext.themeSrcDirPath, fileRelativePath);
     format: {
         if (!(await (0,_tools_runPrettier__WEBPACK_IMPORTED_MODULE_0__/* .getIsPrettierAvailable */ .MT)())) {
@@ -94,7 +98,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 +153,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,
@@ -179,8 +186,6 @@ var lib = __webpack_require__(52300);
 var external_path_ = __webpack_require__(71017);
 // EXTERNAL MODULE: external "fs/promises"
 var promises_ = __webpack_require__(73292);
-// EXTERNAL MODULE: ./node_modules/tsafe/esm/is.mjs
-var is = __webpack_require__(16453);
 // EXTERNAL MODULE: ./dist/bin/tools/fs.existsAsync.js
 var fs_existsAsync = __webpack_require__(43765);
 // EXTERNAL MODULE: ./dist/bin/tools/getInstalledModuleDirPath.js
@@ -195,7 +200,6 @@ var exclude = __webpack_require__(83101);
 
 
 
-
 async function listInstalledModules(params) {
     const { packageJsonFilePath, projectDirPath, filter } = params;
     const parsedPackageJson = await readPackageJsonDependencies({
@@ -232,7 +236,7 @@ const { readPackageJsonDependencies } = (() => {
         const { packageJsonFilePath } = params;
         const parsedPackageJson = JSON.parse((await promises_.readFile(packageJsonFilePath)).toString("utf8"));
         zParsedPackageJson.parse(parsedPackageJson);
-        (0,assert/* assert */.h)((0,is.is)(parsedPackageJson));
+        (0,assert/* assert */.h)((0,assert.is)(parsedPackageJson));
         return parsedPackageJson;
     }
     return { readPackageJsonDependencies };
@@ -251,7 +255,7 @@ const { readPackageJsonVersionAndPeerDependencies } = (() => {
         const { packageJsonFilePath } = params;
         const parsedPackageJson = JSON.parse((await promises_.readFile(packageJsonFilePath)).toString("utf8"));
         zParsedPackageJson.parse(parsedPackageJson);
-        (0,assert/* assert */.h)((0,is.is)(parsedPackageJson));
+        (0,assert/* assert */.h)((0,assert.is)(parsedPackageJson));
         return {
             version: parsedPackageJson.version,
             peerDependencies: (_a = parsedPackageJson.peerDependencies) !== null && _a !== void 0 ? _a : {}
@@ -269,13 +273,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 +296,7 @@ async function crawlAsyncRec(params) {
             await crawlAsyncRec({ dirPath: fileOrDirPath, onFileFound });
             return;
         }
-        onFileFound({ filePath: fileOrDirPath });
+        await onFileFound({ filePath: fileOrDirPath });
     }));
 }
 //# sourceMappingURL=crawlAsync.js.map
@@ -355,8 +359,8 @@ async function getUiModuleMetas(params) {
         if (!(await (0,runPrettier/* getIsPrettierAvailable */.MT)())) {
             return null;
         }
-        const { config } = await (0,runPrettier/* getPrettierAndConfig */.cI)();
-        return external_crypto_.createHash("sha256").update(JSON.stringify(config)).digest("hex");
+        const { configHash } = await (0,runPrettier/* getPrettier */.LG)();
+        return configHash;
     })();
     const installedUiModules = await (async () => {
         const installedModulesWithKeycloakifyInTheName = await listInstalledModules({
@@ -364,7 +368,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))) {
@@ -391,7 +400,7 @@ async function getUiModuleMetas(params) {
             catch (_b) {
                 return undefined;
             }
-            (0,assert/* assert */.h)((0,is.is)(parsedCacheFile));
+            (0,assert/* assert */.h)((0,assert.is)(parsedCacheFile));
             return parsedCacheFile;
         })();
         if (parsedCacheFile === undefined) {
@@ -604,8 +613,8 @@ function getNodeModulesBinDirPath() {
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
 
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
+/* harmony export */   "LG": () => (/* binding */ getPrettier),
 /* harmony export */   "MT": () => (/* binding */ getIsPrettierAvailable),
-/* harmony export */   "cI": () => (/* binding */ getPrettierAndConfig),
 /* harmony export */   "eY": () => (/* binding */ runPrettier)
 /* harmony export */ });
 /* harmony import */ var _nodeModulesBinDirPath__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(73776);
@@ -613,17 +622,24 @@ 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_5__ = __webpack_require__(38469);
+/* harmony import */ var tsafe_id__WEBPACK_IMPORTED_MODULE_7__ = __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_symToStr__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(76030);
+/* harmony import */ var _readThisNpmPackageVersion__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(64795);
 
 
 
 
 
 
-getIsPrettierAvailable.cache = (0,tsafe_id__WEBPACK_IMPORTED_MODULE_5__.id)(undefined);
+
+
+
+getIsPrettierAvailable.cache = (0,tsafe_id__WEBPACK_IMPORTED_MODULE_7__.id)(undefined);
 async function getIsPrettierAvailable() {
     var _a;
     if (getIsPrettierAvailable.cache !== undefined) {
@@ -636,26 +652,53 @@ async function getIsPrettierAvailable() {
     getIsPrettierAvailable.cache = isPrettierAvailable;
     return isPrettierAvailable;
 }
-getPrettierAndConfig.cache = (0,tsafe_id__WEBPACK_IMPORTED_MODULE_5__.id)(undefined);
-async function getPrettierAndConfig() {
+getPrettier.cache = (0,tsafe_id__WEBPACK_IMPORTED_MODULE_7__.id)(undefined);
+async function getPrettier() {
     (0,tsafe_assert__WEBPACK_IMPORTED_MODULE_3__/* .assert */ .h)(getIsPrettierAvailable());
-    if (getPrettierAndConfig.cache !== undefined) {
-        return getPrettierAndConfig.cache;
+    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_7__.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_6__/* .readThisNpmPackageVersion */ .K)().startsWith("0.0.0")) {
+            eval(`${(0,tsafe_symToStr__WEBPACK_IMPORTED_MODULE_8__/* .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_assert__WEBPACK_IMPORTED_MODULE_3__.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) {
+            return "";
+        }
+        const data = await fs_promises__WEBPACK_IMPORTED_MODULE_2__.readFile(configFilePath);
+        return crypto__WEBPACK_IMPORTED_MODULE_5__.createHash("sha256").update(data).digest("hex");
+    })();
     const prettierAndConfig = {
         prettier,
-        config: await prettier.resolveConfig((0,path__WEBPACK_IMPORTED_MODULE_1__.join)((0,_nodeModulesBinDirPath__WEBPACK_IMPORTED_MODULE_0__/* .getNodeModulesBinDirPath */ .K)(), ".."))
+        configHash
     };
-    getPrettierAndConfig.cache = prettierAndConfig;
+    getPrettier.cache = prettierAndConfig;
     return prettierAndConfig;
 }
 async function runPrettier(params) {
     const { sourceCode, filePath } = params;
     let formattedSourceCode;
     try {
-        const { prettier, config } = await getPrettierAndConfig();
-        formattedSourceCode = await prettier.format(sourceCode, Object.assign(Object.assign({}, config), { filePath }));
+        const { prettier } = await getPrettier();
+        const { ignored, inferredParser } = await prettier.getFileInfo(filePath, {
+            resolveConfig: true
+        });
+        if (ignored) {
+            return sourceCode;
+        }
+        const config = await prettier.resolveConfig(filePath);
+        formattedSourceCode = await prettier.format(sourceCode, Object.assign(Object.assign({}, config), { filePath, parser: inferredParser !== null && inferredParser !== void 0 ? inferredParser : undefined }));
     }
     catch (error) {
         console.log(chalk__WEBPACK_IMPORTED_MODULE_4___default().red(`You probably need to upgrade the version of prettier in your project`));
@@ -665,6 +708,24 @@ async function runPrettier(params) {
 }
 //# sourceMappingURL=runPrettier.js.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
+
+
 /***/ })
 
 };