Merge branch 'main' into release-3.13

Author: jerelmiller

CHANGELOG.md

@@ -1,5 +1,13 @@
 # @apollo/client
 
+## 3.12.11
+
+### Patch Changes
+
+- [#12351](https://github.com/apollographql/apollo-client/pull/12351) [`3da908b`](https://github.com/apollographql/apollo-client/commit/3da908b1dde73847805a41c287a83700b2b88887) Thanks [@jerelmiller](https://github.com/jerelmiller)! - Fixes an issue where the wrong `networkStatus` and `loading` value was emitted from `observableQuery` when calling `fetchMore` with a `no-cache` fetch policy. The `networkStatus` now properly reports as `ready` and `loading` as `false` after the result is returned.
+
+- [#12354](https://github.com/apollographql/apollo-client/pull/12354) [`a24ef94`](https://github.com/apollographql/apollo-client/commit/a24ef9474f8f7a864f8b866563f8f7e661d2533f) Thanks [@phryneas](https://github.com/phryneas)! - Fix missing `main.d.cts` file
+
 ## 3.12.10
 
 ### Patch Changes

config/prepareDist.js

@@ -97,7 +97,6 @@ entryPoints.forEach(function buildCts({
   dirs,
   bundleName = dirs[dirs.length - 1],
 }) {
-  if (!dirs.length) return;
   fs.writeFileSync(
     path.join(distRoot, ...dirs, `${bundleName}.d.cts`),
     'export * from "./index.d.ts";\n'

package-lock.json

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

package.json

@@ -22,7 +22,7 @@ import {
 } from "../cache";
 
 import { MockedResponse, mockSingleLink } from "../testing";
-import { ObservableStream } from "../testing/internal";
+import { ObservableStream, setupPaginatedCase } from "../testing/internal";
 
 describe("updateQuery on a simple query", () => {
   const query = gql`
@@ -1789,3 +1789,140 @@ describe("fetchMore on an observable query with connection", () => {
     });
   });
 });
+
+test("uses updateQuery to update the result of the query with no-cache queries", async () => {
+  const { query, link } = setupPaginatedCase();
+
+  const client = new ApolloClient({ cache: new InMemoryCache(), link });
+
+  const observable = client.watchQuery({
+    query,
+    fetchPolicy: "no-cache",
+    notifyOnNetworkStatusChange: true,
+    variables: { limit: 2 },
+  });
+
+  const stream = new ObservableStream(observable);
+
+  await expect(stream).toEmitApolloQueryResult({
+    data: {
+      letters: [
+        { __typename: "Letter", letter: "A", position: 1 },
+        { __typename: "Letter", letter: "B", position: 2 },
+      ],
+    },
+    loading: false,
+    networkStatus: NetworkStatus.ready,
+  });
+
+  let fetchMoreResult = await observable.fetchMore({
+    variables: { offset: 2 },
+    updateQuery: (prev, { fetchMoreResult }) => ({
+      letters: prev.letters.concat(fetchMoreResult.letters),
+    }),
+  });
+
+  expect(fetchMoreResult).toEqualApolloQueryResult({
+    data: {
+      letters: [
+        { __typename: "Letter", letter: "C", position: 3 },
+        { __typename: "Letter", letter: "D", position: 4 },
+      ],
+    },
+    loading: false,
+    networkStatus: NetworkStatus.ready,
+  });
+
+  await expect(stream).toEmitApolloQueryResult({
+    data: {
+      letters: [
+        { __typename: "Letter", letter: "A", position: 1 },
+        { __typename: "Letter", letter: "B", position: 2 },
+      ],
+    },
+    loading: true,
+    networkStatus: NetworkStatus.fetchMore,
+  });
+
+  await expect(stream).toEmitApolloQueryResult({
+    data: {
+      letters: [
+        { __typename: "Letter", letter: "A", position: 1 },
+        { __typename: "Letter", letter: "B", position: 2 },
+        { __typename: "Letter", letter: "C", position: 3 },
+        { __typename: "Letter", letter: "D", position: 4 },
+      ],
+    },
+    loading: false,
+    networkStatus: NetworkStatus.ready,
+  });
+
+  // Ensure we store the merged result as the last result
+  expect(observable.getCurrentResult(false)).toEqualApolloQueryResult({
+    data: {
+      letters: [
+        { __typename: "Letter", letter: "A", position: 1 },
+        { __typename: "Letter", letter: "B", position: 2 },
+        { __typename: "Letter", letter: "C", position: 3 },
+        { __typename: "Letter", letter: "D", position: 4 },
+      ],
+    },
+    loading: false,
+    networkStatus: NetworkStatus.ready,
+  });
+
+  await expect(stream).not.toEmitAnything();
+
+  fetchMoreResult = await observable.fetchMore({
+    variables: { offset: 4 },
+    updateQuery: (_, { fetchMoreResult }) => fetchMoreResult,
+  });
+
+  expect(fetchMoreResult).toEqualApolloQueryResult({
+    data: {
+      letters: [
+        { __typename: "Letter", letter: "E", position: 5 },
+        { __typename: "Letter", letter: "F", position: 6 },
+      ],
+    },
+    loading: false,
+    networkStatus: NetworkStatus.ready,
+  });
+
+  await expect(stream).toEmitApolloQueryResult({
+    data: {
+      letters: [
+        { __typename: "Letter", letter: "A", position: 1 },
+        { __typename: "Letter", letter: "B", position: 2 },
+        { __typename: "Letter", letter: "C", position: 3 },
+        { __typename: "Letter", letter: "D", position: 4 },
+      ],
+    },
+    loading: true,
+    networkStatus: NetworkStatus.fetchMore,
+  });
+
+  await expect(stream).toEmitApolloQueryResult({
+    data: {
+      letters: [
+        { __typename: "Letter", letter: "E", position: 5 },
+        { __typename: "Letter", letter: "F", position: 6 },
+      ],
+    },
+    loading: false,
+    networkStatus: NetworkStatus.ready,
+  });
+
+  expect(observable.getCurrentResult(false)).toEqualApolloQueryResult({
+    data: {
+      letters: [
+        { __typename: "Letter", letter: "E", position: 5 },
+        { __typename: "Letter", letter: "F", position: 6 },
+      ],
+    },
+    loading: false,
+    networkStatus: NetworkStatus.ready,
+  });
+
+  await expect(stream).not.toEmitAnything();
+});

src/__tests__/fetchMore.ts

@@ -583,7 +583,12 @@ Did you mean to call refetch(variables) instead of refetch({ variables })?`,
           });
 
           this.reportResult(
-            { ...lastResult, data: data as TData },
+            {
+              ...lastResult,
+              networkStatus: originalNetworkStatus!,
+              loading: isNetworkRequestInFlight(originalNetworkStatus),
+              data: data as TData,
+            },
             this.variables
           );
         }