keycloakify 10.0.0-rc.75 → 10.0.0-rc.77

package/bin/440.index.js

@@ -351,9 +351,10 @@ const { readAssetsDirSync } = (() => {
 ;// CONCATENATED MODULE: ./dist/bin/keycloakify/replacers/replaceImportsInCssCode.js
 
 
+
 (0,assert.assert)();
 function replaceImportsInCssCode(params) {
-    const { cssCode, fileRelativeDirPath, buildContext } = params;
+    const { cssCode, cssFileRelativeDirPath, buildContext } = params;
     const fixedCssCode = cssCode.replace(/url\(["']?(\/[^/][^)"']+)["']?\)/g, (match, assetFileAbsoluteUrlPathname) => {
         if (buildContext.urlPathname !== undefined) {
             if (!assetFileAbsoluteUrlPathname.startsWith(buildContext.urlPathname)) {
@@ -362,7 +363,13 @@ function replaceImportsInCssCode(params) {
             }
             assetFileAbsoluteUrlPathname = assetFileAbsoluteUrlPathname.replace(buildContext.urlPathname, "/");
         }
-        const assetFileRelativeUrlPathname = external_path_.posix.relative(fileRelativeDirPath.replace(/\\/g, "/"), assetFileAbsoluteUrlPathname.replace(/^\//, ""));
+        inline_style_in_html: {
+            if (cssFileRelativeDirPath !== undefined) {
+                break inline_style_in_html;
+            }
+            return `url(\${url.resourcesPath}/${constants/* basenameOfTheKeycloakifyResourcesDir */.M}${assetFileAbsoluteUrlPathname})`;
+        }
+        const assetFileRelativeUrlPathname = external_path_.posix.relative(cssFileRelativeDirPath.replace(/\\/g, "/"), assetFileAbsoluteUrlPathname.replace(/^\//, ""));
         return `url(${assetFileRelativeUrlPathname})`;
     });
     return { fixedCssCode };
@@ -401,7 +408,7 @@ function generateFtlFilesCodeFactory(params) {
             (0,assert.assert)(cssCode !== null);
             const { fixedCssCode } = replaceImportsInCssCode({
                 cssCode,
-                fileRelativeDirPath: ".",
+                cssFileRelativeDirPath: undefined,
                 buildContext
             });
             $(element).text(fixedCssCode);
@@ -727,7 +734,7 @@ async function generateResourcesForMainTheme(params) {
                     if (filePath.endsWith(".css")) {
                         const { fixedCssCode } = replaceImportsInCssCode({
                             cssCode: sourceCode.toString("utf8"),
-                            fileRelativeDirPath: (0,external_path_.dirname)(fileRelativePath),
+                            cssFileRelativeDirPath: (0,external_path_.dirname)(fileRelativePath),
                             buildContext
                         });
                         return {

package/bin/453.index.js

@@ -124,6 +124,7 @@ async function command(params) {
         return;
     }
     const userProfileFormFieldComponentName = "UserProfileFormFields";
+    const componentName = componentBasename.replace(/.tsx$/, "");
     console.log([
         ``,
         `You now need to update your page router:`,
@@ -132,7 +133,7 @@ async function command(params) {
         chalk__WEBPACK_IMPORTED_MODULE_9___default().grey("```"),
         `// ...`,
         ``,
-        chalk__WEBPACK_IMPORTED_MODULE_9___default().green(`+const ${componentBasename.replace(/.tsx$/, "")} = lazy(() => import("./pages/${componentBasename}"));`),
+        chalk__WEBPACK_IMPORTED_MODULE_9___default().green(`+const ${componentName} = lazy(() => import("./pages/${componentName}"));`),
         ...[
             ``,
             ` export default function KcPage(props: { kcContext: KcContext; }) {`,
@@ -145,7 +146,7 @@ async function command(params) {
             `                 switch (kcContext.pageId) {`,
             `                     // ...`,
             `+                    case "${pageIdOrComponent}": return (`,
-            `+                        <${componentBasename}`,
+            `+                        <${componentName}`,
             `+                            {...{ kcContext, i18n, classes }}`,
             `+                            Template={Template}`,
             `+                            doUseDefaultCss={true}`,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "keycloakify",
-    "version": "10.0.0-rc.75",
+    "version": "10.0.0-rc.77",
     "description": "Create Keycloak themes using React",
     "repository": {
         "type": "git",

package/src/bin/eject-page.ts

@@ -190,6 +190,8 @@ export async function command(params: { cliCommandOptions: CliCommandOptions })
 
     const userProfileFormFieldComponentName = "UserProfileFormFields";
 
+    const componentName = componentBasename.replace(/.tsx$/, "");
+
     console.log(
         [
             ``,
@@ -207,10 +209,7 @@ export async function command(params: { cliCommandOptions: CliCommandOptions })
             `// ...`,
             ``,
             chalk.green(
-                `+const ${componentBasename.replace(
-                    /.tsx$/,
-                    ""
-                )} = lazy(() => import("./pages/${componentBasename}"));`
+                `+const ${componentName} = lazy(() => import("./pages/${componentName}"));`
             ),
             ...[
                 ``,
@@ -224,7 +223,7 @@ export async function command(params: { cliCommandOptions: CliCommandOptions })
                 `                 switch (kcContext.pageId) {`,
                 `                     // ...`,
                 `+                    case "${pageIdOrComponent}": return (`,
-                `+                        <${componentBasename}`,
+                `+                        <${componentName}`,
                 `+                            {...{ kcContext, i18n, classes }}`,
                 `+                            Template={Template}`,
                 `+                            doUseDefaultCss={true}`,

package/src/bin/keycloakify/generateFtl/generateFtl.ts

@@ -64,7 +64,7 @@ export function generateFtlFilesCodeFactory(params: {
 
             const { fixedCssCode } = replaceImportsInCssCode({
                 cssCode,
-                fileRelativeDirPath: ".",
+                cssFileRelativeDirPath: undefined,
                 buildContext
             });
 

package/src/bin/keycloakify/generateResources/generateResourcesForMainTheme.ts

@@ -134,7 +134,7 @@ export async function generateResourcesForMainTheme(params: {
                     if (filePath.endsWith(".css")) {
                         const { fixedCssCode } = replaceImportsInCssCode({
                             cssCode: sourceCode.toString("utf8"),
-                            fileRelativeDirPath: pathDirname(fileRelativePath),
+                            cssFileRelativeDirPath: pathDirname(fileRelativePath),
                             buildContext
                         });
 

package/src/bin/keycloakify/replacers/replaceImportsInCssCode.ts

@@ -1,4 +1,5 @@
 import type { BuildContext } from "../../shared/buildContext";
+import { basenameOfTheKeycloakifyResourcesDir } from "../../shared/constants";
 import { assert } from "tsafe/assert";
 import { posix } from "path";
 
@@ -10,12 +11,12 @@ assert<BuildContext extends BuildContextLike ? true : false>();
 
 export function replaceImportsInCssCode(params: {
     cssCode: string;
-    fileRelativeDirPath: string;
+    cssFileRelativeDirPath: string | undefined;
     buildContext: BuildContextLike;
 }): {
     fixedCssCode: string;
 } {
-    const { cssCode, fileRelativeDirPath, buildContext } = params;
+    const { cssCode, cssFileRelativeDirPath, buildContext } = params;
 
     const fixedCssCode = cssCode.replace(
         /url\(["']?(\/[^/][^)"']+)["']?\)/g,
@@ -31,8 +32,16 @@ export function replaceImportsInCssCode(params: {
                 );
             }
 
+            inline_style_in_html: {
+                if (cssFileRelativeDirPath !== undefined) {
+                    break inline_style_in_html;
+                }
+
+                return `url(\${url.resourcesPath}/${basenameOfTheKeycloakifyResourcesDir}${assetFileAbsoluteUrlPathname})`;
+            }
+
             const assetFileRelativeUrlPathname = posix.relative(
-                fileRelativeDirPath.replace(/\\/g, "/"),
+                cssFileRelativeDirPath.replace(/\\/g, "/"),
                 assetFileAbsoluteUrlPathname.replace(/^\//, "")
             );