Skip to content
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Merge branch 'master' into testing-library-linting
  • Loading branch information
nickserv authored Jun 22, 2020
commit 2645c541125889fb3785488618930a843c9224f3
2 changes: 1 addition & 1 deletion packages/eslint-config-react-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"eslint-plugin-jest-dom": "2.x",
"eslint-plugin-jsx-a11y": "6.x",
"eslint-plugin-react": "7.x",
"eslint-plugin-react-hooks": "1.x || 2.x",
"eslint-plugin-react-hooks": "1.x || 2.x || 3.x || 4.x",
"eslint-plugin-testing-library": "2.x"
},
"dependencies": {
Expand Down
16 changes: 8 additions & 8 deletions packages/react-scripts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,18 +46,18 @@
"dotenv-expand": "5.1.0",
"eslint": "^6.6.0",
"eslint-config-react-app": "^5.2.1",
"eslint-loader": "3.0.3",
"eslint-plugin-flowtype": "4.6.0",
"eslint-plugin-import": "2.20.1",
"eslint-loader": "4.0.2",
"eslint-plugin-flowtype": "4.7.0",
"eslint-plugin-import": "2.20.2",
"eslint-plugin-jest": "23.6.0",
"eslint-plugin-jest-dom": "2.0.0",
"eslint-plugin-jsx-a11y": "6.2.3",
"eslint-plugin-react": "7.19.0",
"eslint-plugin-react-hooks": "^1.6.1",
"eslint-plugin-react": "7.20.0",
"eslint-plugin-react-hooks": "^4.0.0",
"eslint-plugin-testing-library": "2.2.1",
"file-loader": "4.3.0",
"fs-extra": "^8.1.0",
"html-webpack-plugin": "4.0.0-beta.11",
"file-loader": "6.0.0",
"fs-extra": "^9.0.0",
"html-webpack-plugin": "4.3.0",
"identity-obj-proxy": "3.0.0",
"jest": "26.0.1",
"jest-circus": "26.0.1",
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.