less 4.1.0 → 4.1.3

package/.eslintignore

@@ -2,4 +2,5 @@ Gruntfile.js
 dist/*
 tmp/*
 lib/*
-test/browser/less.min.js
+test/browser/less.min.js
+node_modules

package/.eslintrc.json

@@ -1,3 +1,71 @@
 {
-    "extends": "../../.eslintrc.json"
-}
+    "parser": "@typescript-eslint/parser",
+    "parserOptions": {
+        "ecmaVersion": 2018,
+        "sourceType": "module"
+    },
+    "plugins": ["@typescript-eslint"],
+    "env": {
+        "browser": true,
+        "node": true
+    },
+    "globals": {},
+    "rules": {
+        "no-eval": 2,
+        "no-use-before-define": [
+            2,
+            {
+                "functions": false
+            }
+        ],
+        "no-undef": 0,
+        "no-unused-vars": 1,
+        "no-caller": 2,
+        "no-eq-null": 1,
+        "guard-for-in": 2,
+        "no-implicit-coercion": [
+            2,
+            {
+                "boolean": false,
+                "string": true,
+                "number": true
+            }
+        ],
+        "no-with": 2,
+        "no-mixed-spaces-and-tabs": 2,
+        "no-multiple-empty-lines": 2,
+        "dot-location": [2, "property"],
+        "operator-linebreak": [0, "after"],
+        "keyword-spacing": [2, {}],
+        "space-unary-ops": [
+            2,
+            {
+                "words": false,
+                "nonwords": false
+            }
+        ],
+        "no-spaced-func": 2,
+        "space-before-function-paren": [
+            1,
+            {
+                "anonymous": "ignore",
+                "named": "never"
+            }
+        ],
+        "comma-dangle": [2, "never"],
+        "no-trailing-spaces": 0,
+        "max-len": [2, 160],
+        "comma-style": [2, "last"],
+        "curly": [2, "all"],
+        "space-infix-ops": 2,
+        "spaced-comment": 1,
+        "space-before-blocks": [2, "always"],
+        "indent": [
+            2,
+            4,
+            {
+                "SwitchCase": 1
+            }
+        ]
+    }
+}

package/Gruntfile.js

@@ -12,7 +12,6 @@ module.exports = function(grunt) {
     // Report the elapsed execution time of tasks.
     require("time-grunt")(grunt);
 
-    var COMPRESS_FOR_TESTS = false;
     var git = require("git-rev");
 
     // Sauce Labs browser
@@ -184,17 +183,11 @@ module.exports = function(grunt) {
     // Make the SauceLabs jobs
     ["all"].concat(browserTests).map(makeJob);
 
-    var semver = require('semver');
     var path = require('path');
 
     // Handle async / await in Rollup build for tests
-    // Remove this when Node 6 is no longer supported for the build/test process
-    const nodeVersion = semver.major(process.versions.node);
     const tsNodeRuntime = path.resolve(path.join('node_modules', '.bin', 'ts-node'));
-    let scriptRuntime = 'node';
-    if (nodeVersion < 8) {
-        scriptRuntime = tsNodeRuntime;
-    }
+    const crossEnv = path.resolve(path.join('node_modules', '.bin', 'cross-env'));
 
     // Project configuration.
     grunt.initConfig({
@@ -209,7 +202,7 @@ module.exports = function(grunt) {
             build: {
                 command: [
                     /** Browser runtime */
-                    scriptRuntime + " build/rollup.js --dist",
+                    "node build/rollup.js --dist",
                     /** Copy to repo root */
                     "npm run copy:root",
                     /** Node.js runtime */
