Don't call `reobserve` when changing most options in `useQuery` and instead apply them #12681

jerelmiller · 2025-06-06T22:23:48Z

Changing most options for useQuery no longer calls reobserve to avoid network requests when unnecessary. Instead the options are applied to the next fetch.

changeset-bot · 2025-06-06T22:23:51Z

🦋 Changeset detected

Latest commit: b75c2d7

The changes in this PR will be included in the next version bump.

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

jerelmiller · 2025-06-06T22:24:29Z

src/core/ObservableQuery.ts

    newOptions: Partial<ObservableQuery.Options<TData, TVariables>>
  ) {
    const mergedOptions = compact(this.options, newOptions || {});
    assign(this.options, mergedOptions);
+
+    if (this.options.fetchPolicy === "standby") {


This mimics what reobserve does so that polling doesn't continue.

pkg-pr-new · 2025-06-06T22:25:09Z

npm i https://pkg.pr.new/apollographql/apollo-client/@apollo/client@12681

commit: d92356a

jerelmiller · 2025-06-06T22:25:33Z

src/testing/matchers/index.d.ts

  : T extends SnapshotStream<infer Snapshot, any> ?
-    (options: ToRerenderWithSimilarSnapshotOptions<Snapshot>) => Promise<R>
+    (options?: ToRerenderWithSimilarSnapshotOptions<Snapshot>) => Promise<R>


It looks like the implementation allows has this argument as optional so I updated this to work the same.

Yup, that was the intention, thank you for catching that!

github-actions · 2025-06-06T22:25:42Z

size-limit report 📦

Path	Size
import { ApolloClient, InMemoryCache, HttpLink } from "@apollo/client" (CJS)	42.52 KB (-0.05% 🔽)
import { ApolloClient, InMemoryCache, HttpLink } from "@apollo/client" (production) (CJS)	37.66 KB (-0.11% 🔽)
import { ApolloClient, InMemoryCache, HttpLink } from "@apollo/client"	32.55 KB (-0.03% 🔽)
import { ApolloClient, InMemoryCache, HttpLink } from "@apollo/client" (production)	26.97 KB (+0.12% 🔺)
import { ApolloProvider } from "@apollo/client/react"	5.68 KB (0%)
import { ApolloProvider } from "@apollo/client/react" (production)	963 B (0%)
import { useQuery } from "@apollo/client/react"	7.44 KB (+0.39% 🔺)
import { useQuery } from "@apollo/client/react" (production)	2.7 KB (+1.77% 🔺)
import { useLazyQuery } from "@apollo/client/react"	6.93 KB (-0.05% 🔽)
import { useLazyQuery } from "@apollo/client/react" (production)	2.19 KB (-0.14% 🔽)
import { useMutation } from "@apollo/client/react"	6.52 KB (0%)
import { useMutation } from "@apollo/client/react" (production)	1.76 KB (0%)
import { useSubscription } from "@apollo/client/react"	6.62 KB (0%)
import { useSubscription } from "@apollo/client/react" (production)	1.86 KB (0%)
import { useSuspenseQuery } from "@apollo/client/react"	8.44 KB (-0.4% 🔽)
import { useSuspenseQuery } from "@apollo/client/react" (production)	3.74 KB (-0.29% 🔽)
import { useBackgroundQuery } from "@apollo/client/react"	8.21 KB (-0.11% 🔽)
import { useBackgroundQuery } from "@apollo/client/react" (production)	3.5 KB (-0.31% 🔽)
import { useLoadableQuery } from "@apollo/client/react"	8.52 KB (0%)
import { useLoadableQuery } from "@apollo/client/react" (production)	3.82 KB (-0.08% 🔽)
import { useReadQuery } from "@apollo/client/react"	6.44 KB (+0.13% 🔺)
import { useReadQuery } from "@apollo/client/react" (production)	1.69 KB (+0.24% 🔺)
import { useFragment } from "@apollo/client/react"	6.47 KB (0%)
import { useFragment } from "@apollo/client/react" (production)	1.74 KB (0%)

jerelmiller · 2025-06-06T22:26:07Z

src/core/ObservableQuery.ts

@@ -946,11 +946,15 @@ Did you mean to call refetch(variables) instead of refetch({ variables })?`,
  }

  /** @internal */
-  public silentSetOptions(
+  public applyOptions(


The old name was never my favorite. Hope this is ok. Sorry for the noise 😆

phryneas · 2025-06-10T07:50:52Z

.changeset/many-seas-call.md

+- `query`
+- `variables`
+- `skip`
+- Changing `fetchPolicy` from `standby` to a different `fetchPolicy`


Suggested change

- Changing `fetchPolicy` from `standby` to a different `fetchPolicy`

- Changing `fetchPolicy` from or to `standby`

.changeset/many-seas-call.md

phryneas · 2025-06-10T08:58:59Z

src/react/hooks/useQuery.ts

+function shouldReobserve<TData, TVariables extends OperationVariables>(
+  previousOptions: Readonly<WatchQueryOptions<TVariables, TData>>,
+  options: Readonly<WatchQueryOptions<TVariables, TData>>
+) {
+  return (
+    previousOptions.query !== options.query ||
+    !equal(previousOptions.variables, options.variables) ||
+    (previousOptions.fetchPolicy === "standby" &&
+      options.fetchPolicy !== "standby")
+  );
+}


Should this whole logic maybe go into applyOptions? It doesn't really hurt and also could lead to some of the logic in InternalQueryReference.applyOptions being removed 🤔

Discussed in person. We don't want to move here so that useLazyQuery doesn't get reobserve behavior when rerendering with new options before calling execute. execute is the catalyst that will potentially kick off the request (since it calls reobserve). Keeping it out of applyOptions will ensure we have more control over which behavior to use based on the hook using it.

phryneas · 2025-06-10T08:59:24Z

src/testing/matchers/index.d.ts

  : T extends SnapshotStream<infer Snapshot, any> ?
-    (options: ToRerenderWithSimilarSnapshotOptions<Snapshot>) => Promise<R>
+    (options?: ToRerenderWithSimilarSnapshotOptions<Snapshot>) => Promise<R>


Yup, that was the intention, thank you for catching that!

phryneas · 2025-06-18T14:32:51Z

src/react/hooks/__tests__/useQuery.test.tsx

+
+      await expect(renderStream).toRerenderWithSimilarSnapshot({
+        // We waited 50ms before, so waiting another 50ms + 50ms = 100ms
+        timeout: 50,


Suggested change

timeout: 50,

timeout: 55,

This will get very flaky in tests otherwise.

…ders

jerelmiller requested a review from phryneas June 6, 2025 22:23

jerelmiller commented Jun 6, 2025

View reviewed changes

jerelmiller linked an issue Jun 9, 2025 that may be closed by this pull request

Changes to context cause refetches in useQuery #11835

Closed

phryneas reviewed Jun 10, 2025

View reviewed changes

jerelmiller marked this pull request as draft June 12, 2025 06:17

jerelmiller force-pushed the jerel/use-query-less-fetch branch 2 times, most recently from 7ff3b66 to 9577cd7 Compare June 16, 2025 18:35

jerelmiller marked this pull request as ready for review June 16, 2025 18:35

jerelmiller requested a review from phryneas June 16, 2025 18:35

phryneas approved these changes Jun 18, 2025

View reviewed changes

jerelmiller added 15 commits June 18, 2025 12:27

Add failing teset for changing errorPolicy between renders

440fa0b

Add failing test for changing context between renders

c77755a

Add failing test for changing refetchWritePolicy between renders

93dd26a

Add failing test for changing returnPartialData between renders

b5951c9

Add failing test for changing fetchPolicy between renders

3881cd4

Add failing test for changing notifyOnNetworkStatusChange between ren…

9953bf7

…ders

Remove unused var

890d383

Update incorrect assertions

c9e2577

Make options optional for toRerenderWithSimilarSnapshot

a00e3bf

Use toRerenderWithSimilarSnapshot

417f5c3

Cancel polling in silentSetOptions if fetchPolicy is standby

cce9802

Add changeset

ba1e6fa

update size limits

e736b07

Rename silentSetOptions to applyOptions

395ac0f

Rerun api report

a4e41a6

jerelmiller added 13 commits June 18, 2025 12:30

Update size limits

916ce07

Add test to ensure changing from skip false -> true works as expected

311f8e8

Call reobserve when changing to standby fetch policy

dd3d0ac

Add test for changing pollInterval on rerender

e747742

Add test for rerendering pollInterval to 0

8fd5932

Add test for rerendering pollInterval > 0

5aa598f

Call updatePolling in applyOptions

8ec2633

Add tests for changing to/from standby fetch policy

11c179a

Don't call reobserve in applyOptions. Move to useQuery instead

1d9a485

Update changeset

f2c238b

Add test for cache update while in standby

5a7ff55

Update changeset

4eb1d2f

Update timeout

fe8f0fa

jerelmiller force-pushed the jerel/use-query-less-fetch branch from 9577cd7 to fe8f0fa Compare June 18, 2025 18:31

jerelmiller added the auto-cleanup 🤖 label Jun 18, 2025

jerelmiller and others added 2 commits June 18, 2025 12:34

Force run cleanup

d92356a

Clean up Prettier, Size-limit, and Api-Extractor

b75c2d7

jerelmiller merged commit b181f98 into release-4.0 Jun 18, 2025
31 of 32 checks passed

jerelmiller deleted the jerel/use-query-less-fetch branch June 18, 2025 18:43

github-actions bot mentioned this pull request Jun 18, 2025

Version Packages (alpha) #12710

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Don't call `reobserve` when changing most options in `useQuery` and instead apply them #12681

Don't call `reobserve` when changing most options in `useQuery` and instead apply them #12681

Uh oh!

jerelmiller commented Jun 6, 2025

Uh oh!

changeset-bot bot commented Jun 6, 2025 •

edited

Loading

Uh oh!

jerelmiller Jun 6, 2025

Uh oh!

pkg-pr-new bot commented Jun 6, 2025 •

edited

Loading

Uh oh!

jerelmiller Jun 6, 2025

Uh oh!

phryneas Jun 10, 2025

Uh oh!

github-actions bot commented Jun 6, 2025 •

edited

Loading

Uh oh!

jerelmiller Jun 6, 2025

Uh oh!

phryneas Jun 10, 2025

Uh oh!

Uh oh!

phryneas Jun 10, 2025

Uh oh!

jerelmiller Jun 16, 2025

Uh oh!

phryneas Jun 10, 2025

Uh oh!

phryneas Jun 18, 2025

Uh oh!

jerelmiller Jun 18, 2025

Uh oh!

Uh oh!

Uh oh!

	- Changing `fetchPolicy` from `standby` to a different `fetchPolicy`
	- Changing `fetchPolicy` from or to `standby`

Don't call reobserve when changing most options in useQuery and instead apply them #12681

Don't call reobserve when changing most options in useQuery and instead apply them #12681

Uh oh!

Conversation

jerelmiller commented Jun 6, 2025

Uh oh!

changeset-bot bot commented Jun 6, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

🦋 Changeset detected

Uh oh!

Choose a reason for hiding this comment

Uh oh!

pkg-pr-new bot commented Jun 6, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

github-actions bot commented Jun 6, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

size-limit report 📦

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Don't call `reobserve` when changing most options in `useQuery` and instead apply them #12681

Don't call `reobserve` when changing most options in `useQuery` and instead apply them #12681

changeset-bot bot commented Jun 6, 2025 •

edited

Loading

pkg-pr-new bot commented Jun 6, 2025 •

edited

Loading

github-actions bot commented Jun 6, 2025 •

edited

Loading