bump jscs version

ghenania · Jul 3, 2014 · 9f9ef21 · 9f9ef21
1 parent b71e4c8
commit 9f9ef21
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 15 deletions.
diff --git a/.jscsrc b/.jscsrc
@@ -1,6 +1,5 @@
 {
     "fileExtensions": [".js", ".jsx"],
-    "excludeFiles": ["lib/jsx/getLayerSVG.jsx"],
     "additionalRules": [ "node_modules/jscs-trailing-whitespace-in-source/rules/*.js" ],
     "disallowTrailingWhitespaceInSource": true,
     "maximumLineLength": 120,
@@ -83,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
@@ -33,33 +33,42 @@ module.exports = function (grunt) {
             options : {
                 jshintrc : ".jshintrc"
             },
-            all : [
+            js : [
                 "*.js",
-                "package.json",
-                ".jshintrc",
-                ".jscsrc",
                 "lib/**/*.js",
-                "lib/jsx/**/*.jsx",
                 "test/**/*.js",
                 "www/**/*.js",
                 "!www/vendor/**/*.js"
+            ],
+            jsx : [
+                "lib/**/*.jsx"
+            ],
+            json : [
+                "package.json",
+                ".jshintrc",
+                ".jscsrc"
             ]
         },
+
         jscs: {
-            src: "<%= jshint.all %>",
+            js: "<%= jshint.js %>",
+            jsx: [
+                "<%= jshint.jsx %>",
+                "!lib/jsx/getLayerSVG.jsx"
+            ],
             options: {
                 config: ".jscsrc"
             }
         },
-
+        
         nodeunit : {
             all : ["test/test-*.js"]
         }
-                
+
     });
 
     grunt.loadNpmTasks("grunt-contrib-jshint");
-    grunt.loadNpmTasks("grunt-jscs-checker");
+    grunt.loadNpmTasks("grunt-jscs");
     grunt.loadNpmTasks("grunt-contrib-nodeunit");
 
     grunt.registerTask("test", ["jshint", "jscs", "nodeunit"]);

diff --git a/package.json b/package.json
@@ -21,8 +21,7 @@
     "grunt": "^0.4.5",
     "grunt-contrib-jshint": "~0.10",
     "grunt-contrib-nodeunit": "~0.3",
-    "grunt-jscs-checker":
-      "git+https://github.com/joelrbrandt/grunt-jscs-checker.git#83a147044996eb0e4e77227fe3515f07366b49fc",
+    "grunt-jscs": "~0.6.1",
     "nodeunit": "~0.8",
     "jscs-trailing-whitespace-in-source": "0.0.1"
   }