@@ -219,17 +212,19 @@ module.exports = function(grunt) {
             testbuild: {
                 command: [
                     "npm run build",
-                    scriptRuntime + " build/rollup.js --browser --out=./tmp/browser/less.min.js"
+                    "node build/rollup.js --browser --out=./tmp/browser/less.min.js"
                 ].join(" && ")
             },
             testcjs: {
                 command: "npm run build"
             },
             testbrowser: {
-                command: scriptRuntime + " build/rollup.js --browser --out=./tmp/browser/less.min.js"
+                command: "node build/rollup.js --browser --out=./tmp/browser/less.min.js"
             },
             test: {
                 command: [
+                    // https://github.com/TypeStrong/ts-node/issues/693#issuecomment-848907036
+                    crossEnv + " TS_NODE_SCOPE=true",
                     tsNodeRuntime + " test/test-es6.ts",
                     "node test/index.js"
                 ].join(' && ')
@@ -266,6 +261,7 @@ module.exports = function(grunt) {
                     `node bin/lessc --clean-css="--s1 --advanced" ${lessFolder}/_main/lazy-eval.less tmp/lazy-eval.css`,
                     "cd lib",
                     `node ../bin/lessc --clean-css="--s1 --advanced" ../${lessFolder}/_main/lazy-eval.less ../tmp/lazy-eval.css`,
+                    `node ../bin/lessc --source-map=lazy-eval.css.map --autoprefix ../${lessFolder}/_main/lazy-eval.less ../tmp/lazy-eval.css`,
                     "cd ..",
                     // Test multiple plugins
                     `node bin/lessc --plugin=clean-css="--s1 --advanced" --plugin=autoprefix="ie 11,Edge >= 13,Chrome >= 47,Firefox >= 45,iOS >= 9.2,Safari >= 9" ${lessFolder}/_main/lazy-eval.less tmp/lazy-eval.css`

package/bin/lessc

@@ -1,4 +1,7 @@
 #!/usr/bin/env node
+
+/* eslint indent: [2, 2, {"SwitchCase": 1}] */
+
 "use strict";
 
 var path = require('path');
@@ -87,6 +90,12 @@ function render() {
     output = path.resolve(process.cwd(), output);
   }
 
+  if (options.disablePluginRule && queuePlugins.length > 0) {
+    console.error('--plugin and --disable-plugin-rule may not be used at the same time');
+    process.exitCode = 1;
+    return;
+  }
+
   if (options.sourceMap) {
     sourceMapOptions.sourceMapInputFilename = input;
 
@@ -113,6 +122,7 @@ function render() {
       var mapDir = path.dirname(mapFilename);
       var outputDir = path.dirname(output); // find the path from the map to the output file
 
+      // eslint-disable-next-line max-len
       sourceMapOptions.sourceMapOutputFilename = path.join(path.relative(mapDir, outputDir), path.basename(output)); // make the sourcemap filename point to the sourcemap relative to the css file output directory
 
       sourceMapOptions.sourceMapFilename = path.join(path.relative(outputDir, mapDir), path.basename(sourceMapOptions.sourceMapFullFilename));
@@ -180,6 +190,9 @@ function render() {
       var filename = sourceMapOptions.sourceMapFullFilename;
       ensureDirectory(filename);
 
+      // To fix https://github.com/less/less.js/issues/3646
+      output = output.toString();
+      
       fs.writeFile(filename, output, 'utf8', function (err) {
         if (err) {
           var description = 'Error: ';
@@ -441,7 +454,8 @@ function processPluginQueue() {
         break;
 
       case 'no-js':
-        console.error('The "--no-js" argument is deprecated, as inline JavaScript ' + 'is disabled by default. Use "--js" to enable inline JavaScript (not recommended).');
+        // eslint-disable-next-line max-len
+        console.error('The "--no-js" argument is deprecated, as inline JavaScript is disabled by default. Use "--js" to enable inline JavaScript (not recommended).');
         break;
 
       case 'include-path':
@@ -626,6 +640,10 @@ function processPluginQueue() {
         });
         break;
 
+      case 'disable-plugin-rule':
+        options.disablePluginRule = true;
+        break;
+  
       default:
         queuePlugins.push({
           name: arg,