From 35e3fc4b9da6f5e82503395ff68a564029ccacb5 Mon Sep 17 00:00:00 2001 From: Edoardo Sabadelli Date: Fri, 24 May 2024 15:21:39 +0200 Subject: [PATCH] chore: update app-runtime and cli-app-scripts to latest --- package.json | 4 +- .../Visualization/IframePlugin.js | 3 +- yarn.lock | 122 ++++++++---------- 3 files changed, 60 insertions(+), 69 deletions(-) diff --git a/package.json b/package.json index deb928dd5..806f8e872 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "license": "BSD-3-Clause", "dependencies": { "@dhis2/analytics": "^26.6.10", - "@dhis2/app-runtime": "^3.10.2", + "@dhis2/app-runtime": "^3.10.4", "@dhis2/app-runtime-adapter-d2": "^1.1.0", "@dhis2/d2-i18n": "^1.1.3", "@dhis2/d2-ui-rich-text": "^7.4.3", @@ -44,7 +44,7 @@ "cy:run": "d2-utils-cypress run --appStart 'yarn cypress:start'" }, "devDependencies": { - "@dhis2/cli-app-scripts": "^10.4.0-alpha.5", + "@dhis2/cli-app-scripts": "^11.2.2", "@dhis2/cli-style": "^10.5.1", "@dhis2/cli-utils-cypress": "^7.0.1", "@dhis2/cypress-commands": "^7.0.1", diff --git a/src/components/Item/VisualizationItem/Visualization/IframePlugin.js b/src/components/Item/VisualizationItem/Visualization/IframePlugin.js index bf17783fb..b545186d9 100644 --- a/src/components/Item/VisualizationItem/Visualization/IframePlugin.js +++ b/src/components/Item/VisualizationItem/Visualization/IframePlugin.js @@ -1,5 +1,6 @@ -import { useConfig, Plugin } from '@dhis2/app-runtime' +import { useConfig } from '@dhis2/app-runtime' import { useD2 } from '@dhis2/app-runtime-adapter-d2' +import { Plugin } from '@dhis2/app-runtime/experimental' import { CenteredContent, CircularLoader } from '@dhis2/ui' import PropTypes from 'prop-types' import React, { useCallback, useEffect, useMemo, useState } from 'react' diff --git a/yarn.lock b/yarn.lock index e859951ce..eaba3e31f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2266,12 +2266,12 @@ react-beautiful-dnd "^10.1.1" resize-observer-polyfill "^1.5.1" -"@dhis2/app-adapter@10.4.0-alpha.5": - version "10.4.0-alpha.5" - resolved "https://registry.yarnpkg.com/@dhis2/app-adapter/-/app-adapter-10.4.0-alpha.5.tgz#21f76f44b81e41b1c926fb35c7d55fab8e280ab9" - integrity sha512-/DCGOmwoAVNDXxAZJX+OtE9WzDYsTlFWzCZD4diO5oNawnbxW3V/UN0poQdP7ydg7zUp5+u8Hqa7MWEr31rOWw== +"@dhis2/app-adapter@11.2.2": + version "11.2.2" + resolved "https://registry.yarnpkg.com/@dhis2/app-adapter/-/app-adapter-11.2.2.tgz#0e5a8525c6c8adb11a8e33d33bfba78eb7731d62" + integrity sha512-T7kownygvtl/9brKr39xojv4UXAvlvZaBLwkKAoSt1XcDAYpw97vcxs8K5RG00cbLV91I194jVfnKTg2bjuajw== dependencies: - "@dhis2/pwa" "10.4.0-alpha.5" + "@dhis2/pwa" "11.2.2" moment "^2.24.0" "@dhis2/app-runtime-adapter-d2@^1.1.0": @@ -2281,68 +2281,58 @@ dependencies: prop-types "^15.7.2" -"@dhis2/app-runtime@^3.10.0-alpha.2": - version "3.10.0-alpha.5" - resolved "https://registry.yarnpkg.com/@dhis2/app-runtime/-/app-runtime-3.10.0-alpha.5.tgz#81b397e3f4bb4dd47122bea788b80f827c6b6a59" - integrity sha512-AUTanKXQ6H222o9RPBOss3VL2ZjBkpnmWFC7COVDCqkuTTZok8GyiWHEsHeRv2h0npJR/xdT2rsRMX6kvhGxxw== - dependencies: - "@dhis2/app-service-alerts" "3.10.0-alpha.5" - "@dhis2/app-service-config" "3.10.0-alpha.5" - "@dhis2/app-service-data" "3.10.0-alpha.5" - "@dhis2/app-service-offline" "3.10.0-alpha.5" - -"@dhis2/app-runtime@^3.10.2": - version "3.10.2" - resolved "https://registry.yarnpkg.com/@dhis2/app-runtime/-/app-runtime-3.10.2.tgz#e82639bd68234bdeaf2f6d3c256dcdfcdd267da2" - integrity sha512-GiftKk8ZTXlPElXAgVJn41Vj6E1vEGTPGrjrqU7j41ZTYsg+tUcCkISNt1woe5l7E+8+y+9Fy4bgqSsBOAEUvg== - dependencies: - "@dhis2/app-service-alerts" "3.10.2" - "@dhis2/app-service-config" "3.10.2" - "@dhis2/app-service-data" "3.10.2" - "@dhis2/app-service-offline" "3.10.2" - "@dhis2/app-service-plugin" "3.10.2" - -"@dhis2/app-service-alerts@3.10.2": - version "3.10.2" - resolved "https://registry.yarnpkg.com/@dhis2/app-service-alerts/-/app-service-alerts-3.10.2.tgz#0e07c3530606f81ab998a20f2c478600b6027a77" - integrity sha512-2IqaawnlOzYVJLBF2AKVQJ4cuxJNZD7FK0XE0XOv1WwFs70h6bp23MQueIJ/QHxLo7lamE0FC22m4diM4P0CuA== - -"@dhis2/app-service-config@3.10.2": - version "3.10.2" - resolved "https://registry.yarnpkg.com/@dhis2/app-service-config/-/app-service-config-3.10.2.tgz#be52676068e31cdb1fe3f8ddabb8153e1cd6e3e6" - integrity sha512-Crw7Tx4yg4qWw3qYxNCIye77IaY2HUYyDmDKPVVWzgmrcSGxpunv/NtsUg12pxrVfVLnqlH9L6AF9A6hO0afmw== - -"@dhis2/app-service-data@3.10.2": - version "3.10.2" - resolved "https://registry.yarnpkg.com/@dhis2/app-service-data/-/app-service-data-3.10.2.tgz#e94d45d87cab5e156decfe9e92e3153e5df68ba0" - integrity sha512-+ESLrVEDQKXBaQmpaCq78RonkqJM2BliykaO4QBeOc4ilWohaqYajue1Ntg4uV2KrdkCylBdMDwGYjsak0G7hg== +"@dhis2/app-runtime@^3.10.4": + version "3.10.4" + resolved "https://registry.yarnpkg.com/@dhis2/app-runtime/-/app-runtime-3.10.4.tgz#6064ac728770cc94c4d1975db32bd38533655cc6" + integrity sha512-W/d0WcYYcKAeE5/xCunZEMYUSD1fxG+JDQdRDEUsH5y5hB8i/4o2QQrZK8xa19Z3xQJhaW5ypWWqIQVjTJT2Ww== + dependencies: + "@dhis2/app-service-alerts" "3.10.4" + "@dhis2/app-service-config" "3.10.4" + "@dhis2/app-service-data" "3.10.4" + "@dhis2/app-service-offline" "3.10.4" + "@dhis2/app-service-plugin" "3.10.4" + +"@dhis2/app-service-alerts@3.10.4": + version "3.10.4" + resolved "https://registry.yarnpkg.com/@dhis2/app-service-alerts/-/app-service-alerts-3.10.4.tgz#a7cce660015d79980679175e677cf6c6c3f4c7eb" + integrity sha512-DmSLx/kHOHpgGiL8zG0oa6D3MeCY3wPMDGqj+Gfegr654Lmyf4d2vLI7HSZUSOCdraP/fSYTypsdZmWYoXoLBQ== + +"@dhis2/app-service-config@3.10.4": + version "3.10.4" + resolved "https://registry.yarnpkg.com/@dhis2/app-service-config/-/app-service-config-3.10.4.tgz#2bede4df9b036350200cbc085a2a68439fa4fa0a" + integrity sha512-SCFdNxJKpiBjYsU9s0R+u9GrXjzmUEpGpudmC5eQqNV6ajLiebe/pS2jcSPFzjUtHVQMADk0X8TkERoOBqWcxA== + +"@dhis2/app-service-data@3.10.4": + 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/app-service-offline@3.10.2": - version "3.10.2" - resolved "https://registry.yarnpkg.com/@dhis2/app-service-offline/-/app-service-offline-3.10.2.tgz#082279b7045e702c2eecda751d762225313156b0" - integrity sha512-bTp+CCRbyKt/0QADj0O6wLNWhi+6QDkjt2+sfpv3M8oKcftjaQDqedVoypZRA0nqvSdVL2ehtTzqMrrxu6jtZQ== +"@dhis2/app-service-offline@3.10.4": + version "3.10.4" + resolved "https://registry.yarnpkg.com/@dhis2/app-service-offline/-/app-service-offline-3.10.4.tgz#dcdaf3a76c6c7a71f28c89a403ec130bf10fcdf3" + integrity sha512-SUUS+sw3FjR0TMdKSSOVzL8IfPA185gSTHQ1WE4tLc2zE92elvxLL9FuSUuTbu+l1Kr4nRQNLh8muOMWKGnWDg== dependencies: lodash "^4.17.21" -"@dhis2/app-service-plugin@3.10.2": - version "3.10.2" - resolved "https://registry.yarnpkg.com/@dhis2/app-service-plugin/-/app-service-plugin-3.10.2.tgz#09de64ee59017c86c8dab96a0d2ca0d915ae9d31" - integrity sha512-FqR6ILmvAXT2n1SzCZknT+5jJRdajg1dBegWAu3xqZXAntsM4wvFLCx6EtjS5LO2Kga9VZ+TJmVr2UFX1330CQ== +"@dhis2/app-service-plugin@3.10.4": + 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/app-shell@10.4.0-alpha.5": - version "10.4.0-alpha.5" - resolved "https://registry.yarnpkg.com/@dhis2/app-shell/-/app-shell-10.4.0-alpha.5.tgz#27eae99e11777b34126bedd9ff21fad6f4753b1e" - integrity sha512-sS1ZTA0EdByUW6buAtyMk37M2HH0FA4XPqjg4CM8xinZGNQIYevubup6MHMIw8gdPLLhY7L6oN/SDomNoOcX3g== +"@dhis2/app-shell@11.2.2": + version "11.2.2" + resolved "https://registry.yarnpkg.com/@dhis2/app-shell/-/app-shell-11.2.2.tgz#43e849eff4e3238edccf41d55b2ad71b29c4c80d" + integrity sha512-TK4V+LmcvQfFAZZloKPDMKAa/d7jUEl7eXopYyJYscCeImNuMufz3+6WgeOC6xQe9nHC36I8/d7NuSpPiEoQUw== dependencies: - "@dhis2/app-adapter" "10.4.0-alpha.5" - "@dhis2/app-runtime" "^3.10.0-alpha.2" + "@dhis2/app-adapter" "11.2.2" + "@dhis2/app-runtime" "^3.10.4" "@dhis2/d2-i18n" "^1.1.1" - "@dhis2/pwa" "10.4.0-alpha.5" - "@dhis2/ui" "^8.12.3" + "@dhis2/pwa" "11.2.2" + "@dhis2/ui" "^9.4.4" classnames "^2.2.6" moment "^2.29.1" post-robot "^10.0.46" @@ -2355,10 +2345,10 @@ typeface-roboto "^0.0.75" typescript "^3.6.3" -"@dhis2/cli-app-scripts@^10.4.0-alpha.5": - version "10.4.0-alpha.5" - resolved "https://registry.yarnpkg.com/@dhis2/cli-app-scripts/-/cli-app-scripts-10.4.0-alpha.5.tgz#1fcfacf1cbe842a5d6cacfb6e1f0a1060189daed" - integrity sha512-qx765LQzSJTuvm9iFPbp4fEW8U/C73aT/k98eGYtczzy87fbHKr/1ml9FdS4b1+rhZ88CDv4CKLO6EnIcR8KLQ== +"@dhis2/cli-app-scripts@^11.2.2": + version "11.2.2" + resolved "https://registry.yarnpkg.com/@dhis2/cli-app-scripts/-/cli-app-scripts-11.2.2.tgz#fb7d3d487fb8c0d1e690f8f91fc0d3d884dccd35" + integrity sha512-muCg1UjCIN2WZ5FoVJwhdD+SBNO8NYvwZiUoltoHZ244L1v8pfPJifr7zgMLKp+1AsO4DB4nq3ne6qR3elZgiQ== dependencies: "@babel/core" "^7.6.2" "@babel/plugin-proposal-class-properties" "^7.8.3" @@ -2367,7 +2357,7 @@ "@babel/preset-env" "^7.14.7" "@babel/preset-react" "^7.0.0" "@babel/preset-typescript" "^7.6.0" - "@dhis2/app-shell" "10.4.0-alpha.5" + "@dhis2/app-shell" "11.2.2" "@dhis2/cli-helpers-engine" "^3.2.0" "@jest/core" "^27.0.6" "@pmmmwh/react-refresh-webpack-plugin" "^0.5.4" @@ -2521,10 +2511,10 @@ resolved "https://registry.yarnpkg.com/@dhis2/prop-types/-/prop-types-3.1.2.tgz#65b8ad2da8cd2f72bc8b951049a6c9d1b97af3e9" integrity sha512-eM0jjLOWvtXWqSFp5YC4DHFpkP8Y1D2eUwGV7MBWjni+o27oesVan+oT7WHeOeLdlAd4acRJrnaaAyB4Ck1wGQ== -"@dhis2/pwa@10.4.0-alpha.5": - version "10.4.0-alpha.5" - resolved "https://registry.yarnpkg.com/@dhis2/pwa/-/pwa-10.4.0-alpha.5.tgz#64d591354a3b7d84cf9ef2b414fd103601277d66" - integrity sha512-qEKpPuEb9OLOpng+32EgyGIldwFpeVz73qQXG+u8QD2GPTZ7oAljEoprm0jsCG3b5TKxazJ1aINvVA4slLiNkQ== +"@dhis2/pwa@11.2.2": + version "11.2.2" + resolved "https://registry.yarnpkg.com/@dhis2/pwa/-/pwa-11.2.2.tgz#fec40b4022d6e0133e4f1a6910919088e6d0392c" + integrity sha512-WdcH1UwoaFas4voScQ5zwfsTlYGJlo6eFgR991efAytEUGce4UsKFtS+KvtSBNMmQp+9F09tq+BDV52gPv/mdA== dependencies: idb "^6.0.0" workbox-core "^6.1.5" @@ -2564,7 +2554,7 @@ resolved "https://registry.yarnpkg.com/@dhis2/ui-icons/-/ui-icons-9.2.0.tgz#bddf5223cabec93c9499281b2181eb165346b639" integrity sha512-g9993UGWVLwDcbV+wp3HqrK8AXFu49aped0GpZsQUlGbHIzEl1EgmjiII44N40VbXwVUnqIDmu99wBxpH5Gd+g== -"@dhis2/ui@^8.12.3", "@dhis2/ui@^9.2.0": +"@dhis2/ui@^9.2.0", "@dhis2/ui@^9.4.4": version "9.2.0" resolved "https://registry.yarnpkg.com/@dhis2/ui/-/ui-9.2.0.tgz#33d474cbc7cd95f8a714e019d6c69e144f77f86b" integrity sha512-nhKwW5bmIfQvt3L16PffFO2NsDk9BgYb91vHx06fPgM56UdwGYSejpax8eU29vE9urmHSkijSpnBqY4buZy6Ow==