Merge pull request #3 from database-playground/pan93412/dbp-9-upgrade-apollo-client-to-v4

pan93412 · web-flow · commit 7a3b3d0b7341 · 2025-08-24T23:28:21.000+08:00
DBP-9: Upgrade Apollo Client to v4
diff --git a/app/(admin)/(question-management)/database/[id]/_components/header.tsx b/app/(admin)/(question-management)/database/[id]/_components/header.tsx
@@ -1,7 +1,7 @@
 "use client";
 
 import PageHeader, { PageHeaderSkeleton } from "@/components/page-header";
-import { useSuspenseQuery } from "@apollo/client";
+import { useSuspenseQuery } from "@apollo/client/react";
 import { Suspense } from "react";
 import { DATABASE_DETAIL_QUERY } from "./query";
 
diff --git a/app/(admin)/(question-management)/database/[id]/_components/relation-card.tsx b/app/(admin)/(question-management)/database/[id]/_components/relation-card.tsx
@@ -1,7 +1,7 @@
 "use client";
 
 import { CardLayout } from "@/components/card-layout";
-import { useSuspenseQuery } from "@apollo/client";
+import { useSuspenseQuery } from "@apollo/client/react";
 import Image from "next/image";
 import { DATABASE_DETAIL_QUERY } from "./query";
 
diff --git a/app/(admin)/(question-management)/database/[id]/_components/schema-card.tsx b/app/(admin)/(question-management)/database/[id]/_components/schema-card.tsx
@@ -1,7 +1,7 @@
 "use client";
 
 import { CardLayout } from "@/components/card-layout";
