@cedarjs/web 5.0.4-next.167 → 5.0.4

package/dist/apollo/fragmentRegistry.d.ts

@@ -1,24 +1,6 @@
 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;
-    fragmentName?: string;
-    /**
-     * The object to read the fragment data for. Usually a cache reference like
-     * `{ __typename: 'User', id: 1 }`, but any object that Apollo Client can
-     * identify works.
-     */
-    from: Record<string, unknown>;
-}
-export interface FragmentHookResult<TData = any> {
-    /**
-     * The fragment data read from Apollo Client's cache, or `undefined` if the
-     * cache doesn't (yet) contain complete data for the fragment.
-     */
-    data: TData | undefined;
-    complete: boolean;
-}
 export type FragmentIdentifier = string | number;
 export type CacheKey = {
     __typename: string;
@@ -30,13 +12,6 @@ export type RegisterFragmentResult = {
     getCacheKey: (id: FragmentIdentifier) => CacheKey;
     useRegisteredFragment: <TData = any>(id: FragmentIdentifier) => UseFragmentResult<TData>;
 };
-/**
- * Read fragment data from Apollo Client's cache without firing a network
- * request. Used by fragment Cells (Cells that export `FRAGMENT` instead of
- * `QUERY`). Incomplete reads surface `data: undefined` so that fragment Cells
- * fall back to the data snapshot passed via their data prop.
- */
-export declare function useFragment<TData = any>(options: FragmentHookOptions): FragmentHookResult<TData>;
 /**
  * Creates a fragment registry for Apollo Client's InMemoryCache so that they
  * can be referred to by name in any query or InMemoryCache operation

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,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,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;AAqCD;;;;;;;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

@@ -12,23 +12,6 @@ const useRegisteredFragmentHook = (fragment, id) => {
     from
   });
 };
-const UNIDENTIFIABLE_FRAGMENT_REF = "CedarUnidentifiableFragmentRef:_";
-function useFragment(options) {
-  const client = apolloClient.useApolloClient();
-  const { from, ...restOptions } = options;
-  const cacheId = client.cache.identify(from);
-  const result = apolloClient.useFragment({
-    ...restOptions,
-    // We identify the object ourselves (above) because passing an
-    // unidentifiable object to `useFragment` logs a warning and returns a
-    // useless `{ data: {}, complete: true }` result
-    from: cacheId ?? UNIDENTIFIABLE_FRAGMENT_REF
-  });
-  if (cacheId !== void 0 && result.complete) {
-    return { data: result.data, complete: true };
-  }
-  return { data: void 0, complete: false };
-}
 const fragmentRegistry = createFragmentRegistry();
 const registerFragments = (fragments) => {
   return fragments.map(registerFragment);
@@ -52,6 +35,5 @@ const registerFragment = (fragment) => {
 export {
   fragmentRegistry,
   registerFragment,
-  registerFragments,
-  useFragment
+  registerFragments
 };

package/dist/apollo/index.d.ts

@@ -1,56 +1,76 @@
-import type { ApolloLink } from '@apollo/client';
-import { CedarApolloProvider } from './CedarApolloProvider.js';
-import type { ApolloClientCacheConfig as CedarApolloClientCacheConfig, CedarApolloLink, CedarApolloLinkFactory, CedarApolloLinkName, CedarApolloLinks, GraphQLClientConfigProp as CedarGraphQLClientConfigProp } from './CedarApolloProvider.js';
+import React from 'react';
+import type { ApolloClientOptions, setLogVerbosity, ApolloCache, InMemoryCacheConfig, HttpOptions, DocumentNode, HttpLink } from '@apollo/client';
+import { ApolloLink } from '@apollo/client/link/core/core.cjs';
+import type { UseAuth } from '@cedarjs/auth';
+import './typeOverride.js';
 import { fragmentRegistry, registerFragment, registerFragments } from './fragmentRegistry.js';
 import { useCache } from './useCache.js';
 export type { CacheKey, FragmentIdentifier, RegisterFragmentResult, } from './fragmentRegistry.js';
 export { useCache };
 export { fragmentRegistry, registerFragment, registerFragments };
-/**
- * @deprecated Import from `@cedarjs/web/apollo/CedarApolloProvider` instead.
- * This re-export will be removed in a future release.
- *
- * ```js
- * import type { ApolloClientCacheConfig } from '@cedarjs/web/apollo/CedarApolloProvider'
- * ```
- */
-export type ApolloClientCacheConfig = CedarApolloClientCacheConfig;
-/**
- * @deprecated Import from `@cedarjs/web/apollo/CedarApolloProvider` instead.
- * This re-export will be removed in a future release.
- *
- * ```js
- * import type { GraphQLClientConfigProp } from '@cedarjs/web/apollo/CedarApolloProvider'
- * ```
- */
-export type GraphQLClientConfigProp = CedarGraphQLClientConfigProp;
-/**
- * @deprecated Use `CedarApolloLinkName` instead. `RedwoodApolloLinkName` will
- * be removed in a future release.
- */
-export type RedwoodApolloLinkName = CedarApolloLinkName;
-/**
- * @deprecated Use `CedarApolloLink` instead. `RedwoodApolloLink` will be
- * removed in a future release.
- */
-export type RedwoodApolloLink<Name extends CedarApolloLinkName, Link extends ApolloLink = ApolloLink> = CedarApolloLink<Name, Link>;
-/**
- * @deprecated Use `CedarApolloLinks` instead. `RedwoodApolloLinks` will be
- * removed in a future release.
- */
-export type RedwoodApolloLinks = CedarApolloLinks;
-/**
- * @deprecated Use `CedarApolloLinkFactory` instead. `RedwoodApolloLinkFactory`
- * will be removed in a future release.
- */
-export type RedwoodApolloLinkFactory = CedarApolloLinkFactory;
-/**
- * @deprecated Use `CedarApolloProvider` instead. `RedwoodApolloProvider` will
- * be removed in a future release.
- *
- * ```js
- * import { CedarApolloProvider } from '@cedarjs/web/apollo/CedarApolloProvider'
- * ```
- */
-export declare const RedwoodApolloProvider: typeof CedarApolloProvider;
+export type ApolloClientCacheConfig = InMemoryCacheConfig;
+export type RedwoodApolloLinkName = 'withToken' | 'authMiddleware' | 'updateDataApolloLink' | 'httpLink';
+export type RedwoodApolloLink<Name extends RedwoodApolloLinkName, Link extends ApolloLink = ApolloLink> = {
+    name: Name;
+    link: Link;
+};
+export type RedwoodApolloLinks = [
+    RedwoodApolloLink<'withToken'>,
+    RedwoodApolloLink<'authMiddleware'>,
+    RedwoodApolloLink<'updateDataApolloLink'>,
+    RedwoodApolloLink<'httpLink', ApolloLink | HttpLink>
+];
+export type RedwoodApolloLinkFactory = (links: RedwoodApolloLinks) => ApolloLink;
+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/.
+     */
+    cacheConfig?: ApolloClientCacheConfig;
+    /**
+     * Configuration for the terminating `HttpLink`.
+     * See https://www.apollographql.com/docs/react/api/link/apollo-link-http/#httplink-constructor-options.
+     *
+     * For example, you can use this prop to set the credentials policy so that cookies can be sent to other domains:
+     *
+     * ```js
+     * <RedwoodApolloProvider graphQLClientConfig={{
+     *   httpLinkConfig: { credentials: 'include' }
+     * }}>
+     * ```
+     */
+    httpLinkConfig?: HttpOptions;
+    /**
+     * Extend or overwrite `RedwoodApolloProvider`'s Apollo Link.
+     *
+     * To overwrite Redwood's Apollo Link, just provide your own `ApolloLink`.
+     *
+     * To extend Redwood's Apollo Link, provide a function—it'll get passed an array of Redwood's Apollo Links
+     * which are objects with a name and link property:
+     *
+     * ```js
+     * const link = (redwoodApolloLinks) => {
+     *   const consoleLink = new ApolloLink((operation, forward) => {
+     *     console.log(operation.operationName)
+     *     return forward(operation)
+     *   })
+     *
+     *   return ApolloLink.from([consoleLink, ...redwoodApolloLinks.map(({ link }) => link)])
+     * }
+     * ```
+     *
+     * If you do this, there's a few things you should keep in mind:
+     * - your function should return a single link (e.g., using `ApolloLink.from`; see https://www.apollographql.com/docs/react/api/link/introduction/#additive-composition)
+     * - the `HttpLink` should come last (https://www.apollographql.com/docs/react/api/link/introduction/#the-terminating-link)
+     */
+    link?: ApolloLink | RedwoodApolloLinkFactory;
+};
+export declare const RedwoodApolloProvider: React.FunctionComponent<{
+    graphQLClientConfig?: GraphQLClientConfigProp;
+    fragments?: DocumentNode[];
+    useAuth?: UseAuth;
+    logLevel?: ReturnType<typeof setLogVerbosity>;
+    children: React.ReactNode;
+}>;
 //# sourceMappingURL=index.d.ts.map

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,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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/apollo/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAIzB,OAAO,KAAK,EACV,mBAAmB,EACnB,eAAe,EACf,WAAW,EACX,mBAAmB,EACnB,WAAW,EACX,YAAY,EACZ,QAAQ,EACT,MAAM,gBAAgB,CAAA;AAOvB,OAAO,EAAE,UAAU,EAAS,MAAM,mCAAmC,CAAA;AAcrE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AAG5C,OAAO,mBAAmB,CAAA;AAQ1B,OAAO,EACL,gBAAgB,EAChB,gBAAgB,EAChB,iBAAiB,EAClB,MAAM,uBAAuB,CAAA;AAE9B,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AAKxC,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,MAAM,MAAM,uBAAuB,GAAG,mBAAmB,CAAA;AAEzD,MAAM,MAAM,qBAAqB,GAC7B,WAAW,GACX,gBAAgB,GAChB,sBAAsB,GACtB,UAAU,CAAA;AAEd,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;IAC/B,iBAAiB,CAAC,WAAW,CAAC;IAC9B,iBAAiB,CAAC,gBAAgB,CAAC;IACnC,iBAAiB,CAAC,sBAAsB,CAAC;IACzC,iBAAiB,CAAC,UAAU,EAAE,UAAU,GAAG,QAAQ,CAAC;CACrD,CAAA;AAED,MAAM,MAAM,wBAAwB,GAAG,CAAC,KAAK,EAAE,kBAAkB,KAAK,UAAU,CAAA;AAEhF,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,wBAAwB,CAAA;CAC7C,CAAA;AAqND,eAAO,MAAM,qBAAqB,EAAE,KAAK,CAAC,iBAAiB,CAAC;IAC1D,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,CA2CA,CAAA"}

