From 17244f65cede9eaff450f80c7d8abfd8fc16f398 Mon Sep 17 00:00:00 2001 From: Edoardo Sabadelli Date: Mon, 24 Jun 2024 16:00:23 +0200 Subject: [PATCH 1/4] fix: bump analytics with fix for DHIS2-16904 --- package.json | 2 +- yarn.lock | 38 ++++++++++++++++++++++++++------------ 2 files changed, 27 insertions(+), 13 deletions(-) diff --git a/package.json b/package.json index 89b808c9de..a8f9f285da 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,7 @@ "typescript": "^4.8.4" }, "dependencies": { - "@dhis2/analytics": "^26.7.2", + "@dhis2/analytics": "git+https://github.com/d2-ci/analytics.git#98dfdaae04c20d10adb314ddba3ec9daccb773f3", "@dhis2/app-runtime": "^3.7.0", "@dhis2/app-runtime-adapter-d2": "^1.1.0", "@dhis2/app-service-datastore": "^1.0.0-beta.3", diff --git a/yarn.lock b/yarn.lock index 98f9e71f39..651517656a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2029,12 +2029,11 @@ classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2/analytics@^26.7.2": - version "26.7.2" - resolved "https://registry.yarnpkg.com/@dhis2/analytics/-/analytics-26.7.2.tgz#8c6b80274316a277c19868ffc46a26b46ef71979" - integrity sha512-rWVlfn0wOhI1Pwj1L9mxn7P3dfiRJ6TcmMdMh07MdGFlENkch3SnTKGMhI7wxESG7L+xmXE31hWMilFY9GOFbw== +"@dhis2/analytics@git+https://github.com/d2-ci/analytics.git#98dfdaae04c20d10adb314ddba3ec9daccb773f3": + version "26.7.4" + resolved "git+https://github.com/d2-ci/analytics.git#98dfdaae04c20d10adb314ddba3ec9daccb773f3" dependencies: - "@dhis2/multi-calendar-dates" "1.0.0" + "@dhis2/multi-calendar-dates" "^1.2.1" "@dnd-kit/core" "^6.0.7" "@dnd-kit/sortable" "^7.0.2" "@dnd-kit/utilities" "^3.2.1" @@ -2246,13 +2245,14 @@ i18next "^10.3" moment "^2.24.0" -"@dhis2/multi-calendar-dates@1.0.0": - version "1.0.0" - resolved "https://registry.yarnpkg.com/@dhis2/multi-calendar-dates/-/multi-calendar-dates-1.0.0.tgz#bf7f49aecdffa9781837a5d60d56a094b74ab4df" - integrity sha512-IB9a+feuS6yE4lpZj/eZ9uBmpYI7Hxitl2Op0JjoRL4tP+p6uw4ns9cjoSdUeIU9sOAxVZV7oQqSyIw+9P6YjQ== +"@dhis2/d2-i18n@^1.1.3": + version "1.1.3" + resolved "https://registry.yarnpkg.com/@dhis2/d2-i18n/-/d2-i18n-1.1.3.tgz#ad73030f7cfceeed1b5bcaad86a9b336130bdfb1" + integrity sha512-vOu6RDNumOJM396mHt35bETk9ai9b6XJyAwlUy1HstUZNvfET61F8rjCmMuXZU6zJ8ELux8kMFqlH8IG0vDJmA== dependencies: - "@js-temporal/polyfill" "^0.4.2" - classnames "^2.3.2" + "@types/i18next" "^11.9.0" + i18next "^10.3" + moment "^2.24.0" "@dhis2/multi-calendar-dates@^1.1.1": version "1.1.1" @@ -2262,6 +2262,15 @@ "@js-temporal/polyfill" "^0.4.2" classnames "^2.3.2" +"@dhis2/multi-calendar-dates@^1.2.1": + version "1.2.1" + resolved "https://registry.yarnpkg.com/@dhis2/multi-calendar-dates/-/multi-calendar-dates-1.2.1.tgz#d31ac037302879ae624d72d2373ac455b7e357e8" + integrity sha512-lIYwpDbHXKnquvkMDuT2E+V/MwjPDIPIfLi9xfWq5SkuZE3zSl0g65echWYySeZ7EzgRhrtYwA3nuWwuGfcV5Q== + dependencies: + "@dhis2/d2-i18n" "^1.1.3" + "@js-temporal/polyfill" "0.4.3" + classnames "^2.3.2" + "@dhis2/prop-types@^3.1.2": version "3.1.2" resolved "https://registry.yarnpkg.com/@dhis2/prop-types/-/prop-types-3.1.2.tgz#65b8ad2da8cd2f72bc8b951049a6c9d1b97af3e9" @@ -2817,7 +2826,7 @@ "@jridgewell/resolve-uri" "3.1.0" "@jridgewell/sourcemap-codec" "1.4.14" -"@js-temporal/polyfill@^0.4.2": +"@js-temporal/polyfill@0.4.3", "@js-temporal/polyfill@^0.4.2": version "0.4.3" resolved "https://registry.yarnpkg.com/@js-temporal/polyfill/-/polyfill-0.4.3.tgz#e8f8cf86745eb5050679c46a5ebedb9a9cc1f09b" integrity sha512-6Fmjo/HlkyVCmJzAPnvtEWlcbQUSRhi8qlN9EtJA/wP7FqXsevLLrlojR44kzNzrRkpf7eDJ+z7b4xQD/Ycypw== @@ -3370,6 +3379,11 @@ dependencies: "@types/node" "*" +"@types/i18next@^11.9.0": + version "11.9.3" + resolved "https://registry.yarnpkg.com/@types/i18next/-/i18next-11.9.3.tgz#04d84c6539908ad69665d26d8967f942d1638550" + integrity sha512-snM7bMKy6gt7UYdpjsxycqSCAy0fr2JVPY0B8tJ2vp9bN58cE7C880k20PWFM4KXxQ3KsstKM8DLCawGCIH0tg== + "@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0", "@types/istanbul-lib-coverage@^2.0.1": version "2.0.3" resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz#4ba8ddb720221f432e443bd5f9117fd22cfd4762" From 1ec3bcc34489dff99f9d22ab0b09f81acf2a4864 Mon Sep 17 00:00:00 2001 From: Edoardo Sabadelli Date: Tue, 25 Jun 2024 09:03:48 +0200 Subject: [PATCH 2/4] fix: bump analytics with fix for DHIS2-16904 --- package.json | 2 +- yarn.lock | 34 +++++++++------------------------- 2 files changed, 10 insertions(+), 26 deletions(-) diff --git a/package.json b/package.json index a8f9f285da..8a2f693aa2 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,7 @@ "typescript": "^4.8.4" }, "dependencies": { - "@dhis2/analytics": "git+https://github.com/d2-ci/analytics.git#98dfdaae04c20d10adb314ddba3ec9daccb773f3", + "@dhis2/analytics": "git+https://github.com/d2-ci/analytics.git#29ba83880b41d7797d09967edfb3f53165ec9843", "@dhis2/app-runtime": "^3.7.0", "@dhis2/app-runtime-adapter-d2": "^1.1.0", "@dhis2/app-service-datastore": "^1.0.0-beta.3", diff --git a/yarn.lock b/yarn.lock index 651517656a..de7dd2170c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2029,11 +2029,11 @@ classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2/analytics@git+https://github.com/d2-ci/analytics.git#98dfdaae04c20d10adb314ddba3ec9daccb773f3": +"@dhis2/analytics@git+https://github.com/d2-ci/analytics.git#29ba83880b41d7797d09967edfb3f53165ec9843": version "26.7.4" - resolved "git+https://github.com/d2-ci/analytics.git#98dfdaae04c20d10adb314ddba3ec9daccb773f3" + resolved "git+https://github.com/d2-ci/analytics.git#29ba83880b41d7797d09967edfb3f53165ec9843" dependencies: - "@dhis2/multi-calendar-dates" "^1.2.1" + "@dhis2/multi-calendar-dates" "^1.2.2" "@dnd-kit/core" "^6.0.7" "@dnd-kit/sortable" "^7.0.2" "@dnd-kit/utilities" "^3.2.1" @@ -2237,15 +2237,7 @@ resolved "https://registry.yarnpkg.com/@dhis2/cypress-plugins/-/cypress-plugins-10.0.3.tgz#83403aca333e2b356f7ea92c272d3ca00d00276d" integrity sha512-MYIkWI/kCR4hoqvD+spmbXcdoNL/EFX3HZuyRCGUErj5ChJmyWX7jQtDq/twd7GFRma0IqwTtOwaiKAxLRv/Nw== -"@dhis2/d2-i18n@^1.1.0", "@dhis2/d2-i18n@^1.1.1": - version "1.1.1" - resolved "https://registry.yarnpkg.com/@dhis2/d2-i18n/-/d2-i18n-1.1.1.tgz#acaca32cd00b60fd6b6f1dee571f2817a50e243c" - integrity sha512-X0jOCIKPaYv/2z0/sdkEvcbRiYu5o1FrOwvitiS6aKFxSL/GJ872I+UdHwpWJtL+yM7Z8E1epljazW0LnHUz0Q== - dependencies: - i18next "^10.3" - moment "^2.24.0" - -"@dhis2/d2-i18n@^1.1.3": +"@dhis2/d2-i18n@^1.1.0", "@dhis2/d2-i18n@^1.1.1", "@dhis2/d2-i18n@^1.1.3": version "1.1.3" resolved "https://registry.yarnpkg.com/@dhis2/d2-i18n/-/d2-i18n-1.1.3.tgz#ad73030f7cfceeed1b5bcaad86a9b336130bdfb1" integrity sha512-vOu6RDNumOJM396mHt35bETk9ai9b6XJyAwlUy1HstUZNvfET61F8rjCmMuXZU6zJ8ELux8kMFqlH8IG0vDJmA== @@ -2254,18 +2246,10 @@ i18next "^10.3" moment "^2.24.0" -"@dhis2/multi-calendar-dates@^1.1.1": - version "1.1.1" - resolved "https://registry.yarnpkg.com/@dhis2/multi-calendar-dates/-/multi-calendar-dates-1.1.1.tgz#fb76a77114ce0b757db7dd9f588d1a47809732da" - integrity sha512-kaisVuRGfdqY/Up6sWqgc81K67ymPVoRYgYRcT29z61ol2WhiTXTSTuRX/gDO1VKjmskeB5/badRrdLMf4BBUA== - dependencies: - "@js-temporal/polyfill" "^0.4.2" - classnames "^2.3.2" - -"@dhis2/multi-calendar-dates@^1.2.1": - version "1.2.1" - resolved "https://registry.yarnpkg.com/@dhis2/multi-calendar-dates/-/multi-calendar-dates-1.2.1.tgz#d31ac037302879ae624d72d2373ac455b7e357e8" - integrity sha512-lIYwpDbHXKnquvkMDuT2E+V/MwjPDIPIfLi9xfWq5SkuZE3zSl0g65echWYySeZ7EzgRhrtYwA3nuWwuGfcV5Q== +"@dhis2/multi-calendar-dates@^1.1.1", "@dhis2/multi-calendar-dates@^1.2.2": + version "1.2.2" + resolved "https://registry.yarnpkg.com/@dhis2/multi-calendar-dates/-/multi-calendar-dates-1.2.2.tgz#c34e5172474ddc73ad829515ed4c489fb8023669" + integrity sha512-Bl4y2+oDMJLZwtQ1Djfd+wJxOkGixBl6SCuLNH08B3RJSTwF/HcwgtY0vv7tcKUs63SwS7fK6ittXphyB4HJjQ== dependencies: "@dhis2/d2-i18n" "^1.1.3" "@js-temporal/polyfill" "0.4.3" @@ -2826,7 +2810,7 @@ "@jridgewell/resolve-uri" "3.1.0" "@jridgewell/sourcemap-codec" "1.4.14" -"@js-temporal/polyfill@0.4.3", "@js-temporal/polyfill@^0.4.2": +"@js-temporal/polyfill@0.4.3": version "0.4.3" resolved "https://registry.yarnpkg.com/@js-temporal/polyfill/-/polyfill-0.4.3.tgz#e8f8cf86745eb5050679c46a5ebedb9a9cc1f09b" integrity sha512-6Fmjo/HlkyVCmJzAPnvtEWlcbQUSRhi8qlN9EtJA/wP7FqXsevLLrlojR44kzNzrRkpf7eDJ+z7b4xQD/Ycypw== From 7bec4029a8a06411ca7ff509a67265114c840c19 Mon Sep 17 00:00:00 2001 From: Edoardo Sabadelli Date: Tue, 25 Jun 2024 09:24:29 +0200 Subject: [PATCH 3/4] fix: bump analytics for testing --- package.json | 2 +- yarn.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 8a2f693aa2..afc2abbada 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,7 @@ "typescript": "^4.8.4" }, "dependencies": { - "@dhis2/analytics": "git+https://github.com/d2-ci/analytics.git#29ba83880b41d7797d09967edfb3f53165ec9843", + "@dhis2/analytics": "git+https://github.com/d2-ci/analytics.git#4a57d3a7a448f11a7ae9b421bcd0bc9e5dfc78c1", "@dhis2/app-runtime": "^3.7.0", "@dhis2/app-runtime-adapter-d2": "^1.1.0", "@dhis2/app-service-datastore": "^1.0.0-beta.3", diff --git a/yarn.lock b/yarn.lock index de7dd2170c..03d9128270 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2029,9 +2029,9 @@ classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2/analytics@git+https://github.com/d2-ci/analytics.git#29ba83880b41d7797d09967edfb3f53165ec9843": +"@dhis2/analytics@git+https://github.com/d2-ci/analytics.git#4a57d3a7a448f11a7ae9b421bcd0bc9e5dfc78c1": version "26.7.4" - resolved "git+https://github.com/d2-ci/analytics.git#29ba83880b41d7797d09967edfb3f53165ec9843" + resolved "git+https://github.com/d2-ci/analytics.git#4a57d3a7a448f11a7ae9b421bcd0bc9e5dfc78c1" dependencies: "@dhis2/multi-calendar-dates" "^1.2.2" "@dnd-kit/core" "^6.0.7" From e898066f6a37f6a72ea9eebc08bec94ce295bbf5 Mon Sep 17 00:00:00 2001 From: HendrikThePendric Date: Tue, 25 Jun 2024 11:50:10 +0200 Subject: [PATCH 4/4] fix: bump analytics to 26.7.5 for period translations --- package.json | 2 +- yarn.lock | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index afc2abbada..d02d4b185f 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,7 @@ "typescript": "^4.8.4" }, "dependencies": { - "@dhis2/analytics": "git+https://github.com/d2-ci/analytics.git#4a57d3a7a448f11a7ae9b421bcd0bc9e5dfc78c1", + "@dhis2/analytics": "^26.7.5", "@dhis2/app-runtime": "^3.7.0", "@dhis2/app-runtime-adapter-d2": "^1.1.0", "@dhis2/app-service-datastore": "^1.0.0-beta.3", diff --git a/yarn.lock b/yarn.lock index 03d9128270..1b7e4a51ce 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2029,9 +2029,10 @@ classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2/analytics@git+https://github.com/d2-ci/analytics.git#4a57d3a7a448f11a7ae9b421bcd0bc9e5dfc78c1": - version "26.7.4" - resolved "git+https://github.com/d2-ci/analytics.git#4a57d3a7a448f11a7ae9b421bcd0bc9e5dfc78c1" +"@dhis2/analytics@^26.7.5": + version "26.7.5" + resolved "https://registry.yarnpkg.com/@dhis2/analytics/-/analytics-26.7.5.tgz#b85a35ba0adb971b237c814d1d384e10e3ec5ca1" + integrity sha512-YLkCOXWGm8JFlpq0AZhWsMxA6lJeRTixHDeMqdyZQeYPYCvZJiUAp0TtC+uSRK1uV1yIHRj4OjQytMWTsvUUnQ== dependencies: "@dhis2/multi-calendar-dates" "^1.2.2" "@dnd-kit/core" "^6.0.7"