Skip to content

Commit

Permalink
chore: use analytics build from d2-ci for testing
Browse files Browse the repository at this point in the history
  • Loading branch information
@edoardo
edoardo committed Jul 3, 2024
1 parent 04d645c commit 26d68bb
Show file tree
Hide file tree
Showing 2 changed files with 67 additions and 31 deletions.
8 changes: 4 additions & 4 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"postinstall": "patch-package"
},
"devDependencies": {
"@dhis2/cli-app-scripts": "^11.3.1",
"@dhis2/cli-app-scripts": "^11.5.1",
"@dhis2/cli-style": "^10.5.1",
"@dhis2/cypress-commands": "^10.0.3",
"@dhis2/cypress-plugins": "^10.0.3",
Expand All @@ -37,8 +37,8 @@
"start-server-and-test": "^2.0.3"
},
"dependencies": {
"@dhis2/analytics": "^26.7.5",
"@dhis2/app-runtime": "^3.10.4",
"@dhis2/analytics": "git+https://github.com/d2-ci/analytics.git#aeb044f99c37f435a707c1d6369f1aa8c032a0ad",
"@dhis2/app-runtime": "^3.10.5",
"@dhis2/app-runtime-adapter-d2": "^1.1.0",
"@dhis2/app-service-alerts": "3.9.4",
"@dhis2/app-service-datastore": "^1.0.0-beta.3",
Expand Down Expand Up @@ -83,7 +83,7 @@
},
"resolutions": {
"@dhis2/ui": "^9.2.0",
"@dhis2/app-runtime": "3.10.4",
"@dhis2/app-runtime": "3.10.5",
"@dhis2/app-service-alerts": "3.9.4"
}
}
90 changes: 63 additions & 27 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2016,10 +2016,9 @@
classnames "^2.3.1"
prop-types "^15.7.2"

"@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==
"@dhis2/analytics@git+https://github.com/d2-ci/analytics.git#aeb044f99c37f435a707c1d6369f1aa8c032a0ad":
version "26.7.6"
resolved "git+https://github.com/d2-ci/analytics.git#aeb044f99c37f435a707c1d6369f1aa8c032a0ad"
dependencies:
"@dhis2/multi-calendar-dates" "^1.2.2"
"@dnd-kit/core" "^6.0.7"
Expand All @@ -2037,12 +2036,12 @@
react-beautiful-dnd "^10.1.1"
resize-observer-polyfill "^1.5.1"

"@dhis2/app-adapter@11.3.1":
version "11.3.1"
resolved "https://registry.yarnpkg.com/@dhis2/app-adapter/-/app-adapter-11.3.1.tgz#7c0e3d676f90d9298002707884df3fd10ea185db"
integrity sha512-SP3ikUTCSgUWBY01gWNxNHqii2VsMrgMM7uQrcgx5FKs905omPeBhPKq1f1E8kgG5hh7NHgKFlV8UFvn1zVuUw==
"@dhis2/app-adapter@11.5.1":
version "11.5.1"
resolved "https://registry.yarnpkg.com/@dhis2/app-adapter/-/app-adapter-11.5.1.tgz#b4bffdfdb99791b84d5bf2b66a9ad2d77b39bc73"
integrity sha512-YszqMmvMyT6G7RN7yrVcQ8BFFHeDeW8UwWsldBioNL9W9dQKRlFinyUkbcmJKf6yDtL923QcpiPJYcZT77ZQKg==
dependencies:
"@dhis2/pwa" "11.3.1"
"@dhis2/pwa" "11.5.1"
moment "^2.24.0"

"@dhis2/app-runtime-adapter-d2@^1.1.0":
Expand All @@ -2063,7 +2062,18 @@
"@dhis2/app-service-offline" "3.10.4"
"@dhis2/app-service-plugin" "3.10.4"

"@dhis2/[email protected]", "@dhis2/[email protected]":
"@dhis2/app-runtime@^3.10.5":
version "3.10.5"
resolved "https://registry.yarnpkg.com/@dhis2/app-runtime/-/app-runtime-3.10.5.tgz#de6f37a872deef322017d37ab4f1597bc9ad42d6"
integrity sha512-Y07FY3ZGGI8oaCxVcJXu8P/x0WZWt9luLWd8pGPDK2+59NjyVTuevJkH7BM//oZI9+M91ExIRiELNe2ZdXLInQ==
dependencies:
"@dhis2/app-service-alerts" "3.10.5"
"@dhis2/app-service-config" "3.10.5"
"@dhis2/app-service-data" "3.10.5"
"@dhis2/app-service-offline" "3.10.5"
"@dhis2/app-service-plugin" "3.10.5"

