Merge branch 'development' into feat/bootstrap-kickstarts

Author: sunil-lakshman

.talismanrc

@@ -2,7 +2,7 @@ fileignoreconfig:
 - filename: package-lock.json
   checksum: 44b582fb5d952f027fdcb2c771b5b684a1677d1860f9a5ab928a14781d0a0186
 - filename: pnpm-lock.yaml
-  checksum: d28afee9b463d66004354b9476b1e39344f903e2db3a15c5f83bd84e688c01d6
+  checksum: 006cd155027af9b70649f4e9295e7a158a960d7c87a74fad0710443fb3b814bc
 - filename: packages/contentstack-import-setup/test/unit/backup-handler.test.ts
   checksum: 0582d62b88834554cf12951c8690a73ef3ddbb78b82d2804d994cf4148e1ef93
 - filename: packages/contentstack-import-setup/test/config.json
@@ -57,8 +57,10 @@ fileignoreconfig:
   checksum: f93aa9b0c964608b60c88d4c72ff33840b58ec900297c4bae1f4ea365aa51048
 - filename: packages/contentstack-auth/test/utils/mfa-handler.test.ts
   checksum: b067f93cf0185d794e8419cc41e8fac96ed790dea8fc48dc083ee242ccacbd4d
-- filename: packages/contentstack-utilities/src/logger/logger.ts
-  checksum: 76429bc87e279624b386f00e7eb3f4ec25621ace7056289f812b9a076d6e184e
-- filename: packages/contentstack-import/src/import/modules/entries.ts
-  checksum: 2fd4e8ecf75e077632a6408d09997f0921d2a3508f9f2cb8f47fe79a28592300
-version: "1.0"
+- filename: packages/contentstack-import/src/import/module-importer.ts
+  checksum: 93fac2407e20070aa393f783e5a21093e99424e5fd2873aabc2099ac3ea02b27
+- filename: packages/contentstack-import/src/utils/import-config-handler.ts
+  checksum: bb8093633dc7de888541990623c3e02a482b7e6f5db0ba396bedc20c4c74b782
+- filename: packages/contentstack-import/src/utils/setup-branch.ts
+  checksum: a4a968a20d5ab7cbc08c266819907541bbf793cc098521a5e810ada3cbacbee6
+version: "1.0"

package-lock.json

