@ui5/webcomponents-theming 0.0.0-33967dd12 → 0.0.0-33e059bcd

package/package-scripts.cjs

@@ -1,33 +1,22 @@
 const resolve = require("resolve");
 const assets = require('@ui5/webcomponents-tools/assets-meta.js');
+const path = require('path');
 
 const jsonImportsScript = resolve.sync("@ui5/webcomponents-tools/lib/generate-json-imports/themes.js");
 const generateReportScript = resolve.sync("@ui5/webcomponents-theming/lib/generate-css-vars-usage-report/index.js");
 
-const allThemes = assets.themes.all;
-const buildThemesCommands = {};
-const buildThemesCommandsNames = allThemes.map(theme => `build.themes.${theme}`).join(" ");
-
-buildThemesCommands["prepare"] = allThemes.map(theme => `mkdirp dist/themes/${theme}`).join(" && ");
-allThemes.forEach(theme => {
-	buildThemesCommands[theme] = `nps build.themes.copy_${theme}_vars build.themes.copy_${theme}_bundle`;
-	buildThemesCommands[`copy_${theme}_vars`] = `copy-and-watch "../../node_modules/@sap-theming/theming-base-content/content/Base/baseLib/${theme.replace("sap_horizon_exp", "sap_horizon")}/css_variables.css" dist/themes/${theme}/`;
-	buildThemesCommands[`copy_${theme}_bundle`] = `copy-and-watch "src/themes/${theme}/parameters-bundle.css" dist/themes/${theme}/`;
-});
+const LIB = path.join(__dirname, `../tools/lib/`);
 
 module.exports = {
 	scripts: {
 		clean: "rimraf dist && rimraf src/generated",
+		generate: `cross-env UI5_TS=true nps build.postcss build.jsonImports`,
 		build: {
-			default: `cross-env UI5_TS=true nps clean build.src build.themes build.postcss build.jsonImports build.typescript generateReport`,
-			src: `copy-and-watch "src/**/*.js" dist/`,
+			default: `cross-env UI5_TS=true nps clean build.src build.postcss build.jsonImports build.typescript generateReport`,
+			src: `copy-and-watch "src/**/*.{json}" dist/`,
 			typescript: "tsc",
-			themes: {
-				default: `nps build.themes.prepare ${buildThemesCommandsNames}`,
-				...buildThemesCommands
-			},
-			postcss: "postcss dist/**/parameters-bundle.css --config config/postcss.themes --base dist/ --dir dist/css/",
-			jsonImports: `node "${jsonImportsScript}" dist/generated/assets/themes dist/generated/json-imports`,
+			postcss: `node "${LIB}/css-processors/css-processor-themes.mjs"`,
+			jsonImports: `node "${jsonImportsScript}" dist/generated/assets/themes src/generated/json-imports`,
 		},
 		generateReport: `node "${generateReportScript}"`,
 	},

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ui5/webcomponents-theming",
-  "version": "0.0.0-33967dd12",
+  "version": "0.0.0-33e059bcd",
   "description": "UI5 Web Components: webcomponents.theming",
   "author": "SAP SE (https://www.sap.com)",
   "license": "Apache-2.0",
@@ -19,9 +19,10 @@
   "scripts": {
     "clean": "nps clean",
     "build": "nps build",
+    "generate": "nps generate",
     "start": "nps start",
     "verify": "node ./lib/verify-vars/index.js",
-    "prepublishOnly": "npm run clean && npm run build"
+    "prepublishOnly": "tsc -b"
   },
   "repository": {
     "type": "git",
@@ -29,12 +30,11 @@
     "directory": "packages/theming"
   },
   "dependencies": {
-    "@sap-theming/theming-base-content": "11.5.0",
-    "@ui5/webcomponents-base": "0.0.0-33967dd12"
+    "@sap-theming/theming-base-content": "11.10.0",
+    "@ui5/webcomponents-base": "0.0.0-33e059bcd"
   },
   "devDependencies": {
-    "@ui5/webcomponents-tools": "0.0.0-33967dd12",
-    "cssnano": "^6.0.1",
+    "@ui5/webcomponents-tools": "0.0.0-33e059bcd",
     "globby": "^13.1.1",
     "json-beautify": "^1.1.1",
     "nps": "^5.10.0",

package/tsconfig.json

@@ -2,6 +2,7 @@
     "include": ["src/**/*"],
     "compilerOptions": {
       "target": "ES2021",
+      "lib": ["DOM", "DOM.Iterable", "ES2023"],
       // Generate d.ts files
       "declaration": true,
       "outDir": "dist",
@@ -11,5 +12,14 @@
       "strict": true,
       "moduleResolution": "node",
       "experimentalDecorators": true,
+      "composite": true,
+      "rootDir": "src",
+      "tsBuildInfoFile": "dist/.tsbuildinfo",
+      "paths": {
+        "@ui5/webcomponents-base/dist/*": ["../base/src/*"],
+      },
     },
+    "references": [
+      { "path": "../base" },
+    ],
 }

package/config/postcss.themes/postcss.config.cjs

@@ -1,24 +0,0 @@
-const combineSelectors = require('@ui5/webcomponents-tools/lib/postcss-combine-duplicated-selectors/index.js');
-const postcssImport = require('postcss-import');
-const cssnano = require('cssnano');
-const postcssCSStoJSON = require('@ui5/webcomponents-tools/lib/postcss-css-to-json/index.js');
-const postcssCSStoESM = require('@ui5/webcomponents-tools/lib/postcss-css-to-esm/index.js');
-
-module.exports = {
-	plugins: [
-		postcssImport(),
-		combineSelectors({
-			removeDuplicatedProperties: true
-		}),
-		cssnano({
-				preset: [
-					'default', {
-						mergeLonghand: false, // https://github.com/cssnano/cssnano/issues/675
-					},
-				]
-			},
-		),
-		postcssCSStoJSON({ toReplace: `dist`, packageName: "@ui5/webcomponents-theming" }),
-		postcssCSStoESM({ toReplace: `dist`, packageName: "@ui5/webcomponents-theming" }),
-	]
-};