update query integration

package.json

@@ -52,6 +52,7 @@
     "zustand": "^5.0.7"
   },
   "devDependencies": {
+    "@tanstack/react-router-ssr-query": "^1.132.2",
     "@tanstack/router-plugin": "^1.132.2",
     "@types/node": "^22.5.4",
     "@types/pg": "^8.15.5",

src/app/router.tsx

@@ -1,6 +1,6 @@
 import { QueryClient } from "@tanstack/react-query";
 import { createRouter as createTanStackRouter } from "@tanstack/react-router";
-import { routerWithQueryClient } from "@tanstack/react-router-with-query";
+import { setupRouterSsrQueryIntegration } from "@tanstack/react-router-ssr-query";
 import { routeTree } from "./routeTree.gen";
 import { DefaultCatchBoundary } from "../components/DefaultCatchBoundary";
 import { defaultHeaderConfig } from "@/features/core/hooks/use-router-config";
@@ -18,8 +18,7 @@ export function getRouter() {
     },
   });
 
-  return routerWithQueryClient(
+  const router = createTanStackRouter({
-    createTanStackRouter({
     routeTree,
     context: {
       queryClient,
@@ -33,9 +32,14 @@ export function getRouter() {
     defaultErrorComponent: DefaultCatchBoundary,
     scrollRestoration: true,
     defaultViewTransition: false,
-    }),
+  });
+
+  setupRouterSsrQueryIntegration({
+    router,
     queryClient
-  );
+  })
+
+  return router;
 }
 
 declare module "@tanstack/react-router" {

src/lib/tanstack-query/hooks/use-optimistic-mutation.ts

@@ -23,15 +23,15 @@ export function useOptimisticMutation<TData, TVariables = unknown>(
 
       return { previousData };
     },
-    onError: (error, variables, context) => {
+    onError: (error, variables, onMutateResult, context) => {
       if (context && typeof context === 'object' && 'previousData' in context && context.previousData) {
         queryClient.setQueryData(queryKey, context.previousData);
       }
-      mutationOptions.onError?.(error, variables, context);
+      mutationOptions.onError?.(error, variables, onMutateResult, context);
     },
-    onSettled: (data, error, variables, context) => {
+    onSettled: (data, error, variables, onMutateResult, context) => {
       queryClient.invalidateQueries({ queryKey });
-      mutationOptions.onSettled?.(data, error, variables, context);
+      mutationOptions.onSettled?.(data, error, variables, onMutateResult, context);
     }
   });
 }

src/lib/tanstack-query/hooks/use-server-mutation.ts

@@ -52,14 +52,14 @@ export function useServerMutation<TData, TVariables = unknown>(
         throw error;
       }
     },
-    onSuccess: (data, variables, context) => {
+    onSuccess: (data, variables, onMutateResult, context) => {
       if (showSuccessToast && successMessage) {
         toast.success(successMessage);
       }
-      onSuccess?.(data, variables, context);
+      onSuccess?.(data, variables, onMutateResult, context);
     },
-    onError: (error, variables, context) => {
+    onError: (error, variables, onMutateResult, context) => {
-      onError?.(error, variables, context);
+      onError?.(error, variables, onMutateResult, context);
     }
   });
 }