From 46cdd79c27b28d69eb8e5d72a6946376961ba670 Mon Sep 17 00:00:00 2001
From: Mozafar <mozafar@dhis2.org>
Date: Mon, 5 Aug 2024 16:14:22 +0100
Subject: [PATCH] fix: pin react version in resolution (#1573)

---
 package.json |  6 +++---
 yarn.lock    | 26 +++++++++++++-------------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/package.json b/package.json
index 26a682913e..b387cfe986 100644
--- a/package.json
+++ b/package.json
@@ -44,8 +44,8 @@
     },
     "dependencies": {
         "@dhis2/d2-i18n": "^1.1.0",
-        "react": "^16.13",
-        "react-dom": "^16.13",
+        "react": "16.13",
+        "react-dom": "16.13",
         "react-scripts": "^5.0.1",
         "styled-jsx": "^4.0.1"
     },
@@ -82,6 +82,6 @@
         "wait-on": "^6.0.0"
     },
     "resolutions": {
-        "react": "^16.13"
+        "react": "16.13.1"
     }
 }
diff --git a/yarn.lock b/yarn.lock
index 90ad50060e..9c2cf47f69 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -19863,7 +19863,15 @@ react-dom@16.13:
     prop-types "^15.6.2"
     scheduler "^0.19.1"
 
-react-dom@^16.13, react-dom@^16.8.6:
+"react-dom@^16.8.0 || ^17.0.0 || ^18.0.0":
+  version "18.3.1"
+  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-18.3.1.tgz#c2265d79511b57d479b3dd3fdfa51536494c5cb4"
+  integrity sha512-5m4nQKp+rZRb09LNH59GM4BxTh9251/ylbKIbpe7TpGxfJ+9kv6BLkLBXIjjspbgbnIBNqlI23tRnTWT0snUIw==
+  dependencies:
+    loose-envify "^1.1.0"
+    scheduler "^0.23.2"
+
+react-dom@^16.8.6:
   version "16.14.0"
   resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.14.0.tgz#7ad838ec29a777fb3c75c3a190f661cf92ab8b89"
   integrity sha512-1gCeQXDLoIqMgqD3IO2Ah9bnf0w9kzhwN5q4FGnHZ67hBm9yePzB5JJAIQCc8x3pFnNlwFq4RidZggNAAkzWWw==
@@ -19873,14 +19881,6 @@ react-dom@^16.13, react-dom@^16.8.6:
     prop-types "^15.6.2"
     scheduler "^0.19.1"
 
-"react-dom@^16.8.0 || ^17.0.0 || ^18.0.0":
-  version "18.3.1"
-  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-18.3.1.tgz#c2265d79511b57d479b3dd3fdfa51536494c5cb4"
-  integrity sha512-5m4nQKp+rZRb09LNH59GM4BxTh9251/ylbKIbpe7TpGxfJ+9kv6BLkLBXIjjspbgbnIBNqlI23tRnTWT0snUIw==
-  dependencies:
-    loose-envify "^1.1.0"
-    scheduler "^0.23.2"
-
 react-element-to-jsx-string@^14.3.1:
   version "14.3.4"
   resolved "https://registry.yarnpkg.com/react-element-to-jsx-string/-/react-element-to-jsx-string-14.3.4.tgz#709125bc72f06800b68f9f4db485f2c7d31218a8"
@@ -20202,10 +20202,10 @@ react-tooltip@^3.10.0:
   dependencies:
     prop-types "^15.6.0"
 
-react@16.13, react@^16.13, "react@^16.8.0 || ^17.0.0 || ^18.0.0", react@^16.8.6:
-  version "16.14.0"
-  resolved "https://registry.yarnpkg.com/react/-/react-16.14.0.tgz#94d776ddd0aaa37da3eda8fc5b6b18a4c9a3114d"
-  integrity sha512-0X2CImDkJGApiAlcf0ODKIneSwBPhqJawOa5wCtKbu7ZECrmS26NvtSILynQ66cgkT/RJ4LidJOc3bUESwmU8g==
+react@16.13, react@16.13.1, "react@^16.8.0 || ^17.0.0 || ^18.0.0", react@^16.8.6:
+  version "16.13.1"
+  resolved "https://registry.yarnpkg.com/react/-/react-16.13.1.tgz#2e818822f1a9743122c063d6410d85c1e3afe48e"
+  integrity sha512-YMZQQq32xHLX0bz5Mnibv1/LHb3Sqzngu7xstSM+vrkE5Kzr9xE0yMByK5kMoTK30YVJE61WfbxIFFvfeDKT1w==
   dependencies:
     loose-envify "^1.1.0"
     object-assign "^4.1.1"