less 3.10.3 → 3.11.3

package/CONTRIBUTING.md

@@ -35,13 +35,13 @@ _Pull requests are encouraged!_
 * Start by adding a feature request to get feedback and see how your idea is received.
 * If your pull request solves an existing issue, but it's different in some way, _please create a new issue_ and make sure to discuss it with the core contributors. Otherwise you risk your hard work being rejected.
 * Do not change the **./dist/** folder, we do this when releasing
-* _Please add tests_ for your work. Tests are invoked using `npm test` command. It will run both node.js tests and browser ([PhantomJS](http://phantomjs.org/)) tests.
+* _Please add tests_ for your work. Tests are invoked using `npm test` command. It will run both node.js tests and browser (Headless Chrome) tests.
 
 ### Coding Standards
 
 * Always use spaces, never tabs
 * End lines in semi-colons.
-* Loosely aim towards jsHint standards
+* Loosely aim towards eslint standards
 
 
 ## Developing

package/Gruntfile.js

@@ -186,7 +186,7 @@ module.exports = function(grunt) {
     const nodeVersion = semver.major(process.versions.node);
     let scriptRuntime = 'node';
     if (nodeVersion < 8) {
-        scriptRuntime = path.resolve(path.join('node_modules', '.bin', 'babel-node')) + ' --presets=@babel/env';
+        scriptRuntime = path.resolve(path.join('node_modules', '.bin', 'ts-node'));
     }
 
     // Project configuration.
@@ -200,23 +200,36 @@ module.exports = function(grunt) {
                 }
             },
             build: {
-                command: [
-                    scriptRuntime + " build/rollup.js --dist"
-                ].join(" && ")
+                command: scriptRuntime + " build/rollup.js --dist"
             },
             testbuild: {
                 command: [
                     scriptRuntime + " build/rollup.js --lessc --out=./tmp/lessc",
                     scriptRuntime + " build/rollup.js --node --out=./tmp/less.cjs.js",
-                    scriptRuntime + " build/rollup.js --browser --out=./test/browser/less.min.js"
+                    scriptRuntime + " build/rollup.js --browser --out=./tmp/browser/less.min.js"
                 ].join(" && ")
             },
+            testcjs: {
+                command: scriptRuntime + " build/rollup.js --node --out=./tmp/less.cjs.js"
+            },
+            testbrowser: {
+                command: scriptRuntime + " build/rollup.js --browser --out=./tmp/browser/less.min.js"
+            },
             test: {
                 command: "node test/index.js"
             },
+            generatebrowser: {
+                command: 'node test/browser/generator/generate.js'
+            },
+            runbrowser: {
+                command: 'node test/browser/generator/runner.js'
+            },
             benchmark: {
                 command: "node benchmark/index.js"
             },
+            benchmarkbrowser: {
+                command: "node test/browser/generator/runner.js benchmark"
+            },
             opts: {
                 // test running with all current options (using `opts` since `options` means something already)
                 command: [
@@ -273,201 +286,7 @@ module.exports = function(grunt) {
             }
         },
 
-        jasmine: {
-            options: {
-                keepRunner: true,
-                host: "http://localhost:8081/",
-                polyfills: [
-                    "./node_modules/phantomjs-polyfill-object-assign/object-assign-polyfill.js",
-                    "test/browser/vendor/promise.js"
-                ],
-                vendor: [
-                    "test/browser/vendor/jasmine-jsreporter.js",
-                    "test/browser/common.js",
-                    "test/browser/less.min.js"
-                ],
-                template: "test/browser/test-runner-template.tmpl"
-            },
-            main: {
-                // src is used to build list of less files to compile
-                src: [
-                    "test/less/*.less",
-                    "!test/less/plugin-preeval.less", // uses ES6 syntax
-                    // Don't test NPM import, obviously
-                    "!test/less/plugin-module.less",
-                    "!test/less/import-module.less",
-                    "!test/less/javascript.less",
-                    "!test/less/urls.less",
-                    "!test/less/empty.less"
-                ],
-                options: {
-                    helpers: "test/browser/runner-main-options.js",
-                    specs: "test/browser/runner-main-spec.js",
-                    outfile: "tmp/browser/test-runner-main.html"
-                }
-            },
-            legacy: {
-                src: ["test/less/legacy/*.less"],
-                options: {
-                    helpers: "test/browser/runner-legacy-options.js",
-                    specs: "test/browser/runner-legacy-spec.js",
-                    outfile: "tmp/browser/test-runner-legacy.html"
-                }
-            },
-            strictUnits: {
-                src: ["test/less/strict-units/*.less"],
-                options: {
-                    helpers: "test/browser/runner-strict-units-options.js",
-                    specs: "test/browser/runner-strict-units-spec.js",
-                    outfile: "tmp/browser/test-runner-strict-units.html"
-                }
-            },
-            errors: {
-                src: [
-                    "test/less/errors/*.less",
-                    "!test/less/errors/javascript-error.less",
-                    "test/browser/less/errors/*.less"
-                ],
-                options: {
-                    timeout: 20000,
-                    helpers: "test/browser/runner-errors-options.js",
-                    specs: "test/browser/runner-errors-spec.js",
-                    outfile: "tmp/browser/test-runner-errors.html"
-                }
-            },
-            noJsErrors: {
-                src: ["test/less/no-js-errors/*.less"],
-                options: {
-                    helpers: "test/browser/runner-no-js-errors-options.js",
-                    specs: "test/browser/runner-no-js-errors-spec.js",
-                    outfile: "tmp/browser/test-runner-no-js-errors.html"
-                }
-            },
-            browser: {
-                src: [
-                    "test/browser/less/*.less",
-                    "test/browser/less/plugin/*.less"
-                ],
-                options: {
-                    helpers: "test/browser/runner-browser-options.js",
-                    specs: "test/browser/runner-browser-spec.js",
-                    outfile: "tmp/browser/test-runner-browser.html"
-                }
-            },
-            relativeUrls: {
-                src: ["test/browser/less/relative-urls/*.less"],
-                options: {
-                    helpers: "test/browser/runner-relative-urls-options.js",
-                    specs: "test/browser/runner-relative-urls-spec.js",
-                    outfile: "tmp/browser/test-runner-relative-urls.html"
-                }
-            },
-            rewriteUrls: {
-                src: ["test/browser/less/rewrite-urls/*.less"],
-                options: {
-                    helpers: "test/browser/runner-rewrite-urls-options.js",
-                    specs: "test/browser/runner-rewrite-urls-spec.js",
-                    outfile: "tmp/browser/test-runner-rewrite-urls.html"
-                }
-            },
-            rootpath: {
-                src: ["test/browser/less/rootpath/*.less"],
-                options: {
-                    helpers: "test/browser/runner-rootpath-options.js",
-                    specs: "test/browser/runner-rootpath-spec.js",
-                    outfile: "tmp/browser/test-runner-rootpath.html"
-                }
-            },
-            rootpathRelative: {
-                src: ["test/browser/less/rootpath-relative/*.less"],
-                options: {
-                    helpers: "test/browser/runner-rootpath-relative-options.js",
-                    specs: "test/browser/runner-rootpath-relative-spec.js",
-                    outfile: "tmp/browser/test-runner-rootpath-relative.html"
-                }
-            },
-            rootpathRewriteUrls: {
-                src: ["test/browser/less/rootpath-rewrite-urls/*.less"],
-                options: {
-                    helpers:
-                        "test/browser/runner-rootpath-rewrite-urls-options.js",
-                    specs: "test/browser/runner-rootpath-rewrite-urls-spec.js",
-                    outfile:
-                        "tmp/browser/test-runner-rootpath-rewrite-urls.html"
-                }
-            },
-            production: {
-                src: ["test/browser/less/production/*.less"],
-                options: {
-                    helpers: "test/browser/runner-production-options.js",
-                    specs: "test/browser/runner-production-spec.js",
-                    outfile: "tmp/browser/test-runner-production.html"
-                }
-            },
-            modifyVars: {
-                src: ["test/browser/less/modify-vars/*.less"],
-                options: {
-                    helpers: "test/browser/runner-modify-vars-options.js",
-                    specs: "test/browser/runner-modify-vars-spec.js",
-                    outfile: "tmp/browser/test-runner-modify-vars.html"
-                }
-            },
-            globalVars: {
-                src: ["test/browser/less/global-vars/*.less"],
-                options: {
-                    helpers: "test/browser/runner-global-vars-options.js",
-                    specs: "test/browser/runner-global-vars-spec.js",
-                    outfile: "tmp/browser/test-runner-global-vars.html"
-                }
-            },
-            postProcessorPlugin: {
-                src: ["test/less/postProcessorPlugin/*.less"],
-                options: {
-                    helpers: [
-                        "test/plugins/postprocess/index.js",
-                        "test/browser/runner-postProcessorPlugin-options.js"
-                    ],
-                    specs: "test/browser/runner-postProcessorPlugin.js",
-                    outfile:
-                        "tmp/browser/test-runner-post-processor-plugin.html"
-                }
-            },
-            preProcessorPlugin: {
-                src: ["test/less/preProcessorPlugin/*.less"],
-                options: {
-                    helpers: [
-                        "test/plugins/preprocess/index.js",
-                        "test/browser/runner-preProcessorPlugin-options.js"
-                    ],
-                    specs: "test/browser/runner-preProcessorPlugin.js",
-                    outfile: "tmp/browser/test-runner-pre-processor-plugin.html"
-                }
-            },
-            visitorPlugin: {
-                src: ["test/less/visitorPlugin/*.less"],
-                options: {
-                    helpers: [
-                        "test/plugins/visitor/index.js",
-                        "test/browser/runner-VisitorPlugin-options.js"
-                    ],
-                    specs: "test/browser/runner-VisitorPlugin.js",
-                    outfile: "tmp/browser/test-runner-visitor-plugin.html"
-                }
-            },
-            filemanagerPlugin: {
-                src: ["test/less/filemanagerPlugin/*.less"],
-                options: {
-                    helpers: [
-                        "test/plugins/filemanager/index.js",
-                        "test/browser/runner-filemanagerPlugin-options.js"
-                    ],
-                    specs: "test/browser/runner-filemanagerPlugin.js",
-                    outfile: "tmp/browser/test-runner-filemanager-plugin.html"
-                }
-            }
-        },
-
-        "saucelabs-jasmine": sauceJobs,
+        "saucelabs-mocha": sauceJobs,
 
         // Clean the version of less built for the tests
         clean: {
@@ -495,20 +314,20 @@ module.exports = function(grunt) {
 
     // Create the browser version of less.js
     grunt.registerTask("browsertest-lessjs", [
-        "shell:testbuild"
+        "shell:testbrowser"
     ]);
 
     // Run all browser tests
     grunt.registerTask("browsertest", [
         "browsertest-lessjs",
         "connect",
-        "jasmine"
+        "shell:runbrowser"
     ]);
 
     // setup a web server to run the browser tests in a browser rather than phantom
     grunt.registerTask("browsertest-server", [
         "browsertest-lessjs",
-        "jasmine::build",
+        "shell:generatebrowser",
         "connect::keepalive"
     ]);
 
@@ -526,13 +345,13 @@ module.exports = function(grunt) {
 
     grunt.registerTask("sauce", [
         "browsertest-lessjs",
-        "jasmine::build",
+        "shell:generatebrowser",
         "connect",
         "sauce-after-setup"
     ]);
 
     grunt.registerTask("sauce-after-setup", [
-        "saucelabs-jasmine:all",
+        "saucelabs-mocha:all",
         "clean:sauce_log"
     ]);
 
@@ -544,14 +363,12 @@ module.exports = function(grunt) {
         "shell:opts",
         "shell:plugin",
         "connect",
-        "jasmine"
+        "shell:runbrowser"
     ];
 
     if (
         isNaN(Number(process.env.TRAVIS_PULL_REQUEST, 10)) &&
-        Number(process.env.TRAVIS_NODE_VERSION) === 4 &&
-        (process.env.TRAVIS_BRANCH === "master" ||
-            process.env.TRAVIS_BRANCH === "3.x")
+        (process.env.TRAVIS_BRANCH === "master")
     ) {
         testTasks.push("force:on");
         testTasks.push("sauce-after-setup");
@@ -567,8 +384,11 @@ module.exports = function(grunt) {
     // Run shell plugin test
     grunt.registerTask("shell-plugin", ["shell:plugin"]);
 
-    // Run all tests except browsertest
-    grunt.registerTask("quicktest", testTasks.slice(0, -1));
+    // Quickly build and run Node tests
+    grunt.registerTask("quicktest", [
+        "shell:testcjs",
+        "shell:test"
+    ]);
 
     // generate a good test environment for testing sourcemaps
     grunt.registerTask("sourcemap-test", [
@@ -579,5 +399,15 @@ module.exports = function(grunt) {
     ]);
 
     // Run benchmark
-    grunt.registerTask("benchmark", ["shell:benchmark"]);
+    grunt.registerTask("benchmark-node", [
+        "shell:testcjs",
+        "shell:benchmark"
+    ]);
+
+    // Run all browser tests
+    grunt.registerTask("benchmark", [
+        "browsertest-lessjs",
+        "connect",
+        "shell:benchmarkbrowser"
+    ]);
 };

package/README.md

@@ -1,11 +1,9 @@
 <p align="center"><img src="http://lesscss.org/public/img/less_logo.png" width="264" height="117">
 
-<p align="center"><a href="http://badge.fury.io/js/less"><img src="https://badge.fury.io/js/less.svg"></a> <a href="https://travis-ci.org/less/less.js"><img src="https://travis-ci.org/less/less.js.svg?branch=master" style="max-width:100%;"></a> <a href="https://ci.appveyor.com/project/lukeapage/less-js/branch/master"><img src="https://ci.appveyor.com/api/projects/status/bx2qspy3qbuxpl9q/branch/master?svg=true" style="max-width:100%;"></a> <a href="https://david-dm.org/less/less.js"><img src="https://david-dm.org/less/less.js.svg" style="max-width:100%;"></a> <a href="https://david-dm.org/less/less.js#info=devDependencies"><img src="https://david-dm.org/less/less.js/dev-status.svg" style="max-width:100%;"></a> <a href="https://david-dm.org/less/less.js#info=optionalDependencies"><img alt="optionalDependency Status" src="https://david-dm.org/less/less.js/optional-status.svg" style="max-width:100%;"></a> <a href="https://twitter.com/lesstocss"><img alt="Twitter Follow" src="https://img.shields.io/twitter/follow/lesstocss.svg?style=flat-square" style="max-width:100%;"></a></p>
+<p align="center"><a href="http://badge.fury.io/js/less"><a href="https://opencollective.com/less" alt="Financial Contributors on Open Collective"><img src="https://opencollective.com/less/all/badge.svg?label=financial+contributors" /></a> <img src="https://badge.fury.io/js/less.svg"></a> <a href="https://travis-ci.org/less/less.js"><img src="https://travis-ci.org/less/less.js.svg?branch=master" style="max-width:100%;"></a> <a href="https://ci.appveyor.com/project/lukeapage/less-js/branch/master"><img src="https://ci.appveyor.com/api/projects/status/bx2qspy3qbuxpl9q/branch/master?svg=true" style="max-width:100%;"></a> <a href="https://david-dm.org/less/less.js"><img src="https://david-dm.org/less/less.js.svg" style="max-width:100%;"></a> <a href="https://david-dm.org/less/less.js#info=devDependencies"><img src="https://david-dm.org/less/less.js/dev-status.svg" style="max-width:100%;"></a> <a href="https://twitter.com/lesstocss"><img alt="Twitter Follow" src="https://img.shields.io/twitter/follow/lesstocss.svg?style=flat-square" style="max-width:100%;"></a></p>
 
 <p align="center"><a href="https://gitter.im/less/less.js?utm_source=badge&amp;utm_medium=badge&amp;utm_campaign=pr-badge&amp;utm_content=badge"><img src="https://badges.gitter.im/Join%20Chat.svg" style="max-width:100%;"></a> <br><sup class="rich-diff-level-one">Chat with Less.js users and contributors</sup></p>
 
-<p align="center"><a href="https://saucelabs.com/u/less" rel="nofollow"><img src="https://saucelabs.com/browser-matrix/less.svg" alt="Sauce Test Status" style="max-width:100%;"></a></p>
-
 # [Less.js](http://lesscss.org)
 
 > The **dynamic** stylesheet language. [http://lesscss.org](http://lesscss.org).
@@ -47,6 +45,36 @@ Read [Developing Less](http://lesscss.org/usage/#developing-less).
 ## Release History
 See the [changelog](CHANGELOG.md)
 
+## Contributors
+
+### Code Contributors
+
+This project exists thanks to all the people who contribute. [[Contribute](CONTRIBUTING.md)].
+<a href="https://github.com/less/less.js/graphs/contributors"><img src="https://opencollective.com/less/contributors.svg?width=890&button=false" /></a>
+
+### Financial Contributors
+
+Become a financial contributor and help us sustain our community. [[Contribute](https://opencollective.com/less/contribute)]
+
+#### Individuals
+
+<a href="https://opencollective.com/less"><img src="https://opencollective.com/less/individuals.svg?width=890"></a>
+
+#### Organizations
+
+Support this project with your organization. Your logo will show up here with a link to your website. [[Contribute](https://opencollective.com/less/contribute)]
+
+<a href="https://opencollective.com/less/organization/0/website"><img src="https://opencollective.com/less/organization/0/avatar.svg"></a>
+<a href="https://opencollective.com/less/organization/1/website"><img src="https://opencollective.com/less/organization/1/avatar.svg"></a>
+<a href="https://opencollective.com/less/organization/2/website"><img src="https://opencollective.com/less/organization/2/avatar.svg"></a>
+<a href="https://opencollective.com/less/organization/3/website"><img src="https://opencollective.com/less/organization/3/avatar.svg"></a>
+<a href="https://opencollective.com/less/organization/4/website"><img src="https://opencollective.com/less/organization/4/avatar.svg"></a>
+<a href="https://opencollective.com/less/organization/5/website"><img src="https://opencollective.com/less/organization/5/avatar.svg"></a>
+<a href="https://opencollective.com/less/organization/6/website"><img src="https://opencollective.com/less/organization/6/avatar.svg"></a>
+<a href="https://opencollective.com/less/organization/7/website"><img src="https://opencollective.com/less/organization/7/avatar.svg"></a>
+<a href="https://opencollective.com/less/organization/8/website"><img src="https://opencollective.com/less/organization/8/avatar.svg"></a>
+<a href="https://opencollective.com/less/organization/9/website"><img src="https://opencollective.com/less/organization/9/avatar.svg"></a>
+
 ## [License](LICENSE)
 
 Copyright (c) 2009-2017 [Alexis Sellier](http://cloudhead.io) & The Core Less Team