Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"services/*"
],
"devDependencies": {
"@dhis2/cli-app-scripts": "^5.7.1",
"@dhis2/cli-app-scripts": "^7.0.0",
"@dhis2/cli-style": "^7.2.2",
"@dhis2/cli-utils-docsite": "^2.0.3",
"@testing-library/jest-dom": "^5.0.2",
Expand Down
174 changes: 97 additions & 77 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1333,24 +1333,24 @@
resolved "https://registry.yarnpkg.com/@csstools/normalize.css/-/normalize.css-10.1.0.tgz#f0950bba18819512d42f7197e56c518aa491cf18"
integrity sha512-ij4wRiunFfaJxjB0BdrYHIH8FxBJpOwNPhhAcunlmPdXudL1WQV1qoP9un6JsEBAgQH+7UXyyjh0g7jTxXK6tg==

"@dhis2/app-adapter@5.7.1":
version "5.7.1"
resolved "https://registry.yarnpkg.com/@dhis2/app-adapter/-/app-adapter-5.7.1.tgz#fc60387d99749f5d3463fa00f08c63ef5b72468b"
integrity sha512-fT2JD7Iic2JPSKGnHIVfrX+IzvQWL9pPWsZS8gKOcVLCzuJNHjf8d2aPo/40GAc7Mhjmwp/eu6xutW1jMrV6ZA==
"@dhis2/app-adapter@7.0.0":
version "7.0.0"
resolved "https://registry.yarnpkg.com/@dhis2/app-adapter/-/app-adapter-7.0.0.tgz#fb16a2bb05457402141c0ce56e8078bed002f2ee"
integrity sha512-WiWd/eRPmp+PQUWKizeMGPj9EvtnuZMW/GeZJmq0AUHmvCTzW824oM4vwNnVH7DpkqfaVxvxXTyMqckMxMsFwg==
dependencies:
moment "^2.24.0"

"@dhis2/app-shell@5.7.1":
version "5.7.1"
resolved "https://registry.yarnpkg.com/@dhis2/app-shell/-/app-shell-5.7.1.tgz#bfabdd828afca53da62f39d5a56aa397b67cd3f1"
integrity sha512-gupogJV4WBkj8LL64tUdbG0fHkP4u2KJCVzOViOHmN0ehnfViYDdBCvFOe+7Nyo04bzGE2HwOPkoc6mfu4pgSg==
"@dhis2/app-shell@7.0.0":
version "7.0.0"
resolved "https://registry.yarnpkg.com/@dhis2/app-shell/-/app-shell-7.0.0.tgz#21189ec9d3ece9907c7ec48f3c70d3c3a4fd335b"
integrity sha512-LfnSysstJWWMT8XGiyXwIP6mAHmTkaOVe0ruMZOKFAf0JBU/jr32DBYzqrmMii9XdnCo8Rv0GgqSYtRl84/NsQ==
dependencies:
"@dhis2/app-adapter" "5.7.1"
"@dhis2/app-runtime" "^2.6.1"
"@dhis2/d2-i18n" "^1.0.5"
"@dhis2/ui" "^5.7.2"
"@dhis2/app-adapter" "7.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 @@ -1360,10 +1360,10 @@
typeface-roboto "^0.0.75"
typescript "^3.6.3"

"@dhis2/cli-app-scripts@^5.7.1":
version "5.7.1"
resolved "https://registry.yarnpkg.com/@dhis2/cli-app-scripts/-/cli-app-scripts-5.7.1.tgz#5ac09e5da2792ba2799f31e56f364cf55fc9dc47"
integrity sha512-TWPuPxHX8Xp9T8eEk7d98hr4Y37m4bFl1oGq0xCmG5Gt79pgw6UAsDhMMmdT92bP6jI4z4gx0fjSDtYHLZDaIg==
"@dhis2/cli-app-scripts@^7.0.0":
version "7.0.0"
resolved "https://registry.yarnpkg.com/@dhis2/cli-app-scripts/-/cli-app-scripts-7.0.0.tgz#307f8fc935819b78480cf730237019e523ba38d6"
integrity sha512-2K86t8lxJFgVpFNsSg8/m5+SKM6ByNpMhFTI0UfJQOGM65SsLfxztmzav7x3nBt5c2+qxwdWp/D6CjbRn5SLDw==
dependencies:
"@babel/core" "^7.6.2"
"@babel/plugin-proposal-class-properties" "^7.8.3"
Expand All @@ -1372,8 +1372,8 @@
"@babel/preset-env" "^7.9.0"
"@babel/preset-react" "^7.0.0"
"@babel/preset-typescript" "^7.6.0"
"@dhis2/app-shell" "5.7.1"
"@dhis2/cli-helpers-engine" "^2.1.1"
"@dhis2/app-shell" "7.0.0"
"@dhis2/cli-helpers-engine" "^3.0.0"
archiver "^3.1.1"
axios "^0.20.0"
babel-jest "^24.9.0"
Expand All @@ -1395,7 +1395,7 @@
parse-gitignore "^1.0.1"
styled-jsx "<3.3.3"

"@dhis2/cli-helpers-engine@2.1.1", "@dhis2/cli-helpers-engine@^2.1.1":
"@dhis2/cli-helpers-engine@2.1.1":
version "2.1.1"
resolved "https://registry.yarnpkg.com/@dhis2/cli-helpers-engine/-/cli-helpers-engine-2.1.1.tgz#34a15866b1bc16ae5c4997d79256ee787b40c11a"
integrity sha512-7HrpYwenDzPFUMRsIuStQRu7SzwVRq6NCy4k8CbZ4/VTFaWnpkncTAz+C8ztkEQQSYTW7mDLLenJ9qpkhXgoTA==
Expand All @@ -1420,6 +1420,21 @@
update-notifier "^3.0.0"
yargs "^13.1.0"

"@dhis2/cli-helpers-engine@^3.0.0":
version "3.0.0"
resolved "https://registry.yarnpkg.com/@dhis2/cli-helpers-engine/-/cli-helpers-engine-3.0.0.tgz#dacddea16de7e5e60280aefbee2e5661795b78b3"
integrity sha512-e8cZFFsunQp56iLx1FKBWGZ1tmWOjdbqJaBwOnzvsKPyYopV9RzNcPm+HIBwfnCjHBWoWTf6ijaf3xVnimZC2w==
dependencies:
chalk "^3.0.0"
cross-spawn "^7.0.3"
find-up "^5.0.0"
fs-extra "^8.0.1"
inquirer "^7.3.3"
request "^2.88.0"
tar "^4.4.8"
update-notifier "^3.0.0"
yargs "^13.1.0"

"@dhis2/cli-helpers-template@^1.0.2":
version "1.0.2"
resolved "https://registry.yarnpkg.com/@dhis2/cli-helpers-template/-/cli-helpers-template-1.0.2.tgz#537904af58f0965e67a5b490fb2737c148ff24d0"
Expand Down Expand Up @@ -1468,10 +1483,10 @@
live-server "^1.2.1"
match-all "^1.2.5"

"@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 @@ -1483,59 +1498,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.9.0":
version "6.9.0"
resolved "https://registry.yarnpkg.com/@dhis2/ui-constants/-/ui-constants-6.9.0.tgz#dd1671309bd257fee32aa2721da35504566e2a65"
integrity sha512-3OGTBUdFrCQ53SpHSwM6n5D2W8fWLnE6msHFCf/0EXoyzFZMHacBlNmRnuPpLu6nrkDoPWso1XPA68dR0sZ4zw==
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.9.0":
version "6.9.0"
resolved "https://registry.yarnpkg.com/@dhis2/ui-core/-/ui-core-6.9.0.tgz#b10de1b03d50f499e654cb9291c14fb6fc1de19c"
integrity sha512-be9aRu2FPStmGnrfbTxqUSrkYpow5JML5smtFjIvNkXTV3rt4bCPSRBwwO1248jA4XJzpT/LQUcf55JL5VcqYA==
dependencies:
"@dhis2/prop-types" "^1.6.4"
"@popperjs/core" "^2.5.3"
classnames "^2.2.6"
react-popper "^2.2.3"
"@popperjs/core" "^2.9.2"
classnames "^2.3.1"
react-popper "^2.2.5"
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.9.0":
version "6.9.0"
resolved "https://registry.yarnpkg.com/@dhis2/ui-forms/-/ui-forms-6.9.0.tgz#807fc7f69781d3ca7a36ef91b691ce31a7ec054f"
integrity sha512-S0wn0M1RMtNaedB6Jp3rDXQvNMKHbHpYqZFnZsDVmdbvPiPdJR80Dfac6JvYPTHEUgX+mC14ITcKsfosdyVn4g==
dependencies:
"@dhis2/prop-types" "^1.6.4"
classnames "^2.2.6"
final-form "^4.20.1"
react-final-form "^6.5.1"
classnames "^2.3.1"
final-form "^4.20.2"
react-final-form "^6.5.3"

"@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.9.0":
version "6.9.0"
resolved "https://registry.yarnpkg.com/@dhis2/ui-icons/-/ui-icons-6.9.0.tgz#aa48db2bcc8150bd837a08af82a782b9c589dc17"
integrity sha512-V9TepT8Tk/jxefMcJB5To7icbBNkKwoBc+9WaJEQCNgNxtcMTxdnzIXc0IQgWJvUBSwyKTc7UEdTJ8E8eHilzA==
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.9.0":
version "6.9.0"
resolved "https://registry.yarnpkg.com/@dhis2/ui-widgets/-/ui-widgets-6.9.0.tgz#dfcbf5bbefca3eca640a565a00ea7289e5b0a7e5"
integrity sha512-vScix38nLJTyA59Mra1e27YJeqJyJxHWtMhMjUZvrHZQ7MMhEAzKRY2EKlPMMuYr+ycJxYQgmtiC2TA0o9HHtA==
dependencies:
"@dhis2/prop-types" "^1.6.4"
classnames "^2.2.6"
classnames "^2.3.1"

"@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":
version "6.9.0"
resolved "https://registry.yarnpkg.com/@dhis2/ui/-/ui-6.9.0.tgz#e9bc2aa861fdca1ca2a6ecc5ab896970a4552f10"
integrity sha512-kzmT3jHvJ9+jky7gl8spFf9ifhbyyo29eriap+xm+eWyKadmK2olkCv6yudQzec1oJwqF+nfVw1nfnUmiEvWPw==
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.9.0"
"@dhis2/ui-core" "6.9.0"
"@dhis2/ui-forms" "6.9.0"
"@dhis2/ui-icons" "6.9.0"
"@dhis2/ui-widgets" "6.9.0"

"@eslint/eslintrc@^0.3.0":
version "0.3.0"
Expand Down Expand Up @@ -1971,10 +1986,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.9.2":
version "2.9.2"
resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.9.2.tgz#adea7b6953cbb34651766b0548468e743c6a2353"
integrity sha512-VZMYa7+fXHdwIq1TDhSXoVmSPEGM/aa+6Aiq3nVVJ9bXr24zScr+NlKFKC3iPljA7ho/GAZr+d2jOf5GIRC30Q==

"@rollup/plugin-node-resolve@^7.1.1":
version "7.1.3"
Expand Down Expand Up @@ -4306,6 +4321,11 @@ classnames@^2.2.6:
resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.2.6.tgz#43935bffdd291f326dad0a205309b38d00f650ce"
integrity sha512-JR/iSQOSt+LQIWwrwEzJ9uk0xfN3mTVYMwt1Ir5mUcSN6pU+V4zQFFaJsclJbPuAUQH+yfWef6tm7l1quW3C8Q==

classnames@^2.3.1:
version "2.3.1"
resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.3.1.tgz#dfcfa3891e306ec1dad105d0e88f4417b8535e8e"
integrity sha512-OlQdbZ7gLfGarSqxesMesDa5uz7KFbID8Kpq/SxIoNGDqY8lSYs0D+hhtBXhcdB3rcbXArFr7vlHheLk1voeNA==

clean-css@^4.2.3:
version "4.2.3"
resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-4.2.3.tgz#507b5de7d97b48ee53d84adb0160ff6216380f78"
Expand Down Expand Up @@ -6526,10 +6546,10 @@ fill-range@^7.0.1:
dependencies:
to-regex-range "^5.0.1"

final-form@^4.20.1:
version "4.20.1"
resolved "https://registry.yarnpkg.com/final-form/-/final-form-4.20.1.tgz#525a7f7f27f55c28d8994b157b24d6104fc560e9"
integrity sha512-IIsOK3JRxJrN72OBj7vFWZxtGt3xc1bYwJVPchjVWmDol9DlzMSAOPB+vwe75TUYsw1JaH0fTQnIgwSQZQ9Acg==
final-form@^4.20.2:
version "4.20.2"
resolved "https://registry.yarnpkg.com/final-form/-/final-form-4.20.2.tgz#c820b37d7ebb73d71169480256a36c7e6e6c9155"
integrity sha512-5i0IxqwjjPG1nUNCjWhqPCvQJJ2R+QwTwaAnjPmFnLbyjIHWuBPU8u+Ps4G3TcX2Sjno+O5xCZJzYcMJEzzfCQ==
dependencies:
"@babel/runtime" "^7.10.0"

Expand Down Expand Up @@ -10098,7 +10118,7 @@ mkdirp@^1.0.3, mkdirp@^1.0.4:
resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==

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 Expand Up @@ -12097,10 +12117,10 @@ react-fast-compare@^3.0.1:
resolved "https://registry.yarnpkg.com/react-fast-compare/-/react-fast-compare-3.2.0.tgz#641a9da81b6a6320f270e89724fb45a0b39e43bb"
integrity sha512-rtGImPZ0YyLrscKI9xTpV8psd6I8VAtjKCzQDlzyDvqJA8XOW78TXYQwNRNd8g8JZnDu8q9Fu/1v4HPAVwVdHA==

react-final-form@^6.5.1:
version "6.5.2"
resolved "https://registry.yarnpkg.com/react-final-form/-/react-final-form-6.5.2.tgz#d04d1eb7d92eabc6f6c35206bb0eebfc4bfd924b"
integrity sha512-c5l45FYOoxtfpvsvMFh3w2WW8KNxbuebBUrM16rUrooQkewTs0Zahmv0TuKFX5jsC9BKn5Fo84j3ZVXQdURS4w==
react-final-form@^6.5.3:
version "6.5.3"
resolved "https://registry.yarnpkg.com/react-final-form/-/react-final-form-6.5.3.tgz#b60955837fe9d777456ae9d9c48e3e2f21547d29"
integrity sha512-FCs6GC0AMWJl2p6YX7kM+a0AvuSLAZUgbVNtRBskOs4g984t/It0qGtx51O+9vgqnqk6JyoxmIzxKMq+7ch/vg==
dependencies:
"@babel/runtime" "^7.12.1"

Expand All @@ -12114,10 +12134,10 @@ react-is@^17.0.1:
resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.1.tgz#5b3531bd76a645a4c9fb6e693ed36419e3301339"
integrity sha512-NAnt2iGDXohE5LI7uBnLnqvLQMtzhkiAOLXTmv+qnF9Ky7xAPcX8Up/xWIhxvLVGJvuLiNc4xQLtuqDRzb4fSA==

react-popper@^2.2.3:
version "2.2.4"
resolved "https://registry.yarnpkg.com/react-popper/-/react-popper-2.2.4.tgz#d2ad3d2474ac9f1abf93df3099d408e5aa6a2e22"
integrity sha512-NacOu4zWupdQjVXq02XpTD3yFPSfg5a7fex0wa3uGKVkFK7UN6LvVxgcb+xYr56UCuWiNPMH20tntdVdJRwYew==
react-popper@^2.2.5:
version "2.2.5"
resolved "https://registry.yarnpkg.com/react-popper/-/react-popper-2.2.5.tgz#1214ef3cec86330a171671a4fbcbeeb65ee58e96"
integrity sha512-kxGkS80eQGtLl18+uig1UIf9MKixFSyPxglsgLBxlYnyDf65BiY9B3nZSc6C9XUNDgStROB0fMQlTEz1KxGddw==
dependencies:
react-fast-compare "^3.0.1"
warning "^4.0.2"
Expand Down