From 719d24ae112711d94c9fb54b2327d58ed84472c5 Mon Sep 17 00:00:00 2001 From: Joel Brandt Date: Thu, 3 Jul 2014 13:57:10 -0700 Subject: [PATCH] bump jscs version --- .jscsrc | 5 ++--- Gruntfile.js | 17 ++++++++++------- package.json | 2 +- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/.jscsrc b/.jscsrc index b11e47c8..44fdd3ca 100644 --- a/.jscsrc +++ b/.jscsrc @@ -1,4 +1,5 @@ { + "fileExtensions": [".js", ".jsx"], "additionalRules": [ "node_modules/jscs-trailing-whitespace-in-source/rules/*.js" ], "disallowTrailingWhitespaceInSource": true, "maximumLineLength": 120, @@ -81,9 +82,7 @@ "disallowSpaceBeforePostfixUnaryOperators": ["++", "--"], "requireParenthesesAroundIIFE": true, "requireBlocksOnNewline": 1, - "requireCommaBeforeLineBreak": true, - "requireRightStickedOperators": ["!"], - "requireLeftStickedOperators": [","] + "requireCommaBeforeLineBreak": true // "disallowSpaceAfterObjectKeys": true, ; we should pick one of these // "requireSpaceAfterObjectKeys": true, // "requireAlignedObjectValues": "all", ; nice to have... diff --git a/Gruntfile.js b/Gruntfile.js index b966ceed..f265b731 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -35,19 +35,21 @@ module.exports = function (grunt) { options : { jshintrc : ".jshintrc" }, - all : [ + js : [ "*.js", - "package.json", - ".jshintrc", - ".jscsrc", "lib/**/*.js", - "lib/jsx/**/*.jsx", "test/**/*.js", "!lib/parser.js" + ], + json : [ + "package.json", + ".jshintrc", + ".jscsrc" ] }, + jscs: { - src: "<%= jshint.all %>", + js: "<%= jshint.js %>", options: { config: ".jscsrc" } @@ -66,10 +68,11 @@ module.exports = function (grunt) { } } } + }); grunt.loadNpmTasks("grunt-contrib-jshint"); - grunt.loadNpmTasks("grunt-jscs-checker"); + grunt.loadNpmTasks("grunt-jscs"); grunt.loadNpmTasks("grunt-contrib-nodeunit"); grunt.loadNpmTasks("grunt-peg"); diff --git a/package.json b/package.json index 40594ad5..1d4d3972 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,7 @@ "grunt": "~0.4", "grunt-contrib-jshint": "~0.10", "grunt-contrib-nodeunit": "~0.3", - "grunt-jscs-checker": "^0.4.4", + "grunt-jscs": "~0.6.1", "grunt-peg": "~1.2", "nodeunit": "~0.8", "pegjs": "~0.8",