Staging to development Back merge

packages/contentstack-audit/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentstack/cli-audit",
-  "version": "1.2.1",
+  "version": "1.3.0",
   "description": "Contentstack audit plugin",
   "author": "Contentstack CLI",
   "homepage": "https://github.com/contentstack/cli",
@@ -18,8 +18,8 @@
     "/oclif.manifest.json"
   ],
   "dependencies": {
-    "@contentstack/cli-command": "~1.2.15",
-    "@contentstack/cli-utilities": "~1.5.5",
+    "@contentstack/cli-command": "~1.2.16",
+    "@contentstack/cli-utilities": "~1.5.7",
     "@oclif/plugin-help": "^5",
     "@oclif/plugin-plugins": "^3.8.4",
     "chalk": "^4.1.2",
@@ -30,7 +30,7 @@
     "winston": "^3.10.0"
   },
   "devDependencies": {
-    "@contentstack/cli-dev-dependencies": "^1.2.3",
+    "@contentstack/cli-dev-dependencies": "^1.2.4",
     "@oclif/test": "^2.0.3",
     "@types/chai": "^4.3.5",
     "@types/fs-extra": "^11.0.2",

packages/contentstack-audit/test/unit/base-command.test.ts

@@ -59,7 +59,7 @@ describe('BaseCommand class', () => {
         const configPath = resolve(__dirname, 'mock', 'invalid-config.json');
 
         await CMD.run([`--config=${configPath}`]);
-        expect(ctx.stdout).to.include('not valid JSON');
+        expect(ctx.stdout).to.include('Unexpected token');
       });
   });
 });

packages/contentstack-auth/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@contentstack/cli-auth",
   "description": "Contentstack CLI plugin for authentication activities",
