Merge development to staging

packages/contentstack-audit/README.md

@@ -19,7 +19,7 @@ $ npm install -g @contentstack/cli-audit
 $ csdx COMMAND
 running command...
 $ csdx (--version|-v)
-@contentstack/cli-audit/1.2.1 darwin-arm64 node-v21.1.0
+@contentstack/cli-audit/1.3.1 darwin-arm64 node-v20.8.0
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND

packages/contentstack-audit/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentstack/cli-audit",
-  "version": "1.3.0",
+  "version": "1.3.1",
   "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.16",
-    "@contentstack/cli-utilities": "~1.5.7",
+    "@contentstack/cli-command": "~1.2.17",
+    "@contentstack/cli-utilities": "~1.5.8",
     "@oclif/plugin-help": "^5",
     "@oclif/plugin-plugins": "^3.8.4",
     "chalk": "^4.1.2",

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.16 darwin-arm64 node-v21.1.0
+@contentstack/cli-auth/1.3.18 darwin-arm64 node-v20.8.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.17",
+  "version": "1.3.18",
   "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.16",
-    "@contentstack/cli-utilities": "~1.5.7",
+    "@contentstack/cli-command": "~1.2.17",
+    "@contentstack/cli-utilities": "~1.5.8",
     "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.6.2 darwin-arm64 node-v20.8.0
+@contentstack/cli-cm-bootstrap/1.7.0 darwin-arm64 node-v20.8.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.6.3",
+  "version": "1.7.0",
   "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.6.3",
-    "@contentstack/cli-command": "~1.2.16",
-    "@contentstack/cli-utilities": "~1.5.7",
+    "@contentstack/cli-cm-seed": "~1.7.0",
+    "@contentstack/cli-command": "~1.2.17",
+    "@contentstack/cli-utilities": "~1.5.8",
     "inquirer": "8.2.4",
     "mkdirp": "^1.0.4",
     "tar": "^6.1.13"

packages/contentstack-branches/README.md

@@ -37,7 +37,7 @@ $ npm install -g @contentstack/cli-cm-branches
 $ csdx COMMAND
 running command...
 $ csdx (--version)
