Merge pull request #19 from dustinspecker/greenkeeper-eslint-2.0.0

Update eslint to version 2.0.0 🚀

package.json

@@ -30,7 +30,7 @@
     "babel-preset-es2015": "^6.0.12",
     "babel-register": "^6.3.13",
     "coveralls": "^2.11.2",
-    "eslint": "^1.10.3",
+    "eslint": "^2.0.0",
     "eslint-plugin-new-with-error": "^1.1.0",
     "eslint-plugin-no-use-extend-native": "^0.3.1",
     "is-plain-obj": "^1.0.0",

src/esnext.js

@@ -2,6 +2,11 @@ const config = require('./')
 
 config.env.es6 = true
 
+config.parserOptions = {
+  ecmaVersion: 6,
+  sourceType: 'module'
+}
+
 config.ecmaFeatures = {
   arrowFunctions: true,
   binaryLiterals: false,
@@ -13,7 +18,6 @@ config.ecmaFeatures = {
   forOf: true,
   generators: true,
   globalReturn: false,
-  modules: true,
   objectLiteralComputedProperties: true,
   objectLiteralDuplicateProperties: false,
   objectLiteralShorthandMethods: true,

src/index.js

@@ -39,6 +39,7 @@ module.exports = {
       afterColon: true,
       beforeColon: false
     }],
+    'keyword-spacing': [2, {"after": true, "before": true}],
     'linebreak-style': [2, 'unix'],
     'lines-around-comment': 0,
     'max-depth': 2,
@@ -72,7 +73,6 @@ module.exports = {
     'no-else-return': 2,
     'no-empty': 2,
     'no-empty-character-class': 2,
-    'no-empty-label': 2,
     'no-empty-pattern': 2,
     'no-eq-null': 2,
     'no-eval': 2,
@@ -175,15 +175,13 @@ module.exports = {
       before: false
     }],
     'sort-vars': 0,
-    'space-after-keywords': [2, 'always'],
     'space-before-blocks': [2, 'always'],
     'space-before-function-paren': [2, {
       anonymous: 'always',
       named: 'never'
     }],
     'space-in-parens': [2, 'never'],
     'space-infix-ops': 2,
-    'space-return-throw-case': 2,
     'space-unary-ops': [2, {
       nonwords: false,
       words: true

src/jsx.js

@@ -1,6 +1,8 @@
 const config = require('./esnext')
 
-config.ecmaFeatures.jsx = true
+config.parserOptions.ecmaFeatures = {
+  jsx: true
+}
 
 config.env.browser = true
 

test/test.js

@@ -14,6 +14,7 @@ test('index should have rules', t => {
 
 test('esnext should es6 env', t => {
   t.ok(esnext.env.es6)
+  t.ok(esnext.parserOptions.ecmaVersion, 6)
 })
 
 test('esnext should have ecmaFeatures', t => {
@@ -25,5 +26,5 @@ test('jsx should have browser env', t => {
 })
 
 test('jsx should have jsx ecmaFeature', t => {
-  t.ok(jsx.ecmaFeatures.jsx)
+  t.ok(jsx.parserOptions.ecmaFeatures.jsx)
 })