From 23fedbf94a2ff0d408876ead38889c41412f4da2 Mon Sep 17 00:00:00 2001 From: garronej Date: Tue, 7 Mar 2023 17:05:03 +0100 Subject: [PATCH 1/5] Avoid passing unessesary realm values in the error.ftl page --- .../generateFtl/ftl_object_to_js_code_declaring_an_object.ftl | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/bin/keycloakify/generateFtl/ftl_object_to_js_code_declaring_an_object.ftl b/src/bin/keycloakify/generateFtl/ftl_object_to_js_code_declaring_an_object.ftl index 1781db90..4952fdc3 100644 --- a/src/bin/keycloakify/generateFtl/ftl_object_to_js_code_declaring_an_object.ftl +++ b/src/bin/keycloakify/generateFtl/ftl_object_to_js_code_declaring_an_object.ftl @@ -174,6 +174,10 @@ ${ftl_object_to_js_code_declaring_an_object(.data_model, [])?no_esc}; ) || ( ["masterAdminClient", "delegateForUpdate", "defaultRole"]?seq_contains(key) && are_same_path(path, ["realm"]) + ) || ( + "error.ftl" == pageId && + are_same_path(path, ["realm"]) && + !["name", "displayName", "displayNameHtml", "internationalizationEnabled", "registrationEmailAsUsername" ]?seq_contains(key) ) > <#local out_seq += ["/*If you need '" + key + "' on " + pageId + ", please submit an issue to the Keycloakify repo*/"]> From 5ea324c7f2d76430de9b87f05bef294c89a3f527 Mon Sep 17 00:00:00 2001 From: garronej Date: Tue, 7 Mar 2023 17:05:18 +0100 Subject: [PATCH 2/5] Bump version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 52923f81..00fa722f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "keycloakify", - "version": "6.12.4", + "version": "6.12.5", "description": "Keycloak theme generator for Reacts app", "repository": { "type": "git", From daff614fb4980f3eed660a9dd9d553e96afcaf7e Mon Sep 17 00:00:00 2001 From: Joseph Garrone Date: Sun, 5 Mar 2023 23:37:37 +0100 Subject: [PATCH 3/5] Update README.md --- README.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/README.md b/README.md index e3392aba..3f514d4c 100644 --- a/README.md +++ b/README.md @@ -8,9 +8,6 @@ - - - From 98e46d6ac906adbd96e11528fe6ce0e1c8331ae6 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 6 Mar 2023 01:02:57 +0000 Subject: [PATCH 4/5] Update dependency evt to ^2.4.15 --- package.json | 2 +- yarn.lock | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index 00fa722f..43409a81 100644 --- a/package.json +++ b/package.json @@ -81,7 +81,7 @@ "@octokit/rest": "^18.12.0", "cheerio": "^1.0.0-rc.5", "cli-select": "^1.1.2", - "evt": "^2.4.13", + "evt": "^2.4.15", "minimal-polyfills": "^2.2.2", "minimist": "^1.2.6", "path-browserify": "^1.0.1", diff --git a/yarn.lock b/yarn.lock index c977733f..9bb4658b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -839,14 +839,14 @@ escape-string-regexp@^1.0.5: resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" integrity sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg== -evt@^2.4.13: - version "2.4.13" - resolved "https://registry.yarnpkg.com/evt/-/evt-2.4.13.tgz#5ef873159ce62e099d58801a3e4b8e0f5b648017" - integrity sha512-haTVOsmjzk+28zpzvVwan9Zw2rLQF2izgi7BKjAPRzZAfcv+8scL0TpM8MzvGNKFYHiy+Bq3r6FYIIUPl9kt3A== +evt@^2.4.15: + version "2.4.15" + resolved "https://registry.yarnpkg.com/evt/-/evt-2.4.15.tgz#bf673dd2b409067fcdc182becd8e7dbed13692e1" + integrity sha512-jlDDDWdoDg2wIZa9m08HVelHzEAlZLpLbDcWMqlc6nqKHG1Z3ZqC7teDoNH3upClx3SKwJTC0H7RIMfxe7zX2g== dependencies: minimal-polyfills "^2.2.2" run-exclusive "^2.2.18" - tsafe "^1.4.1" + tsafe "^1.4.3" execa@^5.1.1: version "5.1.1" @@ -1769,7 +1769,7 @@ ts-node@^10.9.1: v8-compile-cache-lib "^3.0.1" yn "3.1.1" -tsafe@^1.4.1, tsafe@^1.4.3: +tsafe@^1.4.3: version "1.4.3" resolved "https://registry.yarnpkg.com/tsafe/-/tsafe-1.4.3.tgz#a98ce83616f0d9c01e3c6167a2ead45ba455b2ae" integrity sha512-KjCdgjIqsbKW9oeJGSMVC23jhWm/VXJwkaZ7jffo/WaTioLGTHJqliHe9dECEVzIACNVNs/fwtKwU8wWK4jY4g== From aeb0cb3110e98584d751f12e884a1dbb5327dd4a Mon Sep 17 00:00:00 2001 From: Joseph Garrone Date: Tue, 7 Mar 2023 18:18:04 +0100 Subject: [PATCH 5/5] Only test build on LTS node version --- .github/workflows/ci.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 4f26b082..62cd8aba 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -28,7 +28,7 @@ jobs: needs: test_lint strategy: matrix: - node: [ '14', '15' ,'16', '17' ] + node: [ '14','16' ] os: [ windows-latest, ubuntu-latest ] name: Test with Node v${{ matrix.node }} on ${{ matrix.os }} steps: @@ -136,4 +136,4 @@ jobs: env: NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}} VERSION: ${{ needs.check_if_version_upgraded.outputs.to_version }} - IS_PRE_RELEASE: ${{ needs.check_if_version_upgraded.outputs.is_pre_release }} \ No newline at end of file + IS_PRE_RELEASE: ${{ needs.check_if_version_upgraded.outputs.is_pre_release }}