Skip to content

Commit

Permalink
feat: upgrade to @dhis2/ui v6 and bump other dependency versions
Browse files Browse the repository at this point in the history
  • Loading branch information
@mediremi
mediremi committed Mar 11, 2021
1 parent 5f5dc3f commit 3d2544a
Show file tree
Hide file tree
Showing 2 changed files with 86 additions and 84 deletions.
6 changes: 4 additions & 2 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,15 @@
},
"homepage": "https://github.com/dhis2/app-management-app#readme",
"devDependencies": {
"@dhis2/cli-app-scripts": "^5.7.0",
"@dhis2/cli-app-scripts": "^6.0.0",
"@dhis2/cli-style": "^7.3.0",
"babel-plugin-minify-replace": "^0.5.0"
},
"dependencies": {
"@dhis2/app-runtime": "^2.7.0",
"@dhis2/app-runtime": "^2.8.0",
"@dhis2/d2-i18n": "^1.1.0",
"@dhis2/prop-types": "^2.0.3",
"@dhis2/ui": "^6.5.5",
"moment": "2.24",
"query-string": "^6.14.0",
"react-router-dom": "^5.2.0",
Expand Down
164 changes: 82 additions & 82 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1340,48 +1340,48 @@
resolved "https://registry.yarnpkg.com/@csstools/normalize.css/-/normalize.css-10.1.0.tgz#f0950bba18819512d42f7197e56c518aa491cf18"
integrity sha512-ij4wRiunFfaJxjB0BdrYHIH8FxBJpOwNPhhAcunlmPdXudL1WQV1qoP9un6JsEBAgQH+7UXyyjh0g7jTxXK6tg==

"@dhis2/app-adapter@5.7.0":
version "5.7.0"
resolved "https://registry.yarnpkg.com/@dhis2/app-adapter/-/app-adapter-5.7.0.tgz#ff368e633840ab069830d76b5782217de10076fa"
integrity sha512-VGCjL77J8ppUJgHHCbLc1VpiOsBIhwUXuYZ/rvJDLbvirJwfxemEe9rGaBYphqr2p6RM1NV9gBwSFNqbop27ng==
"@dhis2/app-adapter@6.0.0":
version "6.0.0"
resolved "https://registry.yarnpkg.com/@dhis2/app-adapter/-/app-adapter-6.0.0.tgz#9d9c5120ab77020a8146dbcb3dff215dd76f1099"
integrity sha512-PcsBJWwmeRP2KcDbmTaOZ/meRPnMA7aME94ixpuOMYyl2+G3kx0v/SPc1DBM0FSjmliUfseVIMHyqwEuegj4jg==
dependencies:
moment "^2.24.0"

"@dhis2/app-runtime@^2.6.1", "@dhis2/app-runtime@^2.7.0":
version "2.7.0"
resolved "https://registry.yarnpkg.com/@dhis2/app-runtime/-/app-runtime-2.7.0.tgz#66f383a85f3c937c94d6e47375eddb673e7b5e47"
integrity sha512-VAe0YyzMC93md/Cx6lQ5UyqMAD0/SqUAMHHLfPDW7qrun/dWaeQjCV4cmipOgpL7QQKpkoq+E7okfvuYWIe3Yg==
dependencies:
"@dhis2/app-service-alerts" "2.7.0"
"@dhis2/app-service-config" "2.7.0"
"@dhis2/app-service-data" "2.7.0"

"@dhis2/app-service-alerts@2.7.0":
version "2.7.0"
resolved "https://registry.yarnpkg.com/@dhis2/app-service-alerts/-/app-service-alerts-2.7.0.tgz#08657728797696e488439d88d84ca8b1578bf38a"
integrity sha512-D95z/RrAlNrTaUCPBlvKWRm+F0mG/nguxWOole/XTshNNnlLU41rP9QShcZqqKy88GuNBP0bq/DmuZHM8eBwXA==

"@dhis2/app-service-config@2.7.0":
version "2.7.0"
resolved "https://registry.yarnpkg.com/@dhis2/app-service-config/-/app-service-config-2.7.0.tgz#6579575b6481bcc95e346c70a912c6a3611eacf9"
integrity sha512-MT80E+OtHN8c/OotpjVL37UJIclid4hlmMwmueuDyIgP0EDsf3qzRR/MdjsCBuOeja2xuZpV/ivKu6/GWbQDPQ==

"@dhis2/app-service-data@2.7.0":
version "2.7.0"
resolved "https://registry.yarnpkg.com/@dhis2/app-service-data/-/app-service-data-2.7.0.tgz#adf6f2ec8e7add19b97107309d7f35f67f2c4ffd"
integrity sha512-dkjKAeJ6zR0dszjgeWc5035wQ8QEJI0PH3cGoNwzV92m+YgIG7g4Wu0qDpzw6n2y+xZmeHl/iiH27Zq5eL/clg==

"@dhis2/app-shell@5.7.0":
version "5.7.0"
resolved "https://registry.yarnpkg.com/@dhis2/app-shell/-/app-shell-5.7.0.tgz#353fb6f5661c4709435db6d50b6ee0014087c1d2"
integrity sha512-ml5x+AKOYfQuX8Dy+VEOmjfirbsX8pxlgmrDUBui2GCq1p1Mzewl6X8AvVt7k51NwkpSA+Tdfy7lnyovBO8xPg==
dependencies:
"@dhis2/app-adapter" "5.7.0"
"@dhis2/app-runtime" "^2.6.1"
"@dhis2/d2-i18n" "^1.0.5"
"@dhis2/ui" "^5.7.2"
"@dhis2/app-runtime@^2.8.0":
version "2.8.0"
resolved "https://registry.yarnpkg.com/@dhis2/app-runtime/-/app-runtime-2.8.0.tgz#83ca6e96c299686ee72eea3e1825e04aa53cd5d2"
integrity sha512-Ru6x9L61fD7ITzVaxFqx88kV5/ypB9xSr8nHgRj4EE/kHl/aVejXuwnSS2OIWh80J3mtD1dpNRN/GJ8o0x0HYg==
dependencies:
"@dhis2/app-service-alerts" "2.8.0"
"@dhis2/app-service-config" "2.8.0"
"@dhis2/app-service-data" "2.8.0"

"@dhis2/app-service-alerts@2.8.0":
version "2.8.0"
resolved "https://registry.yarnpkg.com/@dhis2/app-service-alerts/-/app-service-alerts-2.8.0.tgz#f480043a15b5a2b7d90a6e74931ddd3ebb65aa1c"
integrity sha512-hpMqdxCG9w5H2EZyLPQKcKzCdp/Sof68ZGd85lNHo+1c10+1pWhKAjt/p3zoRllHppp17TbEgKoXa1oRx2NeHg==

"@dhis2/app-service-config@2.8.0":
version "2.8.0"
resolved "https://registry.yarnpkg.com/@dhis2/app-service-config/-/app-service-config-2.8.0.tgz#4ce7520e28a7700fa11ad7bcba6468a0a58751a4"
integrity sha512-SZnoa2EjsgV8a1QfnSk6fqxORV3pRcA+SYyz/H/nkr/VodkdgmO5CiwlZxXW8pG+4i6sbMGjGualam2jHF34wg==

"@dhis2/app-service-data@2.8.0":
version "2.8.0"
resolved "https://registry.yarnpkg.com/@dhis2/app-service-data/-/app-service-data-2.8.0.tgz#9cd347127968cb6f3c8a4ab0fc6699ea7058f835"
integrity sha512-5doyL4bxRMdMXY4RtWo2O3NVGwSDOSUY3hGPXaF1TeFWAqujlPTx17uDw6wEelN6LaryAnVwId2Ep3FOV8v5MA==

"@dhis2/app-shell@6.0.0":
version "6.0.0"
resolved "https://registry.yarnpkg.com/@dhis2/app-shell/-/app-shell-6.0.0.tgz#3d9d9c5fb13dbf8b0887a38d10e543ab257f2af3"
integrity sha512-WpKBQHjRB2Kz6FKcLmoBTlgnouTA/154anVq8MXO1iHLhil49i7y5Ina9mEecBygM4enj9Nd4no51n187hkMVQ==
dependencies:
"@dhis2/app-adapter" "6.0.0"
"@dhis2/app-runtime" "^2.8.0"
"@dhis2/d2-i18n" "^1.1.0"
"@dhis2/ui" "^6.5.3"
classnames "^2.2.6"
moment "^2.24.0"
moment "^2.29.1"
prop-types "^15.7.2"
react "^16.8.6"
react-dom "^16.8.6"
Expand All @@ -1391,10 +1391,10 @@
typeface-roboto "^0.0.75"
typescript "^3.6.3"

"@dhis2/cli-app-scripts@^5.7.0":
version "5.7.0"
resolved "https://registry.yarnpkg.com/@dhis2/cli-app-scripts/-/cli-app-scripts-5.7.0.tgz#f12afa01a17ecb0c140348a4f6a53300bdb28d81"
integrity sha512-JYUisJIxs3KZQodeNrsx9iUTDd0yfANvP5YbHNozl164Ti+TUzrk5HspUzdf7GVBIA/AQcv+HXEyJJwzXI+mRQ==
"@dhis2/cli-app-scripts@^6.0.0":
version "6.0.0"
resolved "https://registry.yarnpkg.com/@dhis2/cli-app-scripts/-/cli-app-scripts-6.0.0.tgz#1d44755db364851a1b0068ab5a73efccba533b21"
integrity sha512-QvMjsjt0wBMZ8nmA2+d8SBOztBlvo3ftk5UmUjq+kwTSqD5QwUxADK7LfGptYgH3V4WT9CiCgWEuV+bDdD5iCQ==
dependencies:
"@babel/core" "^7.6.2"
"@babel/plugin-proposal-class-properties" "^7.8.3"
Expand All @@ -1403,7 +1403,7 @@
"@babel/preset-env" "^7.9.0"
"@babel/preset-react" "^7.0.0"
"@babel/preset-typescript" "^7.6.0"
"@dhis2/app-shell" "5.7.0"
"@dhis2/app-shell" "6.0.0"
"@dhis2/cli-helpers-engine" "^2.1.1"
archiver "^3.1.1"
axios "^0.20.0"
Expand Down Expand Up @@ -1463,10 +1463,10 @@
semver "^7.3.2"
yargs "^16.1.0"

"@dhis2/d2-i18n@^1.0.5":
version "1.0.6"
resolved "https://registry.yarnpkg.com/@dhis2/d2-i18n/-/d2-i18n-1.0.6.tgz#2914be8acf296f3a6bf7b51c76c46da6a120b0ff"
integrity sha512-7YdA4ppFosjuyf7ZMm47BrdsA5TWLM9lmS0lUPgjcCVeeWfUgagqzf4W5JGB9XQ3w1vzK+yy5zH2Ij8IgRAGhA==
"@dhis2/d2-i18n@^1.1.0":
version "1.1.0"
resolved "https://registry.yarnpkg.com/@dhis2/d2-i18n/-/d2-i18n-1.1.0.tgz#ec777c5091f747e4c5aa4f9801c62ba4d1ef3d16"
integrity sha512-x3u58goDQsMfBzy50koxNrJjofJTtjRZOfz6f6Py/wMMJfp/T6vZjWMQgcfWH0JrV6d04K1RTt6bI05wqsVQvg==
dependencies:
i18next "^10.3"
moment "^2.24.0"
Expand All @@ -1485,59 +1485,59 @@
dependencies:
prop-types "^15"

"@dhis2/ui-constants@5.7.8":
version "5.7.8"
resolved "https://registry.yarnpkg.com/@dhis2/ui-constants/-/ui-constants-5.7.8.tgz#3356de03c5e9ddc0b5fac5087df8ccd97f0dc3c0"
integrity sha512-Ca9PvKP8s0jcWtqLl5tyAyhoy0F6rAohAiLvoJvRmx1M7lXzxwpHjLZnaQ4b1js3tn7BPB7HRdvv+SREqYY+PA==
"@dhis2/ui-constants@6.5.5":
version "6.5.5"
resolved "https://registry.yarnpkg.com/@dhis2/ui-constants/-/ui-constants-6.5.5.tgz#e70139857a15edbc7f693004d982ff2d85d18d29"
integrity sha512-WVNigzt/qyc28P4EaEjUOjKRChMhbbVgqlPwqdrQUmxrtDHPzILwxASW7cBGCSP7uGhGZBSMXEM6y4zj77XOKA==
dependencies:
"@dhis2/prop-types" "^1.6.4"

"@dhis2/ui-core@5.7.8":
version "5.7.8"
resolved "https://registry.yarnpkg.com/@dhis2/ui-core/-/ui-core-5.7.8.tgz#063f8a10e583803d8b85d168ddbfb52e1f72750b"
integrity sha512-ijmXT8QlBS6RjHsbPOsBzaAb9j5DOvQeoLkhFo5eQZswavug2gW+S/Vh2tgxfNP8gybZ0tHKaJXeXN3bkg7Xnw==
"@dhis2/ui-core@6.5.5":
version "6.5.5"
resolved "https://registry.yarnpkg.com/@dhis2/ui-core/-/ui-core-6.5.5.tgz#83c0b64352345cb7d284d4236c282b3f8d2e7169"
integrity sha512-/VChpke0uLmPK/MGEqmDp4v1b5d2wiVGbgvesw5d/cbgef7xxYSVIB3M2ioLJGPpiyH3L9PawQwcBFGcATWKRQ==
dependencies:
"@dhis2/prop-types" "^1.6.4"
"@popperjs/core" "^2.5.3"
"@popperjs/core" "^2.6.0"
classnames "^2.2.6"
react-popper "^2.2.3"
resize-observer-polyfill "^1.5.1"

"@dhis2/ui-forms@5.7.8":
version "5.7.8"
resolved "https://registry.yarnpkg.com/@dhis2/ui-forms/-/ui-forms-5.7.8.tgz#7b4489b796e2a79bebd1a24b8c1df59103e566c0"
integrity sha512-8c7IKJAqGL+IIZ7sjUbTrlwGHFpwX6KfF8eToDxXkkNONyyRIiFo7uVI43+rHii7+WmFwEhacWWjeYhfVBICfg==
"@dhis2/ui-forms@6.5.5":
version "6.5.5"
resolved "https://registry.yarnpkg.com/@dhis2/ui-forms/-/ui-forms-6.5.5.tgz#26a2ba0e2b3d80416fa3b2c5efc6d008a84f2463"
integrity sha512-AktWbS1EOE/TD7LgPVRom20APdxBjmb8g6aHyxl5gTdLGXAZW6YEQWtZNV58cFEPb3DTvIKU1NCzNVbEC9ly3A==
dependencies:
"@dhis2/prop-types" "^1.6.4"
classnames "^2.2.6"
final-form "^4.20.1"
react-final-form "^6.5.1"

"@dhis2/ui-icons@5.7.8":
version "5.7.8"
resolved "https://registry.yarnpkg.com/@dhis2/ui-icons/-/ui-icons-5.7.8.tgz#cb18c1bfbbcf49b2dae4c2b3ff7a3aeff46aa7f2"
integrity sha512-3P/Ptsf6HEdi0q8q6ba4Hcr8yuK+Y29PJn1Z56IZNZ+sZmFYiU7vxk5aMwA+s1EnjcPWQjrdwLzqqBAJE2W3Qg==
"@dhis2/ui-icons@6.5.5":
version "6.5.5"
resolved "https://registry.yarnpkg.com/@dhis2/ui-icons/-/ui-icons-6.5.5.tgz#8f3b08048e83805b5684ad95921ea4d29098c4d6"
integrity sha512-InYldIdsUK4zZy5h3Bwv/ZZh18KlFaGnLXos9QW6GGRlswunqdfUo+R/6BFXtELHRJlkhGcFuYFaSUgQoQtUgg==
dependencies:
"@dhis2/prop-types" "^1.6.4"

"@dhis2/ui-widgets@5.7.8":
version "5.7.8"
resolved "https://registry.yarnpkg.com/@dhis2/ui-widgets/-/ui-widgets-5.7.8.tgz#77318381dd92848f9ab2cbc5414a2b57599309fe"
integrity sha512-QVLOdB836uUXBRw4OT6x/z1WR7j2ykxpMyat4g9sOXngj6t9+2UXZUO7Zegudj/HsZjTMDiN9A285zwxsd+khQ==
"@dhis2/ui-widgets@6.5.5":
version "6.5.5"
resolved "https://registry.yarnpkg.com/@dhis2/ui-widgets/-/ui-widgets-6.5.5.tgz#e9311596b8e785e676367dd9b95b7942b77d5ed0"
integrity sha512-Z+1B16waQTq23IX7iyvC/5vPYTz87b5bemsKkLVW2zzOiHffZpR++ve1lKW0igujU5ZAdRmdNf751Sa/GE12Kg==
dependencies:
"@dhis2/prop-types" "^1.6.4"
classnames "^2.2.6"

"@dhis2/ui@^5.7.2":
version "5.7.8"
resolved "https://registry.yarnpkg.com/@dhis2/ui/-/ui-5.7.8.tgz#17604580d02cd4a7756552154a089e730a0fdf02"
integrity sha512-FHyTP6geAkR/jwX1/xG8yl8PvGaNhms8zUmaNiBLQ0mUmD9oJb47U8YXhJ5nVd0SFJnmuckOWgAWMt3meZGJTA==
"@dhis2/ui@^6.5.3", "@dhis2/ui@^6.5.5":
version "6.5.5"
resolved "https://registry.yarnpkg.com/@dhis2/ui/-/ui-6.5.5.tgz#42ea27c8a22efb0059985cb8ec07a3dfca0241f9"
integrity sha512-eB2hhhPYnEPwCIXxThBwpYg8WG+pUh2XEGXEV6qOPdbFUGlWQ9qLEPpDkn/WgXjRf10btkiwkKdnDbhazDJJUw==
dependencies:
"@dhis2/ui-constants" "5.7.8"
"@dhis2/ui-core" "5.7.8"
"@dhis2/ui-forms" "5.7.8"
"@dhis2/ui-icons" "5.7.8"
"@dhis2/ui-widgets" "5.7.8"
"@dhis2/ui-constants" "6.5.5"
"@dhis2/ui-core" "6.5.5"
"@dhis2/ui-forms" "6.5.5"
"@dhis2/ui-icons" "6.5.5"
"@dhis2/ui-widgets" "6.5.5"

"@eslint/eslintrc@^0.3.0":
version "0.3.0"
Expand Down Expand Up @@ -1963,10 +1963,10 @@
schema-utils "^2.6.5"
source-map "^0.7.3"

"@popperjs/core@^2.5.3":
version "2.8.4"
resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.8.4.tgz#6f1744b0f69f507a433f42874cc3b2eb4b11b337"
integrity sha512-h0lY7g36rhjNV8KVHKS3/BEOgfsxu0AiRI8+ry5IFBGEsQFkpjxtcpVc9ndN8zrKUeMZXAWMc7eQMepfgykpxQ==
"@popperjs/core@^2.6.0":
version "2.9.1"
resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.9.1.tgz#7f554e7368c9ab679a11f4a042ca17149d70cf12"
integrity sha512-DvJbbn3dUgMxDnJLH+RZQPnXak1h4ZVYQ7CWiFWjQwBFkVajT4rfw2PdpHLTSTwxrYfnoEXkuBiwkDm6tPMQeA==

"@rollup/plugin-node-resolve@^7.1.1":
version "7.1.3"
Expand Down Expand Up @@ -9420,7 +9420,7 @@ moment@2.24:
resolved "https://registry.yarnpkg.com/moment/-/moment-2.24.0.tgz#0d055d53f5052aa653c9f6eb68bb5d12bf5c2b5b"
integrity sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg==

moment@^2.24.0:
moment@^2.24.0, moment@^2.29.1:
version "2.29.1"
resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.1.tgz#b2be769fa31940be9eeea6469c075e35006fa3d3"
integrity sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ==
Expand Down

0 comments on commit 3d2544a

Please sign in to comment.