less 3.0.0-pre.2 → 3.0.1

package/lib/less-rhino/index.js

@@ -1,6 +1,5 @@
 /* jshint rhino:true, unused: false */
-/* jscs:disable validateIndentation */
-/*global name:true, less, loadStyleSheet, os */
+/* global name:true, less, loadStyleSheet, os */
 
 function formatError(ctx, options) {
     options = options || {};
@@ -9,7 +8,7 @@ function formatError(ctx, options) {
     var extract = ctx.extract;
     var error = [];
 
-//    var stylize = options.color ? require('./lessc_helper').stylize : function (str) { return str; };
+    // var stylize = options.color ? require('./lessc_helper').stylize : function (str) { return str; };
     var stylize = function (str) { return str; };
 
     // only output a stack if it isn't a less error
@@ -81,7 +80,7 @@ function loadStyleSheet(sheet, callback, reload, remaining) {
         }
         try {
             callback(e, root, input, sheet, { local: false, lastModified: 0, remaining: remaining }, sheetName);
-        } catch(e) {
+        } catch (e) {
             writeError(e);
         }
     });
@@ -146,25 +145,10 @@ function writeFile(filename, content) {
 // Command line integration via Rhino
 (function (args) {
 
-    var options = {
-        depends: false,
-        compress: false,
-        cleancss: false,
-        max_line_len: -1,
-        silent: false,
-        verbose: false,
-        lint: false,
-        paths: [],
-        color: true,
-        strictImports: false,
-        rootpath: '',
-        relativeUrls: false,
-        ieCompat: true,
-        strictMath: false,
-        strictUnits: false
-    };
+    var options = require('../default-options');
+
     var continueProcessing = true,
-            currentErrorcode;
+        currentErrorcode;
 
     var checkArgFunc = function(arg, option) {
         if (!option) {
@@ -226,8 +210,8 @@ function writeFile(filename, content) {
                 break;
             case 'h':
             case 'help':
-                    //TODO
-//                require('../lib/less/lessc_helper').printUsage();
+                // TODO
+                // require('../lib/less/lessc_helper').printUsage();
                 continueProcessing = false;
                 break;
             case 'x':
@@ -270,7 +254,7 @@ function writeFile(filename, content) {
                         .split(os.type().match(/Windows/) ? /:(?!\\)|;/ : ':')
                         .map(function(p) {
                             if (p) {
-//                                return path.resolve(process.cwd(), p);
+                                // return path.resolve(process.cwd(), p);
                                 return p;
                             }
                         });
@@ -351,20 +335,20 @@ function writeFile(filename, content) {
 
     var name = args[0];
     if (name && name != '-') {
-//        name = path.resolve(process.cwd(), name);
+        // name = path.resolve(process.cwd(), name);
     }
     var output = args[1];
     var outputbase = args[1];
     if (output) {
         options.sourceMapOutputFilename = output;
-//        output = path.resolve(process.cwd(), output);
+        // output = path.resolve(process.cwd(), output);
         if (warningMessages) {
             console.log(warningMessages);
         }
     }
 
-//  options.sourceMapBasepath = process.cwd();
-//    options.sourceMapBasepath = '';
+    // options.sourceMapBasepath = process.cwd();
+    // options.sourceMapBasepath = '';
 
     if (options.sourceMap === true) {
         console.log("output: " + output);
@@ -382,24 +366,25 @@ function writeFile(filename, content) {
         console.log("lessc: no inout files");
         console.log("");
         // TODO
-//        require('../lib/less/lessc_helper').printUsage();
+        // 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);
-//        }
-//    };
+    /*
+    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) {
@@ -443,7 +428,7 @@ function writeFile(filename, content) {
             }
         });
     }
-    catch(e) {
+    catch (e) {
         writeError(e, options);
         quit(1);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "less",
-  "version": "3.0.0-pre.2",
+  "version": "3.0.1",
   "description": "Leaner CSS",
   "homepage": "http://lesscss.org",
   "author": {
@@ -34,7 +34,7 @@
   },
   "browser": "./dist/less.js",
   "engines": {
-    "node": ">=0.12"
+    "node": ">=4"
   },
   "scripts": {
     "test": "grunt test"
@@ -43,26 +43,32 @@
     "errno": "^0.1.1",
     "graceful-fs": "^4.1.2",
     "image-size": "~0.5.0",
-    "mime": "^1.2.11",
+    "mime": "^1.4.1",
     "mkdirp": "^0.5.0",
     "promise": "^7.1.1",
-    "source-map": "^0.5.3"
+    "source-map": "^0.5.3",
+    "request": "2.81.0"
   },
   "devDependencies": {
-    "diff": "^2.2.2",
+    "diff": "^3.2.0",
+    "git-rev": "^0.2.1",
     "grunt": "~0.4.5",
     "grunt-browserify": "^5.0.0",
     "grunt-contrib-clean": "^1.0.0",
     "grunt-contrib-concat": "^1.0.1",
     "grunt-contrib-connect": "^1.0.2",
     "grunt-contrib-jasmine": "^1.0.3",
-    "grunt-contrib-jshint": "^1.0.0",
     "grunt-contrib-uglify": "^1.0.1",
-    "grunt-jscs": "^2.8.0",
-    "grunt-saucelabs": "^8.6.2",
+    "grunt-eslint": "^19.0.0",
+    "grunt-saucelabs": "^9.0.0",
     "grunt-shell": "^1.3.0",
+    "import-module": "file:test/import-module",
     "jit-grunt": "^0.10.0",
+    "less-plugin-clean-css": "^1.5.1",
+    "performance-now": "^0.2.0",
     "phantomjs-prebuilt": "^2.1.7",
+    "phin": "^2.2.3",
+    "promise": "^7.1.1",
     "time-grunt": "^1.3.0"
   },
   "keywords": [
@@ -91,5 +97,6 @@
     "css less"
   ],
   "rawcurrent": "https://raw.github.com/less/less.js/v",
-  "sourcearchive": "https://github.com/less/less.js/archive/v"
+  "sourcearchive": "https://github.com/less/less.js/archive/v",
+  "dependencies": {}
 }

package/test/browser/common.js

@@ -1,8 +1,42 @@
 /* Add js reporter for sauce */
-
 jasmine.getEnv().addReporter(new jasmine.JSReporter2());
 jasmine.getEnv().defaultTimeoutInterval = 3000;
 
+// From https://github.com/axemclion/grunt-saucelabs/issues/109#issuecomment-166767282
+// (function () {
+//     var oldJSReport = window.jasmine.getJSReport;
+//     window.jasmine.getJSReport = function () {
+//         var results = oldJSReport();
+//         if (results) {
+//             return {
+//                 durationSec: results.durationSec,
+//                 suites: removePassingTests(results.suites),
+//                 passed: results.passed
+//             };
+//         } else {
+//             return null;
+//         }
+//     };
+
+//     function removePassingTests (suites) {
+//         return suites.filter(specFailed)
+//             .map(mapSuite);
+//     }
+
+//     function mapSuite (suite) {
+//         var result = {};
+//         for (var s in suite) {
+//             result[s] = suite[s];
+//         }
+//         result.specs = suite.specs.filter(specFailed);
+//         result.suites = removePassingTests(suite.suites);
+//         return result;
+//     }
+
+//     function specFailed (item) {
+//         return !item.passed;
+//     }
+// })();
 /* record log messages for testing */
 
 var logMessages = [];
@@ -45,15 +79,15 @@ less.loggers = [
     }
 ];
 
-var testLessEqualsInDocument = function () {
+testLessEqualsInDocument = function () {
     testLessInDocument(testSheet);
 };
 
-var testLessErrorsInDocument = function (isConsole) {
+testLessErrorsInDocument = function (isConsole) {
     testLessInDocument(isConsole ? testErrorSheetConsole : testErrorSheet);
 };
 
-var testLessInDocument = function (testFunc) {
+testLessInDocument = function (testFunc) {
     var links = document.getElementsByTagName('link'),
         typePattern = /^text\/(x-)?less$/;
 
@@ -65,7 +99,7 @@ var testLessInDocument = function (testFunc) {
     }
 };
 
-var ieFormat = function(text) {
+ieFormat = function(text) {
     var styleNode = document.createElement('style');
     styleNode.setAttribute('type', 'text/css');
     var headNode = document.getElementsByTagName('head')[0];
@@ -84,7 +118,7 @@ var ieFormat = function(text) {
     return transformedText;
 };
 
-var testSheet = function (sheet) {
+testSheet = function (sheet) {
     it(sheet.id + " should match the expected output", function (done) {
         var lessOutputId = sheet.id.replace("original-", ""),
             expectedOutputId = "expected-" + lessOutputId,
@@ -113,7 +147,7 @@ var testSheet = function (sheet) {
     });
 };
 
-//TODO: do it cleaner - the same way as in css
+// TODO: do it cleaner - the same way as in css
 
 function extractId(href) {
     return href.replace(/^[a-z-]+:\/+?[^\/]+/i, '') // Remove protocol & domain
@@ -123,7 +157,7 @@ function extractId(href) {
         .replace(/\./g, ':'); // Replace dots with colons(for valid id)
 }
 
-var waitFor = function (waitFunc) {
+waitFor = function (waitFunc) {
     return new Promise(function (resolve) {
         var timeoutId = setInterval(function () {
             if (waitFunc()) {
@@ -134,7 +168,7 @@ var waitFor = function (waitFunc) {
     });
 };
 
-var testErrorSheet = function (sheet) {
+testErrorSheet = function (sheet) {
     it(sheet.id + " should match an error", function (done) {
         var lessHref = sheet.href,
             id = "less-error-message:" + extractId(lessHref),
@@ -148,7 +182,7 @@ var testErrorSheet = function (sheet) {
             actualErrorElement = document.getElementById(id);
             return actualErrorElement !== null;
         }).then(function () {
-                var innerText = (actualErrorElement.innerHTML
+            var innerText = (actualErrorElement.innerHTML
                         .replace(/<h3>|<\/?p>|<a href="[^"]*">|<\/a>|<ul>|<\/?pre( class="?[^">]*"?)?>|<\/li>|<\/?label>/ig, "")
                         .replace(/<\/h3>/ig, " ")
                         .replace(/<li>|<\/ul>|<br>/ig, "\n"))
@@ -156,34 +190,36 @@ var testErrorSheet = function (sheet) {
                         // for IE8
                         .replace(/\r\n/g, "\n")
                         .replace(/\. \nin/, ". in");
-                actualErrorMsg = innerText
+            actualErrorMsg = innerText
                     .replace(/\n\d+/g, function (lineNo) {
                         return lineNo + " ";
                     })
                     .replace(/\n\s*in /g, " in ")
                     .replace(/\n{2,}/g, "\n")
                     .replace(/\nStack Trace\n[\s\S]*/i, "")
-                    .replace(/\n$/, "");
-                errorFile
+                    .replace(/\n$/, "")
+                    .trim();
+            errorFile
                     .then(function (errorTxt) {
                         errorTxt = errorTxt
                             .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$/, "");
+                            .replace(/\{node\}[\s\S]*\{\/node\}/g, "")
+                            .replace(/\n$/, "")
+                            .trim();
                         expect(actualErrorMsg).toEqual(errorTxt);
                         if (errorTxt == actualErrorMsg) {
                             actualErrorElement.style.display = "none";
                         }
                         done();
                     });
-            });
+        });
     });
 };
 
-var testErrorSheetConsole = function (sheet) {
+testErrorSheetConsole = function (sheet) {
     it(sheet.id + " should match an error", function (done) {
         var lessHref = sheet.href,
             id = sheet.id.replace(/^original-less:/, "less-error-message:"),
@@ -212,7 +248,7 @@ var testErrorSheetConsole = function (sheet) {
     });
 };
 
-var loadFile = function (href) {
+loadFile = function (href) {
     return new Promise(function (resolve, reject) {
         var request = new XMLHttpRequest();
         request.open('GET', href, true);

package/test/browser/css/plugin/plugin.css

@@ -0,0 +1,3 @@
+.test {
+  val: http://localhost:8081/tmp/browser/test-runner-browser.html;
+}

package/test/browser/jasmine-jsreporter.js

@@ -42,7 +42,7 @@
      * @param startMs Start time in Milliseconds
      * @param finishMs Finish time in Milliseconds
      * @return Elapsed time in Seconds */
-    function elapsedSec (startMs, finishMs) {
+    function elapsedSec(startMs, finishMs) {
         return (finishMs - startMs) / 1000;
     }
 
@@ -52,7 +52,7 @@
      * @param amount Amount to round
      * @param numOfDecDigits Number of Digits to round to. Default value is '2'.
      * @return Rounded amount */
-    function round (amount, numOfDecDigits) {
+    function round(amount, numOfDecDigits) {
         numOfDecDigits = numOfDecDigits || 2;
         return Math.round(amount * Math.pow(10, numOfDecDigits)) / Math.pow(10, numOfDecDigits);
     }
@@ -61,7 +61,7 @@
      * Create a new array which contains only the failed items.
      * @param items Items which will be filtered
      * @returns {Array} of failed items */
-    function failures (items) {
+    function failures(items) {
         var fs = [], i, v;
         for (i = 0; i < items.length; i += 1) {
             v = items[i];
@@ -76,7 +76,7 @@
      * Collect information about a Suite, recursively, and return a JSON result.
      * @param suite The Jasmine Suite to get data from
      */
-    function getSuiteData (suite) {
+    function getSuiteData(suite) {
         var suiteData = {
                 description : suite.description,
                 durationSec : 0,

package/test/browser/less/plugin/plugin.js

@@ -0,0 +1,7 @@
+registerPlugin({
+    install: function(less, pluginManager, functions) {
+        functions.add('func', function() {
+            return less.anonymous(location.href);
+        });
+    }
+});

package/test/browser/less/plugin/plugin.less

@@ -0,0 +1,4 @@
+@plugin "plugin";
+.test {
+  val: func();
+}