Skip to content

Commit

Permalink
chore: update d2 config to allow right-to-left support
Browse files Browse the repository at this point in the history
  • Loading branch information
@kabaros
kabaros committed Jun 1, 2024
1 parent 11be0f9 commit 5b21df6
Show file tree
Hide file tree
Showing 3 changed files with 101 additions and 46 deletions.
2 changes: 2 additions & 0 deletions d2.config.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ const config = {

minDHIS2Version: '2.40',

direction: 'auto',

pwa: {
enabled: true,
caching: {
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"cy:run": "start-server-and-test 'yarn start:nobrowser' http://localhost:3000 'yarn cypress run --browser chrome headless --env networkMode=live'"
},
"devDependencies": {
"@dhis2/cli-app-scripts": "^10.3.9",
"@dhis2/cli-app-scripts": "10.5.0-alpha.2",
"@dhis2/cli-style": "^10.5.1",
"@dhis2/cypress-commands": "^10.0.3",
"@dhis2/cypress-plugins": "^10.0.2",
Expand Down
143 changes: 98 additions & 45 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2050,12 +2050,12 @@
react-beautiful-dnd "^10.1.1"
resize-observer-polyfill "^1.5.1"

"@dhis2/app-adapter@10.3.9":
version "10.3.9"
resolved "https://registry.yarnpkg.com/@dhis2/app-adapter/-/app-adapter-10.3.9.tgz#f0733e72bff86661889c6fcf3a8e0ca3452f3121"
integrity sha512-T/FFxzInvNw4YKZX+SuWpge0UGqzKX5w1rC3gBK38sFFpnBGNHgV5QMKo/DZeLDceDu1yrZbkluANoEujJSv9Q==
"@dhis2/app-adapter@10.5.0-alpha.2":
version "10.5.0-alpha.2"
resolved "https://registry.yarnpkg.com/@dhis2/app-adapter/-/app-adapter-10.5.0-alpha.2.tgz#6414b360c88597d1037bf2623b68af2733a4c4c3"
integrity sha512-JOffkgVt3U/Sltpnc2RSa3637hd7Dosc1fQNC1gZesSBAXyA+//oT1trPPYvGV1u8EWaDx7rY+/PBsvGTEQg/Q==
dependencies:
"@dhis2/pwa" "10.3.9"
"@dhis2/pwa" "10.5.0-alpha.2"
moment "^2.24.0"

"@dhis2/app-runtime-adapter-d2@^1.1.0":
Expand All @@ -2065,30 +2065,31 @@
dependencies:
prop-types "^15.7.2"

"@dhis2/app-runtime@^3.7.0", "@dhis2/app-runtime@^3.9.0":
version "3.9.0"
resolved "https://registry.yarnpkg.com/@dhis2/app-runtime/-/app-runtime-3.9.0.tgz#c7e295fd0a68fac976a930bc77105206ded0b61a"
integrity sha512-n0S4pbyvK7FnBQFMONGrhR9YYavBQI+mQLHfCX/vtvOyeoioBUNIinuQlGysuLMEkSVaK5OjV40rvTMzdxF2kQ==
"@dhis2/app-runtime@^3.10.0-alpha.2", "@dhis2/app-runtime@^3.10.2":
version "3.10.2"
resolved "https://registry.yarnpkg.com/@dhis2/app-runtime/-/app-runtime-3.10.2.tgz#e82639bd68234bdeaf2f6d3c256dcdfcdd267da2"
integrity sha512-GiftKk8ZTXlPElXAgVJn41Vj6E1vEGTPGrjrqU7j41ZTYsg+tUcCkISNt1woe5l7E+8+y+9Fy4bgqSsBOAEUvg==
dependencies:
"@dhis2/app-service-alerts" "3.9.0"
"@dhis2/app-service-config" "3.9.0"
"@dhis2/app-service-data" "3.9.0"
"@dhis2/app-service-offline" "3.9.0"
"@dhis2/app-service-alerts" "3.10.2"
"@dhis2/app-service-config" "3.10.2"
"@dhis2/app-service-data" "3.10.2"
"@dhis2/app-service-offline" "3.10.2"
"@dhis2/app-service-plugin" "3.10.2"

"@dhis2/app-service-alerts@3.9.0":
version "3.9.0"
resolved "https://registry.yarnpkg.com/@dhis2/app-service-alerts/-/app-service-alerts-3.9.0.tgz#48d3805676e75ee58104fea4f76cfa779335444e"
integrity sha512-z2eZxm/pxrmFbisbK7/qJKtif2CNWJjaaAH5rfrs5OIajlHy3rO37vSaTQHWv+xWvZFQrs2Op2InxzG0qh5ncA==
"@dhis2/app-service-alerts@3.10.2":
version "3.10.2"
resolved "https://registry.yarnpkg.com/@dhis2/app-service-alerts/-/app-service-alerts-3.10.2.tgz#0e07c3530606f81ab998a20f2c478600b6027a77"
integrity sha512-2IqaawnlOzYVJLBF2AKVQJ4cuxJNZD7FK0XE0XOv1WwFs70h6bp23MQueIJ/QHxLo7lamE0FC22m4diM4P0CuA==

"@dhis2/app-service-config@3.9.0":
version "3.9.0"
resolved "https://registry.yarnpkg.com/@dhis2/app-service-config/-/app-service-config-3.9.0.tgz#8dc59d8de246f54057c0c685d5f94b4cbade6f73"
integrity sha512-OuRn2mJGrQQ8QIC+oIVYYpclB4LErRK2wtsuy/cXLfRbeUti1qWIh110rgd1hnTx+BgRCs5s3NWdIQxS4hYGIQ==
"@dhis2/app-service-config@3.10.2":
version "3.10.2"
resolved "https://registry.yarnpkg.com/@dhis2/app-service-config/-/app-service-config-3.10.2.tgz#be52676068e31cdb1fe3f8ddabb8153e1cd6e3e6"
integrity sha512-Crw7Tx4yg4qWw3qYxNCIye77IaY2HUYyDmDKPVVWzgmrcSGxpunv/NtsUg12pxrVfVLnqlH9L6AF9A6hO0afmw==

"@dhis2/app-service-data@3.9.0":
version "3.9.0"
resolved "https://registry.yarnpkg.com/@dhis2/app-service-data/-/app-service-data-3.9.0.tgz#37f528b5f7f589cbab8dcc7f997c1668bc6566a9"
integrity sha512-/FJgJhL6YGtIVNX5oaNmavkGmimrVHQsS8ueeUO4FvTjYXGlnnN3IuxypQcy/x4yiUyigbPgFJRnbC1J2af2fg==
"@dhis2/app-service-data@3.10.2":
version "3.10.2"
resolved "https://registry.yarnpkg.com/@dhis2/app-service-data/-/app-service-data-3.10.2.tgz#e94d45d87cab5e156decfe9e92e3153e5df68ba0"
integrity sha512-+ESLrVEDQKXBaQmpaCq78RonkqJM2BliykaO4QBeOc4ilWohaqYajue1Ntg4uV2KrdkCylBdMDwGYjsak0G7hg==
dependencies:
react-query "^3.13.11"

Expand All @@ -2105,25 +2106,33 @@
"@dhis2/app-service-data" "^2.1.1"
uuid "^8.1.0"

"@dhis2/app-service-offline@3.9.0":
version "3.9.0"
resolved "https://registry.yarnpkg.com/@dhis2/app-service-offline/-/app-service-offline-3.9.0.tgz#fe4f4a91a1da77554965f6a5fe6f6951d4c467f4"
integrity sha512-0q5zl0vw+a47Ab2qgu6hsZY5ybnH/ea43Vkk4aXYdgcf57xB8ck9DkIcNbc2e1+k9FhvimipxsgTZSbEA/8hJA==
"@dhis2/app-service-offline@3.10.2":
version "3.10.2"
resolved "https://registry.yarnpkg.com/@dhis2/app-service-offline/-/app-service-offline-3.10.2.tgz#082279b7045e702c2eecda751d762225313156b0"
integrity sha512-bTp+CCRbyKt/0QADj0O6wLNWhi+6QDkjt2+sfpv3M8oKcftjaQDqedVoypZRA0nqvSdVL2ehtTzqMrrxu6jtZQ==
dependencies:
lodash "^4.17.21"

"@dhis2/app-[email protected]":
version "10.3.9"
resolved "https://registry.yarnpkg.com/@dhis2/app-shell/-/app-shell-10.3.9.tgz#4def65cfa436047de896865b107d496afbafc643"
integrity sha512-GkKGz1FIcXL4XG7cMPob0T78EvI8ML3CJbtVDxMDx++20R8vD+gKB4jbdXA5QooWeojDA5kpPmNiVHNUJb6LUw==
"@dhis2/app-[email protected]":
version "3.10.2"
resolved "https://registry.yarnpkg.com/@dhis2/app-service-plugin/-/app-service-plugin-3.10.2.tgz#09de64ee59017c86c8dab96a0d2ca0d915ae9d31"
integrity sha512-FqR6ILmvAXT2n1SzCZknT+5jJRdajg1dBegWAu3xqZXAntsM4wvFLCx6EtjS5LO2Kga9VZ+TJmVr2UFX1330CQ==
dependencies:
"@dhis2/app-adapter" "10.3.9"
"@dhis2/app-runtime" "^3.9.0"
post-robot "^10.0.46"

"@dhis2/[email protected]":
version "10.5.0-alpha.2"
resolved "https://registry.yarnpkg.com/@dhis2/app-shell/-/app-shell-10.5.0-alpha.2.tgz#3e082cc65ae5e3652502ac54ef2557c9bf99653b"
integrity sha512-9Ar9qpYaNM/L41P97BtaDemMP/8d7VL9lEhXCLli9YPw4fYfTSl2oZu7R4/NvdHWKI7odvogfab4U9Izbjg9wQ==
dependencies:
"@dhis2/app-adapter" "10.5.0-alpha.2"
"@dhis2/app-runtime" "^3.10.0-alpha.2"
"@dhis2/d2-i18n" "^1.1.1"
"@dhis2/pwa" "10.3.9"
"@dhis2/pwa" "10.5.0-alpha.2"
"@dhis2/ui" "^8.12.3"
classnames "^2.2.6"
moment "^2.29.1"
post-robot "^10.0.46"
prop-types "^15.7.2"
react "^16.8.6"
react-dom "^16.8.6"
Expand All @@ -2133,10 +2142,10 @@
typeface-roboto "^0.0.75"
typescript "^3.6.3"

"@dhis2/cli-app-scripts@^10.3.9":
version "10.3.9"
resolved "https://registry.yarnpkg.com/@dhis2/cli-app-scripts/-/cli-app-scripts-10.3.9.tgz#8a971b52c08f165bcee78fb5bddfd0891ae7f7c2"
integrity sha512-toltKttbok1ORBYvXYOtaIyUUs5C7lB3SEbZuk4KnibwmtG3v/37UEgXC6y0nc0L3XDBz/HK/LrbU4/7osfvcA==
"@dhis2/cli-app-scripts@10.5.0-alpha.2":
version "10.5.0-alpha.2"
resolved "https://registry.yarnpkg.com/@dhis2/cli-app-scripts/-/cli-app-scripts-10.5.0-alpha.2.tgz#9481a4c3bb8d023bcee0e8c1796f8a30f9906c58"
integrity sha512-ez8D16+P2Sy5DLnSC7LvqqXH0nVe2VnjLn3mNQIYJb5NjRyNng4GXbpA6dbdFsXBaRfKYKzaQ5ArC5t2gPfUjw==
dependencies:
"@babel/core" "^7.6.2"
"@babel/plugin-proposal-class-properties" "^7.8.3"
Expand All @@ -2145,7 +2154,7 @@
"@babel/preset-env" "^7.14.7"
"@babel/preset-react" "^7.0.0"
"@babel/preset-typescript" "^7.6.0"
"@dhis2/app-shell" "10.3.9"
"@dhis2/app-shell" "10.5.0-alpha.2"
"@dhis2/cli-helpers-engine" "^3.2.0"
"@jest/core" "^27.0.6"
"@pmmmwh/react-refresh-webpack-plugin" "^0.5.4"
Expand Down Expand Up @@ -2276,10 +2285,10 @@
resolved "https://registry.yarnpkg.com/@dhis2/prop-types/-/prop-types-3.1.2.tgz#65b8ad2da8cd2f72bc8b951049a6c9d1b97af3e9"
integrity sha512-eM0jjLOWvtXWqSFp5YC4DHFpkP8Y1D2eUwGV7MBWjni+o27oesVan+oT7WHeOeLdlAd4acRJrnaaAyB4Ck1wGQ==

"@dhis2/pwa@10.3.9":
version "10.3.9"
resolved "https://registry.yarnpkg.com/@dhis2/pwa/-/pwa-10.3.9.tgz#c119b7da18218a4ea3d18c7eb01c2aca5fc619a2"
integrity sha512-yYxOjgi1D0S6Ah5xQwZauQ3zhXuiojc9AMkP+J+bpZYQhj4hzB2dKyJ252dClO6P/7EtoSj9XJOsMx007uIUEQ==
"@dhis2/pwa@10.5.0-alpha.2":
version "10.5.0-alpha.2"
resolved "https://registry.yarnpkg.com/@dhis2/pwa/-/pwa-10.5.0-alpha.2.tgz#dff4f379832c3e857d73a58761c2b8387ea4a418"
integrity sha512-WWOzJukZjoX2TZiz8STj7miCMytWm4uj/jytVv4R912ilcpdW3g7I2H0ta7QN7hhIxidIirj2vDx1TFt1effOQ==
dependencies:
idb "^6.0.0"
workbox-core "^6.1.5"
Expand Down Expand Up @@ -4699,6 +4708,15 @@ bcrypt-pbkdf@^1.0.0:
dependencies:
tweetnacl "^0.14.3"

belter@^1.0.41:
version "1.0.190"
resolved "https://registry.yarnpkg.com/belter/-/belter-1.0.190.tgz#491857550ef240d9c66b56fc637991f5c3089966"
integrity sha512-jz05FHrO+bwitdI6JxV5ESyRdVhTcwMWQ7L4o+q/R4LNJFQrG58sp9EiwsSjhbihhiyYFcmmCMRRagxte6igtw==
dependencies:
cross-domain-safe-weakmap "^1"
cross-domain-utils "^2"
zalgo-promise "^1"

bfj@^7.0.2:
version "7.0.2"
resolved "https://registry.yarnpkg.com/bfj/-/bfj-7.0.2.tgz#1988ce76f3add9ac2913fd8ba47aad9e651bfbb2"
Expand Down Expand Up @@ -5915,6 +5933,20 @@ create-hmac@^1.1.0, create-hmac@^1.1.4, create-hmac@^1.1.7:
safe-buffer "^5.0.1"
sha.js "^2.4.8"

cross-domain-safe-weakmap@^1, cross-domain-safe-weakmap@^1.0.1:
version "1.0.29"
resolved "https://registry.yarnpkg.com/cross-domain-safe-weakmap/-/cross-domain-safe-weakmap-1.0.29.tgz#0847975c27d9e1cc840f24c1745311958df98022"
integrity sha512-VLoUgf2SXnf3+na8NfeUFV59TRZkIJqCIATaMdbhccgtnTlSnHXkyTRwokngEGYdQXx8JbHT9GDYitgR2sdjuA==
dependencies:
cross-domain-utils "^2.0.0"

cross-domain-utils@^2, cross-domain-utils@^2.0.0:
version "2.0.38"
resolved "https://registry.yarnpkg.com/cross-domain-utils/-/cross-domain-utils-2.0.38.tgz#2eaf321c4dfdb61596805ca4233fde4400cb6377"
integrity sha512-zZfi3+2EIR9l4chrEiXI2xFleyacsJf8YMLR1eJ0Veb5FTMXeJ3DpxDjZkto2FhL/g717WSELqbptNSo85UJDw==
dependencies:
zalgo-promise "^1.0.11"

cross-spawn@^5.0.1:
version "5.1.0"
resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449"
Expand Down Expand Up @@ -12201,6 +12233,17 @@ posix-character-classes@^0.1.0:
resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
integrity sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=

post-robot@^10.0.46:
version "10.0.46"
resolved "https://registry.yarnpkg.com/post-robot/-/post-robot-10.0.46.tgz#39cea5b51033729390fc7c90be3285cd285f0377"
integrity sha512-EgVJiuvI4iRWDZvzObWes0X/n8olWBEJWxlSw79zmhpgkigX8UsVL4VOBhVtoJKwf0Y9qP9g2zOONw1rv80QbA==
dependencies:
belter "^1.0.41"
cross-domain-safe-weakmap "^1.0.1"
cross-domain-utils "^2.0.0"
universal-serialize "^1.0.4"
zalgo-promise "^1.0.3"

postcss-attribute-case-insensitive@^5.0.2:
version "5.0.2"
resolved "https://registry.yarnpkg.com/postcss-attribute-case-insensitive/-/postcss-attribute-case-insensitive-5.0.2.tgz#03d761b24afc04c09e757e92ff53716ae8ea2741"
Expand Down Expand Up @@ -15496,6 +15539,11 @@ unique-string@^2.0.0:
dependencies:
crypto-random-string "^2.0.0"

universal-serialize@^1.0.4:
version "1.0.10"
resolved "https://registry.yarnpkg.com/universal-serialize/-/universal-serialize-1.0.10.tgz#3279bb30f47290ea479f45135620f98fa9d3f3a6"
integrity sha512-FdouA4xSFa0fudk1+z5vLWtxZCoC0Q9lKYV3uUdFl7DttNfolmiw2ASr5ddY+/Yz6Isr68u3IqC9XMSwMP+Pow==

universalify@^0.1.0:
version "0.1.2"
resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
Expand Down Expand Up @@ -16479,6 +16527,11 @@ yocto-queue@^0.1.0:
resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"
integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==

zalgo-promise@^1, zalgo-promise@^1.0.11, zalgo-promise@^1.0.3:
version "1.0.48"
resolved "https://registry.yarnpkg.com/zalgo-promise/-/zalgo-promise-1.0.48.tgz#9e33eef502d5ed9f5a09fc5728c833c3e87afa2e"
integrity sha512-LLHANmdm53+MucY9aOFIggzYtUdkSBFxUsy4glTTQYNyK6B3uCPWTbfiGvSrEvLojw0mSzyFJ1/RRLv+QMNdzQ==

zip-stream@^2.1.2:
version "2.1.3"
resolved "https://registry.yarnpkg.com/zip-stream/-/zip-stream-2.1.3.tgz#26cc4bdb93641a8590dd07112e1f77af1758865b"
Expand Down

0 comments on commit 5b21df6

Please sign in to comment.