Skip to content

Commit

Permalink
fix: upgrade analytics so no ui-core mismatch (#564)
Browse files Browse the repository at this point in the history 
This upgrade should resolve an issue where an older version of @dhis2/ui-core that didn't have all the necessary exports, was brought into the build, causing the dashboard to crash.
  • Loading branch information
@jenniferarnesen
jenniferarnesen authored Feb 18, 2020
1 parent cd61791 commit f154dbb
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 131 deletions.
4 changes: 2 additions & 2 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"private": true,
"license": "BSD-3-Clause",
"dependencies": {
"@dhis2/analytics": "^4.0.0",
"@dhis2/analytics": "^4.0.2",
"@dhis2/app-runtime": "^2.0.3",
"@dhis2/d2-i18n": "^1.0.6",
"@dhis2/d2-ui-core": "^6.0.1",
Expand All @@ -14,7 +14,7 @@
"@dhis2/d2-ui-rich-text": "^6.0.1",
"@dhis2/d2-ui-sharing-dialog": "^6.0.1",
"@dhis2/d2-ui-translation-dialog": "^6.0.1",
"@dhis2/data-visualizer-plugin": "^34.0.0",
"@dhis2/data-visualizer-plugin": "^34.2.1",
"@dhis2/prop-types": "^1.2.1",
"@dhis2/ui-core": "^4.9.1",
"@dhis2/ui-widgets": "^2.0.5",
Expand Down
159 changes: 30 additions & 129 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1154,53 +1154,14 @@
resolved "https://registry.yarnpkg.com/@csstools/convert-colors/-/convert-colors-1.4.0.tgz#ad495dc41b12e75d588c6db8b9834f08fa131eb7"
integrity sha512-5a6wqoJV/xEdbRNKVo6I4hO3VjyDq//8q2f9I6PBAvMesJHFauXDorcNCsr9RzvsZnaWi5NYCcfyqP1QeFHFbw==

"@dhis2/analytics@^2.1.0":
version "2.3.4"
resolved "https://registry.yarnpkg.com/@dhis2/analytics/-/analytics-2.3.4.tgz#7132738b957f7342423f039f31b871465c9f4966"
integrity sha512-eLbCGtRRMUWZpvjlAAAfj0zr32J9CpS3oE3yXJlRVcPJwIT7S3xFAkjcgRwazchr5pZnKR/TBwoXmm84mF18zQ==
dependencies:
"@dhis2/d2-i18n" "^1.0.4"
"@dhis2/d2-ui-org-unit-dialog" "^6.1.0"
"@dhis2/d2-ui-period-selector-dialog" "^6.2.0"
"@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.11"
react-beautiful-dnd "^10.1.1"
styled-jsx "^3.2.1"

"@dhis2/analytics@^3.2.0":
version "3.2.0"
resolved "https://registry.yarnpkg.com/@dhis2/analytics/-/analytics-3.2.0.tgz#f0566c629f4c50272a4df0332fd26eda1e738ba4"
integrity sha512-qt6Qm6jZMx+kDY1/kRJ9SGL5U5d32GXfWw7m3GF+I7t0LOgV0k39MmG/c6+d/VLfga/ZgYCKJ8vlPlhy3V8G0Q==
dependencies:
"@dhis2/d2-i18n" "^1.0.4"
"@dhis2/d2-ui-org-unit-dialog" "^6.3.2"
"@dhis2/d2-ui-period-selector-dialog" "^6.3.2"
"@dhis2/ui-core" "^4.7.1"
"@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.2.1"
lodash "^4.17.13"
react-beautiful-dnd "^10.1.1"
resize-observer-polyfill "^1.5.1"
styled-jsx "^3.2.1"

"@dhis2/analytics@^4.0.0":
version "4.0.0"
resolved "https://registry.yarnpkg.com/@dhis2/analytics/-/analytics-4.0.0.tgz#3f3ff2f32640033a21acb62f1e6b27fbcec3c245"
integrity sha512-4b5lXGLpHYGcKhUl4wKli5QYkAvxDOzCZCGn5moEoYjm3nK1JvSO1ZG1Ujp8nLVkQMe5Z3/YZHdaPXrrYZGOcw==
"@dhis2/analytics@^4.0.1", "@dhis2/analytics@^4.0.2":
version "4.0.2"
resolved "https://registry.yarnpkg.com/@dhis2/analytics/-/analytics-4.0.2.tgz#fa874ce93c2499c6466b746a2ee4e9e75a61ebd8"
integrity sha512-cJVsxPt5rWDv+TOpP6qNcUxJe4my+e+1/NqKj/jm+rxF5XvlK1RovCNFlLvoIVekgw6acI4y6+KYIGznC65d5w==
dependencies:
"@dhis2/d2-i18n" "^1.0.4"
"@dhis2/d2-ui-org-unit-dialog" "^6.3.2"
"@dhis2/d2-ui-period-selector-dialog" "^6.3.2"
"@dhis2/d2-ui-org-unit-dialog" "^6.5.6"
"@dhis2/d2-ui-period-selector-dialog" "^6.5.7"
"@dhis2/ui-core" "^4.9.1"
"@material-ui/core" "^3.9.3"
"@material-ui/icons" "^3.0.2"
Expand Down Expand Up @@ -1315,10 +1276,10 @@
lodash "^4.17.10"
material-ui "^0.20.0"

"@dhis2/d2-ui-core@6.5.0":
version "6.5.0"
resolved "https://registry.yarnpkg.com/@dhis2/d2-ui-core/-/d2-ui-core-6.5.0.tgz#fe83f664343f631525fa8c6046bcdfcd640ac4ca"
integrity sha512-t/BlaqJyyAPf94WUHrbLPuY1sWcB7DYUxM5H7o4yW3LySNHFAwXyQrRw2W38c5aUB1itFb/XDVA51QttC8bvYA==
"@dhis2/d2-ui-core@6.5.7":
version "6.5.7"
resolved "https://registry.yarnpkg.com/@dhis2/d2-ui-core/-/d2-ui-core-6.5.7.tgz#16e49bfd889e13589ddf11c2fe3206926f2da85a"
integrity sha512-R+2KAiPzrNW9poBgqboIlpjfqkT8jddjobtNizLAIqAmkD235/xCexj0g4cIOFgfVjk80UHKquJ658qVPHhx+w==
dependencies:
babel-runtime "^6.26.0"
d2 "~31.7"
Expand Down Expand Up @@ -1355,66 +1316,33 @@
lodash "^4.17.10"
prop-types "^15.6.2"

"@dhis2/d2-ui-org-unit-dialog@^6.1.0":
version "6.1.0"
resolved "https://registry.yarnpkg.com/@dhis2/d2-ui-org-unit-dialog/-/d2-ui-org-unit-dialog-6.1.0.tgz#8f941129450097ba42fec19e2d65108368ccca49"
integrity sha512-/Rhxr22NU2l4Dto2dsn1+hfvH5z7/ORjp1bHi0J8haobODbWzW0xCq63xwsmb3qjyuG/cfY7cwVqpH7osD4Awg==
"@dhis2/d2-ui-org-unit-dialog@^6.5.6":
version "6.5.7"
resolved "https://registry.yarnpkg.com/@dhis2/d2-ui-org-unit-dialog/-/d2-ui-org-unit-dialog-6.5.7.tgz#86b5f1f8a3aea73e759a7f583a388a3866dc107f"
integrity sha512-u8KlnolvyKKvkoB1haJDMOSCa4V1Fleqa75K1M7b2veBfQ1u4BFOdEWOreoaYeHFJ76KFRZwQkkLPkbb6yplxw==
dependencies:
"@dhis2/d2-i18n" "^1.0.3"
"@dhis2/d2-ui-org-unit-tree" "6.1.0"
"@dhis2/d2-ui-org-unit-tree" "6.5.7"
"@material-ui/core" "^3.3.1"
"@material-ui/icons" "^3.0.1"
prop-types "^15.5.10"

"@dhis2/d2-ui-org-unit-dialog@^6.3.2":
version "6.5.0"
resolved "https://registry.yarnpkg.com/@dhis2/d2-ui-org-unit-dialog/-/d2-ui-org-unit-dialog-6.5.0.tgz#e0027fbb0c7fb977061b0ea9a55d454766bbc8bf"
integrity sha512-vrkpiS3dkizKu4dWXs9xmZboi9wrlI34nYjSqqZioGI069rUaei7CR/Fks92efIYu66vlzHV6JSCckV+TAVtXw==
"@dhis2/d2-ui-org-unit-tree@6.5.7":
version "6.5.7"
resolved "https://registry.yarnpkg.com/@dhis2/d2-ui-org-unit-tree/-/d2-ui-org-unit-tree-6.5.7.tgz#c012cca9b84b953e9ce6b0304e7a6d93c82873de"
integrity sha512-n7tKIkJBOqPLNLFcpWJzHqj/f7bZjokzomShyKnZ5JNzBBMYAkYYo+bMZcd79xZYkSyzXgTGTVFq8lBZWM7udA==
dependencies:
"@dhis2/d2-i18n" "^1.0.3"
"@dhis2/d2-ui-org-unit-tree" "6.5.0"
"@material-ui/core" "^3.3.1"
"@material-ui/icons" "^3.0.1"
prop-types "^15.5.10"

"@dhis2/d2-ui-org-unit-tree@6.1.0":
version "6.1.0"
resolved "https://registry.yarnpkg.com/@dhis2/d2-ui-org-unit-tree/-/d2-ui-org-unit-tree-6.1.0.tgz#6604cf93c9d11395e157bdee8ca44133e36673df"
integrity sha512-l4OnCkhzF8V/4GhS5gbFdsFyMBjmFyt2ECfbootafUh0jegMRE4vWLFdk88h6X3jwcRSD6d/gjnkB8Li1rGikQ==
dependencies:
"@dhis2/d2-ui-core" "6.1.0"
"@material-ui/core" "^3.3.1"
babel-runtime "^6.26.0"
prop-types "^15.5.10"

"@dhis2/d2-ui-org-unit-tree@6.5.0":
version "6.5.0"
resolved "https://registry.yarnpkg.com/@dhis2/d2-ui-org-unit-tree/-/d2-ui-org-unit-tree-6.5.0.tgz#e16409ec3ae454132fed09fa0a13ac25b03ca986"
integrity sha512-D/nPBSisETN0qf120/30g7NYmAM8iFDKkSOSABdYS9hL5yZEF8zaReezdJnV36gTxDZcR51/b36Lh4Lzc6OgTQ==
dependencies:
"@dhis2/d2-ui-core" "6.5.0"
"@dhis2/d2-ui-core" "6.5.7"
"@material-ui/core" "^3.3.1"
babel-runtime "^6.26.0"
prop-types "^15.5.10"

"@dhis2/d2-ui-period-selector-dialog@^6.2.0":
version "6.2.1"
resolved "https://registry.yarnpkg.com/@dhis2/d2-ui-period-selector-dialog/-/d2-ui-period-selector-dialog-6.2.1.tgz#e2345e1a7a3095c18fba9a893bbac6042cd037a7"
integrity sha512-1MCV+pEZxhNqofADV/Xg4KBs76H9yXDwTQhHj9iXU8worvxiXaQKY+dY1yh99G1FVrZykUMEUnSmhj8okfk8yg==
dependencies:
"@dhis2/analytics" "^2.1.0"
"@dhis2/d2-i18n" "^1.0.4"
"@material-ui/core" "^3.3.1"
"@material-ui/icons" "^3.0.1"
babel-runtime "^6.26.0"
prop-types "^15.6.0"

"@dhis2/d2-ui-period-selector-dialog@^6.3.2":
version "6.5.0"
resolved "https://registry.yarnpkg.com/@dhis2/d2-ui-period-selector-dialog/-/d2-ui-period-selector-dialog-6.5.0.tgz#41ee143bf2e014fd001130655f26bcbc825cdc9b"
integrity sha512-dGTl98qmk8p3eBqW9TZdmHGUwSdp2HqYqETFe9SkET7vQJdNxG2AeUpXW4vQYi22G1ppe7PnFNqdCwVm++xQVQ==
"@dhis2/d2-ui-period-selector-dialog@^6.5.7":
version "6.5.7"
resolved "https://registry.yarnpkg.com/@dhis2/d2-ui-period-selector-dialog/-/d2-ui-period-selector-dialog-6.5.7.tgz#081b5e5e2f0d9bcbc9d47ba706da16adebeafaf9"
integrity sha512-1pISB3brD1Tx+/k51/TK0kF+ZKeDOviSsM99EEUJ+RfviSx3kSxpYPv/VV0WYV69XUmDGkBJ8LPy0w6mUGVL/A==
dependencies:
"@dhis2/analytics" "^2.1.0"
"@dhis2/analytics" "^4.0.1"
"@dhis2/d2-i18n" "^1.0.4"
"@material-ui/core" "^3.3.1"
"@material-ui/icons" "^3.0.1"
Expand Down Expand Up @@ -1481,21 +1409,16 @@
react-select "^2.0.0"
rxjs "^5.5.7"

"@dhis2/data-visualizer-plugin@^34.0.0":
version "34.0.0"
resolved "https://registry.yarnpkg.com/@dhis2/data-visualizer-plugin/-/data-visualizer-plugin-34.0.0.tgz#da9bd2d23982956bf9c3d714a2d301fc386632ee"
integrity sha512-ALV90YdjCVczoLeje5oHbZDG+MZFmXNgYuFiOpi4Mp12OviG96croxD31Eckkb8vSXQ7EL7bLHRMU9gNNC3Zfw==
"@dhis2/data-visualizer-plugin@^34.2.1":
version "34.2.1"
resolved "https://registry.yarnpkg.com/@dhis2/data-visualizer-plugin/-/data-visualizer-plugin-34.2.1.tgz#3885f4aa037507c292a9388cace5a9d4bfcaae63"
integrity sha512-lU36W31ZdYYGY4JS0zqaeHJUZkrp21uJZE0RTtcvyassBB4KTc84Rf8TYNP4jGcQt0uxU6qJA2kGAZhFXBICjg==
dependencies:
"@dhis2/analytics" "^3.2.0"
"@dhis2/analytics" "^4.0.1"
"@material-ui/core" "^3.1.2"
d2-analysis "33.2.11"
lodash-es "^4.17.11"

"@dhis2/prop-types@^1.0.3":
version "1.0.4"
resolved "https://registry.yarnpkg.com/@dhis2/prop-types/-/prop-types-1.0.4.tgz#37eb55a3baf7bc9cf76e19222ad4e2d0e465be8f"
integrity sha512-BiDR0KKn5fyUQ12u6XPq9pLs/tKR3hwiLzSWc+wVxN/enwgb8XUnLpt+Schc/ZBZq+sGozeUfPbFMRqIsifsIA==

"@dhis2/prop-types@^1.2.1":
version "1.2.1"
resolved "https://registry.yarnpkg.com/@dhis2/prop-types/-/prop-types-1.2.1.tgz#acd62fc65f7c2f55126844289e601e2b842d3421"
Expand All @@ -1510,23 +1433,6 @@
dependencies:
prop-types "^15"

"@dhis2/ui-core@^3.4.0":
version "3.9.0"
resolved "https://registry.yarnpkg.com/@dhis2/ui-core/-/ui-core-3.9.0.tgz#67711e7446e7045a9b90b094a616b11bb7a91514"
integrity sha512-xZ58Z6RSuLCe2t06wWIB6uq9W65CkPJOtf0IQGeFTeelsGL9GTQVICUTZohE78g185qR94WxIEUIID/o1HK/sA==
dependencies:
"@dhis2/prop-types" "^1.0.3"
classnames "^2.2.6"
styled-jsx "^3.2.1"

"@dhis2/ui-core@^4.7.1":
version "4.7.1"
resolved "https://registry.yarnpkg.com/@dhis2/ui-core/-/ui-core-4.7.1.tgz#62f663896b67f8a2b1a557b5cb32f1352cf056bc"
integrity sha512-CHfesGZ15Gs08mCifqmW4LiOM+MpS2spkbdr3P27Yn0uPYjCOG9QbX0UIrdifIqraUSHqTgwtD2HAA4aG2IXEw==
dependencies:
"@dhis2/prop-types" "^1.5.0"
classnames "^2.2.6"

"@dhis2/ui-core@^4.9.1":
version "4.9.1"
resolved "https://registry.yarnpkg.com/@dhis2/ui-core/-/ui-core-4.9.1.tgz#13ebaa43deceb5c3fa2955668c183131241847fa"
Expand Down Expand Up @@ -6498,11 +6404,6 @@ hex-color-regex@^1.1.0:
resolved "https://registry.yarnpkg.com/hex-color-regex/-/hex-color-regex-1.1.0.tgz#4c06fccb4602fe2602b3c93df82d7e7dbf1a8a8e"
integrity sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ==

highcharts@^7.1.2:
version "7.1.3"
resolved "https://registry.yarnpkg.com/highcharts/-/highcharts-7.1.3.tgz#ea3bb16dcdd780e757ab10e90466c64a82b6d285"
integrity sha512-aHAzlSf/czqJlpVt96jYkirWrIV1ZNHgxsTAyk2R5CcG/0V1G8Ge65p76eFqZQp7C8+cA8e6g1xsAPj51MsJ3Q==

highcharts@^7.2.1:
version "7.2.1"
resolved "https://registry.yarnpkg.com/highcharts/-/highcharts-7.2.1.tgz#313c434bbfd4525a72b76c6bfbd9c39dfe2d1993"
Expand Down

0 comments on commit f154dbb

Please sign in to comment.