diff --git a/src/bin/keycloakify/generateTheme/generateTheme.ts b/src/bin/keycloakify/generateTheme/generateTheme.ts index a41bf802..979d4e4d 100644 --- a/src/bin/keycloakify/generateTheme/generateTheme.ts +++ b/src/bin/keycloakify/generateTheme/generateTheme.ts @@ -11,13 +11,8 @@ export type BuildOptionsLike = BuildOptionsLike_generateSrcMainResources & { assert(); -export async function generateTheme(params: { - themeSrcDirPath: string; - keycloakifySrcDirPath: string; - buildOptions: BuildOptionsLike; - keycloakifyVersion: string; -}): Promise { - const { themeSrcDirPath, keycloakifySrcDirPath, buildOptions, keycloakifyVersion } = params; +export async function generateTheme(params: { buildOptions: BuildOptionsLike }): Promise { + const { buildOptions } = params; const [themeName, ...themeVariantNames] = buildOptions.themeNames; @@ -26,9 +21,6 @@ export async function generateTheme(params: { await generateSrcMainResources({ themeName, srcMainResourcesDirPath, - themeSrcDirPath, - keycloakifySrcDirPath, - keycloakifyVersion, buildOptions }); diff --git a/src/bin/keycloakify/generateTheme/readFieldNameUsage.ts b/src/bin/keycloakify/generateTheme/readFieldNameUsage.ts index a3a611d7..72a7a9a0 100644 --- a/src/bin/keycloakify/generateTheme/readFieldNameUsage.ts +++ b/src/bin/keycloakify/generateTheme/readFieldNameUsage.ts @@ -2,14 +2,15 @@ import { crawl } from "../../tools/crawl"; import { join as pathJoin } from "path"; import * as fs from "fs"; import type { ThemeType } from "../../shared/constants"; +import { getThisCodebaseRootDirPath } from "../../tools/getThisCodebaseRootDirPath"; /** Assumes the theme type exists */ -export function readFieldNameUsage(params: { keycloakifySrcDirPath: string; themeSrcDirPath: string; themeType: ThemeType }): string[] { - const { keycloakifySrcDirPath, themeSrcDirPath, themeType } = params; +export function readFieldNameUsage(params: { themeSrcDirPath: string; themeType: ThemeType }): string[] { + const { themeSrcDirPath, themeType } = params; const fieldNames = new Set(); - for (const srcDirPath of [pathJoin(keycloakifySrcDirPath, themeType), pathJoin(themeSrcDirPath, themeType)]) { + for (const srcDirPath of [pathJoin(getThisCodebaseRootDirPath(), "src", themeType), pathJoin(themeSrcDirPath, themeType)]) { const filePaths = crawl({ "dirPath": srcDirPath, "returnedPathsType": "absolute" }).filter(filePath => /\.(ts|tsx|js|jsx)$/.test(filePath)); for (const filePath of filePaths) { diff --git a/src/bin/keycloakify/keycloakify.ts b/src/bin/keycloakify/keycloakify.ts index de6459fb..27115ed3 100644 --- a/src/bin/keycloakify/keycloakify.ts +++ b/src/bin/keycloakify/keycloakify.ts @@ -4,9 +4,6 @@ import * as child_process from "child_process"; import * as fs from "fs"; import { readBuildOptions } from "../shared/buildOptions"; import { getLogger } from "../tools/logger"; -import { getThemeSrcDirPath } from "../shared/getThemeSrcDirPath"; -import { getThisCodebaseRootDirPath } from "../tools/getThisCodebaseRootDirPath"; -import { readThisNpmProjectVersion } from "../tools/readThisNpmProjectVersion"; import { vitePluginSubScriptEnvNames } from "../shared/constants"; import { buildJars } from "./buildJars"; import type { CliCommandOptions } from "../main"; @@ -20,8 +17,6 @@ export async function command(params: { cliCommandOptions: CliCommandOptions }) logger.log("🔏 Building the keycloak theme...⌚"); - const { themeSrcDirPath } = getThemeSrcDirPath({ "reactAppRootDirPath": buildOptions.reactAppRootDirPath }); - { if (!fs.existsSync(buildOptions.keycloakifyBuildDirPath)) { fs.mkdirSync(buildOptions.keycloakifyBuildDirPath, { "recursive": true }); @@ -30,12 +25,7 @@ export async function command(params: { cliCommandOptions: CliCommandOptions }) fs.writeFileSync(pathJoin(buildOptions.keycloakifyBuildDirPath, ".gitignore"), Buffer.from("*", "utf8")); } - await generateTheme({ - themeSrcDirPath, - "keycloakifySrcDirPath": pathJoin(getThisCodebaseRootDirPath(), "src"), - "keycloakifyVersion": readThisNpmProjectVersion(), - buildOptions - }); + await generateTheme({ buildOptions }); run_post_build_script: { if (buildOptions.bundler !== "vite") {