keycloakify 10.0.0-rc.118 → 10.0.0-rc.119

package/vite-plugin/index.js

@@ -4004,14 +4004,10 @@ var constants = __nccwpck_require__(173);
 var tsafe = __nccwpck_require__(1666);
 // EXTERNAL MODULE: ./dist/bin/tools/crawl.js
 var crawl = __nccwpck_require__(3036);
-// EXTERNAL MODULE: ./node_modules/tsafe/objectFromEntries.js
-var objectFromEntries = __nccwpck_require__(8634);
 // EXTERNAL MODULE: ./node_modules/tsafe/objectEntries.js
 var objectEntries = __nccwpck_require__(9612);
 // EXTERNAL MODULE: ./node_modules/tsafe/id.js
 var id = __nccwpck_require__(3047);
-// EXTERNAL MODULE: ./node_modules/tsafe/symToStr.js
-var symToStr = __nccwpck_require__(6564);
 // EXTERNAL MODULE: ./node_modules/chalk/source/index.js
 var source = __nccwpck_require__(8818);
 var source_default = /*#__PURE__*/__nccwpck_require__.n(source);
@@ -4080,19 +4076,6 @@ function ensureSingleOrNone(arg0) {
 }
 //# sourceMappingURL=fetchProxyOptions.js.map
 ;// CONCATENATED MODULE: ./dist/bin/shared/buildContext.js