package/dist/apollo/index.js

@@ -1,11 +1,193 @@
-import { CedarApolloProvider } from "./CedarApolloProvider.js";
+import React from "react";
+import { InMemoryCache } from "@apollo/client/cache/cache.cjs";
+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 {
+  useQuery,
+  useMutation,
+  useSubscription,
+  useBackgroundQuery,
+  useReadQuery,
+  useSuspenseQuery
+} from "@apollo/client/react/hooks/hooks.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 { useNoAuth } from "@cedarjs/auth";
+import "./typeOverride.js";
+import { createUploadLink } from "../bundled/apollo-upload-client.js";
+import {
+  FetchConfigProvider,
+  useFetchConfig
+} from "../components/FetchConfigProvider.js";
+import { GraphQLHooksProvider } from "../components/GraphQLHooksProvider.js";
 import {
   fragmentRegistry,
   registerFragment,
   registerFragments
 } from "./fragmentRegistry.js";
+import * as SSELinkExports from "./sseLink.js";
 import { useCache } from "./useCache.js";
-const RedwoodApolloProvider = CedarApolloProvider;
+const { SSELink, isSubscription, isLiveQuery } = SSELinkExports;
+const ApolloProviderWithFetchConfig = ({ config, children, useAuth = useNoAuth, logLevel }) => {
+  apolloSetLogVerbosity(logLevel);
+  const { getToken, type: authProviderType } = useAuth();
+  const data = {
+    mostRecentRequest: void 0,
+    mostRecentResponse: void 0
+  };
+  const updateDataApolloLink = new 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 && print(operation.query);
+    return forward(operation).map((result) => {
+      data.mostRecentResponse = result;
+      return result;
+    });
+  });
+  const withToken = setContext(async () => {
+    const token = await getToken();
+    return { token };
+  });
+  const { headers, uri } = useFetchConfig();
+  const authMiddleware = new ApolloLink((operation, forward) => {
+    const { token } = operation.getContext();
+    const authHeaders = token ? {
+      "auth-provider": authProviderType,
+      authorization: `Bearer ${token}`
+    } : {};
+    operation.setContext(() => ({
+      headers: {
+        ...operation.getContext().headers,
+        ...headers,
+        // Duped auth headers, because we may remove the `FetchConfigProvider` at a later date.
+        ...authHeaders
+      }
+    }));
+    return forward(operation);
+  });
+  const { httpLinkConfig, link: redwoodApolloLink, ...rest } = config ?? {};
+  const uploadLink = createUploadLink({
+    uri,
+    ...httpLinkConfig
+    // The upload link types don't match the ApolloLink types, even though it comes from Apollo
+    // because they use ESM imports and we're using the default ones.
+  });
+  const uploadOrSSELink = typeof SSELink !== "undefined" ? split(
+    ({ query }) => {
+      const definition = getMainDefinition(query);
+      return isSubscription(definition) || isLiveQuery(definition);
+    },
+    new SSELink({
+      url: uri,
+      auth: { authProviderType, tokenFn: getToken },
+      httpLinkConfig,
+      headers
+    }),
+    uploadLink
+  ) : uploadLink;
+  const terminatingLink = split(
+    ({ query }) => {
+      const documentQuery = query;
+      return documentQuery?.["__meta__"]?.["hash"] !== void 0;
+    },
+    createPersistedQueryLink({
+      generateHash: (document) => document["__meta__"]["hash"]
+    }).concat(uploadOrSSELink),
+    uploadOrSSELink
+  );
+  const redwoodApolloLinks = [
+    { name: "withToken", link: withToken },
+    { name: "authMiddleware", link: authMiddleware },
+    { name: "updateDataApolloLink", link: updateDataApolloLink },
+    { name: "httpLink", link: terminatingLink }
+  ];
+  let link = redwoodApolloLink;
+  link ??= ApolloLink.from(redwoodApolloLinks.map((l) => l.link));
+  if (typeof link === "function") {
+    link = link(redwoodApolloLinks);
+  }
+  const client = new 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.
+    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 extendErrorAndRethrow = (error, _errorInfo) => {
+    error["mostRecentRequest"] = data.mostRecentRequest;
+    error["mostRecentResponse"] = data.mostRecentResponse;
+    throw error;
+  };
+  return /* @__PURE__ */ React.createElement(ApolloProvider, { client }, /* @__PURE__ */ React.createElement(ErrorBoundary, { onError: extendErrorAndRethrow }, children));
+};
+class ErrorBoundary extends React.Component {
+  componentDidCatch(...args) {
+    this.setState({});
+    this.props.onError(...args);
+  }
+  render() {
+    return this.props.children;
+  }
+}
+const RedwoodApolloProvider = ({
+  graphQLClientConfig,
+  fragments,
+  useAuth = useNoAuth,
+  logLevel = "debug",
+  children
+}) => {
+  const { cacheConfig, ...config } = graphQLClientConfig ?? {};
+  if (fragments) {
+    fragmentRegistry.register(...fragments);
+  }
+  const cache = new InMemoryCache({
+    fragments: fragmentRegistry,
+    possibleTypes: cacheConfig?.possibleTypes,
+    ...cacheConfig
+  }).restore(globalThis?.__REDWOOD__APOLLO_STATE ?? {});
+  return /* @__PURE__ */ React.createElement(FetchConfigProvider, { useAuth }, /* @__PURE__ */ React.createElement(
+    ApolloProviderWithFetchConfig,
+    {
+      config: { cache, ...config },
+      useAuth,
+      logLevel
+    },
+    /* @__PURE__ */ React.createElement(
+      GraphQLHooksProvider,
+      {
+        useQuery,
+        useMutation,
+        useSubscription,
+        useBackgroundQuery,
+        useReadQuery,
+        useSuspenseQuery
+      },
+      children
+    )
+  ));
+};
 export {
   RedwoodApolloProvider,
   fragmentRegistry,

package/dist/apollo/suspense.d.ts

@@ -2,6 +2,7 @@ import React from 'react';
 import type { ApolloClientOptions, ApolloLink, HttpOptions, InMemoryCacheConfig, setLogVerbosity } from '@apollo/client';
 import { InMemoryCache } from '@apollo/client-react-streaming';
 import type { UseAuth } from '@cedarjs/auth';
+import './typeOverride.js';
 import type { RedwoodApolloLink, RedwoodApolloLinkFactory, RedwoodApolloLinkName, RedwoodApolloLinks } from './links.js';
 export type ApolloClientCacheConfig = InMemoryCacheConfig;
 export type { RedwoodApolloLink, RedwoodApolloLinkFactory, RedwoodApolloLinkName, RedwoodApolloLinks, };
@@ -19,28 +20,28 @@ export type GraphQLClientConfigProp = Omit<ApolloClientOptions<unknown>, 'cache'
      * For example, you can use this prop to set the credentials policy so that cookies can be sent to other domains:
      *
      * ```js
-     * <CedarApolloProvider graphQLClientConfig={{
+     * <RedwoodApolloProvider graphQLClientConfig={{
      *   httpLinkConfig: { credentials: 'include' }
      * }}>
      * ```
      */
     httpLinkConfig?: HttpOptions;
     /**
-     * Extend or overwrite `CedarApolloProvider`'s Apollo Link.
+     * Extend or overwrite `RedwoodApolloProvider`'s Apollo Link.
      *
-     * To overwrite Cedar's Apollo Link, just provide your own `ApolloLink`.
+     * To overwrite Redwood's Apollo Link, just provide your own `ApolloLink`.
      *
-     * To extend Cedar's Apollo Link, provide a function—it'll get passed an array of Cedar's Apollo Links
+     * To extend Redwood's Apollo Link, provide a function—it'll get passed an array of Redwood's Apollo Links
      * which are objects with a name and link property:
      *
      * ```js
-     * const link = (cedarApolloLinks) => {
+     * const link = (redwoodApolloLinks) => {
      *   const consoleLink = new ApolloLink((operation, forward) => {
      *     console.log(operation.operationName)
      *     return forward(operation)
      *   })
      *
-     *   return ApolloLink.from([consoleLink, ...cedarApolloLinks.map(({ link }) => link)])
+     *   return ApolloLink.from([consoleLink, ...redwoodApolloLinks.map(({ link }) => link)])
      * }
      * ```
      *
@@ -50,16 +51,6 @@ export type GraphQLClientConfigProp = Omit<ApolloClientOptions<unknown>, 'cache'
      */
     link?: ApolloLink | RedwoodApolloLinkFactory;
 };
