Skip to content

Commit e3163e3

Browse files
authored
Merge pull request #603 from evcohen/another-attempt-at-eslint-v6
Update ESLint to v6
2 parents f3de162 + f121a78 commit e3163e3

File tree

2 files changed

+11
-5
lines changed

2 files changed

+11
-5
lines changed

.travis.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
language: node_js
22
node_js:
3+
- "12"
34
- "10"
45
- "9"
56
- "8"
@@ -28,6 +29,7 @@ env:
2829
global:
2930
- TEST=true
3031
matrix:
32+
- ESLINT=6
3133
- ESLINT=5
3234
- ESLINT=4
3335
- ESLINT=3
@@ -39,10 +41,14 @@ matrix:
3941
- node_js: "node"
4042
env: LINT=true TEST=false
4143
exclude:
42-
- node_js: "5"
44+
- node_js: "4"
4345
env: ESLINT=5
4446
- node_js: "4"
47+
env: ESLINT=6
48+
- node_js: "5"
4549
env: ESLINT=5
50+
- node_js: "6"
51+
env: ESLINT=6
4652
allow_failures:
4753
- node_js: "9"
4854
- node_js: "7"

package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,12 @@
3535
"@babel/runtime": "^7.4.5",
3636
"babel-eslint": "^10.0.1",
3737
"babel-jest": "^24.0.0",
38-
"babel-preset-airbnb": "^3.2.0",
38+
"babel-preset-airbnb": "^4.0.0",
3939
"coveralls": "^3.0.1",
40-
"eslint": "^5.15.2",
40+
"eslint": "^3 || ^4 || ^5 || ^6",
4141
"eslint-config-airbnb-base": "^13.0.0",
4242
"eslint-plugin-flowtype": "^3.5.0",
43-
"eslint-plugin-import": "^2.16.0",
43+
"eslint-plugin-import": "^2.18.0",
4444
"estraverse": "^4.2.0",
4545
"expect": "^24.3.1",
4646
"flow-bin": "^0.101.0",
@@ -68,7 +68,7 @@
6868
"jsx-ast-utils": "^2.2.0"
6969
},
7070
"peerDependencies": {
71-
"eslint": "^3 || ^4 || ^5"
71+
"eslint": "^3 || ^4 || ^5 || ^6"
7272
},
7373
"jest": {
7474
"coverageReporters": [

0 commit comments

Comments
 (0)