feat(csk-recipes): use package version for external branch suffix (#165)

Author: trsergey25

apps/csk-marketing-site/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniformdev/csk-marketing-site",
-  "version": "6.0.103",
+  "version": "6.0.104",
   "private": true,
   "engines": {
     "yarn": "please-use-npm",

apps/csk-storybook/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniformdev/csk-storybook",
-  "version": "6.0.103",
+  "version": "6.0.104",
   "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": {

apps/csk/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniformdev/component-starter-kit",
-  "version": "6.0.103",
+  "version": "6.0.104",
   "private": true,
   "engines": {
     "yarn": "please-use-npm",

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "csk-packages",
-  "version": "6.0.103",
+  "version": "6.0.104",
   "private": true,
   "scripts": {
     "build": "turbo build",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniformdev/csk-cli",
-  "version": "6.0.103",
+  "version": "6.0.104",
   "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": {

packages/csk-cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniformdev/csk-components",
-  "version": "6.0.103",
+  "version": "6.0.104",
   "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": {

packages/csk-components/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniformdev/csk-recipes",
-  "version": "6.0.103",
+  "version": "6.0.104",
   "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": {

packages/csk-recipes/package.json

@@ -22,6 +22,7 @@ import {
   RECIPE_SPECIFIC_BRANCHES,
   TEMPLATES,
   REQUIRED_UNIFORM_ENV_VARIABLES,
+  PACKAGE_VERSION,
 } from '../../constants';
 import { runCmdCommand, spawnCmdCommand } from '../../utils';
 
@@ -322,11 +323,12 @@ export const copyDirectory = (sourceDir: string, targetDir: string): void => {
 };
 
 /**
- * Gets the external branch name based on the template.
+ * Returns the formatted external branch name based on template, recipes, and environment.
  *
- * @param {string} template - The template name
- * @param {Recipe[]} recipes - The recipes to check
- * @returns {string} The formatted branch name
+ * @param template - Template name (e.g., 'baseline' or other)
+ * @param recipes - Array of Recipe identifiers
+ * @param dev - Whether to use the dev suffix or package version
+ * @returns Formatted branch name string
  */
 export const getExternalBranchName = (template: string, recipes: Recipe[], dev: boolean): string => {
   const getBranchName = () => {
@@ -345,7 +347,8 @@ export const getExternalBranchName = (template: string, recipes: Recipe[], dev:
     return `${TEMPLATE_BRANCH_PREFIX_LOCAL}${template}`;
   };
 
-  return dev ? `${getBranchName()}-dev` : getBranchName();
+  const suffix = dev ? '-dev' : `-${PACKAGE_VERSION}`;
+  return `${getBranchName()}${suffix}`;
 };
 
 /**

packages/csk-recipes/src/commands/init/utils.ts

@@ -1,5 +1,8 @@
+import packageJson from '../package.json';
 import { EnvVariable, Recipe, Template } from './commands/init/types';
 
+export const PACKAGE_VERSION = packageJson.version;
+
 export const TEMPLATE_BRANCH_PREFIX = 'refs/heads/templates/';
 export const TEMPLATE_BRANCH_PREFIX_LOCAL = 'templates/';