keycloakify 11.8.46 → 11.8.47-rc.1

package/src/bin/sync-extensions/extensionModuleMeta.ts

@@ -206,92 +206,108 @@ export async function getExtensionModuleMetas(params: {
     })();
 
     const extensionModuleMetas = await Promise.all(
-        installedExtensionModules.map(
-            async ({
-                moduleName,
-                version,
-                peerDependencies,
-                dirPath
-            }): Promise<ExtensionModuleMeta> => {
-                use_cache: {
-                    const extensionModuleMeta_cache =
-                        extensionModuleMetas_cacheUpToDate.find(
-                            extensionModuleMeta =>
-                                extensionModuleMeta.moduleName === moduleName
-                        );
-
-                    if (extensionModuleMeta_cache === undefined) {
-                        break use_cache;
-                    }
-
-                    return extensionModuleMeta_cache;
-                }
+        [...installedExtensionModules]
+            .sort((a, b) => a.moduleName.localeCompare(b.moduleName))
+            .map(
+                async ({
+                    moduleName,
+                    version,
+                    peerDependencies,
+                    dirPath
+                }): Promise<ExtensionModuleMeta> => {
+                    use_cache: {
+                        const extensionModuleMeta_cache =
+                            extensionModuleMetas_cacheUpToDate.find(
+                                extensionModuleMeta =>
+                                    extensionModuleMeta.moduleName === moduleName
+                            );
+
+                        if (extensionModuleMeta_cache === undefined) {
+                            break use_cache;
+                        }
 
-                const files: ExtensionModuleMeta["files"] = [];
+                        return extensionModuleMeta_cache;
+                    }
 
-                await crawlAsync({
-                    dirPath: pathJoin(dirPath, KEYCLOAK_THEME),
-                    returnedPathsType: "relative to dirPath",
-                    onFileFound: async fileRelativePath_fromReservedDir => {
-                        const isPublic = fileRelativePath_fromReservedDir.startsWith(
-                            `public${pathSep}`
-                        );
+                    const files: ExtensionModuleMeta["files"] = [];
+
+                    await crawlAsync({
+                        dirPath: pathJoin(dirPath, KEYCLOAK_THEME),
+                        returnedPathsType: "relative to dirPath",
+                        onFileFound: async fileRelativePath_fromReservedDir => {
+                            const isPublic = fileRelativePath_fromReservedDir.startsWith(
+                                `public${pathSep}`
+                            );
+
+                            const fileRelativePath = isPublic
+                                ? pathRelative("public", fileRelativePath_fromReservedDir)
+                                : fileRelativePath_fromReservedDir;
+
+                            const sourceCode =
+                                await getExtensionModuleFileSourceCodeReadyToBeCopied({
+                                    buildContext,
+                                    isPublic,
+                                    fileRelativePath,
+                                    isOwnershipAction: false,
+                                    extensionModuleDirPath: dirPath,
+                                    extensionModuleName: moduleName,
+                                    extensionModuleVersion: version
+                                });
+
+                            const hash = computeHash(sourceCode);
+
+                            const copyableFilePath = pathJoin(
+                                pathDirname(cacheFilePath),
+                                KEYCLOAK_THEME,
+                                fileRelativePath_fromReservedDir
+                            );
+
+                            {
+                                const dirPath = pathDirname(copyableFilePath);
+
+                                if (!(await existsAsync(dirPath))) {
+                                    await fsPr.mkdir(dirPath, { recursive: true });
+                                }
+                            }
 
-                        const fileRelativePath = isPublic
-                            ? pathRelative("public", fileRelativePath_fromReservedDir)
-                            : fileRelativePath_fromReservedDir;
+                            fsPr.writeFile(copyableFilePath, sourceCode);
 
-                        const sourceCode =
-                            await getExtensionModuleFileSourceCodeReadyToBeCopied({
-                                buildContext,
+                            files.push({
                                 isPublic,
                                 fileRelativePath,
-                                isOwnershipAction: false,
-                                extensionModuleDirPath: dirPath,
-                                extensionModuleName: moduleName,
-                                extensionModuleVersion: version
+                                hash,
+                                copyableFilePath
                             });
-
-                        const hash = computeHash(sourceCode);
-
-                        const copyableFilePath = pathJoin(
-                            pathDirname(cacheFilePath),
-                            KEYCLOAK_THEME,
-                            fileRelativePath_fromReservedDir
-                        );
-
-                        {
-                            const dirPath = pathDirname(copyableFilePath);
-
-                            if (!(await existsAsync(dirPath))) {
-                                await fsPr.mkdir(dirPath, { recursive: true });
-                            }
                         }
+                    });
 
-                        fsPr.writeFile(copyableFilePath, sourceCode);
+                    {
+                        const getId = (file: {
+                            isPublic: boolean;
+                            fileRelativePath: string;
+                        }) =>
+                            `${file.isPublic ? "public" : "src"} - ${file.fileRelativePath}`;
 
-                        files.push({
-                            isPublic,
-                            fileRelativePath,
-                            hash,
-                            copyableFilePath
-                        });
+                        files.sort((a, b) => getId(a).localeCompare(getId(b)));
                     }
-                });
 
-                return id<ExtensionModuleMeta>({
-                    moduleName,
-                    version,
-                    files,
-                    peerDependencies: Object.fromEntries(
-                        Object.entries(peerDependencies).filter(
-                            ([moduleName]) =>
-                                !isAmong(["react", "@types/react"], moduleName)
+                    return id<ExtensionModuleMeta>({
+                        moduleName,
+                        version,
+                        files,
+                        peerDependencies: Object.fromEntries(
+                            Object.entries(peerDependencies)
+                                .filter(
+                                    ([moduleName]) =>
+                                        !isAmong(["react", "@types/react"], moduleName)
+                                )
+                                .sort(([moduleName_a], [moduleName_b]) =>
+                                    moduleName_a.localeCompare(moduleName_b)
+                                )
                         )
-                    )
-                });
-            }
-        )
+                    });
+                }
+            )
     );
 
     update_cache: {

package/src/bin/sync-extensions/managedGitignoreFiles.ts

@@ -73,10 +73,16 @@ export async function writeManagedGitignoreFiles(params: {
                 ...ownedFilesRelativePaths_ctx
                     .map(({ fileRelativePath }) => fileRelativePath)
                     .map(fileRelativePath => fileRelativePath.split(pathSep).join("/"))
+                    .sort(posixPathCompareFn)
                     .map(line => `# ${line}`),
                 DELIMITER_END,
                 ``,
-                ...extensionModuleMetas_ctx
+                ...[...extensionModuleMetas_ctx]
+                    .sort((a, b) => {
+                        const n = a.moduleName.length - b.moduleName.length;
+
+                        return n !== 0 ? n : a.moduleName.localeCompare(b.moduleName);
+                    })
                     .map(extensionModuleMeta => [
                         `# === ${extensionModuleMeta.moduleName} v${extensionModuleMeta.version} ===`,
                         ...extensionModuleMeta.files
@@ -90,7 +96,8 @@ export async function writeManagedGitignoreFiles(params: {
                             .map(
                                 fileRelativePath =>
                                     `/${fileRelativePath.split(pathSep).join("/").replace(/^\.\//, "")}`
-                            ),
+                            )
+                            .sort(posixPathCompareFn),
 
                         ``
                     ])
@@ -187,3 +194,26 @@ export async function readManagedGitignoresFile(params: {
 
     return { ownedFilesRelativePaths };
 }
+
+function posixPathCompareFn(a: string, b: string) {
+    const aParts = a.split("/");
+    const bParts = b.split("/");
+
+    const diff = aParts.length - bParts.length;
+
+    if (diff !== 0) {
+        return diff;
+    }
+
+    const len = Math.min(aParts.length, bParts.length);
+
+    for (let i = 0; i < len; i++) {
+        const cmp = aParts[i].localeCompare(bParts[i], undefined, {
+            numeric: true,
+            sensitivity: "base"
+        });
+        if (cmp !== 0) return cmp;
+    }
+
+    return 0;
+}

package/vite-plugin/index.js

@@ -408,30 +408,7 @@ function getBuildContext(params) {
         if (themeSrcDirPath !== undefined) {
             return { themeSrcDirPath };
         }
-        {
-            const basenames = external_fs_.readdirSync(srcDirPath);
-            for (const basename of basenames) {
-                const path = (0,external_path_.join)(srcDirPath, basename);
-                if (!external_fs_.statSync(path).isFile()) {
-                    continue;
-                }
-                if (external_fs_.readFileSync(path).toString("utf8").includes("./kc.gen")) {
-                    return { themeSrcDirPath: srcDirPath };
-                }
-            }
-        }
-        for (const themeType of [...constants.THEME_TYPES, "email"]) {
-            if (!external_fs_.existsSync((0,external_path_.join)(srcDirPath, themeType))) {
-                continue;
-            }
-            return { themeSrcDirPath: srcDirPath };
-        }
-        console.log(source_default().red([
-            `Can't locate your Keycloak theme source directory in .${external_path_.sep}${(0,external_path_.relative)(process.cwd(), srcDirPath)}`,
-            `Make sure to either use the Keycloakify CLI in the root of your Keycloakify project or use the --project CLI option`,
-            `If you are collocating your Keycloak theme with your app you must have a directory named '${constants.KEYCLOAK_THEME}' or '${constants.KEYCLOAK_THEME.replace(/-/g, "_")}' in your 'src' directory`
-        ].join("\n")));
-        process.exit(1);
+        return { themeSrcDirPath: srcDirPath };
     })();
     const { resolvedViteConfig } = (() => {
         if (external_fs_.readdirSync(projectDirPath)

package/bin/433.index.js

@@ -1,140 +0,0 @@
-"use strict";
-exports.id = 433;
-exports.ids = [433];
-exports.modules = {
-
-/***/ 48433:
-/***/ ((module, __webpack_exports__, __webpack_require__) => {
-
-/* harmony export */ __webpack_require__.d(__webpack_exports__, {
-/* harmony export */   "LG": () => (/* binding */ getPrettier),
-/* harmony export */   "MT": () => (/* binding */ getIsPrettierAvailable),
-/* harmony export */   "eY": () => (/* binding */ runPrettier)
-/* harmony export */ });
-/* harmony import */ var _nodeModulesBinDirPath__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(73776);
-/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(71017);
-/* 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_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);
-/* module decorator */ module = __webpack_require__.hmd(module);
-
-
-
-
-
-
-
-
-
-getIsPrettierAvailable.cache = (0,tsafe_id__WEBPACK_IMPORTED_MODULE_7__.id)(undefined);
-async function getIsPrettierAvailable() {
-    var _a;
-    if (getIsPrettierAvailable.cache !== undefined) {
-        return getIsPrettierAvailable.cache;
-    }
-    const nodeModulesBinDirPath = (0,_nodeModulesBinDirPath__WEBPACK_IMPORTED_MODULE_0__/* .getNodeModulesBinDirPath */ .K)({
-        packageJsonFilePath: undefined
-    });
-    const prettierBinPath = (0,path__WEBPACK_IMPORTED_MODULE_1__.join)(nodeModulesBinDirPath, "prettier");
-    const stats = await fs_promises__WEBPACK_IMPORTED_MODULE_2__.stat(prettierBinPath).catch(() => undefined);
-    const isPrettierAvailable = (_a = stats === null || stats === void 0 ? void 0 : stats.isFile()) !== null && _a !== void 0 ? _a : false;
-    getIsPrettierAvailable.cache = isPrettierAvailable;
-    return isPrettierAvailable;
-}
-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 (getPrettier.cache !== undefined) {
-        return getPrettier.cache;
-    }
-    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")) {
-            const prettierDirPath = (0,path__WEBPACK_IMPORTED_MODULE_1__.resolve)((0,path__WEBPACK_IMPORTED_MODULE_1__.join)((0,_nodeModulesBinDirPath__WEBPACK_IMPORTED_MODULE_0__/* .getNodeModulesBinDirPath */ .K)({ packageJsonFilePath: undefined }), "..", "prettier"));
-            const isCJS =  true && module.exports;
-            if (isCJS) {
-                eval(`${(0,tsafe_symToStr__WEBPACK_IMPORTED_MODULE_8__/* .symToStr */ .r)({ prettier })} = require("${prettierDirPath}")`);
-            }
-            else {
-                prettier = await new Promise(_resolve => {
-                    eval(`import("file:///${(0,path__WEBPACK_IMPORTED_MODULE_1__.join)(prettierDirPath, "index.mjs").replace(/\\/g, "/")}").then(prettier => _resolve(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)({ packageJsonFilePath: undefined }), "..", ".."));
-        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,
-        configHash
-    };
-    getPrettier.cache = prettierAndConfig;
-    return prettierAndConfig;
-}
-async function runPrettier(params) {
-    const { sourceCode, filePath } = params;
-    let formattedSourceCode;
-    try {
-        const { prettier } = await getPrettier();
-        const { ignored, inferredParser } = await prettier.getFileInfo(filePath, {
-            resolveConfig: true
-        });
-        if (ignored || inferredParser === null) {
-            return sourceCode;
-        }
-        const config = await prettier.resolveConfig(filePath);
-        formattedSourceCode = await prettier.format(typeof sourceCode === "string" ? sourceCode : sourceCode.toString("utf8"), Object.assign(Object.assign({}, config), { filePath, parser: inferredParser }));
-    }
-    catch (error) {
-        console.log(chalk__WEBPACK_IMPORTED_MODULE_4___default().red(`You probably need to upgrade the version of prettier in your project`));
-        throw error;
-    }
-    return typeof sourceCode === "string"
-        ? formattedSourceCode
-        : Buffer.from(formattedSourceCode, "utf8");
-}
-//# 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
-
-
-/***/ })
-
-};
-;