@ui5/webcomponents-tools 0.0.0-41ab6cd28 → 0.0.0-4237771ff

package/lib/jsdoc/preprocess.js

@@ -116,7 +116,7 @@ const processComponentFile = async (fileName) => {
 	const destFileName = fileName.replace(sourceDir, inputDir).replace(/\.ts$/, ".js");
 	let jsFileContent = `${await fs.readFile(destFileName)}`;
 
-	const classDefinitionRegExp = new RegExp(`let.*? = class`, "gm");
+	const classDefinitionRegExp = new RegExp(`(let.*? = class)|(^class.*?)`, "gm");
 	let classDefinitionMatch = jsFileContent.match(classDefinitionRegExp);
 	if (!classDefinitionMatch) {
 		return; // not a file, generated by typescript, nothing to do here

package/lib/postcss-combine-duplicated-selectors/index.js

@@ -154,22 +154,29 @@ module.exports = (options) => {
 							options.removeDuplicatedProperties ||
 							options.removeDuplicatedValues
 						) {
-							removeDupProperties(
-								destination,
-								options.removeDuplicatedValues,
-							);
+							// removeDupProperties(
+							// 	destination,
+							// 	options.removeDuplicatedValues,
+							// );
 						}
 					} else {
 						if (
 							options.removeDuplicatedProperties ||
 							options.removeDuplicatedValues
 						) {
-							removeDupProperties(rule, options.removeDuplicatedValues);
+							// removeDupProperties(rule, options.removeDuplicatedValues);
 						}
 						// add new selector to symbol table
 						map.set(selector, rule);
 					}
 				},
+				OnceExit(root) {
+					root.nodes.forEach(node => {
+						if (node.type === "rule") {
+							removeDupProperties(node, options.removeDuplicatedValues);
+						}
+					})
+				}
 			};
 		},
 	};

package/lib/scoping/get-all-tags.js

