Merge branch 'main' into responsive-loadouts

the-hideout · Jan 8, 2025 · 3f764e3 · 3f764e3
2 parents b723ec9 + c91bd7b
commit 3f764e3
Show file tree

Hide file tree

Showing 30 changed files with 200 additions and 212 deletions.
diff --git a/.github/workflows/branch-deploy.yml b/.github/workflows/branch-deploy.yml
@@ -20,20 +20,18 @@ jobs:
 
     steps:
 
-      - uses: github/branch-deploy@v10.0.0-rc.1
+      - uses: github/branch-deploy@v10
         id: branch-deploy
         with:
           admins: the-hideout/core-contributors
           admins_pat: ${{ secrets.BRANCH_DEPLOY_ADMINS_PAT }}
-          skip_ci: development
-          skip_reviews: development
           environment_targets: production,development
           environment_urls: production|https://tarkov.dev,development|disabled
           sticky_locks: "true"
 
       - name: checkout
         if: ${{ steps.branch-deploy.outputs.continue == 'true' }}
-        uses: actions/checkout@v4.1.1
+        uses: actions/checkout@v4
         with:
           ref: ${{ steps.branch-deploy.outputs.sha }}
 

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -16,15 +16,17 @@ jobs:
 
     steps:
       - name: deployment check
-        uses: github/branch-deploy@v10.0.0-rc.1
+        uses: github/branch-deploy@v10
         id: deployment-check
         with:
           merge_deploy_mode: "true" # tells the Action to use the merge commit workflow strategy
           environment: production
 
       - name: checkout
         if: ${{ steps.deployment-check.outputs.continue == 'true' }}
-        uses: actions/checkout@v4.1.1
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ steps.deployment-check.outputs.sha }}
 
       # check to ensure all JSON files are valid in the repository
       - name: json-yaml-validate

diff --git a/.github/workflows/unlock-on-merge.yml b/.github/workflows/unlock-on-merge.yml
@@ -14,7 +14,7 @@ jobs:
 
     steps:
       - name: unlock on merge
-        uses: github/branch-deploy@v10.0.0-rc.1
+        uses: github/branch-deploy@v10
         id: unlock-on-merge
         with:
           unlock_on_merge_mode: "true" # <-- indicates that this is the "Unlock on Merge Mode" workflow

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -36,6 +36,7 @@
     "@mui/material": "^6.0.2",
     "@mui/x-tree-view": "^7.23.0",
     "@reduxjs/toolkit": "^2.5.0",
+    "@tanstack/react-query": "^5.62.7",
     "@testing-library/jest-dom": "^6.6.3",
     "@testing-library/react": "^16.1.0",
     "@tippyjs/react": "^4.2.6",
@@ -65,7 +66,6 @@
     "react-i18next": "^15.1.4",
     "react-intersection-observer": "^9.13.1",
     "react-loader-spinner": "^6.1.6",
-    "react-query": "^3.39.3",
     "react-redux": "^9.2.0",
     "react-router-dom": "^6.28.0",
     "react-router-hash-link": "^2.4.3",

diff --git a/public/maps/interactive/container_festive-airdrop-supply-crate.png b/public/maps/interactive/container_festive-airdrop-supply-crate.png
diff --git a/src/__tests__/App.test.js b/src/__tests__/App.test.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import { renderWithProviders } from '../test-utils';
 import App from '../App';
-import { QueryClient, QueryClientProvider } from 'react-query';
+import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
 
 import { useInView } from 'react-intersection-observer';
 jest.mock('react-intersection-observer');

diff --git a/src/components/api-metrics-graph/index.js b/src/components/api-metrics-graph/index.js
@@ -1,4 +1,4 @@
-import { useQuery } from 'react-query';
+import { useQuery } from '@tanstack/react-query';
 import {
     VictoryChart,
     VictoryLine,
@@ -18,7 +18,7 @@ const fetchApiData = async () => {
 
 function ApiMetricsGraph({ graph }) {
     const { t } = useTranslation();
-    const { status, data } = useQuery(`api-metrics`, fetchApiData, { refetchOnMount: false, refetchOnWindowFocus: false });
+    const { status, data } = useQuery({queryKey: `api-metrics`, queryFn: fetchApiData, refetchOnMount: false, refetchOnWindowFocus: false });
 
     let height = VictoryTheme.material.height;
 

diff --git a/src/components/footer/index.js b/src/components/footer/index.js
@@ -68,7 +68,7 @@ function Footer() {
                 <p>
                     {t('Additional data courtesy of')}{' '}
                     <a href="https://www.sp-tarkov.com/" target="_blank" rel="noopener noreferrer">
-                        <span>SPT-AKI</span>
+                        <span>SPT</span>
                     </a>
                 </p>
                 <h3>{t('Map Icons')}</h3>