less 3.13.1 → 4.1.0

package/lib/less-node/plugin-loader.js

@@ -1,46 +1,28 @@
 "use strict";
-var __extends = (this && this.__extends) || (function () {
-    var extendStatics = function (d, b) {
-        extendStatics = Object.setPrototypeOf ||
-            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
-        return extendStatics(d, b);
-    };
-    return function (d, b) {
-        extendStatics(d, b);
-        function __() { this.constructor = d; }
-        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-    };
-})();
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-var path_1 = __importDefault(require("path"));
-var abstract_plugin_loader_js_1 = __importDefault(require("../less/environment/abstract-plugin-loader.js"));
+var tslib_1 = require("tslib");
+var path_1 = tslib_1.__importDefault(require("path"));
+var abstract_plugin_loader_js_1 = tslib_1.__importDefault(require("../less/environment/abstract-plugin-loader.js"));
 /**
  * Node Plugin Loader
  */
-var PluginLoader = /** @class */ (function (_super) {
-    __extends(PluginLoader, _super);
-    function PluginLoader(less) {
-        var _this = _super.call(this) || this;
-        _this.less = less;
-        _this.require = function (prefix) {
-            prefix = path_1.default.dirname(prefix);
-            return function (id) {
-                var str = id.substr(0, 2);
-                if (str === '..' || str === './') {
-                    return require(path_1.default.join(prefix, id));
-                }
-                else {
-                    return require(id);
-                }
-            };
+var PluginLoader = function (less) {
+    this.less = less;
+    this.require = function (prefix) {
+        prefix = path_1.default.dirname(prefix);
+        return function (id) {
+            var str = id.substr(0, 2);
+            if (str === '..' || str === './') {
+                return require(path_1.default.join(prefix, id));
+            }
+            else {
+                return require(id);
+            }
         };
-        return _this;
-    }
-    PluginLoader.prototype.loadPlugin = function (filename, basePath, context, environment, fileManager) {
+    };
+};
+PluginLoader.prototype = Object.assign(new abstract_plugin_loader_js_1.default(), {
+    loadPlugin: function (filename, basePath, context, environment, fileManager) {
         var prefix = filename.slice(0, 1);
         var explicit = prefix === '.' || prefix === '/' || filename.slice(-3).toLowerCase() === '.js';
         if (!explicit) {
@@ -62,12 +44,11 @@ var PluginLoader = /** @class */ (function (_super) {
                 reject(err);
             });
         });
-    };
-    PluginLoader.prototype.loadPluginSync = function (filename, basePath, context, environment, fileManager) {
+    },
+    loadPluginSync: function (filename, basePath, context, environment, fileManager) {
         context.syncImport = true;
         return this.loadPlugin(filename, basePath, context, environment, fileManager);
-    };
-    return PluginLoader;
-}(abstract_plugin_loader_js_1.default));
+    }
+});
 exports.default = PluginLoader;
 //# sourceMappingURL=plugin-loader.js.map

package/lib/less-node/plugin-loader.js.map

