less 3.7.0 → 3.9.0

package/test/browser/runner-rewrite-urls-options.js

@@ -0,0 +1,3 @@
+var less = {logLevel: 4,
+    errorReporting: 'console'};
+less.rewriteUrls = 'all';

package/test/browser/runner-rewrite-urls-spec.js

@@ -0,0 +1,3 @@
+describe("less.js browser test - rewrite urls", function() {
+    testLessEqualsInDocument();
+});

package/test/browser/runner-rootpath-relative-spec.js

@@ -1,3 +1,3 @@
-describe('less.js browser test - rootpath and relative url\'s', function() {
+describe('less.js browser test - rootpath and relative urls', function() {
     testLessEqualsInDocument();
 });

package/test/browser/runner-rootpath-rewrite-urls-options.js

@@ -0,0 +1,4 @@
+var less = {logLevel: 4,
+    errorReporting: 'console'};
+less.rootpath = 'https://www.github.com/cloudhead/less.js/';
+less.rewriteUrls = 'all';

package/test/browser/runner-rootpath-rewrite-urls-spec.js

@@ -0,0 +1,3 @@
+describe('less.js browser test - rootpath and rewrite urls', function() {
+    testLessEqualsInDocument();
+});

package/test/css/colors.css

@@ -23,7 +23,7 @@
   color: #1a0000ff;
 }
 #alpha #hsla {
-  color: rgba(61, 45, 41, 0.6);
+  color: hsla(11, 20%, 20%, 0.6);
 }
 #overflow .a {
   color: #000000;
@@ -47,10 +47,10 @@
   color: #333333;
 }
 #808080 {
-  color: #808080;
+  color: hsl(0, 0%, 50%);
 }
 #00ff00 {
-  color: #00ff00;
+  color: hsl(120, 100%, 50%);
 }
 .lightenblue {
   color: #3333ff;
@@ -85,3 +85,20 @@
   color: 255;
   border-color: rgba(255, 0, 0, 0.5);
 }
+#rrggbbaa {
+  test-1: #55FF5599;
+  test-2: #5F59;
+  test-3: rgba(136, 255, 136, 0.6);
+  test-4: rgba(85, 255, 85, 0.1);
+  test-5: rgba(85, 255, 85, 0.6);
+  test-6: rgba(85, 255, 85, 0.6);
+  test-7: rgba(85, 255, 85, 0.5);
+  test-8: rgba(var(--color-accent), 0.2);
+  test-9: rgb(var(--color-accent));
+  test-9: hsla(var(--color-accent));
+  test-10: #55FF5599;
+  test-11: hsla(120, 100%, 66.66666667%, 0.6);
+  test-12: hsla(120, 100%, 66.66666667%, 0.5);
+  --semi-transparent-dark-background: #001e00ee;
+  --semi-transparent-dark-background-2: #001e00;
+}

package/test/css/css-escapes.css

@@ -25,3 +25,6 @@ ng\:form {
 .bootstrap {
   background-color: #000 \9;
 }
+textarea {
+  font-family: 'helvetica neue', 'wenquanyi micro hei', \5FAE\8F6F\96C5\9ED1, \5B8B\4F53, sans-serif;
+}

package/test/css/functions-each.css

@@ -40,9 +40,43 @@
   val2: 2;
   val3: 4;
 }
+.column-list {
+  list: 1 2 3 4;
+}
+.col-1 {
+  width: 25%;
+}
+.col-2 {
+  width: 25%;
+}
+.col-3 {
+  width: 25%;
+}
+.col-4 {
+  width: 25%;
+}
+.row-1 {
+  width: 10px;
+}
+.row-2 {
+  width: 20px;
+}
+.row-3 {
+  width: 30px;
+}
 .box {
   -less-log: a;
   -less-log: b;
   -less-log: c;
   -less-log: d;
 }
+.test {
+  color: blue;
+  color: red;
+}
+.foo {
+  content: red;
+}
+.bar {
+  content: blue;
+}

package/test/css/functions.css

@@ -17,9 +17,9 @@
   desaturate: #29332f;
   desaturate-relative: #233930;
   greyscale: #2e2e2e;
-  hsl-clamp: #ffffff;
-  spin-p: #bf6a40;
-  spin-n: #bf4055;
+  hsl-clamp: hsl(0, 0%, 100%);
+  spin-p: hsl(20, 50%, 50%);
+  spin-n: hsl(350, 50%, 50%);
   luma-white: 100%;
   luma-black: 0%;
   luma-black-alpha: 0%;