-var __rest = (undefined && undefined.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
-
-
 
 
 
@@ -4108,8 +4091,9 @@ var __rest = (undefined && undefined.__rest) || function (s, e) {
 
 
 
+(0,assert.assert)();
 function getBuildContext(params) {
-    var _a, _b, _c, _d, _e, _f, _g;
+    var _a, _b, _c, _d, _e, _f;
     const { cliCommandOptions } = params;
     const projectDirPath = cliCommandOptions.projectDirPath !== undefined
         ? getAbsoluteAndInOsFormatPath({
@@ -4193,65 +4177,78 @@ function getBuildContext(params) {
         return getPackageJSonDirPath(upCount + 1);
     })(0);
     const parsedPackageJson = (() => {
-        const zParsedPackageJson = z.object({
-            name: z.string().optional(),
-            version: z.string().optional(),
-            homepage: z.string().optional(),
-            keycloakify: (0,id.id)((() => {
-                const zBuildOptions_packageJson = z.object({
-                    extraThemeProperties: z.array(z.string()).optional(),
-                    artifactId: z.string().optional(),
-                    groupId: z.string().optional(),
-                    loginThemeResourcesFromKeycloakVersion: z.string().optional(),
-                    projectBuildDirPath: z.string().optional(),
-                    keycloakifyBuildDirPath: z.string().optional(),
-                    kcContextExclusionsFtl: z.string().optional(),
-                    environmentVariables: z.array(z.object({
-                        name: z.string(),
-                        default: z.string()
-                    }))
-                        .optional(),
-                    themeName: z.union([z.string(), z.array(z.string())]).optional(),
-                    themeVersion: z.string().optional(),
-                    staticDirPathInProjectBuildDirPath: z.string().optional(),
-                    publicDirPath: z.string().optional(),
-                    keycloakVersionTargets: (0,id.id)((() => {
-                        const zKeycloakVersionTargets = z.union([
-                            z.object({
-                                hasAccountTheme: z.literal(true),
-                                "21-and-below": z.union([
-                                    z.boolean(),
-                                    z.string()
-                                ]),
-                                "23": z.union([z.boolean(), z.string()]),
-                                "24": z.union([z.boolean(), z.string()]),
-                                "25-and-above": z.union([z.boolean(), z.string()])
-                            }),
-                            z.object({
-                                hasAccountTheme: z.literal(false),
-                                "21-and-below": z.union([
-                                    z.boolean(),
-                                    z.string()
-                                ]),
-                                "22-and-above": z.union([z.boolean(), z.string()])
-                            })
-                        ]);
-                        {
-                            (0,assert.assert)();
-                        }
-                        return zKeycloakVersionTargets;
-                    })()).optional(),
-                    doUseAccountV3: z.boolean().optional()
-                });
-                {
-                    (0,assert.assert)();
-                }
-                return zBuildOptions_packageJson;
-            })()).optional()
-        });
-        {
+        const zMultiPageApp = (() => {
+            const zTargetType = z.object({
+                accountThemeImplementation: z.literal("Multi-Page"),
+                keycloakVersionTargets: z.object({
+                    "21-and-below": z.union([z.boolean(), z.string()]),
+                    "23": z.union([z.boolean(), z.string()]),
+                    "24": z.union([z.boolean(), z.string()]),
+                    "25-and-above": z.union([z.boolean(), z.string()])
+                })
+                    .optional()
+            });
             (0,assert.assert)();
-        }
+            return (0,id.id)(zTargetType);
+        })();
+        const zSinglePageApp = (() => {
+            const zTargetType = z.object({
+                accountThemeImplementation: z.union([
+                    z.literal("Single-Page"),
+                    z.literal("none")
+                ]),
+                keycloakVersionTargets: z.object({
+                    "21-and-below": z.union([z.boolean(), z.string()]),
+                    "22-and-above": z.union([z.boolean(), z.string()])
+                })
+                    .optional()
+            });
+            (0,assert.assert)();
+            return (0,id.id)(zTargetType);
+        })();
+        const zAccountThemeImplAndKeycloakVersionTargets = (() => {
+            const zTargetType = z.union([zMultiPageApp, zSinglePageApp]);
+            (0,assert.assert)();
+            return (0,id.id)(zTargetType);
+        })();
+        const zBuildOptions = (() => {
+            const zTargetType = z.intersection(z.object({
+                themeName: z.union([z.string(), z.array(z.string())]).optional(),
+                themeVersion: z.string().optional(),
+                environmentVariables: z.array(z.object({
+                    name: z.string(),
+                    default: z.string()
+                }))
+                    .optional(),
+                extraThemeProperties: z.array(z.string()).optional(),
+                artifactId: z.string().optional(),
+                groupId: z.string().optional(),
+                loginThemeResourcesFromKeycloakVersion: z.string().optional(),
+                keycloakifyBuildDirPath: z.string().optional(),
+                kcContextExclusionsFtl: z.string().optional()
+            }), zAccountThemeImplAndKeycloakVersionTargets);
+            (0,assert.assert)();
+            return (0,id.id)(zTargetType);
+        })();
+        const zBuildOptions_packageJson = (() => {
+            const zTargetType = z.intersection(zBuildOptions, z.object({
+                projectBuildDirPath: z.string().optional(),
+                staticDirPathInProjectBuildDirPath: z.string().optional(),
+                publicDirPath: z.string().optional()
+            }));
+            (0,assert.assert)();
+            return (0,id.id)(zTargetType);
+        })();
+        const zParsedPackageJson = (() => {
+            const zTargetType = z.object({
+                name: z.string().optional(),
+                version: z.string().optional(),
+                homepage: z.string().optional(),
+                keycloakify: zBuildOptions_packageJson.optional()
+            });
+            (0,assert.assert)();
+            return (0,id.id)(zTargetType);
+        })();
         const configurationPackageJsonFilePath = (() => {
             const rootPackageJsonFilePath = (0,external_path_.join)(projectDirPath, "package.json");
             return external_fs_.existsSync(rootPackageJsonFilePath)
@@ -4260,11 +4257,48 @@ function getBuildContext(params) {
         })();
         return zParsedPackageJson.parse(JSON.parse(external_fs_.readFileSync(configurationPackageJsonFilePath).toString("utf8")));
     })();
-    const buildOptions = Object.assign(Object.assign({}, parsedPackageJson.keycloakify), resolvedViteConfig === null || resolvedViteConfig === void 0 ? void 0 : resolvedViteConfig.buildOptions);
-    const recordIsImplementedByThemeType = (0,objectFromEntries.objectFromEntries)(["login", "account", "email"].map(themeType => [
-        themeType,
-        external_fs_.existsSync((0,external_path_.join)(themeSrcDirPath, themeType))
-    ]));
+    const bundler = resolvedViteConfig !== undefined ? "vite" : "webpack";
+    if (bundler === "vite" && parsedPackageJson.keycloakify !== undefined) {
+        console.error(source_default().red(`In vite projects, provide your Keycloakify options in vite.config.ts, not in package.json`));
+        process.exit(-1);
+    }
+    const buildOptions = (() => {
+        switch (bundler) {
+            case "vite":
+                (0,assert.assert)(resolvedViteConfig !== undefined);
+                return resolvedViteConfig.buildOptions;
+            case "webpack":
+                (0,assert.assert)(parsedPackageJson.keycloakify !== undefined);
+                return parsedPackageJson.keycloakify;
+        }
+        (0,assert.assert)(false);
+    })();
+    const implementedThemeTypes = {
+        login: {
+            isImplemented: external_fs_.existsSync((0,external_path_.join)(themeSrcDirPath, "login"))
+        },
+        email: {
+            isImplemented: external_fs_.existsSync((0,external_path_.join)(themeSrcDirPath, "email"))
+        },
+        account: (() => {
+            if (buildOptions.accountThemeImplementation === "none") {
+                return { isImplemented: false };
+            }
+            return {
+                isImplemented: true,
+                type: buildOptions.accountThemeImplementation
+            };
+        })()
+    };
+    if (implementedThemeTypes.account.isImplemented &&
+        !external_fs_.existsSync((0,external_path_.join)(themeSrcDirPath, "account"))) {
+        console.error(source_default().red([
+            `You have set 'accountThemeImplementation' to '${implementedThemeTypes.account.type}'`,
+            `but the 'account' directory is missing in your theme source directory`,
+            "Use the `npx keycloakify initialize-account-theme` command to create it"
+        ].join(" ")));
+        process.exit(-1);
+    }
     const themeNames = (() => {
         if (buildOptions.themeName === undefined) {
             return parsedPackageJson.name === undefined
@@ -4285,36 +4319,26 @@ function getBuildContext(params) {
     })();
     const projectBuildDirPath = (() => {
         webpack: {
-            if (resolvedViteConfig !== undefined) {
+            if (bundler !== "webpack") {
                 break webpack;
             }
-            if (buildOptions.projectBuildDirPath !== undefined) {
+            (0,assert.assert)(parsedPackageJson.keycloakify !== undefined);
+            if (parsedPackageJson.keycloakify.projectBuildDirPath !== undefined) {
                 return getAbsoluteAndInOsFormatPath({
-                    pathIsh: buildOptions.projectBuildDirPath,
+                    pathIsh: parsedPackageJson.keycloakify.projectBuildDirPath,
                     cwd: projectDirPath
                 });
             }
             return (0,external_path_.join)(projectDirPath, "build");
         }
+        (0,assert.assert)(bundler === "vite");
+        (0,assert.assert)(resolvedViteConfig !== undefined);
         return (0,external_path_.join)(projectDirPath, resolvedViteConfig.buildDir);
     })();
-    const bundler = resolvedViteConfig !== undefined ? "vite" : "webpack";
-    const doUseAccountV3 = (_a = buildOptions.doUseAccountV3) !== null && _a !== void 0 ? _a : false;
     return {
-        bundler: resolvedViteConfig !== undefined
-            ? { type: "vite" }
-            : (() => {
-                const { scripts } = z.object({
-                    scripts: z.record(z.string()).optional()
-                })
-                    .parse(JSON.parse(external_fs_.readFileSync(packageJsonFilePath).toString("utf8")));
-                return {
-                    type: "webpack",
-                    packageJsonDirPath: (0,external_path_.dirname)(packageJsonFilePath),
-                    packageJsonScripts: scripts !== null && scripts !== void 0 ? scripts : {}
-                };
-            })(),
-        themeVersion: (_c = (_b = buildOptions.themeVersion) !== null && _b !== void 0 ? _b : parsedPackageJson.version) !== null && _c !== void 0 ? _c : "0.0.0",
+        bundler,
+        packageJsonFilePath,
+        themeVersion: (_b = (_a = buildOptions.themeVersion) !== null && _a !== void 0 ? _a : parsedPackageJson.version) !== null && _b !== void 0 ? _b : "0.0.0",
         themeNames,
         extraThemeProperties: buildOptions.extraThemeProperties,
         groupId: (() => {
@@ -4325,8 +4349,8 @@ function getBuildContext(params) {
                 : (_e = (_d = (_c = (0,external_url_.parse)(parsedPackageJson.homepage)
                     .host) === null || _c === void 0 ? void 0 : _c.replace(/:[0-9]+$/, "")) === null || _d === void 0 ? void 0 : _d.split(".").reverse().join(".")) !== null && _e !== void 0 ? _e : fallbackGroupId) + ".keycloak");
         })(),
-        artifactId: (_e = (_d = process.env.KEYCLOAKIFY_ARTIFACT_ID) !== null && _d !== void 0 ? _d : buildOptions.artifactId) !== null && _e !== void 0 ? _e : `${themeNames[0]}-keycloak-theme`,
-        loginThemeResourcesFromKeycloakVersion: (_f = buildOptions.loginThemeResourcesFromKeycloakVersion) !== null && _f !== void 0 ? _f : "24.0.4",
+        artifactId: (_d = (_c = process.env.KEYCLOAKIFY_ARTIFACT_ID) !== null && _c !== void 0 ? _c : buildOptions.artifactId) !== null && _d !== void 0 ? _d : `${themeNames[0]}-keycloak-theme`,
+        loginThemeResourcesFromKeycloakVersion: (_e = buildOptions.loginThemeResourcesFromKeycloakVersion) !== null && _e !== void 0 ? _e : "24.0.4",
         projectDirPath,
         projectBuildDirPath,
         keycloakifyBuildDirPath: (() => {
@@ -4348,17 +4372,20 @@ function getBuildContext(params) {
                 });
             }
             webpack: {
-                if (resolvedViteConfig !== undefined) {
+                if (bundler !== "webpack") {
                     break webpack;
                 }
-                if (buildOptions.publicDirPath !== undefined) {
+                (0,assert.assert)(parsedPackageJson.keycloakify !== undefined);
+                if (parsedPackageJson.keycloakify.publicDirPath !== undefined) {
                     return getAbsoluteAndInOsFormatPath({
-                        pathIsh: buildOptions.publicDirPath,
+                        pathIsh: parsedPackageJson.keycloakify.publicDirPath,
                         cwd: projectDirPath
                     });
                 }
                 return (0,external_path_.join)(projectDirPath, "public");
             }
+            (0,assert.assert)(bundler === "vite");
+            (0,assert.assert)(resolvedViteConfig !== undefined);
             return (0,external_path_.join)(projectDirPath, resolvedViteConfig.publicDir);
         })(),
         cacheDirPath: (() => {
@@ -4375,7 +4402,7 @@ function getBuildContext(params) {
         })(),
         urlPathname: (() => {
             webpack: {
-                if (resolvedViteConfig !== undefined) {
+                if (bundler !== "webpack") {
                     break webpack;
                 }
                 const { homepage } = parsedPackageJson;
@@ -4389,21 +4416,28 @@ function getBuildContext(params) {
                 const out = url.pathname.replace(/([^/])$/, "$1/");
                 return out === "/" ? undefined : out;
             }
+            (0,assert.assert)(bundler === "vite");
+            (0,assert.assert)(resolvedViteConfig !== undefined);
             return resolvedViteConfig.urlPathname;
         })(),
         assetsDirPath: (() => {
             webpack: {
-                if (resolvedViteConfig !== undefined) {
+                if (bundler !== "webpack") {
                     break webpack;
                 }
-                if (buildOptions.staticDirPathInProjectBuildDirPath !== undefined) {
+                (0,assert.assert)(parsedPackageJson.keycloakify !== undefined);
+                if (parsedPackageJson.keycloakify.staticDirPathInProjectBuildDirPath !==
+                    undefined) {
                     getAbsoluteAndInOsFormatPath({
-                        pathIsh: buildOptions.staticDirPathInProjectBuildDirPath,
+                        pathIsh: parsedPackageJson.keycloakify
+                            .staticDirPathInProjectBuildDirPath,
                         cwd: projectBuildDirPath
                     });
                 }
                 return (0,external_path_.join)(projectBuildDirPath, "static");
             }
+            (0,assert.assert)(bundler === "vite");
+            (0,assert.assert)(resolvedViteConfig !== undefined);
             return (0,external_path_.join)(projectBuildDirPath, resolvedViteConfig.assetsDir);
         })(),
         kcContextExclusionsFtlCode: (() => {
@@ -4419,8 +4453,8 @@ function getBuildContext(params) {
             }
             return buildOptions.kcContextExclusionsFtl;
         })(),
-        environmentVariables: (_g = buildOptions.environmentVariables) !== null && _g !== void 0 ? _g : [],
-        recordIsImplementedByThemeType,
+        environmentVariables: (_f = buildOptions.environmentVariables) !== null && _f !== void 0 ? _f : [],
+        implementedThemeTypes,
         themeSrcDirPath,
         fetchOptions: getProxyFetchOptions({
             npmConfigGetCwd: (function callee(upCount) {
@@ -4457,8 +4491,8 @@ function getBuildContext(params) {
                     break build_for_specific_keycloak_major_version;
                 }
                 const keycloakVersionRange = (() => {
-                    const doesImplementAccountV1Theme = !doUseAccountV3 && recordIsImplementedByThemeType.account;
-                    if (doesImplementAccountV1Theme) {
+                    if (implementedThemeTypes.account.isImplemented &&
+                        implementedThemeTypes.account.type === "Multi-Page") {
                         const keycloakVersionRange = (() => {
                             if (buildForKeycloakMajorVersionNumber <= 21) {
                                 return "21-and-below";
@@ -4513,7 +4547,8 @@ function getBuildContext(params) {
             }
             const jarTargets_default = (() => {
                 const jarTargets = [];
-                if (!doUseAccountV3 && recordIsImplementedByThemeType.account) {
+                if (implementedThemeTypes.account.isImplemented &&
+                    implementedThemeTypes.account.type === "Multi-Page") {
                     for (const keycloakVersionRange of [
                         "21-and-below",
                         "23",
@@ -4544,50 +4579,8 @@ function getBuildContext(params) {
             if (buildOptions.keycloakVersionTargets === undefined) {
                 return jarTargets_default;
             }
-            if (buildOptions.keycloakVersionTargets.hasAccountTheme !== doUseAccountV3
-                ? false
-                : recordIsImplementedByThemeType.account) {
-                console.log(source_default().red((() => {
-                    const { keycloakVersionTargets } = buildOptions;
-                    let message = `Bad ${(0,symToStr/* symToStr */.r)({ keycloakVersionTargets })} configuration.\n`;
-                    if (keycloakVersionTargets.hasAccountTheme) {
-                        message +=
-                            "Your codebase does not seem to implement an account theme ";
-                    }
-                    else {
-                        message += "Your codebase implements an account theme ";
-                    }
-                    const { hasAccountTheme } = keycloakVersionTargets;
-                    message += `but you have set ${(0,symToStr/* symToStr */.r)({ keycloakVersionTargets })}.${(0,symToStr/* symToStr */.r)({ hasAccountTheme })}`;
-                    message += ` to ${hasAccountTheme} in your `;
-                    message += (() => {
-                        switch (bundler) {
-                            case "vite":
-                                return "vite.config.ts";
-                            case "webpack":
-                                return "package.json";
-                        }
-                        (0,assert.assert)(false);
-                    })();
-                    message += `. Please set it to ${!hasAccountTheme} `;
-                    message +=
-                        "and fill up the relevant keycloak version ranges.\n";
-                    message += "Example:\n";
-                    message += JSON.stringify((0,id.id)({
-                        keycloakVersionTargets: Object.assign({ hasAccountTheme: recordIsImplementedByThemeType.account }, (0,objectFromEntries.objectFromEntries)(jarTargets_default.map(({ keycloakVersionRange, jarFileBasename }) => [
-                            keycloakVersionRange,
-                            jarFileBasename
-                        ])))
-                    }), null, 2);
-                    message +=
-                        "\nSee: https://docs.keycloakify.dev/v/v10/targetting-specific-keycloak-versions";
-                    return message;
-                })()));
-                process.exit(1);
-            }
             const jarTargets = [];
-            const _a = buildOptions.keycloakVersionTargets, { hasAccountTheme } = _a, rest = __rest(_a, ["hasAccountTheme"]);
-            for (const [keycloakVersionRange, jarNameOrBoolean] of (0,objectEntries.objectEntries)(rest)) {
+            for (const [keycloakVersionRange, jarNameOrBoolean] of (0,objectEntries.objectEntries)(buildOptions.keycloakVersionTargets)) {
                 if (jarNameOrBoolean === false) {
                     continue;
                 }
@@ -4621,8 +4614,7 @@ function getBuildContext(params) {
                 process.exit(1);
             }
             return jarTargets;
-        })(),
-        doUseAccountV3
+        })()
     };
 }
 //# sourceMappingURL=buildContext.js.map
@@ -4973,7 +4965,7 @@ async function downloadAndExtractArchive(params) {
             archiveFileBasename
         });
     }
-    const extractDirBasename = `${archiveFileBasename.split(".")[0]}_${uniqueIdOfOnArchiveFile}_${external_crypto_.createHash("sha256")
+    const extractDirBasename = `${archiveFileBasename.replace(/\.([^.]+)$/, (...[, ext]) => `_${ext}`)}_${uniqueIdOfOnArchiveFile}_${external_crypto_.createHash("sha256")
         .update(onArchiveFile.toString())
         .digest("hex")
         .substring(0, 5)}`;
@@ -4988,7 +4980,9 @@ async function downloadAndExtractArchive(params) {
         return basename => basename !== extractDirBasename && basename.startsWith(prefix);
     })())
         .map(async (extractDirBasename) => {
-        await (0,fs_rm.rm)((0,external_path_.join)(cacheDirPath, extractDirBasename), { recursive: true });
+        await (0,fs_rm.rm)((0,external_path_.join)(cacheDirPath, extractDirBasename), {
+            recursive: true
+        });
         await SuccessTracker.removeFromExtracted({
             cacheDirPath,
             extractDirBasename
@@ -5658,7 +5652,7 @@ const buildContext_1 = __nccwpck_require__(1273);
 const magic_string_1 = __importDefault(__nccwpck_require__(5734));
 const generateKcGenTs_1 = __nccwpck_require__(8585);
 function keycloakify(params) {
-    const { postBuild, ...buildOptions } = params !== null && params !== void 0 ? params : {};
+    const { postBuild, ...buildOptions } = params;
     let projectDirPath = undefined;
     let urlPathname = undefined;
     let buildDirPath = undefined;
@@ -42658,24 +42652,6 @@ exports.objectKeys = objectKeys;
 
 /***/ }),
 
-/***/ 6564:
-/***/ ((__unused_webpack_module, exports) => {
-
-"use strict";
-var __webpack_unused_export__;
-
-__webpack_unused_export__ = ({ value: true });
-exports.r = void 0;
-/** @see <https://docs.tsafe.dev/main/symtostr> */
-function symToStr(wrap) {
-    // @ts-expect-error: We know better
-    return Object.keys(wrap)[0];
-}
-exports.r = symToStr;
-//# sourceMappingURL=symToStr.js.map
-
-/***/ }),
-
 /***/ 7393:
 /***/ ((__unused_webpack_module, exports) => {
 

package/vite-plugin/vite-plugin.d.ts

@@ -1,5 +1,7 @@
 import { type BuildContext, type BuildOptions } from "../bin/shared/buildContext";
-export type Params = BuildOptions & {
-    postBuild?: (buildContext: Omit<BuildContext, "bundler">) => Promise<void>;
-};
-export declare function keycloakify(params?: Params): any;
+export declare namespace keycloakify {
+    type Params = BuildOptions & {
+        postBuild?: (buildContext: Omit<BuildContext, "bundler">) => Promise<void>;
+    };
+}
+export declare function keycloakify(params: keycloakify.Params): any;