diff --git a/.github/workflows/web-sdk.yml b/.github/workflows/web-sdk.yml index be351b75c..55f00f201 100644 --- a/.github/workflows/web-sdk.yml +++ b/.github/workflows/web-sdk.yml @@ -25,7 +25,7 @@ jobs: - name: Setup pnpm 8 uses: pnpm/action-setup@v2 with: - version: 8.6.9 + version: 9.3.0 - name: Setup Node.js 20.x uses: actions/setup-node@v2 diff --git a/web/apps/admin/package.json b/web/apps/admin/package.json index f70e2f3a0..f6a8d2fa3 100644 --- a/web/apps/admin/package.json +++ b/web/apps/admin/package.json @@ -22,7 +22,7 @@ "@raystack/frontier": "workspace:^", "@raystack/proton": "0.1.0-b1687af73f994fa9612a023c850aa97c35735af8", "@stitches/react": "^1.2.8", - "@tanstack/react-query": "^5.83.0", + "@tanstack/react-query": "^5.90.2", "@tanstack/react-query-devtools": "^5.90.2", "@tanstack/react-table": "^8.9.3", "@tanstack/table-core": "^8.21.3", diff --git a/web/package.json b/web/package.json index 7728eb825..e7251659b 100644 --- a/web/package.json +++ b/web/package.json @@ -35,7 +35,9 @@ }, "pnpm": { "overrides": { - "@connectrpc/connect-query-core": "2.1.1" + "@connectrpc/connect-query-core": "2.1.1", + "@tanstack/react-query": "5.90.20", + "@tanstack/query-core": "5.90.20" } }, "engines": { diff --git a/web/pnpm-lock.yaml b/web/pnpm-lock.yaml index 8ccc6a9bf..b6871b33e 100644 --- a/web/pnpm-lock.yaml +++ b/web/pnpm-lock.yaml @@ -6,6 +6,8 @@ settings: overrides: '@connectrpc/connect-query-core': 2.1.1 + '@tanstack/react-query': 5.90.20 + '@tanstack/query-core': 5.90.20 importers: @@ -70,7 +72,7 @@ importers: specifier: ^1.2.8 version: 1.2.8(react@18.3.1) '@tanstack/react-query': - specifier: ^5.83.0 + specifier: 5.90.20 version: 5.90.20(react@18.3.1) '@tanstack/react-query-devtools': specifier: ^5.90.2 @@ -231,7 +233,7 @@ importers: specifier: 0.1.0-330c7558f34570056814d418f99730fb45cfe80f version: 0.1.0-330c7558f34570056814d418f99730fb45cfe80f(@tanstack/query-core@5.90.20)(@tanstack/react-query@5.90.20(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@tanstack/react-query': - specifier: ^5.83.0 + specifier: 5.90.20 version: 5.90.20(react@18.3.1) '@tanstack/react-router': specifier: 1.58.17 @@ -681,14 +683,14 @@ packages: peerDependencies: '@bufbuild/protobuf': 2.x '@connectrpc/connect': ^2.0.1 - '@tanstack/query-core': '>=5.62.0' + '@tanstack/query-core': 5.90.20 '@connectrpc/connect-query@2.1.1': resolution: {integrity: sha512-tDSEJ8J2FV9NsAl8z/e9MrbgeauOw45As/FUfiPpzm64aB+JfeQVXnqThS4ueB6fHfoKDHMxUtaQ7xx7oRCX3Q==} peerDependencies: '@bufbuild/protobuf': 2.x '@connectrpc/connect': ^2.0.1 - '@tanstack/react-query': '>=5.62.0' + '@tanstack/react-query': 5.90.20 react: ^18 || ^19 react-dom: ^18 || ^19 @@ -2291,7 +2293,7 @@ packages: '@raystack/proton@0.1.0-330c7558f34570056814d418f99730fb45cfe80f': resolution: {integrity: sha512-6QFWJKfPofeGusIyChAAyzu1Y7A/5VCFIkNvhvnjnQxmUoq91iEz+w9NXAqG6u50Em1Q/7j58QW12dSVRxfTyQ==} peerDependencies: - '@tanstack/react-query': ^5.0.0 + '@tanstack/react-query': 5.90.20 peerDependenciesMeta: '@tanstack/react-query': optional: true @@ -2299,7 +2301,7 @@ packages: '@raystack/proton@0.1.0-b1687af73f994fa9612a023c850aa97c35735af8': resolution: {integrity: sha512-kKaLa9tESbGQ8cFnB3gfSaPKyOJHqXXIaFGPLKwD9eknwLm4Uu7Uj+3mhY79wDvvTFxSidTl0YkzhzvSPuQphw==} peerDependencies: - '@tanstack/react-query': ^5.0.0 + '@tanstack/react-query': 5.90.20 peerDependenciesMeta: '@tanstack/react-query': optional: true @@ -2685,7 +2687,7 @@ packages: '@tanstack/react-query-devtools@5.91.3': resolution: {integrity: sha512-nlahjMtd/J1h7IzOOfqeyDh5LNfG0eULwlltPEonYy0QL+nqrBB+nyzJfULV+moL7sZyxc2sHdNJki+vLA9BSA==} peerDependencies: - '@tanstack/react-query': ^5.90.20 + '@tanstack/react-query': 5.90.20 react: ^18 || ^19 '@tanstack/react-query@5.90.20': diff --git a/web/sdk/admin/views/preferences/PreferencesView.tsx b/web/sdk/admin/views/preferences/PreferencesView.tsx index 1b5c75595..c715582ce 100644 --- a/web/sdk/admin/views/preferences/PreferencesView.tsx +++ b/web/sdk/admin/views/preferences/PreferencesView.tsx @@ -9,7 +9,7 @@ import { DescribePreferencesResponse, } from "@raystack/proton/frontier"; import { ExclamationTriangleIcon } from "@radix-ui/react-icons"; -import { useQueries } from "@tanstack/react-query"; +import { useQuery, type UseQueryOptions } from "@tanstack/react-query"; import type { ConnectError } from "@connectrpc/connect"; import PreferencesList from "./index"; import PreferenceDetails from "./details"; @@ -27,18 +27,14 @@ export default function PreferencesView({ }: PreferencesViewProps = {}) { const transport = useTransport(); - const [preferencesQuery, traitsQuery] = useQueries({ - queries: [ - { - ...createQueryOptions(AdminServiceQueries.listPreferences, {}, { transport }), - staleTime: Infinity, - }, - { - ...createQueryOptions(FrontierServiceQueries.describePreferences, {}, { transport }), - staleTime: Infinity, - }, - ], - }); + const preferencesQuery = useQuery({ + ...createQueryOptions(AdminServiceQueries.listPreferences, {}, { transport }), + staleTime: Infinity, + } as unknown as UseQueryOptions); + const traitsQuery = useQuery({ + ...createQueryOptions(FrontierServiceQueries.describePreferences, {}, { transport }), + staleTime: Infinity, + } as unknown as UseQueryOptions); const preferences = ((preferencesQuery.data as ListPreferencesResponse)?.preferences || []) as Preference[]; const traits = ((traitsQuery.data as DescribePreferencesResponse)?.traits || []) as PreferenceTrait[]; diff --git a/web/sdk/package.json b/web/sdk/package.json index 70883815d..79f359557 100644 --- a/web/sdk/package.json +++ b/web/sdk/package.json @@ -105,7 +105,7 @@ "@connectrpc/connect-web": "^2.0.2", "@hookform/resolvers": "^3.10.0", "@raystack/proton": "0.1.0-330c7558f34570056814d418f99730fb45cfe80f", - "@tanstack/react-query": "^5.83.0", + "@tanstack/react-query": "^5.90.2", "@tanstack/react-router": "1.58.17", "axios": "^1.9.0", "class-variance-authority": "^0.7.1",