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

package/dist/apollo/ApolloProviderWithFetchConfig.d.ts

@@ -0,0 +1,15 @@
+import React from 'react';
+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: ApolloCache<unknown>;
+    };
+    useAuth?: UseAuth;
+    logLevel: ReturnType<typeof setLogVerbosity>;
+    children: React.ReactNode;
+}
+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

@@ -0,0 +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"}

package/dist/apollo/ApolloProviderWithFetchConfig.js

@@ -0,0 +1,134 @@
+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";
+import { print } from "graphql/language/printer.js";
+import { useNoAuth } from "@cedarjs/auth";
+import { createUploadLink } from "../bundled/apollo-upload-client.js";
+import { useFetchConfig } from "../components/FetchConfigProvider.js";
+import { ErrorBoundary } from "./ErrorBoundary.js";
+import * as SSELinkExports from "./sseLink.js";
+const { SSELink, isSubscription, isLiveQuery } = SSELinkExports;
+function 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: cedarApolloLink, ...rest } = config ?? {};
+  const uploadLink = createUploadLink({
+    uri,
+    ...httpLinkConfig
+  });
+  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 cedarApolloLinks = [
+    { name: "withToken", link: withToken },
+    { name: "authMiddleware", link: authMiddleware },
+    { name: "updateDataApolloLink", link: updateDataApolloLink },
+    { name: "httpLink", link: terminatingLink }
+  ];
+  let link = cedarApolloLink;
+  link ??= ApolloLink.from(cedarApolloLinks.map((l) => l.link));
+  if (typeof link === "function") {
+    link = link(cedarApolloLinks);
+  }
+  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));
+}
+export {
+  ApolloProviderWithFetchConfig
+};

package/dist/apollo/CedarApolloProvider.d.ts

@@ -0,0 +1,14 @@
+import React from 'react';
+import type { DocumentNode, setLogVerbosity } from '@apollo/client';
+import type { UseAuth } from '@cedarjs/auth';
+import type { GraphQLClientConfigProp } from './apolloLinkTypes.js';
+export type { ApolloClientCacheConfig, CedarApolloLink, CedarApolloLinkFactory, CedarApolloLinkName, CedarApolloLinks, GraphQLClientConfigProp, } from './apolloLinkTypes.js';
+interface Props {
+    graphQLClientConfig?: GraphQLClientConfigProp;
+    fragments?: DocumentNode[];
+    useAuth?: UseAuth;
+    logLevel?: ReturnType<typeof setLogVerbosity>;
+    children: React.ReactNode;
+}
+export declare function CedarApolloProvider({ graphQLClientConfig, fragments, useAuth, logLevel, children, }: Props): React.JSX.Element;
+//# sourceMappingURL=CedarApolloProvider.d.ts.map

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

@@ -0,0 +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,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

@@ -0,0 +1,35 @@
+import React from "react";
+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";
+function CedarApolloProvider({
+  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?.__CEDAR__APOLLO_STATE ?? {});
+  return /* @__PURE__ */ React.createElement(FetchConfigProvider, { useAuth }, /* @__PURE__ */ React.createElement(
+    ApolloProviderWithFetchConfig,
+    {
+      config: { cache, ...config },
+      useAuth,
+      logLevel
+    },
+    children
+  ));
+}
+export {
+  CedarApolloProvider
+};

package/dist/apollo/ErrorBoundary.d.ts

@@ -0,0 +1,13 @@
+import React from 'react';
+type ComponentDidCatch = React.ComponentLifecycle<any, any>['componentDidCatch'];
+interface ErrorBoundaryProps {
+    error?: unknown;
+    onError: NonNullable<ComponentDidCatch>;
+    children: React.ReactNode;
+}
+export declare class ErrorBoundary extends React.Component<ErrorBoundaryProps> {
+    componentDidCatch(...args: Parameters<NonNullable<ComponentDidCatch>>): void;
+    render(): React.ReactNode;
+}
+export {};
+//# sourceMappingURL=ErrorBoundary.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"ErrorBoundary.d.ts","sourceRoot":"","sources":["../../src/apollo/ErrorBoundary.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,KAAK,iBAAiB,GAAG,KAAK,CAAC,kBAAkB,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,mBAAmB,CAAC,CAAA;AAEhF,UAAU,kBAAkB;IAC1B,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,OAAO,EAAE,WAAW,CAAC,iBAAiB,CAAC,CAAA;IACvC,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAA;CAC1B;AAED,qBAAa,aAAc,SAAQ,KAAK,CAAC,SAAS,CAAC,kBAAkB,CAAC;IACpE,iBAAiB,CAAC,GAAG,IAAI,EAAE,UAAU,CAAC,WAAW,CAAC,iBAAiB,CAAC,CAAC;IAKrE,MAAM;CAGP"}

package/dist/apollo/ErrorBoundary.js

@@ -0,0 +1,13 @@
+import React from "react";
+class ErrorBoundary extends React.Component {
+  componentDidCatch(...args) {
+    this.setState({});
+    this.props.onError(...args);
+  }
+  render() {
+    return this.props.children;
+  }
+}
+export {
+  ErrorBoundary
+};

package/dist/apollo/apolloLinkTypes.d.ts

@@ -0,0 +1,60 @@
+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> = {
+    name: Name;
+    link: Link;
+};
+export type CedarApolloLinks = [
+    CedarApolloLink<'withToken'>,
+    CedarApolloLink<'authMiddleware'>,
+    CedarApolloLink<'updateDataApolloLink'>,
+    CedarApolloLink<'httpLink', ApolloLink | HttpLink>
+];
+export type CedarApolloLinkFactory = (links: CedarApolloLinks) => 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
+     * <CedarApolloProvider graphQLClientConfig={{
+     *   httpLinkConfig: { credentials: 'include' }
+     * }}>
+     * ```
+     */
+    httpLinkConfig?: HttpOptions;
+    /**
+     * Extend or overwrite `CedarApolloProvider`'s Apollo Link.
+     *
+     * To overwrite Cedar'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
+     * which are objects with a name and link property:
+     *
+     * ```js
+     * const link = (cedarApolloLinks) => {
+     *   const consoleLink = new ApolloLink((operation, forward) => {
+     *     console.log(operation.operationName)
+     *     return forward(operation)
+     *   })
+     *
+     *   return ApolloLink.from([consoleLink, ...cedarApolloLinks.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 | CedarApolloLinkFactory;
+};
+//# sourceMappingURL=apolloLinkTypes.d.ts.map

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

@@ -0,0 +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"}

package/dist/apollo/index.d.ts

@@ -1,75 +1,56 @@
-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 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 { 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 };
-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;
-}>;
+/**
+ * @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;
 //# 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.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;AAMrE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AAS5C,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,CAkCA,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

@@ -1,172 +1,11 @@
-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 { 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 { createUploadLink } from "../bundled/apollo-upload-client.js";
-import {
-  FetchConfigProvider,
-  useFetchConfig
-} from "../components/FetchConfigProvider.js";
+import { CedarApolloProvider } from "./CedarApolloProvider.js";
 import {
   fragmentRegistry,
   registerFragment,
   registerFragments
 } from "./fragmentRegistry.js";
-import * as SSELinkExports from "./sseLink.js";
 import { useCache } from "./useCache.js";
-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
-    },
-    children
-  ));
-};
+const RedwoodApolloProvider = CedarApolloProvider;
 export {
   RedwoodApolloProvider,
   fragmentRegistry,