From 5f8db8f14e71fe4ee715061a1980b911f36916ea Mon Sep 17 00:00:00 2001
From: Jack Reed <phillipjreed@gmail.com>
Date: Tue, 24 Nov 2020 06:27:03 -0700
Subject: [PATCH] Fixup some devDependency peer conflicts
---
package.json | 21 ++++++++++++---------
1 file changed, 12 insertions(+), 9 deletions(-)
diff --git a/package.json b/package.json
index aa93acfed..6d7956cd7 100644
--- a/package.json
+++ b/package.json
@@ -85,7 +85,9 @@
"@babel/preset-env": "^7.10.3",
"@babel/preset-react": "^7.10.1",
"@pmmmwh/react-refresh-webpack-plugin": "^0.3.3",
- "babel-eslint": "10.1.0",
+ "@typescript-eslint/eslint-plugin": "^4.8.2",
+ "@typescript-eslint/parser": "^4.8.2",
+ "babel-eslint": "^10.1.0",
"babel-jest": "^26.0.1",
"babel-loader": "^8.0.6",
"babel-plugin-lodash": "^3.3.4",
@@ -97,22 +99,23 @@
"core-js": "^3.4.8",
"enzyme": "^3.10.0",
"enzyme-adapter-react-16": "^1.14.0",
- "eslint": "^6.0.0",
+ "eslint": "^7.14.0",
"eslint-config-airbnb": "^18.2.0",
- "eslint-config-react-app": "^3.0.5",
+ "eslint-config-react-app": "^6.0.0",
"eslint-loader": "^4.0.2",
- "eslint-plugin-flowtype": "^4.7.0",
- "eslint-plugin-import": "^2.18.0",
- "eslint-plugin-jest": "^23.16.0",
- "eslint-plugin-jsx-a11y": "^6.2.3",
- "eslint-plugin-react": "^7.14.2",
+ "eslint-plugin-flowtype": "^5.2.0",
+ "eslint-plugin-import": "^2.22.1",
+ "eslint-plugin-jest": "^24.0.0",
+ "eslint-plugin-jsx-a11y": "^6.4.1",
+ "eslint-plugin-react": "^7.21.5",
+ "eslint-plugin-react-hooks": "^4.2.0",
"glob": "^7.1.4",
"http-server": "^0.12.3",
"jest": "^26.0.1",
"jest-fetch-mock": "^3.0.0",
"jest-puppeteer": "^4.1.1",
"jsdom": "15.1.1",
- "puppeteer": "^4.0.0",
+ "puppeteer": "^2.1.1",
"react": "^16.8.6",
"react-dev-utils": "^10.2.1",
"react-dom": "^16.8.6",
--
GitLab