Merge pull request #570 from airbnb/ljharb/update_eslint

[eslint config] update `eslint` to require 1.0 or greater
This commit is contained in:
Jordan Harband
2015-11-06 16:36:21 -08:00
4 changed files with 8 additions and 9 deletions

View File

@@ -3,6 +3,5 @@ module.exports = {
'eslint-config-airbnb/legacy',
'eslint-config-airbnb/rules/es6',
],
'parser': 'babel-eslint',
'rules': {}
};

View File

@@ -26,11 +26,13 @@
},
"homepage": "https://github.com/airbnb/javascript",
"devDependencies": {
"babel-eslint": "4.1.3",
"babel-tape-runner": "1.2.0",
"eslint": "1.5.1",
"eslint-plugin-react": "3.4.2",
"react": "0.13.3",
"tape": "4.2.0"
"eslint": "^1.8.0",
"eslint-plugin-react": "^3.7.1",
"react": "^0.13.3",
"tape": "^4.2.2"
},
"peerDependencies": {
"eslint": ">=1.0.0"
}
}

View File

@@ -1,5 +1,4 @@
module.exports = {
'parser': 'babel-eslint',
'plugins': [
'react'
],

View File

@@ -29,8 +29,7 @@ ${body}
test('validate react prop order', t => {
t.test('make sure our eslintrc has React linting dependencies', t => {
t.plan(2);
t.equal(baseConfig.parser, 'babel-eslint', 'uses babel-eslint');
t.plan(1);
t.equal(reactRules.plugins[0], 'react', 'uses eslint-plugin-react');
});