less 3.8.0 → 3.8.1

package/test/css/colors.css

@@ -23,7 +23,7 @@
   color: #1a0000ff;
 }
 #alpha #hsla {
-  color: rgba(61, 45, 41, 0.6);
+  color: hsla(11, 20%, 20%, 0.6);
 }
 #overflow .a {
   color: #000000;
@@ -47,10 +47,10 @@
   color: #333333;
 }
 #808080 {
-  color: #808080;
+  color: hsl(0, 0%, 50%);
 }
 #00ff00 {
-  color: #00ff00;
+  color: hsl(120, 100%, 50%);
 }
 .lightenblue {
   color: #3333ff;
@@ -85,3 +85,20 @@
   color: 255;
   border-color: rgba(255, 0, 0, 0.5);
 }
+#rrggbbaa {
+  test-1: #55FF5599;
+  test-2: #5F59;
+  test-3: rgba(136, 255, 136, 0.6);
+  test-4: rgba(85, 255, 85, 0.1);
+  test-5: rgba(85, 255, 85, 0.6);
+  test-6: rgba(85, 255, 85, 0.6);
+  test-7: rgba(85, 255, 85, 0.5);
+  test-8: rgba(var(--color-accent), 0.2);
+  test-9: rgb(var(--color-accent));
+  test-9: hsla(var(--color-accent));
+  test-10: #55FF5599;
+  test-11: hsla(120, 100%, 66.66666667%, 0.6);
+  test-12: hsla(120, 100%, 66.66666667%, 0.5);
+  --semi-transparent-dark-background: #001e00ee;
+  --semi-transparent-dark-background-2: #001e00;
+}

package/test/css/css-escapes.css

@@ -25,3 +25,6 @@ ng\:form {
 .bootstrap {
   background-color: #000 \9;
 }
+textarea {
+  font-family: 'helvetica neue', 'wenquanyi micro hei', \5FAE\8F6F\96C5\9ED1, \5B8B\4F53, sans-serif;
+}

package/test/css/functions.css

@@ -17,9 +17,9 @@
   desaturate: #29332f;
   desaturate-relative: #233930;
   greyscale: #2e2e2e;
-  hsl-clamp: #ffffff;
-  spin-p: #bf6a40;
-  spin-n: #bf4055;
+  hsl-clamp: hsl(0, 0%, 100%);
+  spin-p: hsl(20, 50%, 50%);
+  spin-n: hsl(350, 50%, 50%);
   luma-white: 100%;
   luma-black: 0%;
   luma-black-alpha: 0%;
@@ -168,7 +168,7 @@
   case-insensitive-2: true;
 }
 #alpha {
-  alpha: rgba(153, 94, 51, 0.6);
+  alpha: hsla(25, 50%, 40%, 0.6);
   alpha2: 0.5;
   alpha3: 0;
 }

package/test/less/colors.less

@@ -96,3 +96,21 @@
   color: red(rgb(100%, 0, 0));
   border-color: rgba(100%, 0, 0, 50%);
 }
