From 506dc544715050e1999cbbfb30ca4873978e8ce3 Mon Sep 17 00:00:00 2001 From: Simon Hewitt Date: Thu, 30 Jul 2015 10:51:34 -0700 Subject: [PATCH 1/4] make relative reporterOutput paths optional --- tasks/jshint.js | 3 ++- tasks/lib/jshint.js | 14 +++++++++----- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/tasks/jshint.js b/tasks/jshint.js index da06d71..9a1f53d 100644 --- a/tasks/jshint.js +++ b/tasks/jshint.js @@ -20,7 +20,8 @@ module.exports = function(grunt) { // Merge task-specific and/or target-specific options with these defaults. var options = this.options({ force: false, - reporter: null + reporter: null, + reporterOutputRelative: true }); // Report JSHint errors but dont fail the task diff --git a/tasks/lib/jshint.js b/tasks/lib/jshint.js index 1c2e682..4781cbb 100644 --- a/tasks/lib/jshint.js +++ b/tasks/lib/jshint.js @@ -156,7 +156,9 @@ exports.init = function(grunt) { var reporterOutputDir; // Get reporter output directory for relative paths in reporters if (options.hasOwnProperty('reporterOutput')) { - reporterOutputDir = path.dirname(options.reporterOutput); + if(options.reporterOutputRelative) { + reporterOutputDir = path.dirname(options.reporterOutput); + } delete options.reporterOutput; } @@ -164,7 +166,7 @@ exports.init = function(grunt) { var reporter = exports.selectReporter(options); // Remove bad options that may have came in from the cli - ['reporter', 'jslint-reporter', 'checkstyle-reporter', 'show-non-errors'].forEach(function(opt) { + ['reporter', 'reporterOutputRelative', 'jslint-reporter', 'checkstyle-reporter', 'show-non-errors'].forEach(function(opt) { if (options.hasOwnProperty(opt)) { delete options[opt]; } @@ -194,9 +196,11 @@ exports.init = function(grunt) { var allData = []; cliOptions.args = files; cliOptions.reporter = function(results, data) { - results.forEach(function(datum) { - datum.file = reporterOutputDir ? path.relative(reporterOutputDir, datum.file) : datum.file; - }); + if(reporterOutputDir) { + results.forEach(function(datum) { + datum.file = path.relative(reporterOutputDir, datum.file); + }); + } reporter(results, data, options); allResults = allResults.concat(results); allData = allData.concat(data); From efbb6f6f0f2b93ec83e1cc5024a26c08b7977702 Mon Sep 17 00:00:00 2001 From: Simon Hewitt Date: Fri, 23 Oct 2015 10:41:14 -0700 Subject: [PATCH 2/4] formatting --- tasks/lib/jshint.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tasks/lib/jshint.js b/tasks/lib/jshint.js index 4781cbb..017db28 100644 --- a/tasks/lib/jshint.js +++ b/tasks/lib/jshint.js @@ -156,7 +156,7 @@ exports.init = function(grunt) { var reporterOutputDir; // Get reporter output directory for relative paths in reporters if (options.hasOwnProperty('reporterOutput')) { - if(options.reporterOutputRelative) { + if (options.reporterOutputRelative) { reporterOutputDir = path.dirname(options.reporterOutput); } delete options.reporterOutput; @@ -196,7 +196,7 @@ exports.init = function(grunt) { var allData = []; cliOptions.args = files; cliOptions.reporter = function(results, data) { - if(reporterOutputDir) { + if (reporterOutputDir) { results.forEach(function(datum) { datum.file = path.relative(reporterOutputDir, datum.file); }); From 3a23c20719efb361498ffe8b59d6bd3669d1f5c2 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Fri, 15 Jan 2016 09:04:35 +0200 Subject: [PATCH 3/4] Bump JSHint to v2.9.1. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 26fb0ae..c1c1d32 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,7 @@ }, "dependencies": { "hooker": "^0.2.3", - "jshint": "~2.8.0" + "jshint": "~2.9.1" }, "devDependencies": { "grunt": "^0.4.5", From cd2657120ff93c65988490210e8fb0d19ab75138 Mon Sep 17 00:00:00 2001 From: Vlad Filippov Date: Sun, 17 Jan 2016 13:06:50 -0500 Subject: [PATCH 4/4] v0.12.0 --- CHANGELOG | 4 ++++ README.md | 5 +++-- package.json | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 769e9e5..9c8209f 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,7 @@ +v0.12.0: + date: 2016-01-17 + changes: + - Update to JSHint ~2.9.0. v0.11.3: date: 2015-09-03 changes: diff --git a/README.md b/README.md index 45c2a43..9cbb18a 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# grunt-contrib-jshint v0.11.3 [![Build Status: Linux](https://travis-ci.org/gruntjs/grunt-contrib-jshint.svg?branch=master)](https://travis-ci.org/gruntjs/grunt-contrib-jshint) [![Build Status: Windows](https://ci.appveyor.com/api/projects/status/j04ik7qgx21ixyfw/branch/master?svg=true)](https://ci.appveyor.com/project/gruntjs/grunt-contrib-jshint/branch/master) +# grunt-contrib-jshint v0.12.0 [![Build Status: Linux](https://travis-ci.org/gruntjs/grunt-contrib-jshint.svg?branch=master)](https://travis-ci.org/gruntjs/grunt-contrib-jshint) [![Build Status: Windows](https://ci.appveyor.com/api/projects/status/j04ik7qgx21ixyfw/branch/master?svg=true)](https://ci.appveyor.com/project/gruntjs/grunt-contrib-jshint/branch/master) > Validate files with JSHint @@ -215,6 +215,7 @@ grunt.initConfig({ ## Release History + * 2016-01-17   v0.12.0   Update to JSHint ~2.9.0. * 2015-09-03   v0.11.3   Update to JSHint ~2.8.0. * 2015-04-16   v0.11.2   Fix default value of the `reporter` option. * 2015-03-20   v0.11.1   Fix io.js compatibility issues. Other fixes to pathing. @@ -253,4 +254,4 @@ grunt.initConfig({ Task submitted by ["Cowboy" Ben Alman](http://benalman.com/) -*This file was generated on Mon Oct 12 2015 00:56:47.* +*This file was generated on Sun Jan 17 2016 13:06:03.* diff --git a/package.json b/package.json index c1c1d32..4ccf04e 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "grunt-contrib-jshint", "description": "Validate files with JSHint", - "version": "0.11.3", + "version": "0.12.0", "author": { "name": "Grunt Team", "url": "http://gruntjs.com/"