[INTERNAL] Variables: use regex for library-local var detection

Author: petermuessig

lib/plugin/css-variables-collector.js

@@ -32,8 +32,9 @@ CSSVariablesCollectorPlugin.prototype = {
 		// for libraries we check that the file is within the libraries theme path
 		// in all other cases with no filename (indicates calculated variables)
 		// or in case of variables in standalone less files we just include them!
+		const regex = new RegExp(`/${this.config.libPath}/themes/`);
 		const include = !filename ||
-			(this.config.libPath ? filename.startsWith(`/resources/${this.config.libPath}/themes/`) : true);
+			(this.config.libPath ? regex.test(filename) : true);
 		return include;
 	},
 
@@ -45,9 +46,11 @@ CSSVariablesCollectorPlugin.prototype = {
 		const vars = {};
 		Object.keys(this.vars).forEach((key) => {
 			const override = this.vars[key].updateAfterEval && varsOverride[key] !== undefined;
-			if (override && process && process.env && process.env.LESS_OPENUI5_CSSVARS_REPORT_OVERRIDE) {
+			/*
+			if (override) {
 				console.log(`Override variable "${key}" from "${this.vars[key].css}" to "${varsOverride[key].css}"`);
 			}
+			*/
 			vars[key] = {
 				css: override ? varsOverride[key].css : this.vars[key].css,
 				export: this.vars[key].export