keycloakify 10.0.0-rc.73 → 10.0.0-rc.74

package/bin/{363.index.js → 440.index.js}

@@ -1,6 +1,6 @@
 "use strict";
-exports.id = 363;
-exports.ids = [363];
+exports.id = 440;
+exports.ids = [440];
 exports.modules = {
 
 /***/ 73817:
@@ -155,7 +155,7 @@ function generateMessageProperties(params) {
 
 /***/ }),
 
-/***/ 52363:
+/***/ 46440:
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
 
 // ESM COMPAT FLAG
@@ -348,63 +348,28 @@ const { readAssetsDirSync } = (() => {
 ;// CONCATENATED MODULE: ./dist/bin/keycloakify/replacers/replaceImportsInJsCode/index.js
 
 //# sourceMappingURL=index.js.map
-// EXTERNAL MODULE: external "crypto"
-var external_crypto_ = __webpack_require__(6113);
 ;// CONCATENATED MODULE: ./dist/bin/keycloakify/replacers/replaceImportsInCssCode.js
 
 
-
 (0,assert.assert)();
 function replaceImportsInCssCode(params) {
-    var _a;
-    const { cssCode } = params;
-    const cssGlobalsToDefine = {};
-    new Set((_a = cssCode.match(/url\(["']?\/[^/][^)"']+["']?\)[^;}]*?/g)) !== null && _a !== void 0 ? _a : []).forEach(match => (cssGlobalsToDefine["url" +
-        external_crypto_.createHash("sha256")
-            .update(match)
-            .digest("hex")
-            .substring(0, 15)] = match));
-    let fixedCssCode = cssCode;
-    Object.keys(cssGlobalsToDefine).forEach(cssVariableName => 
-    //NOTE: split/join pattern ~ replace all
-    (fixedCssCode = fixedCssCode
-        .split(cssGlobalsToDefine[cssVariableName])
-        .join(`var(--${cssVariableName})`)));
-    return { fixedCssCode, cssGlobalsToDefine };
-}
-function generateCssCodeToDefineGlobals(params) {
-    const { cssGlobalsToDefine, buildContext } = params;
-    return {
-        cssCodeToPrependInHead: [
-            ":root {",
-            ...Object.keys(cssGlobalsToDefine)
-                .map(cssVariableName => {
-                var _a;
-                return [
-                    `--${cssVariableName}:`,
-                    cssGlobalsToDefine[cssVariableName].replace(new RegExp(`url\\(${((_a = buildContext.urlPathname) !== null && _a !== void 0 ? _a : "/").replace(/\//g, "\\/")}`, "g"), `url(\${url.resourcesPath}/${constants/* basenameOfTheKeycloakifyResourcesDir */.M}/`)
-                ].join(" ");
-            })
-                .map(line => `    ${line};`),
-            "}"
-        ].join("\n")
-    };
+    const { cssCode, fileRelativeDirPath, buildContext } = params;
+    const fixedCssCode = cssCode.replace(/url\(["']?(\/[^/][^)"']+)["']?\)/g, (match, assetFileAbsoluteUrlPathname) => {
+        if (buildContext.urlPathname !== undefined) {
+            if (!assetFileAbsoluteUrlPathname.startsWith(buildContext.urlPathname)) {
+                // NOTE: Should never happen
+                return match;
+            }
+            assetFileAbsoluteUrlPathname = assetFileAbsoluteUrlPathname.replace(buildContext.urlPathname, "/");
+        }
+        const assetFileRelativeUrlPathname = external_path_.posix.relative(fileRelativeDirPath.replace(/\\/g, "/"), assetFileAbsoluteUrlPathname.replace(/^\//, ""));
+        return `url(${assetFileRelativeUrlPathname})`;
+    });
+    return { fixedCssCode };
 }
 //# sourceMappingURL=replaceImportsInCssCode.js.map
 // EXTERNAL MODULE: ./node_modules/cheerio/lib/esm/index.js + 76 modules
 var esm = __webpack_require__(87182);
-;// CONCATENATED MODULE: ./dist/bin/keycloakify/replacers/replaceImportsInInlineCssCode.js
-
-
-(0,assert.assert)();
-function replaceImportsInInlineCssCode(params) {
-    const { cssCode, buildContext } = params;
-    const fixedCssCode = cssCode.replace(buildContext.urlPathname === undefined
-        ? /url\(["']?\/([^/][^)"']+)["']?\)/g
-        : new RegExp(`url\\(["']?${buildContext.urlPathname}([^)"']+)["']?\\)`, "g"), (...[, group]) => `url(\${url.resourcesPath}/${constants/* basenameOfTheKeycloakifyResourcesDir */.M}/${group})`);
-    return { fixedCssCode };
-}
-//# sourceMappingURL=replaceImportsInInlineCssCode.js.map
 // EXTERNAL MODULE: ./dist/bin/tools/getThisCodebaseRootDirPath.js
 var getThisCodebaseRootDirPath = __webpack_require__(58822);
 ;// CONCATENATED MODULE: ./dist/bin/keycloakify/generateFtl/generateFtl.js
@@ -416,11 +381,10 @@ var getThisCodebaseRootDirPath = __webpack_require__(58822);
 
 
 
-
 (0,assert.assert)();
 function generateFtlFilesCodeFactory(params) {
     var _a;
-    const { themeName, cssGlobalsToDefine, indexHtmlCode, buildContext, keycloakifyVersion, themeType, fieldNames } = params;
+    const { themeName, indexHtmlCode, buildContext, keycloakifyVersion, themeType, fieldNames } = params;
     const $ = esm/* default.load */.ZP.load(indexHtmlCode);
     fix_imports_statements: {
         $("script:not([src])").each((...[, element]) => {
@@ -435,8 +399,9 @@ function generateFtlFilesCodeFactory(params) {
         $("style").each((...[, element]) => {
             const cssCode = $(element).html();
             (0,assert.assert)(cssCode !== null);
-            const { fixedCssCode } = replaceImportsInInlineCssCode({
+            const { fixedCssCode } = replaceImportsInCssCode({
                 cssCode,
+                fileRelativeDirPath: ".",
                 buildContext
             });
             $(element).text(fixedCssCode);
@@ -452,18 +417,6 @@ function generateFtlFilesCodeFactory(params) {
             }
             $(element).attr(attrName, href.replace(new RegExp(`^${((_a = buildContext.urlPathname) !== null && _a !== void 0 ? _a : "/").replace(/\//g, "\\/")}`), `\${url.resourcesPath}/${constants/* basenameOfTheKeycloakifyResourcesDir */.M}/`));
         }));
-        if (Object.keys(cssGlobalsToDefine).length !== 0) {
-            $("head").prepend([
-                "",
-                "<style>",
-                generateCssCodeToDefineGlobals({
-                    cssGlobalsToDefine,
-                    buildContext
-                }).cssCodeToPrependInHead,
-                "</style>",
-                ""
-            ].join("\n"));
-        }
     }
     //FTL is no valid html, we can't insert with cheerio, we put placeholder for injecting later.
     const kcContextDeclarationTemplateFtl = external_fs_.readFileSync((0,external_path_.join)((0,getThisCodebaseRootDirPath/* getThisCodebaseRootDirPath */.e)(), "src", "bin", "keycloakify", "generateFtl", "kcContextDeclarationTemplate.ftl"))
@@ -734,7 +687,6 @@ async function generateResourcesForMainTheme(params) {
         const { themeType } = params;
         return (0,external_path_.join)(resourcesDirPath, "theme", themeName, themeType);
     };
-    const cssGlobalsToDefine = {};
     for (const themeType of ["login", "account"]) {
         if (!buildContext.recordIsImplementedByThemeType[themeType]) {
             continue;
@@ -771,13 +723,12 @@ async function generateResourcesForMainTheme(params) {
             (0,transformCodebase/* transformCodebase */.N)({
                 srcDirPath: buildContext.projectBuildDirPath,
                 destDirPath,
-                transformSourceCode: ({ filePath, sourceCode }) => {
+                transformSourceCode: ({ filePath, fileRelativePath, sourceCode }) => {
                     if (filePath.endsWith(".css")) {
-                        const { cssGlobalsToDefine: cssGlobalsToDefineForThisFile, fixedCssCode } = replaceImportsInCssCode({
-                            cssCode: sourceCode.toString("utf8")
-                        });
-                        Object.entries(cssGlobalsToDefineForThisFile).forEach(([key, value]) => {
-                            cssGlobalsToDefine[key] = value;
+                        const { fixedCssCode } = replaceImportsInCssCode({
+                            cssCode: sourceCode.toString("utf8"),
+                            fileRelativeDirPath: (0,external_path_.dirname)(fileRelativePath),
+                            buildContext
                         });
                         return {
                             modifiedSourceCode: Buffer.from(fixedCssCode, "utf8")
@@ -800,7 +751,6 @@ async function generateResourcesForMainTheme(params) {
             themeName,
             indexHtmlCode: external_fs_.readFileSync((0,external_path_.join)(buildContext.projectBuildDirPath, "index.html"))
                 .toString("utf8"),
-            cssGlobalsToDefine,
             buildContext,
             keycloakifyVersion: (0,readThisNpmPackageVersion/* readThisNpmPackageVersion */.K)(),
             themeType,

package/bin/main.js

@@ -9213,7 +9213,7 @@ program
     .task({
     skip,
     handler: async (cliCommandOptions) => {
-        const { command } = await Promise.all(/* import() */[__nccwpck_require__.e(456), __nccwpck_require__.e(430), __nccwpck_require__.e(525), __nccwpck_require__.e(490), __nccwpck_require__.e(751), __nccwpck_require__.e(837), __nccwpck_require__.e(363)]).then(__nccwpck_require__.bind(__nccwpck_require__, 52363));
+        const { command } = await Promise.all(/* import() */[__nccwpck_require__.e(456), __nccwpck_require__.e(430), __nccwpck_require__.e(525), __nccwpck_require__.e(490), __nccwpck_require__.e(751), __nccwpck_require__.e(837), __nccwpck_require__.e(440)]).then(__nccwpck_require__.bind(__nccwpck_require__, 46440));
         await command({ cliCommandOptions });
     }
 });

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "keycloakify",
-    "version": "10.0.0-rc.73",
+    "version": "10.0.0-rc.74",
     "description": "Create Keycloak themes using React",
     "repository": {
         "type": "git",
@@ -478,7 +478,6 @@
         "src/bin/keycloakify/index.ts",
         "src/bin/keycloakify/keycloakify.ts",
         "src/bin/keycloakify/replacers/replaceImportsInCssCode.ts",
-        "src/bin/keycloakify/replacers/replaceImportsInInlineCssCode.ts",
         "src/bin/keycloakify/replacers/replaceImportsInJsCode/index.ts",
         "src/bin/keycloakify/replacers/replaceImportsInJsCode/replaceImportsInJsCode.ts",
         "src/bin/keycloakify/replacers/replaceImportsInJsCode/vite.ts",
@@ -771,9 +770,9 @@
         "bin/193.index.js",
         "bin/246.index.js",
         "bin/36.index.js",
-        "bin/363.index.js",
         "bin/420.index.js",
         "bin/430.index.js",
+        "bin/440.index.js",
         "bin/453.index.js",
         "bin/456.index.js",
         "bin/490.index.js",

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

@@ -1,7 +1,6 @@
 import cheerio from "cheerio";
 import { replaceImportsInJsCode } from "../replacers/replaceImportsInJsCode";
-import { generateCssCodeToDefineGlobals } from "../replacers/replaceImportsInCssCode";
-import { replaceImportsInInlineCssCode } from "../replacers/replaceImportsInInlineCssCode";
+import { replaceImportsInCssCode } from "../replacers/replaceImportsInCssCode";
 import * as fs from "fs";
 import { join as pathJoin } from "path";
 import type { BuildContext } from "../../shared/buildContext";
@@ -28,7 +27,6 @@ assert<BuildContext extends BuildContextLike ? true : false>();
 export function generateFtlFilesCodeFactory(params: {
     themeName: string;
     indexHtmlCode: string;
-    cssGlobalsToDefine: Record<string, string>;
     buildContext: BuildContextLike;
     keycloakifyVersion: string;
     themeType: ThemeType;
@@ -36,7 +34,6 @@ export function generateFtlFilesCodeFactory(params: {
 }) {
     const {
         themeName,
-        cssGlobalsToDefine,
         indexHtmlCode,
         buildContext,
         keycloakifyVersion,
@@ -65,8 +62,9 @@ export function generateFtlFilesCodeFactory(params: {
 
             assert(cssCode !== null);
 
-            const { fixedCssCode } = replaceImportsInInlineCssCode({
+            const { fixedCssCode } = replaceImportsInCssCode({
                 cssCode,
+                fileRelativeDirPath: ".",
                 buildContext
             });
 
@@ -97,21 +95,6 @@ export function generateFtlFilesCodeFactory(params: {
                 );
             })
         );
-
-        if (Object.keys(cssGlobalsToDefine).length !== 0) {
-            $("head").prepend(
-                [
-                    "",
-                    "<style>",
-                    generateCssCodeToDefineGlobals({
-                        cssGlobalsToDefine,
-                        buildContext
-                    }).cssCodeToPrependInHead,
-                    "</style>",
-                    ""
-                ].join("\n")
-            );
-        }
     }
 
     //FTL is no valid html, we can't insert with cheerio, we put placeholder for injecting later.

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

@@ -1,6 +1,11 @@
 import { transformCodebase } from "../../tools/transformCodebase";
 import * as fs from "fs";
-import { join as pathJoin, resolve as pathResolve, relative as pathRelative } from "path";
+import {
+    join as pathJoin,
+    resolve as pathResolve,
+    relative as pathRelative,
+    dirname as pathDirname
+} from "path";
 import { replaceImportsInJsCode } from "../replacers/replaceImportsInJsCode";
 import { replaceImportsInCssCode } from "../replacers/replaceImportsInCssCode";
 import {
@@ -64,8 +69,6 @@ export async function generateResourcesForMainTheme(params: {
         return pathJoin(resourcesDirPath, "theme", themeName, themeType);
     };
 
-    const cssGlobalsToDefine: Record<string, string> = {};
-
     for (const themeType of ["login", "account"] as const) {
         if (!buildContext.recordIsImplementedByThemeType[themeType]) {
             continue;
@@ -127,21 +130,14 @@ export async function generateResourcesForMainTheme(params: {
             transformCodebase({
                 srcDirPath: buildContext.projectBuildDirPath,
                 destDirPath,
-                transformSourceCode: ({ filePath, sourceCode }) => {
+                transformSourceCode: ({ filePath, fileRelativePath, sourceCode }) => {
                     if (filePath.endsWith(".css")) {
-                        const {
-                            cssGlobalsToDefine: cssGlobalsToDefineForThisFile,
-                            fixedCssCode
-                        } = replaceImportsInCssCode({
-                            cssCode: sourceCode.toString("utf8")
+                        const { fixedCssCode } = replaceImportsInCssCode({
+                            cssCode: sourceCode.toString("utf8"),
+                            fileRelativeDirPath: pathDirname(fileRelativePath),
+                            buildContext
                         });
 
-                        Object.entries(cssGlobalsToDefineForThisFile).forEach(
-                            ([key, value]) => {
-                                cssGlobalsToDefine[key] = value;
-                            }
-                        );
-
                         return {
                             modifiedSourceCode: Buffer.from(fixedCssCode, "utf8")
                         };
@@ -168,7 +164,6 @@ export async function generateResourcesForMainTheme(params: {
             indexHtmlCode: fs
                 .readFileSync(pathJoin(buildContext.projectBuildDirPath, "index.html"))
                 .toString("utf8"),
-            cssGlobalsToDefine,
             buildContext,
             keycloakifyVersion: readThisNpmPackageVersion(),
             themeType,

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

@@ -1,7 +1,6 @@
-import * as crypto from "crypto";
 import type { BuildContext } from "../../shared/buildContext";
 import { assert } from "tsafe/assert";
-import { basenameOfTheKeycloakifyResourcesDir } from "../../shared/constants";
+import { posix } from "path";
 
 export type BuildContextLike = {
     urlPathname: string | undefined;
@@ -9,68 +8,37 @@ export type BuildContextLike = {
 
 assert<BuildContext extends BuildContextLike ? true : false>();
 
-export function replaceImportsInCssCode(params: { cssCode: string }): {
-    fixedCssCode: string;
-    cssGlobalsToDefine: Record<string, string>;
-} {
-    const { cssCode } = params;
-
-    const cssGlobalsToDefine: Record<string, string> = {};
-
-    new Set(cssCode.match(/url\(["']?\/[^/][^)"']+["']?\)[^;}]*?/g) ?? []).forEach(
-        match =>
-            (cssGlobalsToDefine[
-                "url" +
-                    crypto
-                        .createHash("sha256")
-                        .update(match)
-                        .digest("hex")
-                        .substring(0, 15)
-            ] = match)
-    );
-
-    let fixedCssCode = cssCode;
-
-    Object.keys(cssGlobalsToDefine).forEach(
-        cssVariableName =>
-            //NOTE: split/join pattern ~ replace all
-            (fixedCssCode = fixedCssCode
-                .split(cssGlobalsToDefine[cssVariableName])
-                .join(`var(--${cssVariableName})`))
-    );
-
-    return { fixedCssCode, cssGlobalsToDefine };
-}
-
-export function generateCssCodeToDefineGlobals(params: {
-    cssGlobalsToDefine: Record<string, string>;
+export function replaceImportsInCssCode(params: {
+    cssCode: string;
+    fileRelativeDirPath: string;
     buildContext: BuildContextLike;
 }): {
-    cssCodeToPrependInHead: string;
+    fixedCssCode: string;
 } {
-    const { cssGlobalsToDefine, buildContext } = params;
+    const { cssCode, fileRelativeDirPath, buildContext } = params;
+
+    const fixedCssCode = cssCode.replace(
+        /url\(["']?(\/[^/][^)"']+)["']?\)/g,
+        (match, assetFileAbsoluteUrlPathname) => {
+            if (buildContext.urlPathname !== undefined) {
+                if (!assetFileAbsoluteUrlPathname.startsWith(buildContext.urlPathname)) {
+                    // NOTE: Should never happen
+                    return match;
+                }
+                assetFileAbsoluteUrlPathname = assetFileAbsoluteUrlPathname.replace(
+                    buildContext.urlPathname,
+                    "/"
+                );
+            }
+
+            const assetFileRelativeUrlPathname = posix.relative(
+                fileRelativeDirPath.replace(/\\/g, "/"),
+                assetFileAbsoluteUrlPathname.replace(/^\//, "")
+            );
+
+            return `url(${assetFileRelativeUrlPathname})`;
+        }
+    );
 
-    return {
-        cssCodeToPrependInHead: [
-            ":root {",
-            ...Object.keys(cssGlobalsToDefine)
-                .map(cssVariableName =>
-                    [
-                        `--${cssVariableName}:`,
-                        cssGlobalsToDefine[cssVariableName].replace(
-                            new RegExp(
-                                `url\\(${(buildContext.urlPathname ?? "/").replace(
-                                    /\//g,
-                                    "\\/"
-                                )}`,
-                                "g"
-                            ),
-                            `url(\${url.resourcesPath}/${basenameOfTheKeycloakifyResourcesDir}/`
-                        )
-                    ].join(" ")
-                )
-                .map(line => `    ${line};`),
-            "}"
-        ].join("\n")
-    };
+    return { fixedCssCode };
 }

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

@@ -1,28 +0,0 @@
-import type { BuildContext } from "../../shared/buildContext";
-import { assert } from "tsafe/assert";
-import { basenameOfTheKeycloakifyResourcesDir } from "../../shared/constants";
-
-export type BuildContextLike = {
-    urlPathname: string | undefined;
-};
-
-assert<BuildContext extends BuildContextLike ? true : false>();
-
-export function replaceImportsInInlineCssCode(params: {
-    cssCode: string;
-    buildContext: BuildContextLike;
-}): {
-    fixedCssCode: string;
-} {
-    const { cssCode, buildContext } = params;
-
-    const fixedCssCode = cssCode.replace(
-        buildContext.urlPathname === undefined
-            ? /url\(["']?\/([^/][^)"']+)["']?\)/g
-            : new RegExp(`url\\(["']?${buildContext.urlPathname}([^)"']+)["']?\\)`, "g"),
-        (...[, group]) =>
-            `url(\${url.resourcesPath}/${basenameOfTheKeycloakifyResourcesDir}/${group})`
-    );
-
-    return { fixedCssCode };
-}