Skip to content

Commit

Permalink
Close #11 PR: ESLint 2.0 Compatibility. Fixes #10, Fixes #10
Browse files Browse the repository at this point in the history
  • Loading branch information
justinhelmer authored and sindresorhus committed Feb 13, 2016
1 parent 46d82a1 commit 56a33c6
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 6 deletions.
5 changes: 1 addition & 4 deletions index.js
Expand Up @@ -58,7 +58,6 @@ module.exports = {
'no-case-declarations': 2,
'no-div-regex': 2,
'no-else-return': 2,
'no-empty-label': 2,
'no-empty-pattern': 2,
'no-eq-null': 2,
'no-eval': 2,
Expand Down Expand Up @@ -136,6 +135,7 @@ module.exports = {
'indent': [2, 'tab', {SwitchCase: 1}],
'jsx-quotes': 2,
'key-spacing': [2, {beforeColon: false, afterColon: true}],
'keyword-spacing': 2,
'linebreak-style': [2, 'unix'],
'max-nested-callbacks': [1, 4],
'new-cap': [2, {newIsCap: true, capIsNew: true}],
Expand All @@ -160,13 +160,10 @@ module.exports = {
'quotes': [2, 'single'],
'semi-spacing': [2, {before: false, after: true}],
'semi': [2, 'always'],
'space-after-keywords': [2, 'always'],
'space-before-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,
'spaced-comment': [2, 'always', {markers: ['!']}],

Expand Down
4 changes: 2 additions & 2 deletions package.json
Expand Up @@ -55,12 +55,12 @@
"devDependencies": {
"ava": "*",
"babel-eslint": "^4.1.0",
"eslint": "^1.9.0",
"eslint": "^2.0.0",
"eslint-plugin-babel": "^3.0.0",
"is-plain-obj": "^1.0.0",
"temp-write": "^2.1.0"
},
"peerDependencies": {
"eslint": ">=1.9.0"
"eslint": ">=2"
}
}

0 comments on commit 56a33c6

Please sign in to comment.