-import { useSuspenseQuery } from "@apollo/client";
+import { useSuspenseQuery } from "@apollo/client/react";
 import { DATABASE_DETAIL_QUERY } from "./query";
 
 export function SchemaCard({ id }: { id: string }) {
diff --git a/app/(admin)/(question-management)/database/_components/create.tsx b/app/(admin)/(question-management)/database/_components/create.tsx
@@ -9,7 +9,7 @@ import {
   DialogTitle,
   DialogTrigger,
 } from "@/components/ui/dialog";
-import { useMutation } from "@apollo/client";
+import { useMutation } from "@apollo/client/react";
 import { useRouter } from "next/navigation";
 import { useState } from "react";
 import { toast } from "sonner";
diff --git a/app/(admin)/(question-management)/database/_components/data-table.tsx b/app/(admin)/(question-management)/database/_components/data-table.tsx
@@ -1,7 +1,7 @@
 "use client";
 
 import { GeneralDataTable } from "@/components/data-table/general";
-import { useSuspenseQuery } from "@apollo/client";
+import { useSuspenseQuery } from "@apollo/client/react";
 import { columns, type Database } from "./data-table-columns";
 import { DATABASES_TABLE_QUERY } from "./query";
 
diff --git a/app/(admin)/(question-management)/database/_components/delete.tsx b/app/(admin)/(question-management)/database/_components/delete.tsx
@@ -13,8 +13,7 @@ import {
 } from "@/components/ui/alert-dialog";
 import { buttonVariants } from "@/components/ui/button";
 import { DropdownMenuItem } from "@/components/ui/dropdown-menu";
-import { useSuspenseQuery } from "@apollo/client";
-import { useMutation } from "@apollo/client";
+import { useMutation, useSuspenseQuery } from "@apollo/client/react";
 import { Trash } from "lucide-react";
 import { useRouter } from "next/navigation";
 import { Suspense, useState } from "react";
diff --git a/app/(admin)/(question-management)/database/_components/update.tsx b/app/(admin)/(question-management)/database/_components/update.tsx
@@ -10,7 +10,7 @@ import {
   DialogTrigger,
 } from "@/components/ui/dialog";
 import { DropdownMenuItem } from "@/components/ui/dropdown-menu";
-import { useMutation, useSuspenseQuery } from "@apollo/client";
+import { useMutation, useSuspenseQuery } from "@apollo/client/react";
 import { Pencil } from "lucide-react";
 import { useRouter } from "next/navigation";
 import { Suspense, useState } from "react";
diff --git a/app/(admin)/(question-management)/questions/[id]/_components/answer-card.tsx b/app/(admin)/(question-management)/questions/[id]/_components/answer-card.tsx
@@ -1,7 +1,7 @@
 "use client";
 
 import { CardLayout } from "@/components/card-layout";
-import { useSuspenseQuery } from "@apollo/client";
+import { useSuspenseQuery } from "@apollo/client/react";
 import { QUESTION_DETAIL_QUERY } from "./query";
 import { ReferenceAnswerResult } from "./result";
 
diff --git a/app/(admin)/(question-management)/questions/[id]/_components/database-card.tsx b/app/(admin)/(question-management)/questions/[id]/_components/database-card.tsx
@@ -2,7 +2,7 @@
 
 import { CardLayout } from "@/components/card-layout";
 import { StyledLink } from "@/components/ui/link";
-import { useSuspenseQuery } from "@apollo/client";
+import { useSuspenseQuery } from "@apollo/client/react";
 import { QUESTION_DETAIL_QUERY } from "./query";
 
 export function DatabaseCard({ id }: { id: string }) {
diff --git a/app/(admin)/(question-management)/questions/[id]/_components/header.tsx b/app/(admin)/(question-management)/questions/[id]/_components/header.tsx
@@ -1,7 +1,7 @@
 "use client";
 
 import { Badge } from "@/components/ui/badge";
-import { useSuspenseQuery } from "@apollo/client";
+import { useSuspenseQuery } from "@apollo/client/react";
 import { Suspense } from "react";
 import { QUESTION_DETAIL_QUERY } from "./query";
 
diff --git a/app/(admin)/(question-management)/questions/[id]/_components/result.tsx b/app/(admin)/(question-management)/questions/[id]/_components/result.tsx
@@ -2,7 +2,7 @@
 
 import { Alert, AlertDescription } from "@/components/ui/alert";
 import { Badge } from "@/components/ui/badge";
-import { useQuery } from "@apollo/client";
+import { useQuery } from "@apollo/client/react";
 import { AlertTriangle, ChevronDown, Database, Table } from "lucide-react";
 import React from "react";
 import { useState } from "react";
diff --git a/app/(admin)/(question-management)/questions/_components/create.tsx b/app/(admin)/(question-management)/questions/_components/create.tsx
@@ -10,7 +10,7 @@ import {
   DialogTrigger,
 } from "@/components/ui/dialog";
 import { QuestionDifficulty } from "@/gql/graphql";
-import { useMutation, useSuspenseQuery } from "@apollo/client";
+import { useMutation, useSuspenseQuery } from "@apollo/client/react";
 import { useRouter } from "next/navigation";
 import { useState } from "react";
 import { toast } from "sonner";
diff --git a/app/(admin)/(question-management)/questions/_components/data-table.tsx b/app/(admin)/(question-management)/questions/_components/data-table.tsx
@@ -2,7 +2,7 @@
 
 import { CursorDataTable } from "@/components/data-table/cursor";
 import type { Direction } from "@/components/data-table/pagination";
-import { useSuspenseQuery } from "@apollo/client";
+import { useSuspenseQuery } from "@apollo/client/react";
 import { useState } from "react";
 import { columns, type Question } from "./data-table-columns";
 import { QUESTIONS_TABLE_QUERY } from "./query";
diff --git a/app/(admin)/(question-management)/questions/_components/delete.tsx b/app/(admin)/(question-management)/questions/_components/delete.tsx
@@ -13,8 +13,7 @@ import {
 } from "@/components/ui/alert-dialog";
 import { buttonVariants } from "@/components/ui/button";
 import { DropdownMenuItem } from "@/components/ui/dropdown-menu";
-import { useSuspenseQuery } from "@apollo/client";
-import { useMutation } from "@apollo/client";
+import { useMutation, useSuspenseQuery } from "@apollo/client/react";
 import { Trash } from "lucide-react";
 import { useRouter } from "next/navigation";
 import { Suspense, useState } from "react";
diff --git a/app/(admin)/(question-management)/questions/_components/update.tsx b/app/(admin)/(question-management)/questions/_components/update.tsx
@@ -10,7 +10,7 @@ import {
   DialogTrigger,
 } from "@/components/ui/dialog";
 import { DropdownMenuItem } from "@/components/ui/dropdown-menu";
-import { useMutation, useSuspenseQuery } from "@apollo/client";
+import { useMutation, useSuspenseQuery } from "@apollo/client/react";
 import { Pencil } from "lucide-react";
 import { useRouter } from "next/navigation";
 import { Suspense, useState } from "react";
diff --git a/app/(admin)/(user-management)/groups/[id]/_components/audit-info-card.tsx b/app/(admin)/(user-management)/groups/[id]/_components/audit-info-card.tsx
@@ -2,7 +2,7 @@
 
 import { CardLayout } from "@/components/card-layout";
 import { Skeleton } from "@/components/ui/skeleton";
-import { useSuspenseQuery } from "@apollo/client";
+import { useSuspenseQuery } from "@apollo/client/react";
 import { Clock } from "lucide-react";
 import { Suspense } from "react";
 import { GROUP_AUDIT_INFO_QUERY } from "./query";
diff --git a/app/(admin)/(user-management)/groups/[id]/_components/header.tsx b/app/(admin)/(user-management)/groups/[id]/_components/header.tsx
@@ -1,7 +1,7 @@
 "use client";
 
 import PageHeader, { PageHeaderSkeleton } from "@/components/page-header";
-import { useSuspenseQuery } from "@apollo/client";
+import { useSuspenseQuery } from "@apollo/client/react";
 import { Suspense } from "react";
 import { GROUP_HEADER_QUERY } from "./query";
 
diff --git a/app/(admin)/(user-management)/groups/[id]/_components/members-card.tsx b/app/(admin)/(user-management)/groups/[id]/_components/members-card.tsx
@@ -2,7 +2,7 @@
 
 import { CardLayout } from "@/components/card-layout";
 import { Skeleton } from "@/components/ui/skeleton";
-import { useSuspenseQuery } from "@apollo/client";
+import { useSuspenseQuery } from "@apollo/client/react";
 import { Suspense } from "react";
 import { GROUP_MEMBERS_QUERY } from "./query";
 
diff --git a/app/(admin)/(user-management)/groups/[id]/_components/scope-card.tsx b/app/(admin)/(user-management)/groups/[id]/_components/scope-card.tsx
@@ -4,7 +4,7 @@ import { CardLayout } from "@/components/card-layout";
 import { Badge } from "@/components/ui/badge";
 import { Skeleton } from "@/components/ui/skeleton";
 import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";
-import { useSuspenseQuery } from "@apollo/client";
+import { useSuspenseQuery } from "@apollo/client/react";
 import { Suspense } from "react";
 import { GROUP_SCOPES_QUERY } from "./query";
 
diff --git a/app/(admin)/(user-management)/groups/_components/create.tsx b/app/(admin)/(user-management)/groups/_components/create.tsx
@@ -9,7 +9,7 @@ import {
   DialogTitle,
   DialogTrigger,
 } from "@/components/ui/dialog";
-import { useMutation, useSuspenseQuery } from "@apollo/client";
+import { useMutation, useSuspenseQuery } from "@apollo/client/react";
 import { useRouter } from "next/navigation";
 import { useState } from "react";
 import { toast } from "sonner";
diff --git a/app/(admin)/(user-management)/groups/_components/data-table.tsx b/app/(admin)/(user-management)/groups/_components/data-table.tsx
@@ -1,7 +1,7 @@
 "use client";
 
 import { GeneralDataTable } from "@/components/data-table/general";
-import { useSuspenseQuery } from "@apollo/client";
+import { useSuspenseQuery } from "@apollo/client/react";
 import { columns, type Group } from "./data-table-columns";
 import { GROUPS_TABLE_QUERY } from "./query";
 
diff --git a/app/(admin)/(user-management)/groups/_components/delete.tsx b/app/(admin)/(user-management)/groups/_components/delete.tsx
@@ -13,8 +13,7 @@ import {
 } from "@/components/ui/alert-dialog";
 import { buttonVariants } from "@/components/ui/button";
 import { DropdownMenuItem } from "@/components/ui/dropdown-menu";
-import { useSuspenseQuery } from "@apollo/client";
-import { useMutation } from "@apollo/client";
+import { useMutation, useSuspenseQuery } from "@apollo/client/react";
 import { Trash } from "lucide-react";
 import { useRouter } from "next/navigation";
 import { Suspense, useState } from "react";
diff --git a/app/(admin)/(user-management)/groups/_components/update.tsx b/app/(admin)/(user-management)/groups/_components/update.tsx
@@ -10,7 +10,7 @@ import {
   DialogTrigger,
 } from "@/components/ui/dialog";
 import { DropdownMenuItem } from "@/components/ui/dropdown-menu";
-import { useMutation, useSuspenseQuery } from "@apollo/client";
+import { useMutation, useSuspenseQuery } from "@apollo/client/react";
 import { Pencil } from "lucide-react";
 import { useRouter } from "next/navigation";
 import { Suspense, useState } from "react";
diff --git a/app/(admin)/(user-management)/scopesets/[id]/_components/groups.tsx b/app/(admin)/(user-management)/scopesets/[id]/_components/groups.tsx
@@ -3,7 +3,7 @@
 import { CardLayout } from "@/components/card-layout";
 import { Badge } from "@/components/ui/badge";
 import { Skeleton } from "@/components/ui/skeleton";
-import { useSuspenseQuery } from "@apollo/client";
+import { useSuspenseQuery } from "@apollo/client/react";
 import Link from "next/link";
 import { Suspense } from "react";
 import { GROUPS_WITH_SCOPE_SET_QUERY } from "./query";
diff --git a/app/(admin)/(user-management)/scopesets/[id]/_components/header.tsx b/app/(admin)/(user-management)/scopesets/[id]/_components/header.tsx
@@ -1,7 +1,7 @@
 "use client";
 
 import PageHeader, { PageHeaderSkeleton } from "@/components/page-header";
-import { useSuspenseQuery } from "@apollo/client";
+import { useSuspenseQuery } from "@apollo/client/react";
 import { Suspense } from "react";
 import { SCOPE_SET_HEADER_QUERY } from "./query";
 
diff --git a/app/(admin)/(user-management)/scopesets/[id]/_components/scopes.tsx b/app/(admin)/(user-management)/scopesets/[id]/_components/scopes.tsx
@@ -3,7 +3,7 @@
 import { CardLayout } from "@/components/card-layout";
 import { Badge } from "@/components/ui/badge";
 import { Skeleton } from "@/components/ui/skeleton";
-import { useSuspenseQuery } from "@apollo/client";
+import { useSuspenseQuery } from "@apollo/client/react";
 import { Suspense } from "react";
 import { SCOPE_SET_SCOPES_QUERY } from "./query";
 
diff --git a/app/(admin)/(user-management)/scopesets/_components/create.tsx b/app/(admin)/(user-management)/scopesets/_components/create.tsx
@@ -9,7 +9,7 @@ import {
   DialogTitle,
   DialogTrigger,
 } from "@/components/ui/dialog";
-import { useMutation } from "@apollo/client";
+import { useMutation } from "@apollo/client/react";
 import { useRouter } from "next/navigation";
 import { useState } from "react";
 import { toast } from "sonner";
diff --git a/app/(admin)/(user-management)/scopesets/_components/data-table.tsx b/app/(admin)/(user-management)/scopesets/_components/data-table.tsx
@@ -1,7 +1,7 @@
 "use client";
 
 import { GeneralDataTable } from "@/components/data-table/general";
-import { useSuspenseQuery } from "@apollo/client";
+import { useSuspenseQuery } from "@apollo/client/react";
 import { columns, type ScopeSet } from "./data-table-columns";
 import { SCOPE_SET_TABLE_QUERY } from "./query";
 
diff --git a/app/(admin)/(user-management)/scopesets/_components/delete.tsx b/app/(admin)/(user-management)/scopesets/_components/delete.tsx
@@ -13,8 +13,7 @@ import {
 } from "@/components/ui/alert-dialog";
 import { buttonVariants } from "@/components/ui/button";
 import { DropdownMenuItem } from "@/components/ui/dropdown-menu";
-import { useSuspenseQuery } from "@apollo/client";
-import { useMutation } from "@apollo/client";
+import { useMutation, useSuspenseQuery } from "@apollo/client/react";
 import { Trash } from "lucide-react";
 import { useRouter } from "next/navigation";
 import { Suspense, useState } from "react";
diff --git a/app/(admin)/(user-management)/scopesets/_components/update.tsx b/app/(admin)/(user-management)/scopesets/_components/update.tsx
@@ -10,8 +10,7 @@ import {
   DialogTrigger,
 } from "@/components/ui/dialog";
 import { DropdownMenuItem } from "@/components/ui/dropdown-menu";
-import { useSuspenseQuery } from "@apollo/client";
-import { useMutation } from "@apollo/client";
+import { useMutation, useSuspenseQuery } from "@apollo/client/react";
 import { Pencil } from "lucide-react";
 import { useRouter } from "next/navigation";
 import { Suspense, useState } from "react";
diff --git a/app/(admin)/(user-management)/users/[id]/_components/audit-info.tsx b/app/(admin)/(user-management)/users/[id]/_components/audit-info.tsx
@@ -2,7 +2,7 @@
 
 import { CardLayout } from "@/components/card-layout";
 import { Skeleton } from "@/components/ui/skeleton";
-import { useSuspenseQuery } from "@apollo/client";
+import { useSuspenseQuery } from "@apollo/client/react";
 import { Clock } from "lucide-react";
 import { Suspense } from "react";
 import { USER_AUDIT_INFO_QUERY } from "./query";
diff --git a/app/(admin)/(user-management)/users/[id]/_components/groups.tsx b/app/(admin)/(user-management)/users/[id]/_components/groups.tsx
@@ -3,7 +3,7 @@
 import { CardLayout } from "@/components/card-layout";
 import { StyledLink } from "@/components/ui/link";
 import { Skeleton } from "@/components/ui/skeleton";
-import { useSuspenseQuery } from "@apollo/client";
+import { useSuspenseQuery } from "@apollo/client/react";
 import { Suspense } from "react";
 import { USER_GROUP_QUERY } from "./query";
 
diff --git a/app/(admin)/(user-management)/users/[id]/_components/header.tsx b/app/(admin)/(user-management)/users/[id]/_components/header.tsx
@@ -2,7 +2,7 @@
 
 import AppAvatar from "@/components/avatar";
 import PageHeader, { PageHeaderSkeleton } from "@/components/page-header";
-import { useSuspenseQuery } from "@apollo/client";
+import { useSuspenseQuery } from "@apollo/client/react";
 import { Suspense } from "react";
 import { USER_HEADER_QUERY } from "./query";
 
diff --git a/app/(admin)/(user-management)/users/_components/data-table.tsx b/app/(admin)/(user-management)/users/_components/data-table.tsx
@@ -2,7 +2,7 @@
 
 import { CursorDataTable } from "@/components/data-table/cursor";
 import type { Direction } from "@/components/data-table/pagination";
-import { useSuspenseQuery } from "@apollo/client";
+import { useSuspenseQuery } from "@apollo/client/react";
 import { useState } from "react";
 import { columns, type User } from "./data-table-columns";
 import { USERS_TABLE_QUERY } from "./query";
diff --git a/app/(admin)/(user-management)/users/_components/delete.tsx b/app/(admin)/(user-management)/users/_components/delete.tsx
@@ -13,8 +13,7 @@ import {
 } from "@/components/ui/alert-dialog";
 import { buttonVariants } from "@/components/ui/button";
 import { DropdownMenuItem } from "@/components/ui/dropdown-menu";
-import { useSuspenseQuery } from "@apollo/client";
-import { useMutation } from "@apollo/client";
+import { useMutation, useSuspenseQuery } from "@apollo/client/react";
 import { Trash } from "lucide-react";
 import { useRouter } from "next/navigation";
 import { Suspense, useState } from "react";
diff --git a/app/(admin)/(user-management)/users/_components/update.tsx b/app/(admin)/(user-management)/users/_components/update.tsx
@@ -10,7 +10,7 @@ import {
   DialogTrigger,
 } from "@/components/ui/dialog";
 import { DropdownMenuItem } from "@/components/ui/dropdown-menu";
-import { useMutation, useSuspenseQuery } from "@apollo/client";
+import { useMutation, useSuspenseQuery } from "@apollo/client/react";
 import { Pencil } from "lucide-react";
 import { useRouter } from "next/navigation";
 import { Suspense, useState } from "react";
diff --git a/app/(admin)/me/_components/form.tsx b/app/(admin)/me/_components/form.tsx
@@ -6,7 +6,7 @@ import { Form, FormControl, FormDescription, FormField, FormItem, FormLabel, For
 import { Input } from "@/components/ui/input";
 import { BASIC_USER_INFO_QUERY } from "@/lib/user";
 import { useUser } from "@/providers/use-user";
-import { useMutation } from "@apollo/client";
+import { useMutation } from "@apollo/client/react";
 import { zodResolver } from "@hookform/resolvers/zod";
 import { useForm } from "react-hook-form";
 import { toast } from "sonner";
diff --git a/app/global-error.tsx b/app/global-error.tsx
diff --git a/eslint.config.mjs b/eslint.config.mjs
diff --git a/package.json b/package.json
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
