diff --git a/src/bin/copy-keycloak-resources-to-public.ts b/src/bin/copy-keycloak-resources-to-public.ts index f90e2fd1..939c3239 100644 --- a/src/bin/copy-keycloak-resources-to-public.ts +++ b/src/bin/copy-keycloak-resources-to-public.ts @@ -2,7 +2,7 @@ import { downloadKeycloakStaticResources } from "./keycloakify/generateTheme/downloadKeycloakStaticResources"; import { join as pathJoin, relative as pathRelative } from "path"; -import { readBuildOptions } from "./keycloakify/BuildOptions"; +import { readBuildOptions } from "./keycloakify/buildOptions2"; import { themeTypes, keycloak_resources, lastKeycloakVersionWithAccountV1 } from "./constants"; import * as fs from "fs"; diff --git a/src/bin/download-builtin-keycloak-theme.ts b/src/bin/download-builtin-keycloak-theme.ts index ab257e92..2bb68c72 100644 --- a/src/bin/download-builtin-keycloak-theme.ts +++ b/src/bin/download-builtin-keycloak-theme.ts @@ -3,9 +3,8 @@ import { join as pathJoin } from "path"; import { downloadAndUnzip } from "./tools/downloadAndUnzip"; import { promptKeycloakVersion } from "./promptKeycloakVersion"; import { getLogger } from "./tools/logger"; -import { readBuildOptions } from "./keycloakify/BuildOptions"; +import { readBuildOptions, type BuildOptions } from "./keycloakify/buildOptions2"; import { assert } from "tsafe/assert"; -import type { BuildOptions } from "./keycloakify/BuildOptions"; import * as child_process from "child_process"; import * as fs from "fs"; diff --git a/src/bin/eject-keycloak-page.ts b/src/bin/eject-keycloak-page.ts index e82ff9c7..71d70483 100644 --- a/src/bin/eject-keycloak-page.ts +++ b/src/bin/eject-keycloak-page.ts @@ -9,7 +9,7 @@ import { existsSync } from "fs"; import { join as pathJoin, relative as pathRelative } from "path"; import { kebabCaseToCamelCase } from "./tools/kebabCaseToSnakeCase"; import { assert, Equals } from "tsafe/assert"; -import { getThemeSrcDirPath } from "./getSrcDirPath"; +import { getThemeSrcDirPath } from "./getThemeSrcDirPath"; import { themeTypes, type ThemeType } from "./constants"; (async () => { diff --git a/src/bin/getSrcDirPath.ts b/src/bin/getThemeSrcDirPath.ts similarity index 100% rename from src/bin/getSrcDirPath.ts rename to src/bin/getThemeSrcDirPath.ts diff --git a/src/bin/initialize-email-theme.ts b/src/bin/initialize-email-theme.ts index 14f44d6e..165add5d 100644 --- a/src/bin/initialize-email-theme.ts +++ b/src/bin/initialize-email-theme.ts @@ -4,10 +4,10 @@ import { downloadBuiltinKeycloakTheme } from "./download-builtin-keycloak-theme" import { join as pathJoin, relative as pathRelative } from "path"; import { transformCodebase } from "./tools/transformCodebase"; import { promptKeycloakVersion } from "./promptKeycloakVersion"; -import { readBuildOptions } from "./keycloakify/BuildOptions"; +import { readBuildOptions } from "./keycloakify/buildOptions2"; import * as fs from "fs"; import { getLogger } from "./tools/logger"; -import { getThemeSrcDirPath } from "./getSrcDirPath"; +import { getThemeSrcDirPath } from "./getThemeSrcDirPath"; export async function main() { const reactAppRootDirPath = process.cwd(); diff --git a/src/bin/keycloakify/BuildOptions.ts b/src/bin/keycloakify/buildOptions2/buildOptions2.ts similarity index 98% rename from src/bin/keycloakify/BuildOptions.ts rename to src/bin/keycloakify/buildOptions2/buildOptions2.ts index 0ff6268d..3de46600 100644 --- a/src/bin/keycloakify/BuildOptions.ts +++ b/src/bin/keycloakify/buildOptions2/buildOptions2.ts @@ -2,7 +2,7 @@ import { parse as urlParse } from "url"; import { getParsedPackageJson } from "./parsedPackageJson"; import { join as pathJoin } from "path"; import parseArgv from "minimist"; -import { getAbsoluteAndInOsFormatPath } from "../tools/getAbsoluteAndInOsFormatPath"; +import { getAbsoluteAndInOsFormatPath } from "../../tools/getAbsoluteAndInOsFormatPath"; import { readResolvedViteConfig, getKeycloakifyBuildDirPath } from "./resolvedViteConfig"; /** Consolidated build option gathered form CLI arguments and config in package.json */ diff --git a/src/bin/keycloakify/buildOptions2/index.ts b/src/bin/keycloakify/buildOptions2/index.ts new file mode 100644 index 00000000..ff784b36 --- /dev/null +++ b/src/bin/keycloakify/buildOptions2/index.ts @@ -0,0 +1 @@ +export * from "./buildOptions2"; diff --git a/src/bin/keycloakify/parsedPackageJson.ts b/src/bin/keycloakify/buildOptions2/parsedPackageJson.ts similarity index 97% rename from src/bin/keycloakify/parsedPackageJson.ts rename to src/bin/keycloakify/buildOptions2/parsedPackageJson.ts index 52905de1..59308e48 100644 --- a/src/bin/keycloakify/parsedPackageJson.ts +++ b/src/bin/keycloakify/buildOptions2/parsedPackageJson.ts @@ -2,7 +2,7 @@ import * as fs from "fs"; import { assert } from "tsafe"; import type { Equals } from "tsafe"; import { z } from "zod"; -import { pathJoin } from "../tools/pathJoin"; +import { join as pathJoin } from "path"; export type ParsedPackageJson = { name: string; diff --git a/src/bin/keycloakify/resolvedViteConfig.ts b/src/bin/keycloakify/buildOptions2/resolvedViteConfig.ts similarity index 92% rename from src/bin/keycloakify/resolvedViteConfig.ts rename to src/bin/keycloakify/buildOptions2/resolvedViteConfig.ts index 4f422909..7f62b92a 100644 --- a/src/bin/keycloakify/resolvedViteConfig.ts +++ b/src/bin/keycloakify/buildOptions2/resolvedViteConfig.ts @@ -2,10 +2,10 @@ import * as fs from "fs"; import { assert } from "tsafe"; import type { Equals } from "tsafe"; import { z } from "zod"; -import { pathJoin } from "../tools/pathJoin"; -import { resolvedViteConfigJsonBasename } from "../constants"; -import type { OptionalIfCanBeUndefined } from "../tools/OptionalIfCanBeUndefined"; -import { getAbsoluteAndInOsFormatPath } from "../tools/getAbsoluteAndInOsFormatPath"; +import { join as pathJoin } from "path"; +import { resolvedViteConfigJsonBasename } from "../../constants"; +import type { OptionalIfCanBeUndefined } from "../../tools/OptionalIfCanBeUndefined"; +import { getAbsoluteAndInOsFormatPath } from "../../tools/getAbsoluteAndInOsFormatPath"; export type ResolvedViteConfig = { buildDir: string; diff --git a/src/bin/keycloakify/ftlValuesGlobalName.ts b/src/bin/keycloakify/ftlValuesGlobalName.ts deleted file mode 100644 index e69de29b..00000000 diff --git a/src/bin/keycloakify/generateFtl/generateFtl.ts b/src/bin/keycloakify/generateFtl/generateFtl.ts index 04392ed6..15be1210 100644 --- a/src/bin/keycloakify/generateFtl/generateFtl.ts +++ b/src/bin/keycloakify/generateFtl/generateFtl.ts @@ -5,7 +5,7 @@ import { replaceImportsInInlineCssCode } from "../replacers/replaceImportsInInli import * as fs from "fs"; import { join as pathJoin } from "path"; import { objectKeys } from "tsafe/objectKeys"; -import type { BuildOptions } from "../BuildOptions"; +import type { BuildOptions } from "../buildOptions2"; import { assert } from "tsafe/assert"; import { type ThemeType, nameOfTheGlobal, basenameOfTheKeycloakifyResourcesDir } from "../../constants"; diff --git a/src/bin/keycloakify/generateJavaStackFiles/bringInAccountV1.ts b/src/bin/keycloakify/generateJavaStackFiles/bringInAccountV1.ts index 4b8c26ea..2d65df7c 100644 --- a/src/bin/keycloakify/generateJavaStackFiles/bringInAccountV1.ts +++ b/src/bin/keycloakify/generateJavaStackFiles/bringInAccountV1.ts @@ -2,7 +2,7 @@ import * as fs from "fs"; import { join as pathJoin, dirname as pathDirname } from "path"; import { assert } from "tsafe/assert"; import { Reflect } from "tsafe/Reflect"; -import type { BuildOptions } from "../BuildOptions"; +import type { BuildOptions } from "../buildOptions2"; import { resources_common, lastKeycloakVersionWithAccountV1, accountV1ThemeName } from "../../constants"; import { downloadBuiltinKeycloakTheme } from "../../download-builtin-keycloak-theme"; import { transformCodebase } from "../../tools/transformCodebase"; diff --git a/src/bin/keycloakify/generateJavaStackFiles/generateJavaStackFiles.ts b/src/bin/keycloakify/generateJavaStackFiles/generateJavaStackFiles.ts index a8d781f7..48709155 100644 --- a/src/bin/keycloakify/generateJavaStackFiles/generateJavaStackFiles.ts +++ b/src/bin/keycloakify/generateJavaStackFiles/generateJavaStackFiles.ts @@ -2,7 +2,7 @@ import * as fs from "fs"; import { join as pathJoin, dirname as pathDirname } from "path"; import { assert } from "tsafe/assert"; import { Reflect } from "tsafe/Reflect"; -import type { BuildOptions } from "../BuildOptions"; +import type { BuildOptions } from "../buildOptions2"; import { type ThemeType, accountV1ThemeName } from "../../constants"; import { bringInAccountV1 } from "./bringInAccountV1"; diff --git a/src/bin/keycloakify/generateStartKeycloakTestingContainer.ts b/src/bin/keycloakify/generateStartKeycloakTestingContainer.ts index a14bfe49..9c5702c1 100644 --- a/src/bin/keycloakify/generateStartKeycloakTestingContainer.ts +++ b/src/bin/keycloakify/generateStartKeycloakTestingContainer.ts @@ -2,7 +2,7 @@ import * as fs from "fs"; import { join as pathJoin, relative as pathRelative, basename as pathBasename } from "path"; import { assert } from "tsafe/assert"; import { Reflect } from "tsafe/Reflect"; -import type { BuildOptions } from "./BuildOptions"; +import type { BuildOptions } from "./buildOptions2"; export type BuildOptionsLike = { keycloakifyBuildDirPath: string; diff --git a/src/bin/keycloakify/generateTheme/downloadKeycloakStaticResources.ts b/src/bin/keycloakify/generateTheme/downloadKeycloakStaticResources.ts index 7a4f128e..0680e23c 100644 --- a/src/bin/keycloakify/generateTheme/downloadKeycloakStaticResources.ts +++ b/src/bin/keycloakify/generateTheme/downloadKeycloakStaticResources.ts @@ -3,7 +3,7 @@ import * as fs from "fs"; import { join as pathJoin, dirname as pathDirname } from "path"; import { downloadBuiltinKeycloakTheme } from "../../download-builtin-keycloak-theme"; import { resources_common, type ThemeType } from "../../constants"; -import { BuildOptions } from "../BuildOptions"; +import { BuildOptions } from "../buildOptions2"; import { assert } from "tsafe/assert"; import * as crypto from "crypto"; diff --git a/src/bin/keycloakify/generateTheme/generateTheme.ts b/src/bin/keycloakify/generateTheme/generateTheme.ts index 761d8aad..74f22a63 100644 --- a/src/bin/keycloakify/generateTheme/generateTheme.ts +++ b/src/bin/keycloakify/generateTheme/generateTheme.ts @@ -13,7 +13,7 @@ import { basenameOfTheKeycloakifyResourcesDir } from "../../constants"; import { isInside } from "../../tools/isInside"; -import type { BuildOptions } from "../BuildOptions"; +import type { BuildOptions } from "../buildOptions2"; import { assert, type Equals } from "tsafe/assert"; import { downloadKeycloakStaticResources } from "./downloadKeycloakStaticResources"; import { readFieldNameUsage } from "./readFieldNameUsage"; diff --git a/src/bin/keycloakify/keycloakify.ts b/src/bin/keycloakify/keycloakify.ts index 3fd541e0..a9c66c14 100644 --- a/src/bin/keycloakify/keycloakify.ts +++ b/src/bin/keycloakify/keycloakify.ts @@ -4,10 +4,10 @@ import { join as pathJoin, relative as pathRelative, basename as pathBasename, d import * as child_process from "child_process"; import { generateStartKeycloakTestingContainer } from "./generateStartKeycloakTestingContainer"; import * as fs from "fs"; -import { readBuildOptions } from "./BuildOptions"; +import { readBuildOptions } from "./buildOptions2"; import { getLogger } from "../tools/logger"; import { assert } from "tsafe/assert"; -import { getThemeSrcDirPath } from "../getSrcDirPath"; +import { getThemeSrcDirPath } from "../getThemeSrcDirPath"; import { getProjectRoot } from "../tools/getProjectRoot"; import { objectKeys } from "tsafe/objectKeys"; diff --git a/src/bin/keycloakify/replacers/replaceImportsInCssCode.ts b/src/bin/keycloakify/replacers/replaceImportsInCssCode.ts index 3cf192a4..6d592bd2 100644 --- a/src/bin/keycloakify/replacers/replaceImportsInCssCode.ts +++ b/src/bin/keycloakify/replacers/replaceImportsInCssCode.ts @@ -1,5 +1,5 @@ import * as crypto from "crypto"; -import type { BuildOptions } from "../BuildOptions"; +import type { BuildOptions } from "../buildOptions2"; import { assert } from "tsafe/assert"; import { basenameOfTheKeycloakifyResourcesDir } from "../../constants"; diff --git a/src/bin/keycloakify/replacers/replaceImportsInInlineCssCode.ts b/src/bin/keycloakify/replacers/replaceImportsInInlineCssCode.ts index e8e980bd..9ec2c2c4 100644 --- a/src/bin/keycloakify/replacers/replaceImportsInInlineCssCode.ts +++ b/src/bin/keycloakify/replacers/replaceImportsInInlineCssCode.ts @@ -1,4 +1,4 @@ -import type { BuildOptions } from "../BuildOptions"; +import type { BuildOptions } from "../buildOptions2"; import { assert } from "tsafe/assert"; import { basenameOfTheKeycloakifyResourcesDir } from "../../constants"; diff --git a/src/bin/keycloakify/replacers/replaceImportsInJsCode/replaceImportsInJsCode.ts b/src/bin/keycloakify/replacers/replaceImportsInJsCode/replaceImportsInJsCode.ts index 5ba54b5b..6590a2f2 100644 --- a/src/bin/keycloakify/replacers/replaceImportsInJsCode/replaceImportsInJsCode.ts +++ b/src/bin/keycloakify/replacers/replaceImportsInJsCode/replaceImportsInJsCode.ts @@ -1,5 +1,5 @@ import { assert } from "tsafe/assert"; -import type { BuildOptions } from "../../BuildOptions"; +import type { BuildOptions } from "../../buildOptions2"; import { replaceImportsInJsCode_vite } from "./vite"; import { replaceImportsInJsCode_webpack } from "./webpack"; import * as fs from "fs"; diff --git a/src/bin/keycloakify/replacers/replaceImportsInJsCode/vite.ts b/src/bin/keycloakify/replacers/replaceImportsInJsCode/vite.ts index 4d53fc65..18863040 100644 --- a/src/bin/keycloakify/replacers/replaceImportsInJsCode/vite.ts +++ b/src/bin/keycloakify/replacers/replaceImportsInJsCode/vite.ts @@ -1,6 +1,6 @@ import { nameOfTheGlobal, basenameOfTheKeycloakifyResourcesDir } from "../../../constants"; import { assert } from "tsafe/assert"; -import type { BuildOptions } from "../../BuildOptions"; +import type { BuildOptions } from "../../buildOptions2"; import * as nodePath from "path"; import { replaceAll } from "../../../tools/String.prototype.replaceAll"; diff --git a/src/bin/keycloakify/replacers/replaceImportsInJsCode/webpack.ts b/src/bin/keycloakify/replacers/replaceImportsInJsCode/webpack.ts index 5d49cb77..ca5fcf2f 100644 --- a/src/bin/keycloakify/replacers/replaceImportsInJsCode/webpack.ts +++ b/src/bin/keycloakify/replacers/replaceImportsInJsCode/webpack.ts @@ -1,6 +1,6 @@ import { nameOfTheGlobal, basenameOfTheKeycloakifyResourcesDir } from "../../../constants"; import { assert } from "tsafe/assert"; -import type { BuildOptions } from "../../BuildOptions"; +import type { BuildOptions } from "../../buildOptions2"; import * as nodePath from "path"; import { replaceAll } from "../../../tools/String.prototype.replaceAll";