Release 1.8.0

.env

@@ -1,5 +1,7 @@
 BROWSER=false
 PORT=8081
+VITE_PORT=8081
 SKIP_PREFLIGHT_CHECK=true
-REACT_APP_DHIS2_BASE_URL=https://dev.eyeseetea.com/play
-REACT_APP_LOGO_PATH=
+
+VITE_DHIS2_BASE_URL=https://dev.eyeseetea.com/play
+VITE_LOGO_PATH=

.eslintrc.js

@@ -5,7 +5,6 @@ module.exports = {
         "react-app",
         "eslint:recommended",
         "plugin:react/recommended",
-        "plugin:cypress/recommended",
         "plugin:@typescript-eslint/recommended",
     ],
     parser: "@typescript-eslint/parser",
@@ -43,8 +42,7 @@ module.exports = {
         "react-hooks/rules-of-hooks": "error",
         "react-hooks/exhaustive-deps": "warn",
     },
-    plugins: ["cypress", "@typescript-eslint", "react-hooks", "unused-imports"],
-    env: { "cypress/globals": true },
+    plugins: ["@typescript-eslint", "react-hooks", "unused-imports"],
     settings: {
         react: {
             pragma: "React",

.github/workflows/main.yml

@@ -1,12 +1,12 @@
 name: "Shared Master Workflow"
 
 on:
-  push:
-    branches: ["master", "development"]
-  pull_request:
-    branches: [ "master", "development" ]
-  workflow_dispatch:
+    push:
+        branches: ["master", "development"]
+    pull_request:
+
+    workflow_dispatch:
 
 jobs:
-  master-workflow:
-    uses: EyeSeeTea/github-workflows/.github/workflows/master.yml@master
+    master-workflow:
+        uses: EyeSeeTea/github-workflows/.github/workflows/master.yml@master

.gitignore

@@ -29,13 +29,16 @@ src/locales/
 src/react-app.d.ts
 src/react-app-env.d.ts
 
-# cypress
-cypress/screenshots/
-cypress/videos/
-
 # IntelliJ
 .idea/*
 
 # Custom
 bak
 dist
+
+# Yarn 4
+.yarn/cache
+.yarn/install-state.gz
+.yarn/unplugged
+.yarn/build-state.yml
+.pnp.*

.nvmrc

@@ -1 +1 @@
-v16.14.0
+v22.22.0

.yarnrc.yml

@@ -0,0 +1 @@
+nodeLinker: node-modules

README.md

@@ -1,15 +1,61 @@
 ## Setup
 
 ```
+$ nvm use # uses node version in .nvmrc
 $ yarn install
 ```
 
+This project uses **Yarn 4** managed by **Corepack** and declares:
+
+```json
+"packageManager": "yarn@4.12.0"
+```
+
+### If you have Yarn 1 globally and see a packageManager error
+
+If running `yarn` shows an error like:
+
+> This project's package.json defines "packageManager": "yarn@4.12.0". However the current global version of Yarn is 1.22.x.
+
+do the following once on your machine:
+
+```bash
+# 1) Remove global Yarn (optional but recommended)
+npm uninstall -g yarn
+
+# 2) Enable Corepack (shipped with Node 16.9+ / 14.19+)
+corepack enable
+
+# 3) Set Yarn 1.x as the default for projects WITHOUT packageManager
+corepack prepare yarn@1.22.22 --activate
+```
+
+Then, in this project (normal case, once Corepack is enabled):
+
+```bash
+nvm use                 # use the version from .nvmrc
+yarn install
+```
+
+If for some reason `yarn --version` still shows `1.x` inside this repo (for example due to old Corepack state), prepare the Yarn 4 binary without changing the global default or `package.json`:
+
+```bash
+COREPACK_ENABLE_AUTO_PIN=0 corepack prepare yarn@4.12.0
+yarn --version          # should now print 4.12.0
+yarn install
+```
+
+After this:
+
+-   This repo will use **Yarn 4.12.0**.
+-   Other repos without `packageManager` will keep using **Yarn 1.22.22** (or whatever you activated with `corepack prepare`).
+
 ## Development
 
 Start development server:
 
 ```
-$ PORT=8082 REACT_APP_DHIS2_BASE_URL="https://play.dhis2.org/dev" yarn start
+$ VITE_PORT=8082 VITE_DHIS2_BASE_URL="https://play.dhis2.org/dev" yarn start
 ```
 
 Linting:
@@ -26,22 +72,6 @@ Run unit tests:
 $ yarn test
 ```
 
-Run integration tests locally:
-
-```
-$ export CYPRESS_DHIS2_AUTH='admin:district'
-$ export CYPRESS_EXTERNAL_API="http://localhost:8080"
-$ export CYPRESS_ROOT_URL=http://localhost:8081
-
-# non-interactive
-$ yarn cy:e2e:run
-
-# interactive UI
-$ yarn cy:e2e:open
-```
-
-For this to work in Travis CI, you will have to create an environment variable CYPRESS_DHIS2_AUTH (Settings -> Environment Variables) with the password used in your testing DHIS2 instance.
-
 ## Build app ZIP
 
 ```
@@ -60,7 +90,6 @@ $ yarn build-webapp
 -   `src/types`: `.d.ts` file types for modules without TS definitions.
 -   `src/utils`: Misc utilities.
 -   `src/locales`: Auto-generated, don't change nor add to version control.
--   `cypress/integration/`: Contains the integration Cypress tests.
 
 ### i18n
 
@@ -85,7 +114,7 @@ const SomeComponent: React.FunctionComponent = () => {
 
 ### App logo
 
-Add `REACT_APP_LOGO_PATH` to change the path from where the app is loading the logo image on Homepage. Since the root path is `public`, the variable value must be preceded by `img/`. By default, if the value is left blank, WHO logo will show up.
+Add `VITE_LOGO_PATH` to change the path from where the app is loading the logo image on Homepage. Since the root path is `public`, the variable value must be preceded by `img/`. By default, if the value is left blank, WHO logo will show up.
 
 ### Build as a library