downgrade tanstack, fix msot types and exclude recursive

This commit is contained in:
Kendall Garner
2026-06-07 06:48:56 -07:00
parent ac7dc37fd0
commit 7dd6d32710
5 changed files with 51 additions and 49 deletions
+3 -3
View File
@@ -85,9 +85,9 @@
"@mantine/modals": "^9.3.0", "@mantine/modals": "^9.3.0",
"@mantine/notifications": "^9.3.0", "@mantine/notifications": "^9.3.0",
"@radix-ui/react-context-menu": "^2.3.0", "@radix-ui/react-context-menu": "^2.3.0",
"@tanstack/react-query": "^5.101.0", "@tanstack/react-query": "5.96.2",
"@tanstack/react-query-devtools": "^5.101.0", "@tanstack/react-query-devtools": "5.96.2",
"@tanstack/react-query-persist-client": "^5.101.0", "@tanstack/react-query-persist-client": "5.96.2",
"@ts-rest/core": "^3.52.1", "@ts-rest/core": "^3.52.1",
"@wavesurfer/react": "^1.0.12", "@wavesurfer/react": "^1.0.12",
"@xhayper/discord-rpc": "^1.3.4", "@xhayper/discord-rpc": "^1.3.4",
+32 -32
View File
@@ -51,14 +51,14 @@ importers:
specifier: ^2.3.0 specifier: ^2.3.0
version: 2.3.0(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7) version: 2.3.0(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
'@tanstack/react-query': '@tanstack/react-query':
specifier: ^5.101.0 specifier: 5.96.2
version: 5.101.0(react@19.2.7) version: 5.96.2(react@19.2.7)
'@tanstack/react-query-devtools': '@tanstack/react-query-devtools':
specifier: ^5.101.0 specifier: 5.96.2
version: 5.101.0(@tanstack/react-query@5.101.0(react@19.2.7))(react@19.2.7) version: 5.96.2(@tanstack/react-query@5.96.2(react@19.2.7))(react@19.2.7)
'@tanstack/react-query-persist-client': '@tanstack/react-query-persist-client':
specifier: ^5.101.0 specifier: 5.96.2
version: 5.101.0(@tanstack/react-query@5.101.0(react@19.2.7))(react@19.2.7) version: 5.96.2(@tanstack/react-query@5.96.2(react@19.2.7))(react@19.2.7)
'@ts-rest/core': '@ts-rest/core':
specifier: ^3.52.1 specifier: ^3.52.1
version: 3.52.1(@types/node@24.13.1)(zod@3.25.76) version: 3.52.1(@types/node@24.13.1)(zod@3.25.76)
@@ -2063,29 +2063,29 @@ packages:
resolution: {integrity: sha512-4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w==} resolution: {integrity: sha512-4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w==}
engines: {node: '>=10'} engines: {node: '>=10'}
'@tanstack/query-core@5.101.0': '@tanstack/query-core@5.96.2':
resolution: {integrity: sha512-cQetA74EB+seWySv1TTKr828TnP0u39m6LykwDXIo84SNortpDkp30TMEjkqtYCNP9c40uT/iwl6MLiufEt0Ow==} resolution: {integrity: sha512-hzI6cTVh4KNRk8UtoIBS7Lv9g6BnJPXvBKsvYH1aGWvv0347jT3BnSvztOE+kD76XGvZnRC/t6qdW1CaIfwCeA==}
'@tanstack/query-devtools@5.101.0': '@tanstack/query-devtools@5.96.2':
resolution: {integrity: sha512-MVqw17k08RQtGGLEL654+dX/btbX9p/8WjkznO//zusLTMaObxi3Q+MoFwGVkC9K3tqjn8qrrNhJevXx4fJTeQ==} resolution: {integrity: sha512-vBTB1Qhbm3nHSbEUtQwks/EdcAtFfEapr1WyBW4w2ExYKuXVi3jIxUIHf5MlSltiHuL7zNyUuanqT/7sI2sb6g==}
'@tanstack/query-persist-client-core@5.101.0': '@tanstack/query-persist-client-core@5.96.2':
resolution: {integrity: sha512-LH99WepGVLwlLfuOcQcPK7f3Xg/Gf+xlMMIj9xWu/8oQ3egnDzjr+a4HvEmi6PGob5SmGXvmDKZaH5+In9dzjw==} resolution: {integrity: sha512-BYsP8folbvxzZsNnWJxSenEAdepGNfv809150U78D84yt/THi33EwfUCcdKWFbma5XKwlaFQGWMJKeWnVJ6GVA==}
'@tanstack/react-query-devtools@5.101.0': '@tanstack/react-query-devtools@5.96.2':
resolution: {integrity: sha512-cpZA0+WqKXwrwMfiWZEGGF6QrIWVQFbhBtxqDF5sQsAfrFf47HIE6fiPbQU3wyAUEN2+7UNqLCQe7oG6m3f93w==} resolution: {integrity: sha512-nTFKLGuTOFvmFRvcyZ3ArWC/DnMNPoBh6h/2yD6rsf7TCTJCQt+oUWOp2uKPTIuEPtF/vN9Kw5tl5mD1Kbposw==}
peerDependencies: peerDependencies:
'@tanstack/react-query': ^5.101.0 '@tanstack/react-query': ^5.96.2
react: ^18 || ^19 react: ^18 || ^19
'@tanstack/react-query-persist-client@5.101.0': '@tanstack/react-query-persist-client@5.96.2':
resolution: {integrity: sha512-AUcdBgz8V6sM9axzdqkVmWjYSOETkhr6yAZSBnEFyZT2jo6vkFq3UrpRuxGs6fmhKMWv8FA+ZJGcbaKPaoAElQ==} resolution: {integrity: sha512-smQ38oVPlnvkG+G7R60IAD9X6azJLRjHEd7twml9XBLYM31ncPDP0tUKy/Gv/4ItVmKTtjZ5VabXpVZxnaWSww==}
peerDependencies: peerDependencies:
'@tanstack/react-query': ^5.101.0 '@tanstack/react-query': ^5.96.2
react: ^18 || ^19 react: ^18 || ^19
'@tanstack/react-query@5.101.0': '@tanstack/react-query@5.96.2':
resolution: {integrity: sha512-rLlJXSpkqfizLWgkR5+eLeIk0MvTx/meEIR7LRjxic+qxiQP8zVjq7BqQkiCMNLQBlLfuOLqqr6KO5GtrDlmSg==} resolution: {integrity: sha512-sYyzzJT4G0g02azzJ8o55VFFV31XvFpdUpG+unxS0vSaYsJnSPKGoI6WdPwUucJL1wpgGfwfmntNX/Ub1uOViA==}
peerDependencies: peerDependencies:
react: ^18 || ^19 react: ^18 || ^19
@@ -7669,29 +7669,29 @@ snapshots:
dependencies: dependencies:
defer-to-connect: 2.0.1 defer-to-connect: 2.0.1
'@tanstack/query-core@5.101.0': {} '@tanstack/query-core@5.96.2': {}
'@tanstack/query-devtools@5.101.0': {} '@tanstack/query-devtools@5.96.2': {}
'@tanstack/query-persist-client-core@5.101.0': '@tanstack/query-persist-client-core@5.96.2':
dependencies: dependencies:
'@tanstack/query-core': 5.101.0 '@tanstack/query-core': 5.96.2
'@tanstack/react-query-devtools@5.101.0(@tanstack/react-query@5.101.0(react@19.2.7))(react@19.2.7)': '@tanstack/react-query-devtools@5.96.2(@tanstack/react-query@5.96.2(react@19.2.7))(react@19.2.7)':
dependencies: dependencies:
'@tanstack/query-devtools': 5.101.0 '@tanstack/query-devtools': 5.96.2
'@tanstack/react-query': 5.101.0(react@19.2.7) '@tanstack/react-query': 5.96.2(react@19.2.7)
react: 19.2.7 react: 19.2.7
'@tanstack/react-query-persist-client@5.101.0(@tanstack/react-query@5.101.0(react@19.2.7))(react@19.2.7)': '@tanstack/react-query-persist-client@5.96.2(@tanstack/react-query@5.96.2(react@19.2.7))(react@19.2.7)':
dependencies: dependencies:
'@tanstack/query-persist-client-core': 5.101.0 '@tanstack/query-persist-client-core': 5.96.2
'@tanstack/react-query': 5.101.0(react@19.2.7) '@tanstack/react-query': 5.96.2(react@19.2.7)
react: 19.2.7 react: 19.2.7
'@tanstack/react-query@5.101.0(react@19.2.7)': '@tanstack/react-query@5.96.2(react@19.2.7)':
dependencies: dependencies:
'@tanstack/query-core': 5.101.0 '@tanstack/query-core': 5.96.2
react: 19.2.7 react: 19.2.7
'@ts-rest/core@3.52.1(@types/node@24.13.1)(zod@3.25.76)': '@ts-rest/core@3.52.1(@types/node@24.13.1)(zod@3.25.76)':
@@ -224,25 +224,26 @@ export const PlaylistQueryEditor = ({
return detailQuery?.data?.rules?.order || 'asc'; return detailQuery?.data?.rules?.order || 'asc';
}, [detailQuery?.data?.rules?.order, detailQuery?.data?.rules?.sort]); }, [detailQuery?.data?.rules?.order, detailQuery?.data?.rules?.sort]);
const appliedQuery = appliedJsonState?.query;
const detailQueryRules = detailQuery?.data?.rules;
const effectiveQuery = useMemo( const effectiveQuery = useMemo(
() => () =>
appliedJsonState?.query ?? appliedQuery ??
(detailQuery?.data?.rules?.all (detailQueryRules?.all
? { all: detailQuery.data.rules.all } ? { all: detailQueryRules.all }
: detailQuery?.data?.rules?.any : detailQueryRules?.any
? { any: detailQuery.data.rules.any } ? { any: detailQueryRules.any }
: detailQuery?.data?.rules), : detailQueryRules),
[appliedJsonState?.query, detailQuery?.data?.rules], [appliedQuery, detailQueryRules],
); );
const effectiveLimit = appliedJsonState?.limit ?? detailQuery?.data?.rules?.limit; const effectiveLimit = appliedJsonState?.limit ?? detailQuery?.data?.rules?.limit;
const effectiveLimitPercent = const effectiveLimitPercent =
appliedJsonState?.limitPercent ?? detailQuery?.data?.rules?.limitPercent; appliedJsonState?.limitPercent ?? detailQuery?.data?.rules?.limitPercent;
const appliedSort = appliedJsonState?.sort;
const effectiveSortBy = useMemo( const effectiveSortBy = useMemo(
() => () => (appliedSort ? [appliedSort] : parseSortBy()) as SongListSort | SongListSort[],
(appliedJsonState?.sort ? [appliedJsonState.sort] : parseSortBy()) as [appliedSort, parseSortBy],
| SongListSort
| SongListSort[],
[appliedJsonState?.sort, parseSortBy],
); );
const effectiveSortOrder = appliedJsonState?.sort const effectiveSortOrder = appliedJsonState?.sort
? appliedJsonState.sort.startsWith('-') ? appliedJsonState.sort.startsWith('-')
@@ -97,7 +97,7 @@ export const useServerAuthenticated = () => {
isAdmin: userInfo.isAdmin, isAdmin: userInfo.isAdmin,
}); });
// Fetch and update server version and features // Fetch and update server version and featuresauthenticateServer
try { try {
const serverInfo = await controller.getServerInfo({ const serverInfo = await controller.getServerInfo({
apiClientProps: { apiClientProps: {
@@ -298,6 +298,7 @@ export const useServerAuthenticated = () => {
await new Promise((resolve) => setTimeout(resolve, NETWORK_RETRY_DELAY_MS)); await new Promise((resolve) => setTimeout(resolve, NETWORK_RETRY_DELAY_MS));
// Retry authentication // Retry authentication
// eslint-disable-next-line react-hooks/immutability
return authenticateServer(serverWithAuth, nextRetry); return authenticateServer(serverWithAuth, nextRetry);
} }
+1 -1
View File
@@ -189,7 +189,7 @@ const appRouterModals = {
export const AppRouter = () => { export const AppRouter = () => {
const router = ( const router = (
<HashRouter unstable_useTransitions={false}> <HashRouter>
<ModalsProvider modals={appRouterModals}> <ModalsProvider modals={appRouterModals}>
<RouterErrorBoundary> <RouterErrorBoundary>
<Routes> <Routes>