diff --git a/apps/csk-marketing-site/package.json b/apps/csk-marketing-site/package.json index d02571130..909f4e1b8 100644 --- 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 index 4f12631a5..31124d4e6 100644 --- a/apps/csk-marketing-site/src/utils/canvas/canvasClients.ts +++ b/apps/csk-marketing-site/src/utils/canvas/canvasClients.ts @@ -1,10 +1,12 @@ 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'); @@ -12,8 +14,6 @@ export const getCanvasClient = () => { 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 index e60f3e239..5cbc4ee62 100644 --- 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 index c979e2af3..c430f197b 100644 --- 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 index f35a3b254..0d87fdcbc 100644 --- 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", @@ -53,6 +53,7 @@ "@eslint/eslintrc": "^3.2.0", "@tailwindcss/postcss": "^4.1.11", "@tailwindcss/typography": "^0.5.16", + "@types/js-cookie": "^3.0.6", "@types/node": "^24.10.0", "@types/react": "^19.2.7", "@types/react-dom": "^19.2.3", diff --git a/package-lock.json b/package-lock.json index 3244ac0d1..4f0adfda4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "csk-packages", - "version": "6.1.60", + "version": "6.1.61", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "csk-packages", - "version": "6.1.60", + "version": "6.1.61", "workspaces": [ "apps/*", "packages/*" @@ -27,7 +27,7 @@ }, "apps/csk": { "name": "@uniformdev/component-starter-kit", - "version": "6.1.60", + "version": "6.1.61", "dependencies": { "@uniformdev/assets": "20.7.1-alpha.120", "@uniformdev/canvas": "20.7.1-alpha.120", @@ -46,6 +46,7 @@ "@eslint/eslintrc": "^3.2.0", "@tailwindcss/postcss": "^4.1.11", "@tailwindcss/typography": "^0.5.16", + "@types/js-cookie": "^3.0.6", "@types/node": "^24.10.0", "@types/react": "^19.2.7", "@types/react-dom": "^19.2.3", @@ -73,7 +74,7 @@ }, "apps/csk-marketing-site": { "name": "@uniformdev/csk-marketing-site", - "version": "6.1.60", + "version": "6.1.61", "dependencies": { "@uniformdev/assets": "20.7.1-alpha.120", "@uniformdev/canvas": "20.7.1-alpha.120", @@ -131,7 +132,7 @@ }, "apps/csk-storybook": { "name": "@uniformdev/csk-storybook", - "version": "6.1.60", + "version": "6.1.61", "devDependencies": { "@chromatic-com/storybook": "^4.1.3", "@repo/eslint-config": "*", @@ -21777,7 +21778,7 @@ }, "packages/csk-cli": { "name": "@uniformdev/csk-cli", - "version": "6.1.60", + "version": "6.1.61", "license": "SEE LICENSE IN LICENSE.txt", "dependencies": { "@inquirer/prompts": "^7.1.0", @@ -21848,7 +21849,7 @@ }, "packages/csk-components": { "name": "@uniformdev/csk-components", - "version": "6.1.60", + "version": "6.1.61", "license": "SEE LICENSE IN LICENSE.txt", "dependencies": { "@inquirer/prompts": "^7.1.0", @@ -21939,7 +21940,7 @@ }, "packages/csk-recipes": { "name": "@uniformdev/csk-recipes", - "version": "6.1.60", + "version": "6.1.61", "license": "SEE LICENSE IN LICENSE.txt", "dependencies": { "@inquirer/prompts": "^7.1.0", @@ -22013,7 +22014,7 @@ }, "packages/design-extensions-tools": { "name": "@uniformdev/design-extensions-tools", - "version": "6.1.60", + "version": "6.1.61", "license": "SEE LICENSE IN LICENSE.txt", "dependencies": { "@inquirer/prompts": "^7.1.0", @@ -22082,7 +22083,7 @@ }, "packages/eslint-config": { "name": "@repo/eslint-config", - "version": "6.1.60", + "version": "6.1.61", "devDependencies": { "@eslint/js": "^9.31.0", "@next/eslint-plugin-next": "^16.1.1", @@ -22116,12 +22117,12 @@ }, "packages/internal-scripts": { "name": "@repo/internal-scripts", - "version": "6.1.60", + "version": "6.1.61", "license": "ISC" }, "packages/typescript-config": { "name": "@repo/typescript-config", - "version": "6.1.60", + "version": "6.1.61", "license": "MIT" } } diff --git a/package.json b/package.json index 42eea552f..9e9527298 100644 --- 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 index 6776b679a..938e9383d 100644 --- 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 index 9fac4dba5..09a748897 100644 --- 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 index 27f9cfc44..7050b3798 100644 --- 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 index 5d02ba54a..78c972211 100644 --- 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 index 1144ffa6c..383e8616b 100644 --- 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 index 2eee4ea03..56006ab1f 100644 --- 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 ({ _id: `image-${index}-${item?.id}`, component: , diff --git a/packages/csk-components/src/utils/sitemap.ts b/packages/csk-components/src/utils/sitemap.ts index 78710ade3..a0549dce9 100644 --- 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 index 49990938c..ee9c8a7da 100644 --- 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 index fcd18c0ab..d0af3902c 100644 --- 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 index 97a079a79..f5a341858 100644 --- 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 index 62aa0dc92..57f9c73be 100644 --- 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 index 4fa7967bb..41ce7d7e6 100644 --- 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": {