keycloakify 10.0.0-rc.113 → 10.0.0-rc.115

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 (6) hide show
  1. package/bin/440.index.js +9 -3
  2. package/lib/getKcClsx.js +2 -4
  3. package/lib/getKcClsx.js.map +1 -1
  4. package/package.json +1 -1
  5. package/src/bin/keycloakify/replacers/replaceImportsInCssCode.ts +40 -26
  6. package/src/lib/getKcClsx.ts +2 -6
package/bin/440.index.js CHANGED
@@ -355,13 +355,19 @@ const { readAssetsDirSync } = (() => {
355
355
  (0,assert.assert)();
356
356
  function replaceImportsInCssCode(params) {
357
357
  const { cssCode, cssFileRelativeDirPath, buildContext } = params;
358
- const fixedCssCode = cssCode.replace(/url\(["']?(\/[^/][^)"']+)["']?\)/g, (match, assetFileAbsoluteUrlPathname) => {
358
+ let fixedCssCode = cssCode;
359
+ [
360
+ /url\("(\/[^/][^"]+)"\)/g,
361
+ /url\('(\/[^/][^']+)'\)/g,
362
+ /url\((\/[^/][^)]+)\)/g
363
+ ].forEach(regex => (fixedCssCode = fixedCssCode.replace(regex, (match, assetFileAbsoluteUrlPathname) => {
359
364
  if (buildContext.urlPathname !== undefined) {
360
365
  if (!assetFileAbsoluteUrlPathname.startsWith(buildContext.urlPathname)) {
361
366
  // NOTE: Should never happen
362
367
  return match;
363
368
  }
364
- assetFileAbsoluteUrlPathname = assetFileAbsoluteUrlPathname.replace(buildContext.urlPathname, "/");
369
+ assetFileAbsoluteUrlPathname =
370
+ assetFileAbsoluteUrlPathname.replace(buildContext.urlPathname, "/");
365
371
  }
366
372
  inline_style_in_html: {
367
373
  if (cssFileRelativeDirPath !== undefined) {
@@ -371,7 +377,7 @@ function replaceImportsInCssCode(params) {
371
377
  }
372
378
  const assetFileRelativeUrlPathname = external_path_.posix.relative(cssFileRelativeDirPath.replace(/\\/g, "/"), assetFileAbsoluteUrlPathname.replace(/^\//, ""));
373
379
  return `url("${assetFileRelativeUrlPathname}")`;
374
- });
380
+ })));
375
381
  return { fixedCssCode };
376
382
  }
377
383
  //# sourceMappingURL=replaceImportsInCssCode.js.map
package/lib/getKcClsx.js CHANGED
@@ -42,11 +42,9 @@ export function createGetKcClsx(params) {
42
42
  return clsx_withTransform({
43
43
  args,
44
44
  transform: classKey => {
45
+ var _a;
45
46
  assert(is(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
+ return clsx(classKey, (_a = classes === null || classes === void 0 ? void 0 : classes[classKey]) !== null && _a !== void 0 ? _a : (doUseDefaultCss ? defaultClasses[classKey] : undefined));
50
48
  }
51
49
  });
52
50
  }
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,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"}
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,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAG,QAAQ,CAAC,mCACf,CAAC,eAAe,CAAC,CAAC,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAC/D,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/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "keycloakify",
3
- "version": "10.0.0-rc.113",
3
+ "version": "10.0.0-rc.115",
4
4
  "description": "Create Keycloak themes using React",
5
5
  "repository": {
6
6
  "type": "git",
package/src/bin/keycloakify/replacers/replaceImportsInCssCode.ts CHANGED
@@ -18,35 +18,49 @@ export function replaceImportsInCssCode(params: {
18
18
  } {
19
19
  const { cssCode, cssFileRelativeDirPath, buildContext } = params;
20
20
 
21
- const fixedCssCode = cssCode.replace(
22
- /url\(["']?(\/[^/][^)"']+)["']?\)/g,
23
- (match, assetFileAbsoluteUrlPathname) => {
24
- if (buildContext.urlPathname !== undefined) {
25
- if (!assetFileAbsoluteUrlPathname.startsWith(buildContext.urlPathname)) {
26
- // NOTE: Should never happen
27
- return match;
28
- }
29
- assetFileAbsoluteUrlPathname = assetFileAbsoluteUrlPathname.replace(
30
- buildContext.urlPathname,
31
- "/"
32
- );
33
- }
34
-
35
- inline_style_in_html: {
36
- if (cssFileRelativeDirPath !== undefined) {
37
- break inline_style_in_html;
38
- }
21
+ let fixedCssCode = cssCode;
22
+
23
+ [
24
+ /url\("(\/[^/][^"]+)"\)/g,
25
+ /url\('(\/[^/][^']+)'\)/g,
26
+ /url\((\/[^/][^)]+)\)/g
27
+ ].forEach(
28
+ regex =>
29
+ (fixedCssCode = fixedCssCode.replace(
30
+ regex,
31
+ (match, assetFileAbsoluteUrlPathname) => {
32
+ if (buildContext.urlPathname !== undefined) {
33
+ if (
34
+ !assetFileAbsoluteUrlPathname.startsWith(
35
+ buildContext.urlPathname
36
+ )
37
+ ) {
38
+ // NOTE: Should never happen
39
+ return match;
40
+ }
41
+ assetFileAbsoluteUrlPathname =
42
+ assetFileAbsoluteUrlPathname.replace(
43
+ buildContext.urlPathname,
44
+ "/"
45
+ );
46
+ }
39
47
 
40
- return `url("\${xKeycloakify.resourcesPath}/${BASENAME_OF_KEYCLOAKIFY_RESOURCES_DIR}${assetFileAbsoluteUrlPathname}")`;
41
- }
48
+ inline_style_in_html: {
49
+ if (cssFileRelativeDirPath !== undefined) {
50
+ break inline_style_in_html;
51
+ }
42
52
 
43
- const assetFileRelativeUrlPathname = posix.relative(
44
- cssFileRelativeDirPath.replace(/\\/g, "/"),
45
- assetFileAbsoluteUrlPathname.replace(/^\//, "")
46
- );
53
+ return `url("\${xKeycloakify.resourcesPath}/${BASENAME_OF_KEYCLOAKIFY_RESOURCES_DIR}${assetFileAbsoluteUrlPathname}")`;
54
+ }
47
55
 
48
- return `url("${assetFileRelativeUrlPathname}")`;
49
- }
56
+ const assetFileRelativeUrlPathname = posix.relative(
57
+ cssFileRelativeDirPath.replace(/\\/g, "/"),
58
+ assetFileAbsoluteUrlPathname.replace(/^\//, "")
59
+ );
60
+
61
+ return `url("${assetFileRelativeUrlPathname}")`;
62
+ }
63
+ ))
50
64
  );
51
65
 
52
66
  return { fixedCssCode };
package/src/lib/getKcClsx.ts CHANGED
@@ -71,14 +71,10 @@ 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
-
76
74
  return clsx(
77
75
  classKey,
78
- doUseDefaultCss && !className?.split(" ").includes("CLEAR")
79
- ? defaultClasses[classKey]
80
- : undefined,
81
- className
76
+ classes?.[classKey] ??
77
+ (doUseDefaultCss ? defaultClasses[classKey] : undefined)
82
78
  );
83
79
  }
84
80
  });