Bump devDeps and eslint 2.0 settings adjustment

yeoman · May 1, 2016 · ca55109 · ca55109
1 parent 3272f44
commit ca55109
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 20 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -43,21 +43,6 @@
       2,
       "single"
     ],
-    "space-after-keywords": [
-      2,
-      "always"
-    ],
-    "space-before-function-paren": [
-      2,
-      {
-        "anonymous": "always",
-        "named": "never"
-      }
-    ],
-    "space-in-parens": [
-      2,
-      "never"
-    ],
     "strict": [
       2,
       "global"
@@ -67,6 +52,7 @@
       "all"
     ],
     "eol-last": 2,
+    "keyword-spacing": 2,
     "key-spacing": [
       2,
       {
@@ -89,7 +75,6 @@
     ],
     "no-alert": 2,
     "no-caller": 2,
-    "no-empty-label": 2,
     "no-extend-native": 2,
     "no-extra-bind": 2,
     "no-implied-eval": 2,
@@ -128,7 +113,6 @@
         "before": false,
         "after": true
       }
-    ],
-    "space-return-throw-case": 2
+    ]
   }
 }
diff --git a/package.json b/package.json
@@ -75,15 +75,15 @@
   "devDependencies": {
     "gulp": "^3.6.0",
     "gulp-coveralls": "^0.1.0",
-    "gulp-eslint": "^1.0.0",
+    "gulp-eslint": "^2.0.0",
     "gulp-exclude-gitignore": "^1.0.0",
     "gulp-istanbul": "^0.10.0",
     "gulp-mocha": "^2.0.0",
     "gulp-nsp": "^2.1.0",
     "gulp-plumber": "^1.0.0",
     "jsdoc": "^3.3.0-beta1",
     "mockery": "^1.4.0",
-    "nock": "^3.3.2",
+    "nock": "^8.0.0",
     "pinkie-promise": "^2.0.0",
     "proxyquire": "^1.0.0",
     "sinon": "^1.9.1"