Merge pull request #2103 from contentstack/main

Main to Stage Back Merge

Author: cs-raj

.talismanrc

@@ -1,8 +1,8 @@
 fileignoreconfig:
 - filename: package-lock.json
-  checksum: f05190896a586676aaff19ef4c28a3a07b1c4a256665723453aaeac90773b614
+  checksum: 59d20d0ac10b0d5d4014817c8453e4aa9fe0be396f7902999373273a9d471658
 - filename: pnpm-lock.yaml
-  checksum: a1cb283667e727f59fba12ca1ea352acceff8429d6fa65d5786ad505dbd0808b
+  checksum: 7cade45c0e4ff4755b6e7d0f7ce0e40fa5b62131513d9f800635ef4288fdc058
 - filename: packages/contentstack-import-setup/test/unit/backup-handler.test.ts
   checksum: 0582d62b88834554cf12951c8690a73ef3ddbb78b82d2804d994cf4148e1ef93
 - filename: packages/contentstack-import-setup/test/config.json

package-lock.json

@@ -6,7 +6,7 @@
   "bugs": "https://github.com/rohitmishra209/cli-cm-clone/issues",
   "dependencies": {
     "@colors/colors": "^1.6.0",
-    "@contentstack/cli-cm-export": "~1.20.0",
+    "@contentstack/cli-cm-export": "~1.20.1",
     "@contentstack/cli-cm-import": "~1.27.0",
     "@contentstack/cli-command": "~1.6.1",
     "@contentstack/cli-utilities": "~1.14.0",

packages/contentstack-clone/package.json

@@ -48,7 +48,7 @@ $ npm install -g @contentstack/cli-cm-export
 $ csdx COMMAND
 running command...
 $ csdx (--version)
-@contentstack/cli-cm-export/1.18.0 darwin-arm64 node-v22.13.1
+@contentstack/cli-cm-export/1.20.1 darwin-arm64 node-v22.13.0
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND
@@ -76,7 +76,6 @@ FLAGS
                                   mention the branch name, then by default the content will be exported from all the
                                   branches of your stack.
   -a, --alias=<value>             The management token alias of the source stack from which you will export content.
-  -b, --branch-alias=<value>      (Optional) The alias of the branch from which you want to export content.
   -c, --config=<value>            [optional] Path of the config
   -d, --data-dir=<value>          The path or the location in your file system to store the exported content. For e.g.,
                                   ./content
@@ -88,6 +87,7 @@ FLAGS
   -t, --content-types=<value>...  [optional]  The UID of the content type(s) whose content you want to export. In case
                                   of multiple content types, specify the IDs separated by spaces.
   -y, --yes                       [optional] Force override all Marketplace prompts.
+      --branch-alias=<value>      (Optional) The alias of the branch from which you want to export content.
       --secured-assets            [optional] Use this flag for assets that are secured.
 
 DESCRIPTION
@@ -126,7 +126,6 @@ FLAGS
                                   mention the branch name, then by default the content will be exported from all the
                                   branches of your stack.
   -a, --alias=<value>             The management token alias of the source stack from which you will export content.
-  -b, --branch-alias=<value>      (Optional) The alias of the branch from which you want to export content.
   -c, --config=<value>            [optional] Path of the config
   -d, --data-dir=<value>          The path or the location in your file system to store the exported content. For e.g.,
                                   ./content
@@ -138,6 +137,7 @@ FLAGS
   -t, --content-types=<value>...  [optional]  The UID of the content type(s) whose content you want to export. In case
                                   of multiple content types, specify the IDs separated by spaces.
   -y, --yes                       [optional] Force override all Marketplace prompts.
+      --branch-alias=<value>      (Optional) The alias of the branch from which you want to export content.
       --secured-assets            [optional] Use this flag for assets that are secured.
 
 DESCRIPTION

packages/contentstack-export/README.md

@@ -1,7 +1,7 @@
 {
   "name": "@contentstack/cli-cm-export",
   "description": "Contentstack CLI plugin to export content from stack",
-  "version": "1.20.0",
+  "version": "1.20.1",
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {

packages/contentstack-export/package.json

@@ -96,7 +96,6 @@ export default class ExportCommand extends Command {
       exclusive: ['branch-alias'],
     }),
     'branch-alias': flags.string({
-      char: 'b',
       description: '(Optional) The alias of the branch from which you want to export content.',
       exclusive: ['branch'],
     }),

packages/contentstack-export/src/commands/cm/stacks/export.ts

@@ -18,7 +18,7 @@ $ npm install -g @contentstack/cli
 $ csdx COMMAND
 running command...
 $ csdx (--version|-v)
-@contentstack/cli/1.46.0 darwin-arm64 node-v22.14.0
+@contentstack/cli/1.46.1 darwin-arm64 node-v22.14.0
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND
@@ -2187,7 +2187,6 @@ FLAGS
                                   mention the branch name, then by default the content will be exported from all the
                                   branches of your stack.
   -a, --alias=<value>             The management token alias of the source stack from which you will export content.
-  -b, --branch-alias=<value>      (Optional) The alias of the branch from which you want to export content.
   -c, --config=<value>            [optional] Path of the config
   -d, --data-dir=<value>          The path or the location in your file system to store the exported content. For e.g.,
                                   ./content
@@ -2199,6 +2198,7 @@ FLAGS
   -t, --content-types=<value>...  [optional]  The UID of the content type(s) whose content you want to export. In case
                                   of multiple content types, specify the IDs separated by spaces.
   -y, --yes                       [optional] Force override all Marketplace prompts.
+      --branch-alias=<value>      (Optional) The alias of the branch from which you want to export content.
       --secured-assets            [optional] Use this flag for assets that are secured.
 
 DESCRIPTION
@@ -2812,7 +2812,6 @@ FLAGS
                                   mention the branch name, then by default the content will be exported from all the
                                   branches of your stack.
   -a, --alias=<value>             The management token alias of the source stack from which you will export content.
-  -b, --branch-alias=<value>      (Optional) The alias of the branch from which you want to export content.
   -c, --config=<value>            [optional] Path of the config
   -d, --data-dir=<value>          The path or the location in your file system to store the exported content. For e.g.,
                                   ./content
@@ -2824,6 +2823,7 @@ FLAGS
   -t, --content-types=<value>...  [optional]  The UID of the content type(s) whose content you want to export. In case
                                   of multiple content types, specify the IDs separated by spaces.
   -y, --yes                       [optional] Force override all Marketplace prompts.
+      --branch-alias=<value>      (Optional) The alias of the branch from which you want to export content.
       --secured-assets            [optional] Use this flag for assets that are secured.
 
 DESCRIPTION

packages/contentstack/README.md

@@ -1,7 +1,7 @@
 {
   "name": "@contentstack/cli",
   "description": "Command-line tool (CLI) to interact with Contentstack",
-  "version": "1.46.0",
+  "version": "1.46.1",
   "author": "Contentstack",
   "bin": {
     "csdx": "./bin/run.js"
@@ -28,7 +28,7 @@
     "@contentstack/cli-cm-branches": "~1.5.1",
     "@contentstack/cli-cm-bulk-publish": "~1.10.0",
     "@contentstack/cli-cm-clone": "~1.16.0",
-    "@contentstack/cli-cm-export": "~1.20.0",
+    "@contentstack/cli-cm-export": "~1.20.1",
     "@contentstack/cli-cm-export-to-csv": "~1.9.1",
     "@contentstack/cli-cm-import": "~1.27.0",
     "@contentstack/cli-cm-import-setup": "1.4.2",