Skip to content

Commit

Permalink
Merge branch 'master' into handle-deprecated-rules
Browse files Browse the repository at this point in the history
  • Loading branch information
alexilyaev committed Oct 18, 2019
2 parents 75bee9c + c8f1a2d commit b9c49aa
Show file tree
Hide file tree
Showing 3 changed files with 173 additions and 28 deletions.
4 changes: 2 additions & 2 deletions README.md
Expand Up @@ -785,12 +785,12 @@ eslint-config-prettier has been tested with:
- 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
- @typescript-eslint/eslint-plugin 2.3.2
- @typescript-eslint/eslint-plugin 2.4.0
- eslint-plugin-babel 5.3.0
- eslint-plugin-flowtype 4.3.0
- eslint-plugin-react 7.16.0
- eslint-plugin-standard 4.0.1
- eslint-plugin-unicorn 12.0.2
- eslint-plugin-unicorn 12.1.0
- eslint-plugin-vue 5.2.3

Have new rules been added since those versions? Have we missed any rules? Is
Expand Down
189 changes: 167 additions & 22 deletions package-lock.json

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

8 changes: 4 additions & 4 deletions package.json
Expand Up @@ -40,8 +40,8 @@
"semver": "6.3.0"
},
"devDependencies": {
"@typescript-eslint/eslint-plugin": "2.3.2",
"@typescript-eslint/parser": "2.3.2",
"@typescript-eslint/eslint-plugin": "2.4.0",
"@typescript-eslint/parser": "2.4.0",
"babel-eslint": "10.0.3",
"cross-spawn": "6.0.5",
"doctoc": "1.4.0",
Expand All @@ -52,13 +52,13 @@
"eslint-plugin-prettier": "3.1.1",
"eslint-plugin-react": "7.16.0",
"eslint-plugin-standard": "4.0.1",
"eslint-plugin-unicorn": "12.0.2",
"eslint-plugin-unicorn": "12.1.0",
"eslint-plugin-vue": "5.2.3",
"jest": "24.9.0",
"prettier": "1.18.2",
"replace": "1.1.1",
"rimraf": "3.0.0",
"typescript": "3.6.3"
"typescript": "3.6.4"
},
"peerDependencies": {
"eslint": ">=3.14.1"
Expand Down

0 comments on commit b9c49aa

Please sign in to comment.