diff --git a/package.json b/package.json index a30299f8..eea7ecc4 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "keycloakify", - "version": "0.3.7", + "version": "0.3.8", "description": "Keycloak theme generator for Reacts app", "repository": { "type": "git", diff --git a/src/bin/build-keycloak-theme/generateFtl/index.ts b/src/bin/build-keycloak-theme/generateFtl/index.ts index b1a8c894..9ad33323 100644 --- a/src/bin/build-keycloak-theme/generateFtl/index.ts +++ b/src/bin/build-keycloak-theme/generateFtl/index.ts @@ -33,7 +33,7 @@ export type Mode = { type: "standalone"; urlPathname: string; } | { - type: "static fetched from app"; + type: "external assets"; urlPathname: string; urlOrigin: string; } @@ -76,7 +76,7 @@ export function generateFtlFilesCodeFactory( } switch (mode.type) { - case "static fetched from app": + case "external assets": $(element).attr( attrName, href.replace(/^\//, `${mode.urlOrigin}/`) diff --git a/src/bin/build-keycloak-theme/index.ts b/src/bin/build-keycloak-theme/index.ts index 64a5c73e..53936472 100644 --- a/src/bin/build-keycloak-theme/index.ts +++ b/src/bin/build-keycloak-theme/index.ts @@ -11,7 +11,7 @@ import { URL } from "url"; const reactProjectDirPath = process.cwd(); -const isStandalone = process.argv[2]?.toLowerCase() === "--standalone"; +const doUseExternalAssets = process.argv[2]?.toLowerCase() === "--external-assets"; const parsedPackageJson: ParsedPackageJson = require(pathJoin(reactProjectDirPath, "package.json")); @@ -46,14 +46,14 @@ if (require.main === module) { - return isStandalone ? + return !doUseExternalAssets ? { "type": "standalone", urlPathname } as const : { - "type": "static fetched from app", + "type": "external assets", urlPathname, "urlOrigin": (() => { diff --git a/src/bin/build-keycloak-theme/replaceImportFromStatic.ts b/src/bin/build-keycloak-theme/replaceImportFromStatic.ts index f6488fbf..463343f0 100644 --- a/src/bin/build-keycloak-theme/replaceImportFromStatic.ts +++ b/src/bin/build-keycloak-theme/replaceImportFromStatic.ts @@ -4,7 +4,7 @@ import * as crypto from "crypto"; type Mode = { type: "standalone"; } | { - type: "static fetched from app"; + type: "external assets"; urlOrigin: string; urlPathname: string; } @@ -26,7 +26,7 @@ export function replaceImportFromStaticInJsCode( /[a-z]+\.[a-z]+\+"static\//g, `window.${ftlValuesGlobalName}.url.resourcesPath + "/build/static/` ); - case "static fetched from app": + case "external assets": return jsCode!.replace( /[a-z]+\.[a-z]+\+"static\//g, `"${mode.urlOrigin}${mode.urlPathname}static/`