Skip to content

Commit 16c73d0

Browse files
committed
[eslint config] [deps] allow eslint v3 or v4
Closes #1447.
1 parent 5835443 commit 16c73d0

File tree

3 files changed

+7
-4
lines changed

3 files changed

+7
-4
lines changed

.travis.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,16 @@ sudo: false
1818
env:
1919
matrix:
2020
- 'TEST=true ESLINT=3 PACKAGE=eslint-config-airbnb'
21+
- 'TEST=true ESLINT=4 PACKAGE=eslint-config-airbnb'
2122
- 'TEST=true ESLINT=3 PACKAGE=eslint-config-airbnb-base'
2223
- 'TEST=true ESLINT=4 PACKAGE=eslint-config-airbnb-base'
2324
matrix:
2425
fast_finish: true
2526
include:
2627
- node_js: "node"
2728
env: PREPUBLISH=true ESLINT=3 PACKAGE=eslint-config-airbnb
29+
- node_js: "node"
30+
env: PREPUBLISH=true ESLINT=4 PACKAGE=eslint-config-airbnb
2831
- node_js: "node"
2932
env: PREPUBLISH=true ESLINT=3 PACKAGE=eslint-config-airbnb-base
3033
- node_js: "node"
@@ -33,5 +36,6 @@ matrix:
3336
- node_js: "7"
3437
- node_js: "5"
3538
- env: PREPUBLISH=true ESLINT=3 PACKAGE=eslint-config-airbnb
39+
- env: PREPUBLISH=true ESLINT=4 PACKAGE=eslint-config-airbnb
3640
- env: PREPUBLISH=true ESLINT=3 PACKAGE=eslint-config-airbnb-base
3741
- env: PREPUBLISH=true ESLINT=4 PACKAGE=eslint-config-airbnb-base

packages/eslint-config-airbnb/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
"babel-preset-airbnb": "^2.4.0",
5555
"babel-tape-runner": "^2.0.1",
5656
"editorconfig-tools": "^0.1.1",
57-
"eslint": "^3.19.0",
57+
"eslint": "^3.19.0 || ^4.3.0",
5858
"eslint-find-rules": "^3.1.1",
5959
"eslint-plugin-import": "^2.7.0",
6060
"eslint-plugin-jsx-a11y": "^5.1.1",
@@ -65,7 +65,7 @@
6565
"tape": "^4.7.0"
6666
},
6767
"peerDependencies": {
68-
"eslint": "^3.19.0",
68+
"eslint": "^3.19.0 || ^4.3.0",
6969
"eslint-plugin-jsx-a11y": "^5.1.1",
7070
"eslint-plugin-import": "^2.7.0",
7171
"eslint-plugin-react": "^7.1.0"

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,7 @@ test('validate react prop order', (t) => {
4949
setBar() {}
5050
someMethod() {}
5151
renderDogs() {}
52-
render() { return <div />; }
53-
`));
52+
render() { return <div />; }`));
5453

5554
t.notOk(result.warningCount, 'no warnings');
5655
t.notOk(result.errorCount, 'no errors');

0 commit comments

Comments
 (0)