From 7e8a827d6ad0de7d810e4e643fa6f3a6f801e540 Mon Sep 17 00:00:00 2001
From: Austin McGee <947888+amcgee@users.noreply.github.com>
Date: Tue, 11 Aug 2020 19:04:04 +0200
Subject: [PATCH] fix: move internal and singleton dependencies to
 peerDependencies

chore: standardize peerDep versions

chore: pin versions in  deps

 Last command done (1 command done):

chore: fix rebase mixup
---
 package.json                  |  2 ++
 packages/core/package.json    |  4 ++--
 packages/forms/package.json   |  2 +-
 packages/ui/package.json      |  7 +++++++
 packages/widgets/package.json | 15 +++++++--------
 yarn.lock                     |  2 +-
 6 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/package.json b/package.json
index 9c2fc7cfaf..c39467fdef 100644
--- a/package.json
+++ b/package.json
@@ -55,10 +55,12 @@
         "watch:widgets": "yarn build:widgets --watch --dev"
     },
     "devDependencies": {
+        "@dhis2/app-runtime": "^2.2.2",
         "@dhis2/cli-app-scripts": "^4.0.8",
         "@dhis2/cli-style": "^7.0.0",
         "@dhis2/cli-utils-cypress": "^2.2.1",
         "@dhis2/cli-utils-docsite": "^2.0.2",
+        "@dhis2/d2-i18n": "^1.0.6",
         "@storybook/addons": "^5.3.9",
         "@storybook/components": "^5.3.19",
         "@storybook/csf": "^0.0.1",
diff --git a/packages/core/package.json b/packages/core/package.json
index ba2d68a5de..4558355452 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -19,14 +19,14 @@
         "build": "d2-app-scripts build"
     },
     "peerDependencies": {
+        "@dhis2/ui-constants": "^5.3",
+        "@dhis2/ui-icons": "^5.3",
         "react": "^16.8",
         "react-dom": "^16.8",
         "styled-jsx": "^3.2"
     },
     "dependencies": {
         "@dhis2/prop-types": "^1.6.4",
-        "@dhis2/ui-constants": "5.3.2",
-        "@dhis2/ui-icons": "5.3.2",
         "@popperjs/core": "^2.4.2",
         "classnames": "^2.2.6",
         "react-popper": "^2.2.3",
diff --git a/packages/forms/package.json b/packages/forms/package.json
index 900c9c449e..151b7d53bb 100644
--- a/packages/forms/package.json
+++ b/packages/forms/package.json
@@ -16,12 +16,12 @@
         "build": "d2-app-scripts build"
     },
     "peerDependencies": {
+        "@dhis2/ui-core": "^5.3",
         "react": "^16.8",
         "react-dom": "^16.8"
     },
     "dependencies": {
         "@dhis2/prop-types": "^1.6.4",
-        "@dhis2/ui-core": "5.3.2",
         "classnames": "^2.2.6",
         "final-form": "^4.20.0",
         "react-final-form": "^6.5.0"
diff --git a/packages/ui/package.json b/packages/ui/package.json
index 908e2ffe13..b627386d35 100644
--- a/packages/ui/package.json
+++ b/packages/ui/package.json
@@ -15,5 +15,12 @@
         "@dhis2/ui-core": "5.3.2",
         "@dhis2/ui-forms": "5.3.2",
         "@dhis2/ui-widgets": "5.3.2"
+    },
+    "peerDependencies": {
+        "react": "^16.8",
+        "react-dom": "^16.8",
+        "styled-jsx": "^3.2",
+        "@dhis2/app-runtime": "^2",
+        "@dhis2/d2-i18n": "^1"
     }
 }
diff --git a/packages/widgets/package.json b/packages/widgets/package.json
index ee64af26a8..4887ce28a5 100644
--- a/packages/widgets/package.json
+++ b/packages/widgets/package.json
@@ -20,17 +20,16 @@
     "peerDependencies": {
         "react": "^16.8",
         "react-dom": "^16.8",
-        "styled-jsx": "^3.2"
+        "styled-jsx": "^3.2",
+        "@dhis2/ui-core": "^5.3",
+        "@dhis2/ui-icons": "^5.3",
+        "@dhis2/ui-constants": "^5.3",
+        "@dhis2/app-runtime": "^2",
+        "@dhis2/d2-i18n": "^1"
     },
     "dependencies": {
-        "@dhis2/app-runtime": "^2.2.2",
-        "@dhis2/d2-i18n": "^1",
         "@dhis2/prop-types": "^1.6.4",
-        "@dhis2/ui-constants": "5.3.2",
-        "@dhis2/ui-core": "5.3.2",
-        "@dhis2/ui-icons": "5.3.2",
-        "classnames": "^2.2.6",
-        "resize-observer-polyfill": "^1.5.1"
+        "classnames": "^2.2.6"
     },
     "files": [
         "build"
diff --git a/yarn.lock b/yarn.lock
index 595072395d..0537f5f0f4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1480,7 +1480,7 @@
     live-server "^1.2.1"
     match-all "^1.2.5"
 
-"@dhis2/d2-i18n@^1", "@dhis2/d2-i18n@^1.0.5":
+"@dhis2/d2-i18n@^1.0.5", "@dhis2/d2-i18n@^1.0.6":
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/@dhis2/d2-i18n/-/d2-i18n-1.0.6.tgz#2914be8acf296f3a6bf7b51c76c46da6a120b0ff"
   integrity sha512-7YdA4ppFosjuyf7ZMm47BrdsA5TWLM9lmS0lUPgjcCVeeWfUgagqzf4W5JGB9XQ3w1vzK+yy5zH2Ij8IgRAGhA==