@@ -10,7 +10,7 @@ const getTag = file => {
 
 const getPackageTags = (packageDir) => {
 	const srcDir = path.join(packageDir, "src/");
-	return glob.sync(path.join(srcDir, "/**/*.js")).flatMap(file => {
+	return glob.sync(path.join(srcDir, "/**/*.ts")).flatMap(file => {
 		const tag = getTag(file);
 		return [tag];
 	}).filter(item => !!item);

package/lib/scoping/scope-test-pages.js

@@ -18,6 +18,7 @@ const replaceTagsHTML = content => {
 
 // Replace tags in any content
 const replaceTagsAny = content => {
+	console.log(tags.length);
 	tags.forEach(tag => {
 		content = content.replace(new RegExp(`(^|[^\-_A-Za-z0-9])(${tag})([^\-_A-Za-z0-9]|$)`, "g"), `$1$2-${suffix}$3`);
 	});
@@ -27,7 +28,7 @@ const replaceTagsAny = content => {
 // Replace bundle names and HTML tag names in test pages
 glob.sync(path.join(root, "/**/*.html")).forEach(file => {
 	let content = String(fs.readFileSync(file));
-	content = content.replace(/bundle\.(.*?)\.js/g, `../bundle.scoped.$1.js`);
+	content = content.replace("%VITE_BUNDLE_PATH%", "%VITE_BUNDLE_PATH_SCOPED%");
 	content = replaceTagsHTML(content);
 	fs.writeFileSync(file, content);
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ui5/webcomponents-tools",
-  "version": "0.0.0-41ab6cd28",
+  "version": "0.0.0-4237771ff",
   "description": "UI5 Web Components: webcomponents.tools",
   "author": "SAP SE (https://www.sap.com)",
   "license": "Apache-2.0",
@@ -21,10 +21,9 @@
     "directory": "packages/tools"
   },
   "dependencies": {
-    "@typescript-eslint/eslint-plugin": "^5.42.1",
-    "@typescript-eslint/parser": "^5.42.1",
+    "@typescript-eslint/eslint-plugin": "^6.9.0",
+    "@typescript-eslint/parser": "^6.9.0",
     "@wdio/cli": "^7.19.7",
-    "@wdio/devtools-service": "^7.19.7",
     "@wdio/dot-reporter": "^7.19.7",
     "@wdio/local-runner": "^7.19.7",
     "@wdio/mocha-framework": "^7.19.7",
@@ -37,7 +36,6 @@
     "command-line-args": "^5.1.1",
     "concurrently": "^6.0.0",
     "cross-env": "^7.0.3",
-    "cssnano": "^4.1.11",
     "escodegen": "^2.0.0",
     "eslint": "^7.22.0",
     "eslint-config-airbnb-base": "^14.2.1",
@@ -52,11 +50,9 @@
     "jsdoc": "^3.6.6",
     "json-beautify": "^1.1.1",
     "mkdirp": "^1.0.4",
-    "modify-selectors": "^2.0.0",
     "nps": "^5.10.0",
     "postcss": "^8.4.5",
     "postcss-cli": "^9.1.0",
-    "postcss-import": "^14.0.2",
     "postcss-selector-parser": "^6.0.10",
     "prompts": "^2.4.2",
     "properties-reader": "^2.2.0",
@@ -64,9 +60,8 @@
     "resolve": "^1.20.0",
     "rimraf": "^3.0.2",
     "slash": "3.0.0",
-    "vite": "^3.0.4",
-    "wdio-chromedriver-service": "^7.3.2",
-    "zx": "^4.3.0"
+    "vite": "^4.4.9",
+    "wdio-chromedriver-service": "^7.3.2"
   },
   "peerDependencies": {
     "chromedriver": "*",
@@ -78,6 +73,7 @@
     }
   },
   "devDependencies": {
+    "esbuild": "^0.19.9",
     "yargs": "^17.5.1"
   }
 }

package/lib/postcss-css-to-json/index.js

@@ -1,47 +0,0 @@
-const fs = require('fs');
-const path = require('path');
-const mkdirp = require('mkdirp');
-
-const proccessCSS = 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;
-}
-
-module.exports = function (opts) {
-	opts = opts || {};
-
-	return {
-		postcssPlugin: 'postcss-css-to-json',
-		Once (root) {
-			let css = root.toString();
-			css = proccessCSS(css);
-
-			const targetFile = root.source.input.from.replace(`/${opts.toReplace}/`, "/dist/generated/assets/").replace(`\\${opts.toReplace}\\`, "\\dist\\generated\\assets\\");
-			mkdirp.sync(path.dirname(targetFile));
-
-			const filePath = `${targetFile}.json`;
-			const data = {
-				packageName: opts.packageName,
-				fileName: targetFile.substr(targetFile.lastIndexOf("themes")),
-				content: css
-			};
-			// it seems slower to read the old content, but writing the same content with no real changes
-			// (as in initial build and then watch mode) will cause an unnecessary dev server refresh
-			let oldContent = "";
-			try {
-				oldContent = fs.readFileSync(filePath).toString();
-			} catch (e) {
-				// file not found
-			}
-			const content = JSON.stringify({_: data});
-			if (content !== oldContent) {
-				fs.writeFileSync(filePath, content);
-			}
-		}
-	};
-};
-
-module.exports.postcss = true;

package/lib/postcss-new-files/index.js

@@ -1,36 +0,0 @@
-const chokidar = require("chokidar");
-const commandLineArgs = require("command-line-args");
-const { exec } = require("child_process");
-
-const options = commandLineArgs([
-	{ name: "srcFiles", type: String },
-]);
-
-const runPostcss = path => {
-	let command = `postcss ${path} --config config/postcss.components --base src --dir dist/css/`;
-	console.log(`Executing: ${command}`);
-	exec(command, (err, stdout, stderr) => {
-		if (err) {
-			console.log(`Could not run postcss for ${path}. Error: ${err}`);
-		}
-	});
-
-	command = `${command} -w`;
-	console.log(`Executing: ${command}`);
-	exec(command, (err, stdout, stderr) => {
-		if (err) {
-			console.log(`Could not run postcss in watch mode for ${path}. Error: ${err}`);
-		}
-	});
-};
-
-let ready = false; // Do nothing until the ready event has been fired (we don't want to recompile all files initially)
-const watcher = chokidar.watch(options.srcFiles);
-watcher.on("ready", () => {
-	ready = true; // Initial scan is over -> waiting for new files
-});
-watcher.on("add", path => {
-	if (ready) {
-		runPostcss(path);
-	}
-});

package/lib/postcss-p/postcss-p.mjs

@@ -1,14 +0,0 @@
-import 'zx/globals';
-
-// don't print executed commands and their output
-$.verbose = false;
-
-const inputFiles = await globby("src/**/parameters-bundle.css");
-
-const restArgs = process.argv.slice(2);
-
-// run all postcss processes in parallel as passing the glob directly to postcss makes them processed sequentially.
-// and the amount of imports give a big speed up when run in parallel
-await Promise.all(inputFiles.map(file => {
-  return $`postcss ${file} --config config/postcss.themes --base src --dir dist/css/ ${restArgs}`;
-}));