Merge branch 'main' into release-4.0

Author: phryneas

.api-reports/api-report-utilities.api.md

@@ -718,7 +718,7 @@ export class DeepMerger<TContextArgs extends any[]> {
 //
 // @public (undocumented)
 export type DeepOmit<T, K> = T extends DeepOmitPrimitive ? T : {
-    [P in Exclude<keyof T, K>]: T[P] extends infer TP ? TP extends DeepOmitPrimitive ? TP : TP extends any[] ? DeepOmitArray<TP, K> : DeepOmit<TP, K> : never;
+    [P in keyof T as P extends K ? never : P]: T[P] extends infer TP ? TP extends DeepOmitPrimitive ? TP : TP extends any[] ? DeepOmitArray<TP, K> : DeepOmit<TP, K> : never;
 };
 
 // @public (undocumented)

.changeset/fresh-spies-burn.md

@@ -1,5 +1,37 @@
 # @apollo/client
 
+## 3.13.4
+
+### Patch Changes
+
+- [#12420](https://github.com/apollographql/apollo-client/pull/12420) [`fee9368`](https://github.com/apollographql/apollo-client/commit/fee9368750e242ea03dea8d1557683506d411d8d) Thanks [@jorenbroekema](https://github.com/jorenbroekema)! - Use import star from `rehackt` to prevent issues with importing named exports from external CJS modules.
+
+## 3.13.3
+
+### Patch Changes
+
+- [#12362](https://github.com/apollographql/apollo-client/pull/12362) [`f6d387c`](https://github.com/apollographql/apollo-client/commit/f6d387c166cc76f08135966fb6d74fd8fe808c21) Thanks [@jerelmiller](https://github.com/jerelmiller)! - Fixes an issue where calling `observableQuery.getCurrentResult()` when the `errorPolicy` was set to `all` would return the `networkStatus` as `NetworkStatus.ready` when there were errors returned in the result. This has been corrected to report `NetworkStatus.error`.
+
+  This bug also affected the `useQuery` and `useLazyQuery` hooks and may affect you if you check for `networkStatus` in your component.
+
+## 3.13.2
+
+### Patch Changes
+
+- [#12409](https://github.com/apollographql/apollo-client/pull/12409) [`6aa2f3e`](https://github.com/apollographql/apollo-client/commit/6aa2f3e81ee0ae59da7ae0b12000bb5a55ec5c6d) Thanks [@phryneas](https://github.com/phryneas)! - To mitigate problems when Apollo Client ends up more than once in the bundle, some unique symbols were converted into `Symbol.for` calls.
+
+- [#12392](https://github.com/apollographql/apollo-client/pull/12392) [`644bb26`](https://github.com/apollographql/apollo-client/commit/644bb2662168a9bac0519be6979f0db38b0febc4) Thanks [@Joja81](https://github.com/Joja81)! - Fixes an issue where the DeepOmit type would turn optional properties into required properties. This should only affect you if you were using the omitDeep or stripTypename utilities exported by Apollo Client.
+
+- [#12404](https://github.com/apollographql/apollo-client/pull/12404) [`4332b88`](https://github.com/apollographql/apollo-client/commit/4332b886f0409145af57f26d334f86e5a1b465c5) Thanks [@jerelmiller](https://github.com/jerelmiller)! - Show `NaN` rather than converting to `null` in debug messages from `MockLink` for unmatched `variables` values.
+
+## 3.13.1
+
+### Patch Changes
+
+- [#12369](https://github.com/apollographql/apollo-client/pull/12369) [`bdfc5b2`](https://github.com/apollographql/apollo-client/commit/bdfc5b2e386ed5f835716a542de0cf17da37f7fc) Thanks [@phryneas](https://github.com/phryneas)! - `ObervableQuery.refetch`: don't refetch with `cache-and-network`, swich to `network-only` instead
+
+- [#12375](https://github.com/apollographql/apollo-client/pull/12375) [`d3f8f13`](https://github.com/apollographql/apollo-client/commit/d3f8f130718ef50531ca0079192c2672a513814a) Thanks [@jerelmiller](https://github.com/jerelmiller)! - Export the `UseSuspenseFragmentOptions` type.
+
 ## 3.13.0
 
 ### Minor Changes

.changeset/shiny-sheep-behave.md

@@ -12,7 +12,7 @@
 ---
 
 **Announcement:**
-Join 1000+ engineers at GraphQL Summit for talks, workshops, and office hours, Oct 8-10 in NYC. [Get your pass here ->](https://summit.graphql.com/?utm_campaign=github_federation_readme)
+Join 1000+ engineers at GraphQL Summit 2025 by Apollo for talks, workshops, and office hours. Oct 6-8, 2025 in San Francisco. [Get your pass here ->](https://www.apollographql.com/graphql-summit-2025?utm_campaign=2025-03-04_graphql-summit-github-announcement&utm_medium=github&utm_source=apollo-server)
 
 ---
 

CHANGELOG.md

@@ -460,69 +460,75 @@ const COMMENTS_SUBSCRIPTION = gql`
 
 </MultiCodeBlock>
 
-Next, we modify our `CommentsPageWithData` function to add a `subscribeToNewComments` property to the `CommentsPage` component it returns. This property is a function that will be responsible for calling `subscribeToMore` after the component mounts.
+Next, we modify our `CommentsPageWithData` component to call `subscribeToMore` after the comments query loads.
 
 <MultiCodeBlock>
 
 ```tsx {10-25}
 function CommentsPageWithData({ params }: CommentsPageWithDataProps) {
-  const { subscribeToMore, ...result } = useQuery(
-    COMMENTS_QUERY,
-    { variables: { postID: params.postID } }
-  );
+  const { subscribeToMore, ...result } = useQuery(COMMENTS_QUERY, {
+    variables: { postID: params.postID },
+  });
+
+  useEffect(() => {
+    // This assumes you want to wait to start the subscription
+    // after the query has loaded.
+    if (result.data) {
+      const unsubscribe = subscribeToMore({
+        document: COMMENTS_SUBSCRIPTION,
+        variables: { postID: params.postID },
+        updateQuery: (prev, { subscriptionData }) => {
+          if (!subscriptionData.data) return prev;
+          const newFeedItem = subscriptionData.data.commentAdded;
+
+          return Object.assign({}, prev, {
+            post: {
+              comments: [newFeedItem, ...prev.post.comments],
+            },
+          });
+        },
+      });
+
+      return () => {
+        unsubscribe();
+      };
+    }
+  }, [result.data, params.postID, subscribeToMore]);
 
-  return (
-    <CommentsPage
-      {...result}
-      subscribeToNewComments={() =>
-        subscribeToMore({
-          document: COMMENTS_SUBSCRIPTION,
-          variables: { postID: params.postID },
-          updateQuery: (prev, { subscriptionData }) => {
-            if (!subscriptionData.data) return prev;
-            const newFeedItem = subscriptionData.data.commentAdded;
-
-            return Object.assign({}, prev, {
-              post: {
-                comments: [newFeedItem, ...prev.post.comments]
-              }
-            });
-          }
-        })
-      }
-    />
-  );
+  return <CommentsPage {...result} />;
 }
 ```
 
 ```jsx {10-25}
 function CommentsPageWithData({ params }) {
-  const { subscribeToMore, ...result } = useQuery(
-    COMMENTS_QUERY,
-    { variables: { postID: params.postID } }
-  );
+  const { subscribeToMore, ...result } = useQuery(COMMENTS_QUERY, {
+    variables: { postID: params.postID },
+  });
+
+  useEffect(() => {
+    if (result.data) {
+      const unsubscribe = subscribeToMore({
+        document: COMMENTS_SUBSCRIPTION,
+        variables: { postID: params.postID },
+        updateQuery: (prev, { subscriptionData }) => {
+          if (!subscriptionData.data) return prev;
+          const newFeedItem = subscriptionData.data.commentAdded;
+
+          return Object.assign({}, prev, {
+            post: {
+              comments: [newFeedItem, ...prev.post.comments],
+            },
+          });
+        },
+      });
+
+      return () => {
+        unsubscribe();
+      };
+    }
+  }, [result.data, params.postID]);
 
-  return (
-    <CommentsPage
-      {...result}
-      subscribeToNewComments={() =>
-        subscribeToMore({
-          document: COMMENTS_SUBSCRIPTION,
-          variables: { postID: params.postID },
-          updateQuery: (prev, { subscriptionData }) => {
-            if (!subscriptionData.data) return prev;
-            const newFeedItem = subscriptionData.data.commentAdded;
-
-            return Object.assign({}, prev, {
-              post: {
-                comments: [newFeedItem, ...prev.post.comments]
-              }
-            });
-          }
-        })
-      }
-    />
-  );
+  return <CommentsPage {...result} />;
 }
 ```
 
@@ -534,28 +540,6 @@ In the example above, we pass three options to `subscribeToMore`:
 * `variables` indicates the variables to include when executing the subscription.
 * `updateQuery` is a function that tells Apollo Client how to combine the query's currently cached result (`prev`) with the `subscriptionData` that's pushed by our GraphQL server. The return value of this function **completely replaces** the current cached result for the query.
 
-Finally, in our definition of `CommentsPage`, we tell the component to `subscribeToNewComments` when it mounts:
-
-<MultiCodeBlock>
-
-```tsx
-export function CommentsPage({ subscribeToNewComments }: CommentsPageProps) {
-  useEffect(() => subscribeToNewComments(), []);
-
-  return <>...</>
-}
-```
-
-```jsx
-export function CommentsPage({ subscribeToNewComments }) {
-  useEffect(() => subscribeToNewComments(), []);
-
-  return <>...</>
-}
-```
-
-</MultiCodeBlock>
-
 ## `useSubscription` API reference
 
 > **Note:** If you're using React Apollo's `Subscription` render prop component, the option/result details listed below are still valid (options are component props and results are passed into the render prop function). The only difference is that a `subscription` prop (which holds a GraphQL subscription document parsed into an AST by `gql`) is also required.

README.md

@@ -47,7 +47,7 @@ export default graphql(currentUserQuery)(Profile)
 
 ## Jest
 
-[Jest](https://facebook.github.io/jest/) can't use the Webpack loaders. To make the same transformation work in Jest, use [jest-transform-graphql](https://github.com/remind101/jest-transform-graphql).
+[Jest](https://facebook.github.io/jest/) can't use the Webpack loaders. To make the same transformation work in Jest, use [jest-graphql-transformer](https://github.com/hamidyfine/jest-graphql-transformer).
 
 ## FuseBox
 

docs/source/data/subscriptions.mdx

@@ -1,6 +1,6 @@
 {
   "name": "@apollo/client",
-  "version": "3.13.1",
+  "version": "3.13.4",
   "description": "A fully-featured caching GraphQL client.",
   "private": true,
   "keywords": [

docs/source/integrations/webpack.md

@@ -304,6 +304,17 @@ export class ObservableQuery<
         }
       }
 
+      // We need to check for both both `error` and `errors` field because there
+      // are cases where sometimes `error` is set, but not `errors` and
+      // vice-versa. This will be updated in the next major version when
+      // `errors` is deprecated in favor of `error`.
+      if (
+        result.networkStatus === NetworkStatus.ready &&
+        (result.error || result.errors)
+      ) {
+        result.networkStatus = NetworkStatus.error;
+      }
+
       if (
         __DEV__ &&
         !diff.complete &&