less 4.1.1 → 4.1.2

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(' && ')