Merge d24feb1 into 7844ed3

michaeltaranto · Oct 12, 2018 · 9671705 · 9671705
2 parents 7844ed3 + d24feb1
commit 9671705
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/src/index.js b/src/index.js
@@ -4,7 +4,7 @@ const varRgx = /^[@$]/;
 const followVar = (value, lessVars, dictionary) => {
   if (varRgx.test(value)) {
     // value is a variable
-    return followVar(lessVars[value] || dictionary[value.replace(varRgx, '')]);
+    return followVar(lessVars[value] || dictionary[value.replace(varRgx, '')], lessVars, dictionary);
   }
   return value;
 };

diff --git a/test/index.js b/test/index.js
@@ -157,3 +157,15 @@ it('should support sass variables with stripPrefix', () => expect(lessVarsToJS(`
   'font-stack': 'Helvetica, sans-serif',
   'primary-color': '#333'
 }));
+
+it('should recursively call followVar', () => expect(lessVarsToJS(`
+  @klm:    @hij;
+  @abc:    '#fff';
+  @def:    @abc;
+  @hij:    @def;
+`, { stripPrefix: true, resolveVariables: true })).to.deep.equal({
+  abc: '#fff',
+  def: '#fff',
+  hij: '#fff',
+  klm: '#fff'
+}));