@contentstack/cli 1.60.1 → 1.61.1

package/README.md

@@ -18,7 +18,7 @@ $ npm install -g @contentstack/cli
 $ csdx COMMAND
 running command...
 $ csdx (--version|-v)
-@contentstack/cli/1.60.1 linux-x64 node-v22.22.2
+@contentstack/cli/1.61.1 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/6.2.43/src/commands/help.ts)_
+_See code: [@oclif/plugin-help](https://github.com/oclif/plugin-help/blob/6.2.46/src/commands/help.ts)_
 
 ## `csdx launch`
 
@@ -4149,7 +4173,7 @@ EXAMPLES
   $ csdx plugins
 ```
 
-_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/5.4.59/src/commands/plugins/index.ts)_
+_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/5.4.63/src/commands/plugins/index.ts)_
 
 ## `csdx plugins:add PLUGIN`
 
@@ -4223,7 +4247,7 @@ EXAMPLES
   $ csdx plugins:inspect myplugin
 ```
 
-_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/5.4.59/src/commands/plugins/inspect.ts)_
+_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/5.4.63/src/commands/plugins/inspect.ts)_
 
 ## `csdx plugins:install PLUGIN`
 
@@ -4272,7 +4296,7 @@ EXAMPLES
     $ csdx plugins:install someuser/someplugin
 ```
 
-_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/5.4.59/src/commands/plugins/install.ts)_
+_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/5.4.63/src/commands/plugins/install.ts)_
 
 ## `csdx plugins:link PATH`
 
@@ -4303,7 +4327,7 @@ EXAMPLES
   $ csdx plugins:link myplugin
 ```
 
-_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/5.4.59/src/commands/plugins/link.ts)_
+_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/5.4.63/src/commands/plugins/link.ts)_
 
 ## `csdx plugins:remove [PLUGIN]`
 
@@ -4344,7 +4368,7 @@ FLAGS
   --reinstall  Reinstall all plugins after uninstalling.
 ```
 
-_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/5.4.59/src/commands/plugins/reset.ts)_
+_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/5.4.63/src/commands/plugins/reset.ts)_
 
 ## `csdx plugins:uninstall [PLUGIN]`
 
@@ -4372,7 +4396,7 @@ EXAMPLES
   $ csdx plugins:uninstall myplugin
 ```
 
-_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/5.4.59/src/commands/plugins/uninstall.ts)_
+_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/5.4.63/src/commands/plugins/uninstall.ts)_
 
 ## `csdx plugins:unlink [PLUGIN]`
 
@@ -4416,7 +4440,7 @@ DESCRIPTION
   Update installed plugins.
 ```
 
-_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/5.4.59/src/commands/plugins/update.ts)_
+_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/5.4.63/src/commands/plugins/update.ts)_
 
 ## `csdx tokens`
 

package/lib/utils/context-handler.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
-const shortUUID = tslib_1.__importStar(require("short-uuid"));
 const path = tslib_1.__importStar(require("path"));
 const cli_utilities_1 = require("@contentstack/cli-utilities");
 const node_machine_id_1 = require("node-machine-id");
@@ -22,7 +21,7 @@ class CsdxContext {
             cli_utilities_1.configHandler.set('clientId', this.clientId);
         }
         analyticsInfo.push(this.clientId);
-        const sessionId = shortUUID.generate();
+        const sessionId = (0, cli_utilities_1.generateShortUid)();
         cli_utilities_1.configHandler.set('sessionId', sessionId);
         this.sessionId = sessionId;
         analyticsInfo.push(this.sessionId);

package/oclif.manifest.json

@@ -1,4 +1,4 @@
 {
   "commands": {},
-  "version": "1.60.1"
+  "version": "1.61.1"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@contentstack/cli",
   "description": "Command-line tool (CLI) to interact with Contentstack",
-  "version": "1.60.1",
+  "version": "1.61.1",
   "author": "Contentstack",
   "bin": {
     "csdx": "./bin/run.js"
@@ -19,39 +19,31 @@
     "prepack": "pnpm compile && oclif manifest && oclif readme"
   },
   "dependencies": {
-    "@contentstack/cli-audit": "~1.19.1",
-    "@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.1",
-    "@contentstack/cli-cm-bulk-publish": "~1.11.1",
-    "@contentstack/cli-cm-clone": "~1.21.1",
-    "@contentstack/cli-cm-export-to-csv": "~1.12.0",
-    "@contentstack/cli-cm-import-setup": "~1.8.1",
+    "@contentstack/cli-audit": "~1.19.3",
+    "@contentstack/cli-cm-export": "~1.24.3",
+    "@contentstack/cli-cm-import": "~1.32.3",
+    "@contentstack/cli-auth": "~1.8.2",
+    "@contentstack/cli-cm-bootstrap": "~1.19.2",
+    "@contentstack/cli-cm-branches": "~1.8.1",
+    "@contentstack/cli-cm-bulk-publish": "~1.11.3",
+    "@contentstack/cli-cm-clone": "~1.21.3",
+    "@contentstack/cli-cm-export-to-csv": "~1.12.2",
+    "@contentstack/cli-cm-import-setup": "~1.8.3",
     "@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.1",
-    "@contentstack/cli-launch": "^1.9.7",
-    "@contentstack/cli-migration": "~1.12.0",
-    "@contentstack/cli-utilities": "~1.18.1",
-    "@contentstack/cli-variants": "~1.4.1",
-    "@contentstack/management": "~1.27.5",
-    "@oclif/core": "^4.8.3",
+    "@contentstack/cli-cm-seed": "~1.15.2",
+    "@contentstack/cli-command": "~1.8.2",
+    "@contentstack/cli-config": "~1.20.3",
+    "@contentstack/cli-launch": "^1.9.8",
+    "@contentstack/cli-migration": "~1.12.2",
+    "@contentstack/cli-utilities": "~1.18.3",
+    "@contentstack/cli-variants": "~1.4.3",
+    "@oclif/core": "^4.10.5",
     "@oclif/plugin-help": "^6.2.28",
     "@oclif/plugin-not-found": "^3.2.53",
     "@oclif/plugin-plugins": "^5.4.54",
-    "chalk": "^4.1.2",
-    "debug": "^4.4.1",
     "figlet": "1.8.1",
-    "inquirer": "8.2.7",
     "node-machine-id": "^1.1.12",
-    "open": "^8.4.2",
-    "semver": "^7.7.2",
-    "short-uuid": "^4.2.2",
-    "uuid": "^9.0.1",
-    "winston": "^3.17.0"
+    "semver": "^7.7.2"
   },
   "overrides": {
     "@oclif/core": {
@@ -61,14 +53,12 @@
   "devDependencies": {
     "@oclif/test": "^4.1.16",
     "@types/chai": "^4.3.20",
-    "@types/inquirer": "^9.0.9",
-    "@types/mkdirp": "^1.0.2",
     "@types/mocha": "^8.2.3",
     "@types/node": "^14.18.63",
     "@types/semver": "^7.7.0",
     "@types/sinon": "^21.0.0",
     "chai": "^4.5.0",
-    "eslint": "^8.57.1",
+    "eslint": "^9.26.0",
     "eslint-config-oclif": "^6.0.137",
     "eslint-config-oclif-typescript": "^3.1.14",
     "globby": "^10.0.2",