@cedarjs/web 7.0.0-canary.3258 → 7.0.0-rc.123

package/apollo/index.js

@@ -0,0 +1 @@
+module.exports = require('../dist/cjs/apollo/index.js')

package/apollo/package.json

@@ -0,0 +1,5 @@
+{
+  "type": "commonjs",
+  "main": "./index.js",
+  "types": "../dist/apollo/index.d.ts"
+}

package/dist/apollo/ApolloProviderWithFetchConfig.d.ts

@@ -1,21 +1,15 @@
 import React from 'react';
-import type { InMemoryCache, setLogVerbosity } from '@apollo/client';
+import type { ApolloCache, setLogVerbosity } from '@apollo/client';
 import type { UseAuth } from '@cedarjs/auth';
 import type { GraphQLClientConfigProp } from './apolloLinkTypes.js';
 interface Props {
     config: Omit<GraphQLClientConfigProp, 'cacheConfig' | 'cache'> & {
-        cache: InMemoryCache;
+        cache: ApolloCache<unknown>;
     };
-    /**
-     * Builds a fresh cache from the same cache configuration and fragment
-     * registry as `config.cache`. Used to give every client
-     * `useCreateApolloClient` creates its own cache.
-     */
-    createCache: () => InMemoryCache;
     useAuth?: UseAuth;
     logLevel: ReturnType<typeof setLogVerbosity>;
     children: React.ReactNode;
 }
-export declare function ApolloProviderWithFetchConfig({ config, createCache, children, useAuth, logLevel, }: Props): React.JSX.Element;
+export declare function ApolloProviderWithFetchConfig({ config, children, useAuth, logLevel, }: Props): React.JSX.Element;
 export {};
 //# sourceMappingURL=ApolloProviderWithFetchConfig.d.ts.map

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;AAEzB,OAAO,KAAK,EAEV,aAAa,EACb,eAAe,EAChB,MAAM,gBAAgB,CAAA;AAcvB,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AAQ5C,OAAO,KAAK,EAEV,uBAAuB,EACxB,MAAM,sBAAsB,CAAA;AAqC7B,UAAU,KAAK;IACb,MAAM,EAAE,IAAI,CAAC,uBAAuB,EAAE,aAAa,GAAG,OAAO,CAAC,GAAG;QAC/D,KAAK,EAAE,aAAa,CAAA;KACrB,CAAA;IACD;;;;OAIG;IACH,WAAW,EAAE,MAAM,aAAa,CAAA;IAChC,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,WAAW,EACX,QAAQ,EACR,OAAmB,EACnB,QAAQ,GACT,EAAE,KAAK,qBAsMP"}
+{"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"}

package/dist/apollo/ApolloProviderWithFetchConfig.js

