[FIX] Variables: handle variables in the proper order

Author: petermuessig

lib/plugin/css-variables-collector.js

@@ -150,6 +150,20 @@ CSSVariablesCollectorPlugin.prototype = {
 	},
 
 	visitRule(node, visitArgs) {
+		// check rule for being a variable declaration
+		const isVarDeclaration = typeof node.name === "string" && node.name.startsWith("@");
+		if (!this._isInMixinOrParen() && isVarDeclaration) {
+			// add the variable declaration to the list of vars
+			const varName = node.name.substr(1);
+			const isVarInLib = this._isVarInLibrary({
+				varName,
+				filename: node.currentFileInfo.filename
+			});
+			this.vars[varName] = {
+				css: this._getCSS(node.value),
+				export: isVarInLib
+			};
+		}
 		// store the rule context for the call variable extraction
 		this.ruleStack.push(node);
 		return node;
@@ -185,24 +199,6 @@ CSSVariablesCollectorPlugin.prototype = {
 		return node;
 	},
 
-	visitRuleset(node, visitArgs) {
-		node.rules.forEach((value) => {
-			const isVarDeclaration = value instanceof less.tree.Rule && typeof value.name === "string" && value.name.startsWith("@");
-			if (!this._isInMixinOrParen() && isVarDeclaration) {
-				// add the variable declaration to the list of vars
-				const varName = value.name.substr(1);
-				this.vars[varName] = {
-					css: this._getCSS(value.value),
-					export: this._isVarInLibrary({
-						varName,
-						filename: value.currentFileInfo.filename
-					})
-				};
-			}
-		});
-		return node;
-	},
-
 	visitUrl(node, visitArgs) {
 		// we mark the less variables which should be updated after eval
 		// => strangewise less variables with "none" values are also urls