Merge pull request #729 from dhis2/fix/resolve-deps

fix(dependencies): update @dhis2 deps - downgrade to react@16
dhis2 · Feb 7, 2023 · bbebdef · bbebdef
2 parents 7e7d90d + aa4107a
commit bbebdef
Show file tree

Hide file tree

Showing 3 changed files with 880 additions and 518 deletions.
diff --git a/client/package.json b/client/package.json
@@ -18,7 +18,7 @@
     "dependencies": {
         "@auth0/auth0-react": "^1.6.0",
         "@dhis2/d2-i18n": "^1.1.0",
-        "@dhis2/ui": "^6.20.0",
+        "@dhis2/ui": "^8.9.0",
         "classnames": "^2.3.1",
         "copy-text-to-clipboard": "^3.0.1",
         "core-js": "^3.16.4",
@@ -27,8 +27,8 @@
         "jwt-decode": "^2.1.0",
         "lodash": "^4.17.19",
         "query-string": "^7.0.1",
-        "react": "^17.0.2",
-        "react-dom": "^17.0.2",
+        "react": "16.14.0",
+        "react-dom": "16.14.0",
         "react-markdown": "^8.0.3",
         "react-redux": "^7.2.4",
         "react-router-dom": "^5.2.1",

diff --git a/client/src/components/AppIcon/AppIcon.js b/client/src/components/AppIcon/AppIcon.js
@@ -1,4 +1,4 @@
-import { PropTypes } from '@dhis2/prop-types'
+import PropTypes from 'prop-types'
 import React from 'react'
 import styles from './AppIcon.module.css'