less 3.7.0 → 3.9.0

package/lib/less/tree/import.js

@@ -97,17 +97,18 @@ Import.prototype.evalForImport = function (context) {
 };
 Import.prototype.evalPath = function (context) {
     var path = this.path.eval(context);
-    var rootpath = this._fileInfo && this._fileInfo.rootpath;
+    var fileInfo = this._fileInfo;
 
     if (!(path instanceof URL)) {
-        if (rootpath) {
-            var pathValue = path.value;
-            // Add the base path if the import is relative
-            if (pathValue && context.isPathRelative(pathValue)) {
-                path.value = rootpath + pathValue;
-            }
+        // Add the rootpath if the URL requires a rewrite
+        var pathValue = path.value;
+        if (fileInfo &&
+            pathValue &&
+            context.pathRequiresRewrite(pathValue)) {
+            path.value = context.rewritePath(pathValue, fileInfo.rootpath);
+        } else {
+            path.value = context.normalizePath(path.value);
         }
-        path.value = context.normalizePath(path.value);
     }
 
     return path;

package/lib/less/tree/operation.js

@@ -1,7 +1,7 @@
 var Node = require('./node'),
     Color = require('./color'),
     Dimension = require('./dimension'),
-    MATH = require('../math-constants');
+    MATH = require('../constants').Math;
 
 var Operation = function (op, operands, isSpaced) {
     this.op = op.trim();

package/lib/less/tree/url.js

@@ -21,20 +21,19 @@ URL.prototype.eval = function (context) {
         rootpath;
 
     if (!this.isEvald) {
-        // Add the base path if the URL is relative
+        // Add the rootpath if the URL requires a rewrite
         rootpath = this.fileInfo() && this.fileInfo().rootpath;
-        if (rootpath &&
+        if (typeof rootpath === 'string' &&
             typeof val.value === 'string' &&
-            context.isPathRelative(val.value)) {
-
+            context.pathRequiresRewrite(val.value)) {
             if (!val.quote) {
-                rootpath = rootpath.replace(/[\(\)'"\s]/g, function(match) { return '\\' + match; });
+                rootpath = escapePath(rootpath);
             }
-            val.value = rootpath + val.value;
+            val.value = context.rewritePath(val.value, rootpath);
+        } else {
+            val.value = context.normalizePath(val.value);
         }
 
-        val.value = context.normalizePath(val.value);
-
         // Add url args if enabled
         if (context.urlArgs) {
             if (!val.value.match(/^\s*data:/)) {
@@ -51,4 +50,9 @@ URL.prototype.eval = function (context) {
 
     return new URL(val, this.getIndex(), this.fileInfo(), true);
 };
+
+function escapePath(path) {
+    return path.replace(/[\(\)'"\s]/g, function(match) { return '\\' + match; });
+}
+
 module.exports = URL;

package/lib/less/tree/variable-call.js

@@ -17,16 +17,19 @@ VariableCall.prototype.eval = function (context) {
         error = new LessError({message: 'Could not evaluate variable call ' + this.variable});
 
     if (!detachedRuleset.ruleset) {
-        if (Array.isArray(detachedRuleset)) {
+        if (detachedRuleset.rules) {
             rules = detachedRuleset;
         }
+        else if (Array.isArray(detachedRuleset)) {
+            rules = new Ruleset('', detachedRuleset);
+        }
         else if (Array.isArray(detachedRuleset.value)) {
-            rules = detachedRuleset.value;
+            rules = new Ruleset('', detachedRuleset.value);
         }
         else {
             throw error;
         }
-        detachedRuleset = new DetachedRuleset(new Ruleset('', rules));
+        detachedRuleset = new DetachedRuleset(rules);
     }
     if (detachedRuleset.ruleset) {
         return detachedRuleset.callEval(context);

package/lib/less/utils.js

@@ -1,5 +1,6 @@
 /* jshint proto: true */
-var MATH = require('./math-constants');
+var Constants = require('./constants');
+var clone = require('clone');
 
 var utils = {
     getLocation: function(index, inputStream) {
@@ -39,49 +40,58 @@ var utils = {
         return cloned;
     },
     copyOptions: function(obj1, obj2) {
+        if (obj2 && obj2._defaults) {
+            return obj2;
+        }
         var opts = utils.defaults(obj1, obj2);
         if (opts.strictMath) {
-            opts.math = MATH.STRICT_LEGACY;
+            opts.math = Constants.Math.STRICT_LEGACY;
+        }
+        // Back compat with changed relativeUrls option
+        if (opts.relativeUrls) {
+            opts.rewriteUrls = Constants.RewriteUrls.ALL;
         }
-        if (opts.hasOwnProperty('math') && typeof opts.math === 'string') {
+        if (typeof opts.math === 'string') {
             switch (opts.math.toLowerCase()) {
                 case 'always':
-                    opts.math = MATH.ALWAYS;
+                    opts.math = Constants.Math.ALWAYS;
                     break;
                 case 'parens-division':
-                    opts.math = MATH.PARENS_DIVISION;
+                    opts.math = Constants.Math.PARENS_DIVISION;
                     break;
                 case 'strict':
                 case 'parens':
-                    opts.math = MATH.PARENS;
+                    opts.math = Constants.Math.PARENS;
                     break;
                 case 'strict-legacy':
-                    opts.math = MATH.STRICT_LEGACY;
+                    opts.math = Constants.Math.STRICT_LEGACY;
+            }
+        }
+        if (typeof opts.rewriteUrls === 'string') {
+            switch (opts.rewriteUrls.toLowerCase()) {
+                case 'off':
+                    opts.rewriteUrls = Constants.RewriteUrls.OFF;
+                    break;
+                case 'local':
+                    opts.rewriteUrls = Constants.RewriteUrls.LOCAL;
+                    break;
+                case 'all':
+                    opts.rewriteUrls = Constants.RewriteUrls.ALL;
+                    break;
             }
         }
         return opts;
     },
     defaults: function(obj1, obj2) {
-        if (!obj2._defaults || obj2._defaults !== obj1) {
-            for (var prop in obj1) {
-                if (obj1.hasOwnProperty(prop)) {
-                    if (!obj2.hasOwnProperty(prop)) {
-                        obj2[prop] = obj1[prop];
-                    }
-                    else if (Array.isArray(obj1[prop])
-                        && Array.isArray(obj2[prop])) {
-
-                        obj1[prop].forEach(function(p) {
-                            if (obj2[prop].indexOf(p) === -1) {
-                                obj2[prop].push(p);
-                            }
-                        });
-                    }
-                }
-            }
+        var newObj = obj2 || {};
+        if (!obj2._defaults) {
+            newObj = {};
+            var defaults = clone(obj1);
+            newObj._defaults = defaults;
+            var cloned = obj2 ? clone(obj2) : {};
+            Object.assign(newObj, defaults, cloned);
         }
-        obj2._defaults = obj1;
-        return obj2;
+        return newObj;
     },
     merge: function(obj1, obj2) {
         for (var prop in obj2) {

package/lib/less-browser/add-default-options.js

@@ -42,4 +42,8 @@ module.exports = function(window, options) {
     if (options.onReady === undefined) {
         options.onReady = true;
     }
+
+    if (options.relativeUrls) {
+        options.rewriteUrls = 'all';
+    }
 };

package/lib/less-browser/index.js

@@ -30,7 +30,13 @@ module.exports = function(window, options) {
     var typePattern = /^text\/(x-)?less$/;
 
     function clone(obj) {
-        return JSON.parse(JSON.stringify(obj || {}));
+        var cloned = {};
+        for (var prop in obj) {
+            if (obj.hasOwnProperty(prop)) {
+                cloned[prop] = obj[prop];
+            }
+        }
+        return cloned;
     }
 
     // only really needed for phantom
@@ -93,7 +99,8 @@ module.exports = function(window, options) {
                 currentDirectory: fileManager.getPath(path),
                 filename: path,
                 rootFilename: path,
-                relativeUrls: instanceOptions.relativeUrls};
+                rewriteUrls: instanceOptions.rewriteUrls
+            };
 
             newFileInfo.entryPath = newFileInfo.currentDirectory;
             newFileInfo.rootpath = instanceOptions.rootpath || newFileInfo.currentDirectory;

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

@@ -6,7 +6,7 @@ module.exports = function(environment) {
     function imageSize(functionContext, filePathNode) {
         var filePath = filePathNode.value;
         var currentFileInfo = functionContext.currentFileInfo;
-        var currentDirectory = currentFileInfo.relativeUrls ?
+        var currentDirectory = currentFileInfo.rewriteUrls ?
         currentFileInfo.currentDirectory : currentFileInfo.entryPath;
 
         var fragmentStart = filePath.indexOf('#');

package/lib/less-node/lessc-helper.js

@@ -47,7 +47,8 @@ var lessc_helper = {
         console.log('                               in generated CSS file.');
         console.log('  -rp, --rootpath=URL          Sets rootpath for url rewriting in relative imports and urls');
         console.log('                               Works with or without the relative-urls option.');
-        console.log('  -ru, --relative-urls         Re-writes relative urls to the base less file.');
+        console.log('  -ru=, --rewrite-urls=        Rewrites URLs to make them relative to the base less file.');
+        console.log('    all|local|off              \'all\' rewrites all URLs, \'local\' just those starting with a \'.\'');
         console.log('');
         console.log('  -m=, --math=');
         console.log('     always                    Less will eagerly perform math operations always.');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "less",
-  "version": "3.7.0",
+  "version": "3.9.0",
   "description": "Leaner CSS",
   "homepage": "http://lesscss.org",
   "author": {
@@ -51,7 +51,6 @@
     "source-map": "~0.6.0"
   },
   "devDependencies": {
-    "bootstrap": "3.3.7",
     "bootstrap-less-port": "0.3.0",
     "diff": "^3.2.0",
     "git-rev": "^0.2.1",
@@ -71,6 +70,7 @@
     "less-plugin-autoprefix": "^1.5.1",
     "less-plugin-clean-css": "^1.5.1",
     "performance-now": "^0.2.0",
+    "phantomjs-polyfill-object-assign": "0.0.2",
     "phantomjs-prebuilt": "^2.1.16",
     "phin": "^2.2.3",
     "promise": "^7.1.1",
@@ -104,5 +104,7 @@
   ],
   "rawcurrent": "https://raw.github.com/less/less.js/v",
   "sourcearchive": "https://github.com/less/less.js/archive/v",
-  "dependencies": {}
+  "dependencies": {
+    "clone": "^2.1.2"
+  }
 }

package/test/browser/css/rewrite-urls/urls.css

@@ -0,0 +1,36 @@
+@import "http://localhost:8081/test/browser/less/imports/modify-this.css";
+@import "http://localhost:8081/test/browser/less/imports/modify-again.css";
+.modify {
+  my-url: url("http://localhost:8081/test/browser/less/imports/a.png");
+}
+.modify {
+  my-url: url("http://localhost:8081/test/browser/less/imports/b.png");
+}
+@font-face {
+  src: url("/fonts/garamond-pro.ttf");
+  src: local(Futura-Medium), url(http://localhost:8081/test/browser/less/rewrite-urls/fonts.svg#MyGeometricModern) format("svg");
+}
+#shorthands {
+  background: url("http://www.lesscss.org/spec.html") no-repeat 0 4px;
+}
+#misc {
+  background-image: url(http://localhost:8081/test/browser/less/rewrite-urls/images/image.jpg);
+  background: url("#inline-svg");
+}
+#data-uri {
+  background: url(data:image/png;charset=utf-8;base64,
+    kiVBORw0KGgoAAAANSUhEUgAAABAAAAAQAQMAAAAlPW0iAAAABlBMVEUAAAD/
+    k//+l2Z/dAAAAM0lEQVR4nGP4/5/h/1+G/58ZDrAz3D/McH8yw83NDDeNGe4U
+    kg9C9zwz3gVLMDA/A6P9/AFGGFyjOXZtQAAAAAElFTkSuQmCC);
+  background-image: url(data:image/x-png,f9difSSFIIGFIFJD1f982FSDKAA9==);
+  background-image: url(http://fonts.googleapis.com/css?family=\"Rokkitt\":\(400\),700);
+}
+#svg-data-uri {
+  background: transparent url('data:image/svg+xml, <svg version="1.1"><g></g></svg>');
+}
+.comma-delimited {
+  background: url(http://localhost:8081/test/browser/less/rewrite-urls/bg.jpg) no-repeat, url(http://localhost:8081/test/browser/less/rewrite-urls/bg.png) repeat-x top left, url(http://localhost:8081/test/browser/less/rewrite-urls/bg);
+}
+.values {
+  url: url('http://localhost:8081/test/browser/less/rewrite-urls/Trebuchet');
+}

package/test/browser/css/rootpath-rewrite-urls/urls.css

@@ -0,0 +1,35 @@
+@import "https://www.github.com/cloudhead/imports/modify-this.css";
+@import "https://www.github.com/cloudhead/imports/modify-again.css";
+.modify {
+  my-url: url("https://www.github.com/cloudhead/imports/a.png");
+}
+.modify {
+  my-url: url("https://www.github.com/cloudhead/imports/b.png");
+}
+@font-face {
+  src: url("/fonts/garamond-pro.ttf");
+  src: local(Futura-Medium), url(https://www.github.com/cloudhead/less.js/fonts.svg#MyGeometricModern) format("svg");
+}
+#shorthands {
+  background: url("http://www.lesscss.org/spec.html") no-repeat 0 4px;
+}
+#misc {
+  background-image: url(https://www.github.com/cloudhead/less.js/images/image.jpg);
+}
+#data-uri {
+  background: url(data:image/png;charset=utf-8;base64,
+    kiVBORw0KGgoAAAANSUhEUgAAABAAAAAQAQMAAAAlPW0iAAAABlBMVEUAAAD/
+    k//+l2Z/dAAAAM0lEQVR4nGP4/5/h/1+G/58ZDrAz3D/McH8yw83NDDeNGe4U
+    kg9C9zwz3gVLMDA/A6P9/AFGGFyjOXZtQAAAAAElFTkSuQmCC);
+  background-image: url(data:image/x-png,f9difSSFIIGFIFJD1f982FSDKAA9==);
+  background-image: url(http://fonts.googleapis.com/css?family=\"Rokkitt\":\(400\),700);
+}
+#svg-data-uri {
+  background: transparent url('data:image/svg+xml, <svg version="1.1"><g></g></svg>');
+}
+.comma-delimited {
+  background: url(https://www.github.com/cloudhead/less.js/bg.jpg) no-repeat, url(https://www.github.com/cloudhead/less.js/bg.png) repeat-x top left, url(https://www.github.com/cloudhead/less.js/bg);
+}
+.values {
+  url: url('https://www.github.com/cloudhead/less.js/Trebuchet');
+}

package/test/browser/less/rewrite-urls/urls.less

@@ -0,0 +1,34 @@
+@import ".././imports/urls.less";
+@import "http://localhost:8081/test/browser/less/imports/urls2.less";
+@font-face {
+  src: url("/fonts/garamond-pro.ttf");
+  src: local(Futura-Medium),
+       url(fonts.svg#MyGeometricModern) format("svg");
+}
+#shorthands {
+  background: url("http://www.lesscss.org/spec.html") no-repeat 0 4px;
+}
+#misc {
+  background-image: url(images/image.jpg);
+  background: url("#inline-svg");
+}
+#data-uri {
+  background: url(data:image/png;charset=utf-8;base64,
+    kiVBORw0KGgoAAAANSUhEUgAAABAAAAAQAQMAAAAlPW0iAAAABlBMVEUAAAD/
+    k//+l2Z/dAAAAM0lEQVR4nGP4/5/h/1+G/58ZDrAz3D/McH8yw83NDDeNGe4U
+    kg9C9zwz3gVLMDA/A6P9/AFGGFyjOXZtQAAAAAElFTkSuQmCC);
+  background-image: url(data:image/x-png,f9difSSFIIGFIFJD1f982FSDKAA9==);
+  background-image: url(http://fonts.googleapis.com/css?family=\"Rokkitt\":\(400\),700);
+}
+
+#svg-data-uri {
+  background: transparent url('data:image/svg+xml, <svg version="1.1"><g></g></svg>');
+}
+
+.comma-delimited {
+  background: url(bg.jpg) no-repeat, url(bg.png) repeat-x top left, url(bg);
+}
+.values {
+    @a: 'Trebuchet';
+    url: url(@a);
+}

package/test/browser/less/rootpath-rewrite-urls/urls.less

@@ -0,0 +1,33 @@
+@import "../imports/urls.less";
+@import "http://localhost:8081/test/browser/less/imports/urls2.less";
+@font-face {
+  src: url("/fonts/garamond-pro.ttf");
+  src: local(Futura-Medium),
+       url(fonts.svg#MyGeometricModern) format("svg");
+}
+#shorthands {
+  background: url("http://www.lesscss.org/spec.html") no-repeat 0 4px;
+}
+#misc {
+  background-image: url(images/image.jpg);
+}
+#data-uri {
+  background: url(data:image/png;charset=utf-8;base64,
+    kiVBORw0KGgoAAAANSUhEUgAAABAAAAAQAQMAAAAlPW0iAAAABlBMVEUAAAD/
+    k//+l2Z/dAAAAM0lEQVR4nGP4/5/h/1+G/58ZDrAz3D/McH8yw83NDDeNGe4U
+    kg9C9zwz3gVLMDA/A6P9/AFGGFyjOXZtQAAAAAElFTkSuQmCC);
+  background-image: url(data:image/x-png,f9difSSFIIGFIFJD1f982FSDKAA9==);
+  background-image: url(http://fonts.googleapis.com/css?family=\"Rokkitt\":\(400\),700);
+}
+
+#svg-data-uri {
+  background: transparent url('data:image/svg+xml, <svg version="1.1"><g></g></svg>');
+}
+
+.comma-delimited {
+  background: url(bg.jpg) no-repeat, url(bg.png) repeat-x top left, url(bg);
+}
+.values {
+    @a: 'Trebuchet';
+    url: url(@a);
+}