less 2.3.1 → 2.4.0

package/lib/less-browser/index.js

@@ -6,251 +6,251 @@ var addDataAttr = require("./utils").addDataAttr,
     browser = require("./browser");
 
 module.exports = function(window, options) {
-var document = window.document;
-var less = require('../less')();
-module.exports = less;
-less.options = options;
-var environment = less.environment,
-    FileManager = require("./file-manager")(options, less.logger),
-    fileManager = new FileManager();
-environment.addFileManager(fileManager);
-less.FileManager = FileManager;
-
-require("./log-listener")(less, options);
-var errors = require("./error-reporting")(window, less, options);
-var cache = less.cache = options.cache || require("./cache")(window, options, less.logger);
-
-//Setup user functions
-if (options.functions) {
-    less.functions.functionRegistry.addMultiple(options.functions);
-}
-
-var typePattern = /^text\/(x-)?less$/;
-
-function postProcessCSS(styles) {
-    if (options.postProcessor && typeof options.postProcessor === 'function') {
-        styles = options.postProcessor.call(styles, styles) || styles;
+    var document = window.document;
+    var less = require('../less')();
+    //module.exports = less;
+    less.options = options;
+    var environment = less.environment,
+        FileManager = require("./file-manager")(options, less.logger),
+        fileManager = new FileManager();
+    environment.addFileManager(fileManager);
+    less.FileManager = FileManager;
+
+    require("./log-listener")(less, options);
+    var errors = require("./error-reporting")(window, less, options);
+    var cache = less.cache = options.cache || require("./cache")(window, options, less.logger);
+
+    //Setup user functions
+    if (options.functions) {
+        less.functions.functionRegistry.addMultiple(options.functions);
     }
-    return styles;
-}
-
-function clone(obj) {
-    var cloned = {};
-    for(var prop in obj) {
-        if (obj.hasOwnProperty(prop)) {
-            cloned[prop] = obj[prop];
+
+    var typePattern = /^text\/(x-)?less$/;
+
+    function postProcessCSS(styles) {
+        if (options.postProcessor && typeof options.postProcessor === 'function') {
+            styles = options.postProcessor.call(styles, styles) || styles;
         }
+        return styles;
     }
-    return cloned;
-}
-
-// only really needed for phantom
-function bind(func, thisArg) {
-    var curryArgs = Array.prototype.slice.call(arguments, 2);
-    return function() {
-        var args = curryArgs.concat(Array.prototype.slice.call(arguments, 0));
-        return func.apply(thisArg, args);
-    };
-}
 
-function loadStyles(modifyVars) {
-    var styles = document.getElementsByTagName('style'),
-        style;
+    function clone(obj) {
+        var cloned = {};
+        for (var prop in obj) {
+            if (obj.hasOwnProperty(prop)) {
+                cloned[prop] = obj[prop];
+            }
+        }
+        return cloned;
+    }
 
-    for (var i = 0; i < styles.length; i++) {
-        style = styles[i];
-        if (style.type.match(typePattern)) {
-            var instanceOptions = clone(options);
-            instanceOptions.modifyVars = modifyVars;
-            var lessText = style.innerHTML || '';
-            instanceOptions.filename = document.location.href.replace(/#.*$/, '');
+    // only really needed for phantom
+    function bind(func, thisArg) {
+        var curryArgs = Array.prototype.slice.call(arguments, 2);
+        return function() {
+            var args = curryArgs.concat(Array.prototype.slice.call(arguments, 0));
+            return func.apply(thisArg, args);
+        };
+    }
 
-            /*jshint loopfunc:true */
-            // use closure to store current style
-            less.render(lessText, instanceOptions,
-                    bind(function(style, e, result) {
-                        if (e) {
-                            errors.add(e, "inline");
-                        } else {
-                            style.type = 'text/css';
-                            if (style.styleSheet) {
-                                style.styleSheet.cssText = result.css;
+    function loadStyles(modifyVars) {
+        var styles = document.getElementsByTagName('style'),
+            style;
+
+        for (var i = 0; i < styles.length; i++) {
+            style = styles[i];
+            if (style.type.match(typePattern)) {
+                var instanceOptions = clone(options);
+                instanceOptions.modifyVars = modifyVars;
+                var lessText = style.innerHTML || '';
+                instanceOptions.filename = document.location.href.replace(/#.*$/, '');
+
+                /*jshint loopfunc:true */
+                // use closure to store current style
+                less.render(lessText, instanceOptions,
+                        bind(function(style, e, result) {
+                            if (e) {
+                                errors.add(e, "inline");
                             } else {
-                                style.innerHTML = result.css;
+                                style.type = 'text/css';
+                                if (style.styleSheet) {
+                                    style.styleSheet.cssText = result.css;
+                                } else {
+                                    style.innerHTML = result.css;
+                                }
                             }
-                        }
-                    }, null, style));
+                        }, null, style));
+            }
         }
     }
-}
 
-function loadStyleSheet(sheet, callback, reload, remaining, modifyVars) {
+    function loadStyleSheet(sheet, callback, reload, remaining, modifyVars) {
 
-    var instanceOptions = clone(options);
-    addDataAttr(instanceOptions, sheet);
-    instanceOptions.mime = sheet.type;
+        var instanceOptions = clone(options);
+        addDataAttr(instanceOptions, sheet);
+        instanceOptions.mime = sheet.type;
 
-    if (modifyVars) {
-        instanceOptions.modifyVars = modifyVars;
-    }
+        if (modifyVars) {
+            instanceOptions.modifyVars = modifyVars;
+        }
 
-    function loadInitialFileCallback(loadedFile) {
+        function loadInitialFileCallback(loadedFile) {
 
-        var data = loadedFile.contents,
-            path = loadedFile.filename,
-            webInfo = loadedFile.webInfo;
+            var data = loadedFile.contents,
+                path = loadedFile.filename,
+                webInfo = loadedFile.webInfo;
 
-        var newFileInfo = {
-            currentDirectory: fileManager.getPath(path),
-            filename: path,
-            rootFilename: path,
-            relativeUrls: instanceOptions.relativeUrls};
+            var newFileInfo = {
+                currentDirectory: fileManager.getPath(path),
+                filename: path,
+                rootFilename: path,
+                relativeUrls: instanceOptions.relativeUrls};
 
-        newFileInfo.entryPath = newFileInfo.currentDirectory;
-        newFileInfo.rootpath = instanceOptions.rootpath || newFileInfo.currentDirectory;
+            newFileInfo.entryPath = newFileInfo.currentDirectory;
+            newFileInfo.rootpath = instanceOptions.rootpath || newFileInfo.currentDirectory;
 
-        if (webInfo) {
-            webInfo.remaining = remaining;
+            if (webInfo) {
+                webInfo.remaining = remaining;
 
-            if (!instanceOptions.modifyVars) {
-                var css = cache.getCSS(path, webInfo);
-                if (!reload && css) {
-                    webInfo.local = true;
-                    callback(null, css, data, sheet, webInfo, path);
-                    return;
+                if (!instanceOptions.modifyVars) {
+                    var css = cache.getCSS(path, webInfo);
+                    if (!reload && css) {
+                        webInfo.local = true;
+                        callback(null, css, data, sheet, webInfo, path);
+                        return;
+                    }
                 }
             }
-        }
 
-        //TODO add tests around how this behaves when reloading
-        errors.remove(path);
+            //TODO add tests around how this behaves when reloading
+            errors.remove(path);
+
+            instanceOptions.rootFileInfo = newFileInfo;
+            less.render(data, instanceOptions, function(e, result) {
+                if (e) {
+                    e.href = path;
+                    callback(e);
+                } else {
+                    result.css = postProcessCSS(result.css);
+                    if (!instanceOptions.modifyVars) {
+                        cache.setCSS(sheet.href, webInfo.lastModified, result.css);
+                    }
+                    callback(null, result.css, data, sheet, webInfo, path);
+                }
+            });
+        }
 
-        instanceOptions.rootFileInfo = newFileInfo;
-        less.render(data, instanceOptions, function(e, result) {
+        fileManager.loadFile(sheet.href, null, instanceOptions, environment, function(e, loadedFile) {
             if (e) {
-                e.href = path;
                 callback(e);
-            } else {
-                result.css = postProcessCSS(result.css);
-                if (!instanceOptions.modifyVars) {
-                    cache.setCSS(sheet.href, webInfo.lastModified, result.css);
-                }
-                callback(null, result.css, data, sheet, webInfo, path);
+                return;
             }
+            loadInitialFileCallback(loadedFile);
         });
     }
 
-    fileManager.loadFile(sheet.href, null, instanceOptions, environment, function(e, loadedFile) {
-        if (e) {
-            callback(e);
-            return;
+    function loadStyleSheets(callback, reload, modifyVars) {
+        for (var i = 0; i < less.sheets.length; i++) {
+            loadStyleSheet(less.sheets[i], callback, reload, less.sheets.length - (i + 1), modifyVars);
         }
-        loadInitialFileCallback(loadedFile);
-    });
-}
-
-function loadStyleSheets(callback, reload, modifyVars) {
-    for (var i = 0; i < less.sheets.length; i++) {
-        loadStyleSheet(less.sheets[i], callback, reload, less.sheets.length - (i + 1), modifyVars);
     }
-}
-
-function initRunningMode(){
-    if (less.env === 'development') {
-        less.watchTimer = setInterval(function () {
-            if (less.watchMode) {
-                fileManager.clearFileCache();
-                loadStyleSheets(function (e, css, _, sheet, webInfo) {
-                    if (e) {
-                        errors.add(e, e.href || sheet.href);
-                    } else if (css) {
-                        browser.createCSS(window.document, css, sheet);
-                    }
-                });
-            }
-        }, options.poll);
-    }
-}
 
-//
-// Watch mode
-//
-less.watch   = function () {
-    if (!less.watchMode ){
-        less.env = 'development';
-         initRunningMode();
+    function initRunningMode() {
+        if (less.env === 'development') {
+            less.watchTimer = setInterval(function () {
+                if (less.watchMode) {
+                    fileManager.clearFileCache();
+                    loadStyleSheets(function (e, css, _, sheet, webInfo) {
+                        if (e) {
+                            errors.add(e, e.href || sheet.href);
+                        } else if (css) {
+                            browser.createCSS(window.document, css, sheet);
+                        }
+                    });
+                }
+            }, options.poll);
+        }
     }
-    this.watchMode = true;
-    return true;
-};
 
-less.unwatch = function () {clearInterval(less.watchTimer); this.watchMode = false; return false; };
-
-//
-// 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]);
-            }
+    //
+    // Watch mode
+    //
+    less.watch   = function () {
+        if (!less.watchMode ) {
+            less.env = 'development';
+            initRunningMode();
         }
+        this.watchMode = true;
+        return true;
+    };
 
-        resolve();
-    });
-};
-
-//
-// With this function, it's possible to alter variables and re-render
-// CSS without reloading less-files
-//
-less.modifyVars = function(record) {
-    return less.refresh(true, record, false);
-};
+    less.unwatch = function () {clearInterval(less.watchTimer); this.watchMode = false; return false; };
 
-less.refresh = function (reload, modifyVars, clearFileCache) {
-    if ((reload || clearFileCache) && clearFileCache !== false) {
-        fileManager.clearFileCache();
-    }
-    return new Promise(function (resolve, reject) {
-        var startTime, endTime, totalMilliseconds;
-        startTime = endTime = new Date();
+    //
+    // 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 = [];
 
-        loadStyleSheets(function (e, css, _, sheet, webInfo) {
-            if (e) {
-                errors.add(e, e.href || sheet.href);
-                reject(e);
-                return;
-            }
-            if (webInfo.local) {
-                less.logger.info("loading " + sheet.href + " from cache.");
-            } else {
-                less.logger.info("rendered " + sheet.href + " successfully.");
-            }
-            browser.createCSS(window.document, css, sheet);
-            less.logger.info("css for " + sheet.href + " generated in " + (new Date() - endTime) + 'ms');
-            if (webInfo.remaining === 0) {
-                totalMilliseconds = new Date() - startTime;
-                less.logger.info("less has finished. css generated in " + totalMilliseconds + 'ms');
-                resolve({
-                    startTime: startTime,
-                    endTime: endTime,
-                    totalMilliseconds: totalMilliseconds,
-                    sheets: less.sheets.length
-                });
+            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]);
+                }
             }
-            endTime = new Date();
-        }, reload, modifyVars);
 
-        loadStyles(modifyVars);
-    });
-};
+            resolve();
+        });
+    };
+
+    //
+    // With this function, it's possible to alter variables and re-render
+    // CSS without reloading less-files
+    //
+    less.modifyVars = function(record) {
+        return less.refresh(true, record, false);
+    };
+
+    less.refresh = function (reload, modifyVars, clearFileCache) {
+        if ((reload || clearFileCache) && clearFileCache !== false) {
+            fileManager.clearFileCache();
+        }
+        return new Promise(function (resolve, reject) {
+            var startTime, endTime, totalMilliseconds;
+            startTime = endTime = new Date();
+
+            loadStyleSheets(function (e, css, _, sheet, webInfo) {
+                if (e) {
+                    errors.add(e, e.href || sheet.href);
+                    reject(e);
+                    return;
+                }
+                if (webInfo.local) {
+                    less.logger.info("loading " + sheet.href + " from cache.");
+                } else {
+                    less.logger.info("rendered " + sheet.href + " successfully.");
+                }
+                browser.createCSS(window.document, css, sheet);
+                less.logger.info("css for " + sheet.href + " generated in " + (new Date() - endTime) + 'ms');
+                if (webInfo.remaining === 0) {
+                    totalMilliseconds = new Date() - startTime;
+                    less.logger.info("less has finished. css generated in " + totalMilliseconds + 'ms');
+                    resolve({
+                        startTime: startTime,
+                        endTime: endTime,
+                        totalMilliseconds: totalMilliseconds,
+                        sheets: less.sheets.length
+                    });
+                }
+                endTime = new Date();
+            }, reload, modifyVars);
+
+            loadStyles(modifyVars);
+        });
+    };
 
-less.refreshStyles = loadStyles;
+    less.refreshStyles = loadStyles;
     return less;
 };

package/lib/less-browser/log-listener.js

@@ -11,7 +11,7 @@ module.exports = function(less, options) {
     // 1 - Errors
     // 0 - None
     // Defaults to 2
-    options.logLevel = typeof(options.logLevel) !== 'undefined' ? options.logLevel : (options.env === 'development' ?  logLevel_info : logLevel_error);
+    options.logLevel = typeof options.logLevel !== 'undefined' ? options.logLevel : (options.env === 'development' ?  logLevel_info : logLevel_error);
 
     if (!options.loggers) {
         options.loggers = [{
@@ -37,7 +37,7 @@ module.exports = function(less, options) {
             }
         }];
     }
-    for(var i = 0; i < options.loggers.length; i++) {
+    for (var i = 0; i < options.loggers.length; i++) {
         less.logger.addListener(options.loggers[i]);
     }
 };

package/lib/less-browser/utils.js

@@ -1,11 +1,11 @@
 module.exports = {
     extractId: function(href) {
-        return href.replace(/^[a-z-]+:\/+?[^\/]+/, '' )  // Remove protocol & domain
-            .replace(/[\?\&]livereload=\w+/, '' )  // Remove LiveReload cachebuster
-            .replace(/^\//,                  '' )  // Remove root /
-            .replace(/\.[a-zA-Z]+$/,         '' )  // Remove simple extension
-            .replace(/[^\.\w-]+/g,           '-')  // Replace illegal characters
-            .replace(/\./g,                  ':'); // Replace dots with colons(for valid id)
+        return href.replace(/^[a-z-]+:\/+?[^\/]+/, '')  // Remove protocol & domain
+            .replace(/[\?\&]livereload=\w+/, '')        // Remove LiveReload cachebuster
+            .replace(/^\//, '')                         // Remove root /
+            .replace(/\.[a-zA-Z]+$/, '')                // Remove simple extension
+            .replace(/[^\.\w-]+/g, '-')                 // Replace illegal characters
+            .replace(/\./g, ':');                       // Replace dots with colons(for valid id)
     },
     addDataAttr: function(options, tag) {
         for (var opt in tag.dataset) {

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

@@ -1,8 +1,13 @@
 var path = require('path'),
     fs = require('./fs'),
-    PromiseConstructor = typeof Promise === 'undefined' ? require('promise') : Promise,
+    PromiseConstructor,
     AbstractFileManager = require("../less/environment/abstract-file-manager.js");
 
+try {
+    PromiseConstructor = typeof Promise === 'undefined' ? require('promise') : Promise;
+} catch(e) {
+}
+
 var FileManager = function() {
 };
 
@@ -23,7 +28,7 @@ FileManager.prototype.loadFile = function(filename, currentDirectory, options, e
 
     options = options || {};
 
-    if (options.syncImport) {
+    if (options.syncImport || !PromiseConstructor) {
         data = this.loadFileSync(filename, currentDirectory, options, environment, 'utf-8');
         callback(data.error, data);
         return;
@@ -79,7 +84,7 @@ FileManager.prototype.loadFileSync = function(filename, currentDirectory, option
         try {
             fullFilename = filename;
             if (paths[i]) {
-              fullFilename = path.join(paths[i], fullFilename);
+                fullFilename = path.join(paths[i], fullFilename);
             }
             filenamesTried.push(fullFilename);
             fs.statSync(fullFilename);
@@ -95,7 +100,7 @@ FileManager.prototype.loadFileSync = function(filename, currentDirectory, option
     } else {
         data = fs.readFileSync(fullFilename, encoding);
         result = { contents: data, filename: fullFilename};
-     }
+    }
 
     return result;
 };

package/lib/less-node/index.js

@@ -27,11 +27,11 @@ less.formatError = function(ctx, options) {
         return ctx.stack || ctx.message;
     }
 
-    if (typeof(extract[0]) === 'string') {
+    if (typeof extract[0] === 'string') {
         error.push(stylize((ctx.line - 1) + ' ' + extract[0], 'grey'));
     }
 
-    if (typeof(extract[1]) === 'string') {
+    if (typeof extract[1] === 'string') {
         var errorTxt = ctx.line + ' ';
         if (extract[1]) {
             errorTxt += extract[1].slice(0, ctx.column) +
@@ -41,7 +41,7 @@ less.formatError = function(ctx, options) {
         error.push(errorTxt);
     }
 
-    if (typeof(extract[2]) === 'string') {
+    if (typeof extract[2] === 'string') {
         error.push(stylize((ctx.line + 1) + ' ' + extract[2], 'grey'));
     }
     error = error.join('\n') + stylize('', 'reset') + '\n';

package/lib/less-node/plugin-loader.js

@@ -38,7 +38,7 @@ PluginLoader.prototype.tryLoadPlugin = function(name, argument) {
     return null;
 };
 PluginLoader.prototype.compareVersion = function(aVersion, bVersion) {
-    for(var i = 0; i < aVersion.length; i++) {
+    for (var i = 0; i < aVersion.length; i++) {
         if (aVersion[i] !== bVersion[i]) {
             return parseInt(aVersion[i]) > parseInt(bVersion[i]) ? -1 : 1;
         }
@@ -47,7 +47,7 @@ PluginLoader.prototype.compareVersion = function(aVersion, bVersion) {
 };
 PluginLoader.prototype.versionToString = function(version) {
     var versionString = "";
-    for(var i = 0; i < version.length; i++) {
+    for (var i = 0; i < version.length; i++) {
         versionString += (versionString ? "." : "") + version[i];
     }
     return versionString;
@@ -81,7 +81,7 @@ PluginLoader.prototype.tryRequirePlugin = function(name) {
     }
 };
 PluginLoader.prototype.printUsage = function(plugins) {
-    for(var i = 0; i < plugins.length; i++) {
+    for (var i = 0; i < plugins.length; i++) {
         var plugin = plugins[i];
         if (plugin.printUsage) {
             plugin.printUsage();

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

@@ -1,7 +1,7 @@
 var isUrlRe = /^(?:https?:)?\/\//i,
     url = require('url'),
     request,
-    PromiseConstructor = typeof Promise === 'undefined' ? require('promise') : Promise,
+    PromiseConstructor,
     AbstractFileManager = require("../less/environment/abstract-file-manager.js"),
     logger = require("../less/logger");
 
@@ -15,6 +15,9 @@ UrlFileManager.prototype.supports = function(filename, currentDirectory, options
 };
 
 UrlFileManager.prototype.loadFile = function(filename, currentDirectory, options, environment) {
+    if (!PromiseConstructor) {
+        PromiseConstructor = typeof Promise === 'undefined' ? require('promise') : Promise;
+    }
     return new PromiseConstructor(function(fulfill, reject) {
         if (request === undefined) {
             try { request = require('request'); }
@@ -43,7 +46,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 });
         });