[FIX] Variables: reuse of variables-collector

Author: petermuessig

lib/index.js

@@ -288,12 +288,12 @@ Builder.prototype.build = function(options) {
 					// generate the skeleton-css and the less-variables
 					const CSSVariablesCollectorPlugin = require("./plugin/css-variables-collector");
 					const oCSSVariablesCollector = new CSSVariablesCollectorPlugin(config);
-					const CSSVariablesUrlResolverPlugin = require("./plugin/css-variables-urlresolver");
-					const oCSSVariablesUrlResolverPlugin = new CSSVariablesUrlResolverPlugin(config);
+					const VariableCollector = require("./plugin/variable-collector");
+					const oVariableCollector = new VariableCollector(config);
 					result.cssSkeleton = tree.toCSS(Object.assign({}, options.compiler, {
-						plugins: [oCSSVariablesCollector, oCSSVariablesUrlResolverPlugin]
+						plugins: [oCSSVariablesCollector, oVariableCollector]
 					}));
-					const varsOverride = oCSSVariablesUrlResolverPlugin.getVariables();
+					const varsOverride = oVariableCollector.getAllVariables();
 					result.cssVariablesSource = oCSSVariablesCollector.toLessVariables(varsOverride);
 					if (oRTL) {
 						const oCSSVariablesCollectorRTL = new CSSVariablesCollectorPlugin(config);

lib/plugin/css-variables-collector.js

@@ -48,7 +48,7 @@ CSSVariablesCollectorPlugin.prototype = {
 			const override = this.vars[key].updateAfterEval && varsOverride[key] !== undefined;
 			/*
 			if (override) {
-				console.log(`Override variable "${key}" from "${this.vars[key].css}" to "${varsOverride[key].css}"`);
+				console.log(`Override variable "${key}" from "${this.vars[key].css}" to "${varsOverride[key]}"`);
 			}
 			*/
 			vars[key] = {