@contentstack/cli-cm-branches 1.6.1 → 1.6.3

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2024 Contentstack
+Copyright (c) 2026 Contentstack
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/README.md

@@ -37,7 +37,7 @@ $ npm install -g @contentstack/cli-cm-branches
 $ csdx COMMAND
 running command...
 $ csdx (--version)
-@contentstack/cli-cm-branches/1.6.1 linux-x64 node-v22.20.0
+@contentstack/cli-cm-branches/1.6.3 linux-x64 node-v22.22.0
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND

package/lib/branch/merge-handler.js

@@ -247,7 +247,7 @@ class MergeHandler {
                 mergeContent[module].deleted = moduleBranchCompareData.deleted;
                 break;
             default:
-                cli_utilities_1.cliux.error(`error: Invalid strategy ${strategy}`);
+                cli_utilities_1.cliux.error(`Error: Invalid strategy '${strategy}'`);
                 process.exit(1);
         }
     }

package/lib/commands/cm/branches/delete.js

@@ -21,7 +21,7 @@ class BranchDeleteCommand extends cli_command_1.Command {
         if (!branchDeleteFlags.yes) {
             const confirmBranch = await utils_1.interactive.askBranchNameConfirmation();
             if (confirmBranch !== branchDeleteFlags.uid) {
-                cli_utilities_1.cliux.error(`error: To delete the branch, enter a valid branch name '${branchDeleteFlags.uid}'`);
+                cli_utilities_1.cliux.error(`Error: To delete the branch, enter a valid branch name '${branchDeleteFlags.uid}'`);
                 process.exit(1);
             }
         }

package/lib/utils/asset-folder-create-script.js

@@ -146,13 +146,13 @@ function assetFolderCreateScript(contentType) {
     migration.addTask(createAssetTask());
   } else {
     if (apiKey.length === 0) {
-      console.error('Please provide api key using --stack-api-key flag');
+      console.error('Provide the API key using the --stack-api-key flag.');
     }
     if (!compareBranch) {
-      console.error('Please provide compare branch through --config compare-branch:<value> flag');
+      console.error('Specify the compare branch using the --config compare-branch:<value> flag.');
     }
     if (branch.length === 0) {
-      console.error('Please provide branch name through --branch flag');
+      console.error('Specify the branch name using the --branch flag.');
     }
   }
 }

package/lib/utils/entry-create-script.js

@@ -602,13 +602,13 @@ function entryCreateScript(contentType) {
       migration.addTask(createEntryTask());
     } else {
       if (apiKey.length === 0) {
-        console.error('Please provide api key using --stack-api-key flag');
+        console.error('Provide the API key using the --stack-api-key flag.');
       }
       if (!compareBranch) {
-        console.error('Please provide compare branch through --config compare-branch:<value> flag');
+        console.error('Specify the compare branch using the --config compare-branch:<value> flag.');
       }
       if (branch.length === 0) {
-        console.error('Please provide branch name through --branch flag');
+        console.error('Specify the branch name using the --branch flag.');
       }
     }
   };

package/lib/utils/entry-create-update-script.js

@@ -672,13 +672,13 @@ function entryCreateUpdateScript(contentType) {
       migration.addTask(updateEntryTask());
     } else {
       if (apiKey.length === 0) {
-        console.error('Please provide api key using --stack-api-key flag');
+        console.error('Provide the API key using the --stack-api-key flag.');
       }
       if (!compareBranch) {
-        console.error('Please provide compare branch through --config compare-branch:<value> flag');
+        console.error('Specify the compare branch using the --config compare-branch:<value> flag.');
       }
       if (branch.length === 0) {
-        console.error('Please provide branch name through --branch flag');
+        console.error('Specify the branch name using the --branch flag.');
       }
     }
   };`;

package/lib/utils/entry-update-script.js

@@ -669,13 +669,13 @@ function entryUpdateScript(contentType) {
       migration.addTask(updateEntryTask());
     } else {
       if (apiKey.length === 0) {
-        console.error('Please provide api key using --stack-api-key flag');
+        console.error('Provide the API key using the --stack-api-key flag.');
       }
       if (!compareBranch) {
-        console.error('Please provide compare branch through --config compare-branch:<value> flag');
+        console.error('Specify the compare branch using the --config compare-branch:<value> flag.');
       }
       if (branch.length === 0) {
-        console.error('Please provide branch name through --branch flag');
+        console.error('Specify the branch name using the --branch flag.');
       }
     }
   };`;

package/lib/utils/interactive.js

@@ -97,7 +97,7 @@ async function selectMergeStrategy() {
     })
         .then((name) => name)
         .catch((err) => {
-        cli_utilities_1.cliux.error('Failed to collect the merge strategy');
+        cli_utilities_1.cliux.error('Failed to retrieve the merge strategy.');
         process.exit(1);
     });
     return strategy;
@@ -119,7 +119,7 @@ async function selectMergeStrategySubOptions() {
     })
         .then((name) => name)
         .catch((err) => {
-        cli_utilities_1.cliux.error('Failed to collect the merge strategy');
+        cli_utilities_1.cliux.error('Failed to retrieve the merge strategy.');
         process.exit(1);
     });
     return strategy;
@@ -163,7 +163,7 @@ async function selectContentMergePreference() {
     })
         .then((name) => name)
         .catch((err) => {
-        cli_utilities_1.cliux.error('Failed to collect the preference');
+        cli_utilities_1.cliux.error('Failed to retrieve the preference.');
         process.exit(1);
     });
     return strategy;

package/oclif.manifest.json

@@ -364,5 +364,5 @@
       ]
     }
   },
-  "version": "1.6.1"
+  "version": "1.6.3"
 }

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@contentstack/cli-cm-branches",
   "description": "Contentstack CLI plugin to do branches operations",
-  "version": "1.6.1",
+  "version": "1.6.3",
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {
-    "@contentstack/cli-command": "~1.6.1",
+    "@contentstack/cli-command": "~1.7.2",
     "@oclif/core": "^4.3.0",
     "@oclif/plugin-help": "^6.2.28",
-    "@contentstack/cli-utilities": "~1.15.0",
+    "@contentstack/cli-utilities": "~1.17.0",
     "chalk": "^4.1.2",
     "just-diff": "^6.0.2",
     "lodash": "^4.17.21"
@@ -25,7 +25,7 @@
     "mocha": "10.8.2",
     "nyc": "^15.1.0",
     "oclif": "^4.17.46",
-    "sinon": "^19.0.5",
+    "sinon": "^21.0.1",
     "ts-node": "^10.9.2",
     "typescript": "^4.9.5"
   },