@@ -168,7 +168,7 @@
   case-insensitive-2: true;
 }
 #alpha {
-  alpha: rgba(153, 94, 51, 0.6);
+  alpha: hsla(25, 50%, 40%, 0.6);
   alpha2: 0.5;
   alpha3: 0;
 }

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

@@ -0,0 +1,17 @@
+#imported-file {
+  background-image: url("./folder/relative/path");
+  background-image: url("./relative/path");
+  background-image: url("../relative/path");
+  background-image: url("folder/module");
+  background-image: url("folder/module/path");
+  background-image: url("folder/module/relative/path");
+}
+#rewrite-urls-all {
+  background-image: url("./relative/path");
+  background-image: url("../relative/path");
+  background-image: url("./path");
+  background-image: url("./");
+  background-image: url("module");
+  background-image: url("module/path");
+  background-image: url("module/relative/path");
+}

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

@@ -0,0 +1,17 @@
+#imported-file {
+  background-image: url("./folder/relative/path");
+  background-image: url("./relative/path");
+  background-image: url("../relative/path");
+  background-image: url("module");
+  background-image: url("module/path");
+  background-image: url("module/relative/path");
+}
+#rewrite-urls-local {
+  background-image: url("./relative/path");
+  background-image: url("../relative/path");
+  background-image: url("./path");
+  background-image: url("./");
+  background-image: url("module");
+  background-image: url("module/path");
+  background-image: url("module/relative/path");
+}

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

@@ -0,0 +1,17 @@
+#imported-file {
+  background-image: url("http://example.com/assets/css/folder/relative/path");
+  background-image: url("http://example.com/assets/css/relative/path");
+  background-image: url("http://example.com/assets/relative/path");
+  background-image: url("http://example.com/assets/css/folder/module");
+  background-image: url("http://example.com/assets/css/folder/module/path");
+  background-image: url("http://example.com/assets/css/folder/module/relative/path");
+}
+#rootpath-rewrite-urls-all {
+  background-image: url("http://example.com/assets/css/relative/path");
+  background-image: url("http://example.com/assets/relative/path");
+  background-image: url("http://example.com/assets/css/path");
+  background-image: url("http://example.com/assets/css");
+  background-image: url("http://example.com/assets/css/module");
+  background-image: url("http://example.com/assets/css/module/path");
+  background-image: url("http://example.com/assets/css/module/relative/path");
+}

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

@@ -0,0 +1,17 @@
+#imported-file {
+  background-image: url("http://example.com/assets/css/folder/relative/path");
+  background-image: url("http://example.com/assets/css/relative/path");
+  background-image: url("http://example.com/assets/relative/path");
+  background-image: url("module");
+  background-image: url("module/path");
+  background-image: url("module/relative/path");
+}
+#rootpath-rewrite-urls-local {
+  background-image: url("http://example.com/assets/css/relative/path");
+  background-image: url("http://example.com/assets/relative/path");
+  background-image: url("http://example.com/assets/css/path");
+  background-image: url("http://example.com/assets/css");
+  background-image: url("module");
+  background-image: url("module/path");
+  background-image: url("module/relative/path");
+}

package/test/css/static-urls/urls.css

@@ -30,12 +30,12 @@
 #logo {
   width: 100px;
   height: 100px;
-  background: url('assets/logo.png');
+  background: url('./assets/logo.png');
   background: url("#inline-svg");
 }
 @font-face {
   font-family: xecret;
-  src: url('assets/xecret.ttf');
+  src: url('./assets/xecret.ttf');
 }
 #secret {
   font-family: xecret, sans-serif;

package/test/css/urls.css

@@ -38,12 +38,12 @@
 #logo {
   width: 100px;
   height: 100px;
-  background: url('import/assets/logo.png');
+  background: url('./import/assets/logo.png');
   background: url("#inline-svg");
 }
 @font-face {
   font-family: xecret;
-  src: url('import/assets/xecret.ttf');
+  src: url('./import/assets/xecret.ttf');
 }
 #secret {
   font-family: xecret, sans-serif;

package/test/index.js

