@uniformdev/canvas-next-rsc 20.72.2 → 20.72.3-alpha.14

package/dist/component.js

@@ -119,11 +119,11 @@ Add this component mapping to your resolveComponent function on UniformCompositi
 
 // src/components/UniformRichText.tsx
 var import_canvas = require("@uniformdev/canvas");
-var import_richtext5 = require("@uniformdev/richtext");
+var import_richtext6 = require("@uniformdev/richtext");
 var import_react13 = __toESM(require("react"));
 
 // src/components/UniformRichTextNode.tsx
-var import_richtext4 = require("@uniformdev/richtext");
+var import_richtext5 = require("@uniformdev/richtext");
 var import_react12 = __toESM(require("react"));
 
 // src/components/nodes/AssetRichTextNode.tsx
@@ -161,11 +161,11 @@ var LinebreakRichTextNode = () => {
 };
 
 // src/components/nodes/LinkRichTextNode.tsx
-var import_canvas_react = require("@uniformdev/canvas-react");
+var import_richtext = require("@uniformdev/richtext");
 var import_react5 = __toESM(require("react"));
 var LinkRichTextNode = ({ children, node }) => {
   const { link } = node;
-  return /* @__PURE__ */ import_react5.default.createElement("a", { ...(0, import_canvas_react.linkParamValueToAnchorProps)(link) }, children);
+  return /* @__PURE__ */ import_react5.default.createElement("a", { ...(0, import_richtext.linkParamValueToAnchorProps)(link) }, children);
 };
 
 // src/components/nodes/ListItemRichTextNode.tsx
@@ -184,26 +184,26 @@ var ListRichTextNode = ({ children, node }) => {
 };
 
 // src/components/nodes/ParagraphRichTextNode.tsx
-var import_richtext = require("@uniformdev/richtext");
+var import_richtext2 = require("@uniformdev/richtext");
 var import_react8 = __toESM(require("react"));
 var ParagraphRichTextNode = ({ children, node }) => {
   const { format, direction } = node;
   return /* @__PURE__ */ import_react8.default.createElement(
     "p",
     {
-      dir: (0, import_richtext.isPureDirection)(direction) ? direction : void 0,
-      style: (0, import_richtext.isPureTextAlign)(format) ? { textAlign: format } : void 0
+      dir: (0, import_richtext2.isPureDirection)(direction) ? direction : void 0,
+      style: (0, import_richtext2.isPureTextAlign)(format) ? { textAlign: format } : void 0
     },
     children
   );
 };
 
 // src/components/nodes/TableCellRichTextNode.tsx
-var import_richtext2 = require("@uniformdev/richtext");
+var import_richtext3 = require("@uniformdev/richtext");
 var import_react9 = __toESM(require("react"));
 var TableCellRichTextNode = ({ children, node }) => {
   const { headerState } = node;
-  const TableCellTag = (0, import_richtext2.getRichTextTagFromTableCellHeaderState)(headerState);
+  const TableCellTag = (0, import_richtext3.getRichTextTagFromTableCellHeaderState)(headerState);
   return /* @__PURE__ */ import_react9.default.createElement(TableCellTag, null, children);
 };
 
@@ -214,18 +214,18 @@ var TabRichTextNode = () => {
 };
 
 // src/components/nodes/TextRichTextNode.tsx
