Updates dependencies

nicjansma · Dec 14, 2016 · df11864 · df11864
1 parent 34a623d
commit df11864
Show file tree

Hide file tree

Showing 3 changed files with 68 additions and 19 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -1,7 +1,65 @@
 {
     "extends": "eslint:recommended",
     "rules": {
-        // enabled over default
+        //
+        // v1.0 rules
+        //
+        "camelcase": 2,
+        "comma-spacing": 2,
+        "consistent-return": 2,
+        "curly": [2, "all"],
+        "dot-notation": [2, { "allowKeywords": true }],
+        "eol-last": 2,
+        "eqeqeq": 2,
+        "key-spacing": [2, { "beforeColon": false, "afterColon": true }],
+        "new-cap": 2,
+        "new-parens": 2,
+        "no-alert": 2,
+        "no-array-constructor": 2,
+        "no-caller": 2,
+        "no-catch-shadow": 2,
+        "no-eval": 2,
+        "no-extend-native": 2,
+        "no-extra-bind": 2,
+        "no-extra-parens": [2, "functions"],
+        "no-implied-eval": 2,
+        "no-iterator": 2,
+        "no-label-var": 2,
+        "no-labels": 2,
+        "no-lone-blocks": 2,
+        "no-multi-spaces": 2,
+        "no-multi-str": 2,
+        "no-native-reassign": 2,
+        "no-new": 2,
+        "no-new-func": 2,
+        "no-new-object": 2,
+        "no-new-wrappers": 2,
+        "no-octal-escape": 2,
+        "no-process-exit": 2,
+        "no-proto": 2,
+        "no-return-assign": 2,
+        "no-script-url": 2,
+        "no-sequences": 2,
+        "no-shadow": 2,
+        "no-shadow-restricted-names": 2,
+        "no-spaced-func": 2,
+        "no-trailing-spaces": 2,
+        "no-undef-init": 2,
+        "no-unused-expressions": 2,
+        "no-use-before-define": 2,
+        "no-with": 2,
+        "quotes": [2, "double"],
+        "semi": 2,
+        "semi-spacing": [2, {"before": false, "after": true}],
+        "space-infix-ops": 2,
+        "keyword-spacing": 2,
+        "space-unary-ops": [2, { "words": true, "nonwords": false }],
+        "strict": [2, "function"],
+        "yoda": [2, "never"],
+
+        //
+        // Enabled over default
+        //
         "valid-jsdoc": [1, {
             "requireReturn": false,
             "prefer": {
@@ -10,7 +68,6 @@
         }],
         "guard-for-in": 2,
         "no-div-regex": 2,
-        "no-else-return": 2,
         "no-eq-null": 2,
         "no-floating-decimal": 2,
         "no-self-compare": 2,
@@ -24,17 +81,11 @@
         "comma-style": [2, "last"],
         "consistent-this": [2, "that"],
         "no-inline-comments": 2,
-        "no-lonely-if": 2,
         "no-multiple-empty-lines": [1, {"max": 1}],
         "no-nested-ternary": 2,
         "space-before-function-paren": [2, "never"],
-        "space-after-keywords": 1,
         "space-before-blocks": 1,
-        "object-curly-spacing": 1,
-        "computed-property-spacing": 1,
-        "array-bracket-spacing": 1,
         "space-in-parens": 1,
-        "space-unary-ops": 1,
         "spaced-comment": 1,
         "max-len": [1, 120, 4],
 

diff --git a/Gruntfile.js b/Gruntfile.js
@@ -31,9 +31,9 @@ module.exports = function(grunt) {
             },
             build: {
                 options: {
-                    "output-file": "eslint.xml",
-                    "format": "jslint-xml",
-                    "silent": true
+                    outputFile: "eslint.xml",
+                    format: "jslint-xml",
+                    silent: true
                 },
                 src: [
                     "Gruntfile.js",

diff --git a/package.json b/package.json
@@ -16,13 +16,11 @@
     "test": "grunt travis --verbose"
   },
   "devDependencies": {
-    "grunt": ">= 0.4.5",
-    "grunt-contrib-clean": "^0.6.0",
-    "grunt-contrib-connect": "^0.9.0",
-    "grunt-contrib-uglify": ">0.0.0",
-    "grunt-mocha-phantomjs": "^0.6.2",
-    "gruntify-eslint": "^1.0.1",
-    "mocha-phantomjs": "^3.6.0",
-    "phantomjs": "1.9.7-15"
+    "grunt": "^1.0.1",
+    "grunt-contrib-clean": "^1.0.0",
+    "grunt-contrib-connect": "^1.0.2",
+    "grunt-contrib-uglify": "^2.0.0",
+    "grunt-mocha-phantomjs": "^4.0.0",
+    "gruntify-eslint": "^3.1.0"
   }
 }