Remove legacy upgrade

- Add simple grid syntax support
less · Feb 10, 2018 · 4508495 · 4508495
1 parent 2a4a63a
commit 4508495
Show file tree

Hide file tree

Showing 10 changed files with 106 additions and 184 deletions.
diff --git a/dist/less.js b/dist/less.js
diff --git a/dist/less.min.js b/dist/less.min.js
diff --git a/lib/less/parser/parser.js b/lib/less/parser/parser.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);
                     }

diff --git a/lib/less/plugin-manager.js b/lib/less/plugin-manager.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);
 };
 /**

diff --git a/lib/less/tree/index.js b/lib/less/tree/index.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');

diff --git a/lib/less/utils.js b/lib/less/utils.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;
-            }
-        }
     }
 };
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "less",
-  "version": "3.0.0-RC.1",
+  "version": "3.0.0-RC.2",
   "description": "Leaner CSS",
   "homepage": "http://lesscss.org",
   "author": {

diff --git a/test/css/css-grid.css b/test/css/css-grid.css
@@ -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";
+}
diff --git a/test/less/css-grid.less b/test/less/css-grid.less
@@ -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";
+}
diff --git a/test/plugins/visitor/index.js b/test/plugins/visitor/index.js
@@ -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 {