From e3f1da92db1a5bb07ae8d79a90f0d1d04f9bfee3 Mon Sep 17 00:00:00 2001
From: Kasper Fabricius Kristensen
 <45367945+kasperkristensen@users.noreply.github.com>
Date: Fri, 10 Nov 2023 08:31:30 +0100
Subject: [PATCH] fix(admin-ui, ui): Align @types/react versions across UI
 packages (#5596)

* fix: Align @types/react versions across UI packages

* update codeowners
---
 .changeset/lovely-insects-grow.md      |  6 +++
 CODEOWNERS                             |  2 +
 packages/admin-ui/package.json         |  4 +-
 packages/design-system/ui/package.json |  4 +-
 yarn.lock                              | 54 +++++++++++++-------------
 5 files changed, 39 insertions(+), 31 deletions(-)
 create mode 100644 .changeset/lovely-insects-grow.md

diff --git a/.changeset/lovely-insects-grow.md b/.changeset/lovely-insects-grow.md
new file mode 100644
index 0000000000..a6e599d4d2
--- /dev/null
+++ b/.changeset/lovely-insects-grow.md
@@ -0,0 +1,6 @@
+---
+"@medusajs/ui": patch
+"@medusajs/admin-ui": patch
+---
+
+fix(admin-ui,ui): Align @types/react versions
diff --git a/CODEOWNERS b/CODEOWNERS
index 3eb0f0c4c3..37af502bc5 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -2,4 +2,6 @@
 *                                               @medusajs/core
 /docs/                                          @medusajs/docs
 /www/                                           @medusajs/docs
+/packages/admin                                 @medusajs/ui
+/packages/admin-ui                              @medusajs/ui
 /packages/design-system/                        @medusajs/ui
diff --git a/packages/admin-ui/package.json b/packages/admin-ui/package.json
index f563ebc6a9..f0f58a6a50 100644
--- a/packages/admin-ui/package.json
+++ b/packages/admin-ui/package.json
@@ -120,9 +120,9 @@
     "@medusajs/medusa": "^1.17.3",
     "@medusajs/types": "^1.11.5",
     "@types/pluralize": "^0.0.29",
-    "@types/react": "^18.0.27",
+    "@types/react": "^18.2.0",
     "@types/react-datepicker": "^4.10.0",
-    "@types/react-dom": "^18.0.10",
+    "@types/react-dom": "^18.2.0",
     "@types/react-table": "^7.7.9",
     "duplicate-dependencies-webpack-plugin": "^1.0.2",
     "i18next-parser": "^8.0.0",
diff --git a/packages/design-system/ui/package.json b/packages/design-system/ui/package.json
index 3f46f5e4dc..91c617ba68 100644
--- a/packages/design-system/ui/package.json
+++ b/packages/design-system/ui/package.json
@@ -67,8 +67,8 @@
     "jsdom": "^22.1.0",
     "postcss": "^8.4.24",
     "prop-types": "^15.8.1",
-    "react": "18.2.0",
-    "react-dom": "18.2.0",
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0",
     "resize-observer-polyfill": "^1.5.1",
     "rimraf": "^5.0.1",
     "storybook": "^7.0.23",
diff --git a/yarn.lock b/yarn.lock
index ade800393c..b02a2b8d87 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7301,9 +7301,9 @@ __metadata:
     "@tanstack/react-query": 4.22.0
     "@tanstack/react-table": ^8.7.9
     "@types/pluralize": ^0.0.29
-    "@types/react": ^18.0.27
+    "@types/react": ^18.2.0
     "@types/react-datepicker": ^4.10.0
-    "@types/react-dom": ^18.0.10
+    "@types/react-dom": ^18.2.0
     "@types/react-table": ^7.7.9
     autoprefixer: ^10.4.13
     chokidar: ^3.5.3
@@ -8010,10 +8010,10 @@ __metadata:
     postcss: ^8.4.24
     prism-react-renderer: ^2.0.6
     prop-types: ^15.8.1
-    react: 18.2.0
+    react: ^18.2.0
     react-currency-input-field: ^3.6.11
     react-day-picker: ^8.8.0
-    react-dom: 18.2.0
+    react-dom: ^18.2.0
     resize-observer-polyfill: ^1.5.1
     rimraf: ^5.0.1
     storybook: ^7.0.23
@@ -16674,7 +16674,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/react-dom@npm:^18.0.0, @types/react-dom@npm:^18.0.10":
+"@types/react-dom@npm:^18.0.0":
   version: 18.2.6
   resolution: "@types/react-dom@npm:18.2.6"
   dependencies:
@@ -16710,7 +16710,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/react@npm:*, @types/react@npm:^18.0.27":
+"@types/react@npm:*":
   version: 18.2.14
   resolution: "@types/react@npm:18.2.14"
   dependencies:
@@ -41712,18 +41712,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-dom@npm:18.2.0, react-dom@npm:^18.2.0":
-  version: 18.2.0
-  resolution: "react-dom@npm:18.2.0"
-  dependencies:
-    loose-envify: ^1.1.0
-    scheduler: ^0.23.0
-  peerDependencies:
-    react: ^18.2.0
-  checksum: 66dfc5f93e13d0674e78ef41f92ed21dfb80f9c4ac4ac25a4b51046d41d4d2186abc915b897f69d3d0ebbffe6184e7c5876f2af26bfa956f179225d921be713a
-  languageName: node
-  linkType: hard
-
 "react-dom@npm:^15.7.0":
   version: 15.7.0
   resolution: "react-dom@npm:15.7.0"
@@ -41751,6 +41739,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"react-dom@npm:^18.2.0":
+  version: 18.2.0
+  resolution: "react-dom@npm:18.2.0"
+  dependencies:
+    loose-envify: ^1.1.0
+    scheduler: ^0.23.0
+  peerDependencies:
+    react: ^18.2.0
+  checksum: 66dfc5f93e13d0674e78ef41f92ed21dfb80f9c4ac4ac25a4b51046d41d4d2186abc915b897f69d3d0ebbffe6184e7c5876f2af26bfa956f179225d921be713a
+  languageName: node
+  linkType: hard
+
 "react-element-to-jsx-string@npm:^14.3.4":
   version: 14.3.4
   resolution: "react-element-to-jsx-string@npm:14.3.4"
@@ -42197,15 +42197,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react@npm:18.2.0, react@npm:^18.2.0":
-  version: 18.2.0
-  resolution: "react@npm:18.2.0"
-  dependencies:
-    loose-envify: ^1.1.0
-  checksum: b562d9b569b0cb315e44b48099f7712283d93df36b19a39a67c254c6686479d3980b7f013dc931f4a5a3ae7645eae6386b4aa5eea933baa54ecd0f9acb0902b8
-  languageName: node
-  linkType: hard
-
 "react@npm:^15.7.0":
   version: 15.7.0
   resolution: "react@npm:15.7.0"
@@ -42229,6 +42220,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"react@npm:^18.2.0":
+  version: 18.2.0
+  resolution: "react@npm:18.2.0"
+  dependencies:
+    loose-envify: ^1.1.0
+  checksum: b562d9b569b0cb315e44b48099f7712283d93df36b19a39a67c254c6686479d3980b7f013dc931f4a5a3ae7645eae6386b4aa5eea933baa54ecd0f9acb0902b8
+  languageName: node
+  linkType: hard
+
 "read-cache@npm:^1.0.0":
   version: 1.0.0
   resolution: "read-cache@npm:1.0.0"