uniformdev · trsergey25 · Dec 24, 2025 · Dec 24, 2025 · Dec 24, 2025
diff --git a/apps/csk-marketing-site/package.json b/apps/csk-marketing-site/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@uniformdev/csk-marketing-site",
-  "version": "6.1.60",
+  "version": "6.1.61",
   "private": true,
   "engines": {
     "yarn": "please-use-npm",

diff --git a/apps/csk-marketing-site/src/utils/canvas/canvasClients.ts b/apps/csk-marketing-site/src/utils/canvas/canvasClients.ts
@@ -1,19 +1,19 @@
 import { CanvasClient } from '@uniformdev/canvas';
 
 export const getCanvasClient = () => {
+  const projectId = process.env.UNIFORM_PROJECT_ID;
   const apiKey = process.env.UNIFORM_API_KEY;
   const apiHost = process.env.UNIFORM_CLI_BASE_URL || 'https://uniform.app';
   const edgeApiHost = process.env.UNIFORM_CLI_BASE_EDGE_URL || 'https://uniform.global';
-  const projectId = process.env.UNIFORM_PROJECT_ID;
+
+  if (!projectId) throw new Error('projectId is not specified. CanvasClient cannot be instantiated.');
 
   if (!apiKey) throw new Error('apiKey is not specified. CanvasClient cannot be instantiated');
 
   if (!apiHost) throw new Error('apiHost is not specified. CanvasClient cannot be instantiated');
 
   if (!edgeApiHost) throw new Error('edgeApiHost is not specified. CanvasClient cannot be instantiated');
 
-  if (!projectId) throw new Error('projectId is not specified. CanvasClient cannot be instantiated.');
-
   return new CanvasClient({
     apiKey,
     apiHost,

diff --git a/apps/csk-marketing-site/src/utils/canvas/contentClient.ts b/apps/csk-marketing-site/src/utils/canvas/contentClient.ts
@@ -3,10 +3,10 @@ import { RecipeItem } from '@/components/custom-canvas/RecipeList';
 
 export const getContentClient = () =>
   new ContentClient({
-    apiKey: process.env.UNIFORM_API_KEY,
-    apiHost: process.env.UNIFORM_CLI_BASE_URL || 'https://canary.uniform.app',
     projectId: process.env.UNIFORM_PROJECT_ID,
-    edgeApiHost: process.env.UNIFORM_CLI_BASE_EDGE_URL || 'https://canary.uniform.global',
+    apiKey: process.env.UNIFORM_API_KEY,
+    apiHost: process.env.UNIFORM_CLI_BASE_URL || 'https://uniform.app',
+    edgeApiHost: process.env.UNIFORM_CLI_BASE_EDGE_URL || 'https://uniform.global',
   });
 
 export const getRecipesByCategory = async ({

diff --git a/apps/csk-storybook/package.json b/apps/csk-storybook/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@uniformdev/csk-storybook",
-  "version": "6.1.60",
+  "version": "6.1.61",
   "description": "CSK vNext Storybook is an interactive Storybook build showcasing components from the CSK vNext component starter kit. It provides detailed documentation, live previews, and testing capabilities for easy integration into your projects.",
   "main": "index.js",
   "scripts": {

diff --git a/apps/csk/package.json b/apps/csk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@uniformdev/component-starter-kit",
-  "version": "6.1.60",
+  "version": "6.1.61",
   "private": true,
   "engines": {
     "yarn": "please-use-npm",

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "csk-packages",
-  "version": "6.1.60",
+  "version": "6.1.61",
   "private": true,
   "scripts": {
     "build": "turbo build",

diff --git a/packages/csk-cli/package.json b/packages/csk-cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@uniformdev/csk-cli",
-  "version": "6.1.60",
+  "version": "6.1.61",
   "description": "Command-line interface (CLI) tool designed to streamline the development workflow within Uniform projects. It provides commands for pulling additional data and generating components based on Canvas data",
   "license": "SEE LICENSE IN LICENSE.txt",
   "engines": {

diff --git a/packages/csk-cli/src/commands/pull/pull-locales.ts b/packages/csk-cli/src/commands/pull/pull-locales.ts
@@ -20,9 +20,9 @@ export const pullLocales = async () => {
   }
 
   const client = new LocaleClient({
-    apiHost: process.env.UNIFORM_CLI_BASE_URL,
-    apiKey: process.env.UNIFORM_API_KEY,
     projectId: process.env.UNIFORM_PROJECT_ID,
+    apiKey: process.env.UNIFORM_API_KEY,
+    apiHost: process.env.UNIFORM_CLI_BASE_URL || 'https://uniform.app',
   });
 
   const localeResponse: LocalesGetResponse = await client.get();

diff --git a/packages/csk-cli/src/commands/scaffold/utils.ts b/packages/csk-cli/src/commands/scaffold/utils.ts
@@ -11,10 +11,10 @@ import { supportedParameterHandlers } from './parameterHandlers';
 import { ParameterHandler } from './types';
 
 export const getCanvasClient = async () => {
-  const apiHost = process.env.UNIFORM_CLI_BASE_URL || 'https://uniform.app';
-  const edgeApiHost = process.env.UNIFORM_CLI_BASE_EDGE_URL || 'https://uniform.global';
   let projectId = process.env.UNIFORM_PROJECT_ID;
   let apiKey = process.env.UNIFORM_API_KEY;
+  const apiHost = process.env.UNIFORM_CLI_BASE_URL || 'https://uniform.app';
+  const edgeApiHost = process.env.UNIFORM_CLI_BASE_EDGE_URL || 'https://uniform.global';
 
   if (!projectId) {
     projectId = await input({

diff --git a/packages/csk-components/package.json b/packages/csk-components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@uniformdev/csk-components",
-  "version": "6.1.60",
+  "version": "6.1.61",
   "description": "Components Starter Kit that provides a set of basic components for building websites within a Uniform project",
   "license": "SEE LICENSE IN LICENSE.txt",
   "engines": {

diff --git a/packages/csk-components/src/components/canvas/Breadcrumbs/breadcrumbs.tsx b/packages/csk-components/src/components/canvas/Breadcrumbs/breadcrumbs.tsx
@@ -29,6 +29,7 @@ export const Breadcrumbs: FC<
     const client = new ProjectMapClient({
       projectId: process.env.UNIFORM_PROJECT_ID,
       apiKey: process.env.UNIFORM_API_KEY,
+      apiHost: process.env.UNIFORM_CLI_BASE_URL || 'https://uniform.app',
     });
 
     const { projectMapNodes } = compositionCache.getUniformComposition({ id: context?._id }) || {};
@@ -51,6 +52,8 @@ export const Breadcrumbs: FC<
             ? await new CanvasClient({
                 projectId: process.env.UNIFORM_PROJECT_ID,
                 apiKey: process.env.UNIFORM_API_KEY,
+                apiHost: process.env.UNIFORM_CLI_BASE_URL || 'https://uniform.app',
+                edgeApiHost: process.env.UNIFORM_CLI_BASE_EDGE_URL || 'https://uniform.global',
               })
                 .getCompositionById({ compositionId: node.compositionId })
                 .then(({ composition }) => {

diff --git a/packages/csk-components/src/components/canvas/ImageGallery/image-gallery.tsx b/packages/csk-components/src/components/canvas/ImageGallery/image-gallery.tsx
@@ -22,7 +22,7 @@ const ImageGallery: FC<ImageGalleryProps & ReplaceFieldsWithAssets<ImageGalleryP
   const slotsToRender = {
     ...slots.imageGalleryItems,
     items: !items?.length
-      ? slots.imageGalleryItems.items
+      ? slots.imageGalleryItems?.items || []
       : items.map((item, index) => ({
           _id: `image-${index}-${item?.id}`,
           component: <BaseImage src={item.url} alt={item.title || ''} style={{ objectFit: 'cover' }} fill />,

diff --git a/packages/csk-components/src/utils/sitemap.ts b/packages/csk-components/src/utils/sitemap.ts
@@ -2,9 +2,9 @@ import type { MetadataRoute } from 'next';
 import { ProjectMapClient, getNodeActiveCompositionEdition } from '@uniformdev/project-map';
 
 const projectMap = new ProjectMapClient({
-  apiHost: process.env.UNIFORM_CLI_BASE_URL! || 'https://uniform.app',
-  apiKey: process.env.UNIFORM_API_KEY!,
-  projectId: process.env.UNIFORM_PROJECT_ID!,
+  projectId: process.env.UNIFORM_PROJECT_ID,
+  apiKey: process.env.UNIFORM_API_KEY,
+  apiHost: process.env.UNIFORM_CLI_BASE_URL || 'https://uniform.app',
 });
 
 /**

diff --git a/packages/csk-recipes/package.json b/packages/csk-recipes/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@uniformdev/csk-recipes",
-  "version": "6.1.60",
+  "version": "6.1.61",
   "description": "command-line interface (CLI) and utility functions to help you work with recipes in a CSK project. It simplifies project initialization by allowing you to choose templates and include specific recipes",
   "license": "SEE LICENSE IN LICENSE.txt",
   "engines": {

diff --git a/packages/design-extensions-tools/package.json b/packages/design-extensions-tools/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@uniformdev/design-extensions-tools",
-  "version": "6.1.60",
+  "version": "6.1.61",
   "description": "Command-line interface (CLI) tool and a set of utilities for working with design extension integrations",
   "license": "SEE LICENSE IN LICENSE.txt",
   "engines": {

diff --git a/packages/eslint-config/package.json b/packages/eslint-config/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@repo/eslint-config",
-  "version": "6.1.60",
+  "version": "6.1.61",
   "type": "module",
   "private": true,
   "exports": {

diff --git a/packages/internal-scripts/package.json b/packages/internal-scripts/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@repo/internal-scripts",
-  "version": "6.1.60",
+  "version": "6.1.61",
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",

diff --git a/packages/typescript-config/package.json b/packages/typescript-config/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@repo/typescript-config",
-  "version": "6.1.60",
+  "version": "6.1.61",
   "private": true,
   "license": "MIT",
   "publishConfig": {