less 2.1.1 → 2.3.1

package/lib/less-node/image-size.js

@@ -0,0 +1,34 @@
+var Dimension = require("../less/tree/dimension"),
+    Expression = require("../less/tree/expression"),
+    functionRegistry = require("./../less/functions/function-registry"),
+    path = require("path");
+
+function imageSize(filePathNode) {
+    var filePath = filePathNode.value;
+    var currentDirectory = filePathNode.currentFileInfo.relativeUrls ?
+        filePathNode.currentFileInfo.currentDirectory : filePathNode.currentFileInfo.entryPath;
+
+    var sizeOf = require('image-size');
+    filePath = path.join(currentDirectory, filePath);
+    return sizeOf(filePath);
+}
+
+var imageFunctions = {
+    "image-size": function(filePathNode) {
+        var size = imageSize(filePathNode);
+        return new Expression([
+            new Dimension(size.width, "px"),
+            new Dimension(size.height, "px")
+        ]);
+    },
+    "image-width": function(filePathNode) {
+        var size = imageSize(filePathNode);
+        return new Dimension(size.width, "px");
+    },
+    "image-height": function(filePathNode) {
+        var size = imageSize(filePathNode);
+        return new Dimension(size.height, "px");
+    }
+};
+
+functionRegistry.addMultiple(imageFunctions);

package/lib/less-node/index.js

@@ -68,4 +68,7 @@ less.writeError = function (ctx, options) {
     console.error(less.formatError(ctx, options));
 };
 
+// provide image-size functionality
+require('./image-size');
+
 module.exports = less;

package/lib/less-node/lessc-helper.js

