Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 78c38e4

Browse files
committed
Merge branch 'master' into strict-math-division
# Conflicts: # test/less/functions.less
2 parents 556ea61 + d99a1b8 commit 78c38e4

39 files changed

+393
-1608
lines changed

.eslintignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
Gruntfile.js
1+
Gruntfile.js
2+
test/browser/vendor/*

.gitattributes

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ lessc text eol=lf
44
*.less text eol=lf
55
*.css text eol=lf
66
*.htm text eol=lf
7-
gradlew.bat text eol=crlf
87
*.html text eol=lf
98
*.jpg binary
109
*.png binary

.gitignore

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,4 @@ test/sourcemaps/*.css
2020
test/less-bom
2121

2222
# grunt
23-
.grunt
24-
25-
# gradle
26-
.gradle
27-
out
23+
.grunt

.npmignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,3 @@ test/
66
# re-include test files as they can be useful for plugins that do testing
77
!test/*.js
88
tmp/
9-
gradle/

CHANGELOG.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,15 @@
1+
## 3.6.0
2+
3+
2018-07-10
4+
- Allows plain conditions in `if(true, 1, 2)` (vs. `if((true), 1, 2)`)
5+
- Fixes svg-gradient() for Firefox
6+
- Adds more 3rd-party tests for fewer surprises when upgrading
7+
- Removes (broken) `less-rhino` implementation - use other Java ports
8+
19
## 3.5.3
210

311
2018-07-06
4-
- Reverts @media eval change
12+
- Reverts `@media` eval change
513
- Other bug fixes
614

715
## 3.5.0

Gruntfile.js

Lines changed: 8 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -154,8 +154,6 @@ module.exports = function (grunt) {
154154
// Project configuration.
155155
grunt.initConfig({
156156

157-
// Metadata required for build.
158-
build: grunt.file.readYAML('build/build.yml'),
159157
pkg: grunt.file.readJSON('package.json'),
160158
meta: {
161159
copyright: 'Copyright (c) 2009-<%= grunt.template.today("yyyy") %>',
@@ -228,24 +226,6 @@ module.exports = function (grunt) {
228226
dist: {
229227
src: '<%= browserify.browser.dest %>',
230228
dest: 'dist/less.js'
231-
},
232-
// Rhino
233-
rhino: {
234-
options: {
235-
banner: '/* Less.js v<%= pkg.version %> RHINO | <%= meta.copyright %>, <%= pkg.author.name %> <<%= pkg.author.email %>> */\n\n',
236-
footer: '' // override task-level footer
237-
},
238-
src: ['<%= build.rhino %>'],
239-
dest: 'dist/less-rhino.js'
240-
},
241-
// lessc for Rhino
242-
rhinolessc: {
243-
options: {
244-
banner: '/* Less.js v<%= pkg.version %> RHINO | <%= meta.copyright %>, <%= pkg.author.name %> <<%= pkg.author.email %>> */\n\n',
245-
footer: '' // override task-level footer
246-
},
247-
src: ['<%= build.rhinolessc %>'],
248-
dest: 'dist/lessc-rhino.js'
249229
}
250230
},
251231

@@ -292,13 +272,19 @@ module.exports = function (grunt) {
292272
options: {
293273
keepRunner: true,
294274
host: 'http://localhost:8081/',
295-
vendor: ['test/browser/jasmine-jsreporter.js', 'test/browser/common.js', 'test/browser/less.js'],
275+
vendor: [
276+
'test/browser/vendor/promise.js',
277+
'test/browser/jasmine-jsreporter.js',
278+
'test/browser/common.js',
279+
'test/browser/less.js'
280+
],
296281
template: 'test/browser/test-runner-template.tmpl'
297282
},
298283
main: {
299284
// src is used to build list of less files to compile
300285
src: [
301-
'test/less/plugin.less',
286+
'test/less/*.less',
287+
'!test/less/plugin-preeval.less', // uses ES6 syntax
302288
// Don't test NPM import, obviously
303289
'!test/less/plugin-module.less',
304290
'!test/less/import-module.less',
@@ -466,13 +452,6 @@ module.exports = function (grunt) {
466452
'uglify:dist'
467453
]);
468454

469-
// Release Rhino Version (UNSUPPORTED)
470-
grunt.registerTask('rhino', [
471-
'browserify:rhino',
472-
'concat:rhino',
473-
'concat:rhinolessc'
474-
]);
475-
476455
// Create the browser version of less.js
477456
grunt.registerTask('browsertest-lessjs', [
478457
'browserify:browser',

bower.json

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,13 @@
55
"**/.*",
66
"benchmark",
77
"bin",
8-
"build",
9-
"gradle",
108
"lib",
119
"test",
1210
"*.md",
1311
"LICENSE",
1412
"Gruntfile.js",
1513
"*.json",
1614
"*.yml",
17-
"build.gradle",
18-
"gradlew",
19-
"gradlew.bat",
2015
".gitattributes",
2116
".jshintrc",
2217
".npmignore"

0 commit comments

Comments
 (0)