Merge branch '3.x' into edge

# Conflicts:
#	package.json

Author: matthew-dean

CHANGELOG.md

@@ -1,3 +1,29 @@
+# 3.0.0
+2018-02-04
+  - Rename Directive -> AtRule & Rule -> Declaration 
+  - Cross-platform `@plugin` loading! (Node & Browser)
+  - Numerous changes / improvements to plugin architecture
+  - Simplified API calls in plugins (`less.atrule()` vs `new less.tree.AtRule()`)
+  - Property accessors (`$width` to refer to `width: 300px` value)
+  - Inline JavaScript disabled by default for security reasons (use `@plugin`)
+  - Improvements in Less error reporting
+  - Added feature: returning `null` / `false` from Less functions will remove that line
+  - Simple `boolean()` and `if()` functions added
+  - Bug fixes
+  - Removal of unnecessary nodes from API (like IE's `alpha()`)
+
+# 2.7.3
+2017-10-23
+
+  - Bump `request` dependency
+
+# 2.7.2
+2017-01-04
+
+  - Revert breaking changes to contrast() function
+  - Fix error reporting of lessc executable
+  - Changed octals to hex for ES6 strict mode
+
 # 2.7.1 HOTFIX
 
 2016-05-09

dist/less.js

@@ -374,7 +374,7 @@ var Parser = function Parser(context, imports, fileInfo) {
                 //     black border-collapse
                 //
                 keyword: function () {
-                    var k = parserInput.$char("%") || parserInput.$re(/^[_A-Za-z-][_A-Za-z0-9-]*/);
+                    var k = parserInput.$char("%") || parserInput.$re(/^\[?[_A-Za-z-][_A-Za-z0-9-]*\]?/);
                     if (k) {
                         return tree.Color.fromKeyword(k) || new(tree.Keyword)(k);
                     }
@@ -1316,6 +1316,35 @@ var Parser = function Parser(context, imports, fileInfo) {
                     parserInput.restore();
                 }
             },
+            /**
+             * Will parse until regex, unless token is within {},(),[]
+             * Treat like a quoted value for variable interpolation
+             * 
+             * @todo WIP for custom properties
+             */
+            parseUntil: function(re) {
+                var str = '', e = '', 
+                    match, ch,
+                    index = parserInput.i,
+                    regex = new RegExp('^[^\{\(\[]+' + re);
+
+                do {
+                    match = parserInput.$re(regex) || '';
+                    ch = parserInput.currentChar();
+                    if (ch === '{') {
+                        e = parserInput.$re(/^[^\}]+\}/);
+                    }
+                    else if (ch === '(') {
+                        e = parserInput.$re(/^[^\)]+\)/);
+                    }
+                    else if (ch === '[') {
+                        e = parserInput.$re(/^[^\]]+\]/);
+                    }
+                    str += match + e;
+                } while (match);
+
+                return new(tree.Quoted)('', str.slice(0, -1), true, index, fileInfo);
+            },
             anonymousValue: function () {
                 var index = parserInput.i;
                 var match = parserInput.$re(/^([^@\$+\/'"*`(;{}-]*);/);

dist/less.min.js

@@ -1,4 +1,3 @@
-var utils = require('./utils');
 /**
  * Plugin Manager
  */
@@ -54,33 +53,12 @@ PluginManager.prototype.get = function(filename) {
     return this.pluginCache[filename];
 };
 
-/**
- * Deprecate eventually 
- */
-function upgradeVisitors(visitor, oldType, newType) {
-
-    if (visitor['visit' + oldType] && !visitor['visit' + newType]) {
-        visitor['visit' + newType] = visitor['visit' + oldType];
-    }
-    if (visitor['visit' + oldType + 'Out'] && !visitor['visit' + newType + 'Out']) {
-        visitor['visit' + newType + 'Out'] = visitor['visit' + oldType + 'Out'];
-    }
-}
 /**
  * Adds a visitor. The visitor object has options on itself to determine
  * when it should run.
  * @param visitor
  */
 PluginManager.prototype.addVisitor = function(visitor) {
-    var proto;
-    // 2.x to 3.x visitor compatibility
-    try {
-        proto = utils.getPrototype(visitor);
-        upgradeVisitors(proto, 'Directive', 'AtRule');
-        upgradeVisitors(proto, 'Rule', 'Declaration');
-    }
-    catch (e) {}
-
     this.visitors.push(visitor);
 };
 /**

lib/less/parser/parser.js

@@ -3,8 +3,6 @@ var tree = Object.create(null);
 tree.Node = require('./node');
 tree.Color = require('./color');
 tree.AtRule = require('./atrule');
-// Backwards compatibility
-tree.Directive = require('./directive');
 tree.DetachedRuleset = require('./detached-ruleset');
 tree.Operation = require('./operation');
 tree.Dimension = require('./dimension');
@@ -20,8 +18,6 @@ tree.Selector = require('./selector');
 tree.Quoted = require('./quoted');
 tree.Expression = require('./expression');
 tree.Declaration = require('./declaration');
-// Backwards compatibility
-tree.Rule = require('./rule');
 tree.Call = require('./call');
 tree.URL = require('./url');
 tree.Import = require('./import');

lib/less/plugin-manager.js

@@ -65,18 +65,5 @@ module.exports = {
             }
         }
         return obj1;
-    },
-    getPrototype: function(obj) {
-        if (Object.getPrototypeOf) {
-            return Object.getPrototypeOf(obj);
-        }
-        else {
-            if ("".__proto__ === String.prototype) {
-                return obj.__proto__;
-            }
-            else if (obj.constructor) {
-                return obj.constructor.prototype;
-            }
-        }
     }
 };

lib/less/tree/index.js

@@ -0,0 +1,11 @@
+.wrapper {
+  display: grid;
+  grid-template-columns: [col1-start] 9fr [col1-end] 10px [col2-start] 3fr [col2-end];
+  grid-template-rows: auto;
+}
+.wrapper {
+  display: grid;
+  grid-template-columns: 9fr 1.875em 3fr;
+  grid-template-rows: auto;
+  grid-template-areas: "header header header" "content . sidebar" "footer footer footer";
+}

lib/less/utils.js

@@ -0,0 +1,15 @@
+.wrapper {
+  display: grid;
+  grid-template-columns: [col1-start] 9fr [col1-end] 10px [col2-start] 3fr [col2-end];
+  grid-template-rows: auto;
+}
+
+.wrapper {
+  display: grid;
+  grid-template-columns: 9fr 1.875em 3fr;
+  grid-template-rows: auto;
+  grid-template-areas:
+    "header header header"
+    "content . sidebar"
+    "footer footer footer";
+}

test/css/css-grid.css

@@ -8,7 +8,7 @@
         run: function (root) {
             return this._visitor.visit(root);
         },
-        visitRule: function (ruleNode, visitArgs) {
+        visitDeclaration: function (ruleNode, visitArgs) {
             if (ruleNode.name != '-some-aribitrary-property') {
                 return ruleNode;
             } else {