@cedarjs/web 6.0.0 → 7.0.0-canary.2982

package/dist/components/cell/createSuspendingCell.js

@@ -1,14 +1,19 @@
 import React, { Suspense } from "react";
+import { CombinedGraphQLErrors } from "@apollo/client";
 import {
   useApolloClient,
   useBackgroundQuery,
   useReadQuery
-} from "@apollo/client/react/hooks/hooks.cjs";
+} from "@apollo/client/react";
 import { CellErrorBoundary } from "./CellErrorBoundary.js";
 import { isDataEmpty } from "./isCellEmpty.js";
 function createSuspendingCell(createCellProps) {
   const {
     QUERY,
+    // Unlike in createCell this is destructured from a variable rather than
+    // from an annotated parameter, so the default's return type has to be
+    // spelled out. Without it the inferred object literal type widens the
+    // union and options like `skip` are no longer visible on it
     beforeQuery = (props) => ({
       // By default, we assume that the props are the gql-variables.
       variables: props,
@@ -44,31 +49,36 @@ function createSuspendingCell(createCellProps) {
       networkStatus
     };
     if (isEmpty(data, { isDataEmpty }) && Empty) {
-      return /* @__PURE__ */ React.createElement(
-        Empty,
-        {
-          ...userProps,
-          ...afterQueryData,
-          queryResult: queryResultWithNetworkStatus
-        }
-      );
-    }
-    return /* @__PURE__ */ React.createElement(
-      Success,
-      {
-        ...afterQueryData,
+      const emptyProps = {
         ...userProps,
+        ...afterQueryData,
         queryResult: queryResultWithNetworkStatus
-      }
-    );
+      };
+      return /* @__PURE__ */ React.createElement(Empty, { ...emptyProps });
+    }
+    const successProps = {
+      ...afterQueryData,
+      ...userProps,
+      queryResult: queryResultWithNetworkStatus
+    };
+    return /* @__PURE__ */ React.createElement(Success, { ...successProps });
   }
   SuspendingSuccess.displayName = displayName;
   return (props) => {
     const { children: _, ...variables } = props;
     const options = beforeQuery(variables);
-    const query = typeof cellQuery === "function" ? cellQuery(options) : cellQuery;
-    const [queryRef, other] = useBackgroundQuery(query, options);
+    const queryOptions = typeof options === "symbol" ? void 0 : options;
+    const skipped = !queryOptions || queryOptions.skip === true;
+    const query = typeof cellQuery === "function" ? cellQuery(queryOptions ?? {}) : cellQuery;
+    const backgroundQueryOptions = options;
+    const [queryRef, other] = useBackgroundQuery(
+      query,
+      backgroundQueryOptions
+    );
     const client = useApolloClient();
+    if (skipped || !queryRef) {
+      return null;
+    }
     const suspenseQueryResult = {
       client,
       ...other,
@@ -77,7 +87,7 @@ function createSuspendingCell(createCellProps) {
     const FailureComponent = ({ error, resetErrorBoundary }) => {
       if (!Failure) {
         if (error) {
-          throw error;
+          throw error instanceof Error ? error : new Error(error.message);
         }
         throw new Error("Unreachable code: FailureComponent without a Failure");
       }
@@ -88,26 +98,19 @@ function createSuspendingCell(createCellProps) {
           return suspenseQueryResult.refetch?.(variables2);
         }
       };
-      return /* @__PURE__ */ React.createElement(
-        Failure,
-        {
-          error,
-          errorCode: error?.graphQLErrors?.[0]?.extensions?.["code"],
-          queryResult: queryResultWithErrorReset
-        }
-      );
+      const failureProps = {
+        error,
+        errorCode: CombinedGraphQLErrors.is(error) ? error.errors[0]?.extensions?.["code"] : void 0,
+        queryResult: queryResultWithErrorReset
+      };
+      return /* @__PURE__ */ React.createElement(Failure, { ...failureProps });
     };
     const wrapInSuspenseIfLoadingPresent = (suspendingSuccessElement, LoadingComponent) => {
       if (!LoadingComponent) {
         return suspendingSuccessElement;
       }
-      return /* @__PURE__ */ React.createElement(
-        Suspense,
-        {
-          fallback: /* @__PURE__ */ React.createElement(LoadingComponent, { ...props, queryResult: suspenseQueryResult })
-        },
-        suspendingSuccessElement
-      );
+      const loadingProps = { ...props, queryResult: suspenseQueryResult };
+      return /* @__PURE__ */ React.createElement(Suspense, { fallback: /* @__PURE__ */ React.createElement(LoadingComponent, { ...loadingProps }) }, suspendingSuccessElement);
     };
     return /* @__PURE__ */ React.createElement(CellErrorBoundary, { renderFallback: FailureComponent }, wrapInSuspenseIfLoadingPresent(
       /* @__PURE__ */ React.createElement(

package/dist/index.d.ts

@@ -2,13 +2,13 @@ import './global.web-auto-imports.js';
 import './config.js';
 export { FatalErrorBoundary } from './components/FatalErrorBoundary.js';
 export { FetchConfigProvider, useFetchConfig, } from './components/FetchConfigProvider.js';
-export { useQuery, useMutation, useSubscription, } from '@apollo/client/react/hooks/hooks.cjs';
+export { useQuery, useMutation, useSubscription } from '@apollo/client/react';
 export { useFragment } from './apollo/fragmentRegistry.js';
 export type { FragmentHookOptions, FragmentHookResult, } from './apollo/fragmentRegistry.js';
 export * from './components/cell/CellCacheContext.js';
 export { createCell } from './components/cell/createCell.js';
 export { createFragmentCell } from './components/cell/createFragmentCell.js';
-export type { CellProps, CellFailureProps, CellLoadingProps, CellSuccessProps, CellSuccessData, } from './components/cell/cellTypes.js';
+export type { CellProps, CellFailureProps, CellLoadingProps, CellSuccessProps, CellSuccessData, CellBeforeQueryOptions, CellBeforeQueryResult, DataObject, } from './components/cell/cellTypes.js';
 export * from './graphql.js';
 export * from './components/CedarProvider.js';
 export * from './components/MetaTags.js';

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,8BAA8B,CAAA;AACrC,OAAO,aAAa,CAAA;AAEpB,OAAO,EAAE,kBAAkB,EAAE,MAAM,oCAAoC,CAAA;AAEvE,OAAO,EACL,mBAAmB,EACnB,cAAc,GACf,MAAM,qCAAqC,CAAA;AAC5C,OAAO,EACL,QAAQ,EACR,WAAW,EACX,eAAe,GAChB,MAAM,sCAAsC,CAAA;AAC7C,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAA;AAC1D,YAAY,EACV,mBAAmB,EACnB,kBAAkB,GACnB,MAAM,8BAA8B,CAAA;AAErC,cAAc,uCAAuC,CAAA;AAErD,OAAO,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAA;AAC5D,OAAO,EAAE,kBAAkB,EAAE,MAAM,yCAAyC,CAAA;AAE5E,YAAY,EACV,SAAS,EACT,gBAAgB,EAChB,gBAAgB,EAChB,gBAAgB,EAChB,eAAe,GAChB,MAAM,gCAAgC,CAAA;AAEvC,cAAc,cAAc,CAAA;AAE5B,cAAc,+BAA+B,CAAA;AAE7C,cAAc,0BAA0B,CAAA;AACxC,cAAc,0BAA0B,CAAA;AACxC,OAAO,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAA;AACjD,OAAO,EAAE,MAAM,IAAI,IAAI,EAAE,MAAM,EAAE,CAAA;AAEjC,cAAc,0BAA0B,CAAA;AACxC,cAAc,uBAAuB,CAAA;AAErC,cAAc,8BAA8B,CAAA;AAE5C,YAAY,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,8BAA8B,CAAA;AACrC,OAAO,aAAa,CAAA;AAEpB,OAAO,EAAE,kBAAkB,EAAE,MAAM,oCAAoC,CAAA;AAEvE,OAAO,EACL,mBAAmB,EACnB,cAAc,GACf,MAAM,qCAAqC,CAAA;AAC5C,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAC7E,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAA;AAC1D,YAAY,EACV,mBAAmB,EACnB,kBAAkB,GACnB,MAAM,8BAA8B,CAAA;AAErC,cAAc,uCAAuC,CAAA;AAErD,OAAO,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAA;AAC5D,OAAO,EAAE,kBAAkB,EAAE,MAAM,yCAAyC,CAAA;AAE5E,YAAY,EACV,SAAS,EACT,gBAAgB,EAChB,gBAAgB,EAChB,gBAAgB,EAChB,eAAe,EACf,sBAAsB,EACtB,qBAAqB,EACrB,UAAU,GACX,MAAM,gCAAgC,CAAA;AAEvC,cAAc,cAAc,CAAA;AAE5B,cAAc,+BAA+B,CAAA;AAE7C,cAAc,0BAA0B,CAAA;AACxC,cAAc,0BAA0B,CAAA;AACxC,OAAO,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAA;AACjD,OAAO,EAAE,MAAM,IAAI,IAAI,EAAE,MAAM,EAAE,CAAA;AAEjC,cAAc,0BAA0B,CAAA;AACxC,cAAc,uBAAuB,CAAA;AAErC,cAAc,8BAA8B,CAAA;AAE5C,YAAY,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAA"}

package/dist/index.js

@@ -5,11 +5,7 @@ import {
   FetchConfigProvider,
   useFetchConfig
 } from "./components/FetchConfigProvider.js";
-import {
-  useQuery,
-  useMutation,
-  useSubscription
-} from "@apollo/client/react/hooks/hooks.cjs";
+import { useQuery, useMutation, useSubscription } from "@apollo/client/react";
 import { useFragment } from "./apollo/fragmentRegistry.js";
 export * from "./components/cell/CellCacheContext.js";
 import { createCell } from "./components/cell/createCell.js";

package/dist/server/middleware.d.ts

@@ -8,7 +8,7 @@ export type MiddlewareInvokeOptions = {
     route?: RWRouteManifestItem;
     cssPaths?: string[];
     params?: Record<string, unknown>;
-    viteDevServer?: ViteDevServer;
+    viteSsrDevServer?: ViteDevServer;
 };
 export type Middleware = (req: MiddlewareRequest, res: MiddlewareResponse, options?: MiddlewareInvokeOptions) => Promise<MiddlewareResponse> | MiddlewareResponse | void;
 export interface MiddlewareClass {

package/dist/server/middleware.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"middleware.d.ts","sourceRoot":"","sources":["../../src/server/middleware.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,MAAM,CAAA;AAIzC,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAA;AAE3E,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAA;AAC/D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAA;AAEjE,cAAc,wBAAwB,CAAA;AACtC,cAAc,yBAAyB,CAAA;AAEvC,MAAM,MAAM,uBAAuB,GAAG;IACpC,KAAK,CAAC,EAAE,mBAAmB,CAAA;IAC3B,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAA;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAChC,aAAa,CAAC,EAAE,aAAa,CAAA;CAC9B,CAAA;AAED,MAAM,MAAM,UAAU,GAAG,CACvB,GAAG,EAAE,iBAAiB,EACtB,GAAG,EAAE,kBAAkB,EACvB,OAAO,CAAC,EAAE,uBAAuB,KAC9B,OAAO,CAAC,kBAAkB,CAAC,GAAG,kBAAkB,GAAG,IAAI,CAAA;AAE5D,MAAM,WAAW,eAAe;IAC9B,MAAM,EAAE,UAAU,CAAA;CACnB"}
+{"version":3,"file":"middleware.d.ts","sourceRoot":"","sources":["../../src/server/middleware.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,MAAM,CAAA;AAIzC,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAA;AAE3E,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAA;AAC/D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAA;AAEjE,cAAc,wBAAwB,CAAA;AACtC,cAAc,yBAAyB,CAAA;AAEvC,MAAM,MAAM,uBAAuB,GAAG;IACpC,KAAK,CAAC,EAAE,mBAAmB,CAAA;IAC3B,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAA;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAChC,gBAAgB,CAAC,EAAE,aAAa,CAAA;CACjC,CAAA;AAED,MAAM,MAAM,UAAU,GAAG,CACvB,GAAG,EAAE,iBAAiB,EACtB,GAAG,EAAE,kBAAkB,EACvB,OAAO,CAAC,EAAE,uBAAuB,KAC9B,OAAO,CAAC,kBAAkB,CAAC,GAAG,kBAAkB,GAAG,IAAI,CAAA;AAE5D,MAAM,WAAW,eAAe;IAC9B,MAAM,EAAE,UAAU,CAAA;CACnB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/web",
-  "version": "6.0.0",
+  "version": "7.0.0-canary.2982",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/cedarjs/cedar.git",
@@ -80,49 +80,50 @@
     "test:watch": "vitest watch"
   },
   "dependencies": {
-    "@apollo/client": "3.14.1",
-    "@cedarjs/server-store": "6.0.0",
+    "@apollo/client": "4.2.7",
+    "@cedarjs/server-store": "7.0.0-canary.2982",
     "@dr.pogodin/react-helmet": "2.0.4",
     "@whatwg-node/fetch": "0.10.13",
-    "apollo-upload-client": "18.0.1",
+    "apollo-upload-client": "19.0.0",
     "cookie": "1.1.1",
     "graphql": "16.14.2",
     "graphql-sse": "2.6.0",
     "graphql-tag": "2.12.6",
     "react-hot-toast": "2.6.0",
+    "rxjs": "7.8.2",
     "stacktracey": "2.2.0",
     "ts-toolbelt": "9.6.0"
   },
   "devDependencies": {
-    "@apollo/client-react-streaming": "0.12.3",
+    "@apollo/client-react-streaming": "0.14.5",
     "@arethetypeswrong/cli": "0.18.5",
     "@babel/cli": "7.29.7",
     "@babel/core": "^7.26.10",
     "@babel/plugin-transform-runtime": "7.29.7",
     "@babel/runtime": "7.29.7",
-    "@cedarjs/auth": "6.0.0",
-    "@cedarjs/framework-tools": "6.0.0",
-    "@cedarjs/internal": "6.0.0",
+    "@cedarjs/auth": "7.0.0-canary.2982",
+    "@cedarjs/framework-tools": "7.0.0-canary.2982",
+    "@cedarjs/internal": "7.0.0-canary.2982",
     "@rollup/plugin-babel": "6.1.0",
     "@testing-library/dom": "10.4.1",
     "@testing-library/jest-dom": "6.9.1",
     "@testing-library/react": "16.3.2",
-    "@types/apollo-upload-client": "^18",
+    "@types/apollo-upload-client": "^19",
     "@types/react": "^18.2.55",
     "@types/react-dom": "^18.2.19",
     "concurrently": "9.2.4",
     "nodemon": "3.1.14",
     "publint": "0.3.23",
-    "react": "18.3.1",
-    "react-dom": "18.3.1",
+    "react": "19.2.3",
+    "react-dom": "19.2.3",
     "tstyche": "5.0.2",
     "typescript": "5.9.3",
     "vitest": "4.1.10"
   },
   "peerDependencies": {
-    "@cedarjs/auth": "6.0.0",
-    "react": "18.3.1",
-    "react-dom": "18.3.1"
+    "@cedarjs/auth": "7.0.0-canary.2982",
+    "react": "19.2.3",
+    "react-dom": "19.2.3"
   },
   "engines": {
     "node": ">=24"

package/dist/components/RedwoodProvider.d.ts

@@ -1,9 +0,0 @@
-import React from 'react';
-interface RedwoodProviderProps {
-    children: React.ReactNode;
-    titleTemplate?: string;
-}
-export declare const RedwoodProvider: ({ children, titleTemplate, }: RedwoodProviderProps) => React.JSX.Element;
-declare global { }
-export {};
-//# sourceMappingURL=RedwoodProvider.d.ts.map

package/dist/components/RedwoodProvider.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"RedwoodProvider.d.ts","sourceRoot":"","sources":["../../src/components/RedwoodProvider.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAKzB,UAAU,oBAAoB;IAC5B,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAA;IACzB,aAAa,CAAC,EAAE,MAAM,CAAA;CACvB;AAED,eAAO,MAAM,eAAe,GAAI,8BAG7B,oBAAoB,sBAuBtB,CAAA;AAED,OAAO,CAAC,MAAM,CAAC,GAAE"}

package/dist/components/RedwoodProvider.js

@@ -1,23 +0,0 @@
-import React from "react";
-import { Helmet, HelmetProvider } from "@dr.pogodin/react-helmet";
-const RedwoodProvider = ({
-  children,
-  titleTemplate
-}) => {
-  const appTitle = globalThis.__REDWOOD__APP_TITLE;
-  const template = () => {
-    if (titleTemplate) {
-      let template2 = titleTemplate.replace(/%AppTitle/g, appTitle);
-      template2 = template2.replace(/%PageTitle/g, "%s");
-      return template2;
-    }
-    return "";
-  };
-  if (RWJS_ENV.RWJS_EXP_STREAMING_SSR) {
-    return /* @__PURE__ */ React.createElement(React.Fragment, null, children);
-  }
-  return /* @__PURE__ */ React.createElement(HelmetProvider, { context: globalThis.__REDWOOD__HELMET_CONTEXT }, /* @__PURE__ */ React.createElement(Helmet, { titleTemplate: template(), defaultTitle: appTitle }, /* @__PURE__ */ React.createElement("title", null, appTitle)), children);
-};
-export {
-  RedwoodProvider
-};