-@contentstack/cli-cm-branches/1.0.16 darwin-arm64 node-v21.1.0
+@contentstack/cli-cm-branches/1.0.18 darwin-arm64 node-v20.8.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.17",
+  "version": "1.0.18",
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {
-    "@contentstack/cli-command": "~1.2.16",
-    "@contentstack/cli-utilities": "~1.5.7",
+    "@contentstack/cli-command": "~1.2.17",
+    "@contentstack/cli-utilities": "~1.5.8",
     "@oclif/core": "^2.9.3",
     "async": "^3.2.4",
     "big-json": "^3.2.0",

packages/contentstack-branches/src/utils/create-merge-scripts.ts

@@ -1,5 +1,5 @@
 import fs from 'fs';
-import { cliux } from '@contentstack/cli-utilities';
+import { cliux, formatTime, formatDate } from '@contentstack/cli-utilities';
 import { entryCreateScript } from './entry-create-script';
 import { entryUpdateScript } from './entry-update-script';
 import { entryCreateUpdateScript } from './entry-create-update-script';
@@ -74,9 +74,7 @@ export function getContentTypeMergeStatus(status) {
 export function createMergeScripts(contentType: CreateMergeScriptsProps, mergeJobUID: string, content?: any) {
   const date = new Date();
   const rootFolder = 'merge_scripts';
-  const fileCreatedAt = `${date.getFullYear()}${
-    date.getMonth().toString.length === 1 ? `0${date.getMonth() + 1}` : date.getMonth() + 1
-  }${date.getUTCDate()}${date.getHours()}${date.getMinutes()}${date.getSeconds()}`;
+  const fileCreatedAt = `${formatDate(date)}${formatTime(date)}`;
   const mergeScriptsSlug = `merge_scripts_${mergeJobUID}_${fileCreatedAt}`;
 
   const fullPath = `${rootFolder}/${mergeScriptsSlug}`;

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.14 darwin-arm64 node-v21.1.0
+@contentstack/cli-cm-bulk-publish/1.3.16 darwin-arm64 node-v20.8.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.15",
+  "version": "1.3.16",
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {
-    "@contentstack/cli-command": "~1.2.16",
-    "@contentstack/cli-utilities": "~1.5.7",
+    "@contentstack/cli-command": "~1.2.17",
+    "@contentstack/cli-utilities": "~1.5.8",
     "bluebird": "^3.7.2",
     "chalk": "^4.1.2",
     "dotenv": "^16.1.4",

packages/contentstack-clone/README.md

@@ -16,7 +16,7 @@ $ npm install -g @contentstack/cli-cm-clone
 $ csdx COMMAND
 running command...
 $ csdx (--version)
-@contentstack/cli-cm-clone/1.7.0 darwin-arm64 node-v20.8.0
+@contentstack/cli-cm-clone/1.8.0 darwin-arm64 node-v20.8.0
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND

packages/contentstack-clone/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@contentstack/cli-cm-clone",
   "description": "Contentstack stack clone plugin",
-  "version": "1.7.1",
+  "version": "1.8.0",
   "author": "Contentstack",
   "bugs": "https://github.com/rohitmishra209/cli-cm-clone/issues",
   "dependencies": {
-    "@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",
+    "@contentstack/cli-cm-export": "~1.10.2",
+    "@contentstack/cli-cm-import": "~1.12.0",
+    "@contentstack/cli-command": "~1.2.17",
+    "@contentstack/cli-utilities": "~1.5.8",
     "@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.16",
+  "version": "1.2.17",
   "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.7",
+    "@contentstack/cli-utilities": "~1.5.8",
     "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.14 darwin-arm64 node-v21.1.0
+@contentstack/cli-config/1.4.16 darwin-arm64 node-v20.8.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.15",
+  "version": "1.4.16",
   "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.16",
-    "@contentstack/cli-utilities": "~1.5.7",
+    "@contentstack/cli-command": "~1.2.17",
+    "@contentstack/cli-utilities": "~1.5.8",
     "chalk": "^4.0.0",
     "debug": "^4.1.1",
     "inquirer": "8.2.4",

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.6.1",
+  "version": "1.6.2",
   "author": "Abhinav Gupta @abhinav-from-contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {
-    "@contentstack/cli-command": "~1.2.16",
-    "@contentstack/cli-utilities": "~1.5.7",
+    "@contentstack/cli-command": "~1.2.17",
+    "@contentstack/cli-utilities": "~1.5.8",
     "chalk": "^4.1.0",
     "fast-csv": "^4.3.6",
     "inquirer": "8.2.4",

packages/contentstack-export/README.md

@@ -48,7 +48,7 @@ $ npm install -g @contentstack/cli-cm-export
 $ csdx COMMAND
 running command...
 $ csdx (--version)
-@contentstack/cli-cm-export/1.10.1 darwin-arm64 node-v20.8.0
+@contentstack/cli-cm-export/1.10.2 darwin-arm64 node-v20.8.0
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND

packages/contentstack-export/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@contentstack/cli-cm-export",
   "description": "Contentstack CLI plugin to export content from stack",
-  "version": "1.10.1",
+  "version": "1.10.2",
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {
-    "@contentstack/cli-command": "~1.2.16",
-    "@contentstack/cli-utilities": "~1.5.7",
+    "@contentstack/cli-command": "~1.2.17",
+    "@contentstack/cli-utilities": "~1.5.8",
     "@oclif/core": "^2.9.3",
     "async": "^3.2.4",
     "big-json": "^3.2.0",

packages/contentstack-export/src/utils/export-config-handler.ts

@@ -23,7 +23,7 @@ const setupConfig = async (exportCmdFlags: any): Promise<ExportConfig> => {
   const managementTokenAlias = exportCmdFlags['management-token-alias'] || exportCmdFlags['alias'];
 
   if (managementTokenAlias) {
-    const { token, apiKey } = configHandler.get(`tokens.${managementTokenAlias}`);
+    const { token, apiKey } = configHandler.get(`tokens.${managementTokenAlias}`) || {};
     config.management_token = token;
     config.apiKey = apiKey;
     if (!config.management_token) {

packages/contentstack-import/README.md

@@ -47,7 +47,7 @@ $ npm install -g @contentstack/cli-cm-import
 $ csdx COMMAND
 running command...
 $ csdx (--version)
-@contentstack/cli-cm-import/1.11.0 darwin-arm64 node-v20.8.0
+@contentstack/cli-cm-import/1.12.0 darwin-arm64 node-v20.8.0
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND

packages/contentstack-import/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@contentstack/cli-cm-import",
   "description": "Contentstack CLI plugin to import content into stack",
-  "version": "1.11.1",
+  "version": "1.12.0",
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {
-    "@contentstack/cli-command": "~1.2.16",
-    "@contentstack/cli-utilities": "~1.5.7",
+    "@contentstack/cli-command": "~1.2.17",
+    "@contentstack/cli-utilities": "~1.5.8",
     "@contentstack/management": "~1.12.0",
     "@oclif/core": "^2.9.3",
     "axios": "^1.6.0",
@@ -21,7 +21,8 @@
     "mkdirp": "^1.0.4",
     "promise-limit": "^2.7.0",
     "tslib": "^2.4.1",
-    "winston": "^3.7.2"
+    "winston": "^3.7.2",
+    "uuid": "^9.0.0"
   },
   "devDependencies": {
     "@oclif/test": "^1.2.6",
@@ -97,4 +98,4 @@
     }
   },
   "repository": "https://github.com/contentstack/cli"
-}
+}

packages/contentstack-import/src/commands/cm/stacks/import.ts

@@ -97,7 +97,6 @@ export default class ImportCommand extends Command {
     'replace-existing': flags.boolean({
       required: false,
       description: 'Replaces the existing module in the target stack.',
-      dependsOn: ['module'],
     }),
     'skip-existing': flags.boolean({
       required: false,

packages/contentstack-import/src/import/module-importer.ts

@@ -1,4 +1,4 @@
-import { ContentstackClient, HttpClient } from '@contentstack/cli-utilities';
+import { addLocale, ContentstackClient } from '@contentstack/cli-utilities';
 
 import startModuleImport from './modules';
 import startJSModuleImport from './modules-js';
@@ -26,19 +26,9 @@ class ModuleImporter {
 
     // Temporarily adding this api call to verify management token has read and write permissions
     // TODO: CS-40354 - CLI | import rewrite | Migrate HTTP call to SDK call once fix is ready from SDK side
-    const httpClient = new HttpClient({
-      headers: { api_key: this.importConfig.apiKey, authorization: this.importConfig.management_token },
-    });
-
-    const { data } = await httpClient.post(`https://${this.importConfig.host}/v3/locales`, {
-      locale: {
-        name: 'English',
-        code: 'en-us',
-      },
-    });
 
-    if (data.error_code === 161) {
-      throw new Error(data.error_message);
+    if (this.importConfig.management_token) {
+      await addLocale(this.importConfig.apiKey, this.importConfig.management_token, this.importConfig.host);
     }
 
     if (!this.importConfig.master_locale) {