Merge branch 'develop'

hisptz · Jan 22, 2024 · 2ba16c3 · 2ba16c3
2 parents fed33ca + 7ebeba1
commit 2ba16c3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/packages/app/package.json b/packages/app/package.json
@@ -14,7 +14,7 @@
     "@cypress/react": "^5.10.3",
     "@cypress/webpack-dev-server": "^1.7.0",
     "@dhis2/cli-app-scripts": "^10.3.10",
-    "@dhis2/cli-style": "^10.1.1",
+    "@dhis2/cli-style": "^10.5.1",
     "@dhis2/cli-utils-cypress": "^9.0.2",
     "@dhis2/cypress-commands": "^9.0.2",
     "@dhis2/cypress-plugins": "^9.0.2",
@@ -29,6 +29,7 @@
     "cz-conventional-changelog": "3.3.0",
     "dotenv": "^16.0.3",
     "dotenv-cli": "^7.1.0",
+    "eslint-config-react-app": "^7.0.1",
     "eslint-plugin-cypress": "^2.11.3",
     "eslint-plugin-react-hooks": "^4.3.0",
     "prop-types": "^15.7.2",

diff --git a/yarn.lock b/yarn.lock
@@ -2676,7 +2676,7 @@
     update-notifier "^3.0.0"
     yargs "^13.1.0"
 
-"@dhis2/cli-style@^10.1.1":
+"@dhis2/cli-style@^10.5.1":
   version "10.5.1"
   resolved "https://registry.yarnpkg.com/@dhis2/cli-style/-/cli-style-10.5.1.tgz#cf2df63b5eb203e3e3cec867bb9ba53b0d6f2ed6"
   integrity sha512-epMQFxX+A7HzivXMqX5pHSJqP/CRw94HHWOZ+ab8Ug930Y3gF8YG1QtXgfvdMFz7u+LfQlLujj+DgVa/6W5GTQ==
@@ -20691,16 +20691,11 @@ react-error-boundary@^3.1.3, react-error-boundary@^3.1.4:
   dependencies:
     "@babel/runtime" "^7.12.5"
 
-[email protected], react-error-overlay@^6.0.9:
+[email protected], react-error-overlay@^6.0.11, react-error-overlay@^6.0.9:
   version "6.0.9"
   resolved "https://registry.yarnpkg.com/react-error-overlay/-/react-error-overlay-6.0.9.tgz#3c743010c9359608c375ecd6bc76f35d93995b0a"
   integrity sha512-nQTTcUu+ATDbrSD1BZHr5kgSD4oF8OFjxun8uAaL8RwPBacGBNPf/yAuVVdx17N8XNzRDMrZ9XcKZHCjPW+9ew==
 
-react-error-overlay@^6.0.11:
-  version "6.0.11"
-  resolved "https://registry.yarnpkg.com/react-error-overlay/-/react-error-overlay-6.0.11.tgz#92835de5841c5cf08ba00ddd2d677b6d17ff9adb"
-  integrity sha512-/6UZ2qgEyH2aqzYZgQPxEnz33NJ2gNsnHA2o5+o4wW9bLM/JYQitNP9xPhsXwC08hMMovfGe/8retsdDsczPRg==
-
 react-fast-compare@^3.0.1:
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/react-fast-compare/-/react-fast-compare-3.2.2.tgz#929a97a532304ce9fee4bcae44234f1ce2c21d49"