npm - keycloakify - Versions diffs - 10.0.0-rc.112 → 10.0.0-rc.114 - Mend

keycloakify 10.0.0-rc.112 → 10.0.0-rc.114

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 (3) hide show

package/bin/440.index.js +11 -5
package/package.json +1 -1
package/src/bin/keycloakify/replacers/replaceImportsInCssCode.ts +40 -26

package/bin/440.index.js CHANGED Viewed

@@ -355,23 +355,29 @@ const { readAssetsDirSync } = (() => {
 (0,assert.assert)();
 function replaceImportsInCssCode(params) {
     const { cssCode, cssFileRelativeDirPath, buildContext } = params;
-    const fixedCssCode = cssCode.replace(/url\(["']?(\/[^/][^)"']+)["']?\)/g, (match, assetFileAbsoluteUrlPathname) => {
+    let fixedCssCode = cssCode;
+    [
+        /url\("(\/[^/][^"]+)"\)/g,
+        /url\('(\/[^/][^']+)'\)/g,
+        /url\((\/[^/][^)]+)\)/g
+    ].forEach(regex => (fixedCssCode = fixedCssCode.replace(regex, (match, assetFileAbsoluteUrlPathname) => {
         if (buildContext.urlPathname !== undefined) {
             if (!assetFileAbsoluteUrlPathname.startsWith(buildContext.urlPathname)) {
                 // NOTE: Should never happen
                 return match;
             }
-            assetFileAbsoluteUrlPathname = assetFileAbsoluteUrlPathname.replace(buildContext.urlPathname, "/");
+            assetFileAbsoluteUrlPathname =
+                assetFileAbsoluteUrlPathname.replace(buildContext.urlPathname, "/");
         }
         inline_style_in_html: {
             if (cssFileRelativeDirPath !== undefined) {
                 break inline_style_in_html;
             }
-            return `url(\${xKeycloakify.resourcesPath}/${constants/* BASENAME_OF_KEYCLOAKIFY_RESOURCES_DIR */.F_}${assetFileAbsoluteUrlPathname})`;
+            return `url("\${xKeycloakify.resourcesPath}/${constants/* BASENAME_OF_KEYCLOAKIFY_RESOURCES_DIR */.F_}${assetFileAbsoluteUrlPathname}")`;
         }
         const assetFileRelativeUrlPathname = external_path_.posix.relative(cssFileRelativeDirPath.replace(/\\/g, "/"), assetFileAbsoluteUrlPathname.replace(/^\//, ""));
-        return `url(${assetFileRelativeUrlPathname})`;
-    });
+        return `url("${assetFileRelativeUrlPathname}")`;
+    })));
     return { fixedCssCode };
 }
 //# sourceMappingURL=replaceImportsInCssCode.js.map

package/package.json CHANGED Viewed

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

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

@@ -18,35 +18,49 @@ export function replaceImportsInCssCode(params: {
 } {
     const { cssCode, cssFileRelativeDirPath, 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,
-                    "/"
-                );
-            }
-            inline_style_in_html: {
-                if (cssFileRelativeDirPath !== undefined) {
-                    break inline_style_in_html;
-                }
+    let fixedCssCode = cssCode;
+    [
+        /url\("(\/[^/][^"]+)"\)/g,
+        /url\('(\/[^/][^']+)'\)/g,
+        /url\((\/[^/][^)]+)\)/g
+    ].forEach(
+        regex =>
+            (fixedCssCode = fixedCssCode.replace(
+                regex,
+                (match, assetFileAbsoluteUrlPathname) => {
+                    if (buildContext.urlPathname !== undefined) {
+                        if (
+                            !assetFileAbsoluteUrlPathname.startsWith(
+                                buildContext.urlPathname
+                            )
+                        ) {
+                            // NOTE: Should never happen
+                            return match;
+                        }
+                        assetFileAbsoluteUrlPathname =
+                            assetFileAbsoluteUrlPathname.replace(
+                                buildContext.urlPathname,
+                                "/"
+                            );
+                    }
-                return `url(\${xKeycloakify.resourcesPath}/${BASENAME_OF_KEYCLOAKIFY_RESOURCES_DIR}${assetFileAbsoluteUrlPathname})`;
-            }
+                    inline_style_in_html: {
+                        if (cssFileRelativeDirPath !== undefined) {
+                            break inline_style_in_html;
+                        }
-            const assetFileRelativeUrlPathname = posix.relative(
-                cssFileRelativeDirPath.replace(/\\/g, "/"),
-                assetFileAbsoluteUrlPathname.replace(/^\//, "")
-            );
+                        return `url("\${xKeycloakify.resourcesPath}/${BASENAME_OF_KEYCLOAKIFY_RESOURCES_DIR}${assetFileAbsoluteUrlPathname}")`;
+                    }
-            return `url(${assetFileRelativeUrlPathname})`;
-        }
+                    const assetFileRelativeUrlPathname = posix.relative(
+                        cssFileRelativeDirPath.replace(/\\/g, "/"),
+                        assetFileAbsoluteUrlPathname.replace(/^\//, "")
+                    );
+                    return `url("${assetFileRelativeUrlPathname}")`;
+                }
+            ))
     );
     return { fixedCssCode };