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

package/dist/apollo/ApolloProviderWithFetchConfig.d.ts

@@ -4,7 +4,7 @@ import type { UseAuth } from '@cedarjs/auth';
 import type { GraphQLClientConfigProp } from './apolloLinkTypes.js';
 interface Props {
     config: Omit<GraphQLClientConfigProp, 'cacheConfig' | 'cache'> & {
-        cache: ApolloCache<unknown>;
+        cache: ApolloCache;
     };
     useAuth?: UseAuth;
     logLevel: ReturnType<typeof setLogVerbosity>;

package/dist/apollo/ApolloProviderWithFetchConfig.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ApolloProviderWithFetchConfig.d.ts","sourceRoot":"","sources":["../../src/apollo/ApolloProviderWithFetchConfig.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAIzB,OAAO,KAAK,EAAE,WAAW,EAAgB,eAAe,EAAE,MAAM,gBAAgB,CAAA;AAYhF,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AAM5C,OAAO,KAAK,EAEV,uBAAuB,EACxB,MAAM,sBAAsB,CAAA;AAoC7B,UAAU,KAAK;IACb,MAAM,EAAE,IAAI,CAAC,uBAAuB,EAAE,aAAa,GAAG,OAAO,CAAC,GAAG;QAC/D,KAAK,EAAE,WAAW,CAAC,OAAO,CAAC,CAAA;KAC5B,CAAA;IACD,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,QAAQ,EAAE,UAAU,CAAC,OAAO,eAAe,CAAC,CAAA;IAC5C,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAA;CAC1B;AAED,wBAAgB,6BAA6B,CAAC,EAC5C,MAAM,EACN,QAAQ,EACR,OAAmB,EACnB,QAAQ,GACT,EAAE,KAAK,qBAgKP"}
+{"version":3,"file":"ApolloProviderWithFetchConfig.d.ts","sourceRoot":"","sources":["../../src/apollo/ApolloProviderWithFetchConfig.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAO,KAAK,EAAE,WAAW,EAAgB,eAAe,EAAE,MAAM,gBAAgB,CAAA;AAchF,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AAM5C,OAAO,KAAK,EAEV,uBAAuB,EACxB,MAAM,sBAAsB,CAAA;AAoC7B,UAAU,KAAK;IACb,MAAM,EAAE,IAAI,CAAC,uBAAuB,EAAE,aAAa,GAAG,OAAO,CAAC,GAAG;QAC/D,KAAK,EAAE,WAAW,CAAA;KACnB,CAAA;IACD,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,QAAQ,EAAE,UAAU,CAAC,OAAO,eAAe,CAAC,CAAA;IAC5C,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAA;CAC1B;AAED,wBAAgB,6BAA6B,CAAC,EAC5C,MAAM,EACN,QAAQ,EACR,OAAmB,EACnB,QAAQ,GACT,EAAE,KAAK,qBAuKP"}

package/dist/apollo/ApolloProviderWithFetchConfig.js

@@ -1,16 +1,18 @@
 import React from "react";
 import {
   ApolloClient,
-  setLogVerbosity as apolloSetLogVerbosity
-} from "@apollo/client/core/core.cjs";
-import { setContext } from "@apollo/client/link/context/context.cjs";
-import { ApolloLink, split } from "@apollo/client/link/core/core.cjs";
-import { createPersistedQueryLink } from "@apollo/client/link/persisted-queries/persisted-queries.cjs";
-import { ApolloProvider } from "@apollo/client/react/react.cjs";
-import { getMainDefinition } from "@apollo/client/utilities/utilities.cjs";
+  ApolloLink,
+  setLogVerbosity as apolloSetLogVerbosity,
+  split
+} from "@apollo/client";
+import { SetContextLink } from "@apollo/client/link/context";
+import { PersistedQueryLink } from "@apollo/client/link/persisted-queries";
+import { ApolloProvider } from "@apollo/client/react";
+import { getMainDefinition } from "@apollo/client/utilities";
 import { print } from "graphql/language/printer.js";
+import { map } from "rxjs";
 import { useNoAuth } from "@cedarjs/auth";
-import { createUploadLink } from "../bundled/apollo-upload-client.js";
+import { UploadHttpLink } from "../bundled/apollo-upload-client.js";
 import { useFetchConfig } from "../components/FetchConfigProvider.js";
 import { ErrorBoundary } from "./ErrorBoundary.js";
 import * as SSELinkExports from "./sseLink.js";
@@ -34,12 +36,14 @@ function ApolloProviderWithFetchConfig({
     data.mostRecentRequest.operationKind = query?.kind.toString();
     data.mostRecentRequest.variables = variables;
     data.mostRecentRequest.query = query && print(operation.query);
-    return forward(operation).map((result) => {
-      data.mostRecentResponse = result;
-      return result;
-    });
+    return forward(operation).pipe(
+      map((result) => {
+        data.mostRecentResponse = result;
+        return result;
+      })
+    );
   });
-  const withToken = setContext(async () => {
+  const withToken = new SetContextLink(async () => {
     const token = await getToken();
     return { token };
   });
@@ -61,7 +65,7 @@ function ApolloProviderWithFetchConfig({
     return forward(operation);
   });
   const { httpLinkConfig, link: cedarApolloLink, ...rest } = config ?? {};
-  const uploadLink = createUploadLink({
+  const uploadLink = new UploadHttpLink({
     uri,
     ...httpLinkConfig
   });
@@ -83,8 +87,11 @@ function ApolloProviderWithFetchConfig({
       const documentQuery = query;
       return documentQuery?.["__meta__"]?.["hash"] !== void 0;
     },
-    createPersistedQueryLink({
-      generateHash: (document) => document["__meta__"]["hash"]
+    new PersistedQueryLink({
+      generateHash: (document) => {
+        const documentWithMeta = document;
+        return documentWithMeta.__meta__?.hash ?? "";
+      }
     }).concat(uploadOrSSELink),
     uploadOrSSELink
   );

package/dist/apollo/CedarApolloProvider.js

@@ -1,5 +1,5 @@
 import React from "react";
-import { InMemoryCache } from "@apollo/client/cache/cache.cjs";
+import { InMemoryCache } from "@apollo/client";
 import { useNoAuth } from "@cedarjs/auth";
 import { FetchConfigProvider } from "../components/FetchConfigProvider.js";
 import { ApolloProviderWithFetchConfig } from "./ApolloProviderWithFetchConfig.js";

package/dist/apollo/CedarApolloProvider.test.js

@@ -0,0 +1,38 @@
+import React from "react";
+import { gql } from "@apollo/client";
+import { useQuery } from "@apollo/client/react";
+import { render, screen, waitFor } from "@testing-library/react";
+import { vi, describe, test, expect } from "vitest";
+import { CedarApolloProvider } from "./CedarApolloProvider.js";
+globalThis.RWJS_API_GRAPHQL_URL = "https://example.com/graphql";
+describe("CedarApolloProvider smoke test", () => {
+  test("renders children and runs a query through the full link chain", async () => {
+    const fetchMock = vi.fn(async () => {
+      return new Response(JSON.stringify({ data: { answer: 42 } }), {
+        headers: { "content-type": "application/json" }
+      });
+    });
+    vi.stubGlobal("fetch", fetchMock);
+    const QUERY = gql`
+      query AnswerQuery {
+        answer
+      }
+    `;
+    const Consumer = () => {
+      const { data, loading, error } = useQuery(QUERY);
+      if (error) {
+        return /* @__PURE__ */ React.createElement(React.Fragment, null, "error: ", error.message);
+      }
+      if (loading) {
+        return /* @__PURE__ */ React.createElement(React.Fragment, null, "loading");
+      }
+      return /* @__PURE__ */ React.createElement(React.Fragment, null, "answer: ", data?.answer);
+    };
+    render(
+      /* @__PURE__ */ React.createElement(CedarApolloProvider, null, /* @__PURE__ */ React.createElement(Consumer, null))
+    );
+    await waitFor(() => screen.getByText("answer: 42"));
+    expect(fetchMock).toHaveBeenCalled();
+    vi.unstubAllGlobals();
+  });
+});

package/dist/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/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/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/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/apollo/fragmentRegistry.js

@@ -1,24 +1,51 @@
-import * as apolloClient from "@apollo/client";
-import { createFragmentRegistry } from "@apollo/client/cache/cache.cjs";
-import { getFragmentDefinitions } from "@apollo/client/utilities/utilities.cjs";
+import { createFragmentRegistry } from "@apollo/client/cache";
+import {
+  useApolloClient,
+  useFragment as useApolloFragment
+} from "@apollo/client/react";
+import { Kind } from "graphql";
+const getFragmentDefinition = (fragment) => {
+  const definition = fragment.definitions.find(
+    (def) => def.kind === Kind.FRAGMENT_DEFINITION
+  );
+  if (!definition) {
+    throw new Error("The passed document contains no fragment definition");
+  }
+  return definition;
+};
 const getTypenameFromFragment = (fragment) => {
-  const [definition] = getFragmentDefinitions(fragment);
-  return definition.typeCondition.name.value;
+  return getFragmentDefinition(fragment).typeCondition.name.value;
+};
+const getSingleFragmentName = (fragment) => {
+  const definitions = fragment.definitions.filter(
+    (def) => def.kind === 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 useApolloFragment({
     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 = useApolloClient();
   const { from, ...restOptions } = options;
   const cacheId = client.cache.identify(from);
-  const result = apolloClient.useFragment({
+  const result = useApolloFragment({
     ...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/apollo/fragmentRegistry.test.js

@@ -0,0 +1,67 @@
+import React from "react";
+import { ApolloClient, ApolloLink, InMemoryCache, gql } from "@apollo/client";
+import { ApolloProvider } from "@apollo/client/react";
+import { render, screen } from "@testing-library/react";
+import { describe, test } from "vitest";
+import { fragmentRegistry, registerFragment } from "./fragmentRegistry.js";
+const { useRegisteredFragment: useStallFragment } = registerFragment(gql`
+  fragment Stall_info on Stall {
+    id
+    name
+  }
+`);
+const { useRegisteredFragment: useFruitFragment } = registerFragment(gql`
+  fragment Fruit_info on Fruit {
+    id
+    name
+    isSeedless
+    stall {
+      ...Stall_info
+    }
+  }
+`);
+const StallInfo = ({ id }) => {
+  const { data: stall, complete } = useStallFragment(id);
+  return complete ? /* @__PURE__ */ React.createElement("p", null, "Stall Name: ", stall.name) : /* @__PURE__ */ React.createElement("p", null, "stall incomplete");
+};
+const FruitInfo = ({ id }) => {
+  const { data: fruit, complete } = useFruitFragment(id);
+  return complete ? /* @__PURE__ */ React.createElement("div", null, /* @__PURE__ */ React.createElement("h2", null, "Fruit Name: ", fruit.name), /* @__PURE__ */ React.createElement(StallInfo, { id: fruit.stall.id })) : /* @__PURE__ */ React.createElement("div", null, "fruit incomplete");
+};
+describe("registered fragments with nested spreads", () => {
+  test("reads complete data back from the cache", async () => {
+    const cache = new InMemoryCache({ fragments: fragmentRegistry });
+    const client = new ApolloClient({ cache, link: ApolloLink.empty() });
+    client.writeQuery({
+      query: 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"
+            }
+          }
+        ]
+      }
+    });
+    render(
+      /* @__PURE__ */ React.createElement(ApolloProvider, { client }, /* @__PURE__ */ React.createElement(FruitInfo, { id: "1" }))
+    );
+    screen.getByText("Fruit Name: Strawberries");
+    screen.getByText("Stall Name: Pie Veggies");
+  });
+});

package/dist/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/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/apollo/links.js

@@ -1,8 +1,7 @@
-import { Observable } from "@apollo/client/core/index.js";
-import { setContext } from "@apollo/client/link/context/index.js";
-import { ApolloLink } from "@apollo/client/link/core/index.js";
-import { HttpLink } from "@apollo/client/link/http/index.js";
+import { ApolloLink, HttpLink } from "@apollo/client";
+import { SetContextLink } from "@apollo/client/link/context";
 import { print } from "graphql/language/printer.js";
+import { Observable } from "rxjs";
 function createHttpLink(uri, httpLinkConfig, cookieHeader) {
   const headers = {};
   if (cookieHeader) {
@@ -28,9 +27,9 @@ function enhanceError(operation, error) {
 function createUpdateDataLink() {
   return new ApolloLink((operation, forward) => {
     return new Observable((observer) => {
-      forward(operation).subscribe({
+      const subscription = forward(operation).subscribe({
         next(result) {
-          if (result.errors) {
+          if ("errors" in result && result.errors) {
             result.errors.forEach((error) => {
               enhanceError(operation, error);
             });
@@ -42,6 +41,7 @@ function createUpdateDataLink() {
         },
         complete: observer.complete.bind(observer)
       });
+      return () => subscription.unsubscribe();
     });
   });
 }
@@ -67,7 +67,7 @@ function createAuthApolloLink(authProviderType, headersFromFetchProvider) {
   });
 }
 function createTokenLink(getToken) {
-  return setContext(async () => {
+  return new SetContextLink(async () => {
     const token = await getToken();
     return { token };
   });

package/dist/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/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/apollo/sseLink.js

@@ -1,7 +1,7 @@
-import { ApolloLink } from "@apollo/client/link/core/core.cjs";
-import { Observable } from "@apollo/client/utilities/utilities.cjs";
+import { ApolloLink } from "@apollo/client";
 import { Kind, OperationTypeNode, print } from "graphql";
 import { createClient } from "graphql-sse";
+import { Observable } from "rxjs";
 const mapCredentialsHeader = (httpLinkCredentials) => {
   if (!httpLinkCredentials) {
     return void 0;
@@ -69,16 +69,13 @@ class SSELink extends ApolloLink {
   }
   request(operation) {
     return new Observable((sink) => {
-      let request;
-      if (hasTrustedDocument(operation)) {
-        delete operation.query;
-        request = { ...operation };
-      } else {
-        request = {
-          ...operation,
-          query: print(operation.query)
-        };
-      }
+      const { operationName, variables, extensions } = operation;
+      const request = hasTrustedDocument(operation) ? { operationName, variables, extensions } : {
+        operationName,
+        variables,
+        extensions,
+        query: print(operation.query)
+      };
       return this.client.subscribe(request, {
         next: sink.next.bind(sink),
         complete: sink.complete.bind(sink),

package/dist/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.
      *

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

@@ -1 +1 @@
-{"version":3,"file":"suspense.d.ts","sourceRoot":"","sources":["../../src/apollo/suspense.tsx"],"names":[],"mappings":"AAYA,OAAO,KAAqB,MAAM,OAAO,CAAA;AAEzC,OAAO,KAAK,EACV,mBAAmB,EACnB,UAAU,EACV,WAAW,EACX,mBAAmB,EACnB,eAAe,EAChB,MAAM,gBAAgB,CAAA;AAEvB,OAAO,EAEL,aAAa,EAEd,MAAM,gCAAgC,CAAA;AAGvC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AAW5C,OAAO,KAAK,EACV,iBAAiB,EACjB,wBAAwB,EACxB,qBAAqB,EACrB,kBAAkB,EACnB,MAAM,YAAY,CAAA;AASnB,MAAM,MAAM,uBAAuB,GAAG,mBAAmB,CAAA;AAEzD,YAAY,EACV,iBAAiB,EACjB,wBAAwB,EACxB,qBAAqB,EACrB,kBAAkB,GACnB,CAAA;AAED,MAAM,MAAM,uBAAuB,GAAG,IAAI,CACxC,mBAAmB,CAAC,OAAO,CAAC,EAC5B,OAAO,GAAG,MAAM,CACjB,GAAG;IACF,KAAK,CAAC,EAAE,aAAa,CAAA;IACrB;;;OAGG;IACH,WAAW,CAAC,EAAE,uBAAuB,CAAA;IACrC;;;;;;;;;;;OAWG;IACH,cAAc,CAAC,EAAE,WAAW,CAAA;IAC5B;;;;;;;;;;;;;;;;;;;;;;OAsBG;IACH,IAAI,CAAC,EAAE,UAAU,GAAG,wBAAwB,CAAA;CAC7C,CAAA;AAkFD,eAAO,MAAM,mBAAmB,EAAE,KAAK,CAAC,iBAAiB,CAAC;IACxD,mBAAmB,CAAC,EAAE,uBAAuB,CAAA;IAC7C,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,QAAQ,CAAC,EAAE,UAAU,CAAC,OAAO,eAAe,CAAC,CAAA;IAC7C,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAA;CAC1B,CA4BA,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,qBAAqB;0BAtCV,uBAAuB;cACnC,OAAO;eACN,UAAU,CAAC,OAAO,eAAe,CAAC;cACnC,KAAK,CAAC,SAAS;EAmC6B,CAAA"}
+{"version":3,"file":"suspense.d.ts","sourceRoot":"","sources":["../../src/apollo/suspense.tsx"],"names":[],"mappings":"AAYA,OAAO,KAAqB,MAAM,OAAO,CAAA;AAEzC,OAAO,KAAK,EACV,YAAY,IAAI,gBAAgB,EAChC,UAAU,EACV,QAAQ,EACR,mBAAmB,EACnB,eAAe,EAChB,MAAM,gBAAgB,CAAA;AAEvB,OAAO,EAEL,aAAa,EAEd,MAAM,gCAAgC,CAAA;AAGvC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AAW5C,OAAO,KAAK,EACV,iBAAiB,EACjB,wBAAwB,EACxB,qBAAqB,EACrB,kBAAkB,EACnB,MAAM,YAAY,CAAA;AASnB,MAAM,MAAM,uBAAuB,GAAG,mBAAmB,CAAA;AAEzD,YAAY,EACV,iBAAiB,EACjB,wBAAwB,EACxB,qBAAqB,EACrB,kBAAkB,GACnB,CAAA;AAED,MAAM,MAAM,uBAAuB,GAAG,IAAI,CACxC,gBAAgB,CAAC,OAAO,EACxB,OAAO,GAAG,MAAM,CACjB,GAAG;IACF,KAAK,CAAC,EAAE,aAAa,CAAA;IACrB;;;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,wBAAwB,CAAA;CAC7C,CAAA;AAkFD,eAAO,MAAM,mBAAmB,EAAE,KAAK,CAAC,iBAAiB,CAAC;IACxD,mBAAmB,CAAC,EAAE,uBAAuB,CAAA;IAC7C,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,QAAQ,CAAC,EAAE,UAAU,CAAC,OAAO,eAAe,CAAC,CAAA;IAC7C,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAA;CAC1B,CA4BA,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,qBAAqB;0BAtCV,uBAAuB;cACnC,OAAO;eACN,UAAU,CAAC,OAAO,eAAe,CAAC;cACnC,KAAK,CAAC,SAAS;EAmC6B,CAAA"}

package/dist/apollo/suspense.js

@@ -1,6 +1,6 @@
 "use client";
 import React, { useContext } from "react";
-import { setLogVerbosity as apolloSetLogVerbosity } from "@apollo/client/core/index.js";
+import { setLogVerbosity as apolloSetLogVerbosity } from "@apollo/client";
 import {
   ApolloClient,
   InMemoryCache,

package/dist/apollo/useCache.d.ts

@@ -1,16 +1,14 @@
-import type { ApolloCache, Reference, StoreObject } from '@apollo/client';
-import type { NormalizedCacheObject } from '@apollo/client/cache/inmemory/types.js';
-import type { ApolloQueryResult } from '@apollo/client/core';
+import type { ApolloCache, ApolloClient, NormalizedCacheObject, Reference, StoreObject } from '@apollo/client';
 type useCacheType = {
-    cache: ApolloCache<object>;
+    cache: ApolloCache;
     evict: (object: StoreObject | Reference) => boolean;
     extract: (optimistic?: boolean) => NormalizedCacheObject;
     identify: (object: StoreObject | Reference) => {
         id: string | undefined;
     };
     modify: (object: StoreObject | Reference, fields: Record<string, any>) => boolean;
-    resetStore: () => Promise<ApolloQueryResult<any>[] | null>;
-    clearStore: () => Promise<ApolloQueryResult<any>[] | null>;
+    resetStore: () => Promise<ApolloClient.QueryResult<any>[] | null>;
+    clearStore: () => Promise<ApolloClient.QueryResult<any>[] | null>;
 };
 /**
  * Apollo Client stores the results of your GraphQL queries in a local, normalized, in-memory cache.

package/dist/apollo/useCache.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useCache.d.ts","sourceRoot":"","sources":["../../src/apollo/useCache.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA;AACzE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,wCAAwC,CAAA;AACnF,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AAG5D,KAAK,YAAY,GAAG;IAClB,KAAK,EAAE,WAAW,CAAC,MAAM,CAAC,CAAA;IAC1B,KAAK,EAAE,CAAC,MAAM,EAAE,WAAW,GAAG,SAAS,KAAK,OAAO,CAAA;IACnD,OAAO,EAAE,CAAC,UAAU,CAAC,EAAE,OAAO,KAAK,qBAAqB,CAAA;IACxD,QAAQ,EAAE,CAAC,MAAM,EAAE,WAAW,GAAG,SAAS,KAAK;QAAE,EAAE,EAAE,MAAM,GAAG,SAAS,CAAA;KAAE,CAAA;IACzE,MAAM,EAAE,CACN,MAAM,EAAE,WAAW,GAAG,SAAS,EAC/B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,KACxB,OAAO,CAAA;IACZ,UAAU,EAAE,MAAM,OAAO,CAAC,iBAAiB,CAAC,GAAG,CAAC,EAAE,GAAG,IAAI,CAAC,CAAA;IAC1D,UAAU,EAAE,MAAM,OAAO,CAAC,iBAAiB,CAAC,GAAG,CAAC,EAAE,GAAG,IAAI,CAAC,CAAA;CAC3D,CAAA;AAED;;;;GAIG;AACH,eAAO,MAAM,QAAQ,QAAO,YAmE3B,CAAA"}
+{"version":3,"file":"useCache.d.ts","sourceRoot":"","sources":["../../src/apollo/useCache.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,WAAW,EACX,YAAY,EACZ,qBAAqB,EACrB,SAAS,EACT,WAAW,EACZ,MAAM,gBAAgB,CAAA;AAGvB,KAAK,YAAY,GAAG;IAClB,KAAK,EAAE,WAAW,CAAA;IAClB,KAAK,EAAE,CAAC,MAAM,EAAE,WAAW,GAAG,SAAS,KAAK,OAAO,CAAA;IACnD,OAAO,EAAE,CAAC,UAAU,CAAC,EAAE,OAAO,KAAK,qBAAqB,CAAA;IACxD,QAAQ,EAAE,CAAC,MAAM,EAAE,WAAW,GAAG,SAAS,KAAK;QAAE,EAAE,EAAE,MAAM,GAAG,SAAS,CAAA;KAAE,CAAA;IACzE,MAAM,EAAE,CACN,MAAM,EAAE,WAAW,GAAG,SAAS,EAC/B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,KACxB,OAAO,CAAA;IACZ,UAAU,EAAE,MAAM,OAAO,CAAC,YAAY,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,GAAG,IAAI,CAAC,CAAA;IACjE,UAAU,EAAE,MAAM,OAAO,CAAC,YAAY,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,GAAG,IAAI,CAAC,CAAA;CAClE,CAAA;AAED;;;;GAIG;AACH,eAAO,MAAM,QAAQ,QAAO,YAmE3B,CAAA"}

package/dist/apollo/useCache.js

@@ -1,4 +1,4 @@
-import { useApolloClient } from "@apollo/client/react/hooks/hooks.cjs";
+import { useApolloClient } from "@apollo/client/react";
 const useCache = () => {
   const client = useApolloClient();
   const cache = client.cache;

package/dist/bundled/apollo-upload-client.d.ts

@@ -1,3 +1,3 @@
-import createUploadLink from 'apollo-upload-client/createUploadLink.mjs';
-export { createUploadLink };
+import UploadHttpLink from 'apollo-upload-client/UploadHttpLink.mjs';
+export { UploadHttpLink };
 //# sourceMappingURL=apollo-upload-client.d.ts.map

package/dist/bundled/apollo-upload-client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"apollo-upload-client.d.ts","sourceRoot":"","sources":["../../src/bundled/apollo-upload-client.ts"],"names":[],"mappings":"AAAA,OAAO,gBAAgB,MAAM,2CAA2C,CAAA;AAExE,OAAO,EAAE,gBAAgB,EAAE,CAAA"}
+{"version":3,"file":"apollo-upload-client.d.ts","sourceRoot":"","sources":["../../src/bundled/apollo-upload-client.ts"],"names":[],"mappings":"AAAA,OAAO,cAAc,MAAM,yCAAyC,CAAA;AAEpE,OAAO,EAAE,cAAc,EAAE,CAAA"}

package/dist/bundled/apollo-upload-client.js

@@ -1,4 +1,4 @@
-import createUploadLink from "apollo-upload-client/createUploadLink.mjs";
+import UploadHttpLink from "apollo-upload-client/UploadHttpLink.mjs";
 export {
-  createUploadLink
+  UploadHttpLink
 };

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

@@ -4,7 +4,7 @@ import type { UseAuth } from '@cedarjs/auth';
 import type { GraphQLClientConfigProp } from './apolloLinkTypes.js';
 interface Props {
     config: Omit<GraphQLClientConfigProp, 'cacheConfig' | 'cache'> & {
-        cache: ApolloCache<unknown>;
+        cache: ApolloCache;
     };
     useAuth?: UseAuth;
     logLevel: ReturnType<typeof setLogVerbosity>;

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

@@ -1 +1 @@
-{"version":3,"file":"ApolloProviderWithFetchConfig.d.ts","sourceRoot":"","sources":["../../../src/apollo/ApolloProviderWithFetchConfig.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAIzB,OAAO,KAAK,EAAE,WAAW,EAAgB,eAAe,EAAE,MAAM,gBAAgB,CAAA;AAYhF,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AAM5C,OAAO,KAAK,EAEV,uBAAuB,EACxB,MAAM,sBAAsB,CAAA;AAoC7B,UAAU,KAAK;IACb,MAAM,EAAE,IAAI,CAAC,uBAAuB,EAAE,aAAa,GAAG,OAAO,CAAC,GAAG;QAC/D,KAAK,EAAE,WAAW,CAAC,OAAO,CAAC,CAAA;KAC5B,CAAA;IACD,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,QAAQ,EAAE,UAAU,CAAC,OAAO,eAAe,CAAC,CAAA;IAC5C,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAA;CAC1B;AAED,wBAAgB,6BAA6B,CAAC,EAC5C,MAAM,EACN,QAAQ,EACR,OAAmB,EACnB,QAAQ,GACT,EAAE,KAAK,qBAgKP"}
+{"version":3,"file":"ApolloProviderWithFetchConfig.d.ts","sourceRoot":"","sources":["../../../src/apollo/ApolloProviderWithFetchConfig.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAO,KAAK,EAAE,WAAW,EAAgB,eAAe,EAAE,MAAM,gBAAgB,CAAA;AAchF,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AAM5C,OAAO,KAAK,EAEV,uBAAuB,EACxB,MAAM,sBAAsB,CAAA;AAoC7B,UAAU,KAAK;IACb,MAAM,EAAE,IAAI,CAAC,uBAAuB,EAAE,aAAa,GAAG,OAAO,CAAC,GAAG;QAC/D,KAAK,EAAE,WAAW,CAAA;KACnB,CAAA;IACD,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,QAAQ,EAAE,UAAU,CAAC,OAAO,eAAe,CAAC,CAAA;IAC5C,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAA;CAC1B;AAED,wBAAgB,6BAA6B,CAAC,EAC5C,MAAM,EACN,QAAQ,EACR,OAAmB,EACnB,QAAQ,GACT,EAAE,KAAK,qBAuKP"}