@cedarjs/web 9.0.0-canary.1784 → 9.0.0-canary.3124

package/dist/apollo/index.js

@@ -1,197 +1,17 @@
-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 { 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
-    },
-    /* @__PURE__ */ React.createElement(
-      GraphQLHooksProvider,
-      {
-        useQuery,
-        useMutation,
-        useSubscription,
-        useBackgroundQuery,
-        useReadQuery,
-        useSuspenseQuery
-      },
-      children
-    )
-  ));
-};
+import { useCreateApolloClient } from "./useCreateApolloClient.js";
+const RedwoodApolloProvider = CedarApolloProvider;
 export {
   RedwoodApolloProvider,
   fragmentRegistry,
   registerFragment,
   registerFragments,
-  useCache
+  useCache,
+  useCreateApolloClient
 };

package/dist/apollo/links.d.ts

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

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

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

package/dist/apollo/links.js

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

package/dist/apollo/sseLink.d.ts

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

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

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

package/dist/apollo/sseLink.js

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

package/dist/apollo/suspense.d.ts

@@ -1,12 +1,12 @@
 import React from 'react';
-import type { ApolloClientOptions, ApolloLink, HttpOptions, InMemoryCacheConfig, setLogVerbosity } from '@apollo/client';
+import type { ApolloClient as ApolloClientBase, HttpLink, InMemoryCacheConfig, setLogVerbosity } from '@apollo/client';
+import { ApolloLink } 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, };
-export type GraphQLClientConfigProp = Omit<ApolloClientOptions<unknown>, 'cache' | 'link'> & {
+export type GraphQLClientConfigProp = Omit<ApolloClientBase.Options, 'cache' | 'link'> & {
     cache?: InMemoryCache;
     /**
      * Configuration for Apollo Client's `InMemoryCache`.
@@ -20,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
-     * <RedwoodApolloProvider graphQLClientConfig={{
+     * <CedarApolloProvider graphQLClientConfig={{
      *   httpLinkConfig: { credentials: 'include' }
      * }}>
      * ```
      */
-    httpLinkConfig?: HttpOptions;
+    httpLinkConfig?: HttpLink.Options;
     /**
-     * Extend or overwrite `RedwoodApolloProvider`'s Apollo Link.
+     * Extend or overwrite `CedarApolloProvider`'s Apollo Link.
      *
-     * To overwrite Redwood's Apollo Link, just provide your own `ApolloLink`.
+     * To overwrite Cedar'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
+     * 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 = (redwoodApolloLinks) => {
+     * const link = (cedarApolloLinks) => {
      *   const consoleLink = new ApolloLink((operation, forward) => {
      *     console.log(operation.operationName)
      *     return forward(operation)
      *   })
      *
-     *   return ApolloLink.from([consoleLink, ...redwoodApolloLinks.map(({ link }) => link)])
+     *   return ApolloLink.from([consoleLink, ...cedarApolloLinks.map(({ link }) => link)])
      * }
      * ```
      *
@@ -51,6 +51,16 @@ 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;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"}
+{"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,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AAa5C,OAAO,KAAK,EACV,iBAAiB,EACjB,wBAAwB,EACxB,qBAAqB,EACrB,kBAAkB,EACnB,MAAM,YAAY,CAAA;AASnB,MAAM,MAAM,uBAAuB,GAAG,mBAAmB,CAAA;AAEzD,YAAY,EACV,iBAAiB,EACjB,wBAAwB,EACxB,qBAAqB,EACrB,kBAAkB,GACnB,CAAA;AAED,MAAM,MAAM,uBAAuB,GAAG,IAAI,CACxC,gBAAgB,CAAC,OAAO,EACxB,OAAO,GAAG,MAAM,CACjB,GAAG;IACF,KAAK,CAAC,EAAE,aAAa,CAAA;IACrB;;;OAGG;IACH,WAAW,CAAC,EAAE,uBAAuB,CAAA;IACrC;;;;;;;;;;;OAWG;IACH,cAAc,CAAC,EAAE,QAAQ,CAAC,OAAO,CAAA;IACjC;;;;;;;;;;;;;;;;;;;;;;OAsBG;IACH,IAAI,CAAC,EAAE,UAAU,GAAG,wBAAwB,CAAA;CAC7C,CAAA;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"}

package/dist/apollo/suspense.js

@@ -1,14 +1,10 @@
 "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";
+  ApolloLink,
+  setLogVerbosity as apolloSetLogVerbosity
+} from "@apollo/client";
+import { SetContextLink } from "@apollo/client/link/context";
 import {
   ApolloClient,
   InMemoryCache,
@@ -17,13 +13,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 { ApolloClientFactoryContext } from "./ApolloClientFactoryContext.js";
+import { fragmentRegistry } from "./fragmentRegistry.js";
 import {
   createAuthApolloLink,
   createFinalLink,
@@ -38,7 +34,7 @@ const WrappedApolloProvider = WrapApolloProvider(
     }
   })
 );
-const ApolloProviderWithFetchConfig = ({ config, children, logLevel, useAuth = useNoAuth }) => {
+const ApolloProviderWithFetchConfig = ({ config, createCache, children, logLevel, useAuth = useNoAuth }) => {
   apolloSetLogVerbosity(logLevel);
   const { uri, headers } = useFetchConfig();
   const { getToken, type: authProviderType } = useAuth();
@@ -75,39 +71,52 @@ const ApolloProviderWithFetchConfig = ({ config, children, logLevel, useAuth = u
       ...otherConfig
     });
   }
-  return /* @__PURE__ */ React.createElement(WrappedApolloProvider, { makeClient }, children);
+  const createApolloClient = (options) => {
+    const extraHeaders = options?.headers;
+    const withExtraHeaders = new SetContextLink((prevContext) => ({
+      headers: { ...prevContext.headers, ...extraHeaders }
+    }));
+    return new ApolloClient({
+      ...otherConfig,
+      cache: createCache(),
+      link: ApolloLink.from([
+        withExtraHeaders,
+        createFinalLink({
+          userConfiguredLink: userPassedLink,
+          defaultLinks: redwoodApolloLinks
+        })
+      ])
+    });
+  };
+  return /* @__PURE__ */ React.createElement(ApolloClientFactoryContext.Provider, { value: createApolloClient }, /* @__PURE__ */ React.createElement(WrappedApolloProvider, { makeClient }, children));
 };
-const RedwoodApolloProvider = ({
+const CedarApolloProvider = ({
   graphQLClientConfig,
   useAuth = useNoAuth,
   logLevel = "debug",
   children
 }) => {
   const { cacheConfig, ...config } = graphQLClientConfig ?? {};
-  const cache = new InMemoryCache(cacheConfig).restore(
-    globalThis?.__REDWOOD__APOLLO_STATE ?? {}
-  );
+  const createCache = () => {
+    return new InMemoryCache({
+      fragments: fragmentRegistry,
+      ...cacheConfig
+    });
+  };
+  const cache = createCache().restore(globalThis?.__CEDAR__APOLLO_STATE ?? {});
   return /* @__PURE__ */ React.createElement(FetchConfigProvider, { useAuth }, /* @__PURE__ */ React.createElement(
     ApolloProviderWithFetchConfig,
     {
       config: { cache, ...config },
+      createCache,
       useAuth,
       logLevel
     },
-    /* @__PURE__ */ React.createElement(
-      GraphQLHooksProvider,
-      {
-        useQuery,
-        useMutation,
-        useSubscription,
-        useSuspenseQuery,
-        useBackgroundQuery,
-        useReadQuery
-      },
-      children
-    )
+    children
   ));
 };
+const RedwoodApolloProvider = CedarApolloProvider;
 export {
+  CedarApolloProvider,
   RedwoodApolloProvider
 };

package/dist/apollo/useCache.d.ts

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

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

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

package/dist/apollo/useCache.js

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

package/dist/apollo/useCreateApolloClient.d.ts

@@ -0,0 +1,11 @@
+import type { CreateApolloClient } from './ApolloClientFactoryContext.js';
+/**
+ * Returns a factory that builds a new `ApolloClient` sharing
+ * `CedarApolloProvider`'s link chain, auth headers and `defaultOptions`, but
+ * with its own fresh `InMemoryCache` and, when given, extra headers merged
+ * into every operation.
+ *
+ * Must be called from a component rendered under `CedarApolloProvider`.
+ */
+export declare function useCreateApolloClient(): CreateApolloClient;
+//# sourceMappingURL=useCreateApolloClient.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"useCreateApolloClient.d.ts","sourceRoot":"","sources":["../../src/apollo/useCreateApolloClient.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,iCAAiC,CAAA;AAGzE;;;;;;;GAOG;AACH,wBAAgB,qBAAqB,IAAI,kBAAkB,CAU1D"}

package/dist/apollo/useCreateApolloClient.js

@@ -0,0 +1,14 @@
+import React from "react";
+import { ApolloClientFactoryContext } from "./ApolloClientFactoryContext.js";
+function useCreateApolloClient() {
+  const createClient = React.useContext(ApolloClientFactoryContext);
+  if (!createClient) {
+    throw new Error(
+      "useCreateApolloClient must be used within a CedarApolloProvider"
+    );
+  }
+  return createClient;
+}
+export {
+  useCreateApolloClient
+};

package/dist/bins/cedar.js

@@ -0,0 +1,14 @@
+#!/usr/bin/env node
+import { createRequire } from "node:module";
+import { pathToFileURL } from "node:url";
+const require2 = createRequire(import.meta.url);
+const cliPackageJsonFileUrl = pathToFileURL(
+  require2.resolve("@cedarjs/cli/package.json")
+);
+const requireFromCli = createRequire(cliPackageJsonFileUrl);
+const bins = requireFromCli("./package.json")["bin"];
+const cliEntryPointUrl = new URL(bins["cedar"], cliPackageJsonFileUrl);
+if (process.env.PROJECT_CWD) {
+  process.chdir(process.env.PROJECT_CWD);
+}
+import(cliEntryPointUrl.toString());

package/dist/bins/cfw.js

@@ -0,0 +1,14 @@
+#!/usr/bin/env node
+import { createRequire } from "node:module";
+import { pathToFileURL } from "node:url";
+const require2 = createRequire(import.meta.url);
+const cliPackageJsonFileUrl = pathToFileURL(
+  require2.resolve("@cedarjs/cli/package.json")
+);
+const requireFromCli = createRequire(cliPackageJsonFileUrl);
+const bins = requireFromCli("./package.json")["bin"];
+const cliEntryPointUrl = new URL(bins["cfw"], cliPackageJsonFileUrl);
+if (process.env.PROJECT_CWD) {
+  process.chdir(process.env.PROJECT_CWD);
+}
+import(cliEntryPointUrl.toString());

package/dist/bins/cross-env.js

@@ -0,0 +1,8 @@
+#!/usr/bin/env node
+import { createRequire } from "module";
+const require2 = createRequire(import.meta.url);
+const requireFromCrossEnv = createRequire(
+  require2.resolve("cross-env/package.json")
+);
+const bins = requireFromCrossEnv("./package.json")["bin"];
+requireFromCrossEnv(`./${bins["cross-env"]}`);

package/dist/bins/msw.js

@@ -0,0 +1,6 @@
+#!/usr/bin/env node
+import { createRequire } from "module";
+const require2 = createRequire(import.meta.url);
+const requireFromMSW = createRequire(require2.resolve("msw/package.json"));
+const bins = requireFromMSW("./package.json")["bin"];
+requireFromMSW(`./${bins["msw"]}`);