Skip to content

Commit

Permalink
fix: upgrade d2-ui dependencies for latest translations [v32] [DHIS2-…
Browse files Browse the repository at this point in the history 
…8892] (#1061)

* fix: upgrade d2-ui dependencies with new translations

* fix: upgrade analytics
  • Loading branch information
@jenniferarnesen
jenniferarnesen authored Jun 8, 2020
1 parent ff4839e commit 6bc2f8c
Show file tree
Hide file tree
Showing 3 changed files with 100 additions and 52 deletions.
8 changes: 4 additions & 4 deletions packages/app/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@
"webpack-bundle-analyzer": "^3.0.3"
},
"dependencies": {
"@dhis2/analytics": "~2.4.15",
"@dhis2/analytics": "~2.4.16",
"@dhis2/d2-i18n": "^1.0.6",
"@dhis2/d2-ui-core": "^7.0.3",
"@dhis2/d2-ui-file-menu": "^7.0.3",
"@dhis2/d2-ui-interpretations": "^7.0.3",
"@dhis2/d2-ui-core": "^7.0.4",
"@dhis2/d2-ui-file-menu": "^7.0.4",
"@dhis2/d2-ui-interpretations": "^7.0.4",
"@dhis2/data-visualizer-plugin": "^33.1.13",
"@dhis2/ui": "^1.0.0-beta.11",
"@material-ui/core": "^3.1.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/plugin/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"main": "./build/index.js",
"license": "BSD-3-Clause",
"dependencies": {
"@dhis2/analytics": "~2.4.15",
"@dhis2/analytics": "~2.4.16",
"@material-ui/core": "^3.1.2",
"d2-charts-api": "^32.0.9",
"lodash-es": "^4.17.11",
Expand Down
142 changes: 95 additions & 47 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,17 +76,17 @@
js-tokens "^4.0.0"

"@babel/runtime-corejs2@^7.4.2":
version "7.9.6"
resolved "https://registry.yarnpkg.com/@babel/runtime-corejs2/-/runtime-corejs2-7.9.6.tgz#acd5d6351384cc2828dc211aa5426a90476bf4a8"
integrity sha512-TcdM3xc7weMrwTawuG3BTjtVE3mQLXUPQ9CxTbSKOrhn3QAcqCJ2fz+IIv25wztzUnhNZat7hr655YJa61F3zg==
version "7.10.2"
resolved "https://registry.yarnpkg.com/@babel/runtime-corejs2/-/runtime-corejs2-7.10.2.tgz#532f20b839684615f97e9f700f630e995efed426"
integrity sha512-ZLwsFnNm3WpIARU1aLFtufjMHsmEnc8TjtrfAjmbgMbeoyR+LuQoyESoNdTfeDhL6IdY12SpeycXMgSgl8XGXA==
dependencies:
core-js "^2.6.5"
regenerator-runtime "^0.13.4"

"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.2.0":
version "7.9.6"
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.9.6.tgz#a9102eb5cadedf3f31d08a9ecf294af7827ea29f"
integrity sha512-64AF1xY3OAkFHqOb9s4jpgk1Mm5vDZ4L3acHvAml+53nO1XbXLuDodsVpO4OIUsmemlUHMxNdYMNJmsvOwLrvQ==
version "7.10.2"
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.10.2.tgz#d103f21f2602497d38348a32e008637d506db839"
integrity sha512-6sF3uQw2ivImfVIl62RZ7MXhO2tap69WeWK57vAaimT6AZbE4FbqjdEJIN1UqoD6wI6B+1n9UiagafH1sxjOtg==
dependencies:
regenerator-runtime "^0.13.4"

Expand Down Expand Up @@ -185,6 +185,23 @@
react-beautiful-dnd "^10.1.1"
styled-jsx "^3.2.1"

"@dhis2/analytics@~2.4.16":
version "2.4.16"
resolved "https://registry.yarnpkg.com/@dhis2/analytics/-/analytics-2.4.16.tgz#091481981e44e2cf5e631871a8787f57e4245549"
integrity sha512-V6b2IRy4sFGfIESOkFhBdW5BqXrKCJNT/R40fahjM2wfRaCuHdp8crGWwqV5dEJT0CxzNv6w3fSx04dZ069Row==
dependencies:
"@dhis2/d2-ui-org-unit-dialog" "^7.0.4"
"@dhis2/ui-core" "^3.4.0"
"@material-ui/core" "^3.9.3"
"@material-ui/icons" "^3.0.2"
classnames "^2.2.6"
d2-utilizr "^0.2.16"
d3-color "^1.2.3"
highcharts "^7.1.2"
lodash "^4.17.13"
react-beautiful-dnd "^10.1.1"
styled-jsx "^3.2.1"

"@dhis2/d2-i18n-extract@^1.0.8":
version "1.0.8"
resolved "https://registry.yarnpkg.com/@dhis2/d2-i18n-extract/-/d2-i18n-extract-1.0.8.tgz#9d98690d522a51895c8ef3fe7136f026b0f8dacd"
Expand Down Expand Up @@ -213,7 +230,7 @@
i18next "^10.3"
moment "^2.24.0"

"@dhis2/[email protected]", "@dhis2/d2-ui-core@^7.0.3":
"@dhis2/[email protected]":
version "7.0.3"
resolved "https://registry.yarnpkg.com/@dhis2/d2-ui-core/-/d2-ui-core-7.0.3.tgz#75cf0bc7dfadfa6b000bcf61b17fb76f5efb7b1d"
integrity sha512-l2uFWjK8Te473B2p6wxaVi+gniN6bMGAMjX6t/qJKQtWMVK9wfF/tZmwWvypP8UlShMvn+MHSdLOZxQF2bINfg==
Expand All @@ -224,12 +241,23 @@
material-ui "^0.20.0"
rxjs "^5.5.7"

"@dhis2/[email protected]":
version "7.0.3"
resolved "https://registry.yarnpkg.com/@dhis2/d2-ui-favorites-dialog/-/d2-ui-favorites-dialog-7.0.3.tgz#561f3e9370c89da7e33ccb26850a7ace117a40e4"
integrity sha512-ptBJrhg4HN5/m/EFtV6VAcJHQyYUCB4OyIsy885p5QghZmL3mnRPLd5Vp9gRlqsPZn3Of1tjbWNQR7sJ4TDuQw==
"@dhis2/[email protected]", "@dhis2/d2-ui-core@^7.0.4":
version "7.0.4"
resolved "https://registry.yarnpkg.com/@dhis2/d2-ui-core/-/d2-ui-core-7.0.4.tgz#18c9858ac5adda54593d3f575128eb8b9df6da68"
integrity sha512-yTBhJ53xvAGBh49/HDPLmAH2LlWkGtGj8RfhEuN64Z8GsKAo1YS6tAmB79srMnUF91dCFaqAtLx80NqAZ4fHCQ==
dependencies:
babel-runtime "^6.26.0"
d2 "~31.7"
lodash "^4.17.10"
material-ui "^0.20.0"
rxjs "^5.5.7"

"@dhis2/[email protected]":
version "7.0.4"
resolved "https://registry.yarnpkg.com/@dhis2/d2-ui-favorites-dialog/-/d2-ui-favorites-dialog-7.0.4.tgz#9a138d436e1ee1f1aadce00ffc781a18da3c9b14"
integrity sha512-/e9ppzRt2uLgQjivCynJhMYqtekbVoXVUN4k9WwJBTEjHnhA8v5Rxare3WbHoOGB2E47bHXRLDC/jReuiYN2EA==
dependencies:
"@dhis2/d2-ui-sharing-dialog" "7.0.3"
"@dhis2/d2-ui-sharing-dialog" "7.0.4"
"@material-ui/core" "^3.3.1"
"@material-ui/icons" "^3.0.1"
babel-runtime "^6.26.0"
Expand All @@ -239,26 +267,26 @@
redux-logger "^3.0.6"
redux-thunk "^2.2.0"

"@dhis2/d2-ui-file-menu@^7.0.3":
version "7.0.3"
resolved "https://registry.yarnpkg.com/@dhis2/d2-ui-file-menu/-/d2-ui-file-menu-7.0.3.tgz#4c843dcf7b5201d3ba61d1efdde6eb95a66afd93"
integrity sha512-2KGI4b6MWsDXS0MeL4b77p4nXZsckkCS+nPYxm3NSoI32bxCFTtJ+2f3KOpFdKOO1yK3NGS7+hVpqirpdtpjzg==
"@dhis2/d2-ui-file-menu@^7.0.4":
version "7.0.4"
resolved "https://registry.yarnpkg.com/@dhis2/d2-ui-file-menu/-/d2-ui-file-menu-7.0.4.tgz#d343655d351ba9843a6bfd257ef7b785ffbccd64"
integrity sha512-JOnfJ+7pzBRrdlp8Usizb7yjNVrsd3z2miLdl/YQ/q7DE0xFOkethnt3A5dJYqzivbZq49kpKy+oC2FCTAV91Q==
dependencies:
"@dhis2/d2-ui-favorites-dialog" "7.0.3"
"@dhis2/d2-ui-sharing-dialog" "7.0.3"
"@dhis2/d2-ui-translation-dialog" "7.0.3"
"@dhis2/d2-ui-favorites-dialog" "7.0.4"
"@dhis2/d2-ui-sharing-dialog" "7.0.4"
"@dhis2/d2-ui-translation-dialog" "7.0.4"
"@material-ui/core" "^3.3.1"
"@material-ui/icons" "^3.0.1"
prop-types "^15.6.0"

"@dhis2/d2-ui-interpretations@^7.0.3":
version "7.0.3"
resolved "https://registry.yarnpkg.com/@dhis2/d2-ui-interpretations/-/d2-ui-interpretations-7.0.3.tgz#b8d2099315e4140354193d18dda0ab7848385eb7"
integrity sha512-KiHb/Q5WKM2YuLH0fLQW3PpiX2rx3quGpTPoBHIEWruihZvo7cPqkZNTEn4YHR+8YmQ+Dcbeqh3n6NIjzkDe3Q==
"@dhis2/d2-ui-interpretations@^7.0.4":
version "7.0.4"
resolved "https://registry.yarnpkg.com/@dhis2/d2-ui-interpretations/-/d2-ui-interpretations-7.0.4.tgz#81412a3d335dce98cf017100bb4de8ebb62d3838"
integrity sha512-0J3VNiUa0g4ZZ8RIQA2KBG0p5rEl+cfk6P3Usv8i/Qy6RlY71LTrQeAvueDmC8ocJe8ktfK8lojho/fqIequeA==
dependencies:
"@dhis2/d2-ui-mentions-wrapper" "7.0.3"
"@dhis2/d2-ui-rich-text" "7.0.3"
"@dhis2/d2-ui-sharing-dialog" "7.0.3"
"@dhis2/d2-ui-mentions-wrapper" "7.0.4"
"@dhis2/d2-ui-rich-text" "7.0.4"
"@dhis2/d2-ui-sharing-dialog" "7.0.4"
"@material-ui/core" "^3.3.1"
"@material-ui/icons" "^3.0.1"
babel-runtime "^6.26.0"
Expand All @@ -268,10 +296,10 @@
prop-types "^15.5.10"
react-portal "^4.1.5"

"@dhis2/[email protected].3":
version "7.0.3"
resolved "https://registry.yarnpkg.com/@dhis2/d2-ui-mentions-wrapper/-/d2-ui-mentions-wrapper-7.0.3.tgz#ea67c6a920cf015542b6acb50a1441142eb47b7f"
integrity sha512-hFxUYnub3p4DjsREKv4gZgrSi/NCfOOoIQT+DJOOj9ZwhVCGZPnOLgXamwdT2kBar9yFXy7AHppBYqwBGBKokQ==
"@dhis2/[email protected].4":
version "7.0.4"
resolved "https://registry.yarnpkg.com/@dhis2/d2-ui-mentions-wrapper/-/d2-ui-mentions-wrapper-7.0.4.tgz#673fa295409ad7bfd3bfc833664a9f27ae771896"
integrity sha512-7ErRysQWneKNIF39V+33FLR59wyyhKgcwXWpYrXoSmli1a/o6LCBBzft4zsECv+0fxc54ijjyKQBvYP3WxSqlg==
dependencies:
"@material-ui/core" "^3.3.1"
lodash "^4.17.10"
Expand All @@ -287,6 +315,16 @@
"@material-ui/icons" "^3.0.1"
prop-types "^15.5.10"

"@dhis2/d2-ui-org-unit-dialog@^7.0.4":
version "7.0.4"
resolved "https://registry.yarnpkg.com/@dhis2/d2-ui-org-unit-dialog/-/d2-ui-org-unit-dialog-7.0.4.tgz#6a358a2e9c37a16d2d3c5ec082955220e7b61050"
integrity sha512-IkxJn3pbkxCEmKaa2QWjlXEwAQT/Kb5d+YzZyW3T3nNABSiJvxcOcwsR3pI7oAiBER0Cjpw0/O3rawuiyBWtGw==
dependencies:
"@dhis2/d2-ui-org-unit-tree" "7.0.4"
"@material-ui/core" "^3.3.1"
"@material-ui/icons" "^3.0.1"
prop-types "^15.5.10"

"@dhis2/[email protected]":
version "7.0.3"
resolved "https://registry.yarnpkg.com/@dhis2/d2-ui-org-unit-tree/-/d2-ui-org-unit-tree-7.0.3.tgz#df16c7591a2c6b0dae22971604ffc653118b87ae"
Expand All @@ -297,21 +335,31 @@
babel-runtime "^6.26.0"
prop-types "^15.5.10"

"@dhis2/[email protected]":
version "7.0.3"
resolved "https://registry.yarnpkg.com/@dhis2/d2-ui-rich-text/-/d2-ui-rich-text-7.0.3.tgz#26c3e4ecf5dddfb3445476c56c87a62448ce229d"
integrity sha512-AiX6yf+AsYzSXjyXtuk7QtS/fx18vKcGvgFRaJvf7QV8HFxgkE2S8Owayj5mnTUFX6KFndTqjiXmsxn9jlKvhw==
"@dhis2/[email protected]":
version "7.0.4"
resolved "https://registry.yarnpkg.com/@dhis2/d2-ui-org-unit-tree/-/d2-ui-org-unit-tree-7.0.4.tgz#97321a7e6bdf882f1c305d0b7dbda60cf7363ebc"
integrity sha512-qZN4tgigNYDEe9Qvb13zjfY0w2c1DzZ+TpWND4LA1ozNqI/EAAHzxF8822rWbgsc2SKeCVwxifjjNWe+2o1XBg==
dependencies:
"@dhis2/d2-ui-core" "7.0.4"
"@material-ui/core" "^3.3.1"
babel-runtime "^6.26.0"
prop-types "^15.5.10"

"@dhis2/[email protected]":
version "7.0.4"
resolved "https://registry.yarnpkg.com/@dhis2/d2-ui-rich-text/-/d2-ui-rich-text-7.0.4.tgz#28d950932deed33338eb0edc5e0c16e26ec90eef"
integrity sha512-yIiSopC2T//JQg3TplTFZTuWEfgdHmJI5Iw469oB0GpuQRTNkYhxa1J0K2pjLCgRSvGjH76q47ivAQx/Ayso0g==
dependencies:
babel-runtime "^6.26.0"
markdown-it "^8.4.2"
prop-types "^15.6.2"

"@dhis2/[email protected].3":
version "7.0.3"
resolved "https://registry.yarnpkg.com/@dhis2/d2-ui-sharing-dialog/-/d2-ui-sharing-dialog-7.0.3.tgz#585b6e20ce991517b83a4a30e770f7f74b29de8e"
integrity sha512-Q33Rp/csZPSyEeVj7ZjN9+GrPow1D4ghf23kFYJCMvvvXUhOjkImj49XTxfxEMQwPZ+BSmNTDJeQQzYy2jV/RA==
"@dhis2/[email protected].4":
version "7.0.4"
resolved "https://registry.yarnpkg.com/@dhis2/d2-ui-sharing-dialog/-/d2-ui-sharing-dialog-7.0.4.tgz#b867e940b27f300a7c3dce4ec12e9fcdb29ca818"
integrity sha512-7A+yhPprKq/KSNoe58HBLZyMHq6YhpoalJi1/jQ+4Pcb5IS25r7cKwoeYXtX5W8NmptiVOCcVfC4j4ErkhKp8Q==
dependencies:
"@dhis2/d2-ui-core" "7.0.3"
"@dhis2/d2-ui-core" "7.0.4"
"@material-ui/core" "^3.3.1"
"@material-ui/icons" "^3.0.1"
babel-runtime "^6.26.0"
Expand All @@ -320,12 +368,12 @@
recompose "^0.26.0"
rxjs "^5.5.7"

"@dhis2/[email protected].3":
version "7.0.3"
resolved "https://registry.yarnpkg.com/@dhis2/d2-ui-translation-dialog/-/d2-ui-translation-dialog-7.0.3.tgz#d018861b00c72f6e4fa759c6579385f300c9873c"
integrity sha512-da6Y6HUZI5O9A8P2rN2Kp5ESl0feqE/n5HNYk2WsyLoAg18LicYw/lBrOOfziFl2DPy44a741pEyy5U8J0PXMQ==
"@dhis2/[email protected].4":
version "7.0.4"
resolved "https://registry.yarnpkg.com/@dhis2/d2-ui-translation-dialog/-/d2-ui-translation-dialog-7.0.4.tgz#cbdf3d5c6a22edda89560f7fbbe17f387a353699"
integrity sha512-I+rqNbrAXWxtaKkFlH1vhqUUc4HXYPP2a+k0YtLJ56r6Ew3dcVkkz3ypIbAtzFe8x2xdTBmvC4IiSPAh/6c4Rw==
dependencies:
"@dhis2/d2-ui-core" "7.0.3"
"@dhis2/d2-ui-core" "7.0.4"
"@material-ui/core" "^3.3.1"
"@material-ui/icons" "^3.0.1"
babel-runtime "^6.26.0"
Expand Down Expand Up @@ -2936,9 +2984,9 @@ braces@^2.3.1, braces@^2.3.2:
to-regex "^3.0.1"

brcast@^3.0.1:
version "3.0.1"
resolved "https://registry.yarnpkg.com/brcast/-/brcast-3.0.1.tgz#6256a8349b20de9eed44257a9b24d71493cd48dd"
integrity sha512-eI3yqf9YEqyGl9PCNTR46MGvDylGtaHjalcz6Q3fAPnP/PhpKkkve52vFdfGpwp4VUvK6LUr4TQN+2stCrEwTg==
version "3.0.2"
resolved "https://registry.yarnpkg.com/brcast/-/brcast-3.0.2.tgz#55c41a7a077ff4e7ac784c2060e544d4c39ad477"
integrity sha512-f5XwwFCCuvgqP2nMH/hJ74FqnGmb4X3D+NC//HphxJzzhsZvSZa+Hk/syB7j3ZHpPDLMoYU8oBgviRWfNvEfKA==

brorand@^1.0.1:
version "1.1.0"
Expand Down

0 comments on commit 6bc2f8c

Please sign in to comment.