-var import_richtext3 = require("@uniformdev/richtext");
+var import_richtext4 = require("@uniformdev/richtext");
 var import_react11 = __toESM(require("react"));
 var TextRichTextNode = ({ node }) => {
   const { text, format } = node;
-  const tags = (0, import_richtext3.getRichTextTagsFromTextFormat)(format);
+  const tags = (0, import_richtext4.getRichTextTagsFromTextFormat)(format);
   return /* @__PURE__ */ import_react11.default.createElement(import_react11.default.Fragment, null, tags.length > 0 ? tags.reduceRight((children, Tag) => /* @__PURE__ */ import_react11.default.createElement(Tag, null, children), text) : text);
 };
 
 // src/components/UniformRichTextNode.tsx
 function UniformRichTextNode({ node, ...props }) {
   var _a;
-  if (!(0, import_richtext4.isRichTextNode)(node)) return null;
+  if (!(0, import_richtext5.isRichTextNode)(node)) return null;
   let NodeRenderer = (_a = props.resolveRichTextRenderer) == null ? void 0 : _a.call(props, node);
   if (typeof NodeRenderer === "undefined") {
     NodeRenderer = resolveRichTextDefaultRenderer(node);
@@ -281,8 +281,8 @@ var UniformRichText = import_react13.default.forwardRef(function UniformRichText
   }
   const computedPlaceholder = typeof placeholder === "function" ? placeholder({ id: parameterId }) : placeholder;
   const value = parameter.value;
-  if (!value || !(0, import_richtext5.isRichTextValue)(value)) return null;
-  if (!isContextualEditing && (0, import_richtext5.isRichTextValueConsideredEmpty)(value)) return null;
+  if (!value || !(0, import_richtext6.isRichTextValue)(value)) return null;
+  if (!isContextualEditing && (0, import_richtext6.isRichTextValueConsideredEmpty)(value)) return null;
   return Tag === null ? /* @__PURE__ */ import_react13.default.createElement(UniformRichTextNode, { node: value.root, resolveRichTextRenderer }) : /* @__PURE__ */ import_react13.default.createElement(
     Tag,
     {
@@ -294,7 +294,7 @@ var UniformRichText = import_react13.default.forwardRef(function UniformRichText
         [import_canvas.ATTRIBUTE_PARAMETER_TYPE]: "richText"
       } : {}
     },
-    (0, import_richtext5.isRichTextValueConsideredEmpty)(value) ? /* @__PURE__ */ import_react13.default.createElement("p", null, /* @__PURE__ */ import_react13.default.createElement("i", null, computedPlaceholder)) : /* @__PURE__ */ import_react13.default.createElement(UniformRichTextNode, { node: value.root, resolveRichTextRenderer })
+    (0, import_richtext6.isRichTextValueConsideredEmpty)(value) ? /* @__PURE__ */ import_react13.default.createElement("p", null, /* @__PURE__ */ import_react13.default.createElement("i", null, computedPlaceholder)) : /* @__PURE__ */ import_react13.default.createElement(UniformRichTextNode, { node: value.root, resolveRichTextRenderer })
   );
 });
 

package/dist/component.mjs

@@ -122,7 +122,7 @@ var LinebreakRichTextNode = () => {
 };
 
 // src/components/nodes/LinkRichTextNode.tsx
-import { linkParamValueToAnchorProps } from "@uniformdev/canvas-react";
+import { linkParamValueToAnchorProps } from "@uniformdev/richtext";
 import React5 from "react";
 var LinkRichTextNode = ({ children, node }) => {
   const { link } = node;

package/dist/handler.js

@@ -247,8 +247,8 @@ var determineFetchCacheOptions = (mode) => {
 };
 
 // src/clients/canvasClient.ts
-var getCanvasClient = (options) => {
-  return new import_canvas2.CanvasClient({
+var buildCanvasClientOptions = (options) => {
+  return {
     projectId: env.getProjectId(),
     apiHost: env.getApiHost(),
     apiKey: env.getApiKey(),
@@ -293,7 +293,10 @@ var getCanvasClient = (options) => {
         }
       });
     }
-  });
+  };
+};
+var getCompositionDeliveryClient = (options) => {
+  return new import_canvas2.CompositionDeliveryClient(buildCanvasClientOptions(options));
 };
 
 // src/clients/projectMapClient.ts
