less 2.2.2 → 2.6.0

data/lib/less/js/benchmark/less-benchmark.js

@@ -10,33 +10,32 @@ if (process.argv[2]) { file = path.join(process.cwd(), process.argv[2]) }
 fs.readFile(file, 'utf8', function (e, data) {
     var tree, css, start, end, total;
 
-    sys.puts("Benchmarking...\n", path.basename(file) + " (" +
+    console.log("Benchmarking...\n", path.basename(file) + " (" +
              parseInt(data.length / 1024) + " KB)", "");
 
     start = new(Date);
 
     new(less.Parser)({ optimization: 2 }).parse(data, function (err, tree) {
-        end = new(Date);
+        end = new Date();
 
         total = end - start;
 
-        sys.puts("Parsing: " +
+        console.log("Parsing: " +
                  total + " ms (" +
-                 parseInt(1000 / total *
-                 data.length / 1024) + " KB\/s)");
+                 Number(1000 / total * data.length / 1024) + " KB\/s)");
 
-        start = new(Date);
+        start = new Date();
         css = tree.toCSS();
-        end = new(Date);
+        end = new Date();
 
-        sys.puts("Generation: " + (end - start) + " ms (" +
+        console.log("Generation: " + (end - start) + " ms (" +
                  parseInt(1000 / (end - start) *
                  data.length / 1024) + " KB\/s)");
 
         total += end - start;
 
-        sys.puts("Total: " + total + "ms (" +
-                 parseInt(1000 / total * data.length / 1024) + " KB/s)");
+        console.log("Total: " + total + "ms (" +
+            Number(1000 / total * data.length / 1024) + " KB/s)");
 
         if (err) {
             less.writeError(err);

data/lib/less/js/bin/lessc

@@ -3,19 +3,67 @@
 var path = require('path'),
     fs = require('fs'),
     sys = require('util'),
-    os = require('os');
+    os = require('os'),
+    mkdirp;
 
 var less = require('../lib/less');
 var args = process.argv.slice(1);
 var options = {
+    depends: false,
     compress: false,
-    yuicompress: false,
+    cleancss: false,
+    max_line_len: -1,
     optimization: 1,
     silent: false,
+    verbose: false,
+    lint: false,
     paths: [],
     color: true,
-    strictImports: false
+    strictImports: false,
+    insecure: false,
+    rootpath: '',
+    relativeUrls: false,
+    ieCompat: true,
+    strictMath: false,
+    strictUnits: false,
+    globalVariables: '',
+    modifyVariables: '',
+    urlArgs: ''
 };
+var cleancssOptions = {};
+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 checkArgFunc = function(arg, option) {
+    if (!option) {
+        console.log(arg + " option requires a parameter");
+        continueProcessing = false;
+        return false;
+    }
+    return true;
+};
+
+var checkBooleanArg = function(arg) {
+    var onOff = /^((on|t|true|y|yes)|(off|f|false|n|no))$/i.exec(arg);
+    if (!onOff) {
+        console.log(" unable to parse "+arg+" as a boolean. use one of on/t/true/y/yes/off/f/false/n/no");
+        continueProcessing = false;
+        return false;
+    }
+    return Boolean(onOff[2]);
+};
+
+var parseVariableOption = function(option) {
+    var parts = option.split('=', 2);
+    return '@' + parts[0] + ': ' + parts[1] + ';\n';
+};
+
+var warningMessages = "";
+var sourceMapFileInline = false;
 
 args = args.filter(function (arg) {
     var match;
@@ -25,14 +73,14 @@ args = args.filter(function (arg) {
         return false;
     }
 
-    if (match = arg.match(/^--?([a-z][0-9a-z-]*)(?:=([^\s]+))?$/i)) { arg = match[1] }
+    if (match = arg.match(/^--?([a-z][0-9a-z-]*)(?:=(.*))?$/i)) { arg = match[1] }
     else { return arg }
 
     switch (arg) {
         case 'v':
         case 'version':
-            sys.puts("lessc " + less.version.join('.') + " (LESS Compiler) [JavaScript]");
-            process.exit(0);
+            console.log("lessc " + less.version.join('.') + " (LESS Compiler) [JavaScript]");
+            continueProcessing = false;
         case 'verbose':
             options.verbose = true;
             break;
@@ -40,90 +88,315 @@ args = args.filter(function (arg) {
         case 'silent':
             options.silent = true;
             break;
+        case 'l':
+        case 'lint':
+            options.lint = true;
+            break;
         case 'strict-imports':
             options.strictImports = true;
             break;
         case 'h':
         case 'help':
-            sys.puts("usage: lessc source [destination]");
-            process.exit(0);
+            require('../lib/less/lessc_helper').printUsage();
+            continueProcessing = false;
         case 'x':
         case 'compress':
             options.compress = true;
             break;
+        case 'insecure':
+            options.insecure = true;
+            break;
+        case 'M':
+        case 'depends':
+            options.depends = true;
+            break;
         case 'yui-compress':
-            options.yuicompress = true;
+            warningMessages += "yui-compress option has been removed. ignoring.";
+            break;
+        case 'clean-css':
+            options.cleancss = true;
+            break;
+        case 'max-line-len':
+            if (checkArgFunc(arg, match[2])) {
+                options.maxLineLen = parseInt(match[2], 10);
+                if (options.maxLineLen <= 0) {
+                  options.maxLineLen = -1;
+                }
+            }
             break;
         case 'no-color':
             options.color = false;
             break;
+        case 'no-ie-compat':
+            options.ieCompat = false;
+            break;
+        case 'no-js':
+            options.javascriptEnabled = false;
+            break;
         case 'include-path':
-            options.paths = match[2].split(os.type().match(/Windows/) ? ';' : ':')
-                .map(function(p) {
-                    if (p) {
-                      return path.resolve(process.cwd(), p);
-                    }
-                });
+            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);
+                        }
+                    });
+            }
             break;
         case 'O0': options.optimization = 0; break;
         case 'O1': options.optimization = 1; break;
         case 'O2': options.optimization = 2; break;
+        case 'line-numbers':
+            if (checkArgFunc(arg, match[2])) {
+                options.dumpLineNumbers = match[2];
+            }
+            break;
+        case 'source-map':
+            if (!match[2]) {
+                options.sourceMap = true;
+            } else {
+                options.sourceMap = match[2];
+            }
+            break;
+        case 'source-map-rootpath':
+            if (checkArgFunc(arg, match[2])) {
+                options.sourceMapRootpath = match[2];
+            }
+            break;
+        case 'source-map-basepath':
+            if (checkArgFunc(arg, match[2])) {
+                options.sourceMapBasepath = match[2];
+            }
+            break;
+        case 'source-map-map-inline':
+            sourceMapFileInline = true;
+            options.sourceMap = true;
+            break;
+        case 'source-map-less-inline':
+            options.outputSourceFiles = true;
+            break;
+        case 'source-map-url':
+            if (checkArgFunc(arg, match[2])) {
+                options.sourceMapURL = match[2];
+            }
+            break;
+        case 'rp':
+        case 'rootpath':
+            if (checkArgFunc(arg, match[2])) {
+                options.rootpath = match[2].replace(/\\/g, '/');
+            }
+            break;
+        case "ru":
+        case "relative-urls":
+            options.relativeUrls = true;
+            break;
+        case "sm":
+        case "strict-math":
+            if (checkArgFunc(arg, match[2])) {
+                options.strictMath = checkBooleanArg(match[2]);
+            }
+            break;
+        case "su":
+        case "strict-units":
+            if (checkArgFunc(arg, match[2])) {
+                options.strictUnits = checkBooleanArg(match[2]);
+            }
+            break;
+        case "global-var":
+            if (checkArgFunc(arg, match[2])) {
+                options.globalVariables += parseVariableOption(match[2]);
+            }
+            break;
+        case "modify-var":
+            if (checkArgFunc(arg, match[2])) {
+                options.modifyVariables += parseVariableOption(match[2]);
+            }
+            break;
+        case "clean-option":
+            var cleanOptionArgs = match[2].split(":");
+            switch(cleanOptionArgs[0]) {
+                case "--keep-line-breaks":
+                case "-b":
+                    cleancssOptions.keepBreaks = true;
+                    break;
+                case "--s0":
+                    cleancssOptions.keepSpecialComments = 0;
+                    break;
+                case "--s1":
+                    cleancssOptions.keepSpecialComments = 1;
+                    break;
+                case "--skip-advanced":
+                    cleancssOptions.noAdvanced = true;
+                    break;
+                case "--advanced":
+                    cleancssOptions.noAdvanced = false;
+                    break;
+                case "--compatibility":
+                    cleancssOptions.compatibility = cleanOptionArgs[1];
+                    break;
+                default:
+                    console.log("unrecognised clean-css option '" + cleanOptionArgs[0] + "'");
+                    console.log("we support only arguments that make sense for less, '--keep-line-breaks', '-b'");
+                    console.log("'--s0', '--s1', '--advanced', '--skip-advanced', '--compatibility'");
+                    continueProcessing = false;
+                    currentErrorcode = 1;
+                    break;
+            }
+            break;
+        case 'url-args':
+            if (checkArgFunc(arg, match[2])) {
+                options.urlArgs = match[2];
+            }
+            break;
+        default:
+            require('../lib/less/lessc_helper').printUsage();
+            continueProcessing = false;
+            currentErrorcode = 1;
+            break;
     }
 });
 
+if (!continueProcessing) {
+    return;
+}
+
 var input = args[1];
+var inputbase = args[1];
 if (input && input != '-') {
     input = path.resolve(process.cwd(), input);
 }
 var output = args[2];
+var outputbase = args[2];
 if (output) {
+    options.sourceMapOutputFilename = output;
     output = path.resolve(process.cwd(), output);
+    if (warningMessages) {
+        console.log(warningMessages);
+    }
 }
 
-var css, fd, tree;
+options.sourceMapBasepath = options.sourceMapBasepath || (input ? path.dirname(input) : process.cwd());
+
+if (options.sourceMap === true) {
+    if (!output && !sourceMapFileInline) {
+        console.log("the sourcemap option only has an optional filename if the css filename is given");
+        return;
+    }
+    options.sourceMapFullFilename = options.sourceMapOutputFilename + ".map";
+    options.sourceMap = path.basename(options.sourceMapFullFilename);
+}
+
+if (options.cleancss && options.sourceMap) {
+    console.log("the sourcemap option is not compatible with sourcemap support at the moment. See Issue #1656");
+    return;
+}
 
 if (! input) {
-    sys.puts("lessc: no input files");
-    process.exit(1);
+    console.log("lessc: no input files");
+    console.log("");
+    require('../lib/less/lessc_helper').printUsage();
+    currentErrorcode = 1;
+    return;
+}
+
+var ensureDirectory = function (filepath) {
+    var dir = path.dirname(filepath),
+        cmd,
+        existsSync = fs.existsSync || path.existsSync;
+    if (!existsSync(dir)) {
+        if (mkdirp === undefined) {
+            try {mkdirp = require('mkdirp');}
+            catch(e) { mkdirp = null; }
+        }
+        cmd = mkdirp && mkdirp.sync || fs.mkdirSync;
+        cmd(dir);
+    }
+};
+
+if (options.depends) {
+    if (!outputbase) {
+        sys.print("option --depends requires an output path to be specified");
+        return;
+    }
+    sys.print(outputbase + ": ");
+}
+
+if (!sourceMapFileInline) {
+    var writeSourceMap = function(output) {
+        var filename = options.sourceMapFullFilename || options.sourceMap;
+        ensureDirectory(filename);
+        fs.writeFileSync(filename, output, 'utf8');
+    };
 }
 
 var parseLessFile = function (e, data) {
     if (e) {
-        sys.puts("lessc: " + e.message);
-        process.exit(1);
+        console.log("lessc: " + e.message);
+        currentErrorcode = 1;
+        return;
     }
 
-    new(less.Parser)({
-        paths: [path.dirname(input)].concat(options.paths),
-        optimization: options.optimization,
-        filename: input,
-        strictImports: options.strictImports
-    }).parse(data, function (err, tree) {
+    data = options.globalVariables + data + options.modifyVariables;
+
+    options.paths = [path.dirname(input)].concat(options.paths);
+    options.filename = input;
+
+    var parser = new(less.Parser)(options);
+    parser.parse(data, function (err, tree) {
         if (err) {
             less.writeError(err, options);
-            process.exit(1);
+            currentErrorcode = 1;
+            return;
+        } else if (options.depends) {
+            for(var file in parser.imports.files) {
+                sys.print(file + " ")
+            }
+            sys.print("\n");
         } else {
             try {
-                css = tree.toCSS({
+	        if (options.lint) { writeSourceMap = function() {} }
+                var css = tree.toCSS({
+                    silent: options.silent,
+                    verbose: options.verbose,
+                    ieCompat: options.ieCompat,
                     compress: options.compress,
-                    yuicompress: options.yuicompress
+                    cleancss: options.cleancss,
+                    cleancssOptions: cleancssOptions,
+                    sourceMap: Boolean(options.sourceMap),
+                    sourceMapFilename: options.sourceMap,
+                    sourceMapURL: options.sourceMapURL,
+                    sourceMapOutputFilename: options.sourceMapOutputFilename,
+                    sourceMapBasepath: options.sourceMapBasepath,
+                    sourceMapRootpath: options.sourceMapRootpath || "",
+                    outputSourceFiles: options.outputSourceFiles,
+                    writeSourceMap: writeSourceMap,
+                    maxLineLen: options.maxLineLen,
+                    strictMath: options.strictMath,
+                    strictUnits: options.strictUnits,
+                    urlArgs: options.urlArgs
                 });
-                if (output) {
-                    fd = fs.openSync(output, "w");
-                    fs.writeSync(fd, css, 0, "utf8");
-                } else {
-                    sys.print(css);
-                }
+		if(!options.lint) {
+                    if (output) {
+                        ensureDirectory(output);
+                        fs.writeFileSync(output, css, 'utf8');
+                        if (options.verbose) {
+                            console.log('lessc: wrote ' + output);
+                        }
+                    } else {
+                        sys.print(css);
+		    }
+		}
             } catch (e) {
                 less.writeError(e, options);
-                process.exit(2);
+                currentErrorcode = 2;
+                return;
             }
         }
     });
 };
 
 if (input != '-') {
-    fs.readFile(input, 'utf-8', parseLessFile);
+    fs.readFile(input, 'utf8', parseLessFile);
 } else {
     process.stdin.resume();
     process.stdin.setEncoding('utf8');

data/lib/less/js/bower.json

@@ -0,0 +1,18 @@
+{
+  "name": "less",
+  "version": "1.7.0",
+  "main": "./dist/less-1.7.0.js",
+  "ignore": [
+    "**/.*",
+    "benchmark",
+    "bin",
+    "build",
+    "lib",
+    "test",
+    "*.md",
+    "LICENSE",
+    "Gruntfile.js",
+    "package.json",
+    "bower.json"
+  ]
+}

data/lib/less/js/build/README.md

@@ -0,0 +1,51 @@
+[![Build Status](https://travis-ci.org/less/less.js.png?branch=master)](https://travis-ci.org/less/less.js)
+# [Less.js v<%= pkg.version %>](http://lesscss.org)
+
+> The **dynamic** stylesheet language. [http://lesscss.org](http://lesscss.org).
+
+This is the JavaScript, and now official, stable version of LESS.
+
+
+## Getting Started
+
+Options for adding Less.js to your project:
+
+* Install with [NPM](https://npmjs.org/): `npm install less`
+* [Download the latest release][download]
+* Clone the repo: `git clone git://github.com/less/less.js.git`
+
+## More information
+
+For general information on the language, configuration options or usage visit [lesscss.org](http://lesscss.org).
+
+Here are other resources for using Less.js:
+
+* [stackoverflow.com][so] is a great place to get answers about Less.
+* [Less.js Issues][issues] for reporting bugs
+
+
+## Contributing
+Please read [CONTRIBUTING.md](./CONTRIBUTING.md). Add unit tests for any new or changed functionality. Lint and test your code using [Grunt](http://gruntjs.com/).
+
+### Reporting Issues
+
+Before opening any issue, please search for existing issues and read the [Issue Guidelines](https://github.com/necolas/issue-guidelines), written by [Nicolas Gallagher](https://github.com/necolas/). After that if you find a bug or would like to make feature request, [please open a new issue][issues].
+
+Please report documentation issues in [the documentation project](https://github.com/less/less-docs).
+
+### Development
+
+Read [Developing Less](http://lesscss.org/usage/#developing-less).
+
+## Release History
+See the [changelog](CHANGELOG.md)
+
+## [License](LICENSE)
+
+Copyright (c) 2009-<%= grunt.template.today("yyyy") %> [Alexis Sellier](http://cloudhead.io/) & The Core Less Team
+Licensed under the [Apache License](LICENSE).
+
+
+[so]: http://stackoverflow.com/questions/tagged/twitter-bootstrap+less "StackOverflow.com"
+[issues]: https://github.com/less/less.js/issues "GitHub Issues for Less.js"
+[download]: https://github.com/less/less.js/zipball/master "Download Less.js"

data/lib/less/js/build/amd.js

@@ -2,5 +2,5 @@
 //
 // Define Less as an AMD module.
 if (typeof define === "function" && define.amd) {
-    define("less", [], function () { return less; } );
+    define(function () { return less; } );
 }

data/lib/less/js/build/browser-header.js

@@ -0,0 +1,4 @@
+if (typeof(window.less) === 'undefined' || typeof(window.less.nodeType) !== 'undefined') { window.less = {}; }
+less = window.less;
+tree = window.less.tree = {};
+less.mode = 'browser';