Skip to content

Commit

Permalink
build: upgrade React v18 --> v19 (#1545)
Browse files Browse the repository at this point in the history
* build: update dependencies prior to react 19 upgrade

* fix: minor frontend issues, remove prop-types

* build: update to react v19, with temporary typing workaround

* build: update remaining deps to latest version

* fix(frontend): remove forwardRef deprecation & other react errors for v19

* build: update playwright v1.43.0 --> v1.44.1

* fix: usage of ref in component variables

* fix: last remaining incorrect ref usage
  • Loading branch information
spwoodcock authored Jun 6, 2024
1 parent 5bfadc9 commit a338806
Show file tree
Hide file tree
Showing 25 changed files with 2,883 additions and 3,858 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/pr_test_frontend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@ jobs:
e2e-tests:
uses: hotosm/gh-workflows/.github/workflows/test_pnpm.yml@main
with:
container_config: '{"image": "mcr.microsoft.com/playwright:v1.43.0"}'
container_config: '{"image": "mcr.microsoft.com/playwright:v1.44.1"}'
working_dir: src/frontend
run_command: "test:e2e"
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ services:

ui-test:
profiles: ["ui-test"]
image: mcr.microsoft.com/playwright:v1.43.0
image: mcr.microsoft.com/playwright:v1.44.1
working_dir: /app
environment:
- DISPLAY=:0
Expand Down
111 changes: 51 additions & 60 deletions src/frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,45 +20,39 @@
"email": "sysadmin@hotosm.org"
},
"devDependencies": {
"@playwright/test": "^1.43.0",
"@types/jest": "^29.5.5",
"@types/node": "^20.12.5",
"@types/react": "^18.3.1",
"@types/react-dom": "^18.3.0",
"@typescript-eslint/eslint-plugin": "^6.7.4",
"@typescript-eslint/parser": "^6.7.4",
"@vitejs/plugin-react": "^4.1.0",
"autoprefixer": "^10.4.15",
"css-loader": "^6.3.0",
"@playwright/test": "^1.44.1",
"@types/node": "^20.12.13",
"@types/react": "npm:types-react@rc",
"@types/react-dom": "npm:types-react-dom@rc",
"@typescript-eslint/eslint-plugin": "^7.11.0",
"@typescript-eslint/parser": "^7.11.0",
"@vitejs/plugin-react": "^4.3.0",
"autoprefixer": "^10.4.19",
"env-cmd": "^10.1.0",
"eslint": "^8.51.0",
"eslint-config-airbnb": "^19.0.4",
"eslint-config-prettier": "^8.10.0",
"eslint-plugin-prettier": "^5.0.0",
"eslint-plugin-react": "^7.33.0",
"jest-environment-jsdom": "^29.6.1",
"jsdom": "^22.1.0",
"postcss": "^8.4.28",
"postcss-loader": "^4.1.0",
"prettier": "^3.0.0",
"prop-types": "^15.8.1",
"sass": "^1.69.0",
"style-loader": "^3.3.0",
"tailwindcss": "^3.3.3",
"thread-loader": "^3.0.4",
"typescript": "^4.5.2",
"vite": "^4.4.11",
"vite-plugin-pwa": "^0.19.8",
"vitest": "^0.34.6",
"eslint": "^8.56.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-prettier": "^5.1.3",
"eslint-plugin-react": "^7.34.2",
"postcss": "^8.4.38",
"prettier": "^3.2.5",
"tailwindcss": "^3.4.3",
"typescript": "^5.4.5",
"vite": "^5.2.12",
"vite-plugin-pwa": "^0.20.0",
"vitest": "^1.6.0",
"workbox-window": "^7.1.0"
},
"overrides": {
"@types/react": "npm:types-react@rc",
"@types/react-dom": "npm:types-react-dom@rc"
},
"dependencies": {
"@hotosm/ui": "0.2.0-b2",
"@mui/base": "5.0.0-beta.18",
"@mui/icons-material": "^5.11.0",
"@mui/lab": "^5.0.0-alpha.134",
"@mui/material": "^5.14.12",
"@mui/system": "^5.14.12",
"@mui/base": "5.0.0-beta.40",
"@mui/icons-material": "^5.15.19",
"@mui/lab": "^5.0.0-alpha.170",
"@mui/material": "^5.15.19",
"@mui/system": "^5.15.15",
"@radix-ui/react-checkbox": "^1.0.4",
"@radix-ui/react-dialog": "^1.0.5",
"@radix-ui/react-dropdown-menu": "^2.0.6",
Expand All @@ -67,47 +61,44 @@
"@radix-ui/react-select": "^1.2.2",
"@radix-ui/react-switch": "^1.0.3",
"@reduxjs/toolkit": "^2.2.5",
"@sentry/react": "^7.59.3",
"@tiptap/extension-bullet-list": "^2.2.4",
"@tiptap/extension-document": "^2.2.4",
"@tiptap/extension-heading": "^2.2.4",
"@tiptap/extension-image": "^2.2.4",
"@tiptap/extension-link": "^2.2.4",
"@tiptap/extension-list-item": "^2.2.4",
"@tiptap/extension-ordered-list": "^2.2.4",
"@tiptap/extension-paragraph": "^2.2.4",
"@tiptap/extension-text": "^2.2.4",
"@tiptap/extension-youtube": "^2.2.4",
"@tiptap/pm": "^2.2.4",
"@tiptap/react": "^2.2.4",
"@tiptap/starter-kit": "^2.2.4",
"axios": "^1.2.2",
"clsx": "^2.0.0",
"date-fns": "^3.3.1",
"flatgeobuf": "^3.27.1",
"@sentry/react": "^8.7.0",
"@tiptap/extension-bullet-list": "^2.4.0",
"@tiptap/extension-document": "^2.4.0",
"@tiptap/extension-heading": "^2.4.0",
"@tiptap/extension-image": "^2.4.0",
"@tiptap/extension-link": "^2.4.0",
"@tiptap/extension-list-item": "^2.4.0",
"@tiptap/extension-ordered-list": "^2.4.0",
"@tiptap/extension-paragraph": "^2.4.0",
"@tiptap/extension-text": "^2.4.0",
"@tiptap/pm": "^2.4.0",
"@tiptap/react": "^2.4.0",
"@tiptap/starter-kit": "^2.4.0",
"axios": "^1.7.2",
"clsx": "^2.1.1",
"date-fns": "^3.6.0",
"flatgeobuf": "^3.31.1",
"geojson-validation": "^1.0.2",
"html2canvas": "^1.4.1",
"lucide-react": "^0.276.0",
"mini-css-extract-plugin": "^2.7.5",
"ol": "^8.0.0",
"ol-ext": "^4.0.11",
"ol-layerswitcher": "^4.1.1",
"pako": "^2.1.0",
"pmtiles": "^3.0.5",
"pmtiles": "^3.0.6",
"qrcode-generator": "^1.4.4",
"react": "^18.3.1",
"react": "^19.0.0-rc-6d3110b4d9-20240531",
"react-datepicker": "^6.9.0",
"react-dom": "^18.3.1",
"react-dom": "^19.0.0-rc-6d3110b4d9-20240531",
"react-lazy-load-image-component": "^1.6.0",
"react-loading-skeleton": "^3.3.1",
"react-loading-skeleton": "^3.4.0",
"react-redux": "^9.1.2",
"react-router-dom": "^6.23.1",
"react-spinners": "^0.13.8",
"recharts": "^2.10.3",
"recharts": "^2.12.7",
"redux": "^5.0.1",
"redux-persist": "^6.0.0",
"tailwind-merge": "^1.14.0",
"tailwindcss-animate": "^1.0.7",
"tailwind-merge": "2.3.0",
"uuid": "^9.0.1"
},
"peerDependencies": {
Expand Down
Loading

0 comments on commit a338806

Please sign in to comment.