From f8816e0bda7f7c42f0d38973af76f9007519479f Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Wed, 20 Jan 2021 12:36:28 +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 | 3 +++ yarn.lock | 12 ++---------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index 270068c1fe..1b4259ed53 100644 --- a/package.json +++ b/package.json @@ -170,6 +170,9 @@ "typescript": "^3.9.7", "walk": "^2.3.14" }, + "resolutions": { + "**/@types/react": "^16.14" + }, "jest": { "testEnvironment": "./__test-utils__/environment.js", "testMatch": [ diff --git a/yarn.lock b/yarn.lock index a0b46df413..06a4f2e6a6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2122,15 +2122,7 @@ dependencies: "@types/react" "*" -"@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== @@ -3536,7 +3528,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==