@ui5/webcomponents-tools 2.14.0-rc.2 → 2.14.0-rc.3

package/CHANGELOG.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [2.14.0-rc.3](https://github.com/SAP/ui5-webcomponents/compare/v2.14.0-rc.2...v2.14.0-rc.3) (2025-08-22)
+
+
+### Bug Fixes
+
+* **tools:** correct strip unused theming base content ([#12133](https://github.com/SAP/ui5-webcomponents/issues/12133)) ([a97901d](https://github.com/SAP/ui5-webcomponents/commit/a97901da861836a5567cd4076a34bb07522ef7ba))
+
+
+
+
+
 # [2.14.0-rc.2](https://github.com/SAP/ui5-webcomponents/compare/v2.14.0-rc.1...v2.14.0-rc.2) (2025-08-21)
 
 

package/lib/css-processors/css-processor-themes.mjs

@@ -5,7 +5,7 @@ import * as path from "path";
 import { writeFile, mkdir } from "fs/promises";
 import postcss from "postcss";
 import combineDuplicatedSelectors from "../postcss-combine-duplicated-selectors/index.js"
-import { writeFileIfChanged, stripThemingBaseContent, getFileContent } from "./shared.mjs";
+import { writeFileIfChanged, getFileContent } from "./shared.mjs";
 import scopeVariables from "./scope-variables.mjs";
 
 const tsMode = process.env.UI5_TS === "true";
@@ -13,19 +13,32 @@ const extension = tsMode ? ".css.ts" : ".css.js";
 
 const packageJSON = JSON.parse(fs.readFileSync("./package.json"))
 
-let inputFiles = await globby("src/**/parameters-bundle.css");
+const inputFiles = await globby([
+    "src/**/parameters-bundle.css",
+]);
 const restArgs = process.argv.slice(2);
 
-const removeDuplicateSelectors = async (text) => {
-    const result = await postcss(combineDuplicatedSelectors).process(text);
-    return result.css;
-}
+const processThemingPackageFile = async (f) => {
+    const selector = ':root';
+    const result = await postcss().process(f.text);
+
+    const newRule = postcss.rule({ selector });
 
-const processFontFace = (text) => {
-    const declarationExpr = /@font-face\s*{[^}]*}/g;
+    result.root.walkRules(selector, rule => {
+        rule.walkDecls(decl => {
+            if (!decl.prop.startsWith('--sapFontUrl')) {
+                newRule.append(decl.clone());
+            }
+        });
+    });
+
+    return newRule.toString();
+};
 
-    // remove declarations from source, they are extracted in base package
-    return text.replaceAll(declarationExpr, '');
+const processComponentPackageFile = async (f) => {
+    const result = await postcss(combineDuplicatedSelectors).process(f.text);
+
+    return scopeVariables(result.css, packageJSON, f.path);
 }
 
 let scopingPlugin = {
@@ -35,23 +48,14 @@ let scopingPlugin = {
 
         build.onEnd(result => {
             result.outputFiles.forEach(async f => {
-                // remove font-face declarations
-                let newText = processFontFace(f.text);
-
-                // remove duplicate selectors
-                newText = await removeDuplicateSelectors(newText);
-
-                // strip unnecessary theming-base-content
-                newText = stripThemingBaseContent(newText);
+                let newText = f.path.includes("packages/theming") ? await processThemingPackageFile(f) : await processComponentPackageFile(f);
 
-                // scoping
-                newText = scopeVariables(newText, packageJSON, f.path);
-                await mkdir(path.dirname(f.path), {recursive: true});
+                await mkdir(path.dirname(f.path), { recursive: true });
                 writeFile(f.path, newText);
 
                 // JSON
                 const jsonPath = f.path.replace(/dist[\/\\]css/, "dist/generated/assets").replace(".css", ".css.json");
-                await mkdir(path.dirname(jsonPath), {recursive: true});
+                await mkdir(path.dirname(jsonPath), { recursive: true });
                 writeFileIfChanged(jsonPath, JSON.stringify(newText));
 
                 // JS/TS

package/lib/css-processors/shared.mjs

@@ -24,16 +24,6 @@ const writeFileIfChanged = async (fileName, content) => {
     }
 }
 
-// strips the unnecessary theming data coming from @sap-theming/theming-base-content and leaves only the css parameters
-const stripThemingBaseContent = css => {
-	css = css.replace(/\.sapThemeMeta[\s\S]*?:root/, ":root");
-	css = css.replace(/\.background-image.*{.*}/, "");
-	css = css.replace(/\.sapContrast[ ]*:root[\s\S]*?}/, "");
-	css = css.replace(/--sapFontUrl.*\);?/, "");
-	return css;
-}
-
-
 const DEFAULT_THEME = assets.themes.default;
 
 const getDefaultThemeCode = packageName => {
@@ -42,8 +32,8 @@ const getDefaultThemeCode = packageName => {
 import defaultThemeBase from "@ui5/webcomponents-theming/dist/generated/themes/${DEFAULT_THEME}/parameters-bundle.css.js";
 import defaultTheme from "./${DEFAULT_THEME}/parameters-bundle.css.js";
 
-registerThemePropertiesLoader("@ui5/webcomponents-theming", "${DEFAULT_THEME}", async () => defaultThemeBase);
-registerThemePropertiesLoader("${packageName}", "${DEFAULT_THEME}", async () => defaultTheme);
+registerThemePropertiesLoader("@" + "ui5" + "/" + "webcomponents-theming", "${DEFAULT_THEME}", async () => defaultThemeBase);
+registerThemePropertiesLoader(${ packageName.split("").map(c => `"${c}"`).join (" + ") }, "${DEFAULT_THEME}", async () => defaultTheme);
 `;
 };
 
@@ -53,4 +43,4 @@ const getFileContent = (packageName, css, includeDefaultTheme) => {
 }
 
 
-export { writeFileIfChanged, stripThemingBaseContent, getFileContent}
+export { writeFileIfChanged, getFileContent}

package/lib/generate-json-imports/i18n.js

@@ -27,7 +27,7 @@ const importAndCheck = async (localeId) => {
 const localeIds = [${languagesKeysStringArray}];
 
 localeIds.forEach(localeId => {
-	registerI18nLoader("${packageName}", localeId, importAndCheck);
+	registerI18nLoader(${ packageName.split("").map(c => `"${c}"`).join (" + ") }, localeId, importAndCheck);
 });
 `;
 }

package/lib/generate-json-imports/themes.js

@@ -11,10 +11,10 @@ const generate = async () => {
 	const outputFileDynamicImportJSONAttr = path.normalize(`${process.argv[3]}/Themes-node.${ext}`);
 	const outputFileFetchMetaResolve = path.normalize(`${process.argv[3]}/Themes-fetch.${ext}`);
 
-// All supported optional themes
+	// All supported optional themes
 	const allThemes = assets.themes.all;
 
-// All themes present in the file system
+	// All themes present in the file system
 	const dirs = await fs.readdir(inputFolder);
 	const themesOnFileSystem = dirs.map(dir => {
 		const matches = dir.match(/sap_.*$/);
@@ -28,7 +28,7 @@ const generate = async () => {
 	const dynamicImportJSONAttrLines = themesOnFileSystem.map(theme => `\t\tcase "${theme}": return (await import(/* webpackChunkName: "${packageName.replace("@", "").replace("/", "-")}-${theme.replace("_", "-")}-parameters-bundle" */"../assets/themes/${theme}/parameters-bundle.css.json", {with: { type: 'json'}})).default;`).join("\n");
 	const fetchMetaResolveLines = themesOnFileSystem.map(theme => `\t\tcase "${theme}": return (await fetch(new URL("../assets/themes/${theme}/parameters-bundle.css.json", import.meta.url))).json();`).join("\n");
 
-// dynamic imports file content
+	// dynamic imports file content
 	const contentDynamic = function (lines) {
 		return `// @ts-nocheck
 import { registerThemePropertiesLoader } from "@ui5/webcomponents-base/dist/asset-registries/Themes.js";
@@ -49,7 +49,7 @@ const loadAndCheck = async (themeName) => {
 };
 
 ${availableThemesArray}
-  .forEach(themeName => registerThemePropertiesLoader("${packageName}", themeName, loadAndCheck));
+  .forEach(themeName => registerThemePropertiesLoader(${ packageName.split("").map(c => `"${c}"`).join (" + ") }, themeName, loadAndCheck));
 `;
 	}
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ui5/webcomponents-tools",
-  "version": "2.14.0-rc.2",
+  "version": "2.14.0-rc.3",
   "description": "UI5 Web Components: webcomponents.tools",
   "author": "SAP SE (https://www.sap.com)",
   "license": "Apache-2.0",
@@ -83,5 +83,5 @@
     "esbuild": "^0.25.0",
     "yargs": "^17.5.1"
   },
-  "gitHead": "5fe95abc08bc7cfd2d061e31cda5662ad37db4f6"
+  "gitHead": "c1c74f2bd283434a0610b3b9bf9ab0bc9eb682b7"
 }