Skip to content

Revert attempt to update to Apollo Client 4.2 #2430

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
PowerKiKi merged 1 commit into from
Jul 23, 2026
Merged

Revert attempt to update to Apollo Client 4.2 #2430

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions .changeset/lazy-lights-live.md
View file
Open in desktop

This file was deleted.

22 changes: 0 additions & 22 deletions .changeset/wide-carrots-dance.md
View file
Open in desktop

This file was deleted.

9 changes: 3 additions & 6 deletions packages/apollo-angular/src/apollo.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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';
Expand All @@ -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,
Expand Down Expand Up @@ -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 });

Expand Down
11 changes: 3 additions & 8 deletions packages/apollo-angular/src/only-complete-data.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
>;

/**
Expand Down Expand Up @@ -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');
}
2 changes: 1 addition & 1 deletion packages/demo/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
Loading
Loading