Merge development to staging

packages/contentstack-auth/README.md

@@ -18,7 +18,7 @@ $ npm install -g @contentstack/cli-auth
 $ csdx COMMAND
 running command...
 $ csdx (--version)
-@contentstack/cli-auth/1.3.8 darwin-x64 node-v18.16.0
+@contentstack/cli-auth/1.3.9 darwin-arm64 node-v18.16.0
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND

packages/contentstack-auth/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@contentstack/cli-auth",
   "description": "Contentstack CLI plugin for authentication activities",
-  "version": "1.3.8",
+  "version": "1.3.9",
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "scripts": {
@@ -21,8 +21,8 @@
     "test:unit": "mocha --forbid-only \"test/unit/*.test.ts\""
   },
   "dependencies": {
-    "@contentstack/cli-command": "^1.2.8",
-    "@contentstack/cli-utilities": "^1.4.4",
+    "@contentstack/cli-command": "^1.2.9",
+    "@contentstack/cli-utilities": "^1.4.5",
     "chalk": "^4.0.0",
     "debug": "^4.1.1",
     "inquirer": "8.2.4",

packages/contentstack-bootstrap/README.md

@@ -15,7 +15,7 @@ $ npm install -g @contentstack/cli-cm-bootstrap
 $ csdx COMMAND
 running command...
 $ csdx (--version)
-@contentstack/cli-cm-bootstrap/1.4.8 darwin-x64 node-v18.16.0
+@contentstack/cli-cm-bootstrap/1.4.9 darwin-arm64 node-v18.16.0
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND

packages/contentstack-bootstrap/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@contentstack/cli-cm-bootstrap",
   "description": "Bootstrap contentstack apps",
-  "version": "1.4.8",
+  "version": "1.4.9",
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "scripts": {
@@ -17,9 +17,9 @@
     "test:report": "nyc --reporter=lcov mocha \"test/**/*.test.js\""
   },
   "dependencies": {
-    "@contentstack/cli-cm-seed": "^1.4.8",
-    "@contentstack/cli-command": "^1.2.8",
-    "@contentstack/cli-utilities": "^1.4.4",
+    "@contentstack/cli-cm-seed": "^1.4.9",
+    "@contentstack/cli-command": "^1.2.9",
+    "@contentstack/cli-utilities": "^1.4.5",
     "inquirer": "8.2.4",
     "mkdirp": "^1.0.4",
     "tar": "^6.1.13"

packages/contentstack-branches/README.md

@@ -38,7 +38,7 @@ $ npm install -g @contentstack/cli-cm-branches
 $ csdx COMMAND
 running command...
 $ csdx (--version)
-@contentstack/cli-cm-branches/1.0.5 darwin-x64 node-v18.16.0
+@contentstack/cli-cm-branches/1.0.6 darwin-arm64 node-v18.16.0
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND

packages/contentstack-branches/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@contentstack/cli-cm-branches",
   "description": "Contentstack CLI plugin to do branches operations",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {
-    "@contentstack/cli-command": "^1.2.8",
-    "@contentstack/cli-utilities": "^1.4.4",
+    "@contentstack/cli-command": "^1.2.9",
+    "@contentstack/cli-utilities": "^1.4.5",
     "@oclif/command": "^1.8.16",
     "@oclif/config": "^1.18.3",
     "@oclif/core": "^2.3.0",

packages/contentstack-bulk-publish/README.md

@@ -18,7 +18,7 @@ $ npm install -g @contentstack/cli-cm-bulk-publish
 $ csdx COMMAND
 running command...
 $ csdx (--version)
-@contentstack/cli-cm-bulk-publish/1.3.7 darwin-x64 node-v18.16.0
+@contentstack/cli-cm-bulk-publish/1.3.8 darwin-arm64 node-v18.16.0
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND

packages/contentstack-bulk-publish/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@contentstack/cli-cm-bulk-publish",
   "description": "Contentstack CLI plugin for bulk publish actions",
-  "version": "1.3.7",
+  "version": "1.3.8",
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {
-    "@contentstack/cli-command": "^1.2.8",
-    "@contentstack/cli-utilities": "^1.4.4",
+    "@contentstack/cli-command": "^1.2.9",
+    "@contentstack/cli-utilities": "^1.4.5",
     "bluebird": "^3.7.2",
     "chalk": "^4.1.2",
     "inquirer": "8.2.4",

packages/contentstack-clone/README.md

@@ -15,7 +15,7 @@ $ npm install -g @contentstack/cli-cm-clone
 $ csdx COMMAND
 running command...
 $ csdx (--version)
-@contentstack/cli-cm-clone/1.4.8 darwin-x64 node-v18.16.0
+@contentstack/cli-cm-clone/1.4.9 darwin-arm64 node-v18.16.0
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND

packages/contentstack-clone/package.json

@@ -1,15 +1,15 @@
 {
   "name": "@contentstack/cli-cm-clone",
   "description": "Contentstack stack clone plugin",
-  "version": "1.4.8",
+  "version": "1.4.9",
   "author": "Contentstack",
   "bugs": "https://github.com/rohitmishra209/cli-cm-clone/issues",
   "dependencies": {
     "@colors/colors": "^1.5.0",
-    "@contentstack/cli-cm-export": "^1.5.8",
-    "@contentstack/cli-cm-import": "^1.5.8",
-    "@contentstack/cli-command": "^1.2.8",
-    "@contentstack/cli-utilities": "^1.4.4",
+    "@contentstack/cli-cm-export": "^1.5.9",
+    "@contentstack/cli-cm-import": "^1.5.9",
+    "@contentstack/cli-command": "^1.2.9",
+    "@contentstack/cli-utilities": "^1.4.5",
     "async": "^3.2.4",
     "chalk": "^4.1.0",
     "child_process": "^1.0.2",

packages/contentstack-clone/src/lib/util/clone-handler.js

@@ -134,7 +134,7 @@ class CloneHandler {
       let spinner;
       try {
         const stackAPIClient = client.stack({
-          api_key: config.source_stack,
+          api_key: config.target_stack ? config.target_stack : config.source_stack,
           management_token: config.management_token,
         });
 
@@ -337,12 +337,17 @@ class CloneHandler {
 
         const orgMsgExistingStack = 'Choose an organization where the destination stack exists: ';
         const orgMsgNewStack = 'Choose an organization where you want to create a stack: ';
-        const org = await cloneCommand.execute(new HandleOrgCommand({
-          msg: !canCreateStack.stackCreate ? orgMsgExistingStack : orgMsgNewStack
-        }, this));
 
-        let self = this;
-        if (org) {
+        let org;
+        if (!config.target_stack) {
+          org = await cloneCommand.execute(new HandleOrgCommand({
+            msg: !canCreateStack.stackCreate ? orgMsgExistingStack : orgMsgNewStack
+          }, this));
+        }
+
+        const params = { org, canCreateStack };
+        if (!config.target_stack) {
+          let self = this;
           keyPressHandler = async function (_ch, key) {
             if (key.name === 'left' && key.shift) {
               if (self.executingCommand === 1) {
@@ -363,10 +368,9 @@ class CloneHandler {
           };
           process.stdin.addListener('keypress', keyPressHandler);
           this.setBackKeyPressHandler(keyPressHandler);
-
-          await this.executeStackDestinationPrompt({ org, canCreateStack });
+          await this.executeStackDestinationPrompt(params);
         } else {
-          return reject('Org not found.');
+          await this.executeBranchDestinationPrompt(params);
         }
 
         return resolve();
@@ -381,13 +385,9 @@ class CloneHandler {
       this.setExectingCommand(1);
       const { org, canCreateStack } = params;
       if (!canCreateStack.stackCreate) {
-        if (!config.target_stack) {
-          const stackMsg = 'Choose the destination stack:';
-          await cloneCommand.execute(new HandleDestinationStackCommand({ org, msg: stackMsg, isSource: false }, this));
-        }
-        if (config.target_stack) {
-          this.executeBranchDestinationPrompt(params);
-        }
+        const stackMsg = 'Choose the destination stack:';
+        await cloneCommand.execute(new HandleDestinationStackCommand({ org, msg: stackMsg, isSource: false }, this));
+        this.executeBranchDestinationPrompt(params);
       } else {
         const orgUid = orgUidList[org.Organization];
         await cloneCommand.execute(new CreateNewStackCommand({ orgUid }, this));

packages/contentstack-command/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@contentstack/cli-command",
   "description": "Contentstack CLI plugin for configuration",
-  "version": "1.2.8",
+  "version": "1.2.9",
   "author": "Contentstack",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -17,7 +17,7 @@
     "format": "eslint src/**/*.ts --fix"
   },
   "dependencies": {
-    "@contentstack/cli-utilities": "^1.4.4",
+    "@contentstack/cli-utilities": "^1.4.5",
     "contentstack": "^3.10.1"
   },
   "devDependencies": {

packages/contentstack-config/README.md

@@ -18,7 +18,7 @@ $ npm install -g @contentstack/cli-config
 $ csdx COMMAND
 running command...
 $ csdx (--version)
-@contentstack/cli-config/1.4.6 darwin-x64 node-v18.16.0
+@contentstack/cli-config/1.4.7 darwin-arm64 node-v18.16.0
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND

packages/contentstack-config/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@contentstack/cli-config",
   "description": "Contentstack CLI plugin for configuration",
-  "version": "1.4.6",
+  "version": "1.4.7",
   "author": "Contentstack",
   "scripts": {
     "build": "npm run clean && npm run compile",
@@ -21,8 +21,8 @@
     "test:unit:report": "nyc --extension .ts mocha --forbid-only \"test/unit/**/*.test.ts\""
   },
   "dependencies": {
-    "@contentstack/cli-command": "^1.2.8",
-    "@contentstack/cli-utilities": "^1.4.4",
+    "@contentstack/cli-command": "^1.2.9",
+    "@contentstack/cli-utilities": "^1.4.5",
     "chalk": "^4.0.0",
     "debug": "^4.1.1",
     "inquirer": "8.2.4",

packages/contentstack-export-to-csv/.gitignore

@@ -6,3 +6,5 @@
 /yarn.lock
 coverage
 node_modules
+data
+logs

packages/contentstack-export-to-csv/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@contentstack/cli-cm-export-to-csv",
   "description": "Export entities to csv",
-  "version": "1.3.8",
+  "version": "1.3.9",
   "author": "Abhinav Gupta @abhinav-from-contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {
-    "@contentstack/cli-command": "^1.2.8",
-    "@contentstack/cli-utilities": "^1.4.4",
+    "@contentstack/cli-command": "^1.2.9",
+    "@contentstack/cli-utilities": "^1.4.5",
     "chalk": "^4.1.0",
     "fast-csv": "^4.3.6",
     "inquirer": "8.2.4",