less 2.4.0 → 2.5.3

package/lib/less/visitors/to-css-visitor.js

@@ -45,6 +45,13 @@ ToCSSVisitor.prototype = {
         return mediaNode;
     },
 
+    visitImport: function (importNode, visitArgs) {
+        if (importNode.path.currentFileInfo.reference !== undefined && importNode.css) {
+            return;
+        }
+        return importNode;
+    },
+
     visitDirective: function(directiveNode, visitArgs) {
         if (directiveNode.name === "@charset") {
             if (!directiveNode.getIsReferenced()) {
@@ -63,8 +70,30 @@ ToCSSVisitor.prototype = {
             }
             this.charset = true;
         }
-        if (directiveNode.rules && directiveNode.rules.rules) {
-            this._mergeRules(directiveNode.rules.rules);
+        function hasVisibleChild(directiveNode) {
+            //prepare list of childs
+            var rule, bodyRules = directiveNode.rules;
+            //if there is only one nested ruleset and that one has no path, then it is
+            //just fake ruleset that got not replaced and we need to look inside it to
+            //get real childs
+            if (bodyRules.length === 1 && (!bodyRules[0].paths || bodyRules[0].paths.length === 0)) {
+                bodyRules = bodyRules[0].rules;
+            }
+            for (var r = 0; r < bodyRules.length; r++) {
+                rule = bodyRules[r];
+                if (rule.getIsReferenced && rule.getIsReferenced()) {
+                    //the directive contains something that was referenced (likely by extend)
+                    //therefore it needs to be shown in output too
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        if (directiveNode.rules && directiveNode.rules.length) {
+            //it is still true that it is only one ruleset in array
+            //this is last such moment
+            this._mergeRules(directiveNode.rules[0].rules);
             //process childs
             directiveNode.accept(this._visitor);
             visitArgs.visitDeeper = false;
@@ -74,22 +103,18 @@ ToCSSVisitor.prototype = {
                 return directiveNode;
             }
 
-            if (!directiveNode.rules.rules) {
+            if (!directiveNode.rules || !directiveNode.rules.length) {
                 return ;
             }
 
-            //the directive was not directly referenced
-            for (var r = 0; r < directiveNode.rules.rules.length; r++) {
-                var rule = directiveNode.rules.rules[r];
-                if (rule.getIsReferenced && rule.getIsReferenced()) {
-                    //the directive contains something that was referenced (likely by extend)
-                    //therefore it needs to be shown in output too
-
-                    //marking as referenced in case the directive is stored inside another directive
-                    directiveNode.markReferenced();
-                    return directiveNode;
-                }
+            //the directive was not directly referenced - we need to check whether some of its childs
+            //was referenced
+            if (hasVisibleChild(directiveNode)) {
+                //marking as referenced in case the directive is stored inside another directive
+                directiveNode.markReferenced();
+                return directiveNode;
             }
+
             //The directive was not directly referenced and does not contain anything that
             //was referenced. Therefore it must not be shown in output.
             return ;
@@ -269,6 +294,15 @@ ToCSSVisitor.prototype = {
                 rule.value = toValue(spacedGroups);
             }
         });
+    },
+
+    visitAnonymous: function(anonymousNode, visitArgs) {
+        if (!anonymousNode.getIsReferenced()) {
+            return ;
+        }
+
+        anonymousNode.accept(this._visitor);
+        return anonymousNode;
     }
 };
 

package/lib/less-browser/bootstrap.js

@@ -13,14 +13,13 @@ require("./add-default-options")(window, options);
 
 var less = module.exports = require("./index")(window, options);
 
+window.less = less;
+
 if (options.onReady) {
     if (/!watch/.test(window.location.hash)) {
         less.watch();
     }
 
-    less.pageLoadFinished = less.registerStylesheets().then(
-        function () {
-            return less.refresh(less.env === 'development');
-        }
-    );
-}
+    less.registerStylesheetsImmediately();
+    less.pageLoadFinished = less.refresh(less.env === 'development');
+}

package/lib/less-browser/index.js

@@ -27,7 +27,7 @@ module.exports = function(window, options) {
 
     var typePattern = /^text\/(x-)?less$/;
 
-    function postProcessCSS(styles) {
+    function postProcessCSS(styles) { // deprecated, use a plugin for postprocesstasks
         if (options.postProcessor && typeof options.postProcessor === 'function') {
             styles = options.postProcessor.call(styles, styles) || styles;
         }
@@ -187,20 +187,28 @@ module.exports = function(window, options) {
     less.unwatch = function () {clearInterval(less.watchTimer); this.watchMode = false; return false; };
 
     //
-    // Get all <link> tags with the 'rel' attribute set to "stylesheet/less"
+    // Synchronously get all <link> tags with the 'rel' attribute set to
+    // "stylesheet/less".
     //
-    less.registerStylesheets = function() {
-        return new Promise(function(resolve, reject) {
-            var links = document.getElementsByTagName('link');
-            less.sheets = [];
-
-            for (var i = 0; i < links.length; i++) {
-                if (links[i].rel === 'stylesheet/less' || (links[i].rel.match(/stylesheet/) &&
-                    (links[i].type.match(typePattern)))) {
-                    less.sheets.push(links[i]);
-                }
+    less.registerStylesheetsImmediately = function() {
+        var links = document.getElementsByTagName('link');
+        less.sheets = [];
+
+        for (var i = 0; i < links.length; i++) {
+            if (links[i].rel === 'stylesheet/less' || (links[i].rel.match(/stylesheet/) &&
+                (links[i].type.match(typePattern)))) {
+                less.sheets.push(links[i]);
             }
+        }
+    };
 
+    //
+    // Asynchronously get all <link> tags with the 'rel' attribute set to
+    // "stylesheet/less", returning a Promise.
+    //
+    less.registerStylesheets = function() {
+        return new Promise(function(resolve, reject) {
+            less.registerStylesheetsImmediately();
             resolve();
         });
     };

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

@@ -1,34 +1,57 @@
-var Dimension = require("../less/tree/dimension"),
+module.exports = function(environment) {
+    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 = require("./../less/functions/function-registry");
+
+    function imageSize(functionContext, filePathNode) {
+        var filePath = filePathNode.value;
+        var currentFileInfo = functionContext.currentFileInfo;
+        var currentDirectory = currentFileInfo.relativeUrls ?
+        currentFileInfo.currentDirectory : currentFileInfo.entryPath;
+
+        var fragmentStart = filePath.indexOf('#');
+        var fragment = '';
+        if (fragmentStart !== -1) {
+            fragment = filePath.slice(fragmentStart);
+            filePath = filePath.slice(0, fragmentStart);
+        }
+
+        var fileManager = environment.getFileManager(filePath, currentDirectory, functionContext.context, environment, true);
+
+        if (!fileManager) {
+            throw {
+                type: "File",
+                message: "Can not set up FileManager for " + filePathNode
+            };
+        }
+
+        var fileSync = fileManager.loadFileSync(filePath, currentDirectory, functionContext.context, environment);
+
+        if (fileSync.error) {
+            throw fileSync.error;
+        }
+
+        var sizeOf = require('image-size');
+        return sizeOf(fileSync.filename);
     }
-};
 
-functionRegistry.addMultiple(imageFunctions);
+    var imageFunctions = {
+        "image-size": function(filePathNode) {
+            var size = imageSize(this, filePathNode);
+            return new Expression([
+                new Dimension(size.width, "px"),
+                new Dimension(size.height, "px")
+            ]);
+        },
+        "image-width": function(filePathNode) {
+            var size = imageSize(this, filePathNode);
+            return new Dimension(size.width, "px");
+        },
+        "image-height": function(filePathNode) {
+            var size = imageSize(this, filePathNode);
+            return new Dimension(size.height, "px");
+        }
+    };
+
+    functionRegistry.addMultiple(imageFunctions);
+};

package/lib/less-node/index.js

@@ -69,6 +69,6 @@ less.writeError = function (ctx, options) {
 };
 
 // provide image-size functionality
-require('./image-size');
+require('./image-size')(less.environment);
 
 module.exports = less;

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

@@ -27,7 +27,7 @@ var lessc_helper = {
         console.log("");
         console.log("options:");
         console.log("  -h, --help               Prints help (this message) and exit.");
-        console.log("  --include-path=PATHS     Sets include paths. Separated by `:'. Use `;' on Windows.");
+        console.log("  --include-path=PATHS     Sets include paths. Separated by `:'. `;' also supported on windows.");
         console.log("  -M, --depends            Outputs a makefile import dependency list to stdout.");
         console.log("  --no-color               Disables colorized output.");
         console.log("  --no-ie-compat           Disables IE compatibility checks.");
@@ -37,6 +37,7 @@ 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("  --verbose                Be verbose.");
         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.");
@@ -69,7 +70,6 @@ var lessc_helper = {
         console.log("                           that will output the information within a fake");
         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("");

package/lib/less-rhino/index.js

@@ -1,4 +1,5 @@
-/*jshint rhino:true, unused: false */
+/* jshint rhino:true, unused: false */
+/* jscs:disable validateIndentation */
 /*global name:true, less, loadStyleSheet, os */
 
 function formatError(ctx, options) {
@@ -263,13 +264,16 @@ function writeFile(filename, content) {
                 break;
             case 'include-path':
                 if (checkArgFunc(arg, match[2])) {
-                    options.paths = match[2].split(os.type().match(/Windows/) ? ';' : ':')
-                            .map(function(p) {
-                                if (p) {
-//                                    return path.resolve(process.cwd(), p);
-                                    return p;
-                                }
-                            });
+                    // support for both ; and : path separators
+                    // even on windows when using absolute paths with drive letters (eg C:\path:D:\path)
+                    options.paths = match[2]
+                        .split(os.type().match(/Windows/) ? /:(?!\\)|;/ : ':')
+                        .map(function(p) {
+                            if (p) {
+//                                return path.resolve(process.cwd(), p);
+                                return p;
+                            }
+                        });
                 }
                 break;
             case 'line-numbers':

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "less",
-  "version": "2.4.0",
+  "version": "2.5.3",
   "description": "Leaner CSS",
   "homepage": "http://lesscss.org",
   "author": {
@@ -17,12 +17,7 @@
     "type": "git",
     "url": "https://github.com/less/less.js.git"
   },
-  "licenses": [
-    {
-      "type": "Apache v2",
-      "url": "https://github.com/less/less.js/blob/master/LICENSE"
-    }
-  ],
+  "license": "Apache-2.0",
   "bin": {
     "lessc": "./bin/lessc"
   },
@@ -33,6 +28,7 @@
   "jam": {
     "main": "./dist/less.js"
   },
+  "browser": "./dist/less.js",
   "engines": {
     "node": ">=0.10.0"
   },
@@ -47,7 +43,7 @@
     "mkdirp": "^0.5.0",
     "promise": "^6.0.1",
     "request": "^2.51.0",
-    "source-map": "^0.2.0"
+    "source-map": "^0.4.2"
   },
   "devDependencies": {
     "diff": "^1.0",
@@ -55,13 +51,13 @@
     "grunt-contrib-clean": "^0.6.0",
     "grunt-contrib-concat": "^0.5.0",
     "grunt-contrib-connect": "^0.9.0",
-    "grunt-contrib-jasmine": "^0.8.1",
+    "grunt-contrib-jasmine": "^0.8.2",
     "grunt-contrib-jshint": "^0.11.0",
-    "grunt-contrib-uglify": "^0.7.0",
-	"grunt-jscs": "^1.2.0",
+    "grunt-contrib-uglify": "^0.8.0",
+    "grunt-jscs": "^1.6.0",
     "grunt-shell": "^1.1.1",
-    "grunt-browserify": "^3.2.0",
-    "matchdep": "^0.3.0",
+    "grunt-browserify": "~3.5.0",
+    "jit-grunt": "^0.9.1",
     "time-grunt": "^1.0.0",
     "grunt-saucelabs": "^8.3.2"
   },

package/test/browser/less/urls.less

@@ -50,10 +50,16 @@
   uri: data-uri('../../data/data-uri-fail.png');
 }
 #svg-functions {
-  background-image: svg-gradient(to bottom, black, white);
+  @colorlist1: black, white;
+  background-image: svg-gradient(to bottom, @colorlist1);
+  background-image: svg-gradient(to bottom, black white);
   background-image: svg-gradient(to bottom, black, orange 3%, white);
+  @colorlist2: black, orange 3%, white;
+  background-image: svg-gradient(to bottom, @colorlist2);
   @green_5: green 5%;
   @orange_percentage: 3%;
   @orange_color: orange;
+  @colorlist3: (mix(black, white) + #444) 1%, @orange_color @orange_percentage, ((@green_5)), white 95%;
+  background-image: svg-gradient(to bottom,@colorlist3);
   background-image: svg-gradient(to bottom, (mix(black, white) + #444) 1%, @orange_color @orange_percentage, ((@green_5)), white 95%);
 }