@@ -1,13 +1,13 @@
 {
   "name": "@contentstack/cli-cm-clone",
   "description": "Contentstack stack clone plugin",
-  "version": "1.15.2",
+  "version": "1.16.0",
   "author": "Contentstack",
   "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-import": "~1.26.3",
+    "@contentstack/cli-cm-import": "~1.27.0",
     "@contentstack/cli-command": "~1.6.1",
     "@contentstack/cli-utilities": "~1.14.0",
     "@oclif/core": "^4.3.0",

packages/contentstack-clone/package.json

@@ -18,7 +18,9 @@ class StackCloneCommand extends Command {
         type: cloneType,
         'stack-name': stackName,
         'source-branch': sourceStackBranch,
+        'source-branch-alias': sourceStackBranchAlias,
         'target-branch': targetStackBranch,
+        'target-branch-alias': targetStackBranchAlias,
         'source-stack-api-key': sourceStackApiKey,
         'destination-stack-api-key': destinationStackApiKey,
         'source-management-token-alias': sourceManagementTokenAlias,
@@ -47,8 +49,14 @@ class StackCloneCommand extends Command {
         if (sourceStackBranch) {
           config.sourceStackBranch = sourceStackBranch;
         }
+        if (sourceStackBranchAlias) {
+          config.sourceStackBranchAlias = sourceStackBranchAlias;
+        }
         if (targetStackBranch) {
           config.targetStackBranch = targetStackBranch;
+        }
+         if (targetStackBranchAlias) {
+          config.targetStackBranchAlias = targetStackBranchAlias;
         }
         if (sourceStackApiKey) {
           config.source_stack = sourceStackApiKey;
@@ -202,11 +210,25 @@ StackCloneCommand.flags = {
     required: false,
     multiple: false,
     description: 'Branch of the source stack.',
+    exclusive: ['source-branch-alias']
+  }),
+  'source-branch-alias': flags.string({
+    required: false,
+    multiple: false,
+    description: 'Alias of Branch of the source stack.',
+    exclusive: ['source-branch']
   }),
   'target-branch': flags.string({
     required: false,
     multiple: false,
     description: 'Branch of the target stack.',
+    exclusive: ['target-branch-alias']
+  }),
+  'target-branch-alias': flags.string({
+    required: false,
+    multiple: false,
+    description: 'Alias of Branch of the target stack.',
+    exclusive: ['target-branch']
   }),
   'source-management-token-alias': flags.string({
     required: false,
@@ -229,8 +251,8 @@ StackCloneCommand.flags = {
     multiple: false,
     options: ['a', 'b'],
     description: ` Type of data to clone. You can select option a or b.
-a) Structure (all modules except entries & assets).
-b) Structure with content (all modules including entries & assets).
+      a) Structure (all modules except entries & assets).
+      b) Structure with content (all modules including entries & assets).
     `,
   }),
   'source-stack-api-key': flags.string({

packages/contentstack-clone/src/commands/cm/stacks/clone.js

@@ -634,6 +634,10 @@ class CloneHandler {
         cmd.push('--branch', exportConfig.sourceStackBranch);
       }
 
+      if (!exportConfig.sourceStackBranch && exportConfig.sourceStackBranchAlias) {
+        cmd.push('--branch-alias', exportConfig.sourceStackBranchAlias);
+      }
+
       if (exportConfig.forceStopMarketplaceAppsPrompt) cmd.push('-y');
 
       cmd.push('-c');
@@ -663,6 +667,10 @@ class CloneHandler {
       if (importConfig.targetStackBranch) {
         cmd.push('--branch', importConfig.targetStackBranch);
       }
+            
+      if (!importConfig.targetStackBranch && importConfig.targetStackBranchAlias) {
+        cmd.push('--branch-alias', importConfig.targetStackBranchAlias);
+      }
       if (importConfig.importWebhookStatus) {
         cmd.push('--import-webhook-status', importConfig.importWebhookStatus);
       }

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

@@ -1,16 +1,16 @@
 {
   "name": "@contentstack/cli-cm-export-to-csv",
   "description": "Export entities to csv",
-  "version": "1.9.1",
+  "version": "1.9.2",
   "author": "Abhinav Gupta @abhinav-from-contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {
     "@contentstack/cli-command": "~1.6.1",
     "@contentstack/cli-utilities": "~1.14.0",
     "@oclif/core": "^4.3.0",
-    "@oclif/plugin-help": "^6.2.28",
+    "@oclif/plugin-help": "^6.2.32",
     "fast-csv": "^4.3.6",
-    "inquirer": "8.2.6",
+    "inquirer": "8.2.7",
     "inquirer-checkbox-plus-prompt": "1.4.2",
     "mkdirp": "^3.0.1"
   },

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

@@ -6,7 +6,8 @@ const {
   isAuthenticated,
   cliux,
   doesBranchExist,
-  isManagementTokenValid
+  isManagementTokenValid,
+  log
 } = require('@contentstack/cli-utilities');
 const util = require('../../util');
 const config = require('../../util/config');
@@ -126,7 +127,7 @@ class ExportToCsvCommand extends Command {
             }
 
             stackAPIClient = this.getStackClient(managementAPIClient, stack);
-            await this.checkAndUpdateBranchDetail(branchUid, stack, stackAPIClient, managementAPIClient);
+            stackAPIClient = await this.checkAndUpdateBranchDetail(branchUid, stack, stackAPIClient, managementAPIClient);
 
             const contentTypeCount = await util.getContentTypeCount(stackAPIClient);
 
@@ -321,6 +322,7 @@ class ExportToCsvCommand extends Command {
         stackAPIClient = this.getStackClient(managementAPIClient, stack);
       }
     }
+    return stackAPIClient;
   }
 
   /**

packages/contentstack-export-to-csv/src/commands/cm/export-to-csv.js

@@ -1,7 +1,7 @@
 {
   "name": "@contentstack/cli-cm-import",
   "description": "Contentstack CLI plugin to import content into stack",
-  "version": "1.26.3",
+  "version": "1.27.0",
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {