Skip to content

Commit

Permalink
fix: upgrade ui-widgets to 2.1.1 for proper translations (#402)
Browse files Browse the repository at this point in the history
  • Loading branch information
amcgee committed May 19, 2020
1 parent c93c908 commit 46c5ecf
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 21 deletions.
2 changes: 1 addition & 1 deletion adapter/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"build"
],
"dependencies": {
"@dhis2/ui-widgets": "^2.0.4",
"@dhis2/ui-widgets": "^2.1.1",
"moment": "^2.24.0"
},
"devDependencies": {
Expand Down
35 changes: 21 additions & 14 deletions examples/simple-app/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1143,21 +1143,21 @@
resolved "https://registry.yarnpkg.com/@csstools/normalize.css/-/normalize.css-10.1.0.tgz#f0950bba18819512d42f7197e56c518aa491cf18"
integrity sha512-ij4wRiunFfaJxjB0BdrYHIH8FxBJpOwNPhhAcunlmPdXudL1WQV1qoP9un6JsEBAgQH+7UXyyjh0g7jTxXK6tg==

"@dhis2/app-adapter@3.2.6", "@dhis2/app-adapter@file:../../adapter":
version "3.2.6"
"@dhis2/app-adapter@4.0.4", "@dhis2/app-adapter@file:../../adapter":
version "4.0.4"
dependencies:
"@dhis2/ui-widgets" "^2.0.4"
"@dhis2/ui-widgets" "^2.1.1-alpha.2"
moment "^2.24.0"

"@dhis2/app-runtime@^2.0.4":
version "2.0.4"
resolved "https://registry.yarnpkg.com/@dhis2/app-runtime/-/app-runtime-2.0.4.tgz#9ae202fef3313094aef33a3e38d2c6c5d799c808"
integrity sha512-w5+C/fHSsuF0am5Tpvz53+tigEZzfz9ahkjXH3BiWxGVxwZGtdHjWfso1T5bJRiKhDTgf76TxIsQiC11W20WyA==

"@dhis2/app-shell@3.2.6", "@dhis2/app-shell@file:../../shell":
version "3.2.6"
"@dhis2/app-shell@4.0.4", "@dhis2/app-shell@file:../../shell":
version "4.0.4"
dependencies:
"@dhis2/app-adapter" "3.2.6"
"@dhis2/app-adapter" "4.0.4"
"@dhis2/app-runtime" "^2.0.4"
"@dhis2/d2-i18n" "^1.0.5"
"@dhis2/ui-core" "^4.6.1"
Expand All @@ -1173,7 +1173,7 @@
typescript "^3.6.3"

"@dhis2/cli-app-scripts@file:../../cli":
version "3.2.6"
version "4.0.4"
dependencies:
"@babel/core" "^7.6.2"
"@babel/plugin-proposal-class-properties" "^7.8.3"
Expand All @@ -1186,7 +1186,7 @@
"@babel/preset-env" "^7.6.2"
"@babel/preset-react" "^7.0.0"
"@babel/preset-typescript" "^7.6.0"
"@dhis2/app-shell" "3.2.6"
"@dhis2/app-shell" "4.0.4"
"@dhis2/cli-helpers-engine" "^1.5.0"
archiver "^3.1.1"
babel-jest "^24.9.0"
Expand Down Expand Up @@ -1234,13 +1234,20 @@
i18next "^10.3"
moment "^2.24.0"

"@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.6.1":
version "4.6.1"
resolved "https://registry.yarnpkg.com/@dhis2/ui-core/-/ui-core-4.6.1.tgz#62677590b3b32322dfa014b006e6226b637f0162"
Expand All @@ -1249,12 +1256,12 @@
"@dhis2/prop-types" "^1.5.0"
classnames "^2.2.6"

"@dhis2/ui-widgets@^2.0.4":
version "2.0.6"
resolved "https://registry.yarnpkg.com/@dhis2/ui-widgets/-/ui-widgets-2.0.6.tgz#95247dbdfad0ec7d6836f3ccbe8ae85adf5f631d"
integrity sha512-4ZyR36UWk+BS8eAEBx9A6ze2lqowPjfUCqjvaAc3O2+XpWd7UL9kLHV1GQWaC2S6X8UQIdgghq8iKp86u4Ub0A==
"@dhis2/ui-widgets@^2.1.1-alpha.2":
version "2.1.1-alpha.2"
resolved "https://registry.yarnpkg.com/@dhis2/ui-widgets/-/ui-widgets-2.1.1-alpha.2.tgz#e6b21ab80ad4562f1c2bbce9f842a27373577b9a"
integrity sha512-p+QHVFyjUUAnDnbsCq3YZOFFVbZVzt9jCWEmcZWn802Cyu119KawLmFQ24BvkaC/a4SSX5TAfpKu8STtDBVHAA==
dependencies:
"@dhis2/prop-types" "^1.5"
"@dhis2/prop-types" "^1.6"
classnames "^2.2.6"

"@hapi/[email protected]":
Expand Down
12 changes: 6 additions & 6 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1276,7 +1276,7 @@
i18next "^10.3"
moment "^2.24.0"

"@dhis2/prop-types@^1.5", "@dhis2/prop-types@^1.6.4":
"@dhis2/prop-types@^1.6", "@dhis2/prop-types@^1.6.4":
version "1.6.4"
resolved "https://registry.yarnpkg.com/@dhis2/prop-types/-/prop-types-1.6.4.tgz#ec4d256c9440d4d00071524422a727c61ddaa6f6"
integrity sha512-qkVj8OuyjDmSxzYDlCWZllvC9hIbrIImMp79/U5CVsIRbjUF0zA/tfbv4rWnsWALmwEHOQFbzl5GnO5D8RNneA==
Expand All @@ -1292,12 +1292,12 @@
"@popperjs/core" "^2.1.0"
classnames "^2.2.6"

"@dhis2/ui-widgets@^2.0.4":
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"

"@hapi/[email protected]":
Expand Down

0 comments on commit 46c5ecf

Please sign in to comment.