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

package/bin/538.index.js

@@ -3,13 +3,13 @@ exports.id = 538;
 exports.ids = [538];
 exports.modules = {
 
-/***/ 54659:
+/***/ 87751:
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
 
 
 // EXPORTS
 __webpack_require__.d(__webpack_exports__, {
-  "d": () => (/* binding */ readBuildOptions)
+  "s": () => (/* binding */ getBuildContext)
 });
 
 // EXTERNAL MODULE: external "url"
@@ -30,9 +30,9 @@ var external_fs_ = __webpack_require__(57147);
 
 
 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", {
@@ -81,7 +81,7 @@ var lib = __webpack_require__(52300);
 var tsafe = __webpack_require__(1666);
 // EXTERNAL MODULE: ./dist/bin/shared/constants.js
 var constants = __webpack_require__(173);
-;// CONCATENATED MODULE: ./dist/bin/shared/buildOptions.js
+;// CONCATENATED MODULE: ./dist/bin/shared/buildContext.js
 
 
 
@@ -91,26 +91,26 @@ var constants = __webpack_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 (0,getAbsoluteAndInOsFormatPath/* getAbsoluteAndInOsFormatPath */.c)({
-            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 */.fe.resolveViteConfig]: "true" })
         })
             .toString("utf8");
@@ -131,7 +131,7 @@ function readBuildOptions(params) {
                 artifactId: lib.z.string().optional(),
                 groupId: lib.z.string().optional(),
                 loginThemeResourcesFromKeycloakVersion: lib.z.string().optional(),
-                reactAppBuildDirPath: lib.z.string().optional(),
+                projectBuildDirPath: lib.z.string().optional(),
                 keycloakifyBuildDirPath: lib.z.string().optional(),
                 themeName: lib.z.union([lib.z.string(), lib.z.array(lib.z.string())]).optional()
             })
