Merge branch 'main' into pr/rules-of-hooks/useLazyQuery

apollographql · May 21, 2024 · 5f962c9 · 5f962c9
2 parents 86648f2 + 8740f19
commit 5f962c9
Show file tree

Hide file tree

Showing 12 changed files with 240 additions and 133 deletions.
diff --git a/.api-reports/api-report-testing.md b/.api-reports/api-report-testing.md
@@ -440,6 +440,11 @@ class Concast<T> extends Observable<T> {
 // @public (undocumented)
 type ConcastSourcesIterable<T> = Iterable<Source<T>>;
 
+// @internal (undocumented)
+type CovariantUnaryFunction<out Arg, out Ret> = {
+    fn(arg: Arg): Ret;
+}["fn"];
+
 // Warning: (ae-forgotten-export) The symbol "ApolloClient" needs to be exported by the entry point index.d.ts
 // Warning: (ae-forgotten-export) The symbol "NormalizedCacheObject" needs to be exported by the entry point index.d.ts
 //
@@ -954,7 +959,7 @@ interface MockedProviderState {
 }
 
 // @public (undocumented)
-export interface MockedResponse<TData = Record<string, any>, TVariables = Record<string, any>> {
+export interface MockedResponse<out TData = Record<string, any>, out TVariables = Record<string, any>> {
     // (undocumented)
     delay?: number;
     // (undocumented)
@@ -1552,8 +1557,10 @@ interface Resolvers {
     };
 }
 
+// Warning: (ae-forgotten-export) The symbol "CovariantUnaryFunction" needs to be exported by the entry point index.d.ts
+//
 // @public (undocumented)
-export type ResultFunction<T, V = Record<string, any>> = (variables: V) => T;
+export type ResultFunction<T, V = Record<string, any>> = CovariantUnaryFunction<V, T>;
 
 // @public (undocumented)
 type SafeReadonly<T> = T extends object ? Readonly<T> : T;
@@ -1698,7 +1705,7 @@ interface UriFunction {
 }
 
 // @public (undocumented)
-type VariableMatcher<V = Record<string, any>> = (variables: V) => boolean;
+type VariableMatcher<V = Record<string, any>> = CovariantUnaryFunction<V, boolean>;
 
 // @public (undocumented)
 export function wait(ms: number): Promise<void>;

diff --git a/.api-reports/api-report-testing_core.md b/.api-reports/api-report-testing_core.md
@@ -439,6 +439,11 @@ class Concast<T> extends Observable<T> {
 // @public (undocumented)
 type ConcastSourcesIterable<T> = Iterable<Source<T>>;
 
+// @internal (undocumented)
+type CovariantUnaryFunction<out Arg, out Ret> = {
+    fn(arg: Arg): Ret;
+}["fn"];
+
 // Warning: (ae-forgotten-export) The symbol "ApolloClient" needs to be exported by the entry point index.d.ts
 // Warning: (ae-forgotten-export) The symbol "NormalizedCacheObject" needs to be exported by the entry point index.d.ts
 //
@@ -909,7 +914,7 @@ interface MockApolloLink extends ApolloLink {
 }
 
 // @public (undocumented)
-export interface MockedResponse<TData = Record<string, any>, TVariables = Record<string, any>> {
+export interface MockedResponse<out TData = Record<string, any>, out TVariables = Record<string, any>> {
     // (undocumented)
     delay?: number;
     // (undocumented)
@@ -1509,8 +1514,10 @@ interface Resolvers {
     };
 }
 
+// Warning: (ae-forgotten-export) The symbol "CovariantUnaryFunction" needs to be exported by the entry point index.d.ts
+//
 // @public (undocumented)
-export type ResultFunction<T, V = Record<string, any>> = (variables: V) => T;
+export type ResultFunction<T, V = Record<string, any>> = CovariantUnaryFunction<V, T>;
 
 // @public (undocumented)
 type SafeReadonly<T> = T extends object ? Readonly<T> : T;
@@ -1655,7 +1662,7 @@ interface UriFunction {
 }
 
 // @public (undocumented)
-type VariableMatcher<V = Record<string, any>> = (variables: V) => boolean;
+type VariableMatcher<V = Record<string, any>> = CovariantUnaryFunction<V, boolean>;
 
 // @public (undocumented)
 export function wait(ms: number): Promise<void>;

diff --git a/.changeset/late-days-give.md b/.changeset/late-days-give.md
@@ -0,0 +1,5 @@
+---
+"@apollo/client": patch
+---
+
+Fixes [#11849](https://github.com/apollographql/apollo-client/issues/11849) by reevaluating `window.fetch` each time `BatchHttpLink` uses it, if not configured via `options.fetch`. Takes the same approach as PR [#8603](https://github.com/apollographql/apollo-client/pull/8603) which fixed the same issue in `HttpLink`.
diff --git a/.changeset/nasty-pens-dress.md b/.changeset/nasty-pens-dress.md
@@ -0,0 +1,5 @@
+---
+"@apollo/client": patch
+---
+
+Ensure covariant behavior: `MockedResponse<X,Y>` should be assignable to `MockedResponse`
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -15,7 +15,7 @@ jobs:
 
   Lint:
     docker:
-      - image: cimg/node:22.1.0
+      - image: cimg/node:22.2.0
     steps:
       - checkout
       - run: npm version
@@ -24,15 +24,15 @@ jobs:
 
   Formatting:
     docker:
-      - image: cimg/node:22.1.0
+      - image: cimg/node:22.2.0
     steps:
       - checkout
       - run: npm ci
       - run: npm run check:format
 
   Tests:
     docker:
-      - image: cimg/node:22.1.0
+      - image: cimg/node:22.2.0
     steps:
       - checkout
       - run: npm run ci:precheck
@@ -50,7 +50,7 @@ jobs:
 
   BuildTarball:
     docker:
-      - image: cimg/node:22.1.0
+      - image: cimg/node:22.2.0
     steps:
       - checkout
       - run: npm run ci:precheck
@@ -69,7 +69,7 @@ jobs:
       react:
         type: string
     docker:
-      - image: cimg/node:22.1.0
+      - image: cimg/node:22.2.0
     steps:
       - checkout
       - attach_workspace:
@@ -107,7 +107,7 @@ jobs:
       externalPackage:
         type: string
     docker:
-      - image: cimg/node:22.1.0
+      - image: cimg/node:22.2.0
     steps:
       - checkout
       - attach_workspace:

diff --git a/.size-limits.json b/.size-limits.json
@@ -1,4 +1,4 @@
 {
-  "dist/apollo-client.min.cjs": 39607,
+  "dist/apollo-client.min.cjs": 39574,
   "import { ApolloClient, InMemoryCache, HttpLink } from \"dist/index.js\" (production)": 32821
 }