From 3140c878486bbab520c71dfac45b167be06a5d98 Mon Sep 17 00:00:00 2001 From: HendrikThePendric Date: Thu, 20 Jun 2024 16:52:25 +0200 Subject: [PATCH 1/2] Revert "chore: upgrade @dhis2/analytics for scoped pivot table styles v39 (#3103)" This reverts commit c6eab75125e031e00a37391a8570f4b9fd2e8811. --- packages/app/package.json | 2 +- packages/plugin/package.json | 2 +- yarn.lock | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/app/package.json b/packages/app/package.json index 4fa239243c..a87638c4dc 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -13,7 +13,7 @@ "redux-mock-store": "^1.5.4" }, "dependencies": { - "@dhis2/analytics": "^24.10.11", + "@dhis2/analytics": "^24.10.10", "@dhis2/app-runtime": "^3.9.0", "@dhis2/app-runtime-adapter-d2": "^1.1.0", "@dhis2/app-service-datastore": "^1.0.0-beta.3", diff --git a/packages/plugin/package.json b/packages/plugin/package.json index dd26af7675..9a30fd2c57 100644 --- a/packages/plugin/package.json +++ b/packages/plugin/package.json @@ -14,7 +14,7 @@ "access": "public" }, "dependencies": { - "@dhis2/analytics": "^24.10.11", + "@dhis2/analytics": "^24.10.10", "@dhis2/app-runtime": "^3.9.0", "@dhis2/d2-i18n": "^1.1.0", "@dhis2/ui": "^8.4.11", diff --git a/yarn.lock b/yarn.lock index ba88fd8d30..ddf4ec7149 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2145,10 +2145,10 @@ classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2/analytics@^24.10.11": - version "24.10.11" - resolved "https://registry.yarnpkg.com/@dhis2/analytics/-/analytics-24.10.11.tgz#32237c1c5fee150a24cda57d8083a61c294d4d92" - integrity sha512-uRnV1/6A+PjREFk/9x1IUsnJUKjXeTm4+ycG4S0NO6Q76ii3mOQu2YYOjWYbGNRs0I4rz1uGhJXdv5ouo0zfKw== +"@dhis2/analytics@^24.10.10": + version "24.10.10" + resolved "https://registry.yarnpkg.com/@dhis2/analytics/-/analytics-24.10.10.tgz#b9d35b9a86afb6634b688eab2f50004f0edeb492" + integrity sha512-YNfjUy64eZ9wfepSe/Dr53yYay0tFL8nS+mgwXvU1P2qZM41VDqlvutas5DCNhr2kufCZeD15LC1nQlYQn8Tcg== dependencies: "@dhis2/d2-ui-rich-text" "^7.4.0" "@dhis2/multi-calendar-dates" "1.0.0" From 927cc1c87fbd5de1054db220c3adbbbf46bbfef5 Mon Sep 17 00:00:00 2001 From: Hendrik de Graaf Date: Thu, 20 Jun 2024 16:14:56 +0200 Subject: [PATCH 2/2] fix: upgrade @dhis2/analytics for scoped pivot table styles v39 (#3103) * chore: upgrade analytics dependency to branch ci bundle * fix: upgrade analytics package to 24.10.11 * chore: update yarn.lock file --- packages/app/package.json | 2 +- packages/plugin/package.json | 2 +- yarn.lock | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/app/package.json b/packages/app/package.json index a87638c4dc..4fa239243c 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -13,7 +13,7 @@ "redux-mock-store": "^1.5.4" }, "dependencies": { - "@dhis2/analytics": "^24.10.10", + "@dhis2/analytics": "^24.10.11", "@dhis2/app-runtime": "^3.9.0", "@dhis2/app-runtime-adapter-d2": "^1.1.0", "@dhis2/app-service-datastore": "^1.0.0-beta.3", diff --git a/packages/plugin/package.json b/packages/plugin/package.json index 9a30fd2c57..dd26af7675 100644 --- a/packages/plugin/package.json +++ b/packages/plugin/package.json @@ -14,7 +14,7 @@ "access": "public" }, "dependencies": { - "@dhis2/analytics": "^24.10.10", + "@dhis2/analytics": "^24.10.11", "@dhis2/app-runtime": "^3.9.0", "@dhis2/d2-i18n": "^1.1.0", "@dhis2/ui": "^8.4.11", diff --git a/yarn.lock b/yarn.lock index ddf4ec7149..ba88fd8d30 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2145,10 +2145,10 @@ classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2/analytics@^24.10.10": - version "24.10.10" - resolved "https://registry.yarnpkg.com/@dhis2/analytics/-/analytics-24.10.10.tgz#b9d35b9a86afb6634b688eab2f50004f0edeb492" - integrity sha512-YNfjUy64eZ9wfepSe/Dr53yYay0tFL8nS+mgwXvU1P2qZM41VDqlvutas5DCNhr2kufCZeD15LC1nQlYQn8Tcg== +"@dhis2/analytics@^24.10.11": + version "24.10.11" + resolved "https://registry.yarnpkg.com/@dhis2/analytics/-/analytics-24.10.11.tgz#32237c1c5fee150a24cda57d8083a61c294d4d92" + integrity sha512-uRnV1/6A+PjREFk/9x1IUsnJUKjXeTm4+ycG4S0NO6Q76ii3mOQu2YYOjWYbGNRs0I4rz1uGhJXdv5ouo0zfKw== dependencies: "@dhis2/d2-ui-rich-text" "^7.4.0" "@dhis2/multi-calendar-dates" "1.0.0"