Revert "Revert "Update to eslint-2.x""

This reverts commit 28a1b6d.

Author: noseglid

Diff for: best-practices.js

@@ -28,8 +28,6 @@ module.exports = {
     'no-div-regex': 0,
     // disallow else after a return in an if
     'no-else-return': 2,
-    // disallow use of labels for anything other then loops and switches
-    'no-empty-label': 2,
     // disallow comparisons to null without a type-checking operator
     'no-eq-null': 0,
     // disallow use of eval()
@@ -51,7 +49,7 @@ module.exports = {
     // disallow usage of __iterator__ property
     'no-iterator': 2,
     // disallow use of labeled statements
-    'no-labels': 2,
+    'no-labels': [2, { 'allowLoop': false, 'allowSwitch': false }],
     // disallow unnecessary nested blocks
     'no-lone-blocks': 2,
     // disallow creation of functions within loops

Diff for: package.json

@@ -19,5 +19,11 @@
   "keywords": [
     "eslint",
     "eslint-config"
-  ]
+  ],
+  "devDependencies": {
+    "eslint": "^2.0.0"
+  },
+  "peerDependencies": {
+    "eslint": "^2.0.0"
+  }
 }

Diff for: stylistic-issues.js

@@ -28,6 +28,16 @@ module.exports = {
     'jsx-quotes': 2,
     // enforces spacing between keys and values in object literal properties
     'key-spacing': [2, {'beforeColon': false, 'afterColon': true}],
+    // require a space before and after keywords
+    'keyword-spacing': [2, {
+      'before': true,
+      'after': true,
+      'overrides': {
+        'return': { 'after': true },
+        'throw': { 'after': true },
+        'case': { 'after': true }
+      }
+    }],
     // enforces empty lines around comments
     'lines-around-comment': 0,
     // disallow mixed 'LF' and 'CRLF' as linebreaks
@@ -100,10 +110,6 @@ module.exports = {
     'semi': [2, 'always'],
     // sort variables within the same declaration block
     'sort-vars': 0,
-    // require a space before certain keywords
-    'space-before-keywords': [2, 'always'],
-    // require a space after certain keywords
-    'space-after-keywords': [2, 'always'],
     // require or disallow space before blocks
     'space-before-blocks': 2,
     // require or disallow space before function opening parenthesis
@@ -112,8 +118,6 @@ module.exports = {
     'space-in-parens': 0,
     // require spaces around operators
     'space-infix-ops': 2,
-    // require a space after return, throw, and case
-    'space-return-throw-case': 2,
     // Require or disallow spaces before/after unary operators
     'space-unary-ops': 0,
     // require or disallow a space immediately following the // or /* in a comment