+
+#rrggbbaa {
+  test-1: #55FF5599;
+  test-2: #5F59;
+  test-3: lighten(#55FF5599, 10%);
+  test-4: fade(#5F59, 10%);
+  test-5: rgba(#55FF5599);
+  test-6: rgba(#5F59);
+  test-7: rgba(#5F59, 0.5);
+  test-8: rgba(var(--color-accent), 0.2);
+  test-9: rgb(var(--color-accent));
+  test-9: hsla(var(--color-accent));
+  test-10: color('#55FF5599');
+  test-11: hsla(#5F59);
+  test-12: hsla(#5F59, 0.5);
+  --semi-transparent-dark-background: #001e00ee;
+  --semi-transparent-dark-background-2: rgba(0, 30, 0, 238); // invalid opacity will be capped
+}

package/test/less/css-escapes.less

@@ -35,4 +35,8 @@ ng\:form {
 // In Bootstrap v3
 .bootstrap {
     background-color: #000 \9;
+}
+
+textarea {
+    font-family: 'helvetica neue','wenquanyi micro hei',\5FAE\8F6F\96C5\9ED1, \5B8B\4F53, sans-serif;
 }

package/test/less/errors/color-func-invalid-color.txt

@@ -1,4 +1,4 @@
-ArgumentError: error evaluating function `color`: argument must be a color keyword or 3/6 digit hex e.g. #FFF in {path}color-func-invalid-color.less on line 2, column 10:
+ArgumentError: error evaluating function `color`: argument must be a color keyword or 3|4|6|8 digit hex e.g. #FFF in {path}color-func-invalid-color.less on line 2, column 10:
 1 .test {
 2   color: color("NOT A COLOR");
 3 }

package/test/less/sourcemaps/custom-props.less

@@ -0,0 +1,8 @@
+@color: var(--foo);
+
+body {
+	border-left: 1px solid @color;
+	width: calc(50% - 5px);
+	border-top: 1px solid @color;
+}
+

package/test/less-bom/colors.less

@@ -96,3 +96,21 @@
   color: red(rgb(100%, 0, 0));
   border-color: rgba(100%, 0, 0, 50%);
 }
+
+#rrggbbaa {
+  test-1: #55FF5599;
+  test-2: #5F59;
+  test-3: lighten(#55FF5599, 10%);
+  test-4: fade(#5F59, 10%);
+  test-5: rgba(#55FF5599);
+  test-6: rgba(#5F59);
+  test-7: rgba(#5F59, 0.5);
+  test-8: rgba(var(--color-accent), 0.2);
+  test-9: rgb(var(--color-accent));
+  test-9: hsla(var(--color-accent));
+  test-10: color('#55FF5599');
+  test-11: hsla(#5F59);
+  test-12: hsla(#5F59, 0.5);
+  --semi-transparent-dark-background: #001e00ee;
+  --semi-transparent-dark-background-2: rgba(0, 30, 0, 238); // invalid opacity will be capped
+}

package/test/less-bom/css-escapes.less

@@ -35,4 +35,8 @@ ng\:form {
 // In Bootstrap v3
 .bootstrap {
     background-color: #000 \9;
+}
+
+textarea {
+    font-family: 'helvetica neue','wenquanyi micro hei',\5FAE\8F6F\96C5\9ED1, \5B8B\4F53, sans-serif;
 }

package/test/less-bom/errors/color-func-invalid-color.txt

@@ -1,4 +1,4 @@
-ArgumentError: error evaluating function `color`: argument must be a color keyword or 3/6 digit hex e.g. #FFF in {path}color-func-invalid-color.less on line 2, column 10:
+ArgumentError: error evaluating function `color`: argument must be a color keyword or 3|4|6|8 digit hex e.g. #FFF in {path}color-func-invalid-color.less on line 2, column 10:
 1 .test {
 2   color: color("NOT A COLOR");
 3 }

package/test/less-bom/sourcemaps/custom-props.less

@@ -0,0 +1,8 @@
+@color: var(--foo);
+
+body {
+	border-left: 1px solid @color;
+	width: calc(50% - 5px);
+	border-top: 1px solid @color;
+}
+

package/test/less-test.js

@@ -4,7 +4,8 @@ module.exports = function() {
     var path = require('path'),
         fs = require('fs'),
         copyBom = require('./copy-bom')(),
-        doBomTest = false;
+        doBomTest = false,
+        clone = require('clone');
 
     var less = require('../lib/less-node');
     var stylize = require('../lib/less-node/lessc-helper').stylize;
@@ -82,6 +83,10 @@ module.exports = function() {
     });
 
     function testSourcemap(name, err, compiledLess, doReplacements, sourcemap, baseFolder) {
+        if (err) {
+            fail('ERROR: ' + (err && err.message));
+            return;
+        }
         // Check the sourceMappingURL at the bottom of the file
         var expectedSourceMapURL = name + '.css.map',
             sourceMappingPrefix = '/*# sourceMappingURL=',
@@ -226,10 +231,10 @@ module.exports = function() {
     }
 
     function runTestSet(options, foldername, verifyFunction, nameModifier, doReplacements, getFilename) {
-        var options2 = options ? JSON.parse(JSON.stringify(options)) : {};
+        options = options ? clone(options) : {};
         runTestSetInternal(normalFolder, options, foldername, verifyFunction, nameModifier, doReplacements, getFilename);
         if (doBomTest) {
-            runTestSetInternal(bomFolder, options2, foldername, verifyFunction, nameModifier, doReplacements, getFilename);
+            runTestSetInternal(bomFolder, options, foldername, verifyFunction, nameModifier, doReplacements, getFilename);
         }
     }
 
@@ -237,8 +242,10 @@ module.exports = function() {
         runTestSetInternal(normalFolder, options, foldername, verifyFunction, nameModifier, doReplacements, getFilename);
     }
 
-    function runTestSetInternal(baseFolder, options, foldername, verifyFunction, nameModifier, doReplacements, getFilename) {
+    function runTestSetInternal(baseFolder, opts, foldername, verifyFunction, nameModifier, doReplacements, getFilename) {
         foldername = foldername || '';
+        
+        var originalOptions = opts || {};
 
         if (!doReplacements) {
             doReplacements = globalReplacements;
@@ -251,6 +258,8 @@ module.exports = function() {
         fs.readdirSync(path.join(baseFolder, foldername)).forEach(function (file) {
             if (!/\.less$/.test(file)) { return; }
 
+            var options = clone(originalOptions);
+
             var name = getBasename(file);
 
             if (oneTestOnly && name !== oneTestOnly) {
@@ -260,20 +269,24 @@ module.exports = function() {
             totalTests++;
 
             if (options.sourceMap && !options.sourceMap.sourceMapFileInline) {
-                options.sourceMapOutputFilename = name + '.css';
-                options.sourceMapBasepath = path.join(process.cwd(), baseFolder);
-                options.sourceMapRootpath = 'testweb/';
-                // TODO separate options?
-                options.sourceMap = options;
-
+                options.sourceMap = {
+                    sourceMapOutputFilename: name + '.css',
+                    sourceMapBasepath: path.join(process.cwd(), baseFolder),
+                    sourceMapRootpath: 'testweb/'
+                };
                 // This options is normally set by the bin/lessc script. Setting it causes the sourceMappingURL comment to be appended to the CSS
                 // output. The value is designed to allow the sourceMapBasepath option to be tested, as it should be removed by less before
                 // setting the sourceMappingURL value, leaving just the sourceMapOutputFilename and .map extension.
-                options.sourceMapFilename = options.sourceMapBasepath + '/' + options.sourceMapOutputFilename + '.map';
+                options.sourceMap.sourceMapFilename = options.sourceMap.sourceMapBasepath + '/' + options.sourceMap.sourceMapOutputFilename + '.map';
             }
 
             options.getVars = function(file) {
-                return JSON.parse(fs.readFileSync(getFilename(getBasename(file), 'vars', baseFolder), 'utf8'));
+                try {
+                    return JSON.parse(fs.readFileSync(getFilename(getBasename(file), 'vars', baseFolder), 'utf8'));
+                }
+                catch (e) {
+                    return {};
+                }
             };
 
             var doubleCallCheck = false;
@@ -294,6 +307,7 @@ module.exports = function() {
                         release();
                         return verificationResult;
                     }
+
                     if (err) {
                         fail('ERROR: ' + (err && err.message));
                         if (isVerbose) {

package/test/sourcemaps/custom-props.json

@@ -0,0 +1 @@
+{"version":3,"sources":["testweb/sourcemaps/custom-props.less"],"names":[],"mappings":"AAEA;EACC,uBAHO,UAGP;EACA,OAAO,eAAP;EACA,gCAAA","file":"sourcemaps/custom-props.css"}

package/test/less/errors/color-invalid-hex-code.less

@@ -1,4 +0,0 @@
-.a {
-    @wrongHEXColorCode: #DCALLB;
-    color: @wrongHEXColorCode;
-}

package/test/less/errors/color-invalid-hex-code.txt

@@ -1,4 +0,0 @@
-SyntaxError: Invalid HEX color code in {path}color-invalid-hex-code.less on line 2, column 29:
-1 .a {
-2     @wrongHEXColorCode: #DCALLB;
-3     color: @wrongHEXColorCode;

package/test/less/errors/color-invalid-hex-code2.less

@@ -1,4 +0,0 @@
-.a {
-    @wrongHEXColorCode: #fffblack;
-    color: @wrongHEXColorCode;
-}

package/test/less/errors/color-invalid-hex-code2.txt

@@ -1,4 +0,0 @@
-SyntaxError: Invalid HEX color code in {path}color-invalid-hex-code2.less on line 2, column 29:
-1 .a {
-2     @wrongHEXColorCode: #fffblack;
-3     color: @wrongHEXColorCode;

package/test/less-bom/errors/color-invalid-hex-code.less

@@ -1,4 +0,0 @@
-.a {
-    @wrongHEXColorCode: #DCALLB;
-    color: @wrongHEXColorCode;
-}

package/test/less-bom/errors/color-invalid-hex-code.txt

@@ -1,4 +0,0 @@
-SyntaxError: Invalid HEX color code in {path}color-invalid-hex-code.less on line 2, column 29:
-1 .a {
-2     @wrongHEXColorCode: #DCALLB;
-3     color: @wrongHEXColorCode;

package/test/less-bom/errors/color-invalid-hex-code2.less

@@ -1,4 +0,0 @@
-.a {
-    @wrongHEXColorCode: #fffblack;
-    color: @wrongHEXColorCode;
-}

package/test/less-bom/errors/color-invalid-hex-code2.txt

@@ -1,4 +0,0 @@
-SyntaxError: Invalid HEX color code in {path}color-invalid-hex-code2.less on line 2, column 29:
-1 .a {
-2     @wrongHEXColorCode: #fffblack;
-3     color: @wrongHEXColorCode;