@uniformdev/canvas-next 20.74.6-alpha.3 → 20.74.7-alpha.12

package/dist/project-map/index.d.mts

@@ -2,7 +2,7 @@ import * as next from 'next';
 import { GetServerSidePropsContext, PreviewData, GetServerSideProps, GetStaticPropsContext, GetStaticProps } from 'next';
 import { a as UniformGetServerSideProps, c as UniformPreviewData, b as UniformGetStaticProps } from '../models-BGg_qtcM.mjs';
 import * as node_querystring from 'node:querystring';
-import { CanvasClient, CompositionGetByNodePathParameters, DataResolutionOption } from '@uniformdev/canvas';
+import { CanvasClient, CompositionDeliveryClient, CompositionDeliveryReadOptions, CompositionGetByNodePathParameters, DataResolutionOption } from '@uniformdev/canvas';
 import { ParsedUrlQuery } from 'querystring';
 import { ProjectMapNodeGetRequest, ProjectMapNodeGetResponse, ProjectMapClient } from '@uniformdev/project-map';
 import '@uniformdev/canvas-react';
@@ -12,8 +12,10 @@ declare const withUniformGetServerSideProps: <TProps extends {
 } = {
     [key: string]: any;
 }>(options?: {
-    /** If you need to override the default client, you can pass it here */
-    client?: CanvasClient;
+    /**
+     * If you need to override the default client, you can pass it here.
+     */
+    client?: CanvasClient | CompositionDeliveryClient;
     /** A string that you want to strip from the resolved context.resolvedUrl. Useful when calling from a nested folder which is not part of your project map structure */
     prefix?: string;
     /** Useful when you need to modify the path passed to the API */
@@ -21,8 +23,11 @@ declare const withUniformGetServerSideProps: <TProps extends {
     /** Set to true if you want to include draft compositions */
     preview?: boolean;
     projectMapId?: string;
-    /** Way to override getCompositionByNodePath request params */
-    requestOptions?: Omit<Partial<CompositionGetByNodePathParameters & DataResolutionOption>, "state">;
+    /** Way to override get request params */
+    requestOptions?: Omit<Partial<CompositionDeliveryReadOptions & {
+        projectMapNodePath: string;
+        projectMapId?: string;
+    }>, "state"> | Omit<Partial<CompositionGetByNodePathParameters & DataResolutionOption>, "state">;
     /** Custom handler to specify return value and modify composition - e.g. enhance with CMS data */
     callback?: UniformGetServerSideProps<TProps>;
     /** Disables logging of response information and timings */
@@ -60,10 +65,15 @@ declare const withUniformGetStaticProps: <TProps extends {
     modifyPath?: (path: string, context: GetStaticPropsContext<ParsedUrlQuery, UniformPreviewData>) => string;
     /** Set to true if you want to include draft compositions */
     preview?: boolean;
-    /** If you need to override the default client, you can pass it here */
-    client?: CanvasClient;
-    /** Way to override getCompositionByNodePath request params */
-    requestOptions?: Omit<Partial<CompositionGetByNodePathParameters & DataResolutionOption>, "state">;
+    /**
+     * If you need to override the default client, you can pass it here.
+     */
+    client?: CanvasClient | CompositionDeliveryClient;
+    /** Way to override get request params */
+    requestOptions?: Omit<Partial<CompositionDeliveryReadOptions & {
+        projectMapNodePath: string;
+        projectMapId?: string;
+    }>, "state"> | Omit<Partial<CompositionGetByNodePathParameters & DataResolutionOption>, "state">;
     /** Custom handler to specify return value and modify composition - e.g. enhance with CMS data */
     callback?: UniformGetStaticProps<TProps>;
     /** Disables logging of response information and timings */

package/dist/project-map/index.d.ts

@@ -2,7 +2,7 @@ import * as next from 'next';
 import { GetServerSidePropsContext, PreviewData, GetServerSideProps, GetStaticPropsContext, GetStaticProps } from 'next';
 import { a as UniformGetServerSideProps, c as UniformPreviewData, b as UniformGetStaticProps } from '../models-BGg_qtcM.js';
 import * as node_querystring from 'node:querystring';
-import { CanvasClient, CompositionGetByNodePathParameters, DataResolutionOption } from '@uniformdev/canvas';
+import { CanvasClient, CompositionDeliveryClient, CompositionDeliveryReadOptions, CompositionGetByNodePathParameters, DataResolutionOption } from '@uniformdev/canvas';
 import { ParsedUrlQuery } from 'querystring';
 import { ProjectMapNodeGetRequest, ProjectMapNodeGetResponse, ProjectMapClient } from '@uniformdev/project-map';
 import '@uniformdev/canvas-react';
@@ -12,8 +12,10 @@ declare const withUniformGetServerSideProps: <TProps extends {
 } = {
     [key: string]: any;
 }>(options?: {
-    /** If you need to override the default client, you can pass it here */
-    client?: CanvasClient;
+    /**
+     * If you need to override the default client, you can pass it here.
+     */
+    client?: CanvasClient | CompositionDeliveryClient;
     /** A string that you want to strip from the resolved context.resolvedUrl. Useful when calling from a nested folder which is not part of your project map structure */
     prefix?: string;
     /** Useful when you need to modify the path passed to the API */
@@ -21,8 +23,11 @@ declare const withUniformGetServerSideProps: <TProps extends {
     /** Set to true if you want to include draft compositions */
     preview?: boolean;
     projectMapId?: string;
-    /** Way to override getCompositionByNodePath request params */
-    requestOptions?: Omit<Partial<CompositionGetByNodePathParameters & DataResolutionOption>, "state">;
+    /** Way to override get request params */
+    requestOptions?: Omit<Partial<CompositionDeliveryReadOptions & {
+        projectMapNodePath: string;
+        projectMapId?: string;
+    }>, "state"> | Omit<Partial<CompositionGetByNodePathParameters & DataResolutionOption>, "state">;
     /** Custom handler to specify return value and modify composition - e.g. enhance with CMS data */
     callback?: UniformGetServerSideProps<TProps>;
     /** Disables logging of response information and timings */
@@ -60,10 +65,15 @@ declare const withUniformGetStaticProps: <TProps extends {
     modifyPath?: (path: string, context: GetStaticPropsContext<ParsedUrlQuery, UniformPreviewData>) => string;
     /** Set to true if you want to include draft compositions */
     preview?: boolean;
-    /** If you need to override the default client, you can pass it here */
-    client?: CanvasClient;
-    /** Way to override getCompositionByNodePath request params */
-    requestOptions?: Omit<Partial<CompositionGetByNodePathParameters & DataResolutionOption>, "state">;
+    /**
+     * If you need to override the default client, you can pass it here.
+     */
+    client?: CanvasClient | CompositionDeliveryClient;
+    /** Way to override get request params */
+    requestOptions?: Omit<Partial<CompositionDeliveryReadOptions & {
+        projectMapNodePath: string;
+        projectMapId?: string;
+    }>, "state"> | Omit<Partial<CompositionGetByNodePathParameters & DataResolutionOption>, "state">;
     /** Custom handler to specify return value and modify composition - e.g. enhance with CMS data */
     callback?: UniformGetStaticProps<TProps>;
     /** Disables logging of response information and timings */

package/dist/project-map/index.js

@@ -152,7 +152,7 @@ function resolveDiagnosticsDuration(data) {
 
 // src/project-map/withUniformGetServerSideProps.ts
 var withUniformGetServerSideProps = (options) => {
-  const canvasClient = (options == null ? void 0 : options.client) || new import_canvas.CanvasClient({
+  const canvasClient = (options == null ? void 0 : options.client) || new import_canvas.CompositionDeliveryClient({
     apiKey: process.env.UNIFORM_API_KEY,
     projectId: process.env.UNIFORM_PROJECT_ID,
     apiHost: process.env.UNIFORM_CLI_BASE_URL,
@@ -177,13 +177,14 @@ var withUniformGetServerSideProps = (options) => {
     } else {
       try {
         const time = Date.now();
-        const response = await canvasClient.getCompositionByNodePath({
+        const getParams = {
           ...options == null ? void 0 : options.requestOptions,
           projectMapId,
           projectMapNodePath: nodePath,
           state: preview || (options == null ? void 0 : options.preview) ? import_canvas.CANVAS_DRAFT_STATE : import_canvas.CANVAS_PUBLISHED_STATE,
           releaseId
-        });
+        };
+        const response = "get" in canvasClient ? await canvasClient.get(getParams) : await canvasClient.getCompositionByNodePath(getParams);
         const duration = Date.now() - time;
         composition = response.composition;
         if (!(options == null ? void 0 : options.silent)) {
@@ -251,7 +252,7 @@ var resolveSlugFromParams = ({
 // src/project-map/withUniformGetStaticProps.ts
 var withUniformGetStaticProps = (options) => {
   var _a;
-  const canvasClient = (_a = options == null ? void 0 : options.client) != null ? _a : new import_canvas3.CanvasClient({
+  const canvasClient = (_a = options == null ? void 0 : options.client) != null ? _a : new import_canvas3.CompositionDeliveryClient({
     apiKey: process.env.UNIFORM_API_KEY,
     projectId: process.env.UNIFORM_PROJECT_ID,
     apiHost: process.env.UNIFORM_CLI_BASE_URL,
@@ -279,13 +280,14 @@ var withUniformGetStaticProps = (options) => {
     } else {
       try {
         const time = Date.now();
-        const response = await canvasClient.getCompositionByNodePath({
+        const getParams = {
           ...options == null ? void 0 : options.requestOptions,
           projectMapId,
           projectMapNodePath: pathString,
           state: preview || (options == null ? void 0 : options.preview) ? import_canvas3.CANVAS_DRAFT_STATE : import_canvas3.CANVAS_PUBLISHED_STATE,
           releaseId
-        });
+        };
+        const response = "get" in canvasClient ? await canvasClient.get(getParams) : await canvasClient.getCompositionByNodePath(getParams);
         const duration = Date.now() - time;
         composition = response.composition;
         if (!(options == null ? void 0 : options.silent)) {

package/dist/project-map/index.mjs

@@ -10,11 +10,11 @@ import {
 import {
   CANVAS_DRAFT_STATE,
   CANVAS_PUBLISHED_STATE,
-  CanvasClient,
+  CompositionDeliveryClient,
   EMPTY_COMPOSITION
 } from "@uniformdev/canvas";
 var withUniformGetServerSideProps = (options) => {
-  const canvasClient = (options == null ? void 0 : options.client) || new CanvasClient({
+  const canvasClient = (options == null ? void 0 : options.client) || new CompositionDeliveryClient({
     apiKey: process.env.UNIFORM_API_KEY,
     projectId: process.env.UNIFORM_PROJECT_ID,
     apiHost: process.env.UNIFORM_CLI_BASE_URL,
@@ -39,13 +39,14 @@ var withUniformGetServerSideProps = (options) => {
     } else {
       try {
         const time = Date.now();
-        const response = await canvasClient.getCompositionByNodePath({
+        const getParams = {
           ...options == null ? void 0 : options.requestOptions,
           projectMapId,
           projectMapNodePath: nodePath,
           state: preview || (options == null ? void 0 : options.preview) ? CANVAS_DRAFT_STATE : CANVAS_PUBLISHED_STATE,
           releaseId
-        });
+        };
+        const response = "get" in canvasClient ? await canvasClient.get(getParams) : await canvasClient.getCompositionByNodePath(getParams);
         const duration = Date.now() - time;
         composition = response.composition;
         if (!(options == null ? void 0 : options.silent)) {
@@ -103,12 +104,12 @@ var withUniformGetStaticPaths = (options) => {
 import {
   CANVAS_DRAFT_STATE as CANVAS_DRAFT_STATE3,
   CANVAS_PUBLISHED_STATE as CANVAS_PUBLISHED_STATE3,
-  CanvasClient as CanvasClient2,
+  CompositionDeliveryClient as CompositionDeliveryClient2,
   EMPTY_COMPOSITION as EMPTY_COMPOSITION2
 } from "@uniformdev/canvas";
 var withUniformGetStaticProps = (options) => {
   var _a;
-  const canvasClient = (_a = options == null ? void 0 : options.client) != null ? _a : new CanvasClient2({
+  const canvasClient = (_a = options == null ? void 0 : options.client) != null ? _a : new CompositionDeliveryClient2({
     apiKey: process.env.UNIFORM_API_KEY,
     projectId: process.env.UNIFORM_PROJECT_ID,
     apiHost: process.env.UNIFORM_CLI_BASE_URL,
@@ -136,13 +137,14 @@ var withUniformGetStaticProps = (options) => {
     } else {
       try {
         const time = Date.now();
-        const response = await canvasClient.getCompositionByNodePath({
+        const getParams = {
           ...options == null ? void 0 : options.requestOptions,
           projectMapId,
           projectMapNodePath: pathString,
           state: preview || (options == null ? void 0 : options.preview) ? CANVAS_DRAFT_STATE3 : CANVAS_PUBLISHED_STATE3,
           releaseId
-        });
+        };
+        const response = "get" in canvasClient ? await canvasClient.get(getParams) : await canvasClient.getCompositionByNodePath(getParams);
         const duration = Date.now() - time;
         composition = response.composition;
         if (!(options == null ? void 0 : options.silent)) {

package/dist/route/index.js

@@ -309,7 +309,7 @@ function createRouteFetcher(options) {
           previewReleaseId
         });
         const time = Date.now();
-        const response = await routeClient.getRoute({
+        const response = await routeClient.get({
           ...resolvedOptions,
           state: (_b = (_a = resolvedOptions == null ? void 0 : resolvedOptions.state) != null ? _a : defaultPreviewState) != null ? _b : import_canvas.CANVAS_PUBLISHED_STATE,
           dataSourceVariant: (0, import_canvas.getDataSourceVariantFromRouteGetParams)(

package/dist/route/index.mjs

@@ -173,7 +173,7 @@ function createRouteFetcher(options) {
           previewReleaseId
         });
         const time = Date.now();
-        const response = await routeClient.getRoute({
+        const response = await routeClient.get({
           ...resolvedOptions,
           state: (_b = (_a = resolvedOptions == null ? void 0 : resolvedOptions.state) != null ? _a : defaultPreviewState) != null ? _b : CANVAS_PUBLISHED_STATE,
           dataSourceVariant: getDataSourceVariantFromRouteGetParams(

package/dist/slug/index.d.mts

@@ -2,7 +2,7 @@ import * as next from 'next';
 import { GetServerSidePropsContext, GetServerSideProps, GetStaticPropsContext, GetStaticProps } from 'next';
 import { c as UniformPreviewData, a as UniformGetServerSideProps, b as UniformGetStaticProps } from '../models-BGg_qtcM.mjs';
 import * as node_querystring from 'node:querystring';
-import { CanvasClient, CompositionGetBySlugParameters, DataResolutionOption, CompositionGetParameters, CompositionGetResponse } from '@uniformdev/canvas';
+import { CanvasClient, CompositionDeliveryClient, CompositionDeliveryReadOptions, CompositionGetBySlugParameters, DataResolutionOption, CompositionManagementListQuery, CompositionGetParameters, CompositionGetResponse, CompositionManagementClient } from '@uniformdev/canvas';
 import { ParsedUrlQuery } from 'querystring';
 import '@uniformdev/canvas-react';
 
@@ -17,9 +17,13 @@ declare const withUniformGetServerSideProps: <TProps extends {
     modifySlug?: (slug: string, context: GetServerSidePropsContext<ParsedUrlQuery, UniformPreviewData>) => string;
     /** Set to true if you want to include draft compositions */
     preview?: boolean;
-    /** If you need to override the default client, you can pass it here */
-    client?: CanvasClient;
-    requestOptions?: Omit<Partial<CompositionGetBySlugParameters & DataResolutionOption>, "state">;
+    /**
+     * If you need to override the default client, you can pass it here.
+     */
+    client?: CanvasClient | CompositionDeliveryClient;
+    requestOptions?: Omit<Partial<CompositionDeliveryReadOptions & {
+        slug: string;
+    }>, "state"> | Omit<Partial<CompositionGetBySlugParameters & DataResolutionOption>, "state">;
     callback?: UniformGetServerSideProps<TProps>;
     /** Disables logging of response information and timings */
     silent?: boolean;
@@ -31,12 +35,14 @@ declare const withUniformGetStaticPaths: (options?: {
     prefix?: string;
     /** Set to true if you want to include draft compositions */
     preview?: boolean;
-    /** Way to override getCompositionList request params */
-    requestOptions?: Partial<CompositionGetParameters>;
+    /** Way to override list request params */
+    requestOptions?: Partial<CompositionManagementListQuery> | Partial<CompositionGetParameters>;
     /** Way to modify list of slugs before building array of paths */
     callback?: (compositions: CompositionGetResponse[]) => Promise<CompositionGetResponse[]>;
-    /** If you need to override the default client, you can pass it here */
-    client?: CanvasClient;
+    /**
+     * If you need to override the default client, you can pass it here.
+     */
+    client?: CanvasClient | CompositionManagementClient;
 }) => () => Promise<{
     paths: string[];
     fallback: boolean;
@@ -53,10 +59,15 @@ declare const withUniformGetStaticProps: <TProps extends {
     modifySlug?: (slug: string, context: GetStaticPropsContext<ParsedUrlQuery, UniformPreviewData>) => string;
     /** Set to true if you want to include draft compositions */
     preview?: boolean;
-    /** If you need to override the default client, you can pass it here */
-    client?: CanvasClient;
-    /** Way to override getCompositionBySlug request params */
-    requestOptions?: Omit<Partial<CompositionGetBySlugParameters & DataResolutionOption>, "state">;
+    /**
+     * If you need to override the default client, you can pass it here.
+     * @deprecated Passing a `CanvasClient` is deprecated; pass a `CompositionDeliveryClient` instead.
+     */
+    client?: CanvasClient | CompositionDeliveryClient;
+    /** Way to override get request params */
+    requestOptions?: Omit<Partial<CompositionDeliveryReadOptions & {
+        slug: string;
+    }>, "state"> | Omit<Partial<CompositionGetBySlugParameters & DataResolutionOption>, "state">;
     /** Custom handler to specify return value and modify composition - e.g. enhance with CMS data */
     callback?: UniformGetStaticProps<TProps>;
     /** Disables logging of response information and timings */

package/dist/slug/index.d.ts

@@ -2,7 +2,7 @@ import * as next from 'next';
 import { GetServerSidePropsContext, GetServerSideProps, GetStaticPropsContext, GetStaticProps } from 'next';
 import { c as UniformPreviewData, a as UniformGetServerSideProps, b as UniformGetStaticProps } from '../models-BGg_qtcM.js';
 import * as node_querystring from 'node:querystring';
-import { CanvasClient, CompositionGetBySlugParameters, DataResolutionOption, CompositionGetParameters, CompositionGetResponse } from '@uniformdev/canvas';
+import { CanvasClient, CompositionDeliveryClient, CompositionDeliveryReadOptions, CompositionGetBySlugParameters, DataResolutionOption, CompositionManagementListQuery, CompositionGetParameters, CompositionGetResponse, CompositionManagementClient } from '@uniformdev/canvas';
 import { ParsedUrlQuery } from 'querystring';
 import '@uniformdev/canvas-react';
 
@@ -17,9 +17,13 @@ declare const withUniformGetServerSideProps: <TProps extends {
     modifySlug?: (slug: string, context: GetServerSidePropsContext<ParsedUrlQuery, UniformPreviewData>) => string;
     /** Set to true if you want to include draft compositions */
     preview?: boolean;
-    /** If you need to override the default client, you can pass it here */
-    client?: CanvasClient;
-    requestOptions?: Omit<Partial<CompositionGetBySlugParameters & DataResolutionOption>, "state">;
+    /**
+     * If you need to override the default client, you can pass it here.
+     */
+    client?: CanvasClient | CompositionDeliveryClient;
+    requestOptions?: Omit<Partial<CompositionDeliveryReadOptions & {
+        slug: string;
+    }>, "state"> | Omit<Partial<CompositionGetBySlugParameters & DataResolutionOption>, "state">;
     callback?: UniformGetServerSideProps<TProps>;
     /** Disables logging of response information and timings */
     silent?: boolean;
@@ -31,12 +35,14 @@ declare const withUniformGetStaticPaths: (options?: {
     prefix?: string;
     /** Set to true if you want to include draft compositions */
     preview?: boolean;
-    /** Way to override getCompositionList request params */
-    requestOptions?: Partial<CompositionGetParameters>;
+    /** Way to override list request params */
+    requestOptions?: Partial<CompositionManagementListQuery> | Partial<CompositionGetParameters>;
     /** Way to modify list of slugs before building array of paths */
     callback?: (compositions: CompositionGetResponse[]) => Promise<CompositionGetResponse[]>;
-    /** If you need to override the default client, you can pass it here */
-    client?: CanvasClient;
+    /**
+     * If you need to override the default client, you can pass it here.
+     */
+    client?: CanvasClient | CompositionManagementClient;
 }) => () => Promise<{
     paths: string[];
     fallback: boolean;
@@ -53,10 +59,15 @@ declare const withUniformGetStaticProps: <TProps extends {
     modifySlug?: (slug: string, context: GetStaticPropsContext<ParsedUrlQuery, UniformPreviewData>) => string;
     /** Set to true if you want to include draft compositions */
     preview?: boolean;
-    /** If you need to override the default client, you can pass it here */
-    client?: CanvasClient;
-    /** Way to override getCompositionBySlug request params */
-    requestOptions?: Omit<Partial<CompositionGetBySlugParameters & DataResolutionOption>, "state">;
+    /**
+     * If you need to override the default client, you can pass it here.
+     * @deprecated Passing a `CanvasClient` is deprecated; pass a `CompositionDeliveryClient` instead.
+     */
+    client?: CanvasClient | CompositionDeliveryClient;
+    /** Way to override get request params */
+    requestOptions?: Omit<Partial<CompositionDeliveryReadOptions & {
+        slug: string;
+    }>, "state"> | Omit<Partial<CompositionGetBySlugParameters & DataResolutionOption>, "state">;
     /** Custom handler to specify return value and modify composition - e.g. enhance with CMS data */
     callback?: UniformGetStaticProps<TProps>;
     /** Disables logging of response information and timings */

package/dist/slug/index.js

@@ -152,7 +152,7 @@ function resolveDiagnosticsDuration(data) {
 
 // src/slug/withUniformGetServerSideProps.ts
 var withUniformGetServerSideProps = (options) => {
-  const canvasClient = (options == null ? void 0 : options.client) || new import_canvas.CanvasClient({
+  const canvasClient = (options == null ? void 0 : options.client) || new import_canvas.CompositionDeliveryClient({
     apiKey: process.env.UNIFORM_API_KEY,
     projectId: process.env.UNIFORM_PROJECT_ID,
     apiHost: process.env.UNIFORM_CLI_BASE_URL,
@@ -176,13 +176,14 @@ var withUniformGetServerSideProps = (options) => {
     } else {
       try {
         const time = Date.now();
-        const response = await canvasClient.getCompositionBySlug({
+        const getParams = {
           ...options == null ? void 0 : options.requestOptions,
           slug,
           state: preview || (options == null ? void 0 : options.preview) ? import_canvas.CANVAS_DRAFT_STATE : import_canvas.CANVAS_PUBLISHED_STATE,
           diagnostics: true,
           releaseId
-        });
+        };
+        const response = "get" in canvasClient ? await canvasClient.get(getParams) : await canvasClient.getCompositionBySlug(getParams);
         const duration = Date.now() - time;
         composition = response.composition;
         if (!(options == null ? void 0 : options.silent)) {
@@ -209,16 +210,22 @@ var import_canvas2 = require("@uniformdev/canvas");
 var withUniformGetStaticPaths = (options) => {
   return async function wrappedGetStaticPaths() {
     var _a;
-    const canvasClient = (_a = options == null ? void 0 : options.client) != null ? _a : new import_canvas2.CanvasClient({
-      apiKey: process.env.UNIFORM_API_KEY,
-      projectId: process.env.UNIFORM_PROJECT_ID,
-      apiHost: process.env.UNIFORM_CLI_BASE_URL,
-      edgeApiHost: process.env.UNIFORM_CLI_BASE_EDGE_URL
-    });
-    const response = await canvasClient.getCompositionList({
+    const canvasClient = (_a = options == null ? void 0 : options.client) != null ? _a : (
+      // Build-time path enumeration only needs `_slug`, so read the lightweight
+      // canonical list from the origin (not the edge). bypassCache:false keeps the
+      // CDN-cacheable behavior of the old base CanvasClient at build time.
+      new import_canvas2.CompositionManagementClient({
+        apiKey: process.env.UNIFORM_API_KEY,
+        projectId: process.env.UNIFORM_PROJECT_ID,
+        apiHost: process.env.UNIFORM_CLI_BASE_URL,
+        bypassCache: false
+      })
+    );
+    const listParams = {
       ...options == null ? void 0 : options.requestOptions,
       state: (options == null ? void 0 : options.preview) ? import_canvas2.CANVAS_DRAFT_STATE : import_canvas2.CANVAS_PUBLISHED_STATE
-    });
+    };
+    const response = "list" in canvasClient ? await canvasClient.list(listParams) : await canvasClient.getCompositionList(listParams);
     const compositions = (options == null ? void 0 : options.callback) ? await options.callback(response.compositions) : response.compositions;
     const paths = compositions.filter((reference) => !!reference.composition._slug).map((composition) => {
       var _a2;
@@ -247,7 +254,7 @@ var resolveSlugFromParams = ({
 // src/slug/withUniformGetStaticProps.ts
 var withUniformGetStaticProps = (options) => {
   var _a;
-  const canvasClient = (_a = options == null ? void 0 : options.client) != null ? _a : new import_canvas3.CanvasClient({
+  const canvasClient = (_a = options == null ? void 0 : options.client) != null ? _a : new import_canvas3.CompositionDeliveryClient({
     apiKey: process.env.UNIFORM_API_KEY,
     projectId: process.env.UNIFORM_PROJECT_ID,
     apiHost: process.env.UNIFORM_CLI_BASE_URL,
@@ -274,12 +281,13 @@ var withUniformGetStaticProps = (options) => {
     } else {
       try {
         const time = Date.now();
-        const response = await canvasClient.getCompositionBySlug({
+        const getParams = {
           slug: slugString,
           state: preview || (options == null ? void 0 : options.preview) ? import_canvas3.CANVAS_DRAFT_STATE : import_canvas3.CANVAS_PUBLISHED_STATE,
           ...options == null ? void 0 : options.requestOptions,
           releaseId
-        });
+        };
+        const response = "get" in canvasClient ? await canvasClient.get(getParams) : await canvasClient.getCompositionBySlug(getParams);
         const duration = Date.now() - time;
         composition = response.composition;
         if (!(options == null ? void 0 : options.silent)) {

package/dist/slug/index.mjs

@@ -10,11 +10,11 @@ import {
 import {
   CANVAS_DRAFT_STATE,
   CANVAS_PUBLISHED_STATE,
-  CanvasClient,
+  CompositionDeliveryClient,
   EMPTY_COMPOSITION
 } from "@uniformdev/canvas";
 var withUniformGetServerSideProps = (options) => {
-  const canvasClient = (options == null ? void 0 : options.client) || new CanvasClient({
+  const canvasClient = (options == null ? void 0 : options.client) || new CompositionDeliveryClient({
     apiKey: process.env.UNIFORM_API_KEY,
     projectId: process.env.UNIFORM_PROJECT_ID,
     apiHost: process.env.UNIFORM_CLI_BASE_URL,
@@ -38,13 +38,14 @@ var withUniformGetServerSideProps = (options) => {
     } else {
       try {
         const time = Date.now();
-        const response = await canvasClient.getCompositionBySlug({
+        const getParams = {
           ...options == null ? void 0 : options.requestOptions,
           slug,
           state: preview || (options == null ? void 0 : options.preview) ? CANVAS_DRAFT_STATE : CANVAS_PUBLISHED_STATE,
           diagnostics: true,
           releaseId
-        });
+        };
+        const response = "get" in canvasClient ? await canvasClient.get(getParams) : await canvasClient.getCompositionBySlug(getParams);
         const duration = Date.now() - time;
         composition = response.composition;
         if (!(options == null ? void 0 : options.silent)) {
@@ -70,21 +71,27 @@ var withUniformGetServerSideProps = (options) => {
 import {
   CANVAS_DRAFT_STATE as CANVAS_DRAFT_STATE2,
   CANVAS_PUBLISHED_STATE as CANVAS_PUBLISHED_STATE2,
-  CanvasClient as CanvasClient2
+  CompositionManagementClient
 } from "@uniformdev/canvas";
 var withUniformGetStaticPaths = (options) => {
   return async function wrappedGetStaticPaths() {
     var _a;
-    const canvasClient = (_a = options == null ? void 0 : options.client) != null ? _a : new CanvasClient2({
-      apiKey: process.env.UNIFORM_API_KEY,
-      projectId: process.env.UNIFORM_PROJECT_ID,
-      apiHost: process.env.UNIFORM_CLI_BASE_URL,
-      edgeApiHost: process.env.UNIFORM_CLI_BASE_EDGE_URL
-    });
-    const response = await canvasClient.getCompositionList({
+    const canvasClient = (_a = options == null ? void 0 : options.client) != null ? _a : (
+      // Build-time path enumeration only needs `_slug`, so read the lightweight
+      // canonical list from the origin (not the edge). bypassCache:false keeps the
+      // CDN-cacheable behavior of the old base CanvasClient at build time.
+      new CompositionManagementClient({
+        apiKey: process.env.UNIFORM_API_KEY,
+        projectId: process.env.UNIFORM_PROJECT_ID,
+        apiHost: process.env.UNIFORM_CLI_BASE_URL,
+        bypassCache: false
+      })
+    );
+    const listParams = {
       ...options == null ? void 0 : options.requestOptions,
       state: (options == null ? void 0 : options.preview) ? CANVAS_DRAFT_STATE2 : CANVAS_PUBLISHED_STATE2
-    });
+    };
+    const response = "list" in canvasClient ? await canvasClient.list(listParams) : await canvasClient.getCompositionList(listParams);
     const compositions = (options == null ? void 0 : options.callback) ? await options.callback(response.compositions) : response.compositions;
     const paths = compositions.filter((reference) => !!reference.composition._slug).map((composition) => {
       var _a2;
@@ -101,12 +108,12 @@ var withUniformGetStaticPaths = (options) => {
 import {
   CANVAS_DRAFT_STATE as CANVAS_DRAFT_STATE3,
   CANVAS_PUBLISHED_STATE as CANVAS_PUBLISHED_STATE3,
-  CanvasClient as CanvasClient3,
+  CompositionDeliveryClient as CompositionDeliveryClient2,
   EMPTY_COMPOSITION as EMPTY_COMPOSITION2
 } from "@uniformdev/canvas";
 var withUniformGetStaticProps = (options) => {
   var _a;
-  const canvasClient = (_a = options == null ? void 0 : options.client) != null ? _a : new CanvasClient3({
+  const canvasClient = (_a = options == null ? void 0 : options.client) != null ? _a : new CompositionDeliveryClient2({
     apiKey: process.env.UNIFORM_API_KEY,
     projectId: process.env.UNIFORM_PROJECT_ID,
     apiHost: process.env.UNIFORM_CLI_BASE_URL,
@@ -133,12 +140,13 @@ var withUniformGetStaticProps = (options) => {
     } else {
       try {
         const time = Date.now();
-        const response = await canvasClient.getCompositionBySlug({
+        const getParams = {
           slug: slugString,
           state: preview || (options == null ? void 0 : options.preview) ? CANVAS_DRAFT_STATE3 : CANVAS_PUBLISHED_STATE3,
           ...options == null ? void 0 : options.requestOptions,
           releaseId
-        });
+        };
+        const response = "get" in canvasClient ? await canvasClient.get(getParams) : await canvasClient.getCompositionBySlug(getParams);
         const duration = Date.now() - time;
         composition = response.composition;
         if (!(options == null ? void 0 : options.silent)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniformdev/canvas-next",
-  "version": "20.74.6-alpha.3+ac26410bba",
+  "version": "20.74.7-alpha.12+f93a44837e",
   "description": "Next.js SDK for Uniform Canvas",
   "license": "SEE LICENSE IN LICENSE.txt",
   "main": "./dist/index.js",
@@ -66,12 +66,12 @@
     "apidocs-extract": "api-extractor run --local"
   },
   "dependencies": {
-    "@uniformdev/canvas": "20.74.6-alpha.3+ac26410bba",
-    "@uniformdev/canvas-react": "20.74.6-alpha.3+ac26410bba",
-    "@uniformdev/context": "20.74.6-alpha.3+ac26410bba",
-    "@uniformdev/project-map": "20.74.6-alpha.3+ac26410bba",
-    "@uniformdev/redirect": "20.74.6-alpha.3+ac26410bba",
-    "@uniformdev/richtext": "20.74.6-alpha.3+ac26410bba",
+    "@uniformdev/canvas": "20.74.7-alpha.12+f93a44837e",
+    "@uniformdev/canvas-react": "20.74.7-alpha.12+f93a44837e",
+    "@uniformdev/context": "20.74.7-alpha.12+f93a44837e",
+    "@uniformdev/project-map": "20.74.7-alpha.12+f93a44837e",
+    "@uniformdev/redirect": "20.74.7-alpha.12+f93a44837e",
+    "@uniformdev/richtext": "20.74.7-alpha.12+f93a44837e",
     "colorette": "2.0.20"
   },
   "peerDependencies": {
@@ -91,5 +91,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "ac26410bba86c828620eb1876847bbaffd639036"
+  "gitHead": "f93a44837e168f8ece4f56657a29a6f72467c1cb"
 }