Merge branch 'master' into feature/rewrite-urls

.gitattributes

@@ -4,7 +4,6 @@ lessc text eol=lf
 *.less text eol=lf
 *.css text eol=lf
 *.htm text eol=lf
-gradlew.bat text eol=crlf
 *.html text eol=lf
 *.jpg binary
 *.png binary

.gitignore

@@ -20,8 +20,4 @@ test/sourcemaps/*.css
 test/less-bom
 
 # grunt
-.grunt
-
-# gradle
-.gradle
-out
+.grunt

.npmignore

@@ -6,4 +6,3 @@ test/
 # re-include test files as they can be useful for plugins that do testing
 !test/*.js
 tmp/
-gradle/

CHANGELOG.md

@@ -1,7 +1,22 @@
+## 3.7.0
+
+2018-07-11
+  - New each() function! [See docs](http://lesscss.org/functions/#list-functions-each)
+  - New math modes! Also [see docs](http://lesscss.org/usage/#less-options-math).
+  - Bug fixes
+
+## 3.6.0
+
+2018-07-10
+  - Allows plain conditions in `if(true, 1, 2)` (vs. `if((true), 1, 2)`)
+  - Fixes svg-gradient() for Firefox
+  - Adds more 3rd-party tests for fewer surprises when upgrading
+  - Removes (broken) `less-rhino` implementation - use other Java ports
+
 ## 3.5.3
 
 2018-07-06
-  - Reverts @media eval change
+  - Reverts `@media` eval change
   - Other bug fixes
 
 ## 3.5.0

Gruntfile.js

@@ -158,8 +158,6 @@ module.exports = function (grunt) {
     // Project configuration.
     grunt.initConfig({
 
-        // Metadata required for build.
-        build: grunt.file.readYAML('build/build.yml'),
         pkg: grunt.file.readJSON('package.json'),
         meta: {
             copyright: 'Copyright (c) 2009-<%= grunt.template.today("yyyy") %>',
@@ -232,24 +230,6 @@ module.exports = function (grunt) {
             dist: {
                 src: '<%= browserify.browser.dest %>',
                 dest: 'dist/less.js'
-            },
-            // Rhino
-            rhino: {
-                options: {
-                    banner: '/* Less.js v<%= pkg.version %> RHINO | <%= meta.copyright %>, <%= pkg.author.name %> <<%= pkg.author.email %>> */\n\n',
-                    footer: '' // override task-level footer
-                },
-                src: ['<%= build.rhino %>'],
-                dest: 'dist/less-rhino.js'
-            },
-            // lessc for Rhino
-            rhinolessc: {
-                options: {
-                    banner: '/* Less.js v<%= pkg.version %> RHINO | <%= meta.copyright %>, <%= pkg.author.name %> <<%= pkg.author.email %>> */\n\n',
-                    footer: '' // override task-level footer
-                },
-                src: ['<%= build.rhinolessc %>'],
-                dest: 'dist/lessc-rhino.js'
             }
         },
 
@@ -307,7 +287,8 @@ module.exports = function (grunt) {
             main: {
                 // src is used to build list of less files to compile
                 src: [
-                    'test/less/plugin.less',
+                    'test/less/*.less',
+                    '!test/less/plugin-preeval.less', // uses ES6 syntax
                     // Don't test NPM import, obviously
                     '!test/less/plugin-module.less',
                     '!test/less/import-module.less',
@@ -491,13 +472,6 @@ module.exports = function (grunt) {
         'uglify:dist'
     ]);
 
-    // Release Rhino Version (UNSUPPORTED)
-    grunt.registerTask('rhino', [
-        'browserify:rhino',
-        'concat:rhino',
-        'concat:rhinolessc'
-    ]);
-
     // Create the browser version of less.js
     grunt.registerTask('browsertest-lessjs', [
         'browserify:browser',

bin/lessc

@@ -4,6 +4,7 @@ var path = require('path'),
     fs = require('../lib/less-node/fs'),
     os = require('os'),
     utils = require('../lib/less/utils'),
+    MATH = require('../lib/less/math-constants'),
     errno,
     mkdirp;
 
@@ -495,8 +496,17 @@ function processPluginQueue() {
                 break;
             case 'sm':
             case 'strict-math':
+                console.warning('--strict-math is deprecated. Use --math=strict');
                 if (checkArgFunc(arg, match[2])) {
-                    options.strictMath = checkBooleanArg(match[2]);
+                    if (checkBooleanArg(match[2])) {
+                        options.math = MATH.STRICT_LEGACY;
+                    }
+                }
+                break;
+            case 'm':
+            case 'math':
+                if (checkArgFunc(arg, match[2])) {
+                    options.math = match[2];
                 }
                 break;
             case 'su':

bower.json

@@ -5,18 +5,13 @@
     "**/.*",
     "benchmark",
     "bin",
-    "build",
-    "gradle",
     "lib",
     "test",
     "*.md",
     "LICENSE",
     "Gruntfile.js",
     "*.json",
     "*.yml",
-    "build.gradle",
-    "gradlew",
-    "gradlew.bat",
     ".gitattributes",
     ".jshintrc",
     ".npmignore"