DX | 28-04-2025 | Release

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.12.0 darwin-arm64 node-v23.6.0
+@contentstack/cli-audit/1.12.0 darwin-arm64 node-v22.14.0
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND

packages/contentstack-audit/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentstack/cli-audit",
-  "version": "1.12.0",
+  "version": "1.12.1",
   "description": "Contentstack audit plugin",
   "author": "Contentstack CLI",
   "homepage": "https://github.com/contentstack/cli",

packages/contentstack-audit/src/config/index.ts

@@ -13,6 +13,7 @@ const config = {
     'field-rules',
   ],
   'fix-fields': ['reference', 'global_field', 'json:rte', 'json:extension', 'blocks', 'group', 'content_types'],
+  'schema-fields-data-type': ['blocks','group','global_field'],
   moduleConfig: {
     'content-types': {
       name: 'content type',

packages/contentstack-audit/src/modules/content-types.ts

@@ -185,7 +185,6 @@ export default class ContentType {
       field.schema = this.runFixOnSchema(tree, field.schema as ContentTypeSchemaType[]);
     }
     for (let child of field.schema ?? []) {
-
       if (!fixTypes.includes(child.data_type) && child.data_type !== 'json') continue;
 
       switch (child.data_type) {
@@ -487,8 +486,13 @@ export default class ContentType {
       })
       .filter((val: any) => {
         if (this.config.skipFieldTypes.includes(val?.data_type)) return true;
-        if (val?.schema && isEmpty(val?.schema)) return false;
-        if (val?.reference_to && isEmpty(val?.reference_to)) return false;
+        if (
+          val?.schema &&
+          isEmpty(val?.schema) &&
+          (!val?.data_type || this.config['schema-fields-data-type'].includes(val.data_type))
+        )
+          return false;
+        if (val?.reference_to && isEmpty(val?.reference_to) && val.data_type === 'reference') return false;
 
         return !!val;
       }) as ContentTypeSchemaType[];

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.4.0 darwin-arm64 node-v23.6.0
+@contentstack/cli-auth/1.4.0 darwin-arm64 node-v22.14.0
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND

packages/contentstack-branches/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@contentstack/cli-cm-branches",
   "description": "Contentstack CLI plugin to do branches operations",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {

packages/contentstack-branches/src/branch/merge-handler.ts

@@ -2,6 +2,7 @@ import os from 'os';
 import path from 'path';
 import forEach from 'lodash/forEach';
 import { cliux } from '@contentstack/cli-utilities';
+import chalk from 'chalk';
 import { MergeInputOptions, MergeSummary } from '../interfaces';
 import {
   selectMergeStrategy,
@@ -107,6 +108,10 @@ export default class MergeHandler {
           deleted: [],
         };
         const selectedItems = await selectCustomPreferences(module, this.branchCompareData[module]);
+        if (!selectedItems.length) {
+          cliux.print(chalk.red('No items were selected'));
+          process.exit(1);
+        }
         forEach(selectedItems, (item) => {
           this.mergeSettings.mergeContent[module][item.status].push(item.value);
           this.mergeSettings.itemMergeStrategies.push(item.value);
@@ -132,8 +137,11 @@ export default class MergeHandler {
     } else if (this.strategy === 'overwrite_with_compare') {
       this.mergeSettings.strategy = 'overwrite_with_compare';
     }
-
-    await this.displayMergeSummary();
+    if (this.checkEmptySelection()) {
+      cliux.print(chalk.red('No items selected'));
+    } else {
+      await this.displayMergeSummary();
+    }
 
     if (!this.executeOption) {
       const executionResponse = await selectMergeExecution();
@@ -152,6 +160,17 @@ export default class MergeHandler {
     }
   }
 
+  checkEmptySelection() {
+    for (let module in this.branchCompareData) {
+      if (this.mergeSettings.mergeContent[module]?.modified?.length
+        || this.mergeSettings.mergeContent[module]?.added?.length
+        || this.mergeSettings.mergeContent[module]?.deleted?.length) {
+        return false;
+      }
+    }
+    return true;
+  }
+
   displayMergeSummary() {
     if (this.mergeSettings.strategy !== 'ignore') {
       for (let module in this.branchCompareData) {

packages/contentstack-branches/src/interfaces/index.ts

@@ -13,6 +13,7 @@ export interface BranchDiffRes {
   title: string;
   type: string;
   status: string;
+  merge_strategy?: string;
 }
 
 export interface BranchDiffSummary {

packages/contentstack-branches/src/utils/branch-diff-utility.ts

@@ -196,15 +196,21 @@ function printCompactTextView(branchTextRes: BranchCompactTextRes): void {
   if (branchTextRes.modified?.length || branchTextRes.added?.length || branchTextRes.deleted?.length) {
     cliux.print(' ');
     forEach(branchTextRes.added, (diff: BranchDiffRes) => {
-      cliux.print(chalk.green(`+ '${diff.title}' ${startCase(camelCase(diff.type))}`));
+      if (diff.merge_strategy !== 'ignore') {
+        cliux.print(chalk.green(`+ '${diff.title}' ${startCase(camelCase(diff.type))}`));
+      }
     });
 
     forEach(branchTextRes.modified, (diff: BranchDiffRes) => {
-      cliux.print(chalk.blue(`± '${diff.title}' ${startCase(camelCase(diff.type))}`));
+      if (diff.merge_strategy !== 'ignore') {
+        cliux.print(chalk.blue(`± '${diff.title}' ${startCase(camelCase(diff.type))}`));
+      }
     });
 
     forEach(branchTextRes.deleted, (diff: BranchDiffRes) => {
-      cliux.print(chalk.red(`- '${diff.title}' ${startCase(camelCase(diff.type))}`));
+      if (diff.merge_strategy !== 'ignore') {
+        cliux.print(chalk.red(`- '${diff.title}' ${startCase(camelCase(diff.type))}`));
+      }
     });
   }
 }

packages/contentstack-clone/package.json

@@ -7,7 +7,7 @@
   "dependencies": {
     "@colors/colors": "^1.6.0",
     "@contentstack/cli-cm-export": "~1.16.0",
-    "@contentstack/cli-cm-import": "~1.21.1",
+    "@contentstack/cli-cm-import": "~1.21.2",
     "@contentstack/cli-command": "~1.5.0",
     "@contentstack/cli-utilities": "~1.11.0",
     "chalk": "^4.1.2",

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.12.0 darwin-arm64 node-v23.6.0
+@contentstack/cli-config/1.12.0 darwin-arm64 node-v22.14.0
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND

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.21.1 darwin-arm64 node-v23.6.0
+@contentstack/cli-cm-import/1.21.2 darwin-arm64 node-v22.14.0
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND

packages/contentstack-import/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@contentstack/cli-cm-import",
   "description": "Contentstack CLI plugin to import content into stack",
-  "version": "1.21.1",
+  "version": "1.21.2",
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {
-    "@contentstack/cli-audit": "~1.12.0",
+    "@contentstack/cli-audit": "~1.12.1",
     "@contentstack/cli-command": "~1.5.0",
     "@contentstack/cli-utilities": "~1.11.0",
     "@contentstack/management": "~1.20.2",

packages/contentstack-import/src/import/modules/base-class.ts

@@ -308,7 +308,12 @@ export default abstract class BaseClass {
       case 'update-locale':
         return this.stack
           .locale(apiData.code)
-          .update({ locale: pick(apiData, [...this.modulesConfig.locales.requiredKeys]) as LocaleData })
+          .fetch()
+          .then((locale) => {
+            locale.name = apiData.name;
+            locale.fallback_locale = apiData.fallback_locale;
+            return locale.update();
+          })
           .then(onSuccess)
           .catch(onReject);
       case 'create-cts':

packages/contentstack-seed/package.json

@@ -5,7 +5,7 @@
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {
-    "@contentstack/cli-cm-import": "~1.21.1",
+    "@contentstack/cli-cm-import": "~1.21.2",
     "@contentstack/cli-command": "~1.5.0",
     "@contentstack/cli-utilities": "~1.11.0",
     "@contentstack/management": "~1.20.2",

packages/contentstack/README.md

@@ -18,7 +18,7 @@ $ npm install -g @contentstack/cli
 $ csdx COMMAND
 running command...
 $ csdx (--version|-v)
-@contentstack/cli/1.40.0 darwin-arm64 node-v23.6.0
+@contentstack/cli/1.40.0 darwin-arm64 node-v22.14.0
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND
@@ -3775,7 +3775,8 @@ USAGE
   $ csdx launch:functions [-p <value>] [-d <value>]
 
 FLAGS
-  -d, --data-dir=<value>  [default: /Users/aman.kumar/Documents/cli-repo/cli/packages/contentstack] Current working directory
+  -d, --data-dir=<value>  [default: /Users/aman.kumar/Documents/datasync-repo/cli/packages/contentstack] Current working
+                          directory
   -p, --port=<value>      [default: 3000] Port number
 
 DESCRIPTION

packages/contentstack/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@contentstack/cli",
   "description": "Command-line tool (CLI) to interact with Contentstack",
-  "version": "1.40.0",
+  "version": "1.40.1",
   "author": "Contentstack",
   "bin": {
     "csdx": "./bin/run.js"
@@ -22,15 +22,15 @@
     "prepack": "pnpm compile && oclif manifest && oclif readme"
   },
   "dependencies": {
-    "@contentstack/cli-audit": "~1.12.0",
+    "@contentstack/cli-audit": "~1.12.1",
     "@contentstack/cli-auth": "~1.4.0",
     "@contentstack/cli-cm-bootstrap": "~1.14.0",
-    "@contentstack/cli-cm-branches": "~1.4.0",
+    "@contentstack/cli-cm-branches": "~1.4.1",
     "@contentstack/cli-cm-bulk-publish": "~1.8.0",
     "@contentstack/cli-cm-clone": "~1.14.0",
     "@contentstack/cli-cm-export": "~1.16.0",
     "@contentstack/cli-cm-export-to-csv": "~1.8.0",
-    "@contentstack/cli-cm-import": "~1.21.1",
+    "@contentstack/cli-cm-import": "~1.21.2",
     "@contentstack/cli-cm-import-setup": "1.2.0",
     "@contentstack/cli-cm-migrate-rte": "~1.5.0",
     "@contentstack/cli-cm-seed": "~1.11.0",
@@ -67,13 +67,13 @@
     "@types/sinon": "^10.0.20",
     "chai": "^4.5.0",
     "eslint": "^8.57.1",
-    "eslint-config-oclif": "^6.0.44",
+    "eslint-config-oclif": "^6.0.46",
     "eslint-config-oclif-typescript": "^3.1.13",
     "globby": "^10.0.2",
     "mocha": "10.8.2",
     "nock": "^13.5.6",
     "nyc": "^15.1.0",
-    "oclif": "^4.17.44",
+    "oclif": "^4.17.46",
     "rimraf": "^5.0.10",
     "shelljs": "^0.9.2",
     "sinon": "^19.0.5",