Skip to content

Commit 3f764e3

Browse files
authored
Merge branch 'main' into responsive-loadouts
2 parents b723ec9 + c91bd7b commit 3f764e3

30 files changed

+200
-212
lines changed

.github/workflows/branch-deploy.yml

+2-4
Original file line numberDiff line numberDiff line change
@@ -20,20 +20,18 @@ jobs:
2020

2121
steps:
2222

23-
- uses: github/branch-deploy@v10.0.0-rc.1
23+
- uses: github/branch-deploy@v10
2424
id: branch-deploy
2525
with:
2626
admins: the-hideout/core-contributors
2727
admins_pat: ${{ secrets.BRANCH_DEPLOY_ADMINS_PAT }}
28-
skip_ci: development
29-
skip_reviews: development
3028
environment_targets: production,development
3129
environment_urls: production|https://tarkov.dev,development|disabled
3230
sticky_locks: "true"
3331

3432
- name: checkout
3533
if: ${{ steps.branch-deploy.outputs.continue == 'true' }}
36-
uses: actions/checkout@v4.1.1
34+
uses: actions/checkout@v4
3735
with:
3836
ref: ${{ steps.branch-deploy.outputs.sha }}
3937

.github/workflows/deploy.yml

+4-2
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,17 @@ jobs:
1616

1717
steps:
1818
- name: deployment check
19-
uses: github/branch-deploy@v10.0.0-rc.1
19+
uses: github/branch-deploy@v10
2020
id: deployment-check
2121
with:
2222
merge_deploy_mode: "true" # tells the Action to use the merge commit workflow strategy
2323
environment: production
2424

2525
- name: checkout
2626
if: ${{ steps.deployment-check.outputs.continue == 'true' }}
27-
uses: actions/[email protected]
27+
uses: actions/checkout@v4
28+
with:
29+
ref: ${{ steps.deployment-check.outputs.sha }}
2830

2931
# check to ensure all JSON files are valid in the repository
3032
- name: json-yaml-validate

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414

1515
steps:
1616
- name: unlock on merge
17-
uses: github/branch-deploy@v10.0.0-rc.1
17+
uses: github/branch-deploy@v10
1818
id: unlock-on-merge
1919
with:
2020
unlock_on_merge_mode: "true" # <-- indicates that this is the "Unlock on Merge Mode" workflow

package-lock.json

+25-110
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
"@mui/material": "^6.0.2",
3737
"@mui/x-tree-view": "^7.23.0",
3838
"@reduxjs/toolkit": "^2.5.0",
39+
"@tanstack/react-query": "^5.62.7",
3940
"@testing-library/jest-dom": "^6.6.3",
4041
"@testing-library/react": "^16.1.0",
4142
"@tippyjs/react": "^4.2.6",
@@ -65,7 +66,6 @@
6566
"react-i18next": "^15.1.4",
6667
"react-intersection-observer": "^9.13.1",
6768
"react-loader-spinner": "^6.1.6",
68-
"react-query": "^3.39.3",
6969
"react-redux": "^9.2.0",
7070
"react-router-dom": "^6.28.0",
7171
"react-router-hash-link": "^2.4.3",
Loading

src/__tests__/App.test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import React from 'react';
22
import { renderWithProviders } from '../test-utils';
33
import App from '../App';
4-
import { QueryClient, QueryClientProvider } from 'react-query';
4+
import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
55

66
import { useInView } from 'react-intersection-observer';
77
jest.mock('react-intersection-observer');

src/components/api-metrics-graph/index.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { useQuery } from 'react-query';
1+
import { useQuery } from '@tanstack/react-query';
22
import {
33
VictoryChart,
44
VictoryLine,
@@ -18,7 +18,7 @@ const fetchApiData = async () => {
1818

1919
function ApiMetricsGraph({ graph }) {
2020
const { t } = useTranslation();
21-
const { status, data } = useQuery(`api-metrics`, fetchApiData, { refetchOnMount: false, refetchOnWindowFocus: false });
21+
const { status, data } = useQuery({queryKey: `api-metrics`, queryFn: fetchApiData, refetchOnMount: false, refetchOnWindowFocus: false });
2222

2323
let height = VictoryTheme.material.height;
2424

src/components/footer/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ function Footer() {
6868
<p>
6969
{t('Additional data courtesy of')}{' '}
7070
<a href="https://www.sp-tarkov.com/" target="_blank" rel="noopener noreferrer">
71-
<span>SPT-AKI</span>
71+
<span>SPT</span>
7272
</a>
7373
</p>
7474
<h3>{t('Map Icons')}</h3>

0 commit comments

Comments
 (0)