keycloakify 10.0.0-rc.111 → 10.0.0-rc.113

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.
Files changed (12) hide show
  1. package/account/i18n/useI18n.js +14 -3
  2. package/account/i18n/useI18n.js.map +1 -1
  3. package/bin/440.index.js +2 -2
  4. package/lib/getKcClsx.js +4 -1
  5. package/lib/getKcClsx.js.map +1 -1
  6. package/login/i18n/useI18n.js +14 -3
  7. package/login/i18n/useI18n.js.map +1 -1
  8. package/package.json +1 -1
  9. package/src/account/i18n/useI18n.tsx +18 -4
  10. package/src/bin/keycloakify/replacers/replaceImportsInCssCode.ts +2 -2
  11. package/src/lib/getKcClsx.ts +6 -2
  12. package/src/login/i18n/useI18n.tsx +18 -4
package/account/i18n/useI18n.js CHANGED
@@ -5,8 +5,9 @@ import { Reflect } from "tsafe/Reflect";
5
5
  export function createUseI18n(messagesByLanguageTag) {
6
6
  const { withJsx } = (() => {
7
7
  const cache = new WeakMap();
8
- function renderHtmlString(htmlString) {
9
- return (_jsx("div", { style: { display: "inline-block" }, dangerouslySetInnerHTML: {
8
+ function renderHtmlString(params) {
9
+ const { htmlString, msgKey } = params;
10
+ return (_jsx("div", { "data-kc-msg": msgKey, dangerouslySetInnerHTML: {
10
11
  __html: htmlString
11
12
  } }));
12
13
  }
@@ -18,12 +19,22 @@ export function createUseI18n(messagesByLanguageTag) {
18
19
  }
19
20
  return i18n;
20
21
  }
21
- const i18n = Object.assign(Object.assign({}, i18n_noJsx), { msg: (...args) => renderHtmlString(i18n_noJsx.msgStr(...args)), advancedMsg: (...args) => renderHtmlString(i18n_noJsx.advancedMsgStr(...args)) });
22
+ const i18n = Object.assign(Object.assign({}, i18n_noJsx), { msg: (msgKey, ...args) => renderHtmlString({ htmlString: i18n_noJsx.msgStr(msgKey, ...args), msgKey }), advancedMsg: (msgKey, ...args) => renderHtmlString({ htmlString: i18n_noJsx.advancedMsgStr(msgKey, ...args), msgKey }) });
22
23
  cache.set(i18n_noJsx, i18n);
23
24
  return i18n;
24
25
  }
25
26
  return { withJsx };
26
27
  })();
28
+ add_style: {
29
+ const attributeName = "data-kc-i18n";
30
+ // Check if already exists in head
31
+ if (document.querySelector(`style[${attributeName}]`) !== null) {
32
+ break add_style;
33
+ }
34
+ const styleElement = document.createElement("style");
35
+ styleElement.attributes.setNamedItem(document.createAttribute(attributeName));
36
+ (styleElement.textContent = `[data-kc-msg] { display: inline-block; }`), document.head.prepend(styleElement);
37
+ }
27
38
  const { getI18n } = createGetI18n(messagesByLanguageTag);
28
39
  function useI18n(params) {
29
40
  const { kcContext } = params;
package/account/i18n/useI18n.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"useI18n.js","sourceRoot":"","sources":["../../src/account/i18n/useI18n.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAC5C,OAAO,EAAE,aAAa,EAA0E,MAAM,QAAQ,CAAC;AAE/G,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAExC,MAAM,UAAU,aAAa,CAAiD,qBAE7E;IAKG,MAAM,EAAE,OAAO,EAAE,GAAG,CAAC,GAAG,EAAE;QACtB,MAAM,KAAK,GAAG,IAAI,OAAO,EAA0D,CAAC;QAEpF,SAAS,gBAAgB,CAAC,UAAkB;YACxC,OAAO,CACH,cACI,KAAK,EAAE,EAAE,OAAO,EAAE,cAAc,EAAE,EAClC,uBAAuB,EAAE;oBACrB,MAAM,EAAE,UAAU;iBACrB,GACH,CACL,CAAC;QACN,CAAC;QAED,SAAS,OAAO,CAAC,UAAyC;YACtD,SAAS,EAAE;gBACP,MAAM,IAAI,GAAG,KAAK,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;gBAEnC,IAAI,IAAI,KAAK,SAAS,EAAE;oBACpB,MAAM,SAAS,CAAC;iBACnB;gBAED,OAAO,IAAI,CAAC;aACf;YAED,MAAM,IAAI,mCACH,UAAU,KACb,GAAG,EAAE,CAAC,GAAG,IAAI,EAAE,EAAE,CAAC,gBAAgB,CAAC,UAAU,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,CAAC,EAC9D,WAAW,EAAE,CAAC,GAAG,IAAI,EAAE,EAAE,CAAC,gBAAgB,CAAC,UAAU,CAAC,cAAc,CAAC,GAAG,IAAI,CAAC,CAAC,GACjF,CAAC;YAEF,KAAK,CAAC,GAAG,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;YAE5B,OAAO,IAAI,CAAC;QAChB,CAAC;QAED,OAAO,EAAE,OAAO,EAAE,CAAC;IACvB,CAAC,CAAC,EAAE,CAAC;IAEL,MAAM,EAAE,OAAO,EAAE,GAAG,aAAa,CAAC,qBAAqB,CAAC,CAAC;IAEzD,SAAS,OAAO,CAAC,MAAoC;QACjD,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,CAAC;QAE7B,MAAM,EAAE,IAAI,EAAE,sBAAsB,EAAE,GAAG,OAAO,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC;QAEhE,MAAM,CAAC,aAAa,EAAE,gBAAgB,CAAC,GAAG,QAAQ,CAAO,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;QAExE,SAAS,CAAC,GAAG,EAAE;YACX,IAAI,QAAQ,GAAG,IAAI,CAAC;YAEpB,sBAAsB,aAAtB,sBAAsB,uBAAtB,sBAAsB,CAAE,IAAI,CAAC,IAAI,CAAC,EAAE;gBAChC,IAAI,CAAC,QAAQ,EAAE;oBACX,OAAO;iBACV;gBAED,gBAAgB,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;YACpC,CAAC,CAAC,CAAC;YAEH,OAAO,GAAG,EAAE;gBACR,QAAQ,GAAG,KAAK,CAAC;YACrB,CAAC,CAAC;QACN,CAAC,EAAE,EAAE,CAAC,CAAC;QAEP,OAAO,EAAE,IAAI,EAAE,aAAa,EAAE,CAAC;IACnC,CAAC;IAED,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,OAAO,EAAQ,EAAE,CAAC;AACpD,CAAC"}
1
+ {"version":3,"file":"useI18n.js","sourceRoot":"","sources":["../../src/account/i18n/useI18n.tsx"],"names":[],"mappings":"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"}
package/bin/440.index.js CHANGED
@@ -367,10 +367,10 @@ function replaceImportsInCssCode(params) {
367
367
  if (cssFileRelativeDirPath !== undefined) {
368
368
  break inline_style_in_html;
369
369
  }
370
- return `url(\${xKeycloakify.resourcesPath}/${constants/* BASENAME_OF_KEYCLOAKIFY_RESOURCES_DIR */.F_}${assetFileAbsoluteUrlPathname})`;
370
+ return `url("\${xKeycloakify.resourcesPath}/${constants/* BASENAME_OF_KEYCLOAKIFY_RESOURCES_DIR */.F_}${assetFileAbsoluteUrlPathname}")`;
371
371
  }
372
372
  const assetFileRelativeUrlPathname = external_path_.posix.relative(cssFileRelativeDirPath.replace(/\\/g, "/"), assetFileAbsoluteUrlPathname.replace(/^\//, ""));
373
- return `url(${assetFileRelativeUrlPathname})`;
373
+ return `url("${assetFileRelativeUrlPathname}")`;
374
374
  });
375
375
  return { fixedCssCode };
376
376
  }
package/lib/getKcClsx.js CHANGED
@@ -43,7 +43,10 @@ export function createGetKcClsx(params) {
43
43
  args,
44
44
  transform: classKey => {
45
45
  assert(is(classKey));
46
- return clsx(classKey, doUseDefaultCss ? defaultClasses[classKey] : undefined, classes === null || classes === void 0 ? void 0 : classes[classKey]);
46
+ const className = classes === null || classes === void 0 ? void 0 : classes[classKey];
47
+ return clsx(classKey, doUseDefaultCss && !(className === null || className === void 0 ? void 0 : className.split(" ").includes("CLEAR"))
48
+ ? defaultClasses[classKey]
49
+ : undefined, className);
47
50
  }
48
51
  });
49
52
  }
package/lib/getKcClsx.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"getKcClsx.js","sourceRoot":"","sources":["../src/lib/getKcClsx.ts"],"names":[],"mappings":"AACA,OAAO,EAAc,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AAC7E,OAAO,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AACrC,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AACtC,OAAO,EAAE,EAAE,EAAE,MAAM,UAAU,CAAC;AAE9B,MAAM,UAAU,eAAe,CAA0B,MAExD;IACG,MAAM,EAAE,cAAc,EAAE,GAAG,MAAM,CAAC;IAElC,SAAS,aAAa,CAClB,OAAiC,EACjC,OAAiC;QAEjC,IAAI,OAAO,CAAC,eAAe,KAAK,OAAO,CAAC,eAAe,EAAE;YACrD,OAAO,KAAK,CAAC;SAChB;QAED,IAAI,OAAO,CAAC,OAAO,KAAK,OAAO,CAAC,OAAO,EAAE;YACrC,OAAO,IAAI,CAAC;SACf;QAED,IAAI,OAAO,CAAC,OAAO,KAAK,SAAS,IAAI,OAAO,CAAC,OAAO,KAAK,SAAS,EAAE;YAChE,OAAO,KAAK,CAAC;SAChB;QAED,IAAI,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,KAAK,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE;YAC7E,OAAO,KAAK,CAAC;SAChB;QAED,KAAK,MAAM,GAAG,IAAI,OAAO,CAAC,OAAO,EAAE;YAC/B,IAAI,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;gBAC/C,OAAO,KAAK,CAAC;aAChB;SACJ;QAED,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,IAAI,KAAK,GAKS,SAAS,CAAC;IAE5B,SAAS,SAAS,CAAC,MAGlB;QACG,0FAA0F;QAC1F,6FAA6F;QAC7F,SAAS,EAAE;YACP,IAAI,KAAK,KAAK,SAAS,EAAE;gBACrB,MAAM,SAAS,CAAC;aACnB;YAED,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE;gBACtC,MAAM,SAAS,CAAC;aACnB;YAED,OAAO,KAAK,CAAC,MAAM,CAAC;SACvB;QAED,MAAM,EAAE,OAAO,EAAE,eAAe,EAAE,GAAG,MAAM,CAAC;QAE5C,SAAS,MAAM,CAAC,GAAG,IAAuB;YACtC,OAAO,kBAAkB,CAAC;gBACtB,IAAI;gBACJ,SAAS,EAAE,QAAQ,CAAC,EAAE;oBAClB,MAAM,CAAC,EAAE,CAAW,QAAQ,CAAC,CAAC,CAAC;oBAE/B,OAAO,IAAI,CACP,QAAQ,EACR,eAAe,CAAC,CAAC,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,SAAS,EACtD,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAG,QAAQ,CAAC,CACtB,CAAC;gBACN,CAAC;aACJ,CAAC,CAAC;QACP,CAAC;QAED,KAAK,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,EAAE,CAAC;QAEvC,OAAO,EAAE,MAAM,EAAE,CAAC;IACtB,CAAC;IAED,OAAO,EAAE,SAAS,EAAE,CAAC;AACzB,CAAC"}
1
+ {"version":3,"file":"getKcClsx.js","sourceRoot":"","sources":["../src/lib/getKcClsx.ts"],"names":[],"mappings":"AACA,OAAO,EAAc,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AAC7E,OAAO,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AACrC,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AACtC,OAAO,EAAE,EAAE,EAAE,MAAM,UAAU,CAAC;AAE9B,MAAM,UAAU,eAAe,CAA0B,MAExD;IACG,MAAM,EAAE,cAAc,EAAE,GAAG,MAAM,CAAC;IAElC,SAAS,aAAa,CAClB,OAAiC,EACjC,OAAiC;QAEjC,IAAI,OAAO,CAAC,eAAe,KAAK,OAAO,CAAC,eAAe,EAAE;YACrD,OAAO,KAAK,CAAC;SAChB;QAED,IAAI,OAAO,CAAC,OAAO,KAAK,OAAO,CAAC,OAAO,EAAE;YACrC,OAAO,IAAI,CAAC;SACf;QAED,IAAI,OAAO,CAAC,OAAO,KAAK,SAAS,IAAI,OAAO,CAAC,OAAO,KAAK,SAAS,EAAE;YAChE,OAAO,KAAK,CAAC;SAChB;QAED,IAAI,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,KAAK,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE;YAC7E,OAAO,KAAK,CAAC;SAChB;QAED,KAAK,MAAM,GAAG,IAAI,OAAO,CAAC,OAAO,EAAE;YAC/B,IAAI,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;gBAC/C,OAAO,KAAK,CAAC;aAChB;SACJ;QAED,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,IAAI,KAAK,GAKS,SAAS,CAAC;IAE5B,SAAS,SAAS,CAAC,MAGlB;QACG,0FAA0F;QAC1F,6FAA6F;QAC7F,SAAS,EAAE;YACP,IAAI,KAAK,KAAK,SAAS,EAAE;gBACrB,MAAM,SAAS,CAAC;aACnB;YAED,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE;gBACtC,MAAM,SAAS,CAAC;aACnB;YAED,OAAO,KAAK,CAAC,MAAM,CAAC;SACvB;QAED,MAAM,EAAE,OAAO,EAAE,eAAe,EAAE,GAAG,MAAM,CAAC;QAE5C,SAAS,MAAM,CAAC,GAAG,IAAuB;YACtC,OAAO,kBAAkB,CAAC;gBACtB,IAAI;gBACJ,SAAS,EAAE,QAAQ,CAAC,EAAE;oBAClB,MAAM,CAAC,EAAE,CAAW,QAAQ,CAAC,CAAC,CAAC;oBAE/B,MAAM,SAAS,GAAG,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAG,QAAQ,CAAC,CAAC;oBAEtC,OAAO,IAAI,CACP,QAAQ,EACR,eAAe,IAAI,CAAC,CAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,KAAK,CAAC,GAAG,EAAE,QAAQ,CAAC,OAAO,CAAC,CAAA;wBACvD,CAAC,CAAC,cAAc,CAAC,QAAQ,CAAC;wBAC1B,CAAC,CAAC,SAAS,EACf,SAAS,CACZ,CAAC;gBACN,CAAC;aACJ,CAAC,CAAC;QACP,CAAC;QAED,KAAK,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,EAAE,CAAC;QAEvC,OAAO,EAAE,MAAM,EAAE,CAAC;IACtB,CAAC;IAED,OAAO,EAAE,SAAS,EAAE,CAAC;AACzB,CAAC"}
package/login/i18n/useI18n.js CHANGED
@@ -5,8 +5,9 @@ import { Reflect } from "tsafe/Reflect";
5
5
  export function createUseI18n(messagesByLanguageTag) {
6
6
  const { withJsx } = (() => {
7
7
  const cache = new WeakMap();
8
- function renderHtmlString(htmlString) {
9
- return (_jsx("div", { style: { display: "inline-block" }, dangerouslySetInnerHTML: {
8
+ function renderHtmlString(params) {
9
+ const { htmlString, msgKey } = params;
10
+ return (_jsx("div", { "data-kc-msg": msgKey, dangerouslySetInnerHTML: {
10
11
  __html: htmlString
11
12
  } }));
12
13
  }
@@ -18,12 +19,22 @@ export function createUseI18n(messagesByLanguageTag) {
18
19
  }
19
20
  return i18n;
20
21
  }
21
- const i18n = Object.assign(Object.assign({}, i18n_noJsx), { msg: (...args) => renderHtmlString(i18n_noJsx.msgStr(...args)), advancedMsg: (...args) => renderHtmlString(i18n_noJsx.advancedMsgStr(...args)) });
22
+ const i18n = Object.assign(Object.assign({}, i18n_noJsx), { msg: (msgKey, ...args) => renderHtmlString({ htmlString: i18n_noJsx.msgStr(msgKey, ...args), msgKey }), advancedMsg: (msgKey, ...args) => renderHtmlString({ htmlString: i18n_noJsx.advancedMsgStr(msgKey, ...args), msgKey }) });
22
23
  cache.set(i18n_noJsx, i18n);
23
24
  return i18n;
24
25
  }
25
26
  return { withJsx };
26
27
  })();
28
+ add_style: {
29
+ const attributeName = "data-kc-i18n";
30
+ // Check if already exists in head
31
+ if (document.querySelector(`style[${attributeName}]`) !== null) {
32
+ break add_style;
33
+ }
34
+ const styleElement = document.createElement("style");
35
+ styleElement.attributes.setNamedItem(document.createAttribute(attributeName));
36
+ (styleElement.textContent = `[data-kc-msg] { display: inline-block; }`), document.head.prepend(styleElement);
37
+ }
27
38
  const { getI18n } = createGetI18n(messagesByLanguageTag);
28
39
  function useI18n(params) {
29
40
  const { kcContext } = params;
package/login/i18n/useI18n.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"useI18n.js","sourceRoot":"","sources":["../../src/login/i18n/useI18n.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAC5C,OAAO,EAAE,aAAa,EAA0E,MAAM,QAAQ,CAAC;AAE/G,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAExC,MAAM,UAAU,aAAa,CAAiD,qBAE7E;IAKG,MAAM,EAAE,OAAO,EAAE,GAAG,CAAC,GAAG,EAAE;QACtB,MAAM,KAAK,GAAG,IAAI,OAAO,EAA0D,CAAC;QAEpF,SAAS,gBAAgB,CAAC,UAAkB;YACxC,OAAO,CACH,cACI,KAAK,EAAE,EAAE,OAAO,EAAE,cAAc,EAAE,EAClC,uBAAuB,EAAE;oBACrB,MAAM,EAAE,UAAU;iBACrB,GACH,CACL,CAAC;QACN,CAAC;QAED,SAAS,OAAO,CAAC,UAAyC;YACtD,SAAS,EAAE;gBACP,MAAM,IAAI,GAAG,KAAK,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;gBAEnC,IAAI,IAAI,KAAK,SAAS,EAAE;oBACpB,MAAM,SAAS,CAAC;iBACnB;gBAED,OAAO,IAAI,CAAC;aACf;YAED,MAAM,IAAI,mCACH,UAAU,KACb,GAAG,EAAE,CAAC,GAAG,IAAI,EAAE,EAAE,CAAC,gBAAgB,CAAC,UAAU,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,CAAC,EAC9D,WAAW,EAAE,CAAC,GAAG,IAAI,EAAE,EAAE,CAAC,gBAAgB,CAAC,UAAU,CAAC,cAAc,CAAC,GAAG,IAAI,CAAC,CAAC,GACjF,CAAC;YAEF,KAAK,CAAC,GAAG,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;YAE5B,OAAO,IAAI,CAAC;QAChB,CAAC;QAED,OAAO,EAAE,OAAO,EAAE,CAAC;IACvB,CAAC,CAAC,EAAE,CAAC;IAEL,MAAM,EAAE,OAAO,EAAE,GAAG,aAAa,CAAC,qBAAqB,CAAC,CAAC;IAEzD,SAAS,OAAO,CAAC,MAAoC;QACjD,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,CAAC;QAE7B,MAAM,EAAE,IAAI,EAAE,sBAAsB,EAAE,GAAG,OAAO,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC;QAEhE,MAAM,CAAC,aAAa,EAAE,gBAAgB,CAAC,GAAG,QAAQ,CAAO,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;QAExE,SAAS,CAAC,GAAG,EAAE;YACX,IAAI,QAAQ,GAAG,IAAI,CAAC;YAEpB,sBAAsB,aAAtB,sBAAsB,uBAAtB,sBAAsB,CAAE,IAAI,CAAC,IAAI,CAAC,EAAE;gBAChC,IAAI,CAAC,QAAQ,EAAE;oBACX,OAAO;iBACV;gBAED,gBAAgB,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;YACpC,CAAC,CAAC,CAAC;YAEH,OAAO,GAAG,EAAE;gBACR,QAAQ,GAAG,KAAK,CAAC;YACrB,CAAC,CAAC;QACN,CAAC,EAAE,EAAE,CAAC,CAAC;QAEP,OAAO,EAAE,IAAI,EAAE,aAAa,EAAE,CAAC;IACnC,CAAC;IAED,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,OAAO,EAAQ,EAAE,CAAC;AACpD,CAAC"}
1
+ {"version":3,"file":"useI18n.js","sourceRoot":"","sources":["../../src/login/i18n/useI18n.tsx"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "keycloakify",
3
- "version": "10.0.0-rc.111",
3
+ "version": "10.0.0-rc.113",
4
4
  "description": "Create Keycloak themes using React",
5
5
  "repository": {
6
6
  "type": "git",
package/src/account/i18n/useI18n.tsx CHANGED
@@ -13,10 +13,11 @@ export function createUseI18n<MessageKey_themeDefined extends string = never>(me
13
13
  const { withJsx } = (() => {
14
14
  const cache = new WeakMap<GenericI18n_noJsx<MessageKey>, GenericI18n<MessageKey>>();
15
15
 
16
- function renderHtmlString(htmlString: string): JSX.Element {
16
+ function renderHtmlString(params: { htmlString: string; msgKey: string }): JSX.Element {
17
+ const { htmlString, msgKey } = params;
17
18
  return (
18
19
  <div
19
- style={{ display: "inline-block" }}
20
+ data-kc-msg={msgKey}
20
21
  dangerouslySetInnerHTML={{
21
22
  __html: htmlString
22
23
  }}
@@ -37,8 +38,8 @@ export function createUseI18n<MessageKey_themeDefined extends string = never>(me
37
38
 
38
39
  const i18n: I18n = {
39
40
  ...i18n_noJsx,
40
- msg: (...args) => renderHtmlString(i18n_noJsx.msgStr(...args)),
41
- advancedMsg: (...args) => renderHtmlString(i18n_noJsx.advancedMsgStr(...args))
41
+ msg: (msgKey, ...args) => renderHtmlString({ htmlString: i18n_noJsx.msgStr(msgKey, ...args), msgKey }),
42
+ advancedMsg: (msgKey, ...args) => renderHtmlString({ htmlString: i18n_noJsx.advancedMsgStr(msgKey, ...args), msgKey })
42
43
  };
43
44
 
44
45
  cache.set(i18n_noJsx, i18n);
@@ -49,6 +50,19 @@ export function createUseI18n<MessageKey_themeDefined extends string = never>(me
49
50
  return { withJsx };
50
51
  })();
51
52
 
53
+ add_style: {
54
+ const attributeName = "data-kc-i18n";
55
+
56
+ // Check if already exists in head
57
+ if (document.querySelector(`style[${attributeName}]`) !== null) {
58
+ break add_style;
59
+ }
60
+
61
+ const styleElement = document.createElement("style");
62
+ styleElement.attributes.setNamedItem(document.createAttribute(attributeName));
63
+ (styleElement.textContent = `[data-kc-msg] { display: inline-block; }`), document.head.prepend(styleElement);
64
+ }
65
+
52
66
  const { getI18n } = createGetI18n(messagesByLanguageTag);
53
67
 
54
68
  function useI18n(params: { kcContext: KcContextLike }): { i18n: I18n } {
package/src/bin/keycloakify/replacers/replaceImportsInCssCode.ts CHANGED
@@ -37,7 +37,7 @@ export function replaceImportsInCssCode(params: {
37
37
  break inline_style_in_html;
38
38
  }
39
39
 
40
- return `url(\${xKeycloakify.resourcesPath}/${BASENAME_OF_KEYCLOAKIFY_RESOURCES_DIR}${assetFileAbsoluteUrlPathname})`;
40
+ return `url("\${xKeycloakify.resourcesPath}/${BASENAME_OF_KEYCLOAKIFY_RESOURCES_DIR}${assetFileAbsoluteUrlPathname}")`;
41
41
  }
42
42
 
43
43
  const assetFileRelativeUrlPathname = posix.relative(
@@ -45,7 +45,7 @@ export function replaceImportsInCssCode(params: {
45
45
  assetFileAbsoluteUrlPathname.replace(/^\//, "")
46
46
  );
47
47
 
48
- return `url(${assetFileRelativeUrlPathname})`;
48
+ return `url("${assetFileRelativeUrlPathname}")`;
49
49
  }
50
50
  );
51
51
 
package/src/lib/getKcClsx.ts CHANGED
@@ -71,10 +71,14 @@ export function createGetKcClsx<ClassKey extends string>(params: {
71
71
  transform: classKey => {
72
72
  assert(is<ClassKey>(classKey));
73
73
 
74
+ const className = classes?.[classKey];
75
+
74
76
  return clsx(
75
77
  classKey,
76
- doUseDefaultCss ? defaultClasses[classKey] : undefined,
77
- classes?.[classKey]
78
+ doUseDefaultCss && !className?.split(" ").includes("CLEAR")
79
+ ? defaultClasses[classKey]
80
+ : undefined,
81
+ className
78
82
  );
79
83
  }
80
84
  });
package/src/login/i18n/useI18n.tsx CHANGED
@@ -13,10 +13,11 @@ export function createUseI18n<MessageKey_themeDefined extends string = never>(me
13
13
  const { withJsx } = (() => {
14
14
  const cache = new WeakMap<GenericI18n_noJsx<MessageKey>, GenericI18n<MessageKey>>();
15
15
 
16
- function renderHtmlString(htmlString: string): JSX.Element {
16
+ function renderHtmlString(params: { htmlString: string; msgKey: string }): JSX.Element {
17
+ const { htmlString, msgKey } = params;
17
18
  return (
18
19
  <div
19
- style={{ display: "inline-block" }}
20
+ data-kc-msg={msgKey}
20
21
  dangerouslySetInnerHTML={{
21
22
  __html: htmlString
22
23
  }}
@@ -37,8 +38,8 @@ export function createUseI18n<MessageKey_themeDefined extends string = never>(me
37
38
 
38
39
  const i18n: I18n = {
39
40
  ...i18n_noJsx,
40
- msg: (...args) => renderHtmlString(i18n_noJsx.msgStr(...args)),
41
- advancedMsg: (...args) => renderHtmlString(i18n_noJsx.advancedMsgStr(...args))
41
+ msg: (msgKey, ...args) => renderHtmlString({ htmlString: i18n_noJsx.msgStr(msgKey, ...args), msgKey }),
42
+ advancedMsg: (msgKey, ...args) => renderHtmlString({ htmlString: i18n_noJsx.advancedMsgStr(msgKey, ...args), msgKey })
42
43
  };
43
44
 
44
45
  cache.set(i18n_noJsx, i18n);
@@ -49,6 +50,19 @@ export function createUseI18n<MessageKey_themeDefined extends string = never>(me
49
50
  return { withJsx };
50
51
  })();
51
52
 
53
+ add_style: {
54
+ const attributeName = "data-kc-i18n";
55
+
56
+ // Check if already exists in head
57
+ if (document.querySelector(`style[${attributeName}]`) !== null) {
58
+ break add_style;
59
+ }
60
+
61
+ const styleElement = document.createElement("style");
62
+ styleElement.attributes.setNamedItem(document.createAttribute(attributeName));
63
+ (styleElement.textContent = `[data-kc-msg] { display: inline-block; }`), document.head.prepend(styleElement);
64
+ }
65
+
52
66
  const { getI18n } = createGetI18n(messagesByLanguageTag);
53
67
 
54
68
  function useI18n(params: { kcContext: KcContextLike }): { i18n: I18n } {