agtic/keycloak_theme
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename build option, update readme

Browse Source
This commit is contained in:
garronej
2023-09-03 21:02:51 +02:00
parent 39ff7913d6
commit 21d6d27435
5 changed files with 18 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/bin/copy-keycloak-resources-to-public.ts
View File

@ -38,7 +38,7 @@ import * as fs from "fs";
"keycloakVersion": (() => {
switch (themeType) {
case "login":
return buildOptions.loginThemeDefaultResourcesFromKeycloakVersion;
return buildOptions.loginThemeResourcesFromKeycloakVersion;
case "account":
return lastKeycloakVersionWithAccountV1;
}

14
src/bin/keycloakify/BuildOptions.ts
View File

@ -17,7 +17,7 @@ export type BuildOptions = {
groupId: string;
artifactId: string;
bundler: Bundler;
loginThemeDefaultResourcesFromKeycloakVersion: string;
loginThemeResourcesFromKeycloakVersion: string;
/** Directory of your built react project. Defaults to {cwd}/build */
reactAppBuildDirPath: string;
/** Directory that keycloakify outputs to. Defaults to {cwd}/build_keycloak */
@ -42,15 +42,7 @@ export function readBuildOptions(params: { projectDirPath: string; processArgv:
const { name, keycloakify = {}, version, homepage } = parsedPackageJson;
const {
extraThemeProperties,
groupId,
artifactId,
bundler,
keycloakVersionDefaultAssets,
loginThemeDefaultResourcesFromKeycloakVersion,
extraThemeNames = []
} = keycloakify ?? {};
const { extraThemeProperties, groupId, artifactId, bundler, loginThemeResourcesFromKeycloakVersion, extraThemeNames = [] } = keycloakify ?? {};
const themeName =
keycloakify.themeName ??
@ -91,7 +83,7 @@ export function readBuildOptions(params: { projectDirPath: string; processArgv:
"themeVersion": process.env.KEYCLOAKIFY_THEME_VERSION ?? process.env.KEYCLOAKIFY_VERSION ?? version ?? "0.0.0",
extraThemeProperties,
"isSilent": isSilentCliParamProvided,
"loginThemeDefaultResourcesFromKeycloakVersion": loginThemeDefaultResourcesFromKeycloakVersion ?? keycloakVersionDefaultAssets ?? "11.0.3",
"loginThemeResourcesFromKeycloakVersion": loginThemeResourcesFromKeycloakVersion ?? "11.0.3",
"reactAppBuildDirPath": (() => {
let { reactAppBuildDirPath = undefined } = parsedPackageJson.keycloakify ?? {};

4
src/bin/keycloakify/generateTheme/generateTheme.ts
View File

@ -18,7 +18,7 @@ export type BuildOptionsLike = {
themeName: string;
extraThemeProperties: string[] | undefined;
themeVersion: string;
loginThemeDefaultResourcesFromKeycloakVersion: string;
loginThemeResourcesFromKeycloakVersion: string;
urlPathname: string | undefined;
};
@ -167,7 +167,7 @@ export async function generateTheme(params: {
case "account":
return lastKeycloakVersionWithAccountV1;
case "login":
return buildOptions.loginThemeDefaultResourcesFromKeycloakVersion;
return buildOptions.loginThemeResourcesFromKeycloakVersion;
}
})(),
themeDirPath,

7
src/bin/keycloakify/parsedPackageJson.ts
View File

@ -16,9 +16,7 @@ export type ParsedPackageJson = {
artifactId?: string;
groupId?: string;
bundler?: Bundler;
/** @deprecated: Use loginThemeDefaultResourcesFromKeycloakVersion instead */
keycloakVersionDefaultAssets?: string;
loginThemeDefaultResourcesFromKeycloakVersion?: string;
loginThemeResourcesFromKeycloakVersion?: string;
reactAppBuildDirPath?: string;
keycloakifyBuildDirPath?: string;
themeName?: string;
@ -37,8 +35,7 @@ export const zParsedPackageJson = z.object({
"artifactId": z.string().optional(),
"groupId": z.string().optional(),
"bundler": z.enum(bundlers).optional(),
"keycloakVersionDefaultAssets": z.string().optional(),
"loginThemeDefaultResourcesFromKeycloakVersion": z.string().optional(),
"loginThemeResourcesFromKeycloakVersion": z.string().optional(),
"reactAppBuildDirPath": z.string().optional(),
"keycloakifyBuildDirPath": z.string().optional(),
"themeName": z.string().optional(),