From 1ec3bcc34489dff99f9d22ab0b09f81acf2a4864 Mon Sep 17 00:00:00 2001 From: Edoardo Sabadelli Date: Tue, 25 Jun 2024 09:03:48 +0200 Subject: [PATCH] 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==