keycloakify 10.0.0-rc.38 → 10.0.0-rc.39

package/vite-plugin/index.js

@@ -1,7 +1,7 @@
 /******/ (() => { // webpackBootstrap
 /******/ 	var __webpack_modules__ = ({
 
-/***/ 6757:
+/***/ 8355:
 /***/ ((__unused_webpack_module, __webpack_exports__, __nccwpck_require__) => {
 
 "use strict";
@@ -10,7 +10,7 @@ __nccwpck_require__.r(__webpack_exports__);
 
 // EXPORTS
 __nccwpck_require__.d(__webpack_exports__, {
-  "readBuildOptions": () => (/* binding */ readBuildOptions)
+  "getBuildContext": () => (/* binding */ getBuildContext)
 });
 
 // EXTERNAL MODULE: external "url"
@@ -49,9 +49,9 @@ var external_fs_ = __nccwpck_require__(7147);
 
 
 function getNpmWorkspaceRootDirPath(params) {
-    const { reactAppRootDirPath, dependencyExpected } = params;
+    const { projectDirPath, dependencyExpected } = params;
     const npmWorkspaceRootDirPath = (function callee(depth) {
-        const cwd = (0,external_path_.resolve)((0,external_path_.join)(...[reactAppRootDirPath, ...Array(depth).fill("..")]));
+        const cwd = (0,external_path_.resolve)((0,external_path_.join)(...[projectDirPath, ...Array(depth).fill("..")]));
         (0,assert.assert)(cwd !== external_path_.sep, "NPM workspace not found");
         try {
             external_child_process_.execSync("npm config get", {
@@ -4053,7 +4053,7 @@ var z = /*#__PURE__*/Object.freeze({
 var tsafe = __nccwpck_require__(1666);
 // EXTERNAL MODULE: ./dist/bin/shared/constants.js
 var constants = __nccwpck_require__(173);
-;// CONCATENATED MODULE: ./dist/bin/shared/buildOptions.js
+;// CONCATENATED MODULE: ./dist/bin/shared/buildContext.js
 
 
 
@@ -4063,26 +4063,26 @@ var constants = __nccwpck_require__(173);
 
 
 
-function readBuildOptions(params) {
+function getBuildContext(params) {
     var _a, _b, _c, _d, _e, _f;
     const { cliCommandOptions } = params;
-    const reactAppRootDirPath = (() => {
-        if (cliCommandOptions.reactAppRootDirPath === undefined) {
+    const projectDirPath = (() => {
+        if (cliCommandOptions.projectDirPath === undefined) {
             return process.cwd();
         }
         return getAbsoluteAndInOsFormatPath({
-            pathIsh: cliCommandOptions.reactAppRootDirPath,
+            pathIsh: cliCommandOptions.projectDirPath,
             cwd: process.cwd()
         });
     })();
     const { resolvedViteConfig } = (() => {
-        if (external_fs_.readdirSync(reactAppRootDirPath)
+        if (external_fs_.readdirSync(projectDirPath)
             .find(fileBasename => fileBasename.startsWith("vite.config")) ===
             undefined) {
             return { resolvedViteConfig: undefined };
         }
         const output = external_child_process_.execSync("npx vite", {
-            cwd: reactAppRootDirPath,
+            cwd: projectDirPath,
             env: Object.assign(Object.assign({}, process.env), { [constants.vitePluginSubScriptEnvNames.resolveViteConfig]: "true" })
         })
             .toString("utf8");
@@ -4103,7 +4103,7 @@ function readBuildOptions(params) {
                 artifactId: z.string().optional(),
                 groupId: z.string().optional(),
                 loginThemeResourcesFromKeycloakVersion: z.string().optional(),
-                reactAppBuildDirPath: z.string().optional(),
+                projectBuildDirPath: z.string().optional(),
                 keycloakifyBuildDirPath: z.string().optional(),
                 themeName: z.union([z.string(), z.array(z.string())]).optional()
             })
@@ -4113,12 +4113,11 @@ function readBuildOptions(params) {
             (0,tsafe.assert)();
             (0,tsafe.assert)();
         }
-        return zParsedPackageJson.parse(JSON.parse(external_fs_.readFileSync((0,external_path_.join)(reactAppRootDirPath, "package.json"))
-            .toString("utf8")));
+        return zParsedPackageJson.parse(JSON.parse(external_fs_.readFileSync((0,external_path_.join)(projectDirPath, "package.json")).toString("utf8")));
     })();
-    const userProvidedBuildOptions = Object.assign(Object.assign({}, parsedPackageJson.keycloakify), resolvedViteConfig === null || resolvedViteConfig === void 0 ? void 0 : resolvedViteConfig.userProvidedBuildOptions);
+    const buildOptions = Object.assign(Object.assign({}, parsedPackageJson.keycloakify), resolvedViteConfig === null || resolvedViteConfig === void 0 ? void 0 : resolvedViteConfig.buildOptions);
     const themeNames = (() => {
-        if (userProvidedBuildOptions.themeName === undefined) {
+        if (buildOptions.themeName === undefined) {
             return [
                 parsedPackageJson.name
                     .replace(/^@(.*)/, "$1")
@@ -4126,56 +4125,56 @@ function readBuildOptions(params) {
                     .join("-")
             ];
         }
-        if (typeof userProvidedBuildOptions.themeName === "string") {
-            return [userProvidedBuildOptions.themeName];
+        if (typeof buildOptions.themeName === "string") {
+            return [buildOptions.themeName];
         }
-        return userProvidedBuildOptions.themeName;
+        return buildOptions.themeName;
     })();
-    const reactAppBuildDirPath = (() => {
+    const projectBuildDirPath = (() => {
         var _a;
         webpack: {
             if (resolvedViteConfig !== undefined) {
                 break webpack;
             }
-            if (((_a = parsedPackageJson.keycloakify) === null || _a === void 0 ? void 0 : _a.reactAppBuildDirPath) !== undefined) {
+            if (((_a = parsedPackageJson.keycloakify) === null || _a === void 0 ? void 0 : _a.projectBuildDirPath) !== undefined) {
                 return getAbsoluteAndInOsFormatPath({
-                    pathIsh: parsedPackageJson.keycloakify.reactAppBuildDirPath,
-                    cwd: reactAppRootDirPath
+                    pathIsh: parsedPackageJson.keycloakify.projectBuildDirPath,
+                    cwd: projectDirPath
                 });
             }
-            return (0,external_path_.join)(reactAppRootDirPath, "build");
+            return (0,external_path_.join)(projectDirPath, "build");
         }
-        return (0,external_path_.join)(reactAppRootDirPath, resolvedViteConfig.buildDir);
+        return (0,external_path_.join)(projectDirPath, resolvedViteConfig.buildDir);
     })();
     const { npmWorkspaceRootDirPath } = getNpmWorkspaceRootDirPath({
-        reactAppRootDirPath,
+        projectDirPath,
         dependencyExpected: "keycloakify"
     });
     return {
         bundler: resolvedViteConfig !== undefined ? "vite" : "webpack",
         themeVersion: (_b = (_a = process.env.KEYCLOAKIFY_THEME_VERSION) !== null && _a !== void 0 ? _a : parsedPackageJson.version) !== null && _b !== void 0 ? _b : "0.0.0",
         themeNames,
-        extraThemeProperties: userProvidedBuildOptions.extraThemeProperties,
+        extraThemeProperties: buildOptions.extraThemeProperties,
         groupId: (() => {
             var _a, _b, _c, _d, _e;
             const fallbackGroupId = `${themeNames[0]}.keycloak`;
-            return ((_b = (_a = process.env.KEYCLOAKIFY_GROUP_ID) !== null && _a !== void 0 ? _a : userProvidedBuildOptions.groupId) !== null && _b !== void 0 ? _b : (parsedPackageJson.homepage === undefined
+            return ((_b = (_a = process.env.KEYCLOAKIFY_GROUP_ID) !== null && _a !== void 0 ? _a : buildOptions.groupId) !== null && _b !== void 0 ? _b : (parsedPackageJson.homepage === undefined
                 ? fallbackGroupId
                 : (_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: (_d = (_c = process.env.KEYCLOAKIFY_ARTIFACT_ID) !== null && _c !== void 0 ? _c : userProvidedBuildOptions.artifactId) !== null && _d !== void 0 ? _d : `${themeNames[0]}-keycloak-theme`,
-        loginThemeResourcesFromKeycloakVersion: (_e = userProvidedBuildOptions.loginThemeResourcesFromKeycloakVersion) !== null && _e !== void 0 ? _e : "24.0.4",
-        reactAppRootDirPath,
-        reactAppBuildDirPath,
+        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: (() => {
-            if (userProvidedBuildOptions.keycloakifyBuildDirPath !== undefined) {
+            if (buildOptions.keycloakifyBuildDirPath !== undefined) {
                 return getAbsoluteAndInOsFormatPath({
-                    pathIsh: userProvidedBuildOptions.keycloakifyBuildDirPath,
-                    cwd: reactAppRootDirPath
+                    pathIsh: buildOptions.keycloakifyBuildDirPath,
+                    cwd: projectDirPath
                 });
             }
-            return (0,external_path_.join)(reactAppRootDirPath, (resolvedViteConfig === null || resolvedViteConfig === void 0 ? void 0 : resolvedViteConfig.buildDir) === undefined
+            return (0,external_path_.join)(projectDirPath, (resolvedViteConfig === null || resolvedViteConfig === void 0 ? void 0 : resolvedViteConfig.buildDir) === undefined
                 ? "build_keycloak"
                 : `${resolvedViteConfig.buildDir}_keycloak`);
         })(),
@@ -4187,12 +4186,12 @@ function readBuildOptions(params) {
                 if (process.env.PUBLIC_DIR_PATH !== undefined) {
                     return getAbsoluteAndInOsFormatPath({
                         pathIsh: process.env.PUBLIC_DIR_PATH,
-                        cwd: reactAppRootDirPath
+                        cwd: projectDirPath
                     });
                 }
-                return (0,external_path_.join)(reactAppRootDirPath, "public");
+                return (0,external_path_.join)(projectDirPath, "public");
             }
-            return (0,external_path_.join)(reactAppRootDirPath, resolvedViteConfig.publicDir);
+            return (0,external_path_.join)(projectDirPath, resolvedViteConfig.publicDir);
         })(),
         cacheDirPath: (() => {
             const cacheDirPath = (0,external_path_.join)((() => {
@@ -4229,16 +4228,28 @@ function readBuildOptions(params) {
                 if (resolvedViteConfig !== undefined) {
                     break webpack;
                 }
-                return (0,external_path_.join)(reactAppBuildDirPath, "static");
+                return (0,external_path_.join)(projectBuildDirPath, "static");
             }
-            return (0,external_path_.join)(reactAppBuildDirPath, resolvedViteConfig.assetsDir);
+            return (0,external_path_.join)(projectBuildDirPath, resolvedViteConfig.assetsDir);
         })(),
         npmWorkspaceRootDirPath,
-        kcContextExclusionsFtlCode: userProvidedBuildOptions.kcContextExclusionsFtlCode,
-        environmentVariables: (_f = userProvidedBuildOptions.environmentVariables) !== null && _f !== void 0 ? _f : []
+        kcContextExclusionsFtlCode: (() => {
+            if (buildOptions.kcContextExclusionsFtl === undefined) {
+                return undefined;
+            }
+            if (buildOptions.kcContextExclusionsFtl.endsWith(".ftl")) {
+                const kcContextExclusionsFtlPath = getAbsoluteAndInOsFormatPath({
+                    pathIsh: buildOptions.kcContextExclusionsFtl,
+                    cwd: projectDirPath
+                });
+                return external_fs_.readFileSync(kcContextExclusionsFtlPath).toString("utf8");
+            }
+            return buildOptions.kcContextExclusionsFtl;
+        })(),
+        environmentVariables: (_f = buildOptions.environmentVariables) !== null && _f !== void 0 ? _f : []
     };
 }
-//# sourceMappingURL=buildOptions.js.map
+//# sourceMappingURL=buildContext.js.map
 
 /***/ }),
 
@@ -4810,11 +4821,11 @@ function isInside(params) {
 
 (0,assert.assert)();
 async function downloadKeycloakDefaultTheme(params) {
-    const { keycloakVersion, buildOptions } = params;
+    const { keycloakVersion, buildContext } = params;
     const { extractedDirPath } = await downloadAndExtractArchive({
         url: `https://repo1.maven.org/maven2/org/keycloak/keycloak-themes/${keycloakVersion}/keycloak-themes-${keycloakVersion}.jar`,
-        cacheDirPath: buildOptions.cacheDirPath,
-        npmWorkspaceRootDirPath: buildOptions.npmWorkspaceRootDirPath,
+        cacheDirPath: buildContext.cacheDirPath,
+        npmWorkspaceRootDirPath: buildContext.npmWorkspaceRootDirPath,
         uniqueIdOfOnOnArchiveFile: "downloadKeycloakDefaultTheme",
         onArchiveFile: async (params) => {
             if (!isInside({ dirPath: "theme", filePath: params.fileRelativePath })) {
@@ -4929,10 +4940,10 @@ async function downloadKeycloakDefaultTheme(params) {
 
 (0,assert.assert)();
 async function downloadKeycloakStaticResources(params) {
-    const { themeType, themeDirPath, keycloakVersion, buildOptions } = params;
+    const { themeType, themeDirPath, keycloakVersion, buildContext } = params;
     const { defaultThemeDirPath } = await downloadKeycloakDefaultTheme({
         keycloakVersion,
-        buildOptions
+        buildContext
     });
     const resourcesDirPath = (0,external_path_.join)(themeDirPath, themeType, "resources");
     repatriate_base_resources: {
@@ -4994,16 +5005,16 @@ function readThisNpmPackageVersion() {
 
 (0,assert.assert)();
 async function copyKeycloakResourcesToPublic(params) {
-    const { buildOptions } = params;
-    const destDirPath = (0,external_path_.join)(buildOptions.publicDirPath, constants.keycloak_resources);
+    const { buildContext } = params;
+    const destDirPath = (0,external_path_.join)(buildContext.publicDirPath, constants.keycloak_resources);
     const keycloakifyBuildinfoFilePath = (0,external_path_.join)(destDirPath, "keycloakify.buildinfo");
     const keycloakifyBuildinfoRaw = JSON.stringify({
         destDirPath,
         keycloakifyVersion: readThisNpmPackageVersion(),
-        buildOptions: {
+        buildContext: {
             loginThemeResourcesFromKeycloakVersion: readThisNpmPackageVersion(),
-            cacheDirPath: (0,external_path_.relative)(destDirPath, buildOptions.cacheDirPath),
-            npmWorkspaceRootDirPath: (0,external_path_.relative)(destDirPath, buildOptions.npmWorkspaceRootDirPath)
+            cacheDirPath: (0,external_path_.relative)(destDirPath, buildContext.cacheDirPath),
+            npmWorkspaceRootDirPath: (0,external_path_.relative)(destDirPath, buildContext.npmWorkspaceRootDirPath)
         }
     }, null, 2);
     skip_if_already_done: {
@@ -5025,14 +5036,14 @@ async function copyKeycloakResourcesToPublic(params) {
             keycloakVersion: (() => {
                 switch (themeType) {
                     case "login":
-                        return buildOptions.loginThemeResourcesFromKeycloakVersion;
+                        return buildContext.loginThemeResourcesFromKeycloakVersion;
                     case "account":
                         return constants.lastKeycloakVersionWithAccountV1;
                 }
             })(),
             themeType,
             themeDirPath: destDirPath,
-            buildOptions
+            buildContext
         });
     }
     external_fs_.writeFileSync((0,external_path_.join)(destDirPath, "README.txt"), Buffer.from(
@@ -5081,8 +5092,8 @@ var constants = __nccwpck_require__(173);
 const themeSrcDirBasenames = ["keycloak-theme", "keycloak_theme"];
 /** Can't catch error, if the directory isn't found, this function will just exit the process with an error message. */
 function getThemeSrcDirPath(params) {
-    const { reactAppRootDirPath } = params;
-    const srcDirPath = (0,external_path_.join)(reactAppRootDirPath, "src");
+    const { projectDirPath } = params;
+    const srcDirPath = (0,external_path_.join)(projectDirPath, "src");
     const themeSrcDirPath = (0,crawl/* crawl */.J)({
         dirPath: srcDirPath,
         returnedPathsType: "relative to dirPath"
@@ -5123,9 +5134,9 @@ var promises_ = __nccwpck_require__(3292);
 
 (0,assert.assert)();
 async function generateKcGenTs(params) {
-    const { buildOptions } = params;
+    const { buildContext } = params;
     const { themeSrcDirPath } = getThemeSrcDirPath({
-        reactAppRootDirPath: buildOptions.reactAppRootDirPath
+        projectDirPath: buildContext.projectDirPath
     });
     await promises_.writeFile((0,external_path_.join)(themeSrcDirPath, "kc.gen.ts"), Buffer.from([
         `/* prettier-ignore-start */`,
@@ -5138,15 +5149,15 @@ async function generateKcGenTs(params) {
         ``,
         `// This file is auto-generated by Keycloakify`,
         ``,
-        `export type ThemeName = ${buildOptions.themeNames.map(themeName => `"${themeName}"`).join(" | ")};`,
+        `export type ThemeName = ${buildContext.themeNames.map(themeName => `"${themeName}"`).join(" | ")};`,
         ``,
-        `export const themeNames: ThemeName[] = [${buildOptions.themeNames.map(themeName => `"${themeName}"`).join(", ")}];`,
+        `export const themeNames: ThemeName[] = [${buildContext.themeNames.map(themeName => `"${themeName}"`).join(", ")}];`,
         ``,
-        `export type KcEnvName = ${buildOptions.environmentVariables.length === 0 ? "never" : buildOptions.environmentVariables.map(({ name }) => `"${name}"`).join(" | ")};`,
+        `export type KcEnvName = ${buildContext.environmentVariables.length === 0 ? "never" : buildContext.environmentVariables.map(({ name }) => `"${name}"`).join(" | ")};`,
         ``,
-        `export const KcEnvNames: KcEnvName[] = [${buildOptions.environmentVariables.map(({ name }) => `"${name}"`).join(", ")}];`,
+        `export const KcEnvNames: KcEnvName[] = [${buildContext.environmentVariables.map(({ name }) => `"${name}"`).join(", ")}];`,
         ``,
-        `export const kcEnvDefaults: Record<KcEnvName, string> = ${JSON.stringify(Object.fromEntries(buildOptions.environmentVariables.map(({ name, default: defaultValue }) => [name, defaultValue])), null, 2)};`,
+        `export const kcEnvDefaults: Record<KcEnvName, string> = ${JSON.stringify(Object.fromEntries(buildContext.environmentVariables.map(({ name, default: defaultValue }) => [name, defaultValue])), null, 2)};`,
         ``,
         `/* prettier-ignore-end */`
     ].join("\n"), "utf8"));
@@ -5373,12 +5384,12 @@ const id_1 = __nccwpck_require__(3047);
 const fs_rm_1 = __nccwpck_require__(8699);
 const copyKeycloakResourcesToPublic_1 = __nccwpck_require__(8047);
 const assert_1 = __nccwpck_require__(8078);
-const buildOptions_1 = __nccwpck_require__(6757);
+const buildContext_1 = __nccwpck_require__(8355);
 const magic_string_1 = __importDefault(__nccwpck_require__(5734));
 const generateKcGenTs_1 = __nccwpck_require__(7733);
 function keycloakify(params) {
-    const { postBuild, ...userProvidedBuildOptions } = params !== null && params !== void 0 ? params : {};
-    let reactAppRootDirPath = undefined;
+    const { postBuild, ...buildOptions } = params !== null && params !== void 0 ? params : {};
+    let projectDirPath = undefined;
     let urlPathname = undefined;
     let buildDirPath = undefined;
     let command = undefined;
@@ -5392,12 +5403,12 @@ function keycloakify(params) {
                 if (envValue === undefined) {
                     break run_post_build_script_case;
                 }
-                const buildOptions = JSON.parse(envValue);
-                await (postBuild === null || postBuild === void 0 ? void 0 : postBuild(buildOptions));
+                const buildContext = JSON.parse(envValue);
+                await (postBuild === null || postBuild === void 0 ? void 0 : postBuild(buildContext));
                 process.exit(0);
             }
             command = resolvedConfig.command;
-            reactAppRootDirPath = resolvedConfig.root;
+            projectDirPath = resolvedConfig.root;
             urlPathname = (() => {
                 var _a;
                 let out = resolvedConfig.env.BASE_URL;
@@ -5420,7 +5431,7 @@ function keycloakify(params) {
                 }
                 return out;
             })();
-            buildDirPath = (0, path_1.join)(reactAppRootDirPath, resolvedConfig.build.outDir);
+            buildDirPath = (0, path_1.join)(projectDirPath, resolvedConfig.build.outDir);
             resolve_vite_config_case: {
                 const envValue = process.env[constants_1.vitePluginSubScriptEnvNames.resolveViteConfig];
                 if (envValue === undefined) {
@@ -5428,25 +5439,25 @@ function keycloakify(params) {
                 }
                 console.log(constants_1.vitePluginSubScriptEnvNames.resolveViteConfig);
                 console.log(JSON.stringify((0, id_1.id)({
-                    publicDir: (0, path_1.relative)(reactAppRootDirPath, resolvedConfig.publicDir),
+                    publicDir: (0, path_1.relative)(projectDirPath, resolvedConfig.publicDir),
                     assetsDir: resolvedConfig.build.assetsDir,
                     buildDir: resolvedConfig.build.outDir,
                     urlPathname,
-                    userProvidedBuildOptions
+                    buildOptions
                 })));
                 process.exit(0);
             }
-            const buildOptions = (0, buildOptions_1.readBuildOptions)({
+            const buildContext = (0, buildContext_1.getBuildContext)({
                 cliCommandOptions: {
-                    reactAppRootDirPath
+                    projectDirPath
                 }
             });
             await Promise.all([
                 (0, copyKeycloakResourcesToPublic_1.copyKeycloakResourcesToPublic)({
-                    buildOptions
+                    buildContext
                 }),
                 (0, generateKcGenTs_1.generateKcGenTs)({
-                    buildOptions
+                    buildContext
                 })
             ]);
         },
@@ -5456,9 +5467,9 @@ function keycloakify(params) {
             if (command !== "build") {
                 return;
             }
-            (0, assert_1.assert)(reactAppRootDirPath !== undefined);
+            (0, assert_1.assert)(projectDirPath !== undefined);
             {
-                const isWithinSourceDirectory = id.startsWith((0, path_1.join)(reactAppRootDirPath, "src") + path_1.sep);
+                const isWithinSourceDirectory = id.startsWith((0, path_1.join)(projectDirPath, "src") + path_1.sep);
                 if (!isWithinSourceDirectory) {
                     return;
                 }

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

@@ -1,5 +1,5 @@
-import { type BuildOptions, type UserProvidedBuildOptions } from "../bin/shared/buildOptions";
-export type Params = UserProvidedBuildOptions & {
-    postBuild?: (buildOptions: Omit<BuildOptions, "bundler">) => Promise<void>;
+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;