Merge branch 'release-4.0' into jerel/remove-partial-refetch

apollographql · Dec 16, 2024 · 692ed02 · 692ed02
2 parents d82850d + 69c1cb6
commit 692ed02
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 46 deletions.
diff --git a/.api-reports/api-report-testing.api.md b/.api-reports/api-report-testing.api.md
@@ -1810,9 +1810,6 @@ Item
 // @public (undocumented)
 type StoreValue = number | string | string[] | Reference | Reference[] | null | undefined | void | Object;
 
-// @public (undocumented)
-export function subscribeAndCount<TResult>(reject: (reason: any) => any, observable: Observable<TResult>, cb: (handleCount: number, result: TResult) => any): Subscription;
-
 // @public (undocumented)
 type SubscribeToMoreOptions<TData = any, TSubscriptionVariables = OperationVariables, TSubscriptionData = TData> = {
     document: DocumentNode | TypedDocumentNode<TSubscriptionData, TSubscriptionVariables>;

diff --git a/.api-reports/api-report-testing_core.api.md b/.api-reports/api-report-testing_core.api.md
@@ -1767,9 +1767,6 @@ Item
 // @public (undocumented)
 type StoreValue = number | string | string[] | Reference | Reference[] | null | undefined | void | Object;
 
-// @public (undocumented)
-export function subscribeAndCount<TResult>(reject: (reason: any) => any, observable: Observable<TResult>, cb: (handleCount: number, result: TResult) => any): Subscription;
-
 // @public (undocumented)
 type SubscribeToMoreOptions<TData = any, TSubscriptionVariables = OperationVariables, TSubscriptionData = TData> = {
     document: DocumentNode | TypedDocumentNode<TSubscriptionData, TSubscriptionVariables>;

diff --git a/.changeset/clever-zebras-mate.md b/.changeset/clever-zebras-mate.md
@@ -0,0 +1,5 @@
+---
+"@apollo/client": major
+---
+
+Drop support for React 16.
diff --git a/.changeset/shiny-carrots-invent.md b/.changeset/shiny-carrots-invent.md
@@ -0,0 +1,5 @@
+---
+"@apollo/client": major
+---
+
+Remove `subscribeAndCount` testing utility from `@apollo/client/testing`.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -178,7 +178,6 @@ workflows:
                 - "graphql@15"
                 - "graphql@16"
                 - "graphql@^17.0.0-alpha"
-                - "@types/[email protected] @types/[email protected]"
                 - "@types/react@17 @types/react-dom@17"
                 - "@types/react@18 @types/react-dom@18"
                 - "@types/react@19 @types/react-dom@19"

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -74,8 +74,8 @@
   "peerDependencies": {
     "graphql": "^15.0.0 || ^16.0.0",
     "graphql-ws": "^5.5.5",
-    "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || >=19.0.0-rc",
-    "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0 || >=19.0.0-rc",
+    "react": "^17.0.0 || ^18.0.0 || >=19.0.0-rc",
+    "react-dom": "^17.0.0 || ^18.0.0 || >=19.0.0-rc",
     "subscriptions-transport-ws": "^0.9.0 || ^0.11.0"
   },
   "peerDependenciesMeta": {

diff --git a/src/__tests__/__snapshots__/exports.ts.snap b/src/__tests__/__snapshots__/exports.ts.snap
@@ -363,7 +363,6 @@ Array [
   "itAsync",
   "mockObservableLink",
   "mockSingleLink",
-  "subscribeAndCount",
   "tick",
   "wait",
   "withErrorSpy",
@@ -380,7 +379,6 @@ Array [
   "itAsync",
   "mockObservableLink",
   "mockSingleLink",
-  "subscribeAndCount",
   "tick",
   "wait",
   "withErrorSpy",

diff --git a/src/testing/core/index.ts b/src/testing/core/index.ts
@@ -9,7 +9,6 @@ export {
   mockObservableLink,
 } from "./mocking/mockSubscriptionLink.js";
 export { createMockClient } from "./mocking/mockClient.js";
-export { default as subscribeAndCount } from "./subscribeAndCount.js";
 export { itAsync } from "./itAsync.js";
 export { wait, tick } from "./wait.js";
 export * from "./withConsoleSpy.js";
diff --git a/src/testing/core/subscribeAndCount.ts b/src/testing/core/subscribeAndCount.ts