less 2.7.1 → 2.7.2

package/.travis.yml

@@ -1,19 +1,15 @@
 language: node_js
 node_js:
-  - "4.2.0"
-  - "4.0.0"
+  - "6"
+  - "4"
   - "0.12"
   - "0.10"
-before_install:
-  - mkdir travis-phantomjs
-  - wget https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-2.1.1-linux-x86_64.tar.bz2 -O $PWD/travis-phantomjs/phantomjs-2.1.1-linux-x86_64.tar.bz2
-  - tar -xvf $PWD/travis-phantomjs/phantomjs-2.1.1-linux-x86_64.tar.bz2 -C $PWD/travis-phantomjs
-  - export PATH=$PWD/travis-phantomjs/phantomjs-2.1.1-linux-x86_64/bin:$PATH
 install:
   - npm install -g grunt-cli
   - npm install
 env:
   global:
+    - PHANTOMJS_CDNURL=http://cnpmjs.org/downloads
     - secure: TrNVruWYaUK5ALga1y7wRY+MLjWJECUSCsBmKW5EUmIevOUxqHWu7M89FANKxstEeFRRAGH3QJbloRxnzIgh0U0ah5npE9XA1bYXGO5khoXeIyk7pNRfjIo8aEnJH1Vp8vWA6J6ovxdJ7lCFKEGvGKxGde50knVl7KFVVULlX2U=
     - secure: Rzh+CEI7YRvvVkOruPE8Z0dkU0s13V6b6cpqbN72vxbJl/Jm5PUZkjTFJdkWJrW3ErhCKX6EC7XdGvrclqEA9WAqKzrecqCJYqTnw4MwqiAj6F9wqE/BqhoWg4xPxm0MK/7eJMvLCgjNpe+gc1CaeFJZkLSNWn6nOFke+vVlf9Q=
 sudo: false

package/appveyor.yml

@@ -4,6 +4,7 @@ environment:
     - nodejs_version: "0.10"
     - nodejs_version: "0.12"
     - nodejs_version: "4"
+    - nodejs_version: "6"
 
 # Install scripts. (runs after repo cloning)
 install:

package/bin/lessc

@@ -40,18 +40,32 @@ var silent = false,
     plugins: plugins
 };
 var sourceMapOptions = {};
