Skip to content

Commit 8eacf24

Browse files
committed
[eslint config] [*] [breaking] add eslint v6, drop eslint v4
See #2036
1 parent 3b18fea commit 8eacf24

File tree

5 files changed

+22
-26
lines changed

5 files changed

+22
-26
lines changed

.travis.yml

+14-18
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,6 @@ node_js:
55
- "10"
66
- "9"
77
- "8"
8-
- "7"
9-
- "6"
10-
- "5"
11-
- "4"
128
before_install:
139
- 'nvm install-latest-npm'
1410
install:
@@ -20,37 +16,37 @@ script:
2016
sudo: false
2117
env:
2218
matrix:
19+
- 'TEST=true ESLINT=6 PACKAGE=eslint-config-airbnb-base'
20+
- 'TEST=true ESLINT=6 PACKAGE=eslint-config-airbnb'
2321
- 'TEST=true ESLINT=5 PACKAGE=eslint-config-airbnb-base'
2422
- 'TEST=true ESLINT=5 PACKAGE=eslint-config-airbnb'
25-
- 'TEST=true ESLINT=4 PACKAGE=eslint-config-airbnb-base'
26-
- 'TEST=true ESLINT=4 PACKAGE=eslint-config-airbnb'
2723
matrix:
2824
fast_finish: true
2925
include:
3026
- node_js: "lts/*"
31-
env: PREPUBLISH=true ESLINT=5 PACKAGE=eslint-config-airbnb-base
27+
env: PREPUBLISH=true ESLINT=6 PACKAGE=eslint-config-airbnb-base
3228
- node_js: "lts/*"
33-
env: PREPUBLISH=true ESLINT=5 PACKAGE=eslint-config-airbnb
29+
env: PREPUBLISH=true ESLINT=6 PACKAGE=eslint-config-airbnb
3430
- node_js: "lts/*"
35-
env: PREPUBLISH=true ESLINT=4 PACKAGE=eslint-config-airbnb-base
31+
env: PREPUBLISH=true ESLINT=5 PACKAGE=eslint-config-airbnb-base
3632
- node_js: "lts/*"
37-
env: PREPUBLISH=true ESLINT=4 PACKAGE=eslint-config-airbnb
33+
env: PREPUBLISH=true ESLINT=5 PACKAGE=eslint-config-airbnb
3834
- node_js: "lts/*"
3935
env: LINT=true
40-
exclude:
41-
- node_js: "5"
36+
- node_js: "7"
4237
env: TEST=true ESLINT=5 PACKAGE=eslint-config-airbnb-base
43-
- node_js: "5"
38+
- node_js: "7"
4439
env: TEST=true ESLINT=5 PACKAGE=eslint-config-airbnb
45-
- node_js: "4"
40+
- node_js: "6"
4641
env: TEST=true ESLINT=5 PACKAGE=eslint-config-airbnb-base
47-
- node_js: "4"
42+
- node_js: "6"
4843
env: TEST=true ESLINT=5 PACKAGE=eslint-config-airbnb
44+
exclude:
4945
allow_failures:
46+
- node_js: "11"
5047
- node_js: "9"
5148
- node_js: "7"
52-
- node_js: "5"
49+
- env: PREPUBLISH=true ESLINT=6 PACKAGE=eslint-config-airbnb-base
50+
- env: PREPUBLISH=true ESLINT=6 PACKAGE=eslint-config-airbnb
5351
- env: PREPUBLISH=true ESLINT=5 PACKAGE=eslint-config-airbnb-base
5452
- env: PREPUBLISH=true ESLINT=5 PACKAGE=eslint-config-airbnb
55-
- env: PREPUBLISH=true ESLINT=4 PACKAGE=eslint-config-airbnb-base
56-
- env: PREPUBLISH=true ESLINT=4 PACKAGE=eslint-config-airbnb

packages/eslint-config-airbnb-base/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -56,19 +56,19 @@
5656
"babel-preset-airbnb": "^2.6.0",
5757
"babel-tape-runner": "^2.0.1",
5858
"eclint": "^2.8.1",
59-
"eslint": "^4.19.1 || ^5.3.0",
59+
"eslint": "^5.16.0 || ^6.1.0",
6060
"eslint-find-rules": "^3.4.0",
6161
"eslint-plugin-import": "^2.18.2",
6262
"in-publish": "^2.0.0",
6363
"safe-publish-latest": "^1.1.2",
6464
"tape": "^4.11.0"
6565
},
6666
"peerDependencies": {
67-
"eslint": "^4.19.1 || ^5.3.0",
67+
"eslint": "^5.16.0 || ^6.1.0",
6868
"eslint-plugin-import": "^2.18.2"
6969
},
7070
"engines": {
71-
"node": ">= 4"
71+
"node": ">= 6"
7272
},
7373
"dependencies": {
7474
"confusing-browser-globals": "^1.0.7",

packages/eslint-config-airbnb-base/whitespace.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ const baseConfig = require('.');
77
function onlyErrorOnRules(rulesToError, config) {
88
const errorsOnly = assign({}, config);
99
const cli = new CLIEngine({ baseConfig: config, useEslintrc: false });
10-
const baseRules = cli.getConfigForFile('./').rules;
10+
const baseRules = cli.getConfigForFile(require.resolve('./')).rules;
1111

1212
entries(baseRules).forEach((rule) => {
1313
const ruleName = rule[0];

packages/eslint-config-airbnb/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
"babel-preset-airbnb": "^2.6.0",
6363
"babel-tape-runner": "^2.0.1",
6464
"eclint": "^2.8.1",
65-
"eslint": "^4.19.1 || ^5.3.0",
65+
"eslint": "^5.16.0 || ^6.1.0",
6666
"eslint-find-rules": "^3.4.0",
6767
"eslint-plugin-import": "^2.18.2",
6868
"eslint-plugin-jsx-a11y": "^6.2.3",
@@ -73,12 +73,12 @@
7373
"tape": "^4.11.0"
7474
},
7575
"peerDependencies": {
76-
"eslint": "^4.19.1 || ^5.3.0",
76+
"eslint": "^5.16.0 || ^6.1.0",
7777
"eslint-plugin-import": "^2.18.2",
7878
"eslint-plugin-jsx-a11y": "^6.2.3",
7979
"eslint-plugin-react": "^7.14.2"
8080
},
8181
"engines": {
82-
"node": ">= 4"
82+
"node": ">= 6"
8383
}
8484
}

packages/eslint-config-airbnb/whitespace.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ const baseConfig = require('.');
77
function onlyErrorOnRules(rulesToError, config) {
88
const errorsOnly = assign({}, config);
99
const cli = new CLIEngine({ baseConfig: config, useEslintrc: false });
10-
const baseRules = cli.getConfigForFile('./').rules;
10+
const baseRules = cli.getConfigForFile(require.resolve('./')).rules;
1111

1212
entries(baseRules).forEach((rule) => {
1313
const ruleName = rule[0];

0 commit comments

Comments
 (0)