@@ -1 +1 @@
-{"version":3,"file":"plugin-loader.js","sourceRoot":"","sources":["../../src/less-node/plugin-loader.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;AAAA,8CAAwB;AACxB,4GAAiF;AAEjF;;GAEG;AACH;IAA2B,gCAAoB;IAC3C,sBAAY,IAAI;QAAhB,YACI,iBAAO,SAeV;QAbG,KAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,KAAI,CAAC,OAAO,GAAG,UAAA,MAAM;YACjB,MAAM,GAAG,cAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;YAC9B,OAAO,UAAA,EAAE;gBACL,IAAM,GAAG,GAAG,EAAE,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;gBAC5B,IAAI,GAAG,KAAK,IAAI,IAAI,GAAG,KAAK,IAAI,EAAE;oBAC9B,OAAO,OAAO,CAAC,cAAI,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,CAAC;iBACzC;qBACI;oBACD,OAAO,OAAO,CAAC,EAAE,CAAC,CAAC;iBACtB;YACL,CAAC,CAAC;QACN,CAAC,CAAC;;IACN,CAAC;IAED,iCAAU,GAAV,UAAW,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,WAAW,EAAE,WAAW;QAC5D,IAAM,MAAM,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QACpC,IAAM,QAAQ,GAAG,MAAM,KAAK,GAAG,IAAI,MAAM,KAAK,GAAG,IAAI,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,KAAK,KAAK,CAAC;QAChG,IAAI,CAAC,QAAQ,EAAE;YACX,OAAO,CAAC,QAAQ,GAAG,CAAC,cAAc,EAAE,EAAE,CAAC,CAAC;SAC3C;QAED,IAAI,OAAO,CAAC,UAAU,EAAE;YACpB,OAAO,WAAW,CAAC,YAAY,CAAC,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,WAAW,CAAC,CAAC;SAC7E;QAED,OAAO,IAAI,OAAO,CAAC,UAAC,OAAO,EAAE,MAAM;YAC/B,WAAW,CAAC,QAAQ,CAAC,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,WAAW,CAAC,CAAC,IAAI,CAC/D,UAAA,IAAI;gBACA,IAAI;oBACA,OAAO,CAAC,IAAI,CAAC,CAAC;iBACjB;gBACD,OAAO,CAAC,EAAE;oBACN,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;oBACf,MAAM,CAAC,CAAC,CAAC,CAAC;iBACb;YACL,CAAC,CACJ,CAAC,KAAK,CAAC,UAAA,GAAG;gBACP,MAAM,CAAC,GAAG,CAAC,CAAC;YAChB,CAAC,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;IACP,CAAC;IAED,qCAAc,GAAd,UAAe,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,WAAW,EAAE,WAAW;QAChE,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC;QAC1B,OAAO,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,WAAW,EAAE,WAAW,CAAC,CAAC;IAClF,CAAC;IACL,mBAAC;AAAD,CAAC,AAnDD,CAA2B,mCAAoB,GAmD9C;AAED,kBAAe,YAAY,CAAC","sourcesContent":["import path from 'path';\nimport AbstractPluginLoader from '../less/environment/abstract-plugin-loader.js';\n\n/**\n * Node Plugin Loader\n */\nclass PluginLoader extends AbstractPluginLoader {\n    constructor(less) {\n        super();\n\n        this.less = less;\n        this.require = prefix => {\n            prefix = path.dirname(prefix);\n            return id => {\n                const str = id.substr(0, 2);\n                if (str === '..' || str === './') {\n                    return require(path.join(prefix, id));\n                }\n                else {\n                    return require(id);\n                }\n            };\n        };\n    }\n\n    loadPlugin(filename, basePath, context, environment, fileManager) {\n        const prefix = filename.slice(0, 1);\n        const explicit = prefix === '.' || prefix === '/' || filename.slice(-3).toLowerCase() === '.js';\n        if (!explicit) {\n            context.prefixes = ['less-plugin-', ''];\n        }\n\n        if (context.syncImport) {\n            return fileManager.loadFileSync(filename, basePath, context, environment);\n        }\n\n        return new Promise((fulfill, reject) => {\n            fileManager.loadFile(filename, basePath, context, environment).then(\n                data => {\n                    try {\n                        fulfill(data);\n                    }\n                    catch (e) {\n                        console.log(e);\n                        reject(e);\n                    }\n                }\n            ).catch(err => {\n                reject(err);\n            });\n        });\n    }\n\n    loadPluginSync(filename, basePath, context, environment, fileManager) {\n        context.syncImport = true;\n        return this.loadPlugin(filename, basePath, context, environment, fileManager);\n    }\n}\n\nexport default PluginLoader;\n\n"]}
+{"version":3,"file":"plugin-loader.js","sourceRoot":"","sources":["../../src/less-node/plugin-loader.js"],"names":[],"mappings":";;;AAAA,sDAAwB;AACxB,oHAAiF;AAEjF;;GAEG;AACH,IAAM,YAAY,GAAG,UAAS,IAAI;IAC9B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACjB,IAAI,CAAC,OAAO,GAAG,UAAA,MAAM;QACjB,MAAM,GAAG,cAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAC9B,OAAO,UAAA,EAAE;YACL,IAAM,GAAG,GAAG,EAAE,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;YAC5B,IAAI,GAAG,KAAK,IAAI,IAAI,GAAG,KAAK,IAAI,EAAE;gBAC9B,OAAO,OAAO,CAAC,cAAI,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,CAAC;aACzC;iBACI;gBACD,OAAO,OAAO,CAAC,EAAE,CAAC,CAAC;aACtB;QACL,CAAC,CAAC;IACN,CAAC,CAAC;AACN,CAAC,CAAC;AAEF,YAAY,CAAC,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,mCAAoB,EAAE,EAAE;IAC/D,UAAU,YAAC,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,WAAW,EAAE,WAAW;QAC5D,IAAM,MAAM,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QACpC,IAAM,QAAQ,GAAG,MAAM,KAAK,GAAG,IAAI,MAAM,KAAK,GAAG,IAAI,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,KAAK,KAAK,CAAC;QAChG,IAAI,CAAC,QAAQ,EAAE;YACX,OAAO,CAAC,QAAQ,GAAG,CAAC,cAAc,EAAE,EAAE,CAAC,CAAC;SAC3C;QAED,IAAI,OAAO,CAAC,UAAU,EAAE;YACpB,OAAO,WAAW,CAAC,YAAY,CAAC,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,WAAW,CAAC,CAAC;SAC7E;QAED,OAAO,IAAI,OAAO,CAAC,UAAC,OAAO,EAAE,MAAM;YAC/B,WAAW,CAAC,QAAQ,CAAC,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,WAAW,CAAC,CAAC,IAAI,CAC/D,UAAA,IAAI;gBACA,IAAI;oBACA,OAAO,CAAC,IAAI,CAAC,CAAC;iBACjB;gBACD,OAAO,CAAC,EAAE;oBACN,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;oBACf,MAAM,CAAC,CAAC,CAAC,CAAC;iBACb;YACL,CAAC,CACJ,CAAC,KAAK,CAAC,UAAA,GAAG;gBACP,MAAM,CAAC,GAAG,CAAC,CAAC;YAChB,CAAC,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;IACP,CAAC;IAED,cAAc,YAAC,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,WAAW,EAAE,WAAW;QAChE,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC;QAC1B,OAAO,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,WAAW,EAAE,WAAW,CAAC,CAAC;IAClF,CAAC;CACJ,CAAC,CAAC;AAEH,kBAAe,YAAY,CAAC","sourcesContent":["import path from 'path';\nimport AbstractPluginLoader from '../less/environment/abstract-plugin-loader.js';\n\n/**\n * Node Plugin Loader\n */\nconst PluginLoader = function(less) {\n    this.less = less;\n    this.require = prefix => {\n        prefix = path.dirname(prefix);\n        return id => {\n            const str = id.substr(0, 2);\n            if (str === '..' || str === './') {\n                return require(path.join(prefix, id));\n            }\n            else {\n                return require(id);\n            }\n        };\n    };\n};\n\nPluginLoader.prototype = Object.assign(new AbstractPluginLoader(), {\n    loadPlugin(filename, basePath, context, environment, fileManager) {\n        const prefix = filename.slice(0, 1);\n        const explicit = prefix === '.' || prefix === '/' || filename.slice(-3).toLowerCase() === '.js';\n        if (!explicit) {\n            context.prefixes = ['less-plugin-', ''];\n        }\n\n        if (context.syncImport) {\n            return fileManager.loadFileSync(filename, basePath, context, environment);\n        }\n\n        return new Promise((fulfill, reject) => {\n            fileManager.loadFile(filename, basePath, context, environment).then(\n                data => {\n                    try {\n                        fulfill(data);\n                    }\n                    catch (e) {\n                        console.log(e);\n                        reject(e);\n                    }\n                }\n            ).catch(err => {\n                reject(err);\n            });\n        });\n    },\n\n    loadPluginSync(filename, basePath, context, environment, fileManager) {\n        context.syncImport = true;\n        return this.loadPlugin(filename, basePath, context, environment, fileManager);\n    }\n});\n\nexport default PluginLoader;\n\n"]}

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

@@ -1,39 +1,21 @@
 "use strict";
-var __extends = (this && this.__extends) || (function () {
-    var extendStatics = function (d, b) {
-        extendStatics = Object.setPrototypeOf ||
-            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
-        return extendStatics(d, b);
-    };
-    return function (d, b) {
-        extendStatics(d, b);
-        function __() { this.constructor = d; }
-        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-    };
-})();
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
+var tslib_1 = require("tslib");
 var isUrlRe = /^(?:https?:)?\/\//i;
-var url_1 = __importDefault(require("url"));
+var url_1 = tslib_1.__importDefault(require("url"));
 var request;
-var abstract_file_manager_js_1 = __importDefault(require("../less/environment/abstract-file-manager.js"));
-var logger_1 = __importDefault(require("../less/logger"));
-var UrlFileManager = /** @class */ (function (_super) {
-    __extends(UrlFileManager, _super);
-    function UrlFileManager() {
-        return _super !== null && _super.apply(this, arguments) || this;
-    }
-    UrlFileManager.prototype.supports = function (filename, currentDirectory, options, environment) {
+var abstract_file_manager_js_1 = tslib_1.__importDefault(require("../less/environment/abstract-file-manager.js"));
+var logger_1 = tslib_1.__importDefault(require("../less/logger"));
+var UrlFileManager = function () { };
+UrlFileManager.prototype = Object.assign(new abstract_file_manager_js_1.default(), {
+    supports: function (filename, currentDirectory, options, environment) {
         return isUrlRe.test(filename) || isUrlRe.test(currentDirectory);
-    };
-    UrlFileManager.prototype.loadFile = function (filename, currentDirectory, options, environment) {
+    },
+    loadFile: function (filename, currentDirectory, options, environment) {
         return new Promise(function (fulfill, reject) {
             if (request === undefined) {
                 try {
-                    request = require('native-request');
+                    request = require('needle');
                 }
                 catch (e) {
                     request = null;
@@ -46,23 +28,26 @@ var UrlFileManager = /** @class */ (function (_super) {
             var urlStr = isUrlRe.test(filename) ? filename : url_1.default.resolve(currentDirectory, filename);
             /** native-request currently has a bug */
             var hackUrlStr = urlStr.indexOf('?') === -1 ? urlStr + '?' : urlStr;
-            request.get(hackUrlStr, function (error, body, status) {
-                if (status === 404) {
-                    reject({ type: 'File', message: "resource '" + urlStr + "' was not found\n" });
+            request.get(hackUrlStr, { follow_max: 5 }, function (err, resp, body) {
+                if (err || resp.statusCode >= 400) {
+                    var message = resp.statusCode === 404
+                        ? "resource '" + urlStr + "' was not found\n"
+                        : "resource '" + urlStr + "' gave this Error:\n  " + (err || resp.statusMessage || resp.statusCode) + "\n";
+                    reject({ type: 'File', message: message });
                     return;
                 }
-                if (error) {
-                    reject({ type: 'File', message: "resource '" + urlStr + "' gave this Error:\n  " + error + "\n" });
+                if (resp.statusCode >= 300) {
+                    reject({ type: 'File', message: "resource '" + urlStr + "' caused too many redirects" });
                     return;
                 }
+                body = body.toString('utf8');
                 if (!body) {
-                    logger_1.default.warn("Warning: Empty body (HTTP " + status + ") returned by \"" + urlStr + "\"");
+                    logger_1.default.warn("Warning: Empty body (HTTP " + resp.statusCode + ") returned by \"" + urlStr + "\"");
                 }
-                fulfill({ contents: body, filename: urlStr });
+                fulfill({ contents: body || '', filename: urlStr });
             });
         });
-    };
-    return UrlFileManager;
-}(abstract_file_manager_js_1.default));
+    }
+});
 exports.default = UrlFileManager;
 //# sourceMappingURL=url-file-manager.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"url-file-manager.js","sourceRoot":"","sources":["../../src/less-node/url-file-manager.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;AAAA,IAAM,OAAO,GAAG,oBAAoB,CAAC;AACrC,4CAAsB;AACtB,IAAI,OAAO,CAAC;AACZ,0GAA+E;AAC/E,0DAAoC;AAEpC;IAA6B,kCAAmB;IAAhD;;IAqCA,CAAC;IApCG,iCAAQ,GAAR,UAAS,QAAQ,EAAE,gBAAgB,EAAE,OAAO,EAAE,WAAW;QACrD,OAAO,OAAO,CAAC,IAAI,CAAE,QAAQ,CAAE,IAAI,OAAO,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;IACtE,CAAC;IAED,iCAAQ,GAAR,UAAS,QAAQ,EAAE,gBAAgB,EAAE,OAAO,EAAE,WAAW;QACrD,OAAO,IAAI,OAAO,CAAC,UAAC,OAAO,EAAE,MAAM;YAC/B,IAAI,OAAO,KAAK,SAAS,EAAE;gBACvB,IAAI;oBAAE,OAAO,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC;iBAAE;gBAC5C,OAAO,CAAC,EAAE;oBAAE,OAAO,GAAG,IAAI,CAAC;iBAAE;aAChC;YACD,IAAI,CAAC,OAAO,EAAE;gBACV,MAAM,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,0EAA0E,EAAE,CAAC,CAAC;gBAC9G,OAAO;aACV;YAED,IAAI,MAAM,GAAG,OAAO,CAAC,IAAI,CAAE,QAAQ,CAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,aAAG,CAAC,OAAO,CAAC,gBAAgB,EAAE,QAAQ,CAAC,CAAC;YAE3F,yCAAyC;YACzC,IAAM,UAAU,GAAG,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,GAAG,GAAG,CAAC,CAAC,CAAC,MAAM,CAAA;YAErE,OAAO,CAAC,GAAG,CAAC,UAAU,EAAE,UAAC,KAAK,EAAE,IAAI,EAAE,MAAM;gBACxC,IAAI,MAAM,KAAK,GAAG,EAAE;oBAChB,MAAM,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,eAAa,MAAM,sBAAmB,EAAE,CAAC,CAAC;oBAC1E,OAAO;iBACV;gBACD,IAAI,KAAK,EAAE;oBACP,MAAM,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,eAAa,MAAM,8BAAyB,KAAK,OAAI,EAAE,CAAC,CAAC;oBACzF,OAAO;iBACV;gBACD,IAAI,CAAC,IAAI,EAAE;oBACP,gBAAM,CAAC,IAAI,CAAC,+BAA6B,MAAM,wBAAkB,MAAM,OAAG,CAAC,CAAC;iBAC/E;gBACD,OAAO,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC;YAClD,CAAC,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;IACP,CAAC;IACL,qBAAC;AAAD,CAAC,AArCD,CAA6B,kCAAmB,GAqC/C;AAED,kBAAe,cAAc,CAAC","sourcesContent":["const isUrlRe = /^(?:https?:)?\\/\\//i;\nimport url from 'url';\nlet request;\nimport AbstractFileManager from '../less/environment/abstract-file-manager.js';\nimport logger from '../less/logger';\n\nclass UrlFileManager extends AbstractFileManager {\n    supports(filename, currentDirectory, options, environment) {\n        return isUrlRe.test( filename ) || isUrlRe.test(currentDirectory);\n    }\n\n    loadFile(filename, currentDirectory, options, environment) {\n        return new Promise((fulfill, reject) => {\n            if (request === undefined) {\n                try { request = require('native-request'); }\n                catch (e) { request = null; }\n            }\n            if (!request) {\n                reject({ type: 'File', message: 'optional dependency \\'native-request\\' required to import over http(s)\\n' });\n                return;\n            }\n\n            let urlStr = isUrlRe.test( filename ) ? filename : url.resolve(currentDirectory, filename);\n            \n            /** native-request currently has a bug */\n            const hackUrlStr = urlStr.indexOf('?') === -1 ? urlStr + '?' : urlStr\n\n            request.get(hackUrlStr, (error, body, status) => {\n                if (status === 404) {\n                    reject({ type: 'File', message: `resource '${urlStr}' was not found\\n` });\n                    return;\n                }\n                if (error) {\n                    reject({ type: 'File', message: `resource '${urlStr}' gave this Error:\\n  ${error}\\n` });\n                    return;\n                }\n                if (!body) {\n                    logger.warn(`Warning: Empty body (HTTP ${status}) returned by \"${urlStr}\"`);\n                }\n                fulfill({ contents: body, filename: urlStr });\n            });\n        });\n    }\n}\n\nexport default UrlFileManager;\n"]}
+{"version":3,"file":"url-file-manager.js","sourceRoot":"","sources":["../../src/less-node/url-file-manager.js"],"names":[],"mappings":";;;AAAA,IAAM,OAAO,GAAG,oBAAoB,CAAC;AACrC,oDAAsB;AACtB,IAAI,OAAO,CAAC;AACZ,kHAA+E;AAC/E,kEAAoC;AAEpC,IAAM,cAAc,GAAG,cAAY,CAAC,CAAA;AACpC,cAAc,CAAC,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,kCAAmB,EAAE,EAAE;IAChE,QAAQ,YAAC,QAAQ,EAAE,gBAAgB,EAAE,OAAO,EAAE,WAAW;QACrD,OAAO,OAAO,CAAC,IAAI,CAAE,QAAQ,CAAE,IAAI,OAAO,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;IACtE,CAAC;IAED,QAAQ,YAAC,QAAQ,EAAE,gBAAgB,EAAE,OAAO,EAAE,WAAW;QACrD,OAAO,IAAI,OAAO,CAAC,UAAC,OAAO,EAAE,MAAM;YAC/B,IAAI,OAAO,KAAK,SAAS,EAAE;gBACvB,IAAI;oBAAE,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;iBAAE;gBACpC,OAAO,CAAC,EAAE;oBAAE,OAAO,GAAG,IAAI,CAAC;iBAAE;aAChC;YACD,IAAI,CAAC,OAAO,EAAE;gBACV,MAAM,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,0EAA0E,EAAE,CAAC,CAAC;gBAC9G,OAAO;aACV;YAED,IAAI,MAAM,GAAG,OAAO,CAAC,IAAI,CAAE,QAAQ,CAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,aAAG,CAAC,OAAO,CAAC,gBAAgB,EAAE,QAAQ,CAAC,CAAC;YAE3F,yCAAyC;YACzC,IAAM,UAAU,GAAG,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,GAAG,GAAG,CAAC,CAAC,CAAC,MAAM,CAAA;YAErE,OAAO,CAAC,GAAG,CAAC,UAAU,EAAE,EAAE,UAAU,EAAE,CAAC,EAAE,EAAE,UAAC,GAAG,EAAE,IAAI,EAAE,IAAI;gBACvD,IAAI,GAAG,IAAI,IAAI,CAAC,UAAU,IAAI,GAAG,EAAE;oBAC/B,IAAM,OAAO,GAAG,IAAI,CAAC,UAAU,KAAK,GAAG;wBACnC,CAAC,CAAC,eAAa,MAAM,sBAAmB;wBACxC,CAAC,CAAC,eAAa,MAAM,+BAAyB,GAAG,IAAI,IAAI,CAAC,aAAa,IAAI,IAAI,CAAC,UAAU,QAAI,CAAC;oBACnG,MAAM,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,SAAA,EAAE,CAAC,CAAC;oBAClC,OAAO;iBACV;gBACD,IAAI,IAAI,CAAC,UAAU,IAAI,GAAG,EAAE;oBACxB,MAAM,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,eAAa,MAAM,gCAA6B,EAAE,CAAC,CAAC;oBACpF,OAAO;iBACV;gBACD,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;gBAC7B,IAAI,CAAC,IAAI,EAAE;oBACP,gBAAM,CAAC,IAAI,CAAC,+BAA6B,IAAI,CAAC,UAAU,wBAAkB,MAAM,OAAG,CAAC,CAAC;iBACxF;gBACD,OAAO,CAAC,EAAE,QAAQ,EAAE,IAAI,IAAI,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC;YACxD,CAAC,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;IACP,CAAC;CACJ,CAAC,CAAC;AAEH,kBAAe,cAAc,CAAC","sourcesContent":["const isUrlRe = /^(?:https?:)?\\/\\//i;\nimport url from 'url';\nlet request;\nimport AbstractFileManager from '../less/environment/abstract-file-manager.js';\nimport logger from '../less/logger';\n\nconst UrlFileManager = function() {}\nUrlFileManager.prototype = Object.assign(new AbstractFileManager(), {\n    supports(filename, currentDirectory, options, environment) {\n        return isUrlRe.test( filename ) || isUrlRe.test(currentDirectory);\n    },\n\n    loadFile(filename, currentDirectory, options, environment) {\n        return new Promise((fulfill, reject) => {\n            if (request === undefined) {\n                try { request = require('needle'); }\n                catch (e) { request = null; }\n            }\n            if (!request) {\n                reject({ type: 'File', message: 'optional dependency \\'native-request\\' required to import over http(s)\\n' });\n                return;\n            }\n\n            let urlStr = isUrlRe.test( filename ) ? filename : url.resolve(currentDirectory, filename);\n\n            /** native-request currently has a bug */\n            const hackUrlStr = urlStr.indexOf('?') === -1 ? urlStr + '?' : urlStr\n\n            request.get(hackUrlStr, { follow_max: 5 }, (err, resp, body) => {\n                if (err || resp.statusCode >= 400) {\n                    const message = resp.statusCode === 404\n                        ? `resource '${urlStr}' was not found\\n`\n                        : `resource '${urlStr}' gave this Error:\\n  ${err || resp.statusMessage || resp.statusCode}\\n`;\n                    reject({ type: 'File', message });\n                    return;\n                }\n                if (resp.statusCode >= 300) {\n                    reject({ type: 'File', message: `resource '${urlStr}' caused too many redirects` });\n                    return;\n                }\n                body = body.toString('utf8');\n                if (!body) {\n                    logger.warn(`Warning: Empty body (HTTP ${resp.statusCode}) returned by \"${urlStr}\"`);\n                }\n                fulfill({ contents: body || '', filename: urlStr });\n            });\n        });\n    }\n});\n\nexport default UrlFileManager;\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "less",
-	"version": "3.13.1",
+	"version": "4.1.0",
 	"description": "Leaner CSS",
 	"homepage": "http://lesscss.org",
 	"author": {
@@ -50,12 +50,15 @@
 		"image-size": "~0.5.0",
 		"make-dir": "^2.1.0",
 		"mime": "^1.4.1",
-		"native-request": "^1.0.5",
+		"needle": "^2.5.2",
 		"source-map": "~0.6.0"
 	},
 	"devDependencies": {
-		"@less/test-data": "^3.13.0",
-		"@less/test-import-module": "^3.13.0",
+		"@less/test-data": "^4.1.0",
+		"@less/test-import-module": "^4.0.0",
+		"@rollup/plugin-commonjs": "^17.0.0",
+		"@rollup/plugin-json": "^4.1.0",
+		"@rollup/plugin-node-resolve": "^11.0.0",
 		"@typescript-eslint/eslint-plugin": "^3.3.0",
 		"@typescript-eslint/parser": "^3.3.0",
 		"benny": "^3.6.12",
@@ -81,22 +84,21 @@
 		"mocha": "^6.2.1",
 		"mocha-headless-chrome": "^2.0.3",
 		"mocha-teamcity-reporter": "^3.0.0",
+		"nock": "^11.8.2",
 		"npm-run-all": "^4.1.5",
 		"performance-now": "^0.2.0",
 		"phin": "^2.2.3",
 		"promise": "^7.1.1",
 		"read-glob": "^3.0.0",
 		"resolve": "^1.17.0",
-		"rollup": "^1.17.0",
-		"rollup-plugin-commonjs": "^10.0.1",
-		"rollup-plugin-node-resolve": "^5.2.0",
+		"rollup": "^2.34.1",
 		"rollup-plugin-terser": "^5.1.1",
-		"rollup-plugin-typescript2": "^0.24.3",
+		"rollup-plugin-typescript2": "^0.29.0",
 		"semver": "^6.3.0",
 		"shx": "^0.3.2",
 		"time-grunt": "^1.3.0",
 		"ts-node": "^8.4.1",
-		"typescript": "^3.6.3",
+		"typescript": "^4.1.3",
 		"uikit": "2.27.4"
 	},
 	"keywords": [
@@ -128,6 +130,7 @@
 	"sourcearchive": "https://github.com/less/less.js/archive/v",
 	"dependencies": {
 		"copy-anything": "^2.0.1",
+		"parse-node-version": "^1.0.1",
 		"tslib": "^1.10.0"
 	}
 }

package/test/browser/less/errors/image-height-error.txt

@@ -1,4 +1,4 @@
-RuntimeError: error evaluating function `image-height`: Image size functions are not supported in browser version of less in image-height-error.less on line 2, column 11:
+RuntimeError: Error evaluating function `image-height`: Image size functions are not supported in browser version of less in image-height-error.less on line 2, column 11:
 1 .test-height{
 2   height: image-height("../data/image.jpg")
 3 }

package/test/browser/less/errors/image-size-error.txt

@@ -1,4 +1,4 @@
-RuntimeError: error evaluating function `image-size`: Image size functions are not supported in browser version of less in image-size-error.less on line 2, column 9:
+RuntimeError: Error evaluating function `image-size`: Image size functions are not supported in browser version of less in image-size-error.less on line 2, column 9:
 1 .test-size{
 2   size: image-size("../data/image.jpg")
 3 }

package/test/browser/less/errors/image-width-error.txt

@@ -1,4 +1,4 @@
-RuntimeError: error evaluating function `image-width`: Image size functions are not supported in browser version of less in image-width-error.less on line 2, column 10:
+RuntimeError: Error evaluating function `image-width`: Image size functions are not supported in browser version of less in image-width-error.less on line 2, column 10:
 1 .test-width{
 2   width: image-width("../data/image.jpg")
 3 }

package/test/index.js

@@ -1,7 +1,8 @@
 var lessTest = require('./less-test'),
     lessTester = lessTest(),
     path = require('path'),
-    stylize = require('../lib/less-node/lessc-helper').stylize;
+    stylize = require('../lib/less-node/lessc-helper').stylize,
+    nock = require('nock');
 
 console.log('\n' + stylize('Less', 'underline') + '\n');
 
@@ -13,15 +14,15 @@ var testMap = [
         javascriptEnabled: true
     }, '_main/'],
     [{}, 'namespacing/'],
-    [{
-        math: 'strict-legacy'
-    }, 'math/strict-legacy/'],
     [{
         math: 'parens'
     }, 'math/strict/'],
     [{
         math: 'parens-division'
     }, 'math/parens-division/'],
+    [{
+        math: 'always'
+    }, 'math/always/'],
     // Use legacy strictMath: true here to demonstrate it still works
     [{strictMath: true, strictUnits: true, javascriptEnabled: true}, '../errors/eval/',
         lessTester.testErrors, null],
@@ -39,8 +40,10 @@ var testMap = [
     // TODO: Change this to rewriteUrls: false once the relativeUrls option is removed
     [{math: 'strict', relativeUrls: false, rootpath: 'folder (1)/'}, 'static-urls/'],
     [{math: 'strict', compress: true}, 'compression/'],
-    [{math: 0, strictUnits: true}, 'strict-units/'],
-    [{}, 'legacy/'],
+
+    [{math: 0, strictUnits: true}, 'units/strict/'],
+    [{math: 0, strictUnits: false}, 'units/no-strict/'],
+
     [{math: 'strict', strictUnits: true, sourceMap: true, globalVars: true }, 'sourcemaps/',
         lessTester.testSourcemap, null, null,
         function(filename, type, baseFolder) {
@@ -74,8 +77,7 @@ var testMap = [
     [{plugin: 'test/plugins/preprocess/'}, 'preProcessorPlugin/'],
     [{plugin: 'test/plugins/visitor/'}, 'visitorPlugin/'],
     [{plugin: 'test/plugins/filemanager/'}, 'filemanagerPlugin/'],
-    [{}, 'no-strict-math/'],
-    [{}, '3rd-party/'],
+    [{math: 0}, '3rd-party/'],
     [{ processImports: false }, 'process-imports/']
 ];
 testMap.forEach(function(args) {
@@ -83,7 +85,24 @@ testMap.forEach(function(args) {
 });
 lessTester.testSyncronous({syncImport: true}, '_main/import');
 lessTester.testSyncronous({syncImport: true}, '_main/plugin');
-lessTester.testSyncronous({syncImport: true}, 'math/strict-legacy/css');
+lessTester.testSyncronous({syncImport: true}, 'math/strict/css');
 lessTester.testNoOptions();
 lessTester.testJSImport();
 lessTester.finished();
+
+(() => {
+    // Create new tester, since tests are not independent and tests
+    // above modify tester in a way that breaks remote imports.
+    lessTester = lessTest();
+    var scope = nock('https://example.com')
+        .get('/redirect.less').query(true)
+        .reply(301, null, { location: '/target.less' })
+        .get('/target.less').query(true)
+        .reply(200);
+    lessTester.runTestSet(
+        {},
+        'import-redirect/',
+        lessTester.testImportRedirect(scope)
+    );
+    lessTester.finished();
+})();

package/test/less-test.js

@@ -1,5 +1,23 @@
 /* jshint latedef: nofunc */
 
+var logger = require('../lib/less/logger').default;
+
+var isVerbose = process.env.npm_config_loglevel !== 'concise';
+logger.addListener({
+    info(msg) {
+        if (isVerbose) {
+            process.stdout.write(msg + '\n');
+        }
+    },
+    warn(msg) {
+        process.stdout.write(msg + '\n');
+    },
+    erro(msg) {
+        process.stdout.write(msg + '\n');
+    }
+});
+
+
 module.exports = function() {
     var path = require('path'),
         fs = require('fs'),
@@ -14,8 +32,6 @@ module.exports = function() {
     var oneTestOnly = process.argv[2],
         isFinished = false;
 
-    var isVerbose = process.env.npm_config_loglevel !== 'concise';
-
     var testFolder = path.dirname(require.resolve('@less/test-data'));
     var lessFolder = path.join(testFolder, 'less');
 
@@ -27,20 +43,6 @@ module.exports = function() {
         }
     }
 
-    less.logger.addListener({
-        info: function(msg) {
-            if (isVerbose) {
-                process.stdout.write(msg + '\n');
-            }
-        },
-        warn: function(msg) {
-            process.stdout.write(msg + '\n');
-        },
-        error: function(msg) {
-            process.stdout.write(msg + '\n');
-        }
-    });
-
     var queueList = [],
         queueRunning = false;
     function queue(func) {
@@ -519,6 +521,23 @@ module.exports = function() {
         ok(stylize('OK\n', 'green'));
     }
 
+    function testImportRedirect(nockScope) {
+        return (name, err, css, doReplacements, sourcemap, baseFolder) => {
+            process.stdout.write('- ' + path.join(baseFolder, name) + ': ');
+            if (err) {
+                fail('FAIL: ' + (err && err.message));
+                return;
+            }
+            const expected = 'h1 {\n  color: red;\n}\n';
+            if (css !== expected) {
+                difference('FAIL', expected, css);
+                return;
+            }
+            nockScope.done();
+            ok('OK');
+        };
+    }
+
     return {
         runTestSet: runTestSet,
         runTestSetNormalOnly: runTestSetNormalOnly,
@@ -527,6 +546,7 @@ module.exports = function() {
         testSourcemap: testSourcemap,
         testSourcemapWithoutUrlAnnotation: testSourcemapWithoutUrlAnnotation,
         testImports: testImports,
+        testImportRedirect: testImportRedirect,
         testEmptySourcemap: testEmptySourcemap,
         testNoOptions: testNoOptions,
         testJSImport: testJSImport,

package/tsconfig.json

@@ -6,6 +6,7 @@
     "sourceMap": true,
     "inlineSources": true,
     "esModuleInterop": true,
+    "importHelpers": true,
     "target": "ES5"
   },
   "include": ["src/**/*"],