From 1b6ed50277e9cec4b8de041792aadbd11740ab5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20B=C3=BChler?= <david.buhler@cea.fr>
Date: Tue, 30 Nov 2021 10:19:37 +0100
Subject: [PATCH] [ivette] Fixes conflicts between different versions of
@types/react.
---
ivette/package.json | 3 +++
ivette/yarn.lock | 11 +----------
2 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/ivette/package.json b/ivette/package.json
index e42dfede2d4..d415e50f00e 100644
--- a/ivette/package.json
+++ b/ivette/package.json
@@ -11,6 +11,9 @@
"typecheck:watch": "yarn run typecheck -- --watch",
"build": "tsc"
},
+ "resolutions": {
+ "@types/react": "^16.9.17"
+ },
"devDependencies": {
"@babel/cli": "^7.8.4",
"@babel/core": "^7",
diff --git a/ivette/yarn.lock b/ivette/yarn.lock
index 7ae1df4e026..ef173d645aa 100644
--- a/ivette/yarn.lock
+++ b/ivette/yarn.lock
@@ -1239,16 +1239,7 @@
dependencies:
"@types/react" "*"
-"@types/react@*":
- version "17.0.37"
- resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.37.tgz#6884d0aa402605935c397ae689deed115caad959"
- integrity sha512-2FS1oTqBGcH/s0E+CjrCCR9+JMpsu9b69RTFO+40ua43ZqP5MmQ4iUde/dMjWR909KxZwmOQIFq6AV6NjEG5xg==
- dependencies:
- "@types/prop-types" "*"
- "@types/scheduler" "*"
- csstype "^3.0.2"
-
-"@types/react@^16", "@types/react@^16.9.17":
+"@types/react@*", "@types/react@^16", "@types/react@^16.9.17":
version "16.14.21"
resolved "https://registry.yarnpkg.com/@types/react/-/react-16.14.21.tgz#35199b21a278355ec7a3c40003bd6a334bd4ae4a"
integrity sha512-rY4DzPKK/4aohyWiDRHS2fotN5rhBSK6/rz1X37KzNna9HJyqtaGAbq9fVttrEPWF5ywpfIP1ITL8Xi2QZn6Eg==
--
GitLab