From da5efb67e0a98052df51ca50b4dd61fd3aa4ec9f Mon Sep 17 00:00:00 2001 From: Joseph Garrone Date: Tue, 23 Feb 2021 15:32:37 +0100 Subject: [PATCH] bump version --- package-lock.json | 17 ++++++----------- package.json | 5 +++-- .../generateKeycloakThemeResources.ts | 2 +- src/bin/build-keycloak-theme/index.ts | 12 +++++++++--- src/lib/index.ts | 1 + src/lib/inex.ts | 3 --- src/lib/keycloakFtlValues.ts | 19 +++++++++++++++++++ 7 files changed, 39 insertions(+), 20 deletions(-) create mode 100644 src/lib/index.ts delete mode 100644 src/lib/inex.ts create mode 100644 src/lib/keycloakFtlValues.ts diff --git a/package-lock.json b/package-lock.json index 2ed961e6..61ee8df5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,14 +1,15 @@ { "name": "keycloak-react-theming", - "version": "0.0.12", + "version": "0.0.13", "lockfileVersion": 2, "requires": true, "packages": { "": { - "version": "0.0.11", + "version": "0.0.13", "license": "MIT", "dependencies": { - "cheerio": "^1.0.0-rc.5" + "cheerio": "^1.0.0-rc.5", + "evt": "^1.9.12" }, "bin": { "build-keycloak-theme": "dist/bin/build-keycloak-theme/index.js", @@ -482,7 +483,6 @@ "version": "1.9.12", "resolved": "https://registry.npmjs.org/evt/-/evt-1.9.12.tgz", "integrity": "sha512-u8wC4Xif2pcDJ9cEm0wzWCIQb+Y214m1eUgsgm2hVIuXuvC6LToryA0Ecl1O8Slii2E9l6USLsyxXWntjlnIbw==", - "dev": true, "dependencies": { "minimal-polyfills": "^2.1.5", "run-exclusive": "^2.2.14" @@ -612,8 +612,7 @@ "node_modules/minimal-polyfills": { "version": "2.1.6", "resolved": "https://registry.npmjs.org/minimal-polyfills/-/minimal-polyfills-2.1.6.tgz", - "integrity": "sha512-vqoxj7eMzsqX0M6/dkgoNFPw6Mztgn5qjSl0bWGboQeU7Y4UPLeyoqQw6JI+0qmBcJYdkr3nK7dqY8u/fgRp5g==", - "dev": true + "integrity": "sha512-vqoxj7eMzsqX0M6/dkgoNFPw6Mztgn5qjSl0bWGboQeU7Y4UPLeyoqQw6JI+0qmBcJYdkr3nK7dqY8u/fgRp5g==" }, "node_modules/minimatch": { "version": "3.0.4", @@ -749,7 +748,6 @@ "version": "2.2.14", "resolved": "https://registry.npmjs.org/run-exclusive/-/run-exclusive-2.2.14.tgz", "integrity": "sha512-NHaQfB3zPJFx7p4M06AcmoK8xz/h8YDMCdy3jxfyoC9VqIbl1U+DiVjUuAYZBRMwvj5qkQnOUGfsmyUC4k46dg==", - "dev": true, "dependencies": { "minimal-polyfills": "^2.1.5" } @@ -1327,7 +1325,6 @@ "version": "1.9.12", "resolved": "https://registry.npmjs.org/evt/-/evt-1.9.12.tgz", "integrity": "sha512-u8wC4Xif2pcDJ9cEm0wzWCIQb+Y214m1eUgsgm2hVIuXuvC6LToryA0Ecl1O8Slii2E9l6USLsyxXWntjlnIbw==", - "dev": true, "requires": { "minimal-polyfills": "^2.1.5", "run-exclusive": "^2.2.14" @@ -1429,8 +1426,7 @@ "minimal-polyfills": { "version": "2.1.6", "resolved": "https://registry.npmjs.org/minimal-polyfills/-/minimal-polyfills-2.1.6.tgz", - "integrity": "sha512-vqoxj7eMzsqX0M6/dkgoNFPw6Mztgn5qjSl0bWGboQeU7Y4UPLeyoqQw6JI+0qmBcJYdkr3nK7dqY8u/fgRp5g==", - "dev": true + "integrity": "sha512-vqoxj7eMzsqX0M6/dkgoNFPw6Mztgn5qjSl0bWGboQeU7Y4UPLeyoqQw6JI+0qmBcJYdkr3nK7dqY8u/fgRp5g==" }, "minimatch": { "version": "3.0.4", @@ -1539,7 +1535,6 @@ "version": "2.2.14", "resolved": "https://registry.npmjs.org/run-exclusive/-/run-exclusive-2.2.14.tgz", "integrity": "sha512-NHaQfB3zPJFx7p4M06AcmoK8xz/h8YDMCdy3jxfyoC9VqIbl1U+DiVjUuAYZBRMwvj5qkQnOUGfsmyUC4k46dg==", - "dev": true, "requires": { "minimal-polyfills": "^2.1.5" } diff --git a/package.json b/package.json index 7fa75d5d..5b960ad8 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "keycloak-react-theming", - "version": "0.0.12", + "version": "0.0.13", "description": "Keycloak theme generator for Reacts app", "repository": { "type": "git", @@ -42,6 +42,7 @@ "typescript": "^4.1.5" }, "dependencies": { - "cheerio": "^1.0.0-rc.5" + "cheerio": "^1.0.0-rc.5", + "evt": "^1.9.12" } } diff --git a/src/bin/build-keycloak-theme/generateKeycloakThemeResources.ts b/src/bin/build-keycloak-theme/generateKeycloakThemeResources.ts index 6b788342..c69dca12 100644 --- a/src/bin/build-keycloak-theme/generateKeycloakThemeResources.ts +++ b/src/bin/build-keycloak-theme/generateKeycloakThemeResources.ts @@ -8,7 +8,7 @@ import { } from "./replaceImportFromStatic"; import { generateFtlFilesCodeFactory } from "./generateFtl"; -const ftlValuesGlobalName = "keycloakFtlValues"; +export const ftlValuesGlobalName = "keycloakPagesContext"; export function generateKeycloakThemeResources( params: { diff --git a/src/bin/build-keycloak-theme/index.ts b/src/bin/build-keycloak-theme/index.ts index b99c1d13..c708b33a 100644 --- a/src/bin/build-keycloak-theme/index.ts +++ b/src/bin/build-keycloak-theme/index.ts @@ -65,11 +65,17 @@ if (require.main === module) { ' - name: extensions', ' mountPath: /opt/jboss/keycloak/standalone/deployments', '', - `To enable the theme within keycloak log into the admin console, go to your realm settings, click on the theme tab then select ${parsedPackageJson.name} `, '', - 'To test your theme locally you can spin up a Keycloak container image with the theme loaded by running:', + 'To test your theme locally, with hot reloading, you can spin up a Keycloak container image with the theme loaded by running:', + '', + `$ ./${pathRelative(reactProjectDirPath, pathJoin(keycloakThemeBuildingDirPath, containerLaunchScriptBasename))}`, + '', + 'To enable the theme within keycloak log into the admin console, create a realm (called "myrealm" for example),', + `go to your realm settings, click on the theme tab then select ${parsedPackageJson.name}.`, + `More details: https://www.keycloak.org/getting-started/getting-started-docker`, + '', + 'Once your container is up and configured 👉 http://localhost:8080/auth/realms/myrealm/account', '', - `$ ./${pathRelative(reactProjectDirPath, pathJoin(keycloakThemeBuildingDirPath, containerLaunchScriptBasename))}` ].join("\n")); } diff --git a/src/lib/index.ts b/src/lib/index.ts new file mode 100644 index 00000000..a1ae57f5 --- /dev/null +++ b/src/lib/index.ts @@ -0,0 +1 @@ +export * from "./keycloakFtlValues"; \ No newline at end of file diff --git a/src/lib/inex.ts b/src/lib/inex.ts deleted file mode 100644 index 7065045c..00000000 --- a/src/lib/inex.ts +++ /dev/null @@ -1,3 +0,0 @@ - - -export { }; \ No newline at end of file diff --git a/src/lib/keycloakFtlValues.ts b/src/lib/keycloakFtlValues.ts new file mode 100644 index 00000000..5aa05264 --- /dev/null +++ b/src/lib/keycloakFtlValues.ts @@ -0,0 +1,19 @@ + + + +import { ftlValuesGlobalName } from "../bin/build-keycloak-theme/generateKeycloakThemeResources"; +import type { generateFtlFilesCodeFactory } from "../bin/build-keycloak-theme/generateFtl"; +import { id } from "evt/tools/typeSafety/id"; + + +export type KeycloakFtlValues = { + pageBasename: Parameters["generateFtlFilesCode"]>[0]["pageBasename"]; + url: { + loginAction: string, + resourcesPath: string + } +}; + +export const { keycloakPagesContext } = + { [ftlValuesGlobalName]: id((window as any)[ftlValuesGlobalName]) }; +; \ No newline at end of file