Merge branch 'main' into PIMS-2142

bcgov · Oct 25, 2024 · 5c1c2c3 · 5c1c2c3
2 parents aac38e2 + 6a0985b
commit 5c1c2c3
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/react-app/package.json b/react-app/package.json
@@ -23,8 +23,8 @@
     "@mui/icons-material": "6.1.0",
     "@mui/lab": "5.0.0-alpha.170",
     "@mui/material": "6.1.2",
-    "@mui/x-data-grid": "7.18.0",
     "@mui/x-date-pickers": "7.21.0",
+    "@mui/x-data-grid": "7.21.0",
     "@turf/turf": "7.1.0",
     "dayjs": "1.11.10",
     "react": "18.3.1",
@@ -36,7 +36,7 @@
     "react-plugin": "3.0.0-alpha.4",
     "react-router-dom": "6.26.0",
     "supercluster": "8.0.1",
-    "typescript-eslint": "8.8.0",
+    "typescript-eslint": "8.11.0",
     "use-supercluster": "1.2.0",
     "xlsx": "https://cdn.sheetjs.com/xlsx-0.20.3/xlsx-0.20.3.tgz",
     "zod": "3.23.8"