Merge pull request #2430 from the-guild-org/powerkiki

Revert attempt to update to Apollo Client 4.2

Author: PowerKiKi

.changeset/lazy-lights-live.md

@@ -1,7 +1,7 @@
 import { Observable } from 'rxjs';
 import { Inject, Injectable, NgZone, Optional } from '@angular/core';
 import type { OperationVariables } from '@apollo/client';
-import { ApolloClient, ErrorPolicy } from '@apollo/client';
+import { ApolloClient } from '@apollo/client';
 import { QueryRef } from './query-ref';
 import { APOLLO_FLAGS, APOLLO_NAMED_OPTIONS, APOLLO_OPTIONS } from './tokens';
 import type { EmptyObject, Flags, NamedOptions } from './types';
@@ -18,10 +18,7 @@ export declare namespace Apollo {
     TVariables extends OperationVariables = EmptyObject,
   > = ApolloClient.QueryOptions<TData, TVariables>;
 
-  export type QueryResult<
-    TData = unknown,
-    TErrorPolicy extends ErrorPolicy | undefined = undefined,
-  > = ApolloClient.QueryResult<TData, TErrorPolicy>;
+  export type QueryResult<TData = unknown> = ApolloClient.QueryResult<TData>;
 
   export type MutateOptions<
     TData = unknown,
@@ -100,7 +97,7 @@ export class ApolloBase {
     TVariables extends OperationVariables = EmptyObject,
   >(
     options: Apollo.WatchFragmentOptions<TFragmentData, TVariables>,
-  ): Observable<Apollo.WatchFragmentResult<TFragmentData | null>> {
+  ): Observable<Apollo.WatchFragmentResult<TFragmentData>> {
     const { useZone, ...opts } = options;
     const obs = this.ensureClient().watchFragment<TFragmentData, TVariables>({ ...opts });
 

.changeset/wide-carrots-dance.md

@@ -7,8 +7,8 @@ type CompleteFragment<TData> = {
 } & GetDataState<TData, 'complete'>;
 
 type ForWatchFragment<TData> = OperatorFunction<
-  ApolloClient.WatchFragmentResult<TData | null>,
-  ApolloClient.WatchFragmentResult<TData | null> & CompleteFragment<NonNullable<TData>>
+  ApolloClient.WatchFragmentResult<TData>,
+  CompleteFragment<TData>
 >;
 
 /**
@@ -54,10 +54,5 @@ export const onlyComplete = onlyCompleteData;
  * Same as `onlyCompleteData()` but for `Apollo.watchFragment()`.
  */
 export function onlyCompleteFragment<TData>(): ForWatchFragment<TData> {
-  return filter(
-    (
-      result,
-    ): result is ApolloClient.WatchFragmentResult<TData | null> &
-      CompleteFragment<NonNullable<TData>> => result.dataState === 'complete',
-  );
+  return filter((result): result is CompleteFragment<TData> => result.dataState === 'complete');
 }

packages/apollo-angular/src/apollo.ts

@@ -17,7 +17,7 @@
     "@angular/core": "^20.3.0",
     "@angular/platform-browser": "^20.3.0",
     "@angular/router": "^20.3.0",
-    "@apollo/client": "^4.2.7",
+    "@apollo/client": "^4.0.1",
     "apollo-angular": "workspace:*",
     "typescript": "~5.8.0"
   }