@@ -9,8 +9,9 @@ lessTester.prepBomTest();
 var testMap = [
     [{}, 'namespacing/'],
     [{
-        relativeUrls: true, 
-        silent: true, 
+        // TODO: Change this to rewriteUrls: 'all' once the relativeUrls option is removed
+        relativeUrls: true,
+        silent: true,
         javascriptEnabled: true,
         // Set explicitly for legacy tests for >3.0
         ieCompat: true
@@ -37,6 +38,7 @@ var testMap = [
         function(name) { return name + '-mediaquery'; }],
     [{math: 'strict', dumpLineNumbers: 'all'}, 'debug/', null,
         function(name) { return name + '-all'; }],
+    // TODO: Change this to rewriteUrls: false once the relativeUrls option is removed
     [{math: 'strict', relativeUrls: false, rootpath: 'folder (1)/'}, 'static-urls/'],
     [{math: 'strict', compress: true}, 'compression/'],
     [{math: 0, strictUnits: true}, 'strict-units/'],
@@ -56,6 +58,10 @@ var testMap = [
     [{modifyVars: true}, 'modifyVars/',
         null, null, null, function(name, type, baseFolder) { return path.join(baseFolder, name) + '.json'; }],
     [{urlArgs: '424242'}, 'url-args/'],
+    [{rewriteUrls: 'all'}, 'rewrite-urls-all/'],
+    [{rewriteUrls: 'local'}, 'rewrite-urls-local/'],
+    [{rootpath: 'http://example.com/assets/css/', rewriteUrls: 'all'}, 'rootpath-rewrite-urls-all/'],
+    [{rootpath: 'http://example.com/assets/css/', rewriteUrls: 'local'}, 'rootpath-rewrite-urls-local/'],
     [{paths: ['test/data/', 'test/less/import/']}, 'include-path/'],
     [{paths: 'test/data/'}, 'include-path-string/'],
     [{plugin: 'test/plugins/postprocess/'}, 'postProcessorPlugin/'],

package/test/less/colors.less

@@ -96,3 +96,21 @@
   color: red(rgb(100%, 0, 0));
   border-color: rgba(100%, 0, 0, 50%);
 }
+
+#rrggbbaa {
+  test-1: #55FF5599;
+  test-2: #5F59;
+  test-3: lighten(#55FF5599, 10%);
+  test-4: fade(#5F59, 10%);
+  test-5: rgba(#55FF5599);
+  test-6: rgba(#5F59);
+  test-7: rgba(#5F59, 0.5);
+  test-8: rgba(var(--color-accent), 0.2);
+  test-9: rgb(var(--color-accent));
+  test-9: hsla(var(--color-accent));
+  test-10: color('#55FF5599');
+  test-11: hsla(#5F59);
+  test-12: hsla(#5F59, 0.5);
+  --semi-transparent-dark-background: #001e00ee;
+  --semi-transparent-dark-background-2: rgba(0, 30, 0, 238); // invalid opacity will be capped
+}

package/test/less/css-escapes.less

@@ -35,4 +35,8 @@ ng\:form {
 // In Bootstrap v3
 .bootstrap {
     background-color: #000 \9;
+}
+
+textarea {
+    font-family: 'helvetica neue','wenquanyi micro hei',\5FAE\8F6F\96C5\9ED1, \5B8B\4F53, sans-serif;
 }

package/test/less/errors/color-func-invalid-color.txt

@@ -1,4 +1,4 @@
-ArgumentError: error evaluating function `color`: argument must be a color keyword or 3/6 digit hex e.g. #FFF in {path}color-func-invalid-color.less on line 2, column 10:
+ArgumentError: error evaluating function `color`: argument must be a color keyword or 3|4|6|8 digit hex e.g. #FFF in {path}color-func-invalid-color.less on line 2, column 10:
 1 .test {
 2   color: color("NOT A COLOR");
 3 }

package/test/less/functions-each.less

@@ -38,8 +38,11 @@ each(@selectors, {
 
 @set: {
   one: blue;
+  // skip comments
   two: green;
-  three: red;
+  /** and these
+  */
+  three: red; //and this
 }
 .set {
   each(@set, {
@@ -73,9 +76,56 @@ each(@selectors, {
   });
 }
 
+@columns: range(4);
+.column-list {
+  list: @columns;
+}
+
+each(@columns, .(@val) {
+  .col-@{val} {
+    width: (100% / length(@columns));
+  }
+});
+
+each(range(10px, 30px, 10px), .(@val, @index) {
+  .row-@{index} {
+    width: @val;
+  }
+});
+
 @list: a b c d;
 .box {
   each(@list, {
     -less-log: extract(@list, @index);
   })
 }
+
+// https://github.com/less/less.js/issues/3325
+
+@color-schemes: {
+  @primary: {
+    @color: blue;
+  }
+  @secondary: {
+    @color: red;
+  }
+}
+.test {
+  each(primary secondary, .(@color-name) {
+    @scheme: @color-schemes[@@color-name]; // e.g. @color-name = primary
+    color: @scheme[@color];
+  });
+}
+
+@one: {
+  @two: {
+    foo: red;
+    bar: blue;
+  };
+};
+
+each(@one[@two], {
+  .@{key} {
+    content: @value;
+  }
+});

package/test/less/rewrite-urls-all/folder/file.less

@@ -0,0 +1,8 @@
+#imported-file {
+  background-image: url("./relative/path");
+  background-image: url("../relative/path");
+  background-image: url("../../relative/path");
+  background-image: url("module");
+  background-image: url("module/path");
+  background-image: url("module/path/../relative/path");
+}

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

@@ -0,0 +1,11 @@
+@import "./folder/file.less";
+
+#rewrite-urls-all {
+  background-image: url("./relative/path");
+  background-image: url("../relative/path");
+  background-image: url("./relative/../path");
+  background-image: url("./relative/../path/..");
+  background-image: url("module");
+  background-image: url("module/path");
+  background-image: url("module/path/../relative/path");
+}

package/test/less/rewrite-urls-local/folder/file.less

@@ -0,0 +1,8 @@
+#imported-file {
+  background-image: url("./relative/path");
+  background-image: url("../relative/path");
+  background-image: url("../../relative/path");
+  background-image: url("module");
+  background-image: url("module/path");
+  background-image: url("module/path/../relative/path");
+}

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

@@ -0,0 +1,11 @@
+@import "./folder/file.less";
+
+#rewrite-urls-local {
+  background-image: url("./relative/path");
+  background-image: url("../relative/path");
+  background-image: url("./relative/../path");
+  background-image: url("./relative/../path/..");
+  background-image: url("module");
+  background-image: url("module/path");
+  background-image: url("module/path/../relative/path");
+}

package/test/less/rootpath-rewrite-urls-all/folder/file.less

@@ -0,0 +1,8 @@
+#imported-file {
+  background-image: url("./relative/path");
+  background-image: url("../relative/path");
+  background-image: url("../../relative/path");
+  background-image: url("module");
+  background-image: url("module/path");
+  background-image: url("module/path/../relative/path");
+}

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

@@ -0,0 +1,11 @@
+@import "./folder/file.less";
+
+#rootpath-rewrite-urls-all {
+  background-image: url("./relative/path");
+  background-image: url("../relative/path");
+  background-image: url("./relative/../path");
+  background-image: url("./relative/../path/..");
+  background-image: url("module");
+  background-image: url("module/path");
+  background-image: url("module/path/../relative/path");
+}

package/test/less/rootpath-rewrite-urls-local/folder/file.less

@@ -0,0 +1,8 @@
+#imported-file {
+  background-image: url("./relative/path");
+  background-image: url("../relative/path");
+  background-image: url("../../relative/path");
+  background-image: url("module");
+  background-image: url("module/path");
+  background-image: url("module/path/../relative/path");
+}

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

@@ -0,0 +1,11 @@
+@import "./folder/file.less";
+
+#rootpath-rewrite-urls-local {
+  background-image: url("./relative/path");
+  background-image: url("../relative/path");
+  background-image: url("./relative/../path");
+  background-image: url("./relative/../path/..");
+  background-image: url("module");
+  background-image: url("module/path");
+  background-image: url("module/path/../relative/path");
+}

package/test/less/sourcemaps/custom-props.less

@@ -0,0 +1,8 @@
+@color: var(--foo);
+
+body {
+	border-left: 1px solid @color;
+	width: calc(50% - 5px);
+	border-top: 1px solid @color;
+}
+

package/test/less-bom/colors.less

@@ -96,3 +96,21 @@
   color: red(rgb(100%, 0, 0));
   border-color: rgba(100%, 0, 0, 50%);
 }
+
+#rrggbbaa {
+  test-1: #55FF5599;
+  test-2: #5F59;
+  test-3: lighten(#55FF5599, 10%);
+  test-4: fade(#5F59, 10%);
+  test-5: rgba(#55FF5599);
+  test-6: rgba(#5F59);
+  test-7: rgba(#5F59, 0.5);
+  test-8: rgba(var(--color-accent), 0.2);
+  test-9: rgb(var(--color-accent));
+  test-9: hsla(var(--color-accent));
+  test-10: color('#55FF5599');
+  test-11: hsla(#5F59);
+  test-12: hsla(#5F59, 0.5);
+  --semi-transparent-dark-background: #001e00ee;
+  --semi-transparent-dark-background-2: rgba(0, 30, 0, 238); // invalid opacity will be capped
+}

package/test/less-bom/css-escapes.less

@@ -35,4 +35,8 @@ ng\:form {
 // In Bootstrap v3
 .bootstrap {
     background-color: #000 \9;
+}
+
+textarea {
+    font-family: 'helvetica neue','wenquanyi micro hei',\5FAE\8F6F\96C5\9ED1, \5B8B\4F53, sans-serif;
 }

package/test/less-bom/errors/color-func-invalid-color.txt

@@ -1,4 +1,4 @@
-ArgumentError: error evaluating function `color`: argument must be a color keyword or 3/6 digit hex e.g. #FFF in {path}color-func-invalid-color.less on line 2, column 10:
+ArgumentError: error evaluating function `color`: argument must be a color keyword or 3|4|6|8 digit hex e.g. #FFF in {path}color-func-invalid-color.less on line 2, column 10:
 1 .test {
 2   color: color("NOT A COLOR");
 3 }

package/test/less-bom/functions-each.less

@@ -38,8 +38,11 @@ each(@selectors, {
 
 @set: {
   one: blue;
+  // skip comments
   two: green;
-  three: red;
+  /** and these
+  */
+  three: red; //and this
 }
 .set {
   each(@set, {
@@ -73,9 +76,56 @@ each(@selectors, {
   });
 }
 
+@columns: range(4);
+.column-list {
+  list: @columns;
+}
+
+each(@columns, .(@val) {
+  .col-@{val} {
+    width: (100% / length(@columns));
+  }
+});
+
+each(range(10px, 30px, 10px), .(@val, @index) {
+  .row-@{index} {
+    width: @val;
+  }
+});
+
 @list: a b c d;
 .box {
   each(@list, {
     -less-log: extract(@list, @index);
   })
 }
+
+// https://github.com/less/less.js/issues/3325
+
+@color-schemes: {
+  @primary: {
+    @color: blue;
+  }
+  @secondary: {
+    @color: red;
+  }
+}
+.test {
+  each(primary secondary, .(@color-name) {
+    @scheme: @color-schemes[@@color-name]; // e.g. @color-name = primary
+    color: @scheme[@color];
+  });
+}
+
+@one: {
+  @two: {
+    foo: red;
+    bar: blue;
+  };
+};
+
+each(@one[@two], {
+  .@{key} {
+    content: @value;
+  }
+});

package/test/less-bom/rewrite-urls-all/folder/file.less

@@ -0,0 +1,8 @@
+#imported-file {
+  background-image: url("./relative/path");
+  background-image: url("../relative/path");
+  background-image: url("../../relative/path");
+  background-image: url("module");
+  background-image: url("module/path");
+  background-image: url("module/path/../relative/path");
+}

package/test/less-bom/rewrite-urls-all/rewrite-urls-all.less

@@ -0,0 +1,11 @@
+@import "./folder/file.less";
+
+#rewrite-urls-all {
+  background-image: url("./relative/path");
+  background-image: url("../relative/path");
+  background-image: url("./relative/../path");
+  background-image: url("./relative/../path/..");
+  background-image: url("module");
+  background-image: url("module/path");
+  background-image: url("module/path/../relative/path");
+}

package/test/less-bom/rewrite-urls-local/folder/file.less

@@ -0,0 +1,8 @@
+#imported-file {
+  background-image: url("./relative/path");
+  background-image: url("../relative/path");
+  background-image: url("../../relative/path");
+  background-image: url("module");
+  background-image: url("module/path");
+  background-image: url("module/path/../relative/path");
+}

package/test/less-bom/rewrite-urls-local/rewrite-urls-local.less

@@ -0,0 +1,11 @@
+@import "./folder/file.less";
+
+#rewrite-urls-local {
+  background-image: url("./relative/path");
+  background-image: url("../relative/path");
+  background-image: url("./relative/../path");
+  background-image: url("./relative/../path/..");
+  background-image: url("module");
+  background-image: url("module/path");
+  background-image: url("module/path/../relative/path");
+}

package/test/less-bom/rootpath-rewrite-urls-all/folder/file.less

@@ -0,0 +1,8 @@
+#imported-file {
+  background-image: url("./relative/path");
+  background-image: url("../relative/path");
+  background-image: url("../../relative/path");
+  background-image: url("module");
+  background-image: url("module/path");
+  background-image: url("module/path/../relative/path");
+}