@@ -37,12 +37,11 @@ var lessc_helper = {
         console.log("  --strict-imports         Forces evaluation of imports.");
         console.log("  --insecure               Allows imports from insecure https hosts.");
         console.log("  -v, --version            Prints version number and exit.");
-        console.log("  -x, --compress           Compresses output by removing some whitespaces.");
         console.log("  --source-map[=FILENAME]  Outputs a v3 sourcemap to the filename (or output filename.map).");
         console.log("  --source-map-rootpath=X  Adds this path onto the sourcemap filename and less file paths.");
         console.log("  --source-map-basepath=X  Sets sourcemap base path, defaults to current working directory.");
         console.log("  --source-map-less-inline Puts the less files into the map instead of referencing them.");
-        console.log("  --source-map-map-inline  Puts the map (and any less files) into the output css file.");
+        console.log("  --source-map-map-inline  Puts the map (and any less files) as a base64 data uri into the output css file.");
         console.log("  --source-map-url=URL     Sets a custom URL to map file, for sourceMappingURL comment");
         console.log("                           in generated CSS file.");
         console.log("  -rp, --rootpath=URL      Sets rootpath for url rewriting in relative imports and urls");
@@ -71,6 +70,8 @@ var lessc_helper = {
         console.log("                           media query which is compatible with the SASS");
         console.log("                           format, and 'all' which will do both.");
         console.log("  --verbose                Be verbose.");
+        console.log("  -x, --compress           Compresses output by removing some whitespaces.");
+        console.log("                           We recommend you use a dedicated minifer like less-plugin-clean-css");
         console.log("");
         console.log("Report bugs to: http://github.com/less/less.js/issues");
         console.log("Home page: <http://lesscss.org/>");

package/lib/less-node/url-file-manager.js

@@ -35,7 +35,7 @@ UrlFileManager.prototype.loadFile = function(filename, currentDirectory, options
 
         request.get({uri: urlStr, strictSSL: !options.insecure }, function (error, res, body) {
             if (error) {
-                reject({ type: 'File', message: "resource '" + urlStr + "' gave this Error:\n  "+ error +"\n" });
+                reject({ type: 'File', message: "resource '" + urlStr + "' gave this Error:\n  " + error + "\n" });
                 return;
             }
             if (res && res.statusCode === 404) {
@@ -43,7 +43,7 @@ UrlFileManager.prototype.loadFile = function(filename, currentDirectory, options
                 return;
             }
             if (!body) {
-                logger.warn('Warning: Empty body (HTTP '+ res.statusCode + ') returned by "' + urlStr +'"');
+                logger.warn('Warning: Empty body (HTTP '+ res.statusCode + ') returned by "' + urlStr + '"');
             }
             fulfill({ contents: body, filename: urlStr });
         });

package/lib/less-rhino/index.js

@@ -114,7 +114,7 @@ less.Parser.fileLoader = function (file, currentFileInfo, callback, env) {
 
     var j = file.lastIndexOf('/');
     if(newFileInfo.relativeUrls && !/^(?:[a-z-]+:|\/)/.test(file) && j != -1) {
-        var relativeSubDirectory = file.slice(0, j+1);
+        var relativeSubDirectory = file.slice(0, j + 1);
         newFileInfo.rootpath = newFileInfo.rootpath + relativeSubDirectory; // append (sub|sup) directory path of imported file
     }
     newFileInfo.currentDirectory = path;
@@ -135,7 +135,6 @@ less.Parser.fileLoader = function (file, currentFileInfo, callback, env) {
     }
 };
 
-
 function writeFile(filename, content) {
     var fstream = new java.io.FileWriter(filename);
     var out = new java.io.BufferedWriter(fstream);
@@ -178,7 +177,7 @@ function writeFile(filename, content) {
     var checkBooleanArg = function(arg) {
         var onOff = /^((on|t|true|y|yes)|(off|f|false|n|no))$/i.exec(arg);
         if (!onOff) {
-            print(" unable to parse "+arg+" as a boolean. use one of on/t/true/y/yes/off/f/false/n/no");
+            print(" unable to parse " + arg + " as a boolean. use one of on/t/true/y/yes/off/f/false/n/no");
             continueProcessing = false;
             return false;
         }
@@ -371,7 +370,6 @@ function writeFile(filename, content) {
         options.sourceMapOutputFilename = options.sourceMap;
     }
 
-
     if (!name) {
         console.log("lessc: no inout files");
         console.log("");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "less",
-  "version": "2.1.1",
+  "version": "2.3.1",
   "description": "Leaner CSS",
   "homepage": "http://lesscss.org",
   "author": {
@@ -40,12 +40,14 @@
     "test": "grunt test"
   },
   "optionalDependencies": {
-    "graceful-fs": "^3.0.4",
+    "errno": "^0.1.1",
+    "graceful-fs": "^3.0.5",
+    "image-size": "~0.3.5",
     "mime": "^1.2.11",
-    "request": "^2.48.0",
     "mkdirp": "^0.5.0",
-    "source-map": "^0.1.x",
-    "promise": "^6.0.1"
+    "promise": "^6.0.1",
+    "request": "^2.51.0",
+    "source-map": "^0.2.0"
   },
   "devDependencies": {
     "diff": "^1.0",
@@ -54,8 +56,9 @@
     "grunt-contrib-concat": "^0.5.0",
     "grunt-contrib-connect": "^0.9.0",
     "grunt-contrib-jasmine": "^0.8.1",
-    "grunt-contrib-jshint": "^0.10.0",
-    "grunt-contrib-uglify": "^0.6.0",
+    "grunt-contrib-jshint": "^0.11.0",
+    "grunt-contrib-uglify": "^0.7.0",
+	"grunt-jscs": "^1.2.0",
     "grunt-shell": "^1.1.1",
     "grunt-browserify": "^3.2.0",
     "matchdep": "^0.3.0",

package/test/browser/common.js

@@ -130,10 +130,10 @@ var testErrorSheet = function (sheet) {
                         .replace(/<h3>|<\/?p>|<a href="[^"]*">|<\/a>|<ul>|<\/?pre( class="?[^">]*"?)?>|<\/li>|<\/?label>/ig, "")
                         .replace(/<\/h3>/ig, " ")
                         .replace(/<li>|<\/ul>|<br>/ig, "\n"))
-                        .replace(/&amp;/ig,"&")
+                        .replace(/&amp;/ig, "&")
                         // for IE8
-                        .replace(/\r\n/g,"\n")
-                        .replace(/\. \nin/,". in");
+                        .replace(/\r\n/g, "\n")
+                        .replace(/\. \nin/, ". in");
                 actualErrorMsg = innerText
                     .replace(/\n\d+/g, function (lineNo) {
                         return lineNo + " ";
@@ -145,10 +145,11 @@ var testErrorSheet = function (sheet) {
                 errorFile
                     .then(function (errorTxt) {
                         errorTxt = errorTxt
-                            .replace("{path}", "")
-                            .replace("{pathrel}", "")
-                            .replace("{pathhref}", "http://localhost:8081/test/less/errors/")
-                            .replace("{404status}", " (404)")
+                            .replace(/\{path\}/g, "")
+                            .replace(/\{pathrel\}/g, "")
+                            .replace(/\{pathhref\}/g, "http://localhost:8081/test/less/errors/")
+                            .replace(/\{404status\}/g, " (404)")
+                            .replace(/\{node\}.*\{\/node\}/g, "")
                             .replace(/\n$/, "");
                         expect(actualErrorMsg).toEqual(errorTxt);
                         if (errorTxt == actualErrorMsg) {
@@ -177,10 +178,11 @@ var testErrorSheetConsole = function (sheet) {
         errorFile
             .then(function (errorTxt) {
                 errorTxt
-                    .replace("{path}", "")
-                    .replace("{pathrel}", "")
-                    .replace("{pathhref}", "http://localhost:8081/browser/less/")
-                    .replace("{404status}", " (404)")
+                    .replace(/\{path\}/g, "")
+                    .replace(/\{pathrel\}/g, "")
+                    .replace(/\{pathhref\}/g, "http://localhost:8081/browser/less/")
+                    .replace(/\{404status\}/g, " (404)")
+                    .replace(/\{node\}.*\{\/node\}/g, "")
                     .trim();
                 expect(actualErrorMsg).toEqual(errorTxt);
                 done();

package/test/browser/css/urls.css

@@ -6,6 +6,9 @@
 .modify {
   my-url: url("http://localhost:8081/test/browser/less/b.png");
 }
+.gray-gradient {
+  background: url('data:image/svg+xml,%3C%3Fxml%20version%3D%221.0%22%20%3F%3E%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20version%3D%221.1%22%20width%3D%22100%25%22%20height%3D%22100%25%22%20viewBox%3D%220%200%201%201%22%20preserveAspectRatio%3D%22none%22%3E%3ClinearGradient%20id%3D%22gradient%22%20gradientUnits%3D%22userSpaceOnUse%22%20x1%3D%220%25%22%20y1%3D%220%25%22%20x2%3D%220%25%22%20y2%3D%22100%25%22%3E%3Cstop%20offset%3D%220%25%22%20stop-color%3D%22%23999999%22%20stop-opacity%3D%220%22%2F%3E%3Cstop%20offset%3D%2260%25%22%20stop-color%3D%22%23999999%22%20stop-opacity%3D%220.05%22%2F%3E%3Cstop%20offset%3D%2270%25%22%20stop-color%3D%22%23999999%22%20stop-opacity%3D%220.1%22%2F%3E%3Cstop%20offset%3D%2273%25%22%20stop-color%3D%22%23999999%22%20stop-opacity%3D%220.15%22%2F%3E%3Cstop%20offset%3D%2275%25%22%20stop-color%3D%22%23999999%22%20stop-opacity%3D%220.2%22%2F%3E%3Cstop%20offset%3D%2280%25%22%20stop-color%3D%22%23999999%22%20stop-opacity%3D%220.25%22%2F%3E%3Cstop%20offset%3D%2285%25%22%20stop-color%3D%22%23999999%22%20stop-opacity%3D%220.3%22%2F%3E%3Cstop%20offset%3D%2288%25%22%20stop-color%3D%22%23999999%22%20stop-opacity%3D%220.35%22%2F%3E%3Cstop%20offset%3D%2290%25%22%20stop-color%3D%22%23999999%22%20stop-opacity%3D%220.4%22%2F%3E%3Cstop%20offset%3D%2295%25%22%20stop-color%3D%22%23999999%22%20stop-opacity%3D%220.45%22%2F%3E%3Cstop%20offset%3D%22100%25%22%20stop-color%3D%22%23999999%22%20stop-opacity%3D%220.5%22%2F%3E%3C%2FlinearGradient%3E%3Crect%20x%3D%220%22%20y%3D%220%22%20width%3D%221%22%20height%3D%221%22%20fill%3D%22url(%23gradient)%22%20%2F%3E%3C%2Fsvg%3E');
+}
 @font-face {
   src: url("/fonts/garamond-pro.ttf");
   src: local(Futura-Medium), url(http://localhost:8081/test/browser/less/fonts.svg#MyGeometricModern) format("svg");
@@ -48,7 +51,7 @@
   uri: url('http://localhost:8081/test/data/data-uri-fail.png');
 }
 #svg-functions {
-  background-image: url('data:image/svg+xml,<?xml version="1.0" ?><svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="100%" height="100%" viewBox="0 0 1 1" preserveAspectRatio="none"><linearGradient id="gradient" gradientUnits="userSpaceOnUse" x1="0%" y1="0%" x2="0%" y2="100%"><stop offset="0%" stop-color="#000000"/><stop offset="100%" stop-color="#ffffff"/></linearGradient><rect x="0" y="0" width="1" height="1" fill="url(#gradient)" /></svg>');
-  background-image: url('data:image/svg+xml,<?xml version="1.0" ?><svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="100%" height="100%" viewBox="0 0 1 1" preserveAspectRatio="none"><linearGradient id="gradient" gradientUnits="userSpaceOnUse" x1="0%" y1="0%" x2="0%" y2="100%"><stop offset="0%" stop-color="#000000"/><stop offset="3%" stop-color="#ffa500"/><stop offset="100%" stop-color="#ffffff"/></linearGradient><rect x="0" y="0" width="1" height="1" fill="url(#gradient)" /></svg>');
-  background-image: url('data:image/svg+xml,<?xml version="1.0" ?><svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="100%" height="100%" viewBox="0 0 1 1" preserveAspectRatio="none"><linearGradient id="gradient" gradientUnits="userSpaceOnUse" x1="0%" y1="0%" x2="0%" y2="100%"><stop offset="1%" stop-color="#c4c4c4"/><stop offset="3%" stop-color="#ffa500"/><stop offset="5%" stop-color="#008000"/><stop offset="95%" stop-color="#ffffff"/></linearGradient><rect x="0" y="0" width="1" height="1" fill="url(#gradient)" /></svg>');
+  background-image: url('data:image/svg+xml,%3C%3Fxml%20version%3D%221.0%22%20%3F%3E%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20version%3D%221.1%22%20width%3D%22100%25%22%20height%3D%22100%25%22%20viewBox%3D%220%200%201%201%22%20preserveAspectRatio%3D%22none%22%3E%3ClinearGradient%20id%3D%22gradient%22%20gradientUnits%3D%22userSpaceOnUse%22%20x1%3D%220%25%22%20y1%3D%220%25%22%20x2%3D%220%25%22%20y2%3D%22100%25%22%3E%3Cstop%20offset%3D%220%25%22%20stop-color%3D%22%23000000%22%2F%3E%3Cstop%20offset%3D%22100%25%22%20stop-color%3D%22%23ffffff%22%2F%3E%3C%2FlinearGradient%3E%3Crect%20x%3D%220%22%20y%3D%220%22%20width%3D%221%22%20height%3D%221%22%20fill%3D%22url(%23gradient)%22%20%2F%3E%3C%2Fsvg%3E');
+  background-image: url('data:image/svg+xml,%3C%3Fxml%20version%3D%221.0%22%20%3F%3E%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20version%3D%221.1%22%20width%3D%22100%25%22%20height%3D%22100%25%22%20viewBox%3D%220%200%201%201%22%20preserveAspectRatio%3D%22none%22%3E%3ClinearGradient%20id%3D%22gradient%22%20gradientUnits%3D%22userSpaceOnUse%22%20x1%3D%220%25%22%20y1%3D%220%25%22%20x2%3D%220%25%22%20y2%3D%22100%25%22%3E%3Cstop%20offset%3D%220%25%22%20stop-color%3D%22%23000000%22%2F%3E%3Cstop%20offset%3D%223%25%22%20stop-color%3D%22%23ffa500%22%2F%3E%3Cstop%20offset%3D%22100%25%22%20stop-color%3D%22%23ffffff%22%2F%3E%3C%2FlinearGradient%3E%3Crect%20x%3D%220%22%20y%3D%220%22%20width%3D%221%22%20height%3D%221%22%20fill%3D%22url(%23gradient)%22%20%2F%3E%3C%2Fsvg%3E');
+  background-image: url('data:image/svg+xml,%3C%3Fxml%20version%3D%221.0%22%20%3F%3E%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20version%3D%221.1%22%20width%3D%22100%25%22%20height%3D%22100%25%22%20viewBox%3D%220%200%201%201%22%20preserveAspectRatio%3D%22none%22%3E%3ClinearGradient%20id%3D%22gradient%22%20gradientUnits%3D%22userSpaceOnUse%22%20x1%3D%220%25%22%20y1%3D%220%25%22%20x2%3D%220%25%22%20y2%3D%22100%25%22%3E%3Cstop%20offset%3D%221%25%22%20stop-color%3D%22%23c4c4c4%22%2F%3E%3Cstop%20offset%3D%223%25%22%20stop-color%3D%22%23ffa500%22%2F%3E%3Cstop%20offset%3D%225%25%22%20stop-color%3D%22%23008000%22%2F%3E%3Cstop%20offset%3D%2295%25%22%20stop-color%3D%22%23ffffff%22%2F%3E%3C%2FlinearGradient%3E%3Crect%20x%3D%220%22%20y%3D%220%22%20width%3D%221%22%20height%3D%221%22%20fill%3D%22url(%23gradient)%22%20%2F%3E%3C%2Fsvg%3E');
 }

package/test/browser/jasmine-jsreporter.js

@@ -180,7 +180,6 @@
     // export public
     jasmine.JSReporter = JSReporter;
 
-
     // ------------------------------------------------------------------------
     // Jasmine JSReporter for Jasmine 2.0
     // ------------------------------------------------------------------------
@@ -240,7 +239,7 @@
         suite.specs = [];
         suite.suites = [];
         suite.passed = true;
-        suite.parentId = this.suiteStack.slice(this.suiteStack.length -1)[0];
+        suite.parentId = this.suiteStack.slice(this.suiteStack.length - 1)[0];
         if (suite.parentId) {
             this.suites[suite.parentId].suites.push(suite);
         } else {
@@ -273,7 +272,7 @@
         spec = this._cacheSpec(spec);
         spec.timer = new Timer().start();
         // build up suites->spec tree as we go
-        spec.suiteId = this.suiteStack.slice(this.suiteStack.length -1)[0];
+        spec.suiteId = this.suiteStack.slice(this.suiteStack.length - 1)[0];
         this.suites[spec.suiteId].specs.push(spec);
     };
 

package/test/browser/less/nested-gradient-with-svg-gradient/mixin-consumer.less

@@ -0,0 +1,5 @@
+@import "svg-gradient-mixin.less";
+
+.gray-gradient {
+  .gradient-mixin(#999);
+}

package/test/browser/less/nested-gradient-with-svg-gradient/svg-gradient-mixin.less

@@ -0,0 +1,15 @@
+.gradient-mixin(@color) {
+  background: svg-gradient(to bottom,
+    fade(@color, 0%) 0%,
+    fade(@color, 5%) 60%,
+    fade(@color, 10%) 70%,
+    fade(@color, 15%) 73%,
+    fade(@color, 20%) 75%,
+    fade(@color, 25%) 80%,
+    fade(@color, 30%) 85%,
+    fade(@color, 35%) 88%,
+    fade(@color, 40%) 90%,
+    fade(@color, 45%) 95%,
+    fade(@color, 50%) 100%
+  );
+}

package/test/browser/less/urls.less

@@ -1,5 +1,6 @@
 @import "imports/urls.less";
 @import "http://localhost:8081/test/browser/less/imports/urls2.less";
+@import "http://localhost:8081/test/browser/less/nested-gradient-with-svg-gradient/mixin-consumer.less";
 @font-face {
   src: url("/fonts/garamond-pro.ttf");
   src: local(Futura-Medium),