diff --git a/package.json b/package.json index d0f1a414..09a53d1f 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "keycloakify", - "version": "0.3.3", + "version": "0.3.4", "description": "Keycloak theme generator for Reacts app", "repository": { "type": "git", diff --git a/src/bin/build-keycloak-theme/replaceImportFromStatic.ts b/src/bin/build-keycloak-theme/replaceImportFromStatic.ts index 765f9c38..6673e2fb 100644 --- a/src/bin/build-keycloak-theme/replaceImportFromStatic.ts +++ b/src/bin/build-keycloak-theme/replaceImportFromStatic.ts @@ -32,7 +32,7 @@ export function replaceImportFromStaticInCssCode( const cssGlobalsToDefine: Record = {}; - new Set(cssCode.match(/(url\(\/[^)]+\))/g) ?? []) + new Set(cssCode.match(/url\(\/[^)]+\)[^;}]*/g) ?? []) .forEach(match => cssGlobalsToDefine[ "url" + crypto @@ -73,12 +73,8 @@ export function generateCssCodeToDefineGlobals( ...Object.keys(cssGlobalsToDefine) .map(cssVariableName => [ `--${cssVariableName}:`, - [ - "url(", - "${url.resourcesPath}/build" + - cssGlobalsToDefine[cssVariableName].match(/^url\(([^)]+)\)$/)![1], - ")" - ].join("") + cssGlobalsToDefine[cssVariableName] + .replace(/url\(/g, "url(${url.resourcesPath}/build") ].join(" ")) .map(line => ` ${line};`), "}"