Merge branch 'main' into renovate/jsdom-23.x

docker-compose.yml

@@ -2,7 +2,9 @@ version: '3.9'
 
 x-frontend: &frontend
   environment:
-    VITE_ZONE: TEST
+    VITE_ZONE: DEV
+    VITE_USER_POOLS_ID: ca-central-1_t2HSZBHur
+    VITE_USER_POOLS_WEB_CLIENT_ID: 3g6n2ha1loi4kp1jhaq359vrvb
   healthcheck:
     test: curl http://localhost:3000"
     interval: 15s

frontend/package.json

@@ -7,6 +7,7 @@
     "@bcgov-nr/nr-theme": "^1.7.0",
     "@carbon/pictograms-react": "^11.49.0",
     "@carbon/react": "^1.27.0",
+    "@redux-devtools/extension": "^3.3.0",
     "@testing-library/jest-dom": "^6.2.0",
     "@testing-library/react": "^14.0.0",
     "@testing-library/user-event": "^14.0.0",
@@ -23,11 +24,10 @@
     "react-dom": "^18.2.0",
     "react-hash-string": "^1.0.0",
     "react-leaflet": "^4.2.1",
-    "react-redux": "^8.1.3",
+    "react-redux": "^9.0.0",
     "react-router-dom": "^6.10.0",
-    "redux": "^4.2.1",
-    "redux-devtools-extension": "^2.13.9",
-    "redux-thunk": "^2.4.2",
+    "redux": "^5.0.0",
+    "redux-thunk": "^3.0.0",
     "vite": "^4.4.11",
     "vite-plugin-svgr": "^4.0.0",
     "vite-tsconfig-paths": "^4.2.0",

frontend/src/store.ts

@@ -1,6 +1,6 @@
 import { createStore, combineReducers, applyMiddleware } from 'redux'
-import thunk from 'redux-thunk'
-import { composeWithDevTools } from 'redux-devtools-extension'
+import { thunk } from 'redux-thunk'
+import { composeWithDevTools } from '@redux-devtools/extension'
 import type { CognitoUserSession } from 'amazon-cognito-identity-js'
 import { userDetailsReducer } from './reducers/userReducer'