Release/v3.5.0 beta.3 (#3246)

less · Jun 30, 2018 · 99162b6 · 99162b6
1 parent 7a47223
commit 99162b6
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 5 deletions.
diff --git a/dist/less.js b/dist/less.js
@@ -1,5 +1,5 @@
 /*!
- * Less - Leaner CSS v3.5.0-beta.2
+ * Less - Leaner CSS v3.5.0-beta.3
  * http://lesscss.org
  *
  * Copyright (c) 2009-2018, Alexis Sellier <[email protected]>
@@ -228,11 +228,12 @@ module.exports = function(window, options, logger) {
                 vars      = cache && cache.getItem(path + ':vars');
 
             modifyVars = modifyVars || {};
+            vars = vars || "{}"; // if not set, treat as the JSON representation of an empty object
 
             if (timestamp && webInfo.lastModified &&
                 (new Date(webInfo.lastModified).valueOf() ===
                     new Date(timestamp).valueOf()) &&
-                (!modifyVars && !vars || JSON.stringify(modifyVars) === vars)) {
+                JSON.stringify(modifyVars) === vars) {
                 // Use local copy
                 return css;
             }

diff --git a/dist/less.min.js b/dist/less.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "less",
-  "version": "3.5.0-beta.2",
+  "version": "3.5.0-beta.3",
   "description": "Leaner CSS",
   "homepage": "http://lesscss.org",
   "author": {

diff --git a/test/css/css-grid.css b/test/css/css-grid.css
@@ -3,6 +3,19 @@
   grid-template-columns: [col1-start] 9fr [col1-end] 10px [col2-start] 3fr [col2-end];
   grid-template-rows: auto;
 }
+.wrapper {
+  display: grid;
+  grid-template-columns: [left-bound] auto [container-left] 1170px [container-right] auto [right-bound];
+  grid-template-rows: [row-1-start] 140px [row-2-start] 390px [row-3-start] 200px [row-4-start] 120px [row-5-start] 120px [row-6-start] 120px;
+}
+.container-12 {
+  z-index: 20;
+  display: grid;
+  grid-column: container-left / span 1;
+  grid-row: 2;
+  grid-template-columns: [wrapcol-1-start] 1fr [wrapcol-1-end] 15px [wrapcol-2-start] 1fr [wrapcol-2-end] 15px [wrapcol-3-start] 1fr [wrapcol-3-end] 15px [wrapcol-4-start] 1fr [wrapcol-4-end] 15px [wrapcol-5-start] 1fr [wrapcol-5-end] 15px [wrapcol-6-start] 1fr [wrapcol-6-end] 15px [wrapcol-7-start] 1fr [wrapcol-7-end] 15px [wrapcol-8-start] 1fr [wrapcol-8-end] 15px [wrapcol-9-start] 1fr [wrapcol-9-end] 15px [wrapcol-10-start] 1fr [wrapcol-10-end] 15px [wrapcol-11-start] 1fr [wrapcol-11-end] 15px [wrapcol-12-start] 1fr [wrapcol-12-end];
+  grid-template-rows: repeat(14, [gutter] 10px [row] 60px);
+}
 .wrapper {
   display: grid;
   grid-template-columns: 9fr 1.875em 3fr;

diff --git a/test/less/css-grid.less b/test/less/css-grid.less
@@ -4,6 +4,21 @@
   grid-template-rows: auto;
 }
 
+.wrapper {
+  display: grid;
+  grid-template-columns: [left-bound] auto [container-left] 1170px [container-right] auto [right-bound];
+  grid-template-rows: [row-1-start] 140px [row-2-start] 390px [row-3-start] 200px [row-4-start] 120px [row-5-start] 120px [row-6-start] 120px;
+}
+
+.container-12 {
+  z-index: 20;
+  display: grid;
+  grid-column: container-left / span 1;
+  grid-row: 2;
+  grid-template-columns: [wrapcol-1-start] 1fr [wrapcol-1-end] 15px [wrapcol-2-start] 1fr [wrapcol-2-end] 15px [wrapcol-3-start] 1fr [wrapcol-3-end] 15px [wrapcol-4-start] 1fr [wrapcol-4-end] 15px [wrapcol-5-start] 1fr [wrapcol-5-end] 15px [wrapcol-6-start] 1fr [wrapcol-6-end] 15px [wrapcol-7-start] 1fr [wrapcol-7-end] 15px [wrapcol-8-start] 1fr [wrapcol-8-end] 15px [wrapcol-9-start] 1fr [wrapcol-9-end] 15px [wrapcol-10-start] 1fr [wrapcol-10-end] 15px [wrapcol-11-start] 1fr [wrapcol-11-end] 15px [wrapcol-12-start] 1fr [wrapcol-12-end];
+  grid-template-rows: repeat(14, [gutter] 10px [row] 60px);
+}
+
 .wrapper {
   display: grid;
   grid-template-columns: 9fr 1.875em 3fr;