@cedarjs/web 5.0.6 → 5.0.7-next.186

package/dist/apollo/index.js

@@ -1,193 +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 {
-  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
-    )
-  ));
-};
+const RedwoodApolloProvider = CedarApolloProvider;
 export {
   RedwoodApolloProvider,
   fragmentRegistry,

package/dist/apollo/suspense.d.ts

@@ -2,7 +2,6 @@ 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, };
@@ -20,28 +19,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;
     /**
-     * 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 +50,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,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"}

package/dist/apollo/suspense.js

@@ -1,14 +1,6 @@
 "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,
@@ -17,13 +9,12 @@ 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,
@@ -77,16 +68,17 @@ const ApolloProviderWithFetchConfig = ({ config, children, logLevel, useAuth = u
   }
   return /* @__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 cache = new InMemoryCache({
+    fragments: fragmentRegistry,
+    ...cacheConfig
+  }).restore(globalThis?.__CEDAR__APOLLO_STATE ?? {});
   return /* @__PURE__ */ React.createElement(FetchConfigProvider, { useAuth }, /* @__PURE__ */ React.createElement(
     ApolloProviderWithFetchConfig,
     {
@@ -94,20 +86,11 @@ const RedwoodApolloProvider = ({
       useAuth,
       logLevel
     },
-    /* @__PURE__ */ React.createElement(
-      GraphQLHooksProvider,
-      {
-        useQuery,
-        useMutation,
-        useSubscription,
-        useSuspenseQuery,
-        useBackgroundQuery,
-        useReadQuery
-      },
-      children
-    )
+    children
   ));
 };
+const RedwoodApolloProvider = CedarApolloProvider;
 export {
+  CedarApolloProvider,
   RedwoodApolloProvider
 };

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"]}`);

package/dist/bins/redwood.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["redwood"], cliPackageJsonFileUrl);
+if (process.env.PROJECT_CWD) {
+  process.chdir(process.env.PROJECT_CWD);
+}
+import(cliEntryPointUrl.toString());

package/dist/bins/storybook.js

@@ -0,0 +1,27 @@
+#!/usr/bin/env node
+import { createRequire } from "node:module";
+import { pathToFileURL } from "node:url";
+const require2 = createRequire(import.meta.url);
+function isErrorWithCode(error) {
+  return !!error && typeof error === "object" && "code" in error && typeof error.code === "string";
+}
+const pkgJsonPath = require2.resolve("storybook/package.json");
+const storybookPackageJsonFileUrl = pathToFileURL(pkgJsonPath);
+try {
+  const requireFromStorybook = createRequire(storybookPackageJsonFileUrl);
+  const bins = requireFromStorybook("./package.json")["bin"];
+  const sbEntryPointUrl = new URL(
+    bins["storybook"],
+    storybookPackageJsonFileUrl
+  );
+  if (process.env.PROJECT_CWD) {
+    process.chdir(process.env.PROJECT_CWD);
+  }
+  import(sbEntryPointUrl.toString());
+} catch (error) {
+  if (isErrorWithCode(error) && error.code === "MODULE_NOT_FOUND") {
+    console.error("Storybook is not currently installed.");
+    process.exit(1);
+  }
+  throw error;
+}

package/dist/bins/tsc.js

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