Merge pull request #582 from the-hideout/combined-prs-branch

Combined PRs

.github/workflows/branch-deploy.yml

@@ -19,7 +19,7 @@ jobs:
 
     steps:
 
-      - uses: github/branch-deploy@v6.0.1
+      - uses: github/branch-deploy@v6.1.0
         id: branch-deploy
         with:
           admins: the-hideout/core-contributors

.github/workflows/deploy.yml

@@ -16,7 +16,7 @@ jobs:
 
     steps:
       - name: deployment check
-        uses: github/branch-deploy@v6.0.1
+        uses: github/branch-deploy@v6.1.0
         id: deployment-check
         with:
           merge_deploy_mode: "true" # tells the Action to use the merge commit workflow strategy

.github/workflows/unlock-on-merge.yml

@@ -14,7 +14,7 @@ jobs:
 
     steps:
       - name: unlock on merge
-        uses: github/branch-deploy@v6.0.1
+        uses: github/branch-deploy@v6.1.0
         id: unlock-on-merge
         with:
           unlock_on_merge_mode: "true" # <-- indicates that this is the "Unlock on Merge Mode" workflow

package.json

@@ -18,7 +18,7 @@
     "cache-api-data": "node --experimental-loader ./scripts/custom-loader.mjs scripts/cache-api-data.mjs"
   },
   "devDependencies": {
-    "prettier": "^2.8.8",
+    "prettier": "^3.0.0",
     "@babel/plugin-proposal-private-property-in-object": "^7.21.11"
   },
   "dependencies": {
@@ -27,7 +27,7 @@
     "@mdi/react": "^1.6.1",
     "@mui/lab": "^5.0.0-alpha.133",
     "@mui/material": "^5.13.7",
-    "@mui/styles": "^5.13.7",
+    "@mui/styles": "^5.14.0",
     "@reduxjs/toolkit": "^1.9.5",
     "@testing-library/jest-dom": "^5.16.5",
     "@testing-library/react": "^12.1.5",
@@ -52,20 +52,20 @@
     "react-error-boundary": "^4.0.10",
     "react-helmet": "^6.1.0",
     "react-hotkeys-hook": "^4.4.1",
-    "react-i18next": "^13.0.1",
+    "react-i18next": "^13.0.2",
     "react-intersection-observer": "^9.5.1",
     "react-loader-spinner": "^5.3.4",
     "react-query": "^3.39.3",
     "react-redux": "^8.1.1",
     "react-router-dom": "^6.14.1",
     "react-router-hash-link": "^2.4.3",
     "react-scripts": "^5.0.1",
-    "react-select": "^5.7.3",
+    "react-select": "^5.7.4",
     "react-simple-image-viewer": "1.2.1",
     "react-switch": "^7.0.0",
     "react-syntax-highlighter": "^15.5.0",
     "react-table": "^7.8.0",
-    "react-zoom-pan-pinch": "^3.0.7",
+    "react-zoom-pan-pinch": "^3.1.0",
     "resize-observer-polyfill": "^1.5.1",
     "sharp": "^0.32.0",
     "source-map-explorer": "^2.5.3",