From 21b7d2d3d985e8162b803bdec2a787c018910804 Mon Sep 17 00:00:00 2001
From: Mozafar Haider <mozafar@dhis2.org>
Date: Thu, 24 Oct 2024 15:05:18 +0100
Subject: [PATCH] fix(app-platform): upgrade platform tools to use vite and
 react 18

---
 README.md                     |  2 +
 package.json                  | 94 +++++++++++++++++------------------
 src/test-utils/setup-tests.js |  2 +-
 3 files changed, 50 insertions(+), 48 deletions(-)

diff --git a/README.md b/README.md
index 17833f7..49d27b2 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,5 @@
+![React 18](https://img.shields.io/badge/react-18-blue)
+
 # Data exchange app
 
 [Live demo of the master branch](https://dhis2-data-exchange.netlify.app/#/)
diff --git a/package.json b/package.json
index afeb048..28498df 100644
--- a/package.json
+++ b/package.json
@@ -1,49 +1,49 @@
 {
-  "name": "data-exchange-app",
-  "version": "100.10.2",
-  "description": "",
-  "license": "BSD-3-Clause",
-  "private": true,
-  "scripts": {
-    "build": "d2-app-scripts build",
-    "start": "d2-app-scripts start",
-    "start:nobrowser": "BROWSER=none d2-app-scripts start",
-    "test": "TZ=Etc/UTC d2-app-scripts test",
-    "deploy": "d2-app-scripts deploy",
-    "lint": "d2-style check",
-    "lint:staged": "d2-style check --staged",
-    "format": "d2-style apply",
-    "format:staged": "d2-style apply --staged",
-    "cypress:start": "REACT_APP_NODE_ENV=test yarn start:nobrowser",
-    "cypress:open:live": "start-server-and-test 'yarn cypress:start' http://localhost:3000 'yarn cypress open --env networkMode=live'",
-    "cypress:run:live": "start-server-and-test 'yarn cypress:start' http://localhost:3000 'yarn cypress run --env networkMode=live'",
-    "cypress:run:capture": "start-server-and-test 'yarn cypress:start' http://localhost:3000 'yarn cypress run --env networkMode=capture'",
-    "cypress:run:stub": "start-server-and-test 'yarn cypress:start' http://localhost:3000 'yarn cypress run --env networkMode=stub'"
-  },
-  "devDependencies": {
-    "@badeball/cypress-cucumber-preprocessor": "^16.0.0",
-    "@cfaester/enzyme-adapter-react-18": "^0.8.0",
-    "@cypress/webpack-preprocessor": "^5.17.0",
-    "@dhis2/cli-app-scripts": "^12.0.0-alpha.19",
-    "@dhis2/cli-style": "^10.7.4",
-    "@dhis2/cypress-commands": "^10.0.6",
-    "@dhis2/cypress-plugins": "^10.0.1",
-    "@faker-js/faker": "^8.4.1",
-    "@testing-library/jest-dom": "^6.6.2",
-    "@testing-library/react": "^16.0.1",
-    "@testing-library/user-event": "^14.5.2",
-    "cypress": "^13.10.0",
-    "enzyme": "^3.11.0",
-    "start-server-and-test": "^1.14.0"
-  },
-  "dependencies": {
-    "@dhis2/analytics": "^26.7.9",
-    "@dhis2/app-runtime": "^3.10.4",
-    "@dhis2/ui": "^9.11.8",
-    "classnames": "^2.5.1",
-    "package.json": "^2.0.1",
-    "react-router-dom": "^6.4.1",
-    "use-query-params": "^2.1.1"
-  },
-  "resolutions": {}
+    "name": "data-exchange-app",
+    "version": "100.10.2",
+    "description": "",
+    "license": "BSD-3-Clause",
+    "private": true,
+    "scripts": {
+        "build": "d2-app-scripts build",
+        "start": "d2-app-scripts start",
+        "start:nobrowser": "BROWSER=none d2-app-scripts start",
+        "test": "TZ=Etc/UTC d2-app-scripts test",
+        "deploy": "d2-app-scripts deploy",
+        "lint": "d2-style check",
+        "lint:staged": "d2-style check --staged",
+        "format": "d2-style apply",
+        "format:staged": "d2-style apply --staged",
+        "cypress:start": "REACT_APP_NODE_ENV=test yarn start:nobrowser",
+        "cypress:open:live": "start-server-and-test 'yarn cypress:start' http://localhost:3000 'yarn cypress open --env networkMode=live'",
+        "cypress:run:live": "start-server-and-test 'yarn cypress:start' http://localhost:3000 'yarn cypress run --env networkMode=live'",
+        "cypress:run:capture": "start-server-and-test 'yarn cypress:start' http://localhost:3000 'yarn cypress run --env networkMode=capture'",
+        "cypress:run:stub": "start-server-and-test 'yarn cypress:start' http://localhost:3000 'yarn cypress run --env networkMode=stub'"
+    },
+    "devDependencies": {
+        "@badeball/cypress-cucumber-preprocessor": "^16.0.0",
+        "@cfaester/enzyme-adapter-react-18": "^0.8.0",
+        "@cypress/webpack-preprocessor": "^5.17.0",
+        "@dhis2/cli-app-scripts": "^12.0.0-alpha.19",
+        "@dhis2/cli-style": "^10.7.4",
+        "@dhis2/cypress-commands": "^10.0.6",
+        "@dhis2/cypress-plugins": "^10.0.1",
+        "@faker-js/faker": "^8.4.1",
+        "@testing-library/jest-dom": "^6.6.2",
+        "@testing-library/react": "^16.0.1",
+        "@testing-library/user-event": "^14.5.2",
+        "cypress": "^13.10.0",
+        "enzyme": "^3.11.0",
+        "start-server-and-test": "^1.14.0"
+    },
+    "dependencies": {
+        "@dhis2/analytics": "^26.7.9",
+        "@dhis2/app-runtime": "^3.10.4",
+        "@dhis2/ui": "^9.11.8",
+        "classnames": "^2.5.1",
+        "package.json": "^2.0.1",
+        "react-router-dom": "^6.4.1",
+        "use-query-params": "^2.1.1"
+    },
+    "resolutions": {}
 }
diff --git a/src/test-utils/setup-tests.js b/src/test-utils/setup-tests.js
index 422561d..439ff87 100644
--- a/src/test-utils/setup-tests.js
+++ b/src/test-utils/setup-tests.js
@@ -1,4 +1,4 @@
-import { configure } from 'enzyme'
 import Adapter from '@cfaester/enzyme-adapter-react-18'
+import { configure } from 'enzyme'
 
 configure({ adapter: new Adapter() })