@contentstack/cli 1.60.0 → 1.61.0

package/README.md

@@ -18,7 +18,7 @@ $ npm install -g @contentstack/cli
 $ csdx COMMAND
 running command...
 $ csdx (--version|-v)
-@contentstack/cli/1.60.0 linux-x64 node-v22.22.1
+@contentstack/cli/1.61.0 linux-x64 node-v22.22.2
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND
@@ -45,6 +45,7 @@ USAGE
 * [`csdx cm:branches:delete [-uid <value>] [-k <value>]`](#csdx-cmbranchesdelete--uid-value--k-value)
 * [`csdx cm:branches:diff [--base-branch <value>] [--compare-branch <value>] [-k <value>][--module <value>] [--format <value>] [--csv-path <value>]`](#csdx-cmbranchesdiff---base-branch-value---compare-branch-value--k-value--module-value---format-value---csv-path-value)
 * [`csdx cm:branches:merge [-k <value>][--compare-branch <value>] [--no-revert] [--export-summary-path <value>] [--use-merge-summary <value>] [--comment <value>] [--base-branch <value>]`](#csdx-cmbranchesmerge--k-value--compare-branch-value---no-revert---export-summary-path-value---use-merge-summary-value---comment-value---base-branch-value)
+* [`csdx cm:branches:merge-status -k <value> --merge-uid <value>`](#csdx-cmbranchesmerge-status--k-value---merge-uid-value)
 * [`csdx cm:bulk-publish`](#csdx-cmbulk-publish)
 * [`csdx cm:entries:update-and-publish [-a <value>] [--retry-failed <value>] [--bulk-publish <value>] [--content-types <value>] [-t <value>] [-e <value>] [-c <value>] [-y] [--locales <value>] [--branch <value>]`](#csdx-cmentriesupdate-and-publish--a-value---retry-failed-value---bulk-publish-value---content-types-value--t-value--e-value--c-value--y---locales-value---branch-value)
 * [`csdx cm:assets:publish [-a <value>] [--retry-failed <value>] [-e <value>] [--folder-uid <value>] [--bulk-publish <value>] [-c <value>] [-y] [--locales <value>] [--branch <value>] [--delivery-token <value>] [--source-env <value>]`](#csdx-cmassetspublish--a-value---retry-failed-value--e-value---folder-uid-value---bulk-publish-value--c-value--y---locales-value---branch-value---delivery-token-value---source-env-value)
@@ -793,6 +794,29 @@ EXAMPLES
 
 _See code: [@contentstack/cli-cm-branches](https://github.com/contentstack/cli/blob/main/packages/contentstack-export/src/commands/cm/branches/merge.ts)_
 
+## `csdx cm:branches:merge-status -k <value> --merge-uid <value>`
+
+Check the status of a branch merge job
+
+```
+USAGE
+  $ csdx cm:branches:merge-status -k <value> --merge-uid <value>
+
+FLAGS
+  -k, --stack-api-key=<value>  (required) Provide your stack API key.
+      --merge-uid=<value>      (required) Merge job UID to check status for.
+
+DESCRIPTION
+  Check the status of a branch merge job
+
+EXAMPLES
+  $ csdx cm:branches:merge-status -k bltxxxxxxxx --merge-uid merge_abc123
+
+  $ csdx cm:branches:merge-status --stack-api-key bltxxxxxxxx --merge-uid merge_abc123
+```
+
+_See code: [@contentstack/cli-cm-branches](https://github.com/contentstack/cli/blob/main/packages/contentstack-export/src/commands/cm/branches/merge-status.ts)_
+
 ## `csdx cm:bulk-publish`
 
 Bulk Publish script for managing entries and assets
@@ -3829,7 +3853,7 @@ DESCRIPTION
   Display help for csdx.
 ```
 
-_See code: [@oclif/plugin-help](https://github.com/oclif/plugin-help/blob/v6.2.37/src/commands/help.ts)_
+_See code: [@oclif/plugin-help](https://github.com/oclif/plugin-help/blob/6.2.44/src/commands/help.ts)_
 
 ## `csdx launch`
 
@@ -3838,10 +3862,11 @@ Launch related operations
 ```
 USAGE
   $ csdx launch [-d <value>] [-c <value>] [--type GitHub|FileUpload] [--framework Gatsby|NextJs|CRA (Create
-    React App)|CSR (Client-Side Rendered)|Angular|Nuxt|VueJs|Remix|Other] [--org <value>] [-n <value>] [-e <value>]
-    [--branch <value>] [--build-command <value>] [--out-dir <value>] [--server-command <value>] [--variable-type Import
-    variables from a stack|Manually add custom variables to the list|Import variables from the .env.local file|Skip
-    adding environment variables...] [-a <value>] [--env-variables <value>] [--redeploy-latest] [--redeploy-last-upload]
+    React App)|CSR (Client-Side Rendered)|Analog|Angular|Nuxt|Astro|VueJs|Remix|Other] [--org <value>] [-n <value>] [-e
+    <value>] [--branch <value>] [--build-command <value>] [--out-dir <value>] [--server-command <value>]
+    [--variable-type Import variables from a stack|Manually add custom variables to the list|Import variables from the
+    .env.local file|Skip adding environment variables...] [-a <value>] [--env-variables <value>] [--redeploy-latest]
+    [--redeploy-last-upload]
 
 FLAGS
   -a, --alias=<value>              [optional] Alias (name) for the delivery token.
@@ -3855,7 +3880,7 @@ FLAGS
                                    comma. For example: APP_ENV:prod, TEST_ENV:testVal.
       --framework=<option>         [optional] Type of framework. <options: Gatsby|NextJS|Other>
                                    <options: Gatsby|NextJs|CRA (Create React App)|CSR (Client-Side
-                                   Rendered)|Angular|Nuxt|VueJs|Remix|Other>
+                                   Rendered)|Analog|Angular|Nuxt|Astro|VueJs|Remix|Other>
       --org=<value>                [optional] Provide the organization UID to create a new project or deployment.
       --out-dir=<value>            [optional] Output Directory.
       --redeploy-last-upload       [optional] Redeploy with last file upload
@@ -4148,7 +4173,7 @@ EXAMPLES
   $ csdx plugins
 ```
 
-_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.56/src/commands/plugins/index.ts)_
+_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/5.4.61/src/commands/plugins/index.ts)_
 
 ## `csdx plugins:add PLUGIN`
 
@@ -4222,7 +4247,7 @@ EXAMPLES
   $ csdx plugins:inspect myplugin
 ```
 
-_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.56/src/commands/plugins/inspect.ts)_
+_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/5.4.61/src/commands/plugins/inspect.ts)_
 
 ## `csdx plugins:install PLUGIN`
 
@@ -4271,7 +4296,7 @@ EXAMPLES
     $ csdx plugins:install someuser/someplugin
 ```
 
-_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.56/src/commands/plugins/install.ts)_
+_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/5.4.61/src/commands/plugins/install.ts)_
 
 ## `csdx plugins:link PATH`
 
@@ -4302,7 +4327,7 @@ EXAMPLES
   $ csdx plugins:link myplugin
 ```
 
-_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.56/src/commands/plugins/link.ts)_
+_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/5.4.61/src/commands/plugins/link.ts)_
 
 ## `csdx plugins:remove [PLUGIN]`
 
@@ -4343,7 +4368,7 @@ FLAGS
   --reinstall  Reinstall all plugins after uninstalling.
 ```
 
-_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.56/src/commands/plugins/reset.ts)_
+_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/5.4.61/src/commands/plugins/reset.ts)_
 
 ## `csdx plugins:uninstall [PLUGIN]`
 
@@ -4371,7 +4396,7 @@ EXAMPLES
   $ csdx plugins:uninstall myplugin
 ```
 
-_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.56/src/commands/plugins/uninstall.ts)_
+_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/5.4.61/src/commands/plugins/uninstall.ts)_
 
 ## `csdx plugins:unlink [PLUGIN]`
 
