Skip to content

Commit

Permalink
Merge pull request #308 from gruntjs/deps
Browse files Browse the repository at this point in the history
Update dependencies
  • Loading branch information
shama committed Apr 9, 2016
2 parents c8506f1 + 30f5d4b commit e6e4c29
Show file tree
Hide file tree
Showing 6 changed files with 53 additions and 23 deletions.
15 changes: 12 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,15 @@
sudo: false
language: node_js
node_js:
- '5'
- '4'
- '0.10'
- "0.10"
- "0.12"
- "4"
- "5"
- "iojs"
before_install:
- if [ "$TRAVIS_NODE_VERSION" = "0.10" ]; then npm install -g npm@2; fi
matrix:
fast_finish: true
cache:
directories:
- node_modules
4 changes: 4 additions & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
v1.3.0:
date: 2016-04-07
changes:
- Update lodash and async dependecies.
v1.2.0:
date: 2016-02-01
changes:
Expand Down
13 changes: 7 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# grunt-contrib-less v1.2.0 [![Build Status: Linux](https://travis-ci.org/gruntjs/grunt-contrib-less.svg?branch=master)](https://travis-ci.org/gruntjs/grunt-contrib-less) [![Build Status: Windows](https://ci.appveyor.com/api/projects/status/e3aa4d07xe4w4u05/branch/master?svg=true)](https://ci.appveyor.com/project/gruntjs/grunt-contrib-less/branch/master)
# grunt-contrib-less v1.3.0 [![Build Status: Linux](https://travis-ci.org/gruntjs/grunt-contrib-less.svg?branch=master)](https://travis-ci.org/gruntjs/grunt-contrib-less) [![Build Status: Windows](https://ci.appveyor.com/api/projects/status/e3aa4d07xe4w4u05/branch/master?svg=true)](https://ci.appveyor.com/project/gruntjs/grunt-contrib-less/branch/master)

> Compile LESS files to CSS
Expand Down Expand Up @@ -172,15 +172,15 @@ Default: none
less: {
development: {
options: {
paths: ["assets/css"]
paths: ['assets/css']
},
files: {
"path/to/result.css": "path/to/source.less"
'path/to/result.css': 'path/to/source.less'
}
},
production: {
options: {
paths: ["assets/css"],
paths: ['assets/css'],
plugins: [
new (require('less-plugin-autoprefix'))({browsers: ["last 2 versions"]}),
new (require('less-plugin-clean-css'))(cleanCssOptions)
Expand All @@ -191,7 +191,7 @@ less: {
}
},
files: {
"path/to/result.css": "path/to/source.less"
'path/to/result.css': 'path/to/source.less'
}
}
}
Expand All @@ -200,6 +200,7 @@ less: {

## Release History

* 2016-04-07   v1.3.0   Update lodash and async dependecies.
* 2016-02-01   v1.2.0   Update to less ~2.6.0. Removed peerDependency from package.json.
* 2015-11-09   v1.1.0   Update to less ~2.5.0.
* 2014-12-23   v1.0.0   Update to less 2.1.0.
Expand Down Expand Up @@ -236,4 +237,4 @@ less: {

Task submitted by [Tyler Kellen](http://goingslowly.com/)

*This file was generated on Fri Mar 18 2016 19:24:04.*
*This file was generated on Thu Apr 07 2016 15:26:05.*
36 changes: 26 additions & 10 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,28 +1,44 @@
# AppVeyor file
# http://www.appveyor.com/docs/appveyor-yml

version: "{build}"

clone_depth: 10

version: "{build}"

# What combinations to test
environment:
matrix:
- nodejs_version: "5"
- nodejs_version: "4"
- nodejs_version: "0.10"
platform: x86
- nodejs_version: "0.12"
platform: x86
- nodejs_version: "4"
platform: x64
- nodejs_version: "4"
platform: x86
- nodejs_version: "5"
platform: x86

install:
- ps: Install-Product node $env:nodejs_version
- ps: Install-Product node $env:nodejs_version $env:platform
- ps: >-
if ($env:nodejs_version -eq "0.10") {
npm -g install npm@2
$env:PATH="$env:APPDATA\npm;$env:PATH"
}
- npm install

build: off

test_script:
# Output useful info for debugging
- node --version && npm --version
- npm test
# We test multiple Windows shells because of prior stdout buffering issues
# filed against Grunt. https://github.com/joyent/node/issues/3584
- ps: "npm test # PowerShell" # Pass comment to PS for easier debugging
- cmd: npm test

build: off

matrix:
fast_finish: true

cache:
- 'node_modules -> package.json' # local npm modules
- node_modules -> package.json
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "grunt-contrib-less",
"description": "Compile LESS files to CSS",
"version": "1.2.0",
"version": "1.3.0",
"author": {
"name": "Grunt Team",
"url": "http://gruntjs.com/"
Expand All @@ -16,10 +16,10 @@
"test": "grunt test"
},
"dependencies": {
"async": "^0.9.0",
"async": "^1.5.2",
"chalk": "^1.0.0",
"less": "~2.6.0",
"lodash": "^3.2.0"
"lodash": "^4.8.2"
},
"devDependencies": {
"grunt": "^1.0.0",
Expand Down
2 changes: 1 addition & 1 deletion tasks/less.js
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ module.exports = function(grunt) {
};

var parseVariableOptions = function(options) {
var pairs = _.pairs(options);
var pairs = _.toPairs(options);
var output = '';
pairs.forEach(function(pair) {
output += '@' + pair[0] + ':' + pair[1] + ';';
Expand Down

0 comments on commit e6e4c29

Please sign in to comment.