-  "version": "1.3.16",
+  "version": "1.3.17",
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "scripts": {
@@ -22,8 +22,8 @@
     "test:unit:report": "nyc --extension .ts mocha --forbid-only \"test/unit/**/*.test.ts\""
   },
   "dependencies": {
-    "@contentstack/cli-command": "~1.2.15",
-    "@contentstack/cli-utilities": "~1.5.5",
+    "@contentstack/cli-command": "~1.2.16",
+    "@contentstack/cli-utilities": "~1.5.7",
     "chalk": "^4.0.0",
     "debug": "^4.1.1",
     "inquirer": "8.2.4",

packages/contentstack-bootstrap/package.json

@@ -18,8 +18,8 @@
   },
   "dependencies": {
     "@contentstack/cli-cm-seed": "~1.7.0",
-    "@contentstack/cli-command": "~1.2.15",
-    "@contentstack/cli-utilities": "~1.5.5",
+    "@contentstack/cli-command": "~1.2.16",
+    "@contentstack/cli-utilities": "~1.5.7",
     "inquirer": "8.2.4",
     "mkdirp": "^1.0.4",
     "tar": "^6.1.13"

packages/contentstack-branches/package.json

@@ -5,8 +5,8 @@
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {
-    "@contentstack/cli-command": "~1.2.15",
-    "@contentstack/cli-utilities": "~1.5.6",
+    "@contentstack/cli-command": "~1.2.16",
+    "@contentstack/cli-utilities": "~1.5.7",
     "@oclif/core": "^2.9.3",
     "async": "^3.2.4",
     "big-json": "^3.2.0",
@@ -25,9 +25,9 @@
     "winston": "^3.7.2"
   },
   "devDependencies": {
-    "@contentstack/cli-auth": "~1.3.16",
-    "@contentstack/cli-config": "~1.4.14",
-    "@contentstack/cli-dev-dependencies": "~1.2.3",
+    "@contentstack/cli-auth": "~1.3.17",
+    "@contentstack/cli-config": "~1.4.15",
+    "@contentstack/cli-dev-dependencies": "~1.2.4",
     "@oclif/plugin-help": "^5.1.19",
     "@oclif/test": "^1.2.6",
     "@types/flat": "^5.0.2",

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.14",
+  "version": "1.3.15",
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {
-    "@contentstack/cli-command": "~1.2.15",
-    "@contentstack/cli-utilities": "~1.5.5",
+    "@contentstack/cli-command": "~1.2.16",
+    "@contentstack/cli-utilities": "~1.5.7",
     "bluebird": "^3.7.2",
     "chalk": "^4.1.2",
     "dotenv": "^16.1.4",

packages/contentstack-bulk-publish/src/util/retryfailed.js

@@ -5,8 +5,14 @@ module.exports = async (filename, queue, Type) => {
   const logs = await getAllLogs(filename);
   if (logs.file.length > 0) {
     logs.file.forEach(async (log) => {
-      if (Type === 'bulk') {
-        log.message.options.stack = await getStack({ alias: log.message.alias, host: log.message.host });
+      const stackOptions = {host: log.message.host };
+      if(log.message.alias) {
+        stackOptions["alias"] = log.message.alias
+      } else {
+        stackOptions["stackApiKey"] = log.message.api_key
+      }
+      if (Type === 'bulk') {        
+        log.message.options.stack = await getStack(stackOptions);
         queue.Enqueue(log.message.options);
       }
       if (Type === 'publish') {
@@ -18,15 +24,15 @@ module.exports = async (filename, queue, Type) => {
             entryUid: log.message.options.entryUid,
             locale: log.message.options.locale,
             Type: 'entry',
-            stack: await getStack({ alias: log.message.alias, host: log.message.host }),
+            stack: await getStack(stackOptions),
           });
         } else {
           queue.assetQueue.Enqueue({
             assetUid: log.message.options.assetUid,
             publish_details: log.message.options.publish_assets,
             environments: log.message.options.environments,
             Type: 'asset',
-            stack: await getStack({ alias: log.message.alias, host: log.message.host }),
+            stack: await getStack(stackOptions),
           });
         }
       }

packages/contentstack-clone/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@contentstack/cli-cm-clone",
   "description": "Contentstack stack clone plugin",
-  "version": "1.7.0",
+  "version": "1.7.1",
   "author": "Contentstack",
   "bugs": "https://github.com/rohitmishra209/cli-cm-clone/issues",
   "dependencies": {
-    "@contentstack/cli-cm-export": "~1.10.0",
-    "@contentstack/cli-cm-import": "~1.11.0",
-    "@contentstack/cli-command": "~1.2.15",
-    "@contentstack/cli-utilities": "~1.5.5",
+    "@contentstack/cli-cm-export": "~1.10.1",
+    "@contentstack/cli-cm-import": "~1.11.1",
+    "@contentstack/cli-command": "~1.2.16",
+    "@contentstack/cli-utilities": "~1.5.7",
     "@colors/colors": "^1.5.0",
     "async": "^3.2.4",
     "chalk": "^4.1.0",

packages/contentstack-command/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@contentstack/cli-command",
   "description": "Contentstack CLI plugin for configuration",
-  "version": "1.2.15",
+  "version": "1.2.16",
   "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.5.5",
+    "@contentstack/cli-utilities": "~1.5.7",
     "contentstack": "^3.10.1"
   },
   "devDependencies": {

packages/contentstack-config/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@contentstack/cli-config",
   "description": "Contentstack CLI plugin for configuration",
-  "version": "1.4.14",
+  "version": "1.4.15",
   "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.15",
-    "@contentstack/cli-utilities": "~1.5.5",
+    "@contentstack/cli-command": "~1.2.16",
+    "@contentstack/cli-utilities": "~1.5.7",
     "chalk": "^4.0.0",
     "debug": "^4.1.1",
     "inquirer": "8.2.4",

packages/contentstack-dev-dependencies/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@contentstack/cli-dev-dependencies",
-  "version": "1.2.3",
+  "version": "1.2.4",
   "description": "Customized dev dependencies for ContentStack projects",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "scripts": {
     "prepack": "npm run clean && npm run compile",
-    "clean": "rm -rf ./lib ./node_modules tsconfig.build.tsbuildinfo",
+    "clean": "rm -rf ./lib tsconfig.build.tsbuildinfo",
     "compile": "tsc -b tsconfig.json",
     "lint": "eslint src/**/*.ts",
     "format": "eslint src/**/*.ts --fix"
@@ -22,12 +22,13 @@
   "license": "MIT",
   "dependencies": {
     "@oclif/core": "^2.9.3",
-    "lodash": "^4.17.21"
+    "lodash": "^4.17.21",
+    "fancy-test": "^2.0.0",
+    "@oclif/test":"^2.0.3"
   },
   "devDependencies": {
     "@types/node": "^14.14.32",
     "eslint": "^7.32.0",
-    "fancy-test": "^2.0.0",
     "mocha": "10.1.0",
     "ts-node": "^10.9.1",
     "tslib": "^2.5.0",