@@ -4415,7 +4440,7 @@ DESCRIPTION
   Update installed plugins.
 ```
 
-_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.56/src/commands/plugins/update.ts)_
+_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/5.4.61/src/commands/plugins/update.ts)_
 
 ## `csdx tokens`
 

package/oclif.manifest.json

@@ -1,4 +1,4 @@
 {
   "commands": {},
-  "version": "1.60.0"
+  "version": "1.61.0"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@contentstack/cli",
   "description": "Command-line tool (CLI) to interact with Contentstack",
-  "version": "1.60.0",
+  "version": "1.61.0",
   "author": "Contentstack",
   "bin": {
     "csdx": "./bin/run.js"
@@ -19,26 +19,26 @@
     "prepack": "pnpm compile && oclif manifest && oclif readme"
   },
   "dependencies": {
-    "@contentstack/cli-audit": "~1.19.0",
-    "@contentstack/cli-cm-export": "~1.24.0",
-    "@contentstack/cli-cm-import": "~1.32.0",
-    "@contentstack/cli-auth": "~1.8.0",
-    "@contentstack/cli-cm-bootstrap": "~1.19.0",
-    "@contentstack/cli-cm-branches": "~1.7.0",
-    "@contentstack/cli-cm-bulk-publish": "~1.11.0",
-    "@contentstack/cli-cm-clone": "~1.21.0",
-    "@contentstack/cli-cm-export-to-csv": "~1.12.0",
-    "@contentstack/cli-cm-import-setup": "~1.8.0",
+    "@contentstack/cli-audit": "~1.19.2",
+    "@contentstack/cli-cm-export": "~1.24.2",
+    "@contentstack/cli-cm-import": "~1.32.2",
+    "@contentstack/cli-auth": "~1.8.1",
+    "@contentstack/cli-cm-bootstrap": "~1.19.1",
+    "@contentstack/cli-cm-branches": "~1.8.0",
+    "@contentstack/cli-cm-bulk-publish": "~1.11.2",
+    "@contentstack/cli-cm-clone": "~1.21.2",
+    "@contentstack/cli-cm-export-to-csv": "~1.12.1",
+    "@contentstack/cli-cm-import-setup": "~1.8.2",
     "@contentstack/cli-cm-migrate-rte": "~1.6.4",
-    "@contentstack/cli-cm-seed": "~1.15.0",
-    "@contentstack/cli-command": "~1.8.0",
-    "@contentstack/cli-config": "~1.20.0",
-    "@contentstack/cli-launch": "^1.9.6",
-    "@contentstack/cli-migration": "~1.12.0",
-    "@contentstack/cli-utilities": "~1.18.0",
-    "@contentstack/cli-variants": "~1.4.0",
-    "@contentstack/management": "~1.27.5",
-    "@oclif/core": "^4.8.3",
+    "@contentstack/cli-cm-seed": "~1.15.1",
+    "@contentstack/cli-command": "~1.8.1",
+    "@contentstack/cli-config": "~1.20.2",
+    "@contentstack/cli-launch": "^1.9.7",
+    "@contentstack/cli-migration": "~1.12.1",
+    "@contentstack/cli-utilities": "~1.18.2",
+    "@contentstack/cli-variants": "~1.4.2",
+    "@contentstack/management": "~1.30.1",
+    "@oclif/core": "^4.10.5",
     "@oclif/plugin-help": "^6.2.28",
     "@oclif/plugin-not-found": "^3.2.53",
     "@oclif/plugin-plugins": "^5.4.54",
@@ -170,4 +170,4 @@
     }
   },
   "repository": "https://github.com/contentstack/cli"
-}
+}