@cedarjs/web 6.0.0-canary.2663 → 6.0.0-canary.2665

package/dist/cjs/apollo/ApolloProviderWithFetchConfig.js

@@ -32,13 +32,13 @@ __export(ApolloProviderWithFetchConfig_exports, {
 });
 module.exports = __toCommonJS(ApolloProviderWithFetchConfig_exports);
 var import_react = __toESM(require("react"), 1);
-var import_core = require("@apollo/client/core/core.cjs");
-var import_context = require("@apollo/client/link/context/context.cjs");
-var import_core2 = require("@apollo/client/link/core/core.cjs");
-var import_persisted_queries = require("@apollo/client/link/persisted-queries/persisted-queries.cjs");
-var import_react2 = require("@apollo/client/react/react.cjs");
-var import_utilities = require("@apollo/client/utilities/utilities.cjs");
+var import_client = require("@apollo/client");
+var import_context = require("@apollo/client/link/context");
+var import_persisted_queries = require("@apollo/client/link/persisted-queries");
+var import_react2 = require("@apollo/client/react");
+var import_utilities = require("@apollo/client/utilities");
 var import_printer = require("graphql/language/printer.js");
+var import_rxjs = require("rxjs");
 var import_auth = require("@cedarjs/auth");
 var import_apollo_upload_client = require("../bundled/apollo-upload-client.js");
 var import_FetchConfigProvider = require("../components/FetchConfigProvider.js");