-export declare const CedarApolloProvider: React.FunctionComponent<{
-    graphQLClientConfig?: GraphQLClientConfigProp;
-    useAuth?: UseAuth;
-    logLevel?: ReturnType<typeof setLogVerbosity>;
-    children: React.ReactNode;
-}>;
-/**
- * @deprecated Use `CedarApolloProvider` instead. `RedwoodApolloProvider` will
- * be removed in a future release.
- */
 export declare const RedwoodApolloProvider: React.FunctionComponent<{
     graphQLClientConfig?: GraphQLClientConfigProp;
     useAuth?: UseAuth;

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,mBAAmB,EACnB,UAAU,EACV,WAAW,EACX,mBAAmB,EACnB,eAAe,EAChB,MAAM,gBAAgB,CAAA;AAUvB,OAAO,EAEL,aAAa,EAEd,MAAM,gCAAgC,CAAA;AAGvC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AAG5C,OAAO,mBAAmB,CAAA;AAS1B,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,qBAAqB,EAAE,KAAK,CAAC,iBAAiB,CAAC;IAC1D,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,CAoCA,CAAA"}

package/dist/apollo/suspense.js

@@ -1,6 +1,14 @@
 "use client";
 import React, { useContext } from "react";
 import { setLogVerbosity as apolloSetLogVerbosity } from "@apollo/client/core/index.js";
+import {
+  useMutation,
+  useSubscription,
+  useBackgroundQuery,
+  useQuery,
+  useReadQuery,
+  useSuspenseQuery
+} from "@apollo/client/react/hooks/index.js";
 import {
   ApolloClient,
   InMemoryCache,
@@ -9,12 +17,13 @@ import {
 import { buildManualDataTransport } from "@apollo/client-react-streaming/manual-transport";
 import { useNoAuth } from "@cedarjs/auth";
 import { ServerAuthContext } from "@cedarjs/auth/dist/AuthProvider/ServerAuthProvider.js";
+import "./typeOverride.js";
 import {
   FetchConfigProvider,
   useFetchConfig
 } from "../components/FetchConfigProvider.js";
+import { GraphQLHooksProvider } from "../components/GraphQLHooksProvider.js";
 import { ServerHtmlContext } from "../components/ServerInject.js";
-import { fragmentRegistry } from "./fragmentRegistry.js";
 import {
   createAuthApolloLink,
   createFinalLink,
@@ -68,17 +77,16 @@ const ApolloProviderWithFetchConfig = ({ config, children, logLevel, useAuth = u
   }
   return /* @__PURE__ */ React.createElement(WrappedApolloProvider, { makeClient }, children);
 };
-const CedarApolloProvider = ({
+const RedwoodApolloProvider = ({
   graphQLClientConfig,
   useAuth = useNoAuth,
   logLevel = "debug",
   children
 }) => {
   const { cacheConfig, ...config } = graphQLClientConfig ?? {};
-  const cache = new InMemoryCache({
-    fragments: fragmentRegistry,
-    ...cacheConfig
-  }).restore(globalThis?.__CEDAR__APOLLO_STATE ?? {});
+  const cache = new InMemoryCache(cacheConfig).restore(
+    globalThis?.__REDWOOD__APOLLO_STATE ?? {}
+  );
   return /* @__PURE__ */ React.createElement(FetchConfigProvider, { useAuth }, /* @__PURE__ */ React.createElement(
     ApolloProviderWithFetchConfig,
     {
@@ -86,11 +94,20 @@ const CedarApolloProvider = ({
       useAuth,
       logLevel
     },
-    children
+    /* @__PURE__ */ React.createElement(
+      GraphQLHooksProvider,
+      {
+        useQuery,
+        useMutation,
+        useSubscription,
+        useSuspenseQuery,
+        useBackgroundQuery,
+        useReadQuery
+      },
+      children
+    )
   ));
 };
-const RedwoodApolloProvider = CedarApolloProvider;
 export {
-  CedarApolloProvider,
   RedwoodApolloProvider
 };

package/dist/apollo/typeOverride.d.ts

@@ -0,0 +1,21 @@
+import type { QueryHookOptions, QueryResult, MutationHookOptions, MutationTuple, OperationVariables, SubscriptionHookOptions, SubscriptionResult, UseSuspenseQueryResult, SuspenseQueryHookOptions } from '@apollo/client';
+declare global {
+    interface QueryOperationResult<TData = any, TVariables extends OperationVariables = OperationVariables> extends QueryResult<TData, TVariables> {
+    }
+    interface MutationOperationResult<TData, TVariables> extends MutationTuple<TData, TVariables> {
+    }
+    interface SubscriptionOperationResult<TData = any, TVariables extends OperationVariables = OperationVariables> extends SubscriptionResult<TData, TVariables> {
+    }
+    interface GraphQLQueryHookOptions<TData, TVariables extends OperationVariables> extends QueryHookOptions<TData, TVariables> {
+    }
+    interface GraphQLMutationHookOptions<TData, TVariables> extends MutationHookOptions<TData, TVariables> {
+    }
+    interface GraphQLSubscriptionHookOptions<TData, TVariables extends OperationVariables> extends SubscriptionHookOptions<TData, TVariables> {
+    }
+    interface SuspenseQueryOperationResult<TData = any, TVariables extends OperationVariables = OperationVariables> extends UseSuspenseQueryResult<TData, TVariables> {
+    }
+    interface GraphQLSuspenseQueryHookOptions<TData, TVariables extends OperationVariables> extends SuspenseQueryHookOptions<TData, TVariables> {
+    }
+}
+export {};
+//# sourceMappingURL=typeOverride.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"typeOverride.d.ts","sourceRoot":"","sources":["../../src/apollo/typeOverride.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,gBAAgB,EAChB,WAAW,EACX,mBAAmB,EACnB,aAAa,EACb,kBAAkB,EAClB,uBAAuB,EACvB,kBAAkB,EAClB,sBAAsB,EACtB,wBAAwB,EACzB,MAAM,gBAAgB,CAAA;AAGvB,OAAO,CAAC,MAAM,CAAC;IAEb,UAAU,oBAAoB,CAC5B,KAAK,GAAG,GAAG,EACX,UAAU,SAAS,kBAAkB,GAAG,kBAAkB,CAC1D,SAAQ,WAAW,CAAC,KAAK,EAAE,UAAU,CAAC;KAAG;IAG3C,UAAU,uBAAuB,CAAC,KAAK,EAAE,UAAU,CAAE,SAAQ,aAAa,CACxE,KAAK,EACL,UAAU,CACX;KAAG;IAGJ,UAAU,2BAA2B,CACnC,KAAK,GAAG,GAAG,EACX,UAAU,SAAS,kBAAkB,GAAG,kBAAkB,CAC1D,SAAQ,kBAAkB,CAAC,KAAK,EAAE,UAAU,CAAC;KAAG;IAGlD,UAAU,uBAAuB,CAC/B,KAAK,EACL,UAAU,SAAS,kBAAkB,CACrC,SAAQ,gBAAgB,CAAC,KAAK,EAAE,UAAU,CAAC;KAAG;IAGhD,UAAU,0BAA0B,CAClC,KAAK,EACL,UAAU,CACV,SAAQ,mBAAmB,CAAC,KAAK,EAAE,UAAU,CAAC;KAAG;IAGnD,UAAU,8BAA8B,CACtC,KAAK,EACL,UAAU,SAAS,kBAAkB,CACrC,SAAQ,uBAAuB,CAAC,KAAK,EAAE,UAAU,CAAC;KAAG;IAGvD,UAAU,4BAA4B,CACpC,KAAK,GAAG,GAAG,EACX,UAAU,SAAS,kBAAkB,GAAG,kBAAkB,CAC1D,SAAQ,sBAAsB,CAAC,KAAK,EAAE,UAAU,CAAC;KAAG;IAGtD,UAAU,+BAA+B,CACvC,KAAK,EACL,UAAU,SAAS,kBAAkB,CACrC,SAAQ,wBAAwB,CAAC,KAAK,EAAE,UAAU,CAAC;KAAG;CACzD;AAED,OAAO,EAAE,CAAA"}