Skip to content

Commit

Permalink
fix: upgrade ui-widgets to 2.1.1 for proper translations (#851)
Browse files Browse the repository at this point in the history
* fix: upgrade ui-widgets to 2.1.1 for proper translations

* chore: deduplicate d2-i18n
  • Loading branch information
amcgee authored May 20, 2020
1 parent d441366 commit 47e098a
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 12 deletions.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"license": "BSD-3-Clause",
"dependencies": {
"@dhis2/analytics": "^4.3.25",
"@dhis2/app-runtime": "^2.0.3",
"@dhis2/app-runtime": "^2.2.1",
"@dhis2/d2-i18n": "^1.0.6",
"@dhis2/d2-ui-core": "^6.5.8",
"@dhis2/d2-ui-interpretations": "^6.5.7",
Expand All @@ -16,7 +16,7 @@
"@dhis2/d2-ui-translation-dialog": "^6.0.1",
"@dhis2/data-visualizer-plugin": "^34.3.34",
"@dhis2/ui-core": "^4.16.0",
"@dhis2/ui-widgets": "^2.1.0",
"@dhis2/ui-widgets": "^2.1.1",
"@material-ui/core": "^3.9.2",
"@material-ui/icons": "^4.9.1",
"d2": "^31.8.1",
Expand Down
40 changes: 30 additions & 10 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1019,10 +1019,23 @@
resize-observer-polyfill "^1.5.1"
styled-jsx "^3.2.1"

"@dhis2/app-runtime@^2.0.3":
version "2.0.3"
resolved "https://registry.yarnpkg.com/@dhis2/app-runtime/-/app-runtime-2.0.3.tgz#ababc8494420b4f16cbfdc3fef8f9a2707008a4c"
integrity sha512-h1UZ5r1izLWJrncvK6pcYlQvGP6CTEQFbzVLHlZ/s1yPMbQaNTOprZPvJU4jCxyfa5XBY9Tcs5FAeDxzdsxQGg==
"@dhis2/app-runtime@^2.2.1":
version "2.2.1"
resolved "https://registry.yarnpkg.com/@dhis2/app-runtime/-/app-runtime-2.2.1.tgz#9c2192c247bbca44e721c2ece1a0d6f8bcdf00d6"
integrity sha512-rX4+Dz31zov0OZNKxcOBbVdXwac5nxX0a4e6G0MKE2OCuHZtvASNbahl86IAasCjuNOclUSgLmIJpEhqlnUxpw==
dependencies:
"@dhis2/app-service-config" "2.2.1"
"@dhis2/app-service-data" "2.2.1"

"@dhis2/app-service-config@2.2.1":
version "2.2.1"
resolved "https://registry.yarnpkg.com/@dhis2/app-service-config/-/app-service-config-2.2.1.tgz#5417b6ec266fa0e3d84a9405010cee43ed6a0027"
integrity sha512-o841GSzjg/VaucWN/9Axo42Dv6CS4Wra3BAw+qFsMtZ7agFKbSssbxyloDiB0/TDv9moR8xivfAHn8kfcVwuNQ==

"@dhis2/app-service-data@2.2.1":
version "2.2.1"
resolved "https://registry.yarnpkg.com/@dhis2/app-service-data/-/app-service-data-2.2.1.tgz#b418a9624761cedded3ebddc3459db90bdaa3c16"
integrity sha512-XeAmjjt8sL1sbu8rsEEQDBQyc//cHww79kCGXpuFHR5tytzhT31cQ457/zNqU3DW61xKgv+bCWk845kuD26UbQ==

"@dhis2/cli-helpers-engine@1.5.0":
version "1.5.0"
Expand Down Expand Up @@ -1225,13 +1238,20 @@
d2-analysis "33.2.11"
lodash-es "^4.17.11"

"@dhis2/prop-types@^1.5", "@dhis2/prop-types@^1.5.0":
"@dhis2/prop-types@^1.5.0":
version "1.5.0"
resolved "https://registry.yarnpkg.com/@dhis2/prop-types/-/prop-types-1.5.0.tgz#7e69919f66698be373dd21940a8a770234ded6a1"
integrity sha512-dueFkkAMOIMbXiU7Mhr3Y+DBRyOd/rHA+5/IDiYWN1xttlUTSuGZLQ5AnJ7osBicEhx+qElaGbTdRYQj3SMBtA==
dependencies:
prop-types "^15"

"@dhis2/prop-types@^1.6":
version "1.6.4"
resolved "https://registry.yarnpkg.com/@dhis2/prop-types/-/prop-types-1.6.4.tgz#ec4d256c9440d4d00071524422a727c61ddaa6f6"
integrity sha512-qkVj8OuyjDmSxzYDlCWZllvC9hIbrIImMp79/U5CVsIRbjUF0zA/tfbv4rWnsWALmwEHOQFbzl5GnO5D8RNneA==
dependencies:
prop-types "^15"

"@dhis2/ui-core@^4.16.0", "@dhis2/ui-core@^4.9.1":
version "4.16.0"
resolved "https://registry.yarnpkg.com/@dhis2/ui-core/-/ui-core-4.16.0.tgz#868555c2d8758af3f26e168d2a469bde39c91b1d"
Expand All @@ -1241,12 +1261,12 @@
"@popperjs/core" "^2.1.0"
classnames "^2.2.6"

"@dhis2/ui-widgets@^2.1.0":
version "2.1.0"
resolved "https://registry.yarnpkg.com/@dhis2/ui-widgets/-/ui-widgets-2.1.0.tgz#2accfdfea4c9564d7d35f8748ff7e113cac14032"
integrity sha512-S/vs7UrJxKcFO0TQhXx0jkKP9MqRGA48vkuBMVston+aZneIpVjLUtPvwP4P87uyK97DvHPkZm4gzniN6Beazg==
"@dhis2/ui-widgets@^2.1.1":
version "2.1.1"
resolved "https://registry.yarnpkg.com/@dhis2/ui-widgets/-/ui-widgets-2.1.1.tgz#23b1887c0190e83bb7a41e6b570dfd41ba99d838"
integrity sha512-tLLXgQ2x0IDVcCg2AdK4J8B0Zj6DHOimI/5xTtp/xoaLDYDwJN3VDIJU0TSh5YIEZPzUmh2nqmdmNHDUXereFw==
dependencies:
"@dhis2/prop-types" "^1.5"
"@dhis2/prop-types" "^1.6"
classnames "^2.2.6"

"@emotion/babel-utils@^0.6.4":
Expand Down

0 comments on commit 47e098a

Please sign in to comment.