Skip to content

Commit

Permalink
Upgrade to ESLint 6
Browse files Browse the repository at this point in the history
Fixes #390
  • Loading branch information
sindresorhus committed Aug 19, 2019
1 parent 0216305 commit 698b043
Show file tree
Hide file tree
Showing 7 changed files with 32 additions and 30 deletions.
2 changes: 1 addition & 1 deletion config/plugins.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
module.exports = {
// Repeated here from eslint-config-xo in case some plugins set something different
parserOptions: {
ecmaVersion: 2019,
ecmaVersion: 2020,
sourceType: 'module',
ecmaFeatures: {
jsx: true
Expand Down
50 changes: 26 additions & 24 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"node": ">=6"
},
"scripts": {
"test": "node cli-main.js && eslint . && nyc ava"
"test": "node cli-main.js && eslint --quiet . && nyc ava"
},
"files": [
"config",
Expand Down Expand Up @@ -48,54 +48,56 @@
"simple"
],
"dependencies": {
"arrify": "^1.0.1",
"arrify": "^2.0.1",
"debug": "^4.1.0",
"eslint": "^5.15.0",
"eslint-config-prettier": "^3.3.0",
"eslint": "^6.2.0",
"eslint-config-prettier": "^6.1.0",
"eslint-config-xo": "^0.26.0",
"eslint-formatter-pretty": "^2.0.0",
"eslint-plugin-ava": "^5.1.0",
"eslint-plugin-ava": "^8.0.0",
"eslint-plugin-eslint-comments": "^3.0.1",
"eslint-plugin-import": "^2.14.0",
"eslint-plugin-no-use-extend-native": "^0.4.0",
"eslint-plugin-node": "^8.0.0",
"eslint-plugin-prettier": "^3.0.0",
"eslint-plugin-promise": "^4.0.0",
"eslint-plugin-unicorn": "^7.0.0",
"find-cache-dir": "^2.0.0",
"get-stdin": "^6.0.0",
"find-cache-dir": "^3.0.0",
"get-stdin": "^7.0.0",
"globby": "^9.0.0",
"has-flag": "^3.0.0",
"has-flag": "^4.0.0",
"lodash.isequal": "^4.5.0",
"lodash.mergewith": "^4.6.1",
"lodash.mergewith": "^4.6.2",
"meow": "^5.0.0",
"multimatch": "^3.0.0",
"open-editor": "^1.2.0",
"path-exists": "^3.0.0",
"pkg-conf": "^2.1.0",
"multimatch": "^4.0.0",
"open-editor": "^2.0.1",
"path-exists": "^4.0.0",
"pkg-conf": "^3.1.0",
"prettier": "^1.15.2",
"resolve-cwd": "^2.0.0",
"resolve-from": "^4.0.0",
"semver": "^5.5.0",
"slash": "^2.0.0",
"update-notifier": "^2.3.0",
"resolve-cwd": "^3.0.0",
"resolve-from": "^5.0.0",
"semver": "^6.3.0",
"slash": "^3.0.0",
"update-notifier": "^3.0.1",
"xo-init": "^0.7.0"
},
"devDependencies": {
"ava": "^1.1.0",
"coveralls": "^3.0.0",
"eslint-config-xo-react": "^0.17.0",
"eslint-plugin-react": "^7.6.1",
"coveralls": "^3.0.6",
"eslint-config-xo-react": "^0.20.0",
"eslint-plugin-react": "^7.14.3",
"eslint-plugin-react-hooks": "^1.7.0",
"execa": "^1.0.0",
"nyc": "^13.0.1",
"nyc": "^14.1.1",
"pify": "^4.0.0",
"proxyquire": "^2.0.1",
"temp-write": "^3.4.0"
"proxyquire": "^2.1.3",
"temp-write": "^4.0.0"
},
"eslintConfig": {
"extends": "eslint-config-xo"
},
"eslintIgnore": [
"cli.js",
"test/fixtures"
]
}
2 changes: 1 addition & 1 deletion test/fixtures/gitignore/test/bar.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import test from 'ava'
import fn from '..'

test(t => {
test('main', t => {
t.is(fn('foo'), fn('foobar'))
})
2 changes: 1 addition & 1 deletion test/fixtures/overrides/test/bar.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import test from 'ava'
import fn from '..'

test(t => {
test('main', t => {
t.is(fn('foo'), fn('foobar'))
})
2 changes: 1 addition & 1 deletion test/fixtures/overrides/test/foo.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import test from 'ava'
import fn from '..'

test(t => {
test('main', t => {
t.is(fn('foo'), fn('foobar'))
})
2 changes: 1 addition & 1 deletion test/open-report.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import test from 'ava';
import path from 'path';
import test from 'ava';
import proxyquire from 'proxyquire';
import fn from '..';

Expand Down
2 changes: 1 addition & 1 deletion test/options-manager.js
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ test('normalizeOptions: falsie values stay falsie', t => {

test('buildConfig: defaults', t => {
const config = manager.buildConfig({});
t.true(/[\\/]\.cache\/xo[\\/]?$/u.test(slash(config.cacheLocation)));
t.regex(slash(config.cacheLocation), /[\\/]\.cache\/xo[\\/]?$/u);
t.is(config.useEslintrc, false);
t.is(config.cache, true);
t.is(config.baseConfig.extends[0], 'xo/esnext');
Expand Down

0 comments on commit 698b043

Please sign in to comment.