Merge branch 'master' into strict-math-division

# Conflicts: # test/less/functions.less
less · Jul 11, 2018 · 78c38e4 · 78c38e4
2 parents 556ea61 + d99a1b8
commit 78c38e4
Show file tree

Hide file tree

Showing 39 changed files with 393 additions and 1,608 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -1 +1,2 @@
-Gruntfile.js
+Gruntfile.js
+test/browser/vendor/*
diff --git a/.gitattributes b/.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

diff --git a/.gitignore b/.gitignore
@@ -20,8 +20,4 @@ test/sourcemaps/*.css
 test/less-bom
 
 # grunt
-.grunt
-
-# gradle
-.gradle
-out
+.grunt
diff --git a/.npmignore b/.npmignore
@@ -6,4 +6,3 @@ test/
 # re-include test files as they can be useful for plugins that do testing
 !test/*.js
 tmp/
-gradle/
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,7 +1,15 @@
+## 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

diff --git a/Gruntfile.js b/Gruntfile.js
@@ -154,8 +154,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") %>',
@@ -228,24 +226,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'
             }
         },
 
@@ -292,13 +272,19 @@ module.exports = function (grunt) {
             options: {
                 keepRunner: true,
                 host: 'http://localhost:8081/',
-                vendor: ['test/browser/jasmine-jsreporter.js', 'test/browser/common.js', 'test/browser/less.js'],
+                vendor: [
+                    'test/browser/vendor/promise.js',
+                    'test/browser/jasmine-jsreporter.js',
+                    'test/browser/common.js',
+                    'test/browser/less.js'
+                ],
                 template: 'test/browser/test-runner-template.tmpl'
             },
             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',
@@ -466,13 +452,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',

diff --git a/bower.json b/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"