@@ -1,27 +1,22 @@
 import React from "react";
 import {
   ApolloClient,
-  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";
+  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";
 import { print } from "graphql/language/printer.js";
-import { map } from "rxjs";
 import { useNoAuth } from "@cedarjs/auth";
-import { UploadHttpLink } from "../bundled/apollo-upload-client.js";
+import { createUploadLink } from "../bundled/apollo-upload-client.js";
 import { useFetchConfig } from "../components/FetchConfigProvider.js";
-import { ApolloClientFactoryContext } from "./ApolloClientFactoryContext.js";
 import { ErrorBoundary } from "./ErrorBoundary.js";
-import { getOperationKind } from "./links.js";
 import * as SSELinkExports from "./sseLink.js";
 const { SSELink, isSubscription, isLiveQuery } = SSELinkExports;
 function ApolloProviderWithFetchConfig({
   config,
-  createCache,
   children,
   useAuth = useNoAuth,
   logLevel
@@ -36,20 +31,15 @@ function ApolloProviderWithFetchConfig({
     const { operationName, query, variables } = operation;
     data.mostRecentRequest = {};
     data.mostRecentRequest.operationName = operationName;
-    data.mostRecentRequest.operationKind = getOperationKind(
-      query,
-      operationName
-    );
+    data.mostRecentRequest.operationKind = query?.kind.toString();
     data.mostRecentRequest.variables = variables;
     data.mostRecentRequest.query = query && print(operation.query);
-    return forward(operation).pipe(
-      map((result) => {
-        data.mostRecentResponse = result;
-        return result;
-      })
-    );
+    return forward(operation).map((result) => {
+      data.mostRecentResponse = result;
+      return result;
+    });
   });
-  const withToken = new SetContextLink(async () => {
+  const withToken = setContext(async () => {
     const token = await getToken();
     return { token };
   });
@@ -71,7 +61,7 @@ function ApolloProviderWithFetchConfig({
     return forward(operation);
   });
   const { httpLinkConfig, link: cedarApolloLink, ...rest } = config ?? {};
-  const uploadLink = new UploadHttpLink({
+  const uploadLink = createUploadLink({
     uri,
     ...httpLinkConfig
   });
@@ -93,11 +83,8 @@ function ApolloProviderWithFetchConfig({
       const documentQuery = query;
       return documentQuery?.["__meta__"]?.["hash"] !== void 0;
     },
-    new PersistedQueryLink({
-      generateHash: (document) => {
-        const documentWithMeta = document;
-        return documentWithMeta.__meta__?.hash ?? "";
-      }
+    createPersistedQueryLink({
+      generateHash: (document) => document["__meta__"]["hash"]
     }).concat(uploadOrSSELink),
     uploadOrSSELink
   );
@@ -112,45 +99,35 @@ function ApolloProviderWithFetchConfig({
   if (typeof link === "function") {
     link = link(cedarApolloLinks);
   }
-  const defaultOptions = {
-    watchQuery: {
-      // The `fetchPolicy` we expect:
-      //
-      // > Apollo Client executes the full query against both the cache and
-      // > your GraphQL server.
-      // > The query automatically updates if the result of the server-side
-      // > query modifies cached fields.
-      //
-      // See https://www.apollographql.com/docs/react/data/queries/#cache-and-network.
-      fetchPolicy: "cache-and-network",
-      // So that Cells rerender when refetching.
-      // See https://www.apollographql.com/docs/react/data/queries/#inspecting-loading-states.
-      notifyOnNetworkStatusChange: true
-    }
-  };
   const client = new ApolloClient({
-    defaultOptions,
+    // 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.
+    defaultOptions: {
+      watchQuery: {
+        // The `fetchPolicy` we expect:
+        //
+        // > Apollo Client executes the full query against both the cache and
+        // > your GraphQL server.
+        // > The query automatically updates if the result of the server-side
+        // > query modifies cached fields.
+        //
+        // See https://www.apollographql.com/docs/react/data/queries/#cache-and-network.
+        fetchPolicy: "cache-and-network",
+        // So that Cells rerender when refetching.
+        // See https://www.apollographql.com/docs/react/data/queries/#inspecting-loading-states.
+        notifyOnNetworkStatusChange: true
+      }
+    },
     link,
     ...rest
   });
-  const createApolloClient = (options) => {
-    const extraHeaders = options?.headers;
-    const withExtraHeaders = new SetContextLink((prevContext) => ({
-      headers: { ...prevContext.headers, ...extraHeaders }
-    }));
-    return new ApolloClient({
-      defaultOptions,
-      ...rest,
-      cache: createCache(),
-      link: ApolloLink.from([withExtraHeaders, link])
-    });
-  };
   const extendErrorAndRethrow = (error, _errorInfo) => {
     error["mostRecentRequest"] = data.mostRecentRequest;
     error["mostRecentResponse"] = data.mostRecentResponse;
     throw error;
   };
-  return /* @__PURE__ */ React.createElement(ApolloClientFactoryContext.Provider, { value: createApolloClient }, /* @__PURE__ */ React.createElement(ApolloProvider, { client }, /* @__PURE__ */ React.createElement(ErrorBoundary, { onError: extendErrorAndRethrow }, children)));
+  return /* @__PURE__ */ React.createElement(ApolloProvider, { client }, /* @__PURE__ */ React.createElement(ErrorBoundary, { onError: extendErrorAndRethrow }, children));
 }
 export {
   ApolloProviderWithFetchConfig

package/dist/apollo/CedarApolloProvider.d.ts

@@ -2,7 +2,6 @@ import React from 'react';
 import type { DocumentNode, setLogVerbosity } from '@apollo/client';
 import type { UseAuth } from '@cedarjs/auth';
 import type { GraphQLClientConfigProp } from './apolloLinkTypes.js';
-import './typeOverrides.js';
 export type { ApolloClientCacheConfig, CedarApolloLink, CedarApolloLinkFactory, CedarApolloLinkName, CedarApolloLinks, GraphQLClientConfigProp, } from './apolloLinkTypes.js';
 interface Props {
     graphQLClientConfig?: GraphQLClientConfigProp;

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

@@ -1 +1 @@
-{"version":3,"file":"CedarApolloProvider.d.ts","sourceRoot":"","sources":["../../src/apollo/CedarApolloProvider.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAO,KAAK,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAA;AAGnE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AAK5C,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAA;AAInE,OAAO,oBAAoB,CAAA;AAE3B,YAAY,EACV,uBAAuB,EACvB,eAAe,EACf,sBAAsB,EACtB,mBAAmB,EACnB,gBAAgB,EAChB,uBAAuB,GACxB,MAAM,sBAAsB,CAAA;AAE7B,UAAU,KAAK;IACb,mBAAmB,CAAC,EAAE,uBAAuB,CAAA;IAC7C,SAAS,CAAC,EAAE,YAAY,EAAE,CAAA;IAC1B,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,QAAQ,CAAC,EAAE,UAAU,CAAC,OAAO,eAAe,CAAC,CAAA;IAC7C,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAA;CAC1B;AAED,wBAAgB,mBAAmB,CAAC,EAClC,mBAAmB,EACnB,SAAS,EACT,OAAmB,EACnB,QAAkB,EAClB,QAAQ,GACT,EAAE,KAAK,qBAsCP"}
+{"version":3,"file":"CedarApolloProvider.d.ts","sourceRoot":"","sources":["../../src/apollo/CedarApolloProvider.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAO,KAAK,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAA;AAGnE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AAK5C,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAA;AAInE,YAAY,EACV,uBAAuB,EACvB,eAAe,EACf,sBAAsB,EACtB,mBAAmB,EACnB,gBAAgB,EAChB,uBAAuB,GACxB,MAAM,sBAAsB,CAAA;AAE7B,UAAU,KAAK;IACb,mBAAmB,CAAC,EAAE,uBAAuB,CAAA;IAC7C,SAAS,CAAC,EAAE,YAAY,EAAE,CAAA;IAC1B,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,QAAQ,CAAC,EAAE,UAAU,CAAC,OAAO,eAAe,CAAC,CAAA;IAC7C,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAA;CAC1B;AAED,wBAAgB,mBAAmB,CAAC,EAClC,mBAAmB,EACnB,SAAS,EACT,OAAmB,EACnB,QAAkB,EAClB,QAAQ,GACT,EAAE,KAAK,qBA4BP"}

package/dist/apollo/CedarApolloProvider.js

@@ -1,11 +1,9 @@
 import React from "react";
-import { InMemoryCache } from "@apollo/client";
+import { InMemoryCache } from "@apollo/client/cache/cache.cjs";
 import { useNoAuth } from "@cedarjs/auth";
 import { FetchConfigProvider } from "../components/FetchConfigProvider.js";
 import { ApolloProviderWithFetchConfig } from "./ApolloProviderWithFetchConfig.js";
 import { fragmentRegistry } from "./fragmentRegistry.js";
-import { withParsedScalars } from "./parsedScalars.js";
-import "./typeOverrides.js";
 function CedarApolloProvider({
   graphQLClientConfig,
   fragments,
@@ -17,20 +15,15 @@ function CedarApolloProvider({
   if (fragments) {
     fragmentRegistry.register(...fragments);
   }
-  const createCache = () => {
-    return new InMemoryCache({
-      fragments: fragmentRegistry,
-      // Includes possibleTypes, along with every other option the caller set
-      // in cacheConfig
-      ...withParsedScalars(cacheConfig)
-    });
-  };
-  const cache = createCache().restore(globalThis?.__CEDAR__APOLLO_STATE ?? {});
+  const cache = new InMemoryCache({
+    fragments: fragmentRegistry,
+    possibleTypes: cacheConfig?.possibleTypes,
+    ...cacheConfig
+  }).restore(globalThis?.__CEDAR__APOLLO_STATE ?? {});
   return /* @__PURE__ */ React.createElement(FetchConfigProvider, { useAuth }, /* @__PURE__ */ React.createElement(
     ApolloProviderWithFetchConfig,
     {
       config: { cache, ...config },
-      createCache,
       useAuth,
       logLevel
     },

package/dist/apollo/apolloLinkTypes.d.ts

@@ -1,4 +1,4 @@
-import type { ApolloClient, ApolloLink, HttpLink, InMemoryCache, InMemoryCacheConfig } from '@apollo/client';
+import type { ApolloCache, ApolloClientOptions, ApolloLink, HttpLink, HttpOptions, 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,13 +12,8 @@ export type CedarApolloLinks = [
     CedarApolloLink<'httpLink', ApolloLink | HttpLink>
 ];
 export type CedarApolloLinkFactory = (links: CedarApolloLinks) => ApolloLink;
-export type GraphQLClientConfigProp = Omit<ApolloClient.Options, 'cache' | 'link'> & {
-    /**
-     * Replace the `InMemoryCache` that `CedarApolloProvider` creates with one
-     * of your own. Apollo Client is told (via `TypeOverrides`) that its cache
-     * is always an `InMemoryCache`, so a cache passed here has to be one too.
-     */
-    cache?: InMemoryCache;
+export type GraphQLClientConfigProp = Omit<ApolloClientOptions<unknown>, 'cache' | 'link'> & {
+    cache?: ApolloCache<unknown>;
     /**
      * Configuration for Apollo Client's `InMemoryCache`.
      * See https://www.apollographql.com/docs/react/caching/cache-configuration/.
@@ -36,7 +31,7 @@ export type GraphQLClientConfigProp = Omit<ApolloClient.Options, 'cache' | 'link
      * }}>
      * ```
      */
-    httpLinkConfig?: HttpLink.Options;
+    httpLinkConfig?: HttpOptions;
     /**
      * 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,YAAY,EACZ,UAAU,EACV,QAAQ,EACR,aAAa,EACb,mBAAmB,EACpB,MAAM,gBAAgB,CAAA;AAEvB,MAAM,MAAM,uBAAuB,GAAG,mBAAmB,CAAA;AAEzD,MAAM,MAAM,mBAAmB,GAC7B,WAAW,GAAG,gBAAgB,GAAG,sBAAsB,GAAG,UAAU,CAAA;AAEtE,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;;;;OAIG;IACH,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,sBAAsB,CAAA;CAC3C,CAAA"}
+{"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"}

package/dist/apollo/fragmentRegistry.d.ts

@@ -1,5 +1,5 @@
-import type { FragmentRegistryAPI } from '@apollo/client/cache';
-import { useFragment as useApolloFragment } from '@apollo/client/react';
+import type { UseFragmentResult } from '@apollo/client';
+import type { FragmentRegistryAPI } from '@apollo/client/cache/index.js';
 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) => useApolloFragment.Result<TData>;
+    useRegisteredFragment: <TData = any>(id: FragmentIdentifier) => UseFragmentResult<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,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"}
+{"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"}

package/dist/apollo/fragmentRegistry.js

@@ -1,51 +1,24 @@
-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;
-};
+import * as apolloClient from "@apollo/client";
+import { createFragmentRegistry } from "@apollo/client/cache/cache.cjs";
+import { getFragmentDefinitions } from "@apollo/client/utilities/utilities.cjs";
 const getTypenameFromFragment = (fragment) => {
-  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 [definition] = getFragmentDefinitions(fragment);
+  return definition.typeCondition.name.value;
 };
 const useRegisteredFragmentHook = (fragment, id) => {
   const from = { __typename: getTypenameFromFragment(fragment), id };
-  return useApolloFragment({
+  return apolloClient.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 = useApolloClient();
+  const client = apolloClient.useApolloClient();
   const { from, ...restOptions } = options;
   const cacheId = client.cache.identify(from);
-  const result = useApolloFragment({
+  const result = apolloClient.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/apollo/index.d.ts

@@ -1,14 +1,10 @@
 import type { ApolloLink } from '@apollo/client';
-import type { CreateApolloClientOptions } from './ApolloClientFactoryContext.js';
 import { CedarApolloProvider } from './CedarApolloProvider.js';
 import type { ApolloClientCacheConfig as CedarApolloClientCacheConfig, CedarApolloLink, CedarApolloLinkFactory, CedarApolloLinkName, CedarApolloLinks, GraphQLClientConfigProp as CedarGraphQLClientConfigProp } from './CedarApolloProvider.js';
 import { fragmentRegistry, registerFragment, registerFragments } from './fragmentRegistry.js';
 import { useCache } from './useCache.js';
-import { useCreateApolloClient } from './useCreateApolloClient.js';
 export type { CacheKey, FragmentIdentifier, RegisterFragmentResult, } from './fragmentRegistry.js';
-export type { CreateApolloClientOptions };
 export { useCache };
-export { useCreateApolloClient };
 export { fragmentRegistry, registerFragment, registerFragments };
 /**
  * @deprecated Import from `@cedarjs/web/apollo/CedarApolloProvider` instead.

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/apollo/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAA;AAEhD,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,iCAAiC,CAAA;AAChF,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAA;AAC9D,OAAO,KAAK,EACV,uBAAuB,IAAI,4BAA4B,EACvD,eAAe,EACf,sBAAsB,EACtB,mBAAmB,EACnB,gBAAgB,EAChB,uBAAuB,IAAI,4BAA4B,EACxD,MAAM,0BAA0B,CAAA;AACjC,OAAO,EACL,gBAAgB,EAChB,gBAAgB,EAChB,iBAAiB,EAClB,MAAM,uBAAuB,CAAA;AAC9B,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AACxC,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAA;AAElE,YAAY,EACV,QAAQ,EACR,kBAAkB,EAClB,sBAAsB,GACvB,MAAM,uBAAuB,CAAA;AAE9B,YAAY,EAAE,yBAAyB,EAAE,CAAA;AAEzC,OAAO,EAAE,QAAQ,EAAE,CAAA;AAEnB,OAAO,EAAE,qBAAqB,EAAE,CAAA;AAEhC,OAAO,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,CAAA;AAEhE;;;;;;;GAOG;AACH,MAAM,MAAM,uBAAuB,GAAG,4BAA4B,CAAA;AAElE;;;;;;;GAOG;AACH,MAAM,MAAM,uBAAuB,GAAG,4BAA4B,CAAA;AAElE;;;GAGG;AACH,MAAM,MAAM,qBAAqB,GAAG,mBAAmB,CAAA;AAEvD;;;GAGG;AACH,MAAM,MAAM,iBAAiB,CAC3B,IAAI,SAAS,mBAAmB,EAChC,IAAI,SAAS,UAAU,GAAG,UAAU,IAClC,eAAe,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;AAE/B;;;GAGG;AACH,MAAM,MAAM,kBAAkB,GAAG,gBAAgB,CAAA;AAEjD;;;GAGG;AACH,MAAM,MAAM,wBAAwB,GAAG,sBAAsB,CAAA;AAE7D;;;;;;;GAOG;AACH,eAAO,MAAM,qBAAqB,4BAAsB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/apollo/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAA;AAEhD,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAA;AAC9D,OAAO,KAAK,EACV,uBAAuB,IAAI,4BAA4B,EACvD,eAAe,EACf,sBAAsB,EACtB,mBAAmB,EACnB,gBAAgB,EAChB,uBAAuB,IAAI,4BAA4B,EACxD,MAAM,0BAA0B,CAAA;AACjC,OAAO,EACL,gBAAgB,EAChB,gBAAgB,EAChB,iBAAiB,EAClB,MAAM,uBAAuB,CAAA;AAC9B,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AAExC,YAAY,EACV,QAAQ,EACR,kBAAkB,EAClB,sBAAsB,GACvB,MAAM,uBAAuB,CAAA;AAE9B,OAAO,EAAE,QAAQ,EAAE,CAAA;AAEnB,OAAO,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,CAAA;AAEhE;;;;;;;GAOG;AACH,MAAM,MAAM,uBAAuB,GAAG,4BAA4B,CAAA;AAElE;;;;;;;GAOG;AACH,MAAM,MAAM,uBAAuB,GAAG,4BAA4B,CAAA;AAElE;;;GAGG;AACH,MAAM,MAAM,qBAAqB,GAAG,mBAAmB,CAAA;AAEvD;;;GAGG;AACH,MAAM,MAAM,iBAAiB,CAC3B,IAAI,SAAS,mBAAmB,EAChC,IAAI,SAAS,UAAU,GAAG,UAAU,IAClC,eAAe,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;AAE/B;;;GAGG;AACH,MAAM,MAAM,kBAAkB,GAAG,gBAAgB,CAAA;AAEjD;;;GAGG;AACH,MAAM,MAAM,wBAAwB,GAAG,sBAAsB,CAAA;AAE7D;;;;;;;GAOG;AACH,eAAO,MAAM,qBAAqB,4BAAsB,CAAA"}

package/dist/apollo/index.js

@@ -5,13 +5,11 @@ import {
   registerFragments
 } from "./fragmentRegistry.js";
 import { useCache } from "./useCache.js";
-import { useCreateApolloClient } from "./useCreateApolloClient.js";
 const RedwoodApolloProvider = CedarApolloProvider;
 export {
   RedwoodApolloProvider,
   fragmentRegistry,
   registerFragment,
   registerFragments,
-  useCache,
-  useCreateApolloClient
+  useCache
 };

package/dist/apollo/links.d.ts

@@ -1,14 +1,13 @@
-import { ApolloLink, HttpLink } from '@apollo/client';
-import { SetContextLink } from '@apollo/client/link/context';
-import type { DocumentNode, OperationTypeNode } from 'graphql';
-export declare function getOperationKind(query: DocumentNode, operationName?: string): OperationTypeNode | undefined;
-export declare function createHttpLink(uri: string, httpLinkConfig: HttpLink.Options | undefined, cookieHeader?: string | null): HttpLink;
+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;
 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>): SetContextLink;
+export declare function createTokenLink(getToken: () => Promise<string | null>): ApolloLink;
 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,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AACrD,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAA;AAC5D,OAAO,KAAK,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAA;AAK9D,wBAAgB,gBAAgB,CAC9B,KAAK,EAAE,YAAY,EACnB,aAAa,CAAC,EAAE,MAAM,GACrB,iBAAiB,GAAG,SAAS,CAE/B;AAED,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"}
+{"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"}

package/dist/apollo/links.js

@@ -1,11 +1,8 @@
-import { ApolloLink, HttpLink } from "@apollo/client";
-import { SetContextLink } from "@apollo/client/link/context";
-import { getOperationAST } from "graphql";
+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 { print } from "graphql/language/printer.js";
-import { Observable } from "rxjs";
-function getOperationKind(query, operationName) {
-  return getOperationAST(query, operationName)?.operation;
-}
 function createHttpLink(uri, httpLinkConfig, cookieHeader) {
   const headers = {};
   if (cookieHeader) {
@@ -22,7 +19,7 @@ function enhanceError(operation, error) {
   const { operationName, query, variables } = operation;
   error.__RedwoodEnhancedError = {
     operationName,
-    operationKind: getOperationKind(query, operationName),
+    operationKind: query?.kind.toString(),
     variables,
     query: query && print(query)
   };
@@ -31,9 +28,9 @@ function enhanceError(operation, error) {
 function createUpdateDataLink() {
   return new ApolloLink((operation, forward) => {
     return new Observable((observer) => {
-      const subscription = forward(operation).subscribe({
+      forward(operation).subscribe({
         next(result) {
-          if ("errors" in result && result.errors) {
+          if (result.errors) {
             result.errors.forEach((error) => {
               enhanceError(operation, error);
             });
@@ -45,7 +42,6 @@ function createUpdateDataLink() {
         },
         complete: observer.complete.bind(observer)
       });
-      return () => subscription.unsubscribe();
     });
   });
 }
@@ -71,7 +67,7 @@ function createAuthApolloLink(authProviderType, headersFromFetchProvider) {
   });
 }
 function createTokenLink(getToken) {
-  return new SetContextLink(async () => {
+  return setContext(async () => {
     const token = await getToken();
     return { token };
   });
@@ -94,6 +90,5 @@ export {
   createFinalLink,
   createHttpLink,
   createTokenLink,
-  createUpdateDataLink,
-  getOperationKind
+  createUpdateDataLink
 };

package/dist/apollo/sseLink.d.ts

@@ -1,15 +1,16 @@
-import type { HttpLink } from '@apollo/client';
-import { ApolloLink } from '@apollo/client';
+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 { 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?: HttpLink.Options;
+    httpLinkConfig?: HttpOptions;
     headers?: Record<string, string>;
 }
 declare const isSubscription: (definition: DefinitionNode) => boolean;
@@ -20,7 +21,9 @@ declare const isLiveQuery: (definition: DefinitionNode) => boolean;
 declare class SSELink extends ApolloLink {
     private client;
     constructor(options: SSELinkOptions);
-    request(operation: ApolloLink.Operation): Observable<ApolloLink.Result>;
+    request(operation: Operation & {
+        query?: any;
+    }): Observable<FetchResult>;
 }
 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,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"}
+{"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"}

package/dist/apollo/sseLink.js

@@ -1,7 +1,7 @@
-import { ApolloLink } from "@apollo/client";
+import { ApolloLink } from "@apollo/client/link/core/core.cjs";
+import { Observable } from "@apollo/client/utilities/utilities.cjs";
 import { Kind, OperationTypeNode, print } from "graphql";
 import { createClient } from "graphql-sse";
-import { Observable } from "rxjs";
 const mapCredentialsHeader = (httpLinkCredentials) => {
   if (!httpLinkCredentials) {
     return void 0;
@@ -69,13 +69,16 @@ class SSELink extends ApolloLink {
   }
   request(operation) {
     return new Observable((sink) => {
-      const { operationName, variables, extensions } = operation;
-      const request = hasTrustedDocument(operation) ? { operationName, variables, extensions } : {
-        operationName,
-        variables,
-        extensions,
-        query: print(operation.query)
-      };
+      let request;
+      if (hasTrustedDocument(operation)) {
+        delete operation.query;
+        request = { ...operation };
+      } else {
+        request = {
+          ...operation,
+          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,13 +1,11 @@
 import React from 'react';
-import type { ApolloClient as ApolloClientBase, HttpLink, InMemoryCacheConfig, setLogVerbosity } from '@apollo/client';
-import { ApolloLink } from '@apollo/client';
+import type { ApolloClientOptions, ApolloLink, HttpOptions, InMemoryCacheConfig, setLogVerbosity } from '@apollo/client';
 import { InMemoryCache } from '@apollo/client-react-streaming';
-import './typeOverrides.js';
 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<ApolloClientBase.Options, 'cache' | 'link'> & {
+export type GraphQLClientConfigProp = Omit<ApolloClientOptions<unknown>, 'cache' | 'link'> & {
     cache?: InMemoryCache;
     /**
      * Configuration for Apollo Client's `InMemoryCache`.
@@ -26,7 +24,7 @@ export type GraphQLClientConfigProp = Omit<ApolloClientBase.Options, 'cache' | '
      * }}>
      * ```
      */
-    httpLinkConfig?: HttpLink.Options;
+    httpLinkConfig?: HttpOptions;
     /**
      * 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,YAAY,IAAI,gBAAgB,EAChC,QAAQ,EACR,mBAAmB,EACnB,eAAe,EAChB,MAAM,gBAAgB,CAAA;AACvB,OAAO,EACL,UAAU,EAEX,MAAM,gBAAgB,CAAA;AAEvB,OAAO,EAEL,aAAa,EAEd,MAAM,gCAAgC,CAAA;AAGvC,OAAO,oBAAoB,CAAA;AAE3B,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AAa5C,OAAO,KAAK,EACV,iBAAiB,EACjB,wBAAwB,EACxB,qBAAqB,EACrB,kBAAkB,EACnB,MAAM,YAAY,CAAA;AAUnB,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;AAqHD,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,CAsCA,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,qBAAqB;0BAhDV,uBAAuB;cACnC,OAAO;eACN,UAAU,CAAC,OAAO,eAAe,CAAC;cACnC,KAAK,CAAC,SAAS;EA6C6B,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,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"}