"@dhis2/[email protected]", "@dhis2/[email protected]", "@dhis2/[email protected]":
version "3.9.4"
resolved "https://registry.yarnpkg.com/@dhis2/app-service-alerts/-/app-service-alerts-3.9.4.tgz#5aed2b191bb98bbf5eb14babb495b70f28b69aff"
integrity sha512-Oq2PZMcYyB+uXNwmifclv8oVobuKLTfN9ia7Gwa5G63c7Zjl4HldOxrM3TGDnsGYWfuGxtm8LNuzKfFX91HWmg==
Expand All @@ -2073,13 +2083,25 @@
resolved "https://registry.yarnpkg.com/@dhis2/app-service-config/-/app-service-config-3.10.4.tgz#2bede4df9b036350200cbc085a2a68439fa4fa0a"
integrity sha512-SCFdNxJKpiBjYsU9s0R+u9GrXjzmUEpGpudmC5eQqNV6ajLiebe/pS2jcSPFzjUtHVQMADk0X8TkERoOBqWcxA==

"@dhis2/[email protected]":
version "3.10.5"
resolved "https://registry.yarnpkg.com/@dhis2/app-service-config/-/app-service-config-3.10.5.tgz#a97b7bc8fdb311ecf149efb452245708d4f8744d"
integrity sha512-qW2zopHjyVyzgAYs2+BlIMpIZcKTIzHQjCBI8fxkPNpSQhKxC2i4O/RYaIBtW6kuTbU9BCKxO+qrrRnhnOb7Vw==

"@dhis2/[email protected]":
version "3.10.4"
resolved "https://registry.yarnpkg.com/@dhis2/app-service-data/-/app-service-data-3.10.4.tgz#dcd993a24d2edd97e7ad8a042a682e60582740ff"
integrity sha512-RaoWniioCe33PcPZoDuO66qOrIt0JeeCN8RzmCDrRVGvGmlDTZ3hNuWm9CnsAvO1U6sYDiulKPqrEQu8YKMG0w==
dependencies:
react-query "^3.13.11"

"@dhis2/[email protected]":
version "3.10.5"
resolved "https://registry.yarnpkg.com/@dhis2/app-service-data/-/app-service-data-3.10.5.tgz#a1b533e32c6506fe2967f840ed4bd11987170c2f"
integrity sha512-edAG57lAPNs3NnboDI+SZ5+xKzU3vk7AiZ+P6onnFfqwDVqWgxnl1qJUO5ZvPdslsli3ZJYqEjMh03ChtF5zeA==
dependencies:
react-query "^3.13.11"

"@dhis2/app-service-data@^2.1.1":
version "2.12.4"
resolved "https://registry.yarnpkg.com/@dhis2/app-service-data/-/app-service-data-2.12.4.tgz#3445a113592444100f66849f522f5270b9302fbd"
Expand All @@ -2100,23 +2122,37 @@
dependencies:
lodash "^4.17.21"

"@dhis2/[email protected]":
version "3.10.5"
resolved "https://registry.yarnpkg.com/@dhis2/app-service-offline/-/app-service-offline-3.10.5.tgz#f38f8ac1fb04c9ea40dd6ea4af4fe2e43f6f2be2"
integrity sha512-i5i6abootrCyy2VTC6hB8NKEART6HzAAtSP05gxtoqTLGlVMQGOdm56hojeZGdWRoU/CmGBmgy283r6zUbMW0A==
dependencies:
lodash "^4.17.21"

"@dhis2/[email protected]":
version "3.10.4"
resolved "https://registry.yarnpkg.com/@dhis2/app-service-plugin/-/app-service-plugin-3.10.4.tgz#f5412a1320393042012dd75713e3215e51628554"
integrity sha512-GW6xa/5y2yFXvhtLConnaOxKqyu6VPZWRBaQR73/bRRmFcnd7hlMkZ2M0GWSjoW4QHLXlLhXHFsgHPETBftkPg==
dependencies:
post-robot "^10.0.46"

"@dhis2/[email protected]":
version "11.3.1"
resolved "https://registry.yarnpkg.com/@dhis2/app-shell/-/app-shell-11.3.1.tgz#b08ff8ca44fca9dae77c909ab6cb068c3c2ed5eb"
integrity sha512-Kbw4pHH/OSFXM1aBJJSNuTQtvBQIS0TFlK93hO/f5M+Yq37WYMLC9WWOyqCLRU1vtht8NRqWaYBGZ6qLGqZXYQ==
"@dhis2/[email protected]":
version "3.10.5"
resolved "https://registry.yarnpkg.com/@dhis2/app-service-plugin/-/app-service-plugin-3.10.5.tgz#cf6261f44c802a5f82dafeeffdf64761296258fc"
integrity sha512-8FBe1udhLGVoyMq/4jaLjY32D8u2tvWtY75T7AfaIthB6U5KPzgQeGRqeU1om3LlCkxuyILYgHrR4g5i1LlOIA==
dependencies:
post-robot "^10.0.46"

