less 3.10.3 → 3.11.3

package/lib/less/contexts.js

@@ -84,7 +84,7 @@ contexts.Eval = class {
 
     exitCalc() {
         this.calcStack.pop();
-        if (!this.calcStack) {
+        if (!this.calcStack.length) {
             this.inCalc = false;
         }
     }

package/lib/less/environment/abstract-file-manager.js

@@ -124,4 +124,4 @@ class AbstractFileManager {
     };
 }
 
-export default AbstractFileManager;
+export default AbstractFileManager;

package/lib/less/import-manager.js

@@ -26,7 +26,7 @@ export default environment => {
             this.context = context;
             // Deprecated? Unused outside of here, could be useful.
             this.queue = [];        // Files which haven't been imported yet
-            this.files = {};        // Holds the imported parse trees.
+            this.files = [];        // List of files imported
         }
 
         /**
@@ -52,11 +52,9 @@ export default environment => {
                     logger.info(`The file ${fullPath} was skipped because it was not found and the import was marked optional.`);
                 }
                 else {
-                    // Inline imports aren't cached here.
-                    // If we start to cache them, please make sure they won't conflict with non-inline imports of the
-                    // same name as they used to do before this comment and the condition below have been added.
-                    if (!importManager.files[fullPath] && !importOptions.inline) {
-                        importManager.files[fullPath] = { root, options: importOptions };
+                    const files = importManager.files
+                    if (files.indexOf(fullPath) === -1) {
+                        files.push(fullPath)
                     }
                     if (e && !importManager.error) { importManager.error = e; }
                     callback(e, root, importedEqualsRoot, fullPath);
@@ -122,20 +120,9 @@ export default environment => {
                 } else if (importOptions.inline) {
                     fileParsedFunc(null, contents, resolvedFilename);
                 } else {
-
-                    // import (multiple) parse trees apparently get altered and can't be cached.
-                    // TODO: investigate why this is
-                    if (importManager.files[resolvedFilename]
-                        && !importManager.files[resolvedFilename].options.multiple
-                        && !importOptions.multiple) {
-
-                        fileParsedFunc(null, importManager.files[resolvedFilename].root, resolvedFilename);
-                    }
-                    else {
-                        new Parser(newEnv, importManager, newFileInfo).parse(contents, (e, root) => {
-                            fileParsedFunc(e, root, resolvedFilename);
-                        });
-                    }
+                    new Parser(newEnv, importManager, newFileInfo).parse(contents, (e, root) => {
+                        fileParsedFunc(e, root, resolvedFilename);
+                    });
                 }
             };
             let promise;

package/lib/less/index.js

@@ -42,7 +42,7 @@ export default (environment, fileManagers) => {
      * It's not clear what should / must be public and why.
      */
     const initial = {
-        version: [3, 10, 3],
+        version: [3, 11, 3],
         data,
         tree,
         Environment,

package/lib/less/less-error.js

@@ -1,4 +1,7 @@
 import * as utils from './utils';
+
+const anonymousFunc = /(<anonymous>|Function):(\d+):(\d+)/;
+
 /**
  * This is a centralized class of any error that could be thrown internally (mostly by the parser).
  * Besides standard .message it keeps some additional data like a path to the file where the error
@@ -44,11 +47,28 @@ const LessError = function LessError(e, fileContentMap, currentFilename) {
         this.column = col;
 
         if (!this.line && this.stack) {
-            const found = this.stack.match(/(<anonymous>|Function):(\d+):(\d+)/);
+            const found = this.stack.match(anonymousFunc);
+
+            /**
+             * We have to figure out how this environment stringifies anonymous functions
+             * so we can correctly map plugin errors.
+             * 
+             * Note, in Node 8, the output of anonymous funcs varied based on parameters
+             * being present or not, so we inject dummy params.
+             */
+            const func = new Function('a', 'throw new Error()');
+            let lineAdjust = 0;
+            try {
+                func();
+            } catch (e) {
+                const match = e.stack.match(anonymousFunc);
+                const line = parseInt(match[2]);
+                lineAdjust = 1 - line;
+            }
 
             if (found) {
                 if (found[2]) {
-                    this.line = parseInt(found[2]) - 2;
+                    this.line = parseInt(found[2]) + lineAdjust;
                 }
                 if (found[3]) {
                     this.column = parseInt(found[3]);

package/lib/less/parse-tree.js

@@ -52,12 +52,8 @@ export default SourceMapBuilder => {
                 result.map = sourceMapBuilder.getExternalSourceMap();
             }
 
-            result.imports = [];
-            for (const file in this.imports.files) {
-                if (this.imports.files.hasOwnProperty(file) && file !== this.imports.rootFilename) {
-                    result.imports.push(file);
-                }
-            }
+            const rootFilename = this.imports.rootFilename
+            result.imports = this.imports.files.filter(file => file !== rootFilename);
             return result;
         }
     }

package/lib/less/parser/parser.js

@@ -327,8 +327,8 @@ const Parser = function Parser(context, imports, fileInfo) {
                         continue;
                     }
 
-                    node = mixin.definition() || this.declaration() || this.ruleset() ||
-                        mixin.call(false, false) || this.variableCall() || this.entities.call() || this.atrule();
+                    node = mixin.definition() || this.declaration() || mixin.call(false, false) || 
+                        this.ruleset() || this.variableCall() || this.entities.call() || this.atrule();
                     if (node) {
                         root.push(node);
                     } else {
@@ -766,7 +766,6 @@ const Parser = function Parser(context, imports, fileInfo) {
             //
             variableCall: function (parsedName) {
                 let lookups;
-                let important;
                 const i = parserInput.i;
                 const inValue = !!parsedName;
                 let name = parsedName;
@@ -787,10 +786,6 @@ const Parser = function Parser(context, imports, fileInfo) {
                         name = name[1];
                     }
 
-                    if (lookups && parsers.important()) {
-                        important = true;
-                    }
-
                     const call = new tree.VariableCall(name, i, fileInfo);
                     if (!inValue && parsers.end()) {
                         parserInput.forget();
@@ -798,7 +793,7 @@ const Parser = function Parser(context, imports, fileInfo) {
                     }
                     else {
                         parserInput.forget();
-                        return new tree.NamespaceValue(call, lookups, important, i, fileInfo);
+                        return new tree.NamespaceValue(call, lookups, i, fileInfo);
                     }
                 }
 
@@ -927,7 +922,7 @@ const Parser = function Parser(context, imports, fileInfo) {
                             parserInput.forget();
                             const mixin = new(tree.mixin.Call)(elements, args, index, fileInfo, !lookups && important);
                             if (lookups) {
-                                return new tree.NamespaceValue(mixin, lookups, important);
+                                return new tree.NamespaceValue(mixin, lookups);
                             }
                             else {
                                 return mixin;
@@ -1159,7 +1154,7 @@ const Parser = function Parser(context, imports, fileInfo) {
                             parserInput.restore();
                         }
                     } else {
-                        parserInput.forget();
+                        parserInput.restore();
                     }
                 },
             
@@ -2326,6 +2321,11 @@ const Parser = function Parser(context, imports, fileInfo) {
                         continue;
                     }
                     e = this.addition() || this.entity();
+
+                    if (e instanceof tree.Comment) {
+                        e = null;
+                    }
+
                     if (e) {
                         entities.push(e);
                         // operations do not allow keyword "/" dimension (e.g. small/20px) so we support that here

package/lib/less/tree/debug-info.js

@@ -16,9 +16,10 @@ const debugInfo = (context, ctx, lineSeparator) => {
     return result;
 };
 
-debugInfo.asComment = ctx => `/* line ${ctx.debugInfo.lineNumber}, ${ctx.debugInfo.fileName} */\n`;
+debugInfo.asComment = ctx => ctx.debugInfo ? `/* line ${ctx.debugInfo.lineNumber}, ${ctx.debugInfo.fileName} */\n` : '';
 
 debugInfo.asMediaQuery = ctx => {
+    if (!ctx.debugInfo) { return ''; }
     let filenameWithProtocol = ctx.debugInfo.fileName;
     if (!/^[a-z]+:\/\//i.test(filenameWithProtocol)) {
         filenameWithProtocol = `file://${filenameWithProtocol}`;

package/lib/less/tree/namespace-value.js

@@ -4,12 +4,11 @@ import Ruleset from './ruleset';
 import Selector from './selector';
 
 class NamespaceValue extends Node {
-    constructor(ruleCall, lookups, important, index, fileInfo) {
+    constructor(ruleCall, lookups, index, fileInfo) {
         super();
 
         this.value = ruleCall;
         this.lookups = lookups;
-        this.important = important;
         this._index = index;
         this._fileInfo = fileInfo;
     }

package/lib/less/visitors/visitor.js

@@ -80,8 +80,16 @@ class Visitor {
             }
         }
 
-        if (visitArgs.visitDeeper && node && node.accept) {
-            node.accept(this);
+        if (visitArgs.visitDeeper && node) {
+            if (node.length) {
+                for (var i = 0, cnt = node.length; i < cnt; i++) {
+                    if (node[i].accept) {
+                        node[i].accept(this);
+                    }
+                }
+            } else if (node.accept) {
+                node.accept(this);
+            }
         }
 
         if (funcOut != _noop) {

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

@@ -3,17 +3,11 @@ import fs from './fs';
 import AbstractFileManager from '../less/environment/abstract-file-manager.js';
 
 class FileManager extends AbstractFileManager {
-    constructor() {
-        super();
-
-        this.contents = {};
-    }
-
-    supports(filename, currentDirectory, options, environment) {
+    supports() {
         return true;
     }
 
-    supportsSync(filename, currentDirectory, options, environment) {
+    supportsSync() {
         return true;
     }
 
@@ -107,55 +101,31 @@ class FileManager extends AbstractFileManager {
                                     fullFilename = extFilename;
                                 }
                             }
-
-                            let modified = false;
-
-                            if (self.contents[fullFilename]) {
+                        
+                            const readFileArgs = [fullFilename];
+                            if (!options.rawBuffer) {
+                                readFileArgs.push('utf-8');
+                            }
+                            if (options.syncImport) {
                                 try {
-                                    var stat = fs.statSync.apply(this, [fullFilename]);
-                                    if (stat.mtime.getTime() === self.contents[fullFilename].mtime.getTime()) {
-                                        fulfill({ contents: self.contents[fullFilename].data, filename: fullFilename});
-                                    }
-                                    else {
-                                        modified = true;
-                                    }
+                                    const data = fs.readFileSync.apply(this, readFileArgs);
+                                    fulfill({ contents: data, filename: fullFilename});
                                 }
                                 catch (e) {
-                                    modified = true;
+                                    filenamesTried.push(isNodeModule ? npmPrefix + fullFilename : fullFilename);
+                                    return tryPrefix(j + 1);
                                 }
                             }
-                            if (modified || !self.contents[fullFilename]) {
-                                const readFileArgs = [fullFilename];
-                                if (!options.rawBuffer) {
-                                    readFileArgs.push('utf-8');
-                                }
-                                if (options.syncImport) {
-                                    try {
-                                        const data = fs.readFileSync.apply(this, readFileArgs);
-                                        var stat = fs.statSync.apply(this, [fullFilename]);
-                                        self.contents[fullFilename] = { data, mtime: stat.mtime };
-                                        fulfill({ contents: data, filename: fullFilename});
-                                    }
-                                    catch (e) {
+                            else {
+                                readFileArgs.push(function(e, data) {
+                                    if (e) {
                                         filenamesTried.push(isNodeModule ? npmPrefix + fullFilename : fullFilename);
                                         return tryPrefix(j + 1);
                                     }
-                                }
-                                else {
-                                    readFileArgs.push(function(e, data) {
-                                        if (e) {
-                                            filenamesTried.push(isNodeModule ? npmPrefix + fullFilename : fullFilename);
-                                            return tryPrefix(j + 1);
-                                        }
-                                        const stat = fs.statSync.apply(this, [fullFilename]);
-                                        self.contents[fullFilename] = { data, mtime: stat.mtime };      
-                                        fulfill({ contents: data, filename: fullFilename});
-                                    });
-                                    fs.readFile.apply(this, readFileArgs);
-                                }
-
+                                    fulfill({ contents: data, filename: fullFilename});
+                                });
+                                fs.readFile.apply(this, readFileArgs);
                             }
-
                         }
                         else {
                             tryPathIndex(i + 1);
@@ -174,4 +144,4 @@ class FileManager extends AbstractFileManager {
     }
 }
 
-export default FileManager;
+export default FileManager;

package/lib/lessc.js

@@ -1,6 +1,6 @@
-import path from 'path';
+import * as path from 'path';
 import fs from './less-node/fs';
-import os from 'os';
+import * as os from 'os';
 import * as utils from './less/utils';
 import * as Constants from './less/constants';
 let errno;
@@ -28,25 +28,6 @@ options.reUsePluginManager = true;
 const sourceMapOptions = {};
 let continueProcessing = true;
 
-// Calling process.exit does not flush stdout always. Instead of exiting the process, we set the process' exitCode,
-// close all handles and wait for the event loop to exit the process.
-// @see https://github.com/nodejs/node/issues/6409
-// Unfortunately, node 0.10.x does not support setting process.exitCode, so we need to call reallyExit() explicitly.
-// @see https://nodejs.org/api/process.html#process_process_exitcode
-// Additionally we also need to make sure that uncaughtExceptions are never swallowed.
-// @see https://github.com/less/less.js/issues/2881
-// This code can safely be removed if node 0.10.x is not supported anymore.
-process.on('exit', () => { process.reallyExit(process.exitCode); });
-process.on('uncaughtException', err => {
-    console.error(err);
-    process.exitCode = 1;
-});
-// This code will still be required because otherwise rejected promises would not be reported to the user
-process.on('unhandledRejection', err => {
-    console.error(err);
-    process.exitCode = 1;
-});
-
 const checkArgFunc = (arg, option) => {
     if (!option) {
         console.error(`${arg} option requires a parameter`);
@@ -154,7 +135,7 @@ function render() {
         const existsSync = fs.existsSync || path.existsSync;
         if (!existsSync(dir)) {
             if (mkdirp === undefined) {
-                try {mkdirp = require('mkdirp');}
+                try {mkdirp = require('make-dir');}
                 catch (e) { mkdirp = null; }
             }
             cmd = mkdirp && mkdirp.sync || fs.mkdirSync;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "less",
-  "version": "3.10.3",
+  "version": "3.11.3",
   "description": "Leaner CSS",
   "homepage": "http://lesscss.org",
   "author": {
@@ -36,55 +36,59 @@
   },
   "scripts": {
     "test": "grunt test",
-    "grunt": "grunt"
+    "grunt": "grunt",
+    "changelog": "github-changes -o less -r less.js -a --only-pulls --use-commit-body -m \"(YYYY-MM-DD)\""
   },
   "optionalDependencies": {
     "errno": "^0.1.1",
     "graceful-fs": "^4.1.2",
     "image-size": "~0.5.0",
+    "make-dir": "^2.1.0",
     "mime": "^1.4.1",
-    "mkdirp": "^0.5.0",
     "promise": "^7.1.1",
     "request": "^2.83.0",
     "source-map": "~0.6.0"
   },
   "devDependencies": {
-    "@babel/cli": "^7.5.5",
-    "@babel/core": "^7.5.5",
-    "@babel/node": "^7.5.5",
-    "@babel/preset-env": "^7.5.5",
-    "@typescript-eslint/eslint-plugin": "^1.13.0",
-    "@typescript-eslint/parser": "^1.13.0",
+    "@typescript-eslint/eslint-plugin": "^2.3.3",
+    "@typescript-eslint/parser": "^2.3.3",
+    "benny": "^3.6.12",
     "bootstrap-less-port": "0.3.0",
+    "chai": "^4.2.0",
     "diff": "^3.2.0",
+    "fs-extra": "^8.1.0",
     "git-rev": "^0.2.1",
+    "github-changes": "^1.1.2",
+    "globby": "^10.0.1",
     "grunt": "^1.0.4",
     "grunt-cli": "^1.3.2",
     "grunt-contrib-clean": "^1.0.0",
     "grunt-contrib-connect": "^1.0.2",
-    "grunt-contrib-jasmine": "^1.2.0",
     "grunt-eslint": "^21.1.0",
-    "grunt-saucelabs": "^9.0.0",
+    "grunt-saucelabs": "^9.0.1",
     "grunt-shell": "^1.3.0",
+    "html-template-tag": "^3.2.0",
     "import-module": "file:test/import-module",
     "jit-grunt": "^0.10.0",
     "less-plugin-autoprefix": "^1.5.1",
     "less-plugin-clean-css": "^1.5.1",
     "minimist": "^1.2.0",
+    "mocha": "^6.2.1",
+    "mocha-headless-chrome": "^2.0.3",
+    "mocha-teamcity-reporter": "^3.0.0",
     "performance-now": "^0.2.0",
-    "phantomjs-polyfill-object-assign": "0.0.2",
-    "phantomjs-prebuilt": "^2.1.16",
     "phin": "^2.2.3",
     "promise": "^7.1.1",
     "read-glob": "^3.0.0",
     "rollup": "^1.17.0",
-    "rollup-plugin-babel": "^4.3.3",
     "rollup-plugin-commonjs": "^10.0.1",
     "rollup-plugin-node-resolve": "^5.2.0",
     "rollup-plugin-terser": "^5.1.1",
+    "rollup-plugin-typescript2": "^0.24.3",
     "semver": "^6.3.0",
     "time-grunt": "^1.3.0",
-    "typescript": "^3.5.3",
+    "ts-node": "^8.4.1",
+    "typescript": "^3.6.3",
     "uikit": "2.27.4"
   },
   "keywords": [
@@ -115,6 +119,7 @@
   "rawcurrent": "https://raw.github.com/less/less.js/v",
   "sourcearchive": "https://github.com/less/less.js/archive/v",
   "dependencies": {
-    "clone": "^2.1.2"
+    "clone": "^2.1.2",
+    "tslib": "^1.10.0"
   }
 }

package/test/browser/common.js

@@ -1,44 +1,3 @@
-/* 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 = [];
 window.less = window.less || {};
 
@@ -140,13 +99,15 @@ testSheet = function (sheet) {
                             window.navigator.userAgent.indexOf('Trident/') >= 0) {
                             text = ieFormat(text);
                         }
-                        expect(lessOutput).toEqual(text);
+                        expect(lessOutput).to.equal(text);
                         done();
+                    })
+                    .catch(function(err) {
+                        done(err);
                     });
             })
             .catch(function(err) {
-                console.log(err);
-                done();
+                done(err);
             });
     });
 };
@@ -213,11 +174,14 @@ testErrorSheet = function (sheet) {
                         .replace(/\{node\}[\s\S]*\{\/node\}/g, '')
                         .replace(/\n$/, '')
                         .trim();
-                    expect(actualErrorMsg).toEqual(errorTxt);
+                    expect(actualErrorMsg).to.equal(errorTxt);
                     if (errorTxt == actualErrorMsg) {
                         actualErrorElement.style.display = 'none';
                     }
                     done();
+                })
+                .catch(function (err) {
+                    done(err);
                 });
         });
     });
@@ -234,7 +198,7 @@ testErrorSheetConsole = function (sheet) {
                 .replace(/\nStack Trace\n[\s\S]*/, '');
 
         describe('the error', function () {
-            expect(actualErrorElement).toBe(null);
+            expect(actualErrorElement).to.be.null;
         });
 
         errorFile
@@ -246,7 +210,7 @@ testErrorSheetConsole = function (sheet) {
                     .replace(/\{404status\}/g, ' (404)')
                     .replace(/\{node\}.*\{\/node\}/g, '')
                     .trim();
-                expect(actualErrorMsg).toEqual(errorTxt);
+                expect(actualErrorMsg).to.equal(errorTxt);
                 done();
             });
     });
@@ -264,5 +228,3 @@ loadFile = function (href) {
         request.send(null);
     });
 };
-
-jasmine.DEFAULT_TIMEOUT_INTERVAL = 90000;

package/test/browser/generator/benchmark.config.js

@@ -0,0 +1,50 @@
+
+module.exports = {
+    current: {
+    // src is used to build list of less files to compile
+        src: [
+            "benchmark/benchmark.less"
+        ],
+        options: {
+            helpers: "benchmark/browseroptions.js",
+            specs: "benchmark/browserspec.js",
+            outfile: "tmp/browser/test-runner-benchmark-current.html"
+        }
+    },
+    v3_10_3: {
+        // src is used to build list of less files to compile
+        src: [
+            "benchmark/benchmark.less"
+        ],
+        options: {
+            helpers: "benchmark/browseroptions.js",
+            specs: "benchmark/browserspec.js",
+            outfile: "tmp/browser/test-runner-benchmark-v3_10_3.html",
+            less: "https://cdnjs.cloudflare.com/ajax/libs/less.js/3.10.3/less.min.js"
+        }
+    },
+    v3_9_0: {
+        // src is used to build list of less files to compile
+        src: [
+            "benchmark/benchmark.less"
+        ],
+        options: {
+            helpers: "benchmark/browseroptions.js",
+            specs: "benchmark/browserspec.js",
+            outfile: "tmp/browser/test-runner-benchmark-v3_9_0.html",
+            less: "https://cdnjs.cloudflare.com/ajax/libs/less.js/3.9.0/less.min.js"
+        }
+    },
+    v2_7_3: {
+        // src is used to build list of less files to compile
+        src: [
+            "benchmark/benchmark.less"
+        ],
+        options: {
+            helpers: "benchmark/browseroptions.js",
+            specs: "benchmark/browserspec.js",
+            outfile: "tmp/browser/test-runner-benchmark-v2_7_3.html",
+            less: "https://cdnjs.cloudflare.com/ajax/libs/less.js/2.7.3/less.min.js"
+        }
+    }
+}