[FIX] Variables: improved detection of library variables

Author: petermuessig

lib/index.js

@@ -191,6 +191,7 @@ Builder.prototype.build = function(options) {
 		// inject the library name as prefix (e.g. "sap.m" as "_sap_m")
 		if (options.library && typeof options.library.name === "string") {
 			const libName = config.libName = options.library.name;
+			config.libPath = libName.replace(/\./g, "/");
 			config.prefix = "_" + libName.replace(/\./g, "_") + "_";
 		}
 

lib/plugin/css-variables-collector.js

@@ -27,10 +27,11 @@ CSSVariablesCollectorPlugin.prototype = {
 		return this.ruleStack.length > 0 && !this.ruleStack[this.ruleStack.length - 1].variable;
 	},
 
-	_isInGlobalOrBaseImport() {
-		return this.config.libName !== "sap.ui.core" && this.importStack.filter((importNode) => {
-			return /\/(?:global|base)\.less$/.test(importNode.importedFilename);
-		}).length > 0;
+	_isVarInLibrary() {
+		// the last less file defines the location of the css variable and this must
+		// be in the path of the current library, otherwise it is an external variable
+		const regexp = new RegExp(`^/resources/${this.config.libPath}/themes/`);
+		return this.importStack.length > 0 ? regexp.test(this.importStack[this.importStack.length - 1].importedFilename) : true;
 	},
 
 	_isRelevant() {
@@ -109,7 +110,7 @@ CSSVariablesCollectorPlugin.prototype = {
 			}
 			this.calcVars[newName] = {
 				css: css,
-				export: !this._isInGlobalOrBaseImport()
+				export: this._isVarInLibrary()
 			};
 			return new less.tree.Call("var", [new less.tree.Anonymous("--" + newName, node.index, node.currentFileInfo, node.mapLines)]);
 		}
@@ -187,7 +188,7 @@ CSSVariablesCollectorPlugin.prototype = {
 				// add the variable declaration to the list of vars
 				this.vars[value.name.substr(1)] = {
 					css: this._getCSS(value.value),
-					export: !this._isInGlobalOrBaseImport()
+					export: this._isVarInLibrary()
 				};
 			}
 		});