less 3.9.0 → 3.10.1

package/lib/less-browser/browser.js

@@ -1,18 +1,19 @@
-var utils = require('./utils');
-module.exports = {
+import * as utils from './utils';
+
+export default {
     createCSS: function (document, styles, sheet) {
         // Strip the query-string
-        var href = sheet.href || '';
+        const href = sheet.href || '';
 
         // If there is no title set, use the filename, minus the extension
-        var id = 'less:' + (sheet.title || utils.extractId(href));
+        const id = `less:${sheet.title || utils.extractId(href)}`;
 
         // If this has already been inserted into the DOM, we may need to replace it
-        var oldStyleNode = document.getElementById(id);
-        var keepOldStyleNode = false;
+        const oldStyleNode = document.getElementById(id);
+        let keepOldStyleNode = false;
 
         // Create a new stylesheet node for insertion or (if necessary) replacement
-        var styleNode = document.createElement('style');
+        const styleNode = document.createElement('style');
         styleNode.setAttribute('type', 'text/css');
         if (sheet.media) {
             styleNode.setAttribute('media', sheet.media);
@@ -27,12 +28,12 @@ module.exports = {
                 oldStyleNode.firstChild.nodeValue === styleNode.firstChild.nodeValue);
         }
 
-        var head = document.getElementsByTagName('head')[0];
+        const head = document.getElementsByTagName('head')[0];
 
         // If there is no oldStyleNode, just append; otherwise, only append if we need
         // to replace oldStyleNode with an updated stylesheet
         if (oldStyleNode === null || keepOldStyleNode === false) {
-            var nextEl = sheet && sheet.nextSibling || null;
+            const nextEl = sheet && sheet.nextSibling || null;
             if (nextEl) {
                 nextEl.parentNode.insertBefore(styleNode, nextEl);
             } else {
@@ -55,9 +56,9 @@ module.exports = {
         }
     },
     currentScript: function(window) {
-        var document = window.document;
-        return document.currentScript || (function() {
-            var scripts = document.getElementsByTagName('script');
+        const document = window.document;
+        return document.currentScript || (() => {
+            const scripts = document.getElementsByTagName('script');
             return scripts[scripts.length - 1];
         })();
     }

package/lib/less-browser/cache.js

@@ -1,7 +1,7 @@
 // Cache system is a bit outdated and could do with work
 
-module.exports = function(window, options, logger) {
-    var cache = null;
+export default (window, options, logger) => {
+    let cache = null;
     if (options.env !== 'development') {
         try {
             cache = (typeof window.localStorage === 'undefined') ? null : window.localStorage;
@@ -10,23 +10,23 @@ module.exports = function(window, options, logger) {
     return {
         setCSS: function(path, lastModified, modifyVars, styles) {
             if (cache) {
-                logger.info('saving ' + path + ' to cache.');
+                logger.info(`saving ${path} to cache.`);
                 try {
                     cache.setItem(path, styles);
-                    cache.setItem(path + ':timestamp', lastModified);
+                    cache.setItem(`${path}:timestamp`, lastModified);
                     if (modifyVars) {
-                        cache.setItem(path + ':vars', JSON.stringify(modifyVars));
+                        cache.setItem(`${path}:vars`, JSON.stringify(modifyVars));
                     }
                 } catch (e) {
                     // TODO - could do with adding more robust error handling
-                    logger.error('failed to save "' + path + '" to local storage for caching.');
+                    logger.error(`failed to save "${path}" to local storage for caching.`);
                 }
             }
         },
         getCSS: function(path, webInfo, modifyVars) {
-            var css       = cache && cache.getItem(path),
-                timestamp = cache && cache.getItem(path + ':timestamp'),
-                vars      = cache && cache.getItem(path + ':vars');
+            const css       = cache && cache.getItem(path);
+            const timestamp = cache && cache.getItem(`${path}:timestamp`);
+            let vars      = cache && cache.getItem(`${path}:vars`);
 
             modifyVars = modifyVars || {};
             vars = vars || "{}"; // if not set, treat as the JSON representation of an empty object

package/lib/less-browser/error-reporting.js

@@ -1,22 +1,25 @@
-var utils = require('./utils'),
-    browser = require('./browser');
+import * as utils from './utils';
+import browser from './browser';
 
-module.exports = function(window, less, options) {
+export default (window, less, options) => {
 
     function errorHTML(e, rootHref) {
-        var id = 'less-error-message:' + utils.extractId(rootHref || '');
-        var template = '<li><label>{line}</label><pre class="{class}">{content}</pre></li>';
-        var elem = window.document.createElement('div'), timer, content, errors = [];
-        var filename = e.filename || rootHref;
-        var filenameNoPath = filename.match(/([^\/]+(\?.*)?)$/)[1];
+        const id = `less-error-message:${utils.extractId(rootHref || '')}`;
+        const template = '<li><label>{line}</label><pre class="{class}">{content}</pre></li>';
+        const elem = window.document.createElement('div');
+        let timer;
+        let content;
+        const errors = [];
+        const filename = e.filename || rootHref;
+        const filenameNoPath = filename.match(/([^\/]+(\?.*)?)$/)[1];
 
         elem.id        = id;
         elem.className = 'less-error-message';
 
-        content = '<h3>'  + (e.type || 'Syntax') + 'Error: ' + (e.message || 'There is an error in your .less file') +
-            '</h3>' + '<p>in <a href="' + filename   + '">' + filenameNoPath + '</a> ';
+        content = `<h3>${e.type || 'Syntax'}Error: ${e.message || 'There is an error in your .less file'}` + 
+            `</h3><p>in <a href="${filename}">${filenameNoPath}</a> `;
 
-        var errorline = function (e, i, classname) {
+        const errorline = (e, i, classname) => {
             if (e.extract[i] !== undefined) {
                 errors.push(template.replace(/\{line\}/, (parseInt(e.line, 10) || 0) + (i - 1))
                     .replace(/\{class\}/, classname)
@@ -28,11 +31,10 @@ module.exports = function(window, less, options) {
             errorline(e, 0, '');
             errorline(e, 1, 'line');
             errorline(e, 2, '');
-            content += 'on line ' + e.line + ', column ' + (e.column + 1) + ':</p>' +
-                '<ul>' + errors.join('') + '</ul>';
+            content += `on line ${e.line}, column ${e.column + 1}:</p><ul>${errors.join('')}</ul>`;
         }
         if (e.stack && (e.extract || options.logLevel >= 4)) {
-            content += '<br/>Stack Trace</br />' + e.stack.split('\n').slice(1).join('<br/>');
+            content += `<br/>Stack Trace</br />${e.stack.split('\n').slice(1).join('<br/>')}`;
         }
         elem.innerHTML = content;
 
@@ -89,9 +91,9 @@ module.exports = function(window, less, options) {
         ].join(';');
 
         if (options.env === 'development') {
-            timer = setInterval(function () {
-                var document = window.document,
-                    body = document.body;
+            timer = setInterval(() => {
+                const document = window.document;
+                const body = document.body;
                 if (body) {
                     if (document.getElementById(id)) {
                         body.replaceChild(elem, document.getElementById(id));
@@ -105,7 +107,7 @@ module.exports = function(window, less, options) {
     }
 
     function removeErrorHTML(path) {
-        var node = window.document.getElementById('less-error-message:' + utils.extractId(path));
+        const node = window.document.getElementById(`less-error-message:${utils.extractId(path)}`);
         if (node) {
             node.parentNode.removeChild(node);
         }
@@ -126,13 +128,12 @@ module.exports = function(window, less, options) {
     }
 
     function errorConsole(e, rootHref) {
-        var template = '{line} {content}';
-        var filename = e.filename || rootHref;
-        var errors = [];
-        var content = (e.type || 'Syntax') + 'Error: ' + (e.message || 'There is an error in your .less file') +
-            ' in ' + filename;
+        const template = '{line} {content}';
+        const filename = e.filename || rootHref;
+        const errors = [];
+        let content = `${e.type || 'Syntax'}Error: ${e.message || 'There is an error in your .less file'} in ${filename}`;
 
-        var errorline = function (e, i, classname) {
+        const errorline = (e, i, classname) => {
             if (e.extract[i] !== undefined) {
                 errors.push(template.replace(/\{line\}/, (parseInt(e.line, 10) || 0) + (i - 1))
                     .replace(/\{class\}/, classname)
@@ -144,11 +145,10 @@ module.exports = function(window, less, options) {
             errorline(e, 0, '');
             errorline(e, 1, 'line');
             errorline(e, 2, '');
-            content += ' on line ' + e.line + ', column ' + (e.column + 1) + ':\n' +
-                errors.join('\n');
+            content += ` on line ${e.line}, column ${e.column + 1}:\n${errors.join('\n')}`;
         }
         if (e.stack && (e.extract || options.logLevel >= 4)) {
-            content += '\nStack Trace\n' + e.stack;
+            content += `\nStack Trace\n${e.stack}`;
         }
         less.logger.error(content);
     }

package/lib/less-browser/file-manager.js

@@ -1,35 +1,32 @@
 /* global window, XMLHttpRequest */
 
-module.exports = function(options, logger) {
+import AbstractFileManager from '../less/environment/abstract-file-manager.js';
 
-    var AbstractFileManager = require('../less/environment/abstract-file-manager.js');
+let options;
+let logger;
+let fileCache = {};
 
-    var fileCache = {};
-
-    // TODOS - move log somewhere. pathDiff and doing something similar in node. use pathDiff in the other browser file for the initial load
-    var FileManager = function() {
-    };
-
-    FileManager.prototype = new AbstractFileManager();
-
-    FileManager.prototype.alwaysMakePathsAbsolute = function alwaysMakePathsAbsolute() {
+// TODOS - move log somewhere. pathDiff and doing something similar in node. use pathDiff in the other browser file for the initial load
+class FileManager extends AbstractFileManager {
+    alwaysMakePathsAbsolute() {
         return true;
-    };
-    FileManager.prototype.join = function join(basePath, laterPath) {
+    }
+
+    join(basePath, laterPath) {
         if (!basePath) {
             return laterPath;
         }
         return this.extractUrlParts(laterPath, basePath).path;
-    };
-    FileManager.prototype.doXHR = function doXHR(url, type, callback, errback) {
+    }
 
-        var xhr = new XMLHttpRequest();
-        var async = options.isFileProtocol ? options.fileAsync : true;
+    doXHR(url, type, callback, errback) {
+        const xhr = new XMLHttpRequest();
+        const async = options.isFileProtocol ? options.fileAsync : true;
 
         if (typeof xhr.overrideMimeType === 'function') {
             xhr.overrideMimeType('text/css');
         }
-        logger.debug('XHR: Getting \'' + url + '\'');
+        logger.debug(`XHR: Getting '${url}'`);
         xhr.open('GET', url, async);
         xhr.setRequestHeader('Accept', type || 'text/x-less, text/css; q=0.9, */*; q=0.5');
         xhr.send(null);
@@ -50,7 +47,7 @@ module.exports = function(options, logger) {
                 errback(xhr.status, url);
             }
         } else if (async) {
-            xhr.onreadystatechange = function () {
+            xhr.onreadystatechange = () => {
                 if (xhr.readyState == 4) {
                     handleResponse(xhr, callback, errback);
                 }
@@ -58,16 +55,17 @@ module.exports = function(options, logger) {
         } else {
             handleResponse(xhr, callback, errback);
         }
-    };
-    FileManager.prototype.supports = function(filename, currentDirectory, options, environment) {
+    }
+
+    supports() {
         return true;
-    };
+    }
 
-    FileManager.prototype.clearFileCache = function() {
+    clearFileCache() {
         fileCache = {};
-    };
+    }
 
-    FileManager.prototype.loadFile = function loadFile(filename, currentDirectory, options, environment) {
+    loadFile(filename, currentDirectory, options, environment) {
         // TODO: Add prefix support like less-node?
         // What about multiple paths?
 
@@ -81,17 +79,17 @@ module.exports = function(options, logger) {
 
         // sheet may be set to the stylesheet for the initial load or a collection of properties including
         // some context variables for imports
-        var hrefParts = this.extractUrlParts(filename, window.location.href);
-        var href      = hrefParts.url;
-        var self      = this;
+        const hrefParts = this.extractUrlParts(filename, window.location.href);
+        const href      = hrefParts.url;
+        const self      = this;
         
-        return new Promise(function(resolve, reject) {
+        return new Promise((resolve, reject) => {
             if (options.useFileCache && fileCache[href]) {
                 try {
-                    var lessText = fileCache[href];
+                    const lessText = fileCache[href];
                     return resolve({ contents: lessText, filename: href, webInfo: { lastModified: new Date() }});
                 } catch (e) {
-                    return reject({ filename: href, message: 'Error loading file ' + href + ' error was ' + e.message });
+                    return reject({ filename: href, message: `Error loading file ${href} error was ${e.message}` });
                 }
             }
 
@@ -100,12 +98,16 @@ module.exports = function(options, logger) {
                 fileCache[href] = data;
 
                 // Use remote copy (re-parse)
-                resolve({ contents: data, filename: href, webInfo: { lastModified: lastModified }});
+                resolve({ contents: data, filename: href, webInfo: { lastModified }});
             }, function doXHRError(status, url) {
-                reject({ type: 'File', message: '\'' + url + '\' wasn\'t found (' + status + ')', href: href });
+                reject({ type: 'File', message: `'${url}' wasn't found (${status})`, href });
             });
         });
-    };
+    }
+}
 
+export default (opts, log) => {
+    options = opts;
+    logger = log;
     return FileManager;
-};
+}

package/lib/less-browser/image-size.js

@@ -1,7 +1,7 @@
-module.exports = function() {
 
-    var functionRegistry = require('./../less/functions/function-registry');
+import functionRegistry from './../less/functions/function-registry';
 
+export default () => {
     function imageSize() {
         throw {
             type: 'Runtime',
@@ -9,7 +9,7 @@ module.exports = function() {
         };
     }
 
-    var imageFunctions = {
+    const imageFunctions = {
         'image-size': function(filePathNode) {
             imageSize(this, filePathNode);
             return -1;

package/lib/less-browser/index.js

@@ -2,36 +2,43 @@
 // index.js
 // Should expose the additional browser functions on to the less object
 //
-var addDataAttr = require('./utils').addDataAttr,
-    browser = require('./browser');
+import {addDataAttr} from './utils';
+import lessRoot from '../less';
+import browser from './browser';
+import FM from './file-manager';
+import PluginLoader from './plugin-loader';
+import LogListener from './log-listener';
+import ErrorReporting from './error-reporting';
+import Cache from './cache';
+import ImageSize from './image-size';
+
+export default (window, options) => {
+    const document = window.document;
+    const less = lessRoot();
 
-module.exports = function(window, options) {
-    var document = window.document;
-    var less = require('../less')();
-    
     less.options = options;
-    var environment = less.environment,
-        FileManager = require('./file-manager')(options, less.logger),
-        fileManager = new FileManager();
+    const environment = less.environment;
+    const FileManager = FM(options, less.logger);
+    const fileManager = new FileManager();
     environment.addFileManager(fileManager);
     less.FileManager = FileManager;
-    less.PluginLoader = require('./plugin-loader');
+    less.PluginLoader = PluginLoader;
 
-    require('./log-listener')(less, options);
-    var errors = require('./error-reporting')(window, less, options);
-    var cache = less.cache = options.cache || require('./cache')(window, options, less.logger);
-    require('./image-size')(less.environment);
+    LogListener(less, options);
+    const errors = ErrorReporting(window, less, options);
+    const cache = less.cache = options.cache || Cache(window, options, less.logger);
+    ImageSize(less.environment);
 
     // Setup user functions - Deprecate?
     if (options.functions) {
         less.functions.functionRegistry.addMultiple(options.functions);
     }
 
-    var typePattern = /^text\/(x-)?less$/;
+    const typePattern = /^text\/(x-)?less$/;
 
     function clone(obj) {
-        var cloned = {};
-        for (var prop in obj) {
+        const cloned = {};
+        for (const prop in obj) {
             if (obj.hasOwnProperty(prop)) {
                 cloned[prop] = obj[prop];
             }
@@ -41,47 +48,47 @@ module.exports = function(window, options) {
 
     // only really needed for phantom
     function bind(func, thisArg) {
-        var curryArgs = Array.prototype.slice.call(arguments, 2);
+        const curryArgs = Array.prototype.slice.call(arguments, 2);
         return function() {
-            var args = curryArgs.concat(Array.prototype.slice.call(arguments, 0));
+            const args = curryArgs.concat(Array.prototype.slice.call(arguments, 0));
             return func.apply(thisArg, args);
         };
     }
 
     function loadStyles(modifyVars) {
-        var styles = document.getElementsByTagName('style'),
-            style;
+        const styles = document.getElementsByTagName('style');
+        let style;
 
-        for (var i = 0; i < styles.length; i++) {
+        for (let i = 0; i < styles.length; i++) {
             style = styles[i];
             if (style.type.match(typePattern)) {
-                var instanceOptions = clone(options);
+                const instanceOptions = clone(options);
                 instanceOptions.modifyVars = modifyVars;
-                var lessText = style.innerHTML || '';
+                const lessText = style.innerHTML || '';
                 instanceOptions.filename = document.location.href.replace(/#.*$/, '');
 
                 /* jshint loopfunc:true */
                 // use closure to store current style
                 less.render(lessText, instanceOptions,
-                        bind(function(style, e, result) {
-                            if (e) {
-                                errors.add(e, 'inline');
+                    bind((style, e, result) => {
+                        if (e) {
+                            errors.add(e, 'inline');
+                        } else {
+                            style.type = 'text/css';
+                            if (style.styleSheet) {
+                                style.styleSheet.cssText = result.css;
                             } else {
-                                style.type = 'text/css';
-                                if (style.styleSheet) {
-                                    style.styleSheet.cssText = result.css;
-                                } else {
-                                    style.innerHTML = result.css;
-                                }
+                                style.innerHTML = result.css;
                             }
-                        }, null, style));
+                        }
+                    }, null, style));
             }
         }
     }
 
     function loadStyleSheet(sheet, callback, reload, remaining, modifyVars) {
 
-        var instanceOptions = clone(options);
+        const instanceOptions = clone(options);
         addDataAttr(instanceOptions, sheet);
         instanceOptions.mime = sheet.type;
 
@@ -90,12 +97,11 @@ module.exports = function(window, options) {
         }
 
         function loadInitialFileCallback(loadedFile) {
+            const data = loadedFile.contents;
+            const path = loadedFile.filename;
+            const webInfo = loadedFile.webInfo;
 
-            var data = loadedFile.contents,
-                path = loadedFile.filename,
-                webInfo = loadedFile.webInfo;
-
-            var newFileInfo = {
+            const newFileInfo = {
                 currentDirectory: fileManager.getPath(path),
                 filename: path,
                 rootFilename: path,
@@ -108,7 +114,7 @@ module.exports = function(window, options) {
             if (webInfo) {
                 webInfo.remaining = remaining;
 
-                var css = cache.getCSS(path, webInfo, instanceOptions.modifyVars);
+                const css = cache.getCSS(path, webInfo, instanceOptions.modifyVars);
                 if (!reload && css) {
                     webInfo.local = true;
                     callback(null, css, data, sheet, webInfo, path);
@@ -121,7 +127,7 @@ module.exports = function(window, options) {
             errors.remove(path);
 
             instanceOptions.rootFileInfo = newFileInfo;
-            less.render(data, instanceOptions, function(e, result) {
+            less.render(data, instanceOptions, (e, result) => {
                 if (e) {
                     e.href = path;
                     callback(e);
@@ -133,9 +139,9 @@ module.exports = function(window, options) {
         }
 
         fileManager.loadFile(sheet.href, null, instanceOptions, environment)
-            .then(function(loadedFile) {
+            .then(loadedFile => {
                 loadInitialFileCallback(loadedFile);
-            }).catch(function(err) {
+            }).catch(err => {
                 console.log(err);
                 callback(err);
             });
@@ -143,17 +149,17 @@ module.exports = function(window, options) {
     }
 
     function loadStyleSheets(callback, reload, modifyVars) {
-        for (var i = 0; i < less.sheets.length; i++) {
+        for (let i = 0; i < less.sheets.length; i++) {
             loadStyleSheet(less.sheets[i], callback, reload, less.sheets.length - (i + 1), modifyVars);
         }
     }
 
     function initRunningMode() {
         if (less.env === 'development') {
-            less.watchTimer = setInterval(function () {
+            less.watchTimer = setInterval(() => {
                 if (less.watchMode) {
                     fileManager.clearFileCache();
-                    loadStyleSheets(function (e, css, _, sheet, webInfo) {
+                    loadStyleSheets((e, css, _, sheet, webInfo) => {
                         if (e) {
                             errors.add(e, e.href || sheet.href);
                         } else if (css) {
@@ -183,11 +189,11 @@ module.exports = function(window, options) {
     // Synchronously get all <link> tags with the 'rel' attribute set to
     // "stylesheet/less".
     //
-    less.registerStylesheetsImmediately = function() {
-        var links = document.getElementsByTagName('link');
+    less.registerStylesheetsImmediately = () => {
+        const links = document.getElementsByTagName('link');
         less.sheets = [];
 
-        for (var i = 0; i < links.length; i++) {
+        for (let i = 0; i < links.length; i++) {
             if (links[i].rel === 'stylesheet/less' || (links[i].rel.match(/stylesheet/) &&
                 (links[i].type.match(typePattern)))) {
                 less.sheets.push(links[i]);
@@ -199,27 +205,26 @@ module.exports = function(window, options) {
     // Asynchronously get all <link> tags with the 'rel' attribute set to
     // "stylesheet/less", returning a Promise.
     //
-    less.registerStylesheets = function() {
-        return new Promise(function(resolve, reject) {
-            less.registerStylesheetsImmediately();
-            resolve();
-        });
-    };
+    less.registerStylesheets = () => new Promise((resolve, reject) => {
+        less.registerStylesheetsImmediately();
+        resolve();
+    });
 
     //
     // With this function, it's possible to alter variables and re-render
     // CSS without reloading less-files
     //
-    less.modifyVars = function(record) {
-        return less.refresh(true, record, false);
-    };
+    less.modifyVars = record => less.refresh(true, record, false);
 
-    less.refresh = function (reload, modifyVars, clearFileCache) {
+    less.refresh = (reload, modifyVars, clearFileCache) => {
         if ((reload || clearFileCache) && clearFileCache !== false) {
             fileManager.clearFileCache();
         }
-        return new Promise(function (resolve, reject) {
-            var startTime, endTime, totalMilliseconds, remainingSheets;
+        return new Promise((resolve, reject) => {
+            let startTime;
+            let endTime;
+            let totalMilliseconds;
+            let remainingSheets;
             startTime = endTime = new Date();
 
             // Set counter for remaining unprocessed sheets
@@ -231,27 +236,27 @@ module.exports = function(window, options) {
                 totalMilliseconds = endTime - startTime;
                 less.logger.info('Less has finished and no sheets were loaded.');
                 resolve({
-                    startTime: startTime,
-                    endTime: endTime,
-                    totalMilliseconds: totalMilliseconds,
+                    startTime,
+                    endTime,
+                    totalMilliseconds,
                     sheets: less.sheets.length
                 });
 
             } else {
                 // Relies on less.sheets array, callback seems to be guaranteed to be called for every element of the array
-                loadStyleSheets(function (e, css, _, sheet, webInfo) {
+                loadStyleSheets((e, css, _, sheet, webInfo) => {
                     if (e) {
                         errors.add(e, e.href || sheet.href);
                         reject(e);
                         return;
                     }
                     if (webInfo.local) {
-                        less.logger.info('Loading ' + sheet.href + ' from cache.');
+                        less.logger.info(`Loading ${sheet.href} from cache.`);
                     } else {
-                        less.logger.info('Rendered ' + sheet.href + ' successfully.');
+                        less.logger.info(`Rendered ${sheet.href} successfully.`);
                     }
                     browser.createCSS(window.document, css, sheet);
-                    less.logger.info('CSS for ' + sheet.href + ' generated in ' + (new Date() - endTime) + 'ms');
+                    less.logger.info(`CSS for ${sheet.href} generated in ${new Date() - endTime}ms`);
 
                     // Count completed sheet
                     remainingSheets--;
@@ -259,11 +264,11 @@ module.exports = function(window, options) {
                     // Check if the last remaining sheet was processed and then call the promise
                     if (remainingSheets === 0) {
                         totalMilliseconds = new Date() - startTime;
-                        less.logger.info('Less has finished. CSS generated in ' + totalMilliseconds + 'ms');
+                        less.logger.info(`Less has finished. CSS generated in ${totalMilliseconds}ms`);
                         resolve({
-                            startTime: startTime,
-                            endTime: endTime,
-                            totalMilliseconds: totalMilliseconds,
+                            startTime,
+                            endTime,
+                            totalMilliseconds,
                             sheets: less.sheets.length
                         });
                     }