@@ -438,13 +441,13 @@ var processCompositionChange = async (compositionId) => {
   };
 };
 var getComposition = async ({ compositionId }) => {
-  const canvasClient = getCanvasClient({
+  const canvasClient = getCompositionDeliveryClient({
     cache: {
       type: "no-cache"
     }
   });
   try {
-    const composition = await canvasClient.getCompositionById({
+    const composition = await canvasClient.get({
       compositionId
     });
     return composition;
@@ -510,7 +513,7 @@ var processEdgeConfigChange = async ({ source_url }) => {
       type: "no-cache"
     }
   });
-  const route = await routeClient.getRoute({
+  const route = await routeClient.get({
     path: source_url
   });
   let valueToStore = void 0;

package/dist/handler.mjs

@@ -155,7 +155,7 @@ import { parseConnectionString } from "@vercel/edge-config";
 import { Webhook } from "svix";
 
 // src/clients/canvasClient.ts
-import { CanvasClient } from "@uniformdev/canvas";
+import { CanvasClient, CompositionDeliveryClient } from "@uniformdev/canvas";
 
 // src/config/helpers.ts
 import serverConfig from "uniform.server.config";
@@ -214,8 +214,8 @@ var determineFetchCacheOptions = (mode) => {
 };
 
 // src/clients/canvasClient.ts
-var getCanvasClient = (options) => {
-  return new CanvasClient({
+var buildCanvasClientOptions = (options) => {
+  return {
     projectId: env.getProjectId(),
     apiHost: env.getApiHost(),
     apiKey: env.getApiKey(),
@@ -260,7 +260,10 @@ var getCanvasClient = (options) => {
         }
       });
     }
-  });
+  };
+};
+var getCompositionDeliveryClient = (options) => {
+  return new CompositionDeliveryClient(buildCanvasClientOptions(options));
 };
 
 // src/clients/projectMapClient.ts
@@ -405,13 +408,13 @@ var processCompositionChange = async (compositionId) => {
   };
 };
 var getComposition = async ({ compositionId }) => {
-  const canvasClient = getCanvasClient({
+  const canvasClient = getCompositionDeliveryClient({
     cache: {
       type: "no-cache"
     }
   });
   try {
-    const composition = await canvasClient.getCompositionById({
+    const composition = await canvasClient.get({
       compositionId
     });
     return composition;
@@ -477,7 +480,7 @@ var processEdgeConfigChange = async ({ source_url }) => {
       type: "no-cache"
     }
   });
-  const route = await routeClient.getRoute({
+  const route = await routeClient.get({
     path: source_url
   });
   let valueToStore = void 0;

package/dist/index.d.mts

@@ -1,4 +1,4 @@
-import { CanvasClient, RouteClient, CompositionGetBySlugParameters, ResolvedRouteGetResponse, RouteGetParameters } from '@uniformdev/canvas';
+import { CanvasClient, CompositionDeliveryClient, RouteClient, CompositionGetBySlugParameters, ResolvedRouteGetResponse, RouteGetParameters } from '@uniformdev/canvas';
 import { UniformServerConfig, CompositionContext, AppDirectoryContextState, AppDirectoryServerContext, PlaygroundParameters, AwaitedPageParameters, PageParameters } from '@uniformdev/canvas-next-rsc-shared';
 export { PageParameters, PlaygroundParameters } from '@uniformdev/canvas-next-rsc-shared';
 import { ManifestClient } from '@uniformdev/context/api';
@@ -12,8 +12,17 @@ import { ClientContextComponent } from '@uniformdev/canvas-next-rsc-client';
 type GetCanvasClientOptions = {
     cache: NonNullable<UniformServerConfig['canvasCache']>;
 };
+type GetCompositionDeliveryClientOptions = GetCanvasClientOptions;
+/**
+ * @deprecated Use {@link getCompositionDeliveryClient} instead
+ */
 declare const getCanvasClient: (options: GetCanvasClientOptions) => CanvasClient;
+declare const getCompositionDeliveryClient: (options: GetCompositionDeliveryClientOptions) => CompositionDeliveryClient;
+/**
+ * @deprecated Use {@link getDefaultCompositionDeliveryClient} instead.
+ */
 declare const getDefaultCanvasClient: (options: Pick<CompositionContext, "searchParams">) => Promise<CanvasClient>;
+declare const getDefaultCompositionDeliveryClient: (options: Pick<CompositionContext, "searchParams">) => Promise<CompositionDeliveryClient>;
 
 type GetManifestClientOptions = {
     cache: NonNullable<UniformServerConfig['manifestCache']>;
@@ -248,8 +257,8 @@ type RetrieveSlugOptions = Pick<CompositionGetBySlugParameters, 'slug' | 'locale
         [key: string]: string | undefined;
     };
 } & RetrieveCommonOptions;
-type RetrieveRouteFetchOptions = Omit<RouteGetParameters, 'projectId' | 'path' | 'withComponentIDs' | 'withContentSourceMap' | 'state'>;
+type RetrieveRouteFetchOptions = Omit<RouteGetParameters, 'projectId' | 'path' | 'withComponentIDs' | 'state'>;
 declare const retrieveCompositionBySlug: ({ slug, searchParams, skipPrefetch, locale, releaseId, versionId, }: RetrieveSlugOptions) => Promise<ResolvedRouteGetResponse>;
 declare const retrieveRoute: ({ params, searchParams: providedSearchParams, skipPrefetch }: RetrieveRouteOptions, fetchOptions?: RetrieveRouteFetchOptions) => Promise<ResolvedRouteGetResponse>;
 
-export { ContextUpdateTransfer, type ContextUpdateTransferProps, type CreateServerUniformContextProps, type CreateStaticParamsOptions, type GetCanvasClientOptions, type GetManifestClientOptions, type GetProjectMapClientOptions, type GetRouteClientOptions, UniformCompositionProps, UniformContext, type UniformContextProps, UniformPlayground, type UniformPlaygroundProps, createServerUniformContext, createStaticParams, generateStaticParams, getCanvasClient, getDefaultCanvasClient, getDefaultManifestClient, getDefaultProjectMapClient, getDefaultRouteClient, getManifest, getManifestClient, getProjectMapClient, getRouteClient, isDevelopmentEnvironment, isDraftModeEnabled, isIncontextEditingEnabled, isOnVercelPreviewEnvironment, retrieveCompositionBySlug, retrieveRoute };
+export { ContextUpdateTransfer, type ContextUpdateTransferProps, type CreateServerUniformContextProps, type CreateStaticParamsOptions, type GetCanvasClientOptions, type GetCompositionDeliveryClientOptions, type GetManifestClientOptions, type GetProjectMapClientOptions, type GetRouteClientOptions, UniformCompositionProps, UniformContext, type UniformContextProps, UniformPlayground, type UniformPlaygroundProps, createServerUniformContext, createStaticParams, generateStaticParams, getCanvasClient, getCompositionDeliveryClient, getDefaultCanvasClient, getDefaultCompositionDeliveryClient, getDefaultManifestClient, getDefaultProjectMapClient, getDefaultRouteClient, getManifest, getManifestClient, getProjectMapClient, getRouteClient, isDevelopmentEnvironment, isDraftModeEnabled, isIncontextEditingEnabled, isOnVercelPreviewEnvironment, retrieveCompositionBySlug, retrieveRoute };

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { CanvasClient, RouteClient, CompositionGetBySlugParameters, ResolvedRouteGetResponse, RouteGetParameters } from '@uniformdev/canvas';
+import { CanvasClient, CompositionDeliveryClient, RouteClient, CompositionGetBySlugParameters, ResolvedRouteGetResponse, RouteGetParameters } from '@uniformdev/canvas';
 import { UniformServerConfig, CompositionContext, AppDirectoryContextState, AppDirectoryServerContext, PlaygroundParameters, AwaitedPageParameters, PageParameters } from '@uniformdev/canvas-next-rsc-shared';
 export { PageParameters, PlaygroundParameters } from '@uniformdev/canvas-next-rsc-shared';
 import { ManifestClient } from '@uniformdev/context/api';
@@ -12,8 +12,17 @@ import { ClientContextComponent } from '@uniformdev/canvas-next-rsc-client';
 type GetCanvasClientOptions = {
     cache: NonNullable<UniformServerConfig['canvasCache']>;
 };
+type GetCompositionDeliveryClientOptions = GetCanvasClientOptions;
+/**
+ * @deprecated Use {@link getCompositionDeliveryClient} instead
+ */
 declare const getCanvasClient: (options: GetCanvasClientOptions) => CanvasClient;
+declare const getCompositionDeliveryClient: (options: GetCompositionDeliveryClientOptions) => CompositionDeliveryClient;
+/**
+ * @deprecated Use {@link getDefaultCompositionDeliveryClient} instead.
+ */
 declare const getDefaultCanvasClient: (options: Pick<CompositionContext, "searchParams">) => Promise<CanvasClient>;
+declare const getDefaultCompositionDeliveryClient: (options: Pick<CompositionContext, "searchParams">) => Promise<CompositionDeliveryClient>;
 
 type GetManifestClientOptions = {
     cache: NonNullable<UniformServerConfig['manifestCache']>;
@@ -248,8 +257,8 @@ type RetrieveSlugOptions = Pick<CompositionGetBySlugParameters, 'slug' | 'locale
         [key: string]: string | undefined;
     };
 } & RetrieveCommonOptions;
-type RetrieveRouteFetchOptions = Omit<RouteGetParameters, 'projectId' | 'path' | 'withComponentIDs' | 'withContentSourceMap' | 'state'>;
+type RetrieveRouteFetchOptions = Omit<RouteGetParameters, 'projectId' | 'path' | 'withComponentIDs' | 'state'>;
 declare const retrieveCompositionBySlug: ({ slug, searchParams, skipPrefetch, locale, releaseId, versionId, }: RetrieveSlugOptions) => Promise<ResolvedRouteGetResponse>;
 declare const retrieveRoute: ({ params, searchParams: providedSearchParams, skipPrefetch }: RetrieveRouteOptions, fetchOptions?: RetrieveRouteFetchOptions) => Promise<ResolvedRouteGetResponse>;
 
-export { ContextUpdateTransfer, type ContextUpdateTransferProps, type CreateServerUniformContextProps, type CreateStaticParamsOptions, type GetCanvasClientOptions, type GetManifestClientOptions, type GetProjectMapClientOptions, type GetRouteClientOptions, UniformCompositionProps, UniformContext, type UniformContextProps, UniformPlayground, type UniformPlaygroundProps, createServerUniformContext, createStaticParams, generateStaticParams, getCanvasClient, getDefaultCanvasClient, getDefaultManifestClient, getDefaultProjectMapClient, getDefaultRouteClient, getManifest, getManifestClient, getProjectMapClient, getRouteClient, isDevelopmentEnvironment, isDraftModeEnabled, isIncontextEditingEnabled, isOnVercelPreviewEnvironment, retrieveCompositionBySlug, retrieveRoute };
+export { ContextUpdateTransfer, type ContextUpdateTransferProps, type CreateServerUniformContextProps, type CreateStaticParamsOptions, type GetCanvasClientOptions, type GetCompositionDeliveryClientOptions, type GetManifestClientOptions, type GetProjectMapClientOptions, type GetRouteClientOptions, UniformCompositionProps, UniformContext, type UniformContextProps, UniformPlayground, type UniformPlaygroundProps, createServerUniformContext, createStaticParams, generateStaticParams, getCanvasClient, getCompositionDeliveryClient, getDefaultCanvasClient, getDefaultCompositionDeliveryClient, getDefaultManifestClient, getDefaultProjectMapClient, getDefaultRouteClient, getManifest, getManifestClient, getProjectMapClient, getRouteClient, isDevelopmentEnvironment, isDraftModeEnabled, isIncontextEditingEnabled, isOnVercelPreviewEnvironment, retrieveCompositionBySlug, retrieveRoute };

package/dist/index.esm.js

@@ -2,7 +2,7 @@
 import "server-only";
 
 // src/clients/canvasClient.ts
-import { CanvasClient } from "@uniformdev/canvas";
+import { CanvasClient, CompositionDeliveryClient } from "@uniformdev/canvas";
 
 // src/config/helpers.ts
 import serverConfig from "uniform.server.config";
@@ -184,8 +184,8 @@ var determineFetchCacheOptions = (mode) => {
 };
 
 // src/clients/canvasClient.ts
-var getCanvasClient = (options) => {
-  return new CanvasClient({
+var buildCanvasClientOptions = (options) => {
+  return {
     projectId: env.getProjectId(),
     apiHost: env.getApiHost(),
     apiKey: env.getApiKey(),
@@ -230,13 +230,24 @@ var getCanvasClient = (options) => {
         }
       });
     }
-  });
+  };
+};
+var getCanvasClient = (options) => {
+  return new CanvasClient(buildCanvasClientOptions(options));
+};
+var getCompositionDeliveryClient = (options) => {
+  return new CompositionDeliveryClient(buildCanvasClientOptions(options));
 };
 var getDefaultCanvasClient = async (options) => {
   return getCanvasClient({
     cache: await getCanvasCacheStrategy(options)
   });
 };
+var getDefaultCompositionDeliveryClient = async (options) => {
+  return getCompositionDeliveryClient({
+    cache: await getCanvasCacheStrategy(options)
+  });
+};
 
 // src/clients/manifestClient.ts
 import { ManifestClient } from "@uniformdev/context/api";
@@ -477,7 +488,6 @@ var retrieveCompositionBySlug = async ({
   releaseId,
   versionId
 }) => {
-  var _a;
   if (!skipPrefetch) {
     void getManifest({
       searchParams
@@ -489,15 +499,14 @@ var retrieveCompositionBySlug = async ({
   });
   for (let i = 0; i < states.length; i++) {
     const state = states[i];
-    const canvasClient = await getDefaultCanvasClient({
+    const canvasClient = await getDefaultCompositionDeliveryClient({
       searchParams
     });
     try {
-      const composition = await canvasClient.getCompositionBySlug({
+      const composition = await canvasClient.get({
         slug,
         state,
         withComponentIDs: true,
-        withContentSourceMap: isOnVercelPreviewEnvironment() && ((_a = getServerConfig().experimental) == null ? void 0 : _a.vercelVisualEditing),
         locale,
         releaseId,
         versionId
@@ -571,7 +580,6 @@ var retrieveRouteByPath = async ({
   fetchOptions,
   releaseId
 }) => {
-  var _a;
   const client = await getDefaultRouteClient({
     searchParams
   });
@@ -588,13 +596,12 @@ var retrieveRouteByPath = async ({
       queryPath = `${helper.pathname}${helper.search}`;
     }
   }
-  return await client.getRoute({
+  return await client.get({
     ...fetchOptions,
     path: queryPath,
     state,
     dataSourceVariant: getDataSourceVariantFromRouteGetParams(fetchOptions != null ? fetchOptions : {}, state),
     withComponentIDs: true,
-    withContentSourceMap: isOnVercelPreviewEnvironment() && ((_a = getServerConfig().experimental) == null ? void 0 : _a.vercelVisualEditing),
     releaseId
   });
 };
@@ -1158,7 +1165,7 @@ var UniformPlayground = async ({ searchParams, ...rest }) => {
   if (!id) {
     notFound2();
   }
-  const canvasClient = getCanvasClient({
+  const canvasClient = getCompositionDeliveryClient({
     cache: {
       type: "no-cache"
     }
@@ -1168,7 +1175,7 @@ var UniformPlayground = async ({ searchParams, ...rest }) => {
   for (let i = 0; i < possibleStates.length; i++) {
     const state = possibleStates[i];
     try {
-      composition = await canvasClient.getCompositionById({
+      composition = await canvasClient.get({
         compositionId: id,
         state,
         withComponentIDs: true
@@ -1207,7 +1214,9 @@ export {
   createStaticParams,
   generateStaticParams,
   getCanvasClient,
+  getCompositionDeliveryClient,
   getDefaultCanvasClient,
+  getDefaultCompositionDeliveryClient,
   getDefaultManifestClient,
   getDefaultProjectMapClient,
   getDefaultRouteClient,

package/dist/index.js

@@ -38,7 +38,9 @@ __export(index_exports, {
   createStaticParams: () => createStaticParams,
   generateStaticParams: () => generateStaticParams,
   getCanvasClient: () => getCanvasClient,
+  getCompositionDeliveryClient: () => getCompositionDeliveryClient,
   getDefaultCanvasClient: () => getDefaultCanvasClient,
+  getDefaultCompositionDeliveryClient: () => getDefaultCompositionDeliveryClient,
   getDefaultManifestClient: () => getDefaultManifestClient,
   getDefaultProjectMapClient: () => getDefaultProjectMapClient,
   getDefaultRouteClient: () => getDefaultRouteClient,
@@ -237,8 +239,8 @@ var determineFetchCacheOptions = (mode) => {
 };
 
 // src/clients/canvasClient.ts
-var getCanvasClient = (options) => {
-  return new import_canvas2.CanvasClient({
+var buildCanvasClientOptions = (options) => {
+  return {
     projectId: env.getProjectId(),
     apiHost: env.getApiHost(),
     apiKey: env.getApiKey(),
@@ -283,13 +285,24 @@ var getCanvasClient = (options) => {
         }
       });
     }
-  });
+  };
+};
+var getCanvasClient = (options) => {
+  return new import_canvas2.CanvasClient(buildCanvasClientOptions(options));
+};
+var getCompositionDeliveryClient = (options) => {
+  return new import_canvas2.CompositionDeliveryClient(buildCanvasClientOptions(options));
 };
 var getDefaultCanvasClient = async (options) => {
   return getCanvasClient({
     cache: await getCanvasCacheStrategy(options)
   });
 };
+var getDefaultCompositionDeliveryClient = async (options) => {
+  return getCompositionDeliveryClient({
+    cache: await getCanvasCacheStrategy(options)
+  });
+};
 
 // src/clients/manifestClient.ts
 var import_api = require("@uniformdev/context/api");
@@ -505,7 +518,6 @@ var retrieveCompositionBySlug = async ({
   releaseId,
   versionId
 }) => {
-  var _a;
   if (!skipPrefetch) {
     void getManifest({
       searchParams
@@ -517,15 +529,14 @@ var retrieveCompositionBySlug = async ({
   });
   for (let i = 0; i < states.length; i++) {
     const state = states[i];
-    const canvasClient = await getDefaultCanvasClient({
+    const canvasClient = await getDefaultCompositionDeliveryClient({
       searchParams
     });
     try {
-      const composition = await canvasClient.getCompositionBySlug({
+      const composition = await canvasClient.get({
         slug,
         state,
         withComponentIDs: true,
-        withContentSourceMap: isOnVercelPreviewEnvironment() && ((_a = getServerConfig().experimental) == null ? void 0 : _a.vercelVisualEditing),
         locale,
         releaseId,
         versionId
@@ -599,7 +610,6 @@ var retrieveRouteByPath = async ({
   fetchOptions,
   releaseId
 }) => {
-  var _a;
   const client = await getDefaultRouteClient({
     searchParams
   });
@@ -616,13 +626,12 @@ var retrieveRouteByPath = async ({
       queryPath = `${helper.pathname}${helper.search}`;
     }
   }
-  return await client.getRoute({
+  return await client.get({
     ...fetchOptions,
     path: queryPath,
     state,
     dataSourceVariant: (0, import_canvas4.getDataSourceVariantFromRouteGetParams)(fetchOptions != null ? fetchOptions : {}, state),
     withComponentIDs: true,
-    withContentSourceMap: isOnVercelPreviewEnvironment() && ((_a = getServerConfig().experimental) == null ? void 0 : _a.vercelVisualEditing),
     releaseId
   });
 };
@@ -1178,7 +1187,7 @@ var UniformPlayground = async ({ searchParams, ...rest }) => {
   if (!id) {
     (0, import_navigation2.notFound)();
   }
-  const canvasClient = getCanvasClient({
+  const canvasClient = getCompositionDeliveryClient({
     cache: {
       type: "no-cache"
     }
@@ -1188,7 +1197,7 @@ var UniformPlayground = async ({ searchParams, ...rest }) => {
   for (let i = 0; i < possibleStates.length; i++) {
     const state = possibleStates[i];
     try {
-      composition = await canvasClient.getCompositionById({
+      composition = await canvasClient.get({
         compositionId: id,
         state,
         withComponentIDs: true
@@ -1228,7 +1237,9 @@ var UniformPlayground = async ({ searchParams, ...rest }) => {
   createStaticParams,
   generateStaticParams,
   getCanvasClient,
+  getCompositionDeliveryClient,
   getDefaultCanvasClient,
+  getDefaultCompositionDeliveryClient,
   getDefaultManifestClient,
   getDefaultProjectMapClient,
   getDefaultRouteClient,

package/dist/index.mjs

@@ -2,7 +2,7 @@
 import "server-only";
 
 // src/clients/canvasClient.ts
-import { CanvasClient } from "@uniformdev/canvas";
+import { CanvasClient, CompositionDeliveryClient } from "@uniformdev/canvas";
 
 // src/config/helpers.ts
 import serverConfig from "uniform.server.config";
@@ -184,8 +184,8 @@ var determineFetchCacheOptions = (mode) => {
 };
 
 // src/clients/canvasClient.ts
-var getCanvasClient = (options) => {
-  return new CanvasClient({
+var buildCanvasClientOptions = (options) => {
+  return {
     projectId: env.getProjectId(),
     apiHost: env.getApiHost(),
     apiKey: env.getApiKey(),
@@ -230,13 +230,24 @@ var getCanvasClient = (options) => {
         }
       });
     }
-  });
+  };
+};
+var getCanvasClient = (options) => {
+  return new CanvasClient(buildCanvasClientOptions(options));
+};
+var getCompositionDeliveryClient = (options) => {
+  return new CompositionDeliveryClient(buildCanvasClientOptions(options));
 };
 var getDefaultCanvasClient = async (options) => {
   return getCanvasClient({
     cache: await getCanvasCacheStrategy(options)
   });
 };
+var getDefaultCompositionDeliveryClient = async (options) => {
+  return getCompositionDeliveryClient({
+    cache: await getCanvasCacheStrategy(options)
+  });
+};
 
 // src/clients/manifestClient.ts
 import { ManifestClient } from "@uniformdev/context/api";
@@ -477,7 +488,6 @@ var retrieveCompositionBySlug = async ({
   releaseId,
   versionId
 }) => {
-  var _a;
   if (!skipPrefetch) {
     void getManifest({
       searchParams
@@ -489,15 +499,14 @@ var retrieveCompositionBySlug = async ({
   });
   for (let i = 0; i < states.length; i++) {
     const state = states[i];
-    const canvasClient = await getDefaultCanvasClient({
+    const canvasClient = await getDefaultCompositionDeliveryClient({
       searchParams
     });
     try {
-      const composition = await canvasClient.getCompositionBySlug({
+      const composition = await canvasClient.get({
         slug,
         state,
         withComponentIDs: true,
-        withContentSourceMap: isOnVercelPreviewEnvironment() && ((_a = getServerConfig().experimental) == null ? void 0 : _a.vercelVisualEditing),
         locale,
         releaseId,
         versionId
@@ -571,7 +580,6 @@ var retrieveRouteByPath = async ({
   fetchOptions,
   releaseId
 }) => {
-  var _a;
   const client = await getDefaultRouteClient({
     searchParams
   });
@@ -588,13 +596,12 @@ var retrieveRouteByPath = async ({
       queryPath = `${helper.pathname}${helper.search}`;
     }
   }
-  return await client.getRoute({
+  return await client.get({
     ...fetchOptions,
     path: queryPath,
     state,
     dataSourceVariant: getDataSourceVariantFromRouteGetParams(fetchOptions != null ? fetchOptions : {}, state),
     withComponentIDs: true,
-    withContentSourceMap: isOnVercelPreviewEnvironment() && ((_a = getServerConfig().experimental) == null ? void 0 : _a.vercelVisualEditing),
     releaseId
   });
 };
@@ -1158,7 +1165,7 @@ var UniformPlayground = async ({ searchParams, ...rest }) => {
   if (!id) {
     notFound2();
   }
-  const canvasClient = getCanvasClient({
+  const canvasClient = getCompositionDeliveryClient({
     cache: {
       type: "no-cache"
     }
@@ -1168,7 +1175,7 @@ var UniformPlayground = async ({ searchParams, ...rest }) => {
   for (let i = 0; i < possibleStates.length; i++) {
     const state = possibleStates[i];
     try {
-      composition = await canvasClient.getCompositionById({
+      composition = await canvasClient.get({
         compositionId: id,
         state,
         withComponentIDs: true
@@ -1207,7 +1214,9 @@ export {
   createStaticParams,
   generateStaticParams,
   getCanvasClient,
+  getCompositionDeliveryClient,
   getDefaultCanvasClient,
+  getDefaultCompositionDeliveryClient,
   getDefaultManifestClient,
   getDefaultProjectMapClient,
   getDefaultRouteClient,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniformdev/canvas-next-rsc",
-  "version": "20.72.2",
+  "version": "20.72.3-alpha.14+1e232e59cd",
   "license": "SEE LICENSE IN LICENSE.txt",
   "scripts": {
     "build": "tsup",
@@ -60,15 +60,15 @@
     "react-dom": "19.2.1"
   },
   "dependencies": {
-    "@uniformdev/canvas": "20.72.2",
-    "@uniformdev/canvas-next-rsc-client": "^20.72.2",
-    "@uniformdev/canvas-next-rsc-shared": "^20.72.2",
-    "@uniformdev/canvas-react": "20.72.2",
-    "@uniformdev/context": "20.72.2",
-    "@uniformdev/project-map": "20.72.2",
-    "@uniformdev/redirect": "20.72.2",
-    "@uniformdev/richtext": "20.72.2",
-    "@uniformdev/webhooks": "20.72.2",
+    "@uniformdev/canvas": "20.72.3-alpha.14+1e232e59cd",
+    "@uniformdev/canvas-next-rsc-client": "^20.72.3-alpha.14+1e232e59cd",
+    "@uniformdev/canvas-next-rsc-shared": "^20.72.3-alpha.14+1e232e59cd",
+    "@uniformdev/canvas-react": "20.72.3-alpha.14+1e232e59cd",
+    "@uniformdev/context": "20.72.3-alpha.14+1e232e59cd",
+    "@uniformdev/project-map": "20.72.3-alpha.14+1e232e59cd",
+    "@uniformdev/redirect": "20.72.3-alpha.14+1e232e59cd",
+    "@uniformdev/richtext": "20.72.3-alpha.14+1e232e59cd",
+    "@uniformdev/webhooks": "20.72.3-alpha.14+1e232e59cd",
     "@vercel/edge-config": "^1.4.3",
     "encoding": "^0.1.13",
     "server-only": "^0.0.1",
@@ -85,5 +85,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "8b65535fb3ec81e23f9eb8e0ed0b0be478f6e0e8"
+  "gitHead": "1e232e59cd3ded97b85b063986cc95e954b8c937"
 }