@ui5/webcomponents-theming 0.0.0-b93c2a321 → 0.0.0-c41f1b293

package/lib/generate-css-vars-usage-report/index.js

@@ -1,12 +1,15 @@
-const fs = require('fs');
-const path = require("path");
-const glob = require("glob");
-const beautify = require("json-beautify");
+import fs from "fs/promises";
+import path from "path";
+import beautify from "json-beautify";
+import { fileURLToPath } from 'url';
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
 
 const vars = new Set();
 
-const processFile = file => {
-	const content = fs.readFileSync(file);
+const processFile = async file => {
+	const content = await fs.readFile(file);
 	const matches = `${content}`.match(/var\(--sap[\-_A-Za-z0-9]+\)/g);
 	matches && matches.forEach(match => {
 		const cssVar = match.match(/--sap[\-_A-Za-z0-9]+/)[0];
@@ -14,14 +17,20 @@ const processFile = file => {
 	});
 };
 
-// Main
-glob.sync(path.join(__dirname, "../../../main/src/themes/**/*.css")).forEach(file => processFile(file));
+const generate = async () => {
+	const { globby } = await import("globby");
+
+	const mainFiles = await globby(path.join(__dirname, "../../../main/src/themes/**/*.css").replace(/\\/g, "/"));
+	const fioriFiles = await globby(path.join(__dirname, "../../../fiori/src/themes/**/*.css").replace(/\\/g, "/"));
+
+	await Promise.all([...mainFiles.map(processFile), ...fioriFiles.map(processFile)]);
 
-// Fiori
-glob.sync(path.join(__dirname, "../../../fiori/src/themes/**/*.css")).forEach(file => processFile(file));
+	const collator = new Intl.Collator(undefined, {numeric: true, sensitivity: 'base'});
+	const result = Array.from(vars).sort(collator.compare); // natural sort
 
-const collator = new Intl.Collator(undefined, {numeric: true, sensitivity: 'base'});
-const result = Array.from(vars).sort(collator.compare); // natural sort
+	return fs.writeFile(path.join(__dirname, "../../css-vars-usage.json"), beautify(result, null, 2, 100));
+}
 
-fs.writeFileSync(path.join(__dirname, "../../css-vars-usage.json"), beautify(result, null, 2, 100));
-console.log("CSS Vars usage report generated.");
+generate().then(() => {
+	console.log("CSS Vars usage report generated.");
+});

package/{package-scripts.js → package-scripts.cjs}

@@ -15,16 +15,13 @@ allThemes.forEach(theme => {
 	buildThemesCommands[`copy_${theme}_bundle`] = `copy-and-watch "src/themes/${theme}/parameters-bundle.css" dist/themes/${theme}/`;
 });
 
-const generateHash = resolve.sync("@ui5/webcomponents-tools/lib/hash/generate.js");
-const hashIsUpToDate = resolve.sync("@ui5/webcomponents-tools/lib/hash/upToDate.js");
-const UP_TO_DATE = `node "${hashIsUpToDate}" dist/ hash.txt && echo "Up to date."`;
-
 module.exports = {
 	scripts: {
-		clean: "rimraf dist",
+		clean: "rimraf dist && rimraf src/generated",
 		build: {
-			default: `${UP_TO_DATE} || nps clean build.src build.themes build.postcss build.jsonImports generateReport hash`,
+			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/`,
+			typescript: "tsc",
 			themes: {
 				default: `nps build.themes.prepare ${buildThemesCommandsNames}`,
 				...buildThemesCommands
@@ -33,6 +30,5 @@ module.exports = {
 			jsonImports: `node "${jsonImportsScript}" dist/generated/assets/themes dist/generated/json-imports`,
 		},
 		generateReport: `node "${generateReportScript}"`,
-		hash: `node ${generateHash} dist/ hash.txt`,
 	},
 };

package/package.json

@@ -1,10 +1,11 @@
 {
   "name": "@ui5/webcomponents-theming",
-  "version": "0.0.0-b93c2a321",
+  "version": "0.0.0-c41f1b293",
   "description": "UI5 Web Components: webcomponents.theming",
   "author": "SAP SE (https://www.sap.com)",
   "license": "Apache-2.0",
   "private": false,
+  "type": "module",
   "keywords": [
     "openui5",
     "sapui5",
@@ -20,7 +21,6 @@
     "build": "nps build",
     "start": "nps start",
     "verify": "node ./lib/verify-vars/index.js",
-    "hash": "nps hash",
     "prepublishOnly": "npm run clean && npm run build"
   },
   "repository": {
@@ -29,14 +29,14 @@
     "directory": "packages/theming"
   },
   "dependencies": {
-    "@sap-theming/theming-base-content": "11.1.38",
-    "@ui5/webcomponents-base": "0.0.0-b93c2a321"
+    "@sap-theming/theming-base-content": "11.4.2",
+    "@ui5/webcomponents-base": "0.0.0-c41f1b293"
   },
   "devDependencies": {
-    "@ui5/webcomponents-tools": "0.0.0-b93c2a321",
-    "chromedriver": "100.0.0",
+    "@ui5/webcomponents-tools": "0.0.0-c41f1b293",
+    "chromedriver": "112.0.0",
     "cssnano": "^4.1.11",
-    "glob": "^7.1.6",
+    "globby": "^13.1.1",
     "json-beautify": "^1.1.1",
     "nps": "^5.10.0",
     "postcss": "^8.4.5",

package/tsconfig.json

@@ -0,0 +1,15 @@
+{
+    "include": ["src/**/*"],
+    "compilerOptions": {
+      "target": "ES2021",
+      // Generate d.ts files
+      "declaration": true,
+      "outDir": "dist",
+      "skipLibCheck": true,
+      "sourceMap": true,
+      "inlineSources": true,
+      "strict": true,
+      "moduleResolution": "node",
+      "experimentalDecorators": true,
+    },
+}

package/hash.txt

@@ -1 +0,0 @@
-jTxjP4q8ZYzq4ZcbwLrh2rt5ZuI=