From e7c722bb99358aaaba0fc0e40f5821d88ee33978 Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Wed, 27 Jan 2021 14:14:25 +0000
Subject: [PATCH] Pin React types to 16.x for now

This avoids type conflicts from other deps that depends on just `*`. Type deps
needs to be de-duplicated down to a single version to avoid errors (unlike code
deps).
---
 package.json |  5 ++++-
 yarn.lock    | 12 ++----------
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/package.json b/package.json
index 39c5325237..36988fbcc6 100644
--- a/package.json
+++ b/package.json
@@ -88,7 +88,7 @@
     "@types/flux": "^3.1.9",
     "@types/modernizr": "^3.5.3",
     "@types/node": "^12.19.15",
-    "@types/react": "16.9",
+    "@types/react": "^16.9",
     "@types/react-dom": "^16.9.10",
     "@types/sanitize-html": "^1.27.1",
     "autoprefixer": "^9.8.6",
@@ -144,6 +144,9 @@
     "webpack-cli": "^3.3.12",
     "webpack-dev-server": "^3.11.2"
   },
+  "resolutions": {
+    "**/@types/react": "^16.14"
+  },
   "jest": {
     "testEnvironment": "jest-environment-jsdom-sixteen",
     "testMatch": [
diff --git a/yarn.lock b/yarn.lock
index 334f93247c..dfba435394 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1807,15 +1807,7 @@
   dependencies:
     "@types/react" "^16"
 
-"@types/react@*", "@types/react@16.9":
-  version "16.9.35"
-  resolved "https://registry.yarnpkg.com/@types/react/-/react-16.9.35.tgz#a0830d172e8aadd9bd41709ba2281a3124bbd368"
-  integrity sha512-q0n0SsWcGc8nDqH2GJfWQWUOmZSJhXV64CjVN5SvcNti3TdEaA3AH0D8DwNmMdzjMAC/78tB8nAZIlV8yTz+zQ==
-  dependencies:
-    "@types/prop-types" "*"
-    csstype "^2.2.0"
-
-"@types/react@^16":
+"@types/react@*", "@types/react@^16", "@types/react@^16.14", "@types/react@^16.9":
   version "16.14.2"
   resolved "https://registry.yarnpkg.com/@types/react/-/react-16.14.2.tgz#85dcc0947d0645349923c04ccef6018a1ab7538c"
   integrity sha512-BzzcAlyDxXl2nANlabtT4thtvbbnhee8hMmH/CcJrISDBVcJS1iOsP1f0OAgSdGE0MsY9tqcrb9YoZcOFv9dbQ==
@@ -4087,7 +4079,7 @@ cssstyle@^2.2.0:
   dependencies:
     cssom "~0.3.6"
 
-csstype@^2.2.0, csstype@^2.6.7:
+csstype@^2.6.7:
   version "2.6.10"
   resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.10.tgz#e63af50e66d7c266edb6b32909cfd0aabe03928b"
   integrity sha512-D34BqZU4cIlMCY93rZHbrq9pjTAQJ3U8S8rfBqjwHxkGPThWFjzZDQpgMJY0QViLxth6ZKYiwFBo14RdN44U/w==