Skip to content

Commit

Permalink
fix: upgrade d2-ui dependencies to fix interpretations translations […
Browse files Browse the repository at this point in the history 
…v35] (#1514)

Upgrades both interpretations and file-menu to keep d2-ui packages in sync.

Note: The latest file-menu included small changes to the favorites dialog (support for scatter, which doesn't impact v35, and replacing unsafe_componentWillReceiveProps)
  • Loading branch information
@jenniferarnesen
jenniferarnesen committed Dec 15, 2020
1 parent 3d6a299 commit 3d18155
Show file tree
Hide file tree
Showing 2 changed files with 50 additions and 39 deletions.
4 changes: 2 additions & 2 deletions packages/app/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
"@dhis2/analytics": "^11.0.7",
"@dhis2/app-runtime": "*",
"@dhis2/d2-i18n": "*",
"@dhis2/d2-ui-file-menu": "^7.0.8",
"@dhis2/d2-ui-interpretations": "^7.0.8",
"@dhis2/d2-ui-file-menu": "^7.1.3",
"@dhis2/d2-ui-interpretations": "^7.1.3",
"@dhis2/data-visualizer-plugin": "35.12.24",
"@dhis2/ui": "^5.6.1",
"@material-ui/icons": "^3.0.1",
Expand Down
85 changes: 48 additions & 37 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1464,12 +1464,23 @@
material-ui "^0.20.0"
rxjs "^5.5.7"

"@dhis2/d2-ui-favorites-dialog@7.0.8":
version "7.0.8"
resolved "https://registry.yarnpkg.com/@dhis2/d2-ui-favorites-dialog/-/d2-ui-favorites-dialog-7.0.8.tgz#24784aa68833517a5ba22d5f816c80a8a81bcdbc"
integrity sha512-oKNR249Oekx3dl/5S/v0J7+GbGNYG+vt9eqYlbUt+WeCxUaV1YCXDoN2dvo+kmtwyOZR0TjKJygd1XFQBegrIg==
"@dhis2/d2-ui-core@7.1.3":
version "7.1.3"
resolved "https://registry.yarnpkg.com/@dhis2/d2-ui-core/-/d2-ui-core-7.1.3.tgz#3c043a305b0225de153fe76dbfd417f6b17793e8"
integrity sha512-w5Me5bGc2/6j0WBng9gobqmS5X1yB9l3f0aeFfpzPiH+TQL+1N/n8TAP+hnHEE/DV3H+/IlKN8DJ1wlw3Jlu+g==
dependencies:
babel-runtime "^6.26.0"
d2 "~31.7"
lodash "^4.17.10"
material-ui "^0.20.0"
rxjs "^5.5.7"

"@dhis2/d2-ui-favorites-dialog@7.1.3":
version "7.1.3"
resolved "https://registry.yarnpkg.com/@dhis2/d2-ui-favorites-dialog/-/d2-ui-favorites-dialog-7.1.3.tgz#abfab187634c6f09006cb1c2e5b57f0f0818ec71"
integrity sha512-mLhn/A70ZC0MZ2Xrv/mMY+ybp4H2az4y+VtVp/ujpGYdoth4vaoQt7G7ERgx+oM50gK1B6yJNMfEDCd3WZVDyQ==
dependencies:
"@dhis2/d2-ui-sharing-dialog" "7.0.8"
"@dhis2/d2-ui-sharing-dialog" "7.1.3"
"@material-ui/core" "^3.3.1"
"@material-ui/icons" "^3.0.1"
babel-runtime "^6.26.0"
Expand All @@ -1479,26 +1490,26 @@
redux-logger "^3.0.6"
redux-thunk "^2.2.0"

"@dhis2/d2-ui-file-menu@^7.0.8":
version "7.0.8"
resolved "https://registry.yarnpkg.com/@dhis2/d2-ui-file-menu/-/d2-ui-file-menu-7.0.8.tgz#fed1626e68fe4ea4c1f823323fe0681a84dd799c"
integrity sha512-nY6sctT656z4+xWJsfSpiBtXqXZyTD3mUFxxJf3BBnRMrx30eebeOqgFbo++y8hcnGkJg67VCz5lTk07u7PIOA==
"@dhis2/d2-ui-file-menu@^7.1.3":
version "7.1.3"
resolved "https://registry.yarnpkg.com/@dhis2/d2-ui-file-menu/-/d2-ui-file-menu-7.1.3.tgz#26064d2aafd16a08e48716ff221a9d87fb73d732"
integrity sha512-mvTA9VDJuWdNv7LjnH7wZRE5dfYiBNECotgRb7PsoHK7u499GfnF6DgLlJ3JaEpGSEj0L+fMPa14L/wyIk1x6Q==
dependencies:
"@dhis2/d2-ui-favorites-dialog" "7.0.8"
"@dhis2/d2-ui-sharing-dialog" "7.0.8"
"@dhis2/d2-ui-translation-dialog" "7.0.8"
"@dhis2/d2-ui-favorites-dialog" "7.1.3"
"@dhis2/d2-ui-sharing-dialog" "7.1.3"
"@dhis2/d2-ui-translation-dialog" "7.1.3"
"@material-ui/core" "^3.3.1"
"@material-ui/icons" "^3.0.1"
prop-types "^15.6.0"

"@dhis2/d2-ui-interpretations@^7.0.8":
version "7.0.8"
resolved "https://registry.yarnpkg.com/@dhis2/d2-ui-interpretations/-/d2-ui-interpretations-7.0.8.tgz#290281cbb8ff4b4b8baa3d771f15028ee3e4b8f2"
integrity sha512-dYW419Q/qk4CYCMjzvqtFaqUdvfnSMFDM1XdcZOMLcKGJIcONZ3IMcKriYlmy9zPQb/OHaTTEBQ8vG5UoJ0AYw==
"@dhis2/d2-ui-interpretations@^7.1.3":
version "7.1.3"
resolved "https://registry.yarnpkg.com/@dhis2/d2-ui-interpretations/-/d2-ui-interpretations-7.1.3.tgz#4f365ffbfd65fcee5f2188d02bd6f403288a4fce"
integrity sha512-rgS70Wxufs9mlhQqwp9XyqAlmzk1mVEB5cd2D91ODqwzqVScmGHUhakjQpdO9cYtFMTKxNI3/B3S6HbfqXwG4Q==
dependencies:
"@dhis2/d2-ui-mentions-wrapper" "7.0.8"
"@dhis2/d2-ui-rich-text" "7.0.8"
"@dhis2/d2-ui-sharing-dialog" "7.0.8"
"@dhis2/d2-ui-mentions-wrapper" "7.1.3"
"@dhis2/d2-ui-rich-text" "7.1.3"
"@dhis2/d2-ui-sharing-dialog" "7.1.3"
"@material-ui/core" "^3.3.1"
"@material-ui/icons" "^3.0.1"
babel-runtime "^6.26.0"
Expand All @@ -1508,10 +1519,10 @@
prop-types "^15.5.10"
react-portal "^4.1.5"

"@dhis2/d2-ui-mentions-wrapper@7.0.8":
version "7.0.8"
resolved "https://registry.yarnpkg.com/@dhis2/d2-ui-mentions-wrapper/-/d2-ui-mentions-wrapper-7.0.8.tgz#e9a753e774ad7cc633bb539716fd6182a6ce4e8d"
integrity sha512-u21NoxJKC69rsDVaYkZUvR3Hja6Ie2XnZh0TTiVrnJlGW+s3tKcvHlcHfqDPrSyqfRQKCQB//LKGYKhE9U5pMA==
"@dhis2/d2-ui-mentions-wrapper@7.1.3":
version "7.1.3"
resolved "https://registry.yarnpkg.com/@dhis2/d2-ui-mentions-wrapper/-/d2-ui-mentions-wrapper-7.1.3.tgz#1dba7463db5a39b98524e6601568d3c6dc1e8b9c"
integrity sha512-HjnH6vBMvLpjNM8z5iSI3Z5fgJZ+zPpwT4yL7JZX/TqzQuFtSE5cX2MKp3+dlXw4/iNz9qgTgfCg7tT+eHpKzQ==
dependencies:
"@material-ui/core" "^3.3.1"
lodash "^4.17.10"
Expand All @@ -1537,21 +1548,21 @@
babel-runtime "^6.26.0"
prop-types "^15.5.10"

"@dhis2/d2-ui-rich-text@7.0.8":
version "7.0.8"
resolved "https://registry.yarnpkg.com/@dhis2/d2-ui-rich-text/-/d2-ui-rich-text-7.0.8.tgz#9eaae380dca3b56df7d0a92940dbacebefcd8624"
integrity sha512-YLI1wjgZUCDBcMCOTNIqJwtwdpNjOq8CTFb9esm8wfyT2Mw/vAAy929Sj+tKT8cJ2+xMKJhx8pQaJ4XbPPIZJg==
"@dhis2/d2-ui-rich-text@7.1.3":
version "7.1.3"
resolved "https://registry.yarnpkg.com/@dhis2/d2-ui-rich-text/-/d2-ui-rich-text-7.1.3.tgz#79c0d374a240df0f39a0c1823784b3cd127d05f7"
integrity sha512-T2kqiDqdnIdpFNyEBo4iBt6NR23gfLZ92WHMwaJykT3NryvwgMrblg9bIUjj0T87i1URQOI4hyu1mw/PCeOXTw==
dependencies:
babel-runtime "^6.26.0"
markdown-it "^8.4.2"
prop-types "^15.6.2"

"@dhis2/d2-ui-sharing-dialog@7.0.8":
version "7.0.8"
resolved "https://registry.yarnpkg.com/@dhis2/d2-ui-sharing-dialog/-/d2-ui-sharing-dialog-7.0.8.tgz#33d62e549bcceba4ecbe00180088381902449a2e"
integrity sha512-usXa4FotS90zZkQb2uqBEJOJHcZDbb7CM8GUMnkok8fryjsoeSIIRBEyt5GqVjBH4PHWja3V0BfkBW1w9gp+WQ==
"@dhis2/d2-ui-sharing-dialog@7.1.3":
version "7.1.3"
resolved "https://registry.yarnpkg.com/@dhis2/d2-ui-sharing-dialog/-/d2-ui-sharing-dialog-7.1.3.tgz#27412a4e52dc636f167b0548ee5344f8957a3bb1"
integrity sha512-vTe1IuGRwgBt8jQeGQoa3pGSd4j0lOuY6q9oyblVvT7IQ7GyBecwHS4YT8sK/kM9LwTZ+xDc4VgHVAzoFESVng==
dependencies:
"@dhis2/d2-ui-core" "7.0.8"
"@dhis2/d2-ui-core" "7.1.3"
"@material-ui/core" "^3.3.1"
"@material-ui/icons" "^3.0.1"
babel-runtime "^6.26.0"
Expand All @@ -1560,12 +1571,12 @@
recompose "^0.26.0"
rxjs "^5.5.7"

"@dhis2/d2-ui-translation-dialog@7.0.8":
version "7.0.8"
resolved "https://registry.yarnpkg.com/@dhis2/d2-ui-translation-dialog/-/d2-ui-translation-dialog-7.0.8.tgz#97633f8f6e16b2dd92d5c846010c1038ee9bbcf8"
integrity sha512-+yLrWQOMPrgDc5yI+qiv3pKY0Szjgm2RjdzwKI9/S4+aTNFI1uVPQuiuEf2bz89UeOZ3n4s4yEvQndnpsaGo8g==
"@dhis2/d2-ui-translation-dialog@7.1.3":
version "7.1.3"
resolved "https://registry.yarnpkg.com/@dhis2/d2-ui-translation-dialog/-/d2-ui-translation-dialog-7.1.3.tgz#6ae4befc6e1541a16c0554f5b54f52d7947b5809"
integrity sha512-N5BhTYCkcU32m9RhMEItclNxMr7khgrAQms3s5+4XRrGvdGcJo35CoulRmOU1Zs4e8KNhQg3QJMdCIxcvzsFeQ==
dependencies:
"@dhis2/d2-ui-core" "7.0.8"
"@dhis2/d2-ui-core" "7.1.3"
"@material-ui/core" "^3.3.1"
"@material-ui/icons" "^3.0.1"
babel-runtime "^6.26.0"
Expand Down

0 comments on commit 3d18155

Please sign in to comment.