From 1f69d8566713c287c08898d0ab46eed11ab9ce08 Mon Sep 17 00:00:00 2001 From: HendrikThePendric Date: Wed, 19 Jun 2024 15:08:27 +0200 Subject: [PATCH 1/3] chore: upgrade analytics dependency to branch ci bundle --- packages/app/package.json | 2 +- packages/plugin/package.json | 2 +- yarn.lock | 5 ++--- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/packages/app/package.json b/packages/app/package.json index a87638c4dc..4d66daf33e 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": "git+https://github.com/d2-ci/analytics.git#418c49ef9961909473b62ac7af878dfed69c43b1", "@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..531dd11d91 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": "git+https://github.com/d2-ci/analytics.git#418c49ef9961909473b62ac7af878dfed69c43b1", "@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..406f8793f6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2145,10 +2145,9 @@ classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2/analytics@^24.10.10": +"@dhis2/analytics@git+https://github.com/d2-ci/analytics.git#418c49ef9961909473b62ac7af878dfed69c43b1": version "24.10.10" - resolved "https://registry.yarnpkg.com/@dhis2/analytics/-/analytics-24.10.10.tgz#b9d35b9a86afb6634b688eab2f50004f0edeb492" - integrity sha512-YNfjUy64eZ9wfepSe/Dr53yYay0tFL8nS+mgwXvU1P2qZM41VDqlvutas5DCNhr2kufCZeD15LC1nQlYQn8Tcg== + resolved "git+https://github.com/d2-ci/analytics.git#418c49ef9961909473b62ac7af878dfed69c43b1" dependencies: "@dhis2/d2-ui-rich-text" "^7.4.0" "@dhis2/multi-calendar-dates" "1.0.0" From 5e8edad35d56657de6423f011b508d3524fd2208 Mon Sep 17 00:00:00 2001 From: HendrikThePendric Date: Thu, 20 Jun 2024 12:59:02 +0200 Subject: [PATCH 2/3] fix: upgrade analytics package to 24.10.11 --- packages/app/package.json | 2 +- packages/plugin/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/app/package.json b/packages/app/package.json index 4d66daf33e..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": "git+https://github.com/d2-ci/analytics.git#418c49ef9961909473b62ac7af878dfed69c43b1", + "@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 531dd11d91..dd26af7675 100644 --- a/packages/plugin/package.json +++ b/packages/plugin/package.json @@ -14,7 +14,7 @@ "access": "public" }, "dependencies": { - "@dhis2/analytics": "git+https://github.com/d2-ci/analytics.git#418c49ef9961909473b62ac7af878dfed69c43b1", + "@dhis2/analytics": "^24.10.11", "@dhis2/app-runtime": "^3.9.0", "@dhis2/d2-i18n": "^1.1.0", "@dhis2/ui": "^8.4.11", From 1d21b3e1772756b7df084233d2734dfe6e2f1597 Mon Sep 17 00:00:00 2001 From: HendrikThePendric Date: Thu, 20 Jun 2024 13:00:36 +0200 Subject: [PATCH 3/3] chore: update yarn.lock file --- yarn.lock | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 406f8793f6..ba88fd8d30 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2145,9 +2145,10 @@ classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2/analytics@git+https://github.com/d2-ci/analytics.git#418c49ef9961909473b62ac7af878dfed69c43b1": - version "24.10.10" - resolved "git+https://github.com/d2-ci/analytics.git#418c49ef9961909473b62ac7af878dfed69c43b1" +"@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"