@@ -141,12 +141,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")
@@ -154,56 +153,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 (0,getAbsoluteAndInOsFormatPath/* getAbsoluteAndInOsFormatPath */.c)({
-                    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 (0,getAbsoluteAndInOsFormatPath/* getAbsoluteAndInOsFormatPath */.c)({
-                    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`);
         })(),
@@ -215,12 +214,12 @@ function readBuildOptions(params) {
                 if (process.env.PUBLIC_DIR_PATH !== undefined) {
                     return (0,getAbsoluteAndInOsFormatPath/* getAbsoluteAndInOsFormatPath */.c)({
                         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)((() => {
@@ -257,16 +256,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 = (0,getAbsoluteAndInOsFormatPath/* getAbsoluteAndInOsFormatPath */.c)({
+                    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
 
 /***/ }),
 
@@ -373,8 +384,8 @@ const containerName = "keycloak-keycloakify";
 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,path__WEBPACK_IMPORTED_MODULE_3__.join)(reactAppRootDirPath, "src");
+    const { projectDirPath } = params;
+    const srcDirPath = (0,path__WEBPACK_IMPORTED_MODULE_3__.join)(projectDirPath, "src");
     const themeSrcDirPath = (0,_tools_crawl__WEBPACK_IMPORTED_MODULE_2__/* .crawl */ .J)({
         dirPath: srcDirPath,
         returnedPathsType: "relative to dirPath"
@@ -488,8 +499,8 @@ __webpack_require__.d(__webpack_exports__, {
   "command": () => (/* binding */ command)
 });
 
-// EXTERNAL MODULE: ./dist/bin/shared/buildOptions.js + 1 modules
-var shared_buildOptions = __webpack_require__(54659);
+// EXTERNAL MODULE: ./dist/bin/shared/buildContext.js + 1 modules
+var shared_buildContext = __webpack_require__(87751);
 // EXTERNAL MODULE: ./node_modules/tsafe/assert.js
 var assert = __webpack_require__(88078);
 // EXTERNAL MODULE: ./dist/bin/shared/getThemeSrcDirPath.js
@@ -505,9 +516,9 @@ var external_path_ = __webpack_require__(71017);
 
 (0,assert.assert)();
 async function generateKcGenTs(params) {
-    const { buildOptions } = params;
+    const { buildContext } = params;
     const { themeSrcDirPath } = (0,getThemeSrcDirPath/* getThemeSrcDirPath */.f)({
-        reactAppRootDirPath: buildOptions.reactAppRootDirPath
+        projectDirPath: buildContext.projectDirPath
     });
     await promises_.writeFile((0,external_path_.join)(themeSrcDirPath, "kc.gen.ts"), Buffer.from([
         `/* prettier-ignore-start */`,
@@ -520,15 +531,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"));
@@ -539,10 +550,10 @@ async function generateKcGenTs(params) {
 
 async function command(params) {
     const { cliCommandOptions } = params;
-    const buildOptions = (0,shared_buildOptions/* readBuildOptions */.d)({
+    const buildContext = (0,shared_buildContext/* getBuildContext */.s)({
         cliCommandOptions
     });
-    await generateKcGenTs({ buildOptions });
+    await generateKcGenTs({ buildContext });
 }
 //# sourceMappingURL=update-kc-gen.js.map
 

package/bin/932.index.js

@@ -15,7 +15,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var path__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(path__WEBPACK_IMPORTED_MODULE_1__);
 /* harmony import */ var _tools_transformCodebase__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(60332);
 /* harmony import */ var _shared_promptKeycloakVersion__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(95781);
-/* harmony import */ var _shared_buildOptions__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(54659);
+/* harmony import */ var _shared_buildContext__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(87751);
 /* harmony import */ var fs__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(57147);
 /* harmony import */ var fs__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(fs__WEBPACK_IMPORTED_MODULE_5__);
 /* harmony import */ var _shared_getThemeSrcDirPath__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(39216);
@@ -28,9 +28,9 @@ __webpack_require__.r(__webpack_exports__);
 
 async function command(params) {
     const { cliCommandOptions } = params;
-    const buildOptions = (0,_shared_buildOptions__WEBPACK_IMPORTED_MODULE_4__/* .readBuildOptions */ .d)({ cliCommandOptions });
+    const buildContext = (0,_shared_buildContext__WEBPACK_IMPORTED_MODULE_4__/* .getBuildContext */ .s)({ cliCommandOptions });
     const { themeSrcDirPath } = (0,_shared_getThemeSrcDirPath__WEBPACK_IMPORTED_MODULE_6__/* .getThemeSrcDirPath */ .f)({
-        reactAppRootDirPath: buildOptions.reactAppRootDirPath
+        projectDirPath: buildContext.projectDirPath
     });
     const emailThemeSrcDirPath = (0,path__WEBPACK_IMPORTED_MODULE_1__.join)(themeSrcDirPath, "email");
     if (fs__WEBPACK_IMPORTED_MODULE_5__.existsSync(emailThemeSrcDirPath)) {
@@ -41,11 +41,11 @@ async function command(params) {
     const { keycloakVersion } = await (0,_shared_promptKeycloakVersion__WEBPACK_IMPORTED_MODULE_3__/* .promptKeycloakVersion */ .s)({
         // NOTE: This is arbitrary
         startingFromMajor: 17,
-        cacheDirPath: buildOptions.cacheDirPath
+        cacheDirPath: buildContext.cacheDirPath
     });
     const { defaultThemeDirPath } = await (0,_shared_downloadKeycloakDefaultTheme__WEBPACK_IMPORTED_MODULE_0__/* .downloadKeycloakDefaultTheme */ .x)({
         keycloakVersion,
-        buildOptions
+        buildContext
     });
     (0,_tools_transformCodebase__WEBPACK_IMPORTED_MODULE_2__/* .transformCodebase */ .N)({
         srcDirPath: (0,path__WEBPACK_IMPORTED_MODULE_1__.join)(defaultThemeDirPath, "base", "email"),
@@ -84,8 +84,8 @@ async function command(params) {
 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,path__WEBPACK_IMPORTED_MODULE_3__.join)(reactAppRootDirPath, "src");
+    const { projectDirPath } = params;
+    const srcDirPath = (0,path__WEBPACK_IMPORTED_MODULE_3__.join)(projectDirPath, "src");
     const themeSrcDirPath = (0,_tools_crawl__WEBPACK_IMPORTED_MODULE_2__/* .crawl */ .J)({
         dirPath: srcDirPath,
         returnedPathsType: "relative to dirPath"