@@ -51,30 +51,32 @@ function ApolloProviderWithFetchConfig({
   useAuth = import_auth.useNoAuth,
   logLevel
 }) {
-  (0, import_core.setLogVerbosity)(logLevel);
+  (0, import_client.setLogVerbosity)(logLevel);
   const { getToken, type: authProviderType } = useAuth();
   const data = {
     mostRecentRequest: void 0,
     mostRecentResponse: void 0
   };
-  const updateDataApolloLink = new import_core2.ApolloLink((operation, forward) => {
+  const updateDataApolloLink = new import_client.ApolloLink((operation, forward) => {
     const { operationName, query, variables } = operation;
     data.mostRecentRequest = {};
     data.mostRecentRequest.operationName = operationName;
     data.mostRecentRequest.operationKind = query?.kind.toString();
     data.mostRecentRequest.variables = variables;
     data.mostRecentRequest.query = query && (0, import_printer.print)(operation.query);
-    return forward(operation).map((result) => {
-      data.mostRecentResponse = result;
-      return result;
-    });
+    return forward(operation).pipe(
+      (0, import_rxjs.map)((result) => {
+        data.mostRecentResponse = result;
+        return result;
+      })
+    );
   });
-  const withToken = (0, import_context.setContext)(async () => {
+  const withToken = new import_context.SetContextLink(async () => {
     const token = await getToken();
     return { token };
   });
   const { headers, uri } = (0, import_FetchConfigProvider.useFetchConfig)();
-  const authMiddleware = new import_core2.ApolloLink((operation, forward) => {
+  const authMiddleware = new import_client.ApolloLink((operation, forward) => {
     const { token } = operation.getContext();
     const authHeaders = token ? {
       "auth-provider": authProviderType,
@@ -91,11 +93,11 @@ function ApolloProviderWithFetchConfig({
     return forward(operation);
   });
   const { httpLinkConfig, link: cedarApolloLink, ...rest } = config ?? {};
-  const uploadLink = (0, import_apollo_upload_client.createUploadLink)({
+  const uploadLink = new import_apollo_upload_client.UploadHttpLink({
     uri,
     ...httpLinkConfig
   });
-  const uploadOrSSELink = typeof SSELink !== "undefined" ? (0, import_core2.split)(
+  const uploadOrSSELink = typeof SSELink !== "undefined" ? (0, import_client.split)(
     ({ query }) => {
       const definition = (0, import_utilities.getMainDefinition)(query);
       return isSubscription(definition) || isLiveQuery(definition);
@@ -108,13 +110,16 @@ function ApolloProviderWithFetchConfig({
     }),
     uploadLink
   ) : uploadLink;
-  const terminatingLink = (0, import_core2.split)(
+  const terminatingLink = (0, import_client.split)(
     ({ query }) => {
       const documentQuery = query;
       return documentQuery?.["__meta__"]?.["hash"] !== void 0;
     },
-    (0, import_persisted_queries.createPersistedQueryLink)({
-      generateHash: (document) => document["__meta__"]["hash"]
+    new import_persisted_queries.PersistedQueryLink({
+      generateHash: (document) => {
+        const documentWithMeta = document;
+        return documentWithMeta.__meta__?.hash ?? "";
+      }
     }).concat(uploadOrSSELink),
     uploadOrSSELink
   );
@@ -125,11 +130,11 @@ function ApolloProviderWithFetchConfig({
     { name: "httpLink", link: terminatingLink }
   ];
   let link = cedarApolloLink;
-  link ??= import_core2.ApolloLink.from(cedarApolloLinks.map((l) => l.link));
+  link ??= import_client.ApolloLink.from(cedarApolloLinks.map((l) => l.link));
   if (typeof link === "function") {
     link = link(cedarApolloLinks);
   }
-  const client = new import_core.ApolloClient({
+  const client = new import_client.ApolloClient({
     // Default options for every Cell. Better to specify them here than in
     // `beforeQuery` where it's too easy to overwrite them.
     // See https://www.apollographql.com/docs/react/api/core/ApolloClient/#example-defaultoptions-object.

package/dist/cjs/apollo/CedarApolloProvider.js

@@ -32,7 +32,7 @@ __export(CedarApolloProvider_exports, {
 });
 module.exports = __toCommonJS(CedarApolloProvider_exports);
 var import_react = __toESM(require("react"), 1);
-var import_cache = require("@apollo/client/cache/cache.cjs");
+var import_client = require("@apollo/client");
 var import_auth = require("@cedarjs/auth");
 var import_FetchConfigProvider = require("../components/FetchConfigProvider.js");
 var import_ApolloProviderWithFetchConfig = require("./ApolloProviderWithFetchConfig.js");
@@ -48,7 +48,7 @@ function CedarApolloProvider({
   if (fragments) {
     import_fragmentRegistry.fragmentRegistry.register(...fragments);
   }
-  const cache = new import_cache.InMemoryCache({
+  const cache = new import_client.InMemoryCache({
     fragments: import_fragmentRegistry.fragmentRegistry,
     possibleTypes: cacheConfig?.possibleTypes,
     ...cacheConfig

package/dist/cjs/apollo/CedarApolloProvider.test.js

@@ -0,0 +1,61 @@
+"use strict";
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var import_react = __toESM(require("react"), 1);
+var import_client = require("@apollo/client");
+var import_react2 = require("@apollo/client/react");
+var import_react3 = require("@testing-library/react");
+var import_vitest = require("vitest");
+var import_CedarApolloProvider = require("./CedarApolloProvider.js");
+globalThis.RWJS_API_GRAPHQL_URL = "https://example.com/graphql";
+(0, import_vitest.describe)("CedarApolloProvider smoke test", () => {
+  (0, import_vitest.test)("renders children and runs a query through the full link chain", async () => {
+    const fetchMock = import_vitest.vi.fn(async () => {
+      return new Response(JSON.stringify({ data: { answer: 42 } }), {
+        headers: { "content-type": "application/json" }
+      });
+    });
+    import_vitest.vi.stubGlobal("fetch", fetchMock);
+    const QUERY = import_client.gql`
+      query AnswerQuery {
+        answer
+      }
+    `;
+    const Consumer = () => {
+      const { data, loading, error } = (0, import_react2.useQuery)(QUERY);
+      if (error) {
+        return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, "error: ", error.message);
+      }
+      if (loading) {
+        return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, "loading");
+      }
+      return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, "answer: ", data?.answer);
+    };
+    (0, import_react3.render)(
+      /* @__PURE__ */ import_react.default.createElement(import_CedarApolloProvider.CedarApolloProvider, null, /* @__PURE__ */ import_react.default.createElement(Consumer, null))
+    );
+    await (0, import_react3.waitFor)(() => import_react3.screen.getByText("answer: 42"));
+    (0, import_vitest.expect)(fetchMock).toHaveBeenCalled();
+    import_vitest.vi.unstubAllGlobals();
+  });
+});

package/dist/cjs/apollo/apolloLinkTypes.d.ts

@@ -1,4 +1,4 @@
-import type { ApolloCache, ApolloClientOptions, ApolloLink, HttpLink, HttpOptions, InMemoryCacheConfig } from '@apollo/client';
+import type { ApolloCache, ApolloClient, ApolloLink, HttpLink, InMemoryCacheConfig } from '@apollo/client';
 export type ApolloClientCacheConfig = InMemoryCacheConfig;
 export type CedarApolloLinkName = 'withToken' | 'authMiddleware' | 'updateDataApolloLink' | 'httpLink';
 export type CedarApolloLink<Name extends CedarApolloLinkName, Link extends ApolloLink = ApolloLink> = {
@@ -12,8 +12,8 @@ export type CedarApolloLinks = [
     CedarApolloLink<'httpLink', ApolloLink | HttpLink>
 ];
 export type CedarApolloLinkFactory = (links: CedarApolloLinks) => ApolloLink;
-export type GraphQLClientConfigProp = Omit<ApolloClientOptions<unknown>, 'cache' | 'link'> & {
-    cache?: ApolloCache<unknown>;
+export type GraphQLClientConfigProp = Omit<ApolloClient.Options, 'cache' | 'link'> & {
+    cache?: ApolloCache;
     /**
      * Configuration for Apollo Client's `InMemoryCache`.
      * See https://www.apollographql.com/docs/react/caching/cache-configuration/.
@@ -31,7 +31,7 @@ export type GraphQLClientConfigProp = Omit<ApolloClientOptions<unknown>, 'cache'
      * }}>
      * ```
      */
-    httpLinkConfig?: HttpOptions;
+    httpLinkConfig?: HttpLink.Options;
     /**
      * Extend or overwrite `CedarApolloProvider`'s Apollo Link.
      *

package/dist/cjs/apollo/apolloLinkTypes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"apolloLinkTypes.d.ts","sourceRoot":"","sources":["../../../src/apollo/apolloLinkTypes.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,WAAW,EACX,mBAAmB,EACnB,UAAU,EACV,QAAQ,EACR,WAAW,EACX,mBAAmB,EACpB,MAAM,gBAAgB,CAAA;AAEvB,MAAM,MAAM,uBAAuB,GAAG,mBAAmB,CAAA;AAEzD,MAAM,MAAM,mBAAmB,GAC3B,WAAW,GACX,gBAAgB,GAChB,sBAAsB,GACtB,UAAU,CAAA;AAEd,MAAM,MAAM,eAAe,CACzB,IAAI,SAAS,mBAAmB,EAChC,IAAI,SAAS,UAAU,GAAG,UAAU,IAClC;IACF,IAAI,EAAE,IAAI,CAAA;IACV,IAAI,EAAE,IAAI,CAAA;CACX,CAAA;AAED,MAAM,MAAM,gBAAgB,GAAG;IAC7B,eAAe,CAAC,WAAW,CAAC;IAC5B,eAAe,CAAC,gBAAgB,CAAC;IACjC,eAAe,CAAC,sBAAsB,CAAC;IACvC,eAAe,CAAC,UAAU,EAAE,UAAU,GAAG,QAAQ,CAAC;CACnD,CAAA;AAED,MAAM,MAAM,sBAAsB,GAAG,CAAC,KAAK,EAAE,gBAAgB,KAAK,UAAU,CAAA;AAE5E,MAAM,MAAM,uBAAuB,GAAG,IAAI,CACxC,mBAAmB,CAAC,OAAO,CAAC,EAC5B,OAAO,GAAG,MAAM,CACjB,GAAG;IACF,KAAK,CAAC,EAAE,WAAW,CAAC,OAAO,CAAC,CAAA;IAC5B;;;OAGG;IACH,WAAW,CAAC,EAAE,uBAAuB,CAAA;IACrC;;;;;;;;;;;OAWG;IACH,cAAc,CAAC,EAAE,WAAW,CAAA;IAC5B;;;;;;;;;;;;;;;;;;;;;;OAsBG;IACH,IAAI,CAAC,EAAE,UAAU,GAAG,sBAAsB,CAAA;CAC3C,CAAA"}
+{"version":3,"file":"apolloLinkTypes.d.ts","sourceRoot":"","sources":["../../../src/apollo/apolloLinkTypes.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,WAAW,EACX,YAAY,EACZ,UAAU,EACV,QAAQ,EACR,mBAAmB,EACpB,MAAM,gBAAgB,CAAA;AAEvB,MAAM,MAAM,uBAAuB,GAAG,mBAAmB,CAAA;AAEzD,MAAM,MAAM,mBAAmB,GAC3B,WAAW,GACX,gBAAgB,GAChB,sBAAsB,GACtB,UAAU,CAAA;AAEd,MAAM,MAAM,eAAe,CACzB,IAAI,SAAS,mBAAmB,EAChC,IAAI,SAAS,UAAU,GAAG,UAAU,IAClC;IACF,IAAI,EAAE,IAAI,CAAA;IACV,IAAI,EAAE,IAAI,CAAA;CACX,CAAA;AAED,MAAM,MAAM,gBAAgB,GAAG;IAC7B,eAAe,CAAC,WAAW,CAAC;IAC5B,eAAe,CAAC,gBAAgB,CAAC;IACjC,eAAe,CAAC,sBAAsB,CAAC;IACvC,eAAe,CAAC,UAAU,EAAE,UAAU,GAAG,QAAQ,CAAC;CACnD,CAAA;AAED,MAAM,MAAM,sBAAsB,GAAG,CAAC,KAAK,EAAE,gBAAgB,KAAK,UAAU,CAAA;AAE5E,MAAM,MAAM,uBAAuB,GAAG,IAAI,CACxC,YAAY,CAAC,OAAO,EACpB,OAAO,GAAG,MAAM,CACjB,GAAG;IACF,KAAK,CAAC,EAAE,WAAW,CAAA;IACnB;;;OAGG;IACH,WAAW,CAAC,EAAE,uBAAuB,CAAA;IACrC;;;;;;;;;;;OAWG;IACH,cAAc,CAAC,EAAE,QAAQ,CAAC,OAAO,CAAA;IACjC;;;;;;;;;;;;;;;;;;;;;;OAsBG;IACH,IAAI,CAAC,EAAE,UAAU,GAAG,sBAAsB,CAAA;CAC3C,CAAA"}

package/dist/cjs/apollo/fragmentRegistry.d.ts

@@ -1,5 +1,5 @@
-import type { UseFragmentResult } from '@apollo/client';
-import type { FragmentRegistryAPI } from '@apollo/client/cache/index.js';
+import type { FragmentRegistryAPI } from '@apollo/client/cache';
+import { useFragment as useApolloFragment } from '@apollo/client/react';
 import type { DocumentNode } from 'graphql';
 export interface FragmentHookOptions {
     fragment: DocumentNode;
@@ -28,7 +28,7 @@ export type RegisterFragmentResult = {
     fragment: DocumentNode;
     typename: string;
     getCacheKey: (id: FragmentIdentifier) => CacheKey;
-    useRegisteredFragment: <TData = any>(id: FragmentIdentifier) => UseFragmentResult<TData>;
+    useRegisteredFragment: <TData = any>(id: FragmentIdentifier) => useApolloFragment.Result<TData>;
 };
 /**
  * Read fragment data from Apollo Client's cache without firing a network

package/dist/cjs/apollo/fragmentRegistry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fragmentRegistry.d.ts","sourceRoot":"","sources":["../../../src/apollo/fragmentRegistry.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAA;AAEvD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAA;AAExE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAA;AAE3C,MAAM,WAAW,mBAAmB;IAClC,QAAQ,EAAE,YAAY,CAAA;IACtB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB;;;;OAIG;IACH,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAC9B;AAED,MAAM,WAAW,kBAAkB,CAAC,KAAK,GAAG,GAAG;IAC7C;;;OAGG;IACH,IAAI,EAAE,KAAK,GAAG,SAAS,CAAA;IACvB,QAAQ,EAAE,OAAO,CAAA;CAClB;AAED,MAAM,MAAM,kBAAkB,GAAG,MAAM,GAAG,MAAM,CAAA;AAEhD,MAAM,MAAM,QAAQ,GAAG;IACrB,UAAU,EAAE,MAAM,CAAA;IAClB,EAAE,EAAE,kBAAkB,CAAA;CACvB,CAAA;AAED,MAAM,MAAM,sBAAsB,GAAG;IACnC,QAAQ,EAAE,YAAY,CAAA;IACtB,QAAQ,EAAE,MAAM,CAAA;IAChB,WAAW,EAAE,CAAC,EAAE,EAAE,kBAAkB,KAAK,QAAQ,CAAA;IACjD,qBAAqB,EAAE,CAAC,KAAK,GAAG,GAAG,EACjC,EAAE,EAAE,kBAAkB,KACnB,iBAAiB,CAAC,KAAK,CAAC,CAAA;CAC9B,CAAA;AA8CD;;;;;GAKG;AACH,wBAAgB,WAAW,CAAC,KAAK,GAAG,GAAG,EACrC,OAAO,EAAE,mBAAmB,GAC3B,kBAAkB,CAAC,KAAK,CAAC,CAsB3B;AAED;;;;;;;IAOI;AACJ,eAAO,MAAM,gBAAgB,EAAE,mBAA8C,CAAA;AAE7E;;GAEG;AACH,eAAO,MAAM,iBAAiB,GAAI,WAAW,YAAY,EAAE,6BAE1D,CAAA;AAED;;;;;;;;;;;;;GAaG;AACH,eAAO,MAAM,gBAAgB,GAC3B,UAAU,YAAY,KACrB,sBAqBF,CAAA"}
+{"version":3,"file":"fragmentRegistry.d.ts","sourceRoot":"","sources":["../../../src/apollo/fragmentRegistry.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAA;AAE/D,OAAO,EAEL,WAAW,IAAI,iBAAiB,EACjC,MAAM,sBAAsB,CAAA;AAC7B,OAAO,KAAK,EAAE,YAAY,EAA0B,MAAM,SAAS,CAAA;AAGnE,MAAM,WAAW,mBAAmB;IAClC,QAAQ,EAAE,YAAY,CAAA;IACtB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB;;;;OAIG;IACH,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAC9B;AAED,MAAM,WAAW,kBAAkB,CAAC,KAAK,GAAG,GAAG;IAC7C;;;OAGG;IACH,IAAI,EAAE,KAAK,GAAG,SAAS,CAAA;IACvB,QAAQ,EAAE,OAAO,CAAA;CAClB;AAED,MAAM,MAAM,kBAAkB,GAAG,MAAM,GAAG,MAAM,CAAA;AAEhD,MAAM,MAAM,QAAQ,GAAG;IACrB,UAAU,EAAE,MAAM,CAAA;IAClB,EAAE,EAAE,kBAAkB,CAAA;CACvB,CAAA;AAED,MAAM,MAAM,sBAAsB,GAAG;IACnC,QAAQ,EAAE,YAAY,CAAA;IACtB,QAAQ,EAAE,MAAM,CAAA;IAChB,WAAW,EAAE,CAAC,EAAE,EAAE,kBAAkB,KAAK,QAAQ,CAAA;IACjD,qBAAqB,EAAE,CAAC,KAAK,GAAG,GAAG,EACjC,EAAE,EAAE,kBAAkB,KACnB,iBAAiB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;CACrC,CAAA;AA4ED;;;;;GAKG;AACH,wBAAgB,WAAW,CAAC,KAAK,GAAG,GAAG,EACrC,OAAO,EAAE,mBAAmB,GAC3B,kBAAkB,CAAC,KAAK,CAAC,CA6B3B;AAED;;;;;;;IAOI;AACJ,eAAO,MAAM,gBAAgB,EAAE,mBAA8C,CAAA;AAE7E;;GAEG;AACH,eAAO,MAAM,iBAAiB,GAAI,WAAW,YAAY,EAAE,6BAE1D,CAAA;AAED;;;;;;;;;;;;;GAaG;AACH,eAAO,MAAM,gBAAgB,GAC3B,UAAU,YAAY,KACrB,sBAqBF,CAAA"}

package/dist/cjs/apollo/fragmentRegistry.js

@@ -1,9 +1,7 @@
 "use strict";
-var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -17,14 +15,6 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var fragmentRegistry_exports = {};
 __export(fragmentRegistry_exports, {
@@ -34,27 +24,51 @@ __export(fragmentRegistry_exports, {
   useFragment: () => useFragment
 });
 module.exports = __toCommonJS(fragmentRegistry_exports);
-var apolloClient = __toESM(require("@apollo/client"), 1);
-var import_cache = require("@apollo/client/cache/cache.cjs");
-var import_utilities = require("@apollo/client/utilities/utilities.cjs");
+var import_cache = require("@apollo/client/cache");
+var import_react = require("@apollo/client/react");
+var import_graphql = require("graphql");
+const getFragmentDefinition = (fragment) => {
+  const definition = fragment.definitions.find(
+    (def) => def.kind === import_graphql.Kind.FRAGMENT_DEFINITION
+  );
+  if (!definition) {
+    throw new Error("The passed document contains no fragment definition");
+  }
+  return definition;
+};
 const getTypenameFromFragment = (fragment) => {
-  const [definition] = (0, import_utilities.getFragmentDefinitions)(fragment);
-  return definition.typeCondition.name.value;
+  return getFragmentDefinition(fragment).typeCondition.name.value;
+};
+const getSingleFragmentName = (fragment) => {
+  const definitions = fragment.definitions.filter(
+    (def) => def.kind === import_graphql.Kind.FRAGMENT_DEFINITION
+  );
+  return definitions.length === 1 ? definitions[0].name.value : void 0;
 };
 const useRegisteredFragmentHook = (fragment, id) => {
   const from = { __typename: getTypenameFromFragment(fragment), id };
-  return apolloClient.useFragment({
+  return (0, import_react.useFragment)({
     fragment,
+    // The cache's fragment registry adds the definitions of any spread
+    // fragments to the document, so Apollo Client can't infer the fragment
+    // name from the document alone
+    fragmentName: getFragmentDefinition(fragment).name.value,
     from
   });
 };
 const UNIDENTIFIABLE_FRAGMENT_REF = "CedarUnidentifiableFragmentRef:_";
 function useFragment(options) {
-  const client = apolloClient.useApolloClient();
+  const client = (0, import_react.useApolloClient)();
   const { from, ...restOptions } = options;
   const cacheId = client.cache.identify(from);
-  const result = apolloClient.useFragment({
+  const result = (0, import_react.useFragment)({
     ...restOptions,
+    // The cache's fragment registry adds the definitions of any spread
+    // fragments to the document, so Apollo Client can't infer the fragment
+    // name from the document alone. When the passed document has more than
+    // one fragment definition of its own we pass `undefined` and let Apollo
+    // Client surface its "must provide fragmentName" error
+    fragmentName: restOptions.fragmentName ?? getSingleFragmentName(options.fragment),
     // We identify the object ourselves (above) because passing an
     // unidentifiable object to `useFragment` logs a warning and returns a
     // useless `{ data: {}, complete: true }` result

package/dist/cjs/apollo/fragmentRegistry.test.js

@@ -0,0 +1,90 @@
+"use strict";
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var import_react = __toESM(require("react"), 1);
+var import_client = require("@apollo/client");
+var import_react2 = require("@apollo/client/react");
+var import_react3 = require("@testing-library/react");
+var import_vitest = require("vitest");
+var import_fragmentRegistry = require("./fragmentRegistry.js");
+const { useRegisteredFragment: useStallFragment } = (0, import_fragmentRegistry.registerFragment)(import_client.gql`
+  fragment Stall_info on Stall {
+    id
+    name
+  }
+`);
+const { useRegisteredFragment: useFruitFragment } = (0, import_fragmentRegistry.registerFragment)(import_client.gql`
+  fragment Fruit_info on Fruit {
+    id
+    name
+    isSeedless
+    stall {
+      ...Stall_info
+    }
+  }
+`);
+const StallInfo = ({ id }) => {
+  const { data: stall, complete } = useStallFragment(id);
+  return complete ? /* @__PURE__ */ import_react.default.createElement("p", null, "Stall Name: ", stall.name) : /* @__PURE__ */ import_react.default.createElement("p", null, "stall incomplete");
+};
+const FruitInfo = ({ id }) => {
+  const { data: fruit, complete } = useFruitFragment(id);
+  return complete ? /* @__PURE__ */ import_react.default.createElement("div", null, /* @__PURE__ */ import_react.default.createElement("h2", null, "Fruit Name: ", fruit.name), /* @__PURE__ */ import_react.default.createElement(StallInfo, { id: fruit.stall.id })) : /* @__PURE__ */ import_react.default.createElement("div", null, "fruit incomplete");
+};
+(0, import_vitest.describe)("registered fragments with nested spreads", () => {
+  (0, import_vitest.test)("reads complete data back from the cache", async () => {
+    const cache = new import_client.InMemoryCache({ fragments: import_fragmentRegistry.fragmentRegistry });
+    const client = new import_client.ApolloClient({ cache, link: import_client.ApolloLink.empty() });
+    client.writeQuery({
+      query: import_client.gql`
+        query GetGroceries {
+          groceries {
+            ... on Fruit {
+              ...Fruit_info
+            }
+          }
+        }
+      `,
+      data: {
+        groceries: [
+          {
+            __typename: "Fruit",
+            id: "1",
+            name: "Strawberries",
+            isSeedless: false,
+            stall: {
+              __typename: "Stall",
+              id: "s1",
+              name: "Pie Veggies"
+            }
+          }
+        ]
+      }
+    });
+    (0, import_react3.render)(
+      /* @__PURE__ */ import_react.default.createElement(import_react2.ApolloProvider, { client }, /* @__PURE__ */ import_react.default.createElement(FruitInfo, { id: "1" }))
+    );
+    import_react3.screen.getByText("Fruit Name: Strawberries");
+    import_react3.screen.getByText("Stall Name: Pie Veggies");
+  });
+});

package/dist/cjs/apollo/links.d.ts

@@ -1,13 +1,12 @@
-import type { HttpOptions } from '@apollo/client';
-import { ApolloLink } from '@apollo/client/link/core/index.js';
-import { HttpLink } from '@apollo/client/link/http/index.js';
-export declare function createHttpLink(uri: string, httpLinkConfig: HttpOptions | undefined, cookieHeader?: string | null): HttpLink;
+import { ApolloLink, HttpLink } from '@apollo/client';
+import { SetContextLink } from '@apollo/client/link/context';
+export declare function createHttpLink(uri: string, httpLinkConfig: HttpLink.Options | undefined, cookieHeader?: string | null): HttpLink;
 export declare function createUpdateDataLink(): ApolloLink;
 export declare function createAuthApolloLink(authProviderType: string, headersFromFetchProvider: {
     'auth-provider'?: string | undefined;
     authorization?: string | undefined;
 } | undefined): ApolloLink;
-export declare function createTokenLink(getToken: () => Promise<string | null>): ApolloLink;
+export declare function createTokenLink(getToken: () => Promise<string | null>): SetContextLink;
 export declare function createFinalLink({ userConfiguredLink, defaultLinks, }: {
     userConfiguredLink?: ApolloLink | RedwoodApolloLinkFactory;
     defaultLinks: RedwoodApolloLinks;

package/dist/cjs/apollo/links.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"links.d.ts","sourceRoot":"","sources":["../../../src/apollo/links.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAa,MAAM,gBAAgB,CAAA;AAG5D,OAAO,EAAE,UAAU,EAAE,MAAM,mCAAmC,CAAA;AAC9D,OAAO,EAAE,QAAQ,EAAE,MAAM,mCAAmC,CAAA;AAG5D,wBAAgB,cAAc,CAC5B,GAAG,EAAE,MAAM,EACX,cAAc,EAAE,WAAW,GAAG,SAAS,EACvC,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,YAc7B;AAeD,wBAAgB,oBAAoB,eAmBnC;AACD,wBAAgB,oBAAoB,CAClC,gBAAgB,EAAE,MAAM,EACxB,wBAAwB,EACpB;IACE,eAAe,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IACpC,aAAa,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;CACnC,GACD,SAAS,cA6Bd;AACD,wBAAgB,eAAe,CAAC,QAAQ,EAAE,MAAM,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,cAMrE;AAED,wBAAgB,eAAe,CAAC,EAC9B,kBAAkB,EAClB,YAAY,GACb,EAAE;IACD,kBAAkB,CAAC,EAAE,UAAU,GAAG,wBAAwB,CAAA;IAC1D,YAAY,EAAE,kBAAkB,CAAA;CACjC,GAAG,UAAU,CAUb;AAID,MAAM,MAAM,iBAAiB,CAC3B,IAAI,SAAS,qBAAqB,EAClC,IAAI,SAAS,UAAU,GAAG,UAAU,IAClC;IACF,IAAI,EAAE,IAAI,CAAA;IACV,IAAI,EAAE,IAAI,CAAA;CACX,CAAA;AAED,MAAM,MAAM,kBAAkB,GAAG,CAC7B,iBAAiB,CAAC,WAAW,CAAC,GAC9B,iBAAiB,CAAC,gBAAgB,CAAC,GACnC,iBAAiB,CAAC,kBAAkB,CAAC,GACrC,iBAAiB,CAAC,UAAU,EAAE,QAAQ,CAAC,CAC1C,EAAE,CAAA;AAMH,KAAK,SAAS,CAAC,CAAC,SAAS,MAAM,IAAI;IAAE,IAAI,EAAE,CAAC,CAAA;CAAE,CAAA;AAC9C,KAAK,gBAAgB,CAAC,CAAC,IAAI,CAAC,SAAS,SAAS,CAAC,MAAM,IAAI,CAAC,EAAE,GAAG,IAAI,GAAG,KAAK,CAAA;AAC3E,MAAM,MAAM,qBAAqB,GAAG,gBAAgB,CAAC,kBAAkB,CAAC,CAAA;AAExE,MAAM,MAAM,wBAAwB,GAAG,CAAC,KAAK,EAAE,kBAAkB,KAAK,UAAU,CAAA"}
+{"version":3,"file":"links.d.ts","sourceRoot":"","sources":["../../../src/apollo/links.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AACrD,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAA;AAI5D,wBAAgB,cAAc,CAC5B,GAAG,EAAE,MAAM,EACX,cAAc,EAAE,QAAQ,CAAC,OAAO,GAAG,SAAS,EAC5C,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,YAc7B;AAeD,wBAAgB,oBAAoB,eAqBnC;AACD,wBAAgB,oBAAoB,CAClC,gBAAgB,EAAE,MAAM,EACxB,wBAAwB,EACpB;IACE,eAAe,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IACpC,aAAa,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;CACnC,GACD,SAAS,cA6Bd;AACD,wBAAgB,eAAe,CAAC,QAAQ,EAAE,MAAM,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,kBAMrE;AAED,wBAAgB,eAAe,CAAC,EAC9B,kBAAkB,EAClB,YAAY,GACb,EAAE;IACD,kBAAkB,CAAC,EAAE,UAAU,GAAG,wBAAwB,CAAA;IAC1D,YAAY,EAAE,kBAAkB,CAAA;CACjC,GAAG,UAAU,CAUb;AAID,MAAM,MAAM,iBAAiB,CAC3B,IAAI,SAAS,qBAAqB,EAClC,IAAI,SAAS,UAAU,GAAG,UAAU,IAClC;IACF,IAAI,EAAE,IAAI,CAAA;IACV,IAAI,EAAE,IAAI,CAAA;CACX,CAAA;AAED,MAAM,MAAM,kBAAkB,GAAG,CAC7B,iBAAiB,CAAC,WAAW,CAAC,GAC9B,iBAAiB,CAAC,gBAAgB,CAAC,GACnC,iBAAiB,CAAC,kBAAkB,CAAC,GACrC,iBAAiB,CAAC,UAAU,EAAE,QAAQ,CAAC,CAC1C,EAAE,CAAA;AAMH,KAAK,SAAS,CAAC,CAAC,SAAS,MAAM,IAAI;IAAE,IAAI,EAAE,CAAC,CAAA;CAAE,CAAA;AAC9C,KAAK,gBAAgB,CAAC,CAAC,IAAI,CAAC,SAAS,SAAS,CAAC,MAAM,IAAI,CAAC,EAAE,GAAG,IAAI,GAAG,KAAK,CAAA;AAC3E,MAAM,MAAM,qBAAqB,GAAG,gBAAgB,CAAC,kBAAkB,CAAC,CAAA;AAExE,MAAM,MAAM,wBAAwB,GAAG,CAAC,KAAK,EAAE,kBAAkB,KAAK,UAAU,CAAA"}

package/dist/cjs/apollo/links.js

@@ -25,17 +25,16 @@ __export(links_exports, {
   createUpdateDataLink: () => createUpdateDataLink
 });
 module.exports = __toCommonJS(links_exports);
-var import_core = require("@apollo/client/core/index.js");
-var import_context = require("@apollo/client/link/context/index.js");
-var import_core2 = require("@apollo/client/link/core/index.js");
-var import_http = require("@apollo/client/link/http/index.js");
+var import_client = require("@apollo/client");
+var import_context = require("@apollo/client/link/context");
 var import_printer = require("graphql/language/printer.js");
+var import_rxjs = require("rxjs");
 function createHttpLink(uri, httpLinkConfig, cookieHeader) {
   const headers = {};
   if (cookieHeader) {
     headers.cookie = cookieHeader;
   }
-  return new import_http.HttpLink({
+  return new import_client.HttpLink({
     uri,
     credentials: "include",
     ...httpLinkConfig,
@@ -53,11 +52,11 @@ function enhanceError(operation, error) {
   return error;
 }
 function createUpdateDataLink() {
-  return new import_core2.ApolloLink((operation, forward) => {
-    return new import_core.Observable((observer) => {
-      forward(operation).subscribe({
+  return new import_client.ApolloLink((operation, forward) => {
+    return new import_rxjs.Observable((observer) => {
+      const subscription = forward(operation).subscribe({
         next(result) {
-          if (result.errors) {
+          if ("errors" in result && result.errors) {
             result.errors.forEach((error) => {
               enhanceError(operation, error);
             });
@@ -69,11 +68,12 @@ function createUpdateDataLink() {
         },
         complete: observer.complete.bind(observer)
       });
+      return () => subscription.unsubscribe();
     });
   });
 }
 function createAuthApolloLink(authProviderType, headersFromFetchProvider) {
-  return new import_core2.ApolloLink((operation, forward) => {
+  return new import_client.ApolloLink((operation, forward) => {
     const { token } = operation.getContext();
     const authHeaders = token ? {
       "auth-provider": authProviderType,
@@ -94,7 +94,7 @@ function createAuthApolloLink(authProviderType, headersFromFetchProvider) {
   });
 }
 function createTokenLink(getToken) {
-  return (0, import_context.setContext)(async () => {
+  return new import_context.SetContextLink(async () => {
     const token = await getToken();
     return { token };
   });
@@ -110,7 +110,7 @@ function createFinalLink({
       return userConfiguredLink;
     }
   }
-  return import_core2.ApolloLink.from(defaultLinks.map((l) => l.link));
+  return import_client.ApolloLink.from(defaultLinks.map((l) => l.link));
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/cjs/apollo/sseLink.d.ts

@@ -1,16 +1,15 @@
-import type { HttpOptions } from '@apollo/client';
-import type { Operation, FetchResult } from '@apollo/client/core';
-import { ApolloLink } from '@apollo/client/link/core/core.cjs';
-import { Observable } from '@apollo/client/utilities/utilities.cjs';
+import type { HttpLink } from '@apollo/client';
+import { ApolloLink } from '@apollo/client';
 import type { DefinitionNode } from 'graphql';
 import type { ClientOptions } from 'graphql-sse';
+import { Observable } from 'rxjs';
 interface SSELinkOptions extends Partial<ClientOptions> {
     url: string;
     auth: {
         authProviderType: string;
         tokenFn: () => Promise<null | string>;
     };
-    httpLinkConfig?: HttpOptions;
+    httpLinkConfig?: HttpLink.Options;
     headers?: Record<string, string>;
 }
 declare const isSubscription: (definition: DefinitionNode) => boolean;
@@ -21,9 +20,7 @@ declare const isLiveQuery: (definition: DefinitionNode) => boolean;
 declare class SSELink extends ApolloLink {
     private client;
     constructor(options: SSELinkOptions);
-    request(operation: Operation & {
-        query?: any;
-    }): Observable<FetchResult>;
+    request(operation: ApolloLink.Operation): Observable<ApolloLink.Result>;
 }
 export { SSELink, isSubscription, isLiveQuery };
 //# sourceMappingURL=sseLink.d.ts.map

package/dist/cjs/apollo/sseLink.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sseLink.d.ts","sourceRoot":"","sources":["../../../src/apollo/sseLink.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA;AACjD,OAAO,KAAK,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAA;AACjE,OAAO,EAAE,UAAU,EAAE,MAAM,mCAAmC,CAAA;AAC9D,OAAO,EAAE,UAAU,EAAE,MAAM,wCAAwC,CAAA;AACnE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAE7C,OAAO,KAAK,EAAE,aAAa,EAA+B,MAAM,aAAa,CAAA;AAE7E,UAAU,cAAe,SAAQ,OAAO,CAAC,aAAa,CAAC;IACrD,GAAG,EAAE,MAAM,CAAA;IACX,IAAI,EAAE;QAAE,gBAAgB,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,OAAO,CAAC,IAAI,GAAG,MAAM,CAAC,CAAA;KAAE,CAAA;IACzE,cAAc,CAAC,EAAE,WAAW,CAAA;IAC5B,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CACjC;AAsDD,QAAA,MAAM,cAAc,GAAI,YAAY,cAAc,YAKjD,CAAA;AAID,QAAA,MAAM,WAAW,GAAI,YAAY,cAAc,YAS9C,CAAA;AAED;;GAEG;AACH,cAAM,OAAQ,SAAQ,UAAU;IAC9B,OAAO,CAAC,MAAM,CAAQ;gBAEV,OAAO,EAAE,cAAc;IA2B5B,OAAO,CACZ,SAAS,EAAE,SAAS,GAAG;QAAE,KAAK,CAAC,EAAE,GAAG,CAAA;KAAE,GACrC,UAAU,CAAC,WAAW,CAAC;CAuB3B;AAED,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,WAAW,EAAE,CAAA"}
+{"version":3,"file":"sseLink.d.ts","sourceRoot":"","sources":["../../../src/apollo/sseLink.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AAC9C,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAA;AAC3C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAE7C,OAAO,KAAK,EAAE,aAAa,EAA+B,MAAM,aAAa,CAAA;AAE7E,OAAO,EAAE,UAAU,EAAE,MAAM,MAAM,CAAA;AACjC,UAAU,cAAe,SAAQ,OAAO,CAAC,aAAa,CAAC;IACrD,GAAG,EAAE,MAAM,CAAA;IACX,IAAI,EAAE;QAAE,gBAAgB,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,OAAO,CAAC,IAAI,GAAG,MAAM,CAAC,CAAA;KAAE,CAAA;IACzE,cAAc,CAAC,EAAE,QAAQ,CAAC,OAAO,CAAA;IACjC,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CACjC;AAsDD,QAAA,MAAM,cAAc,GAAI,YAAY,cAAc,YAKjD,CAAA;AAID,QAAA,MAAM,WAAW,GAAI,YAAY,cAAc,YAS9C,CAAA;AAED;;GAEG;AACH,cAAM,OAAQ,SAAQ,UAAU;IAC9B,OAAO,CAAC,MAAM,CAAQ;gBAEV,OAAO,EAAE,cAAc;IA2B5B,OAAO,CACZ,SAAS,EAAE,UAAU,CAAC,SAAS,GAC9B,UAAU,CAAC,UAAU,CAAC,MAAM,CAAC;CA6BjC;AAED,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,WAAW,EAAE,CAAA"}

package/dist/cjs/apollo/sseLink.js

@@ -23,10 +23,10 @@ __export(sseLink_exports, {
   isSubscription: () => isSubscription
 });
 module.exports = __toCommonJS(sseLink_exports);
-var import_core = require("@apollo/client/link/core/core.cjs");
-var import_utilities = require("@apollo/client/utilities/utilities.cjs");
+var import_client = require("@apollo/client");
 var import_graphql = require("graphql");
 var import_graphql_sse = require("graphql-sse");
+var import_rxjs = require("rxjs");
 const mapCredentialsHeader = (httpLinkCredentials) => {
   if (!httpLinkCredentials) {
     return void 0;
@@ -70,7 +70,7 @@ const isLiveQuery = (definition) => {
   }
   return !!definition.directives?.find((d) => d.name.value === "live");
 };
-class SSELink extends import_core.ApolloLink {
+class SSELink extends import_client.ApolloLink {
   client;
   constructor(options) {
     super();
@@ -93,17 +93,14 @@ class SSELink extends import_core.ApolloLink {
     });
   }
   request(operation) {
-    return new import_utilities.Observable((sink) => {
-      let request;
-      if (hasTrustedDocument(operation)) {
-        delete operation.query;
-        request = { ...operation };
-      } else {
-        request = {
-          ...operation,
-          query: (0, import_graphql.print)(operation.query)
-        };
-      }
+    return new import_rxjs.Observable((sink) => {
+      const { operationName, variables, extensions } = operation;
+      const request = hasTrustedDocument(operation) ? { operationName, variables, extensions } : {
+        operationName,
+        variables,
+        extensions,
+        query: (0, import_graphql.print)(operation.query)
+      };
       return this.client.subscribe(request, {
         next: sink.next.bind(sink),
         complete: sink.complete.bind(sink),

package/dist/cjs/apollo/suspense.d.ts

@@ -1,11 +1,11 @@
 import React from 'react';
-import type { ApolloClientOptions, ApolloLink, HttpOptions, InMemoryCacheConfig, setLogVerbosity } from '@apollo/client';
+import type { ApolloClient as ApolloClientBase, ApolloLink, HttpLink, InMemoryCacheConfig, setLogVerbosity } from '@apollo/client';
 import { InMemoryCache } from '@apollo/client-react-streaming';
 import type { UseAuth } from '@cedarjs/auth';
 import type { RedwoodApolloLink, RedwoodApolloLinkFactory, RedwoodApolloLinkName, RedwoodApolloLinks } from './links.js';
 export type ApolloClientCacheConfig = InMemoryCacheConfig;
 export type { RedwoodApolloLink, RedwoodApolloLinkFactory, RedwoodApolloLinkName, RedwoodApolloLinks, };
-export type GraphQLClientConfigProp = Omit<ApolloClientOptions<unknown>, 'cache' | 'link'> & {
+export type GraphQLClientConfigProp = Omit<ApolloClientBase.Options, 'cache' | 'link'> & {
     cache?: InMemoryCache;
     /**
      * Configuration for Apollo Client's `InMemoryCache`.
@@ -24,7 +24,7 @@ export type GraphQLClientConfigProp = Omit<ApolloClientOptions<unknown>, 'cache'
      * }}>
      * ```
      */
-    httpLinkConfig?: HttpOptions;
+    httpLinkConfig?: HttpLink.Options;
     /**
      * Extend or overwrite `CedarApolloProvider`'s Apollo Link.
      *