Adds support for useBackgroundQuery and useReadQuery in Streaming SSR

examples/app-dir-experiments/app/ssr/ApolloWrapper.tsx

@@ -1,14 +1,10 @@
 "use client";
 
-import {
-  ApolloClient,
-  ApolloLink,
-  HttpLink,
-  SuspenseCache,
-} from "@apollo/client";
+import { ApolloLink, HttpLink, SuspenseCache } from "@apollo/client";
 import {
   ApolloNextAppProvider,
   NextSSRInMemoryCache,
+  NextSSRApolloClient,
   SSRMultipartLink,
 } from "@apollo/experimental-nextjs-app-support/ssr";
 import { setVerbosity } from "ts-invariant";
@@ -21,7 +17,7 @@ function makeClient() {
     fetchOptions: { cache: "no-store" },
   });
 
-  return new ApolloClient({
+  return new NextSSRApolloClient({
     cache: new NextSSRInMemoryCache(),
     link:
       typeof window === "undefined"

examples/app-dir-experiments/package.json

@@ -10,7 +10,7 @@
     "lint": "next lint"
   },
   "dependencies": {
-    "@apollo/client": ">=3.8.0-beta.2",
+    "@apollo/client": ">=3.8.0-beta.3",
     "@apollo/experimental-nextjs-app-support": "workspace:^",
     "@apollo/server": "^4.6.0",
     "@as-integrations/next": "^1.3.0",

examples/hack-the-supergraph-ssr/app/ApolloWrapper.tsx

@@ -1,15 +1,11 @@
 "use client";
 import React from "react";
-import {
-  ApolloClient,
-  ApolloLink,
-  HttpLink,
-  SuspenseCache,
-} from "@apollo/client";
+import { ApolloLink, HttpLink, SuspenseCache } from "@apollo/client";
 import clientCookies from "js-cookie";
 import {
   ApolloNextAppProvider,
   NextSSRInMemoryCache,
+  NextSSRApolloClient,
   SSRMultipartLink,
 } from "@apollo/experimental-nextjs-app-support/ssr";
 
@@ -75,7 +71,7 @@ export function ApolloWrapper({
           ])
         : ApolloLink.from([delayLink, httpLink]);
 
-    return new ApolloClient({
+    return new NextSSRApolloClient({
       cache: new NextSSRInMemoryCache(),
       link,
     });

examples/hack-the-supergraph-ssr/app/error.tsx

@@ -4,16 +4,14 @@ import React from "react";
 import { Box, Heading, Text, VStack } from "@chakra-ui/react";
 
 export const Error = ({
-  children,
-  code,
   error,
-}: React.PropsWithChildren<{
-  code?: string;
-  error: { toString(): string };
-}>) => (
+  reset,
+}: {
+  error: Error;
+  reset: () => void;
+}) => (
   <VStack spacing="12">
     <VStack textAlign="center">
-      <Heading size="4xl">{code ?? "Unknown Error"}</Heading>
       <Heading fontSize="3xl">Houston, something went wrong on our end</Heading>
       <Text>Please review the information below for more details.</Text>
     </VStack>
@@ -25,10 +23,9 @@ export const Error = ({
         borderRadius="8px"
         borderColor="brand.light"
       >
-        <Text color="brand.error">{error.toString()}</Text>
+        <Text color="brand.error">Error: {error.message}</Text>
       </Box>
     )}
-    {children}
   </VStack>
 );
 

examples/hack-the-supergraph-ssr/package.json

@@ -10,7 +10,7 @@
     "lint": "next lint"
   },
   "dependencies": {
-    "@apollo/client": ">=3.8.0-beta.2",
+    "@apollo/client": ">=3.8.0-beta.3",
     "@apollo/experimental-nextjs-app-support": "workspace:^",
     "@apollo/space-kit": "^9.11.0",
     "@chakra-ui/next-js": "^2.1.2",

examples/polls-demo/app/cc/apollo-wrapper.tsx

@@ -1,12 +1,8 @@
 "use client";
 
+import { ApolloLink, HttpLink, SuspenseCache } from "@apollo/client";
 import {
-  ApolloClient,
-  ApolloLink,
-  HttpLink,
-  SuspenseCache,
-} from "@apollo/client";
-import {
+  NextSSRApolloClient,
   ApolloNextAppProvider,
   NextSSRInMemoryCache,
   SSRMultipartLink,
@@ -25,7 +21,7 @@ function makeClient() {
     uri: "https://fragrant-shadow-9470.fly.dev/",
   });
 
-  return new ApolloClient({
+  return new NextSSRApolloClient({
     cache: new NextSSRInMemoryCache(),
     link:
       typeof window === "undefined"

examples/polls-demo/app/cc/error.tsx

@@ -1,5 +1,11 @@
 "use client";
 
-export default function Error(error: { toString(): string }) {
-  return <p>Error: {error.toString()}</p>;
+export default function Error({
+  error,
+  reset,
+}: {
+  error: Error;
+  reset: () => void;
+}) {
+  return <p>Error: {error.message}</p>;
 }

examples/polls-demo/app/cc/page.tsx

@@ -1,7 +1,7 @@
-import { Poll } from "./poll-cc";
+import { PollWrapper } from "./poll-cc";
 
 export const dynamic = "force-dynamic";
 
 export default async function Home() {
-  return <Poll />;
+  return <PollWrapper />;
 }

examples/polls-demo/app/cc/poll-cc.tsx

@@ -1,23 +1,36 @@
 "use client";
-
-import { useSuspenseQuery } from "@apollo/experimental-nextjs-app-support/ssr";
+import { Suspense } from "react";
+import {
+  useReadQuery,
+  useBackgroundQuery,
+} from "@apollo/experimental-nextjs-app-support/ssr";
 import { useMutation } from "@apollo/client";
+import { QueryReference } from "@apollo/client/react/cache/QueryReference";
 import { Poll as PollInner } from "@/components/poll";
 
 import { useState, useCallback } from "react";
 
 import {
   AnswerPollDocument,
   GetPollDocument,
+  GetPollQuery,
 } from "@/components/poll/documents.generated";
 
-export const Poll = () => {
-  const [showResults, setShowResults] = useState(false);
-
-  const { data } = useSuspenseQuery(GetPollDocument, {
+export const PollWrapper = () => {
+  const [queryRef] = useBackgroundQuery(GetPollDocument, {
     variables: { id: "1", delay: 0 },
   });
 
+  return (
+    <Suspense fallback={<>Loading...</>}>
+      <Poll queryRef={queryRef} />
+    </Suspense>
+  );
+};
+
+const Poll = ({ queryRef }: { queryRef: QueryReference<GetPollQuery> }) => {
+  const { data } = useReadQuery(queryRef);
+  const [showResults, setShowResults] = useState(false);
   const [mutate, { loading: mutationLoading }] =
     useMutation(AnswerPollDocument);
 

examples/polls-demo/package.json

@@ -12,7 +12,7 @@
     "codegen": "graphql-codegen --config codegen.ts"
   },
   "dependencies": {
-    "@apollo/client": ">=3.8.0-beta.2",
+    "@apollo/client": ">=3.8.0-beta.3",
     "@apollo/experimental-nextjs-app-support": "workspace:^",
     "@apollo/server": "^4.7.0",
     "@as-integrations/next": "^1.3.0",

package/.eslintrc.js

@@ -20,5 +20,11 @@ module.exports = {
   rules: {
     "@typescript-eslint/no-explicit-any": "off",
     "react/prop-types": "off",
+    "@typescript-eslint/no-unused-vars": [
+      "warn",
+      {
+        varsIgnorePattern: "^_",
+      },
+    ],
   },
 };

package/README.md

@@ -82,14 +82,14 @@ First, create a new file `app/ApolloWrapper.js`:
 // ^ this file needs the "use client" pragma
 
 import {
-  ApolloClient,
   ApolloLink,
   HttpLink,
   SuspenseCache,
 } from "@apollo/client";
 import {
   ApolloNextAppProvider,
   NextSSRInMemoryCache,
+  NextSSRApolloClient,
   SSRMultipartLink,
 } from "@apollo/experimental-nextjs-app-support/ssr";
 
@@ -103,7 +103,7 @@ function makeClient() {
     fetchOptions: { cache: "no-store" },
   });
 
-  return new ApolloClient({
+  return new NextSSRApolloClient({
     // use the `NextSSRInMemoryCache`, not the normal `InMemoryCache`
     cache: new NextSSRInMemoryCache(),
     link:
@@ -164,7 +164,12 @@ export default function RootLayout({
 > ☝️ This will work even if your layout is a React Server Component and will also allow the children of the layout to be React Server Components.  
 > It just makes sure that all Client Components will have access to the same Apollo Client instance, shared through the `ApolloNextAppProvider`.
 
-Now you can use the hooks `useQuery`, `useSuspenseQuery`, `useFragment`, and `useApolloClient` from `"@apollo/experimental-nextjs-app-support/ssr"` in your Client components like you are used to.
+You can import the following Apollo Client hooks from `"@apollo/experimental-nextjs-app-support/ssr"` in your client components (make sure you are not importing these hooks from `@apollo/client` as this package wraps and re-exports them to support streaming SSR):
+- `useQuery`
+- `useSuspenseQuery`
+- `useBackgroundQuery`
+- `useReadQuery`
+- `useFragment`
 
 If you want to make the most of the streaming SSR features offered by React & the Next.js App Router, consider using the [`useSuspenseQuery`](https://www.apollographql.com/docs/react/api/react/hooks-experimental/#using-usesuspensequery_experimental) and [`useFragment`](https://www.apollographql.com/docs/react/api/react/hooks-experimental/#using-usefragment_experimental) hooks.
 

package/package.json

@@ -44,7 +44,7 @@
   },
   "packageManager": "[email protected]",
   "devDependencies": {
-    "@apollo/client": ">=3.8.0-beta.2",
+    "@apollo/client": ">=3.8.0-beta.3",
     "@total-typescript/shoehorn": "^0.1.0",
     "@tsconfig/recommended": "^1.0.1",
     "@typescript-eslint/eslint-plugin": "latest",
@@ -59,7 +59,7 @@
     "vitest": "^0.30.1"
   },
   "peerDependencies": {
-    "@apollo/client": ">=3.8.0-beta.2",
+    "@apollo/client": ">=3.8.0-beta.3",
     "next": "^13.4.1",
     "react": "^18"
   },

package/src/ssr/ApolloRehydrateSymbols.tsx

@@ -1,14 +1,22 @@
 import { SuperJSONResult } from "superjson/dist/types";
-import { RehydrationCache, ResultsCache } from "./types";
+import {
+  RehydrationCache,
+  ResultsCache,
+  BackgroundQueriesCache,
+} from "./types";
 import type { DataTransport } from "./dataTransport";
 
 declare global {
   interface Window {
     [ApolloRehydrationCache]?: RehydrationCache;
     [ApolloResultCache]?: ResultsCache;
     [ApolloSSRDataTransport]?: DataTransport<SuperJSONResult>;
+    [ApolloBackgroundQueryTransport]?: BackgroundQueriesCache;
   }
 }
 export const ApolloRehydrationCache = Symbol.for("ApolloRehydrationCache");
 export const ApolloResultCache = Symbol.for("ApolloResultCache");
 export const ApolloSSRDataTransport = Symbol.for("ApolloSSRDataTransport");
+export const ApolloBackgroundQueryTransport = Symbol.for(
+  "ApolloBackgroundQueryTransport"
+);