keycloakify 9.4.0-rc.15 → 9.4.0-rc.16

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -2,9 +2,10 @@
2
2
  import type { I18n } from "../../account/i18n";
3
3
  import type { TemplateProps, ClassKey } from "../../account/TemplateProps";
4
4
  import type { LazyOrNot } from "../../tools/LazyOrNot";
5
- export type PageProps<KcContext, I18nExtended extends I18n> = {
5
+ import type { KcContext } from "../../account/kcContext";
6
+ export type PageProps<NarowedKcContext = KcContext, I18nExtended extends I18n = I18n> = {
6
7
  Template: LazyOrNot<(props: TemplateProps<any, any>) => JSX.Element | null>;
7
- kcContext: KcContext;
8
+ kcContext: NarowedKcContext;
8
9
  i18n: I18nExtended;
9
10
  doUseDefaultCss: boolean;
10
11
  classes?: Partial<Record<ClassKey, string>>;
@@ -110,6 +110,7 @@ var readFieldNameUsage_1 = require("./readFieldNameUsage");
110
110
  var readExtraPageNames_1 = require("./readExtraPageNames");
111
111
  var generateMessageProperties_1 = require("./generateMessageProperties");
112
112
  var bringInAccountV1_1 = require("./bringInAccountV1");
113
+ var fs_rmSync_1 = require("../../tools/fs.rmSync");
113
114
  (0, assert_1.assert)();
114
115
  function generateTheme(params) {
115
116
  var _a;
@@ -131,7 +132,7 @@ function generateTheme(params) {
131
132
  "email": false
132
133
  };
133
134
  _loop_1 = function (themeType) {
134
- var themeTypeDirPath, generateFtlFilesCode;
135
+ var themeTypeDirPath, destDirPath, generateFtlFilesCode;
135
136
  return __generator(this, function (_g) {
136
137
  switch (_g.label) {
137
138
  case 0:
@@ -141,19 +142,22 @@ function generateTheme(params) {
141
142
  implementedThemeTypes[themeType] = true;
142
143
  themeTypeDirPath = getThemeTypeDirPath({ themeType: themeType });
143
144
  apply_replacers_and_move_to_theme_resources: {
145
+ destDirPath = (0, path_1.join)(themeTypeDirPath, "resources", constants_1.basenameOfTheKeycloakifyResourcesDir);
146
+ // NOTE: Prevent accumulation of files in the assets dir, as names are hashed they pile up.
147
+ (0, fs_rmSync_1.rmSync)(destDirPath, { "recursive": true, "force": true });
144
148
  if (themeType === "account" && implementedThemeTypes.login) {
145
149
  // NOTE: We prevend doing it twice, it has been done for the login theme.
146
150
  (0, transformCodebase_1.transformCodebase)({
147
151
  "srcDirPath": (0, path_1.join)(getThemeTypeDirPath({
148
152
  "themeType": "login"
149
153
  }), "resources", constants_1.basenameOfTheKeycloakifyResourcesDir),
150
- "destDirPath": (0, path_1.join)(themeTypeDirPath, "resources", constants_1.basenameOfTheKeycloakifyResourcesDir)
154
+ destDirPath: destDirPath
151
155
  });
152
156
  break apply_replacers_and_move_to_theme_resources;
153
157
  }
154
158
  (0, transformCodebase_1.transformCodebase)({
155
159
  "srcDirPath": buildOptions.reactAppBuildDirPath,
156
- "destDirPath": (0, path_1.join)(themeTypeDirPath, "resources", constants_1.basenameOfTheKeycloakifyResourcesDir),
160
+ destDirPath: destDirPath,
157
161
  "transformSourceCode": function (_a) {
158
162
  var filePath = _a.filePath, sourceCode = _a.sourceCode;
159
163
  //NOTE: Prevent cycles, excludes the folder we generated for debug in public/
@@ -1 +1 @@
1
- {"version":3,"file":"generateTheme.js","sourceRoot":"","sources":["../../../src/bin/keycloakify/generateTheme/generateTheme.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"generateTheme.js","sourceRoot":"","sources":["../../../src/bin/keycloakify/generateTheme/generateTheme.ts"],"names":[],"mappings":"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"}
@@ -2,9 +2,10 @@
2
2
  import type { I18n } from "../../login/i18n";
3
3
  import { type TemplateProps, type ClassKey } from "../../login/TemplateProps";
4
4
  import type { LazyOrNot } from "../../tools/LazyOrNot";
5
- export type PageProps<KcContext, I18nExtended extends I18n> = {
5
+ import type { KcContext } from "../../account/kcContext";
6
+ export type PageProps<NarowedKcContext = KcContext, I18nExtended extends I18n = I18n> = {
6
7
  Template: LazyOrNot<(props: TemplateProps<any, any>) => JSX.Element | null>;
7
- kcContext: KcContext;
8
+ kcContext: NarowedKcContext;
8
9
  i18n: I18nExtended;
9
10
  doUseDefaultCss: boolean;
10
11
  classes?: Partial<Record<ClassKey, string>>;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "keycloakify",
3
- "version": "9.4.0-rc.15",
3
+ "version": "9.4.0-rc.16",
4
4
  "description": "Create Keycloak themes using React",
5
5
  "repository": {
6
6
  "type": "git",
@@ -1,10 +1,11 @@
1
1
  import type { I18n } from "keycloakify/account/i18n";
2
2
  import type { TemplateProps, ClassKey } from "keycloakify/account/TemplateProps";
3
3
  import type { LazyOrNot } from "keycloakify/tools/LazyOrNot";
4
+ import type { KcContext } from "keycloakify/account/kcContext";
4
5
 
5
- export type PageProps<KcContext, I18nExtended extends I18n> = {
6
+ export type PageProps<NarowedKcContext = KcContext, I18nExtended extends I18n = I18n> = {
6
7
  Template: LazyOrNot<(props: TemplateProps<any, any>) => JSX.Element | null>;
7
- kcContext: KcContext;
8
+ kcContext: NarowedKcContext;
8
9
  i18n: I18nExtended;
9
10
  doUseDefaultCss: boolean;
10
11
  classes?: Partial<Record<ClassKey, string>>;
@@ -20,6 +20,7 @@ import { readFieldNameUsage } from "./readFieldNameUsage";
20
20
  import { readExtraPagesNames } from "./readExtraPageNames";
21
21
  import { generateMessageProperties } from "./generateMessageProperties";
22
22
  import { bringInAccountV1 } from "./bringInAccountV1";
23
+ import { rmSync } from "../../tools/fs.rmSync";
23
24
 
24
25
  export type BuildOptionsLike = {
25
26
  bundler: "vite" | "webpack";
@@ -78,6 +79,11 @@ export async function generateTheme(params: {
78
79
  const themeTypeDirPath = getThemeTypeDirPath({ themeType });
79
80
 
80
81
  apply_replacers_and_move_to_theme_resources: {
82
+ const destDirPath = pathJoin(themeTypeDirPath, "resources", basenameOfTheKeycloakifyResourcesDir);
83
+
84
+ // NOTE: Prevent accumulation of files in the assets dir, as names are hashed they pile up.
85
+ rmSync(destDirPath, { "recursive": true, "force": true });
86
+
81
87
  if (themeType === "account" && implementedThemeTypes.login) {
82
88
  // NOTE: We prevend doing it twice, it has been done for the login theme.
83
89
 
@@ -89,7 +95,7 @@ export async function generateTheme(params: {
89
95
  "resources",
90
96
  basenameOfTheKeycloakifyResourcesDir
91
97
  ),
92
- "destDirPath": pathJoin(themeTypeDirPath, "resources", basenameOfTheKeycloakifyResourcesDir)
98
+ destDirPath
93
99
  });
94
100
 
95
101
  break apply_replacers_and_move_to_theme_resources;
@@ -97,7 +103,7 @@ export async function generateTheme(params: {
97
103
 
98
104
  transformCodebase({
99
105
  "srcDirPath": buildOptions.reactAppBuildDirPath,
100
- "destDirPath": pathJoin(themeTypeDirPath, "resources", basenameOfTheKeycloakifyResourcesDir),
106
+ destDirPath,
101
107
  "transformSourceCode": ({ filePath, sourceCode }) => {
102
108
  //NOTE: Prevent cycles, excludes the folder we generated for debug in public/
103
109
  // This should not happen if users follow the new instruction setup but we keep it for retrocompatibility.
@@ -1,10 +1,11 @@
1
1
  import type { I18n } from "keycloakify/login/i18n";
2
2
  import { type TemplateProps, type ClassKey } from "keycloakify/login/TemplateProps";
3
3
  import type { LazyOrNot } from "keycloakify/tools/LazyOrNot";
4
+ import type { KcContext } from "keycloakify/account/kcContext";
4
5
 
5
- export type PageProps<KcContext, I18nExtended extends I18n> = {
6
+ export type PageProps<NarowedKcContext = KcContext, I18nExtended extends I18n = I18n> = {
6
7
  Template: LazyOrNot<(props: TemplateProps<any, any>) => JSX.Element | null>;
7
- kcContext: KcContext;
8
+ kcContext: NarowedKcContext;
8
9
  i18n: I18nExtended;
9
10
  doUseDefaultCss: boolean;
10
11
  classes?: Partial<Record<ClassKey, string>>;