Skip to content

Commit c0ef454

Browse files
committed
Merge pull request airbnb#570 from airbnb/ljharb/update_eslint
[eslint config] update `eslint` to require 1.0 or greater
2 parents f4e5967 + d432f58 commit c0ef454

File tree

4 files changed

+8
-9
lines changed

4 files changed

+8
-9
lines changed

packages/eslint-config-airbnb/base.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,5 @@ module.exports = {
33
'eslint-config-airbnb/legacy',
44
'eslint-config-airbnb/rules/es6',
55
],
6-
'parser': 'babel-eslint',
76
'rules': {}
87
};

packages/eslint-config-airbnb/package.json

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,13 @@
2626
},
2727
"homepage": "https://github.com/airbnb/javascript",
2828
"devDependencies": {
29-
"babel-eslint": "4.1.3",
3029
"babel-tape-runner": "1.2.0",
31-
"eslint": "1.5.1",
32-
"eslint-plugin-react": "3.4.2",
33-
"react": "0.13.3",
34-
"tape": "4.2.0"
30+
"eslint": "^1.8.0",
31+
"eslint-plugin-react": "^3.7.1",
32+
"react": "^0.13.3",
33+
"tape": "^4.2.2"
34+
},
35+
"peerDependencies": {
36+
"eslint": ">=1.0.0"
3537
}
3638
}

packages/eslint-config-airbnb/rules/react.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
module.exports = {
2-
'parser': 'babel-eslint',
32
'plugins': [
43
'react'
54
],

packages/eslint-config-airbnb/test/test-react-order.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,7 @@ ${body}
2929

3030
test('validate react prop order', t => {
3131
t.test('make sure our eslintrc has React linting dependencies', t => {
32-
t.plan(2);
33-
t.equal(baseConfig.parser, 'babel-eslint', 'uses babel-eslint');
32+
t.plan(1);
3433
t.equal(reactRules.plugins[0], 'react', 'uses eslint-plugin-react');
3534
});
3635

0 commit comments

Comments
 (0)