-var continueProcessing = true,
-    currentErrorcode;
-
-// calling process.exit does not flush stdout always
-// so use this to set the exit code
-process.on('exit', function() { process.reallyExit(currentErrorcode); });
+var continueProcessing = true;
+
+// Calling process.exit does not flush stdout always. Instead of exiting the process, we set the process' exitCode,
+// close all handles and wait for the event loop to exit the process.
+// @see https://github.com/nodejs/node/issues/6409
+// Unfortunately, node 0.10.x does not support setting process.exitCode, so we need to call reallyExit() explicitly.
+// @see https://nodejs.org/api/process.html#process_process_exitcode
+// Additionally we also need to make sure that uncaughtExceptions are never swallowed.
+// @see https://github.com/less/less.js/issues/2881
+// This code can safely be removed if node 0.10.x is not supported anymore.
+process.on("exit", function() { process.reallyExit(process.exitCode); });
+process.on("uncaughtException", function(err) {
+    console.error(err);
+    process.exitCode = 1;
+});
+// This code will still be required because otherwise rejected promises would not be reported to the user
+process.on("unhandledRejection", function(err) {
+    console.error(err);
+    process.exitCode = 1;
+});
 
 var checkArgFunc = function(arg, option) {
     if (!option) {
         console.error(arg + " option requires a parameter");
         continueProcessing = false;
-        currentErrorcode = 1;
+        process.exitCode = 1;
         return false;
     }
     return true;
@@ -62,7 +76,7 @@ var checkBooleanArg = function(arg) {
     if (!onOff) {
         console.error(" unable to parse " + arg + " as a boolean. use one of on/t/true/y/yes/off/f/false/n/no");
         continueProcessing = false;
-        currentErrorcode = 1;
+        process.exitCode = 1;
         return false;
     }
     return Boolean(onOff[2]);
@@ -252,7 +266,7 @@ function printUsage() {
                 } else {
                     console.error("Unable to load plugin " + name +
                         " please make sure that it is installed under or at the same level as less");
-                    currentErrorcode = 1;
+                    process.exitCode = 1;
                 }
                 break;
             default:
@@ -263,7 +277,7 @@ function printUsage() {
                     console.error("Unable to interpret argument " + arg +
                         " - if it is a plugin (less-plugin-" + arg + "), make sure that it is installed under or at" +
                         " the same level as less");
-                    currentErrorcode = 1;
+                    process.exitCode = 1;
                 }
                 break;
         }
@@ -288,15 +302,20 @@ function printUsage() {
         sourceMapOptions.sourceMapInputFilename = input;
         if (!sourceMapOptions.sourceMapFullFilename) {
             if (!output && !sourceMapFileInline) {
-                console.log("the sourcemap option only has an optional filename if the css filename is given");
-                console.log("consider adding --source-map-map-inline which embeds the sourcemap into the css");
+                console.error("the sourcemap option only has an optional filename if the css filename is given");
+                console.error("consider adding --source-map-map-inline which embeds the sourcemap into the css");
+                process.exitCode = 1;
                 return;
             }
             // its in the same directory, so always just the basename
-            sourceMapOptions.sourceMapOutputFilename = path.basename(output);
-            sourceMapOptions.sourceMapFullFilename = output + ".map";
+            if (output) {
+                sourceMapOptions.sourceMapOutputFilename = path.basename(output);
+                sourceMapOptions.sourceMapFullFilename = output + ".map";
+            }
             // its in the same directory, so always just the basename
-            sourceMapOptions.sourceMapFilename = path.basename(sourceMapOptions.sourceMapFullFilename);
+            if ('sourceMapFullFilename' in sourceMapOptions) {
+                sourceMapOptions.sourceMapFilename = path.basename(sourceMapOptions.sourceMapFullFilename);
+            }
         } else if (options.sourceMap && !sourceMapFileInline) {
             var mapFilename = path.resolve(process.cwd(), sourceMapOptions.sourceMapFullFilename),
                 mapDir = path.dirname(mapFilename),
@@ -316,7 +335,7 @@ function printUsage() {
     }
 
     if (sourceMapOptions.sourceMapRootpath === undefined) {
-        var pathToMap = path.dirname(sourceMapFileInline ? output : sourceMapOptions.sourceMapFullFilename || '.'),
+        var pathToMap = path.dirname((sourceMapFileInline ? output : sourceMapOptions.sourceMapFullFilename) || '.'),
             pathToInput = path.dirname(sourceMapOptions.sourceMapInputFilename || '.');
         sourceMapOptions.sourceMapRootpath = path.relative(pathToMap, pathToInput);
     }
@@ -325,7 +344,7 @@ function printUsage() {
         console.error("lessc: no input files");
         console.error("");
         printUsage();
-        currentErrorcode = 1;
+        process.exitCode = 1;
         return;
     }
 
@@ -345,7 +364,8 @@ function printUsage() {
 
     if (options.depends) {
         if (!outputbase) {
-            console.log("option --depends requires an output path to be specified");
+            console.error("option --depends requires an output path to be specified");
+            process.exitCode = 1;
             return;
         }
         process.stdout.write(outputbase + ": ");
@@ -366,6 +386,7 @@ function printUsage() {
                     }
                     console.error('lessc: failed to create file ' + filename);
                     console.error(description);
+                    process.exitCode = 1;
                 } else {
                     less.logger.info('lessc: wrote ' + filename);
                 }
@@ -397,6 +418,7 @@ function printUsage() {
                     }
                     console.error('lessc: failed to create file ' + output);
                     console.error(description);
+                    process.exitCode = 1;
                 } else {
                     less.logger.info('lessc: wrote ' + output);
                     onSuccess();
@@ -421,7 +443,7 @@ function printUsage() {
     var parseLessFile = function (e, data) {
         if (e) {
             console.error("lessc: " + e.message);
-            currentErrorcode = 1;
+            process.exitCode = 1;
             return;
         }
 
@@ -468,7 +490,7 @@ function printUsage() {
             },
             function(err) {
                 less.writeError(err, options);
-                currentErrorcode = 1;
+                process.exitCode = 1;
             });
     };
 

package/dist/less.js

@@ -1,8 +1,8 @@
 /*!
- * Less - Leaner CSS v2.7.1
+ * Less - Leaner CSS v2.7.2
  * http://lesscss.org
  *
- * Copyright (c) 2009-2016, Alexis Sellier <self@cloudhead.net>
+ * Copyright (c) 2009-2017, Alexis Sellier <self@cloudhead.net>
  * Licensed under the Apache-2.0 License.
  *
  */
@@ -1718,41 +1718,33 @@ colorFunctions = {
     greyscale: function (color) {
         return colorFunctions.desaturate(color, new Dimension(100));
     },
-    contrast: function (color, color1, color2, threshold) {
-        // Return which of `color1` and `color2` has the greatest contrast with `color`
-        // according to the standard WCAG contrast ratio calculation.
-        // http://www.w3.org/TR/WCAG20/#contrast-ratiodef
-        // The threshold param is no longer used, in line with SASS.
+    contrast: function (color, dark, light, threshold) {
         // filter: contrast(3.2);
         // should be kept as is, so check for color
         if (!color.rgb) {
             return null;
         }
-        if (typeof color1 === 'undefined') {
-            color1 = colorFunctions.rgba(0, 0, 0, 1.0);
+        if (typeof light === 'undefined') {
+            light = colorFunctions.rgba(255, 255, 255, 1.0);
         }
-        if (typeof color2 === 'undefined') {
-            color2 = colorFunctions.rgba(255, 255, 255, 1.0);
+        if (typeof dark === 'undefined') {
+            dark = colorFunctions.rgba(0, 0, 0, 1.0);
         }
-        var contrast1, contrast2;
-        var luma = color.luma();
-        var luma1 = color1.luma();
-        var luma2 = color2.luma();
-        // Calculate contrast ratios for each color
-        if (luma > luma1) {
-            contrast1 = (luma + 0.05) / (luma1 + 0.05);
-        } else {
-            contrast1 = (luma1 + 0.05) / (luma + 0.05);
+        //Figure out which is actually light and dark!
+        if (dark.luma() > light.luma()) {
+            var t = light;
+            light = dark;
+            dark = t;
         }
-        if (luma > luma2) {
-            contrast2 = (luma + 0.05) / (luma2 + 0.05);
+        if (typeof threshold === 'undefined') {
+            threshold = 0.43;
         } else {
-            contrast2 = (luma2 + 0.05) / (luma + 0.05);
+            threshold = number(threshold);
         }
-        if (contrast1 > contrast2) {
-            return color1;
+        if (color.luma() < threshold) {
+            return light;
         } else {
-            return color2;
+            return dark;
         }
     },
     argb: function (color) {
@@ -2485,7 +2477,7 @@ module.exports = function(environment, fileManagers) {
     var SourceMapOutput, SourceMapBuilder, ParseTree, ImportManager, Environment;
 
     var less = {
-        version: [2, 7, 1],
+        version: [2, 7, 2],
         data: require('./data'),
         tree: require('./tree'),
         Environment: (Environment = require("./environment/environment")),
@@ -5872,6 +5864,7 @@ var Node = require("./node"),
 var Comment = function (value, isLineComment, index, currentFileInfo) {
     this.value = value;
     this.isLineComment = isLineComment;
+    this.index = index;
     this.currentFileInfo = currentFileInfo;
     this.allowRoot = true;
 };