@cedarjs/web 6.0.2 → 6.0.3-next.275

package/dist/apollo/suspense.d.ts

@@ -1,11 +1,13 @@
 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 './typeOverrides.js';
 import type { UseAuth } from '@cedarjs/auth';
 import type { RedwoodApolloLink, RedwoodApolloLinkFactory, RedwoodApolloLinkName, RedwoodApolloLinks } from './links.js';
 export type ApolloClientCacheConfig = InMemoryCacheConfig;
 export type { RedwoodApolloLink, RedwoodApolloLinkFactory, RedwoodApolloLinkName, RedwoodApolloLinks, };
-export type GraphQLClientConfigProp = Omit<ApolloClientOptions<unknown>, 'cache' | 'link'> & {
+export type GraphQLClientConfigProp = Omit<ApolloClientBase.Options, 'cache' | 'link'> & {
     cache?: InMemoryCache;
     /**
      * Configuration for Apollo Client's `InMemoryCache`.
@@ -24,7 +26,7 @@ export type GraphQLClientConfigProp = Omit<ApolloClientOptions<unknown>, 'cache'
      * }}>
      * ```
      */
-    httpLinkConfig?: HttpOptions;
+    httpLinkConfig?: HttpLink.Options;
     /**
      * Extend or overwrite `CedarApolloProvider`'s Apollo Link.
      *

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

@@ -1 +1 @@
-{"version":3,"file":"suspense.d.ts","sourceRoot":"","sources":["../../src/apollo/suspense.tsx"],"names":[],"mappings":"AAYA,OAAO,KAAqB,MAAM,OAAO,CAAA;AAEzC,OAAO,KAAK,EACV,mBAAmB,EACnB,UAAU,EACV,WAAW,EACX,mBAAmB,EACnB,eAAe,EAChB,MAAM,gBAAgB,CAAA;AAEvB,OAAO,EAEL,aAAa,EAEd,MAAM,gCAAgC,CAAA;AAGvC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AAW5C,OAAO,KAAK,EACV,iBAAiB,EACjB,wBAAwB,EACxB,qBAAqB,EACrB,kBAAkB,EACnB,MAAM,YAAY,CAAA;AASnB,MAAM,MAAM,uBAAuB,GAAG,mBAAmB,CAAA;AAEzD,YAAY,EACV,iBAAiB,EACjB,wBAAwB,EACxB,qBAAqB,EACrB,kBAAkB,GACnB,CAAA;AAED,MAAM,MAAM,uBAAuB,GAAG,IAAI,CACxC,mBAAmB,CAAC,OAAO,CAAC,EAC5B,OAAO,GAAG,MAAM,CACjB,GAAG;IACF,KAAK,CAAC,EAAE,aAAa,CAAA;IACrB;;;OAGG;IACH,WAAW,CAAC,EAAE,uBAAuB,CAAA;IACrC;;;;;;;;;;;OAWG;IACH,cAAc,CAAC,EAAE,WAAW,CAAA;IAC5B;;;;;;;;;;;;;;;;;;;;;;OAsBG;IACH,IAAI,CAAC,EAAE,UAAU,GAAG,wBAAwB,CAAA;CAC7C,CAAA;AAkFD,eAAO,MAAM,mBAAmB,EAAE,KAAK,CAAC,iBAAiB,CAAC;IACxD,mBAAmB,CAAC,EAAE,uBAAuB,CAAA;IAC7C,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,QAAQ,CAAC,EAAE,UAAU,CAAC,OAAO,eAAe,CAAC,CAAA;IAC7C,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAA;CAC1B,CA4BA,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,qBAAqB;0BAtCV,uBAAuB;cACnC,OAAO;eACN,UAAU,CAAC,OAAO,eAAe,CAAC;cACnC,KAAK,CAAC,SAAS;EAmC6B,CAAA"}
+{"version":3,"file":"suspense.d.ts","sourceRoot":"","sources":["../../src/apollo/suspense.tsx"],"names":[],"mappings":"AAYA,OAAO,KAAqB,MAAM,OAAO,CAAA;AAEzC,OAAO,KAAK,EACV,YAAY,IAAI,gBAAgB,EAChC,QAAQ,EACR,mBAAmB,EACnB,eAAe,EAChB,MAAM,gBAAgB,CAAA;AACvB,OAAO,EACL,UAAU,EAEX,MAAM,gBAAgB,CAAA;AAEvB,OAAO,EAEL,aAAa,EAEd,MAAM,gCAAgC,CAAA;AAGvC,OAAO,oBAAoB,CAAA;AAE3B,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AAa5C,OAAO,KAAK,EACV,iBAAiB,EACjB,wBAAwB,EACxB,qBAAqB,EACrB,kBAAkB,EACnB,MAAM,YAAY,CAAA;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,12 +1,17 @@
 "use client";
 import React, { useContext } from "react";
-import { setLogVerbosity as apolloSetLogVerbosity } from "@apollo/client/core/index.js";
+import {
+  ApolloLink,
+  setLogVerbosity as apolloSetLogVerbosity
+} from "@apollo/client";
+import { SetContextLink } from "@apollo/client/link/context";
 import {
   ApolloClient,
   InMemoryCache,
   WrapApolloProvider
 } from "@apollo/client-react-streaming";
 import { buildManualDataTransport } from "@apollo/client-react-streaming/manual-transport";
+import "./typeOverrides.js";
 import { useNoAuth } from "@cedarjs/auth";
 import { ServerAuthContext } from "@cedarjs/auth/dist/AuthProvider/ServerAuthProvider.js";
 import {
@@ -14,6 +19,7 @@ import {
   useFetchConfig
 } from "../components/FetchConfigProvider.js";
 import { ServerHtmlContext } from "../components/ServerInject.js";
+import { ApolloClientFactoryContext } from "./ApolloClientFactoryContext.js";
 import { fragmentRegistry } from "./fragmentRegistry.js";
 import {
   createAuthApolloLink,
@@ -29,7 +35,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();
@@ -66,7 +72,24 @@ 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 CedarApolloProvider = ({
   graphQLClientConfig,
@@ -75,14 +98,18 @@ const CedarApolloProvider = ({
   children
 }) => {
   const { cacheConfig, ...config } = graphQLClientConfig ?? {};
-  const cache = new InMemoryCache({
-    fragments: fragmentRegistry,
-    ...cacheConfig
-  }).restore(globalThis?.__CEDAR__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
     },

package/dist/apollo/typeOverrides.d.ts

@@ -0,0 +1,8 @@
+import type { InMemoryCache } from '@apollo/client';
+declare module '@apollo/client' {
+    interface TypeOverrides {
+        cache: InMemoryCache;
+    }
+}
+export {};
+//# sourceMappingURL=typeOverrides.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"typeOverrides.d.ts","sourceRoot":"","sources":["../../src/apollo/typeOverrides.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAA;AAanD,OAAO,QAAQ,gBAAgB,CAAC;IAC9B,UAAU,aAAa;QACrB,KAAK,EAAE,aAAa,CAAA;KACrB;CACF;AAED,OAAO,EAAE,CAAA"}

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 { ApolloClient, InMemoryCache, NormalizedCacheObject, Reference, StoreObject } from '@apollo/client';
 type useCacheType = {
-    cache: ApolloCache<object>;
+    cache: InMemoryCache;
     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,YAAY,EACZ,aAAa,EACb,qBAAqB,EACrB,SAAS,EACT,WAAW,EACZ,MAAM,gBAAgB,CAAA;AAGvB,KAAK,YAAY,GAAG;IAClB,KAAK,EAAE,aAAa,CAAA;IACpB,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/bundled/apollo-upload-client.d.ts

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

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

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