Skip to content

Commit 698b043

Browse files
committed
Upgrade to ESLint 6
Fixes #390
1 parent 0216305 commit 698b043

File tree

7 files changed

+32
-30
lines changed

7 files changed

+32
-30
lines changed

config/plugins.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
module.exports = {
44
// Repeated here from eslint-config-xo in case some plugins set something different
55
parserOptions: {
6-
ecmaVersion: 2019,
6+
ecmaVersion: 2020,
77
sourceType: 'module',
88
ecmaFeatures: {
99
jsx: true

package.json

Lines changed: 26 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"node": ">=6"
1515
},
1616
"scripts": {
17-
"test": "node cli-main.js && eslint . && nyc ava"
17+
"test": "node cli-main.js && eslint --quiet . && nyc ava"
1818
},
1919
"files": [
2020
"config",
@@ -48,54 +48,56 @@
4848
"simple"
4949
],
5050
"dependencies": {
51-
"arrify": "^1.0.1",
51+
"arrify": "^2.0.1",
5252
"debug": "^4.1.0",
53-
"eslint": "^5.15.0",
54-
"eslint-config-prettier": "^3.3.0",
53+
"eslint": "^6.2.0",
54+
"eslint-config-prettier": "^6.1.0",
5555
"eslint-config-xo": "^0.26.0",
5656
"eslint-formatter-pretty": "^2.0.0",
57-
"eslint-plugin-ava": "^5.1.0",
57+
"eslint-plugin-ava": "^8.0.0",
5858
"eslint-plugin-eslint-comments": "^3.0.1",
5959
"eslint-plugin-import": "^2.14.0",
6060
"eslint-plugin-no-use-extend-native": "^0.4.0",
6161
"eslint-plugin-node": "^8.0.0",
6262
"eslint-plugin-prettier": "^3.0.0",
6363
"eslint-plugin-promise": "^4.0.0",
6464
"eslint-plugin-unicorn": "^7.0.0",
65-
"find-cache-dir": "^2.0.0",
66-
"get-stdin": "^6.0.0",
65+
"find-cache-dir": "^3.0.0",
66+
"get-stdin": "^7.0.0",
6767
"globby": "^9.0.0",
68-
"has-flag": "^3.0.0",
68+
"has-flag": "^4.0.0",
6969
"lodash.isequal": "^4.5.0",
70-
"lodash.mergewith": "^4.6.1",
70+
"lodash.mergewith": "^4.6.2",
7171
"meow": "^5.0.0",
72-
"multimatch": "^3.0.0",
73-
"open-editor": "^1.2.0",
74-
"path-exists": "^3.0.0",
75-
"pkg-conf": "^2.1.0",
72+
"multimatch": "^4.0.0",
73+
"open-editor": "^2.0.1",
74+
"path-exists": "^4.0.0",
75+
"pkg-conf": "^3.1.0",
7676
"prettier": "^1.15.2",
77-
"resolve-cwd": "^2.0.0",
78-
"resolve-from": "^4.0.0",
79-
"semver": "^5.5.0",
80-
"slash": "^2.0.0",
81-
"update-notifier": "^2.3.0",
77+
"resolve-cwd": "^3.0.0",
78+
"resolve-from": "^5.0.0",
79+
"semver": "^6.3.0",
80+
"slash": "^3.0.0",
81+
"update-notifier": "^3.0.1",
8282
"xo-init": "^0.7.0"
8383
},
8484
"devDependencies": {
8585
"ava": "^1.1.0",
86-
"coveralls": "^3.0.0",
87-
"eslint-config-xo-react": "^0.17.0",
88-
"eslint-plugin-react": "^7.6.1",
86+
"coveralls": "^3.0.6",
87+
"eslint-config-xo-react": "^0.20.0",
88+
"eslint-plugin-react": "^7.14.3",
89+
"eslint-plugin-react-hooks": "^1.7.0",
8990
"execa": "^1.0.0",
90-
"nyc": "^13.0.1",
91+
"nyc": "^14.1.1",
9192
"pify": "^4.0.0",
92-
"proxyquire": "^2.0.1",
93-
"temp-write": "^3.4.0"
93+
"proxyquire": "^2.1.3",
94+
"temp-write": "^4.0.0"
9495
},
9596
"eslintConfig": {
9697
"extends": "eslint-config-xo"
9798
},
9899
"eslintIgnore": [
100+
"cli.js",
99101
"test/fixtures"
100102
]
101103
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import test from 'ava'
22
import fn from '..'
33

4-
test(t => {
4+
test('main', t => {
55
t.is(fn('foo'), fn('foobar'))
66
})
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import test from 'ava'
22
import fn from '..'
33

4-
test(t => {
4+
test('main', t => {
55
t.is(fn('foo'), fn('foobar'))
66
})
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import test from 'ava'
22
import fn from '..'
33

4-
test(t => {
4+
test('main', t => {
55
t.is(fn('foo'), fn('foobar'))
66
})

test/open-report.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import test from 'ava';
21
import path from 'path';
2+
import test from 'ava';
33
import proxyquire from 'proxyquire';
44
import fn from '..';
55

test/options-manager.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ test('normalizeOptions: falsie values stay falsie', t => {
4343

4444
test('buildConfig: defaults', t => {
4545
const config = manager.buildConfig({});
46-
t.true(/[\\/]\.cache\/xo[\\/]?$/u.test(slash(config.cacheLocation)));
46+
t.regex(slash(config.cacheLocation), /[\\/]\.cache\/xo[\\/]?$/u);
4747
t.is(config.useEslintrc, false);
4848
t.is(config.cache, true);
4949
t.is(config.baseConfig.extends[0], 'xo/esnext');

0 commit comments

Comments
 (0)