less 4.1.3 → 4.2.0

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

@@ -19,168 +19,168 @@ module.exports = {
             `!${lessFolder}/_main/empty.less`
         ],
         options: {
-            helpers: "test/browser/runner-main-options.js",
-            specs: "test/browser/runner-main-spec.js",
-            outfile: "tmp/browser/test-runner-main.html"
+            helpers: 'test/browser/runner-main-options.js',
+            specs: 'test/browser/runner-main-spec.js',
+            outfile: 'tmp/browser/test-runner-main.html'
         }
     },
     legacy: {
         src: [`${lessFolder}/legacy/*.less`],
         options: {
-            helpers: "test/browser/runner-legacy-options.js",
-            specs: "test/browser/runner-legacy-spec.js",
-            outfile: "tmp/browser/test-runner-legacy.html"
+            helpers: 'test/browser/runner-legacy-options.js',
+            specs: 'test/browser/runner-legacy-spec.js',
+            outfile: 'tmp/browser/test-runner-legacy.html'
         }
     },
     strictUnits: {
         src: [`${lessFolder}/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"
+            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: [
             `${lessFolder}/errors/*.less`,
             `${testFolder}/errors/javascript-error.less`,
-            "test/browser/less/errors/*.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"
+            helpers: 'test/browser/runner-errors-options.js',
+            specs: 'test/browser/runner-errors-spec.js',
+            outfile: 'tmp/browser/test-runner-errors.html'
         }
     },
     noJsErrors: {
         src: [`${lessFolder}/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"
+            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"
+            '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"
+            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"],
+        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"
+            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"],
+        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"
+            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"],
+        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"
+            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"],
+        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"
+            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"],
+        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",
+            '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"
+            'tmp/browser/test-runner-rootpath-rewrite-urls.html'
         }
     },
     production: {
-        src: ["test/browser/less/production/*.less"],
+        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"
+            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"],
+        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"
+            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"],
+        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"
+            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: [`${lessFolder}/postProcessorPlugin/*.less`],
         options: {
             helpers: [
-                `test/plugins/postprocess/index.js`,
-                "test/browser/runner-postProcessorPlugin-options.js"
+                'test/plugins/postprocess/index.js',
+                'test/browser/runner-postProcessorPlugin-options.js'
             ],
-            specs: "test/browser/runner-postProcessorPlugin.js",
+            specs: 'test/browser/runner-postProcessorPlugin.js',
             outfile:
-            "tmp/browser/test-runner-post-processor-plugin.html"
+            'tmp/browser/test-runner-post-processor-plugin.html'
         }
     },
     preProcessorPlugin: {
         src: [`${lessFolder}/preProcessorPlugin/*.less`],
         options: {
             helpers: [
-                `test/plugins/preprocess/index.js`,
-                "test/browser/runner-preProcessorPlugin-options.js"
+                '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"
+            specs: 'test/browser/runner-preProcessorPlugin.js',
+            outfile: 'tmp/browser/test-runner-pre-processor-plugin.html'
         }
     },
     visitorPlugin: {
         src: [`${lessFolder}/visitorPlugin/*.less`],
         options: {
             helpers: [
-                `test/plugins/visitor/index.js`,
-                "test/browser/runner-VisitorPlugin-options.js"
+                '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"
+            specs: 'test/browser/runner-VisitorPlugin.js',
+            outfile: 'tmp/browser/test-runner-visitor-plugin.html'
         }
     },
     filemanagerPlugin: {
         src: [`${lessFolder}/filemanagerPlugin/*.less`],
         options: {
             helpers: [
-                `test/plugins/filemanager/index.js`,
-                "test/browser/runner-filemanagerPlugin-options.js"
+                '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"
+            specs: 'test/browser/runner-filemanagerPlugin.js',
+            outfile: 'tmp/browser/test-runner-filemanager-plugin.html'
         }
     }
 }

package/test/browser/runner-rewrite-urls-spec.js

@@ -1,3 +1,3 @@
-describe("less.js browser test - rewrite urls", function() {
+describe('less.js browser test - rewrite urls', function() {
     testLessEqualsInDocument();
 });

package/test/index.js

@@ -63,6 +63,8 @@ var testMap = [
         'sourcemaps-empty/', lessTester.testEmptySourcemap],
     [{math: 'strict', strictUnits: true, sourceMap: {disableSourcemapAnnotation: true}},
         'sourcemaps-disable-annotation/', lessTester.testSourcemapWithoutUrlAnnotation],
+    [{math: 'strict', strictUnits: true, sourceMap: true},
+        'sourcemaps-variable-selector/', lessTester.testSourcemapWithVariableInSelector],
     [{globalVars: true, banner: '/**\n  * Test\n  */\n'}, 'globalVars/',
         null, null, null, function(name, type, baseFolder) { return path.join(baseFolder, name) + '.json'; }],
     [{modifyVars: true}, 'modifyVars/',

package/test/less-test.js

@@ -169,6 +169,29 @@ module.exports = function() {
         }
     }
 
+    function testSourcemapWithVariableInSelector(name, err, compiledLess, doReplacements, sourcemap, baseFolder) {
+        if (err) {
+            fail('ERROR: ' + (err && err.message));
+            return;
+        }
+
+        // Even if annotation is not necessary, the map file should be there.
+        fs.readFile(path.join('test/', name) + '.json', 'utf8', function (e, expectedSourcemap) {
+            process.stdout.write('- ' + path.join(baseFolder, name) + ': ');
+            if (sourcemap === expectedSourcemap) {
+                ok('OK');
+            } else if (err) {
+                fail('ERROR: ' + (err && err.message));
+                if (isVerbose) {
+                    process.stdout.write('\n');
+                    process.stdout.write(err.stack + '\n');
+                }
+            } else {
+                difference('FAIL', expectedSourcemap, sourcemap);
+            }
+        });
+    }
+
     function testImports(name, err, compiledLess, doReplacements, sourcemap, baseFolder, imports) {
         if (err) {
             fail('ERROR: ' + (err && err.message));
@@ -228,7 +251,7 @@ module.exports = function() {
 
     // To fix ci fail about error format change in upstream v8 project
     // https://github.com/v8/v8/commit/c0fd89c3c089e888c4f4e8582e56db7066fa779b
-    // Node 16.9.0+ include this change via https://github.com/nodejs/node/pull/39947 
+    // Node 16.9.0+ include this change via https://github.com/nodejs/node/pull/39947
     function testTypeErrors(name, err, compiledLess, doReplacements, sourcemap, baseFolder) {
         const fileSuffix = semver.gte(process.version, 'v16.9.0') ? '-2.txt' : '.txt';
         fs.readFile(path.join(baseFolder, name) + fileSuffix, 'utf8', function (e, expectedErr) {
@@ -254,7 +277,7 @@ module.exports = function() {
     // https://github.com/less/less.js/issues/3112
     function testJSImport() {
         process.stdout.write('- Testing root function registry');
-        less.functions.functionRegistry.add('ext', function() { 
+        less.functions.functionRegistry.add('ext', function() {
             return new less.tree.Anonymous('file');
         });
         var expected = '@charset "utf-8";\n';
@@ -282,7 +305,7 @@ module.exports = function() {
             .replace(/\{pathhref\}/g, '')
             .replace(/\{404status\}/g, '')
             .replace(/\{nodepath\}/g, path.join(process.cwd(), 'node_modules', '/'))
-            .replace(/\{pathrel\}/g, path.join(path.relative(lessFolder, p), '/')) 
+            .replace(/\{pathrel\}/g, path.join(path.relative(lessFolder, p), '/'))
             .replace(/\{pathesc\}/g, pathesc)
             .replace(/\{pathimport\}/g, pathimport)
             .replace(/\{pathimportesc\}/g, pathimportesc)
@@ -327,7 +350,7 @@ module.exports = function() {
 
     function runTestSetInternal(baseFolder, opts, foldername, verifyFunction, nameModifier, doReplacements, getFilename) {
         foldername = foldername || '';
-        
+
         var originalOptions = opts || {};
 
         if (!doReplacements) {
@@ -497,10 +520,10 @@ module.exports = function() {
     }
 
     /**
-     * 
-     * @param {Object} options 
-     * @param {string} filePath 
-     * @param {Function} callback 
+     *
+     * @param {Object} options
+     * @param {string} filePath
+     * @param {Function} callback
      */
     function toCSS(options, filePath, callback) {
         options = options || {};
@@ -577,7 +600,7 @@ module.exports = function() {
                 }
                 ok(stylize('OK\n', 'green'));
             }
-        );      
+        );
     }
 
     return {
@@ -588,6 +611,7 @@ module.exports = function() {
         testTypeErrors: testTypeErrors,
         testSourcemap: testSourcemap,
         testSourcemapWithoutUrlAnnotation: testSourcemapWithoutUrlAnnotation,
+        testSourcemapWithVariableInSelector: testSourcemapWithVariableInSelector,
         testImports: testImports,
         testImportRedirect: testImportRedirect,
         testEmptySourcemap: testEmptySourcemap,

package/test/plugins/filemanager/index.js

@@ -1,7 +1,7 @@
 (function(exports) {
     var plugin = function(less) {
         var FileManager = less.FileManager, TestFileManager = new FileManager();
-        function TestFileManager() { };
+        function TestFileManager() { }
         TestFileManager.loadFile = function (filename, currentDirectory, options, environment, callback) {
             if (filename.match(/.*\.test$/)) {
                 return less.environment.fileManagers[0].loadFile('colors.test', currentDirectory, options, environment, callback);

package/test/sourcemaps-variable-selector/basic.json

@@ -0,0 +1 @@
+{"version":3,"sources":["testweb/sourcemaps-variable-selector/basic.less"],"names":[],"mappings":"AAEC;EACG,eAAA","file":"sourcemaps-variable-selector/basic.css"}

package/test/test-es6.ts

@@ -2,16 +2,16 @@
 console.log('Testing ES6 imports...')
 
 import less from '..';
-let lessRender = less.render;
+const lessRender = less.render;
 
 // then I call lessRender on something
-let y = lessRender(`
+lessRender(`
 body {
     a: 1;
     b: 2;
     c: 30;
     d: 4;
-}`, {sourceMap: {}},  function(error, output) {
-  if (error)
-    console.error(error)
+}`, {sourceMap: {}},  function(error: any, output: any) {
+    if (error)
+        console.error(error)
 })

package/tsconfig.build.json

@@ -0,0 +1,7 @@
+{
+  "extends": "./tsconfig",
+  "compilerOptions": {
+    "rootDir": "./src",
+  },
+  "include": ["src/**/*"]
+}

package/tsconfig.json

@@ -1,12 +1,13 @@
 {
   "compilerOptions": {
     "outDir": "./lib",
-    "rootDir": "./src",
+    "rootDir": ".",
     "allowJs": true,
     "sourceMap": true,
     "inlineSources": true,
     "esModuleInterop": true,
     "importHelpers": true,
+    "noImplicitAny": true,
     "target": "ES5"
   },
   "ts-node": {
@@ -14,6 +15,6 @@
       "rootDir": "."
     }
   },
-  "include": ["src/**/*"],
-  "exclude": ["node_modules"]
+  "include": ["**/*"],
+  "exclude": ["node_modules", "lib/**/*"]
 }

package/.eslintrc.json

@@ -1,71 +0,0 @@
-{
-    "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
-            }
-        ]
-    }
-}