"@dhis2/[email protected]":
version "11.5.1"
resolved "https://registry.yarnpkg.com/@dhis2/app-shell/-/app-shell-11.5.1.tgz#bc51f787e853efb8ffa81ab784db144614e6529d"
integrity sha512-b3lSywJaygMlqw8ZgfBILOXz6QuYCPrYP3gNn+mm1ZrEXD8yc/f2gwYT2vgxqNUgZ7H0xT9B0mKP83+KUOFCtQ==
dependencies:
"@dhis2/app-adapter" "11.3.1"
"@dhis2/app-adapter" "11.5.1"
"@dhis2/app-runtime" "^3.10.4"
"@dhis2/d2-i18n" "^1.1.1"
"@dhis2/pwa" "11.3.1"
"@dhis2/ui" "^9.4.4"
"@dhis2/pwa" "11.5.1"
"@dhis2/ui" "^9.8.9"
classnames "^2.2.6"
moment "^2.29.1"
post-robot "^10.0.46"
Expand All @@ -2129,10 +2165,10 @@
typeface-roboto "^0.0.75"
typescript "^3.6.3"

"@dhis2/cli-app-scripts@^11.3.1":
version "11.3.1"
resolved "https://registry.yarnpkg.com/@dhis2/cli-app-scripts/-/cli-app-scripts-11.3.1.tgz#0045e0dbb97e7d95ec1b94ec92c02e610130c8ca"
integrity sha512-V0fOhail1LG9pz+tujHXPztu5xUb5QX88AbeqcDnLyncRE21cAovWDztsiBNLBsv/rynowACD7xyDaMH7LjiVQ==
"@dhis2/cli-app-scripts@^11.5.1":
version "11.5.1"
resolved "https://registry.yarnpkg.com/@dhis2/cli-app-scripts/-/cli-app-scripts-11.5.1.tgz#cd4f6ab39fdb47414ce0abf9e14a11a7a3792efb"
integrity sha512-FjHivrij+mk1TGpJ0hgj0u28GgBiovrNV/G9T3IPSgHUO2QiYIiiUUkZ/I16kpPxzVsTmK8y4QCjEq8BBMX2gA==
dependencies:
"@babel/core" "^7.6.2"
"@babel/plugin-proposal-class-properties" "^7.8.3"
Expand All @@ -2141,7 +2177,7 @@
"@babel/preset-env" "^7.14.7"
"@babel/preset-react" "^7.0.0"
"@babel/preset-typescript" "^7.6.0"
"@dhis2/app-shell" "11.3.1"
"@dhis2/app-shell" "11.5.1"
"@dhis2/cli-helpers-engine" "^3.2.0"
"@jest/core" "^27.0.6"
"@pmmmwh/react-refresh-webpack-plugin" "^0.5.4"
Expand Down Expand Up @@ -2285,10 +2321,10 @@
resolved "https://registry.yarnpkg.com/@dhis2/prop-types/-/prop-types-3.1.2.tgz#65b8ad2da8cd2f72bc8b951049a6c9d1b97af3e9"
integrity sha512-eM0jjLOWvtXWqSFp5YC4DHFpkP8Y1D2eUwGV7MBWjni+o27oesVan+oT7WHeOeLdlAd4acRJrnaaAyB4Ck1wGQ==

"@dhis2/pwa@11.3.1":
version "11.3.1"
resolved "https://registry.yarnpkg.com/@dhis2/pwa/-/pwa-11.3.1.tgz#416a6d019cd765f6dc407f6cd779c29a2ac73ef4"
integrity sha512-uKjw/sUA2cCJwNuSVX9UaCpGvh3Jab5jzINsX21yWJDm6ofM68PVLL6HeSpBPD1lfjUwVrlQxoHp5j/HCgX0cA==
"@dhis2/pwa@11.5.1":
version "11.5.1"
resolved "https://registry.yarnpkg.com/@dhis2/pwa/-/pwa-11.5.1.tgz#3b290659a64b28d47eb35229796b0e3ddb9292a9"
integrity sha512-gN8BGSNhpw8UVseXNOV4/mY3OlMU99nh4Zm0L2LZhRzktdY+oncsopvlq8EP2mXcIP64lMt//pKE/OTDXTCtfg==
dependencies:
idb "^6.0.0"
workbox-core "^6.1.5"
Expand Down Expand Up @@ -2328,7 +2364,7 @@
resolved "https://registry.yarnpkg.com/@dhis2/ui-icons/-/ui-icons-9.2.0.tgz#bddf5223cabec93c9499281b2181eb165346b639"
integrity sha512-g9993UGWVLwDcbV+wp3HqrK8AXFu49aped0GpZsQUlGbHIzEl1EgmjiII44N40VbXwVUnqIDmu99wBxpH5Gd+g==

"@dhis2/ui@^9.2.0", "@dhis2/ui@^9.4.4":
"@dhis2/ui@^9.2.0", "@dhis2/ui@^9.8.9":
version "9.2.0"
resolved "https://registry.yarnpkg.com/@dhis2/ui/-/ui-9.2.0.tgz#33d474cbc7cd95f8a714e019d6c69e144f77f86b"
integrity sha512-nhKwW5bmIfQvt3L16PffFO2NsDk9BgYb91vHx06fPgM56UdwGYSejpax8eU29vE9urmHSkijSpnBqY4buZy6Ow==
Expand Down

0 comments on commit 26d68bb

Please sign in to comment.