@cedarjs/web 7.0.0-canary.3259 → 7.0.0-rc.127

package/dist/apollo/suspense.js

@@ -1,17 +1,12 @@
 "use client";
 import React, { useContext } from "react";
-import {
-  ApolloLink,
-  setLogVerbosity as apolloSetLogVerbosity
-} from "@apollo/client";
-import { SetContextLink } from "@apollo/client/link/context";
+import { setLogVerbosity as apolloSetLogVerbosity } from "@apollo/client/core/index.js";
 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 {
@@ -19,7 +14,6 @@ import {
   useFetchConfig
 } from "../components/FetchConfigProvider.js";
 import { ServerHtmlContext } from "../components/ServerInject.js";
-import { ApolloClientFactoryContext } from "./ApolloClientFactoryContext.js";
 import { fragmentRegistry } from "./fragmentRegistry.js";
 import {
   createAuthApolloLink,
@@ -28,7 +22,6 @@ import {
   createTokenLink,
   createUpdateDataLink
 } from "./links.js";
-import { withParsedScalars } from "./parsedScalars.js";
 const WrappedApolloProvider = WrapApolloProvider(
   buildManualDataTransport({
     useInsertHtml() {
@@ -36,7 +29,7 @@ const WrappedApolloProvider = WrapApolloProvider(
     }
   })
 );
-const ApolloProviderWithFetchConfig = ({ config, createCache, children, logLevel, useAuth = useNoAuth }) => {
+const ApolloProviderWithFetchConfig = ({ config, children, logLevel, useAuth = useNoAuth }) => {
   apolloSetLogVerbosity(logLevel);
   const { uri, headers } = useFetchConfig();
   const { getToken, type: authProviderType } = useAuth();
@@ -73,24 +66,7 @@ const ApolloProviderWithFetchConfig = ({ config, createCache, children, logLevel
       ...otherConfig
     });
   }
-  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));
+  return /* @__PURE__ */ React.createElement(WrappedApolloProvider, { makeClient }, children);
 };
 const CedarApolloProvider = ({
   graphQLClientConfig,
@@ -99,18 +75,14 @@ const CedarApolloProvider = ({
   children
 }) => {
   const { cacheConfig, ...config } = graphQLClientConfig ?? {};
-  const createCache = () => {
-    return new InMemoryCache({
-      fragments: fragmentRegistry,
-      ...withParsedScalars(cacheConfig)
-    });
-  };
-  const cache = createCache().restore(globalThis?.__CEDAR__APOLLO_STATE ?? {});
+  const cache = new InMemoryCache({
+    fragments: fragmentRegistry,
+    ...cacheConfig
+  }).restore(globalThis?.__CEDAR__APOLLO_STATE ?? {});
   return /* @__PURE__ */ React.createElement(FetchConfigProvider, { useAuth }, /* @__PURE__ */ React.createElement(
     ApolloProviderWithFetchConfig,
     {
       config: { cache, ...config },
-      createCache,
       useAuth,
       logLevel
     },

package/dist/apollo/useCache.d.ts

@@ -1,14 +1,16 @@
-import type { ApolloClient, InMemoryCache, NormalizedCacheObject, Reference, StoreObject } from '@apollo/client';
+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';
 type useCacheType = {
-    cache: InMemoryCache;
+    cache: ApolloCache<object>;
     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<ApolloClient.QueryResult<any>[] | null>;
-    clearStore: () => Promise<ApolloClient.QueryResult<any>[] | null>;
+    resetStore: () => Promise<ApolloQueryResult<any>[] | null>;
+    clearStore: () => Promise<ApolloQueryResult<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,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"}
+{"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"}

package/dist/apollo/useCache.js

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

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

@@ -1,3 +1,3 @@
-import UploadHttpLink from 'apollo-upload-client/UploadHttpLink.mjs';
-export { UploadHttpLink };
+import createUploadLink from 'apollo-upload-client/createUploadLink.mjs';
+export { createUploadLink };
 //# 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,cAAc,MAAM,yCAAyC,CAAA;AAEpE,OAAO,EAAE,cAAc,EAAE,CAAA"}
+{"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"}