Skip to content

Commit

Permalink
Update to ESLint 6
Browse files Browse the repository at this point in the history
  • Loading branch information
lydell committed Jun 25, 2019
1 parent db2081c commit 15f87af
Show file tree
Hide file tree
Showing 4 changed files with 70 additions and 43 deletions.
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -780,7 +780,8 @@ You can also supply a custom message if you want:

eslint-config-prettier has been tested with:

- ESLint 5.16.0
- ESLint 6.0.1
- eslint-config-prettier 5.1.0 and older were tested with ESLint 5.x
- eslint-config-prettier 2.10.0 and older were tested with ESLint 4.x
- eslint-config-prettier 2.1.1 and older were tested with ESLint 3.x
- prettier 1.18.2
Expand Down
2 changes: 1 addition & 1 deletion bin/cli.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ if (module === require.main) {
"This tool checks whether an ESLint configuration contains rules that are",
"unnecessary or conflict with Prettier. It’s supposed to be run like this:",
"",
" eslint --print-config . | eslint-config-prettier-check",
" eslint --print-config path/to/main.js | eslint-config-prettier-check",
" eslint --print-config test/index.js | eslint-config-prettier-check",
"",
"Exit codes:",
Expand Down
104 changes: 65 additions & 39 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"test:lint-verify-fail": "eslint \"test-lint/*.{js,ts,vue}\" --config .eslintrc.base.js --format json",
"test:lint-rules": "eslint index.js --config test-config/.eslintrc.js --format json",
"test:jest": "jest",
"test:cli-sanity": "eslint --print-config . | node ./bin/cli.js",
"test:cli-sanity": "eslint --print-config index.js | node ./bin/cli.js",
"test:cli-sanity-warning": "eslint --print-config ./bin/cli.js | node ./bin/cli.js",
"test": "npm run test:lint && npm run test:jest && npm run test:cli-sanity && npm run test:cli-sanity-warning"
},
Expand All @@ -43,7 +43,7 @@
"babel-eslint": "10.0.2",
"cross-spawn": "6.0.5",
"doctoc": "1.4.0",
"eslint": "5.16.0",
"eslint": "6.0.1",
"eslint-config-google": "0.13.0",
"eslint-plugin-babel": "5.3.0",
"eslint-plugin-flowtype": "3.11.1",
Expand Down

0 comments on commit 15f87af

Please sign in to comment.