Merge pull request #2268 from contentstack/fix/DX-3789-merge-dev-into-v2-beta-dev

Fix/dx 3789 merge dev into v2 beta dev

Author: cs-raj

package-lock.json

@@ -301,11 +301,11 @@ export abstract class AuditBaseCommand extends BaseCommand<typeof AuditBaseComma
           missingMultipleFields = missingEntry.missingMultipleFields ?? {};
           await this.prepareReport(module, missingEntryRefs);
 
-          await this.prepareReport(`Entries_Select_feild`, missingSelectFeild);
+          await this.prepareReport(`Entries_Select_field`, missingSelectFeild);
 
-          await this.prepareReport('Entries_Mandatory_feild', missingMandatoryFields);
+          await this.prepareReport('Entries_Mandatory_field', missingMandatoryFields);
 
-          await this.prepareReport('Entries_Title_feild', missingTitleFields);
+          await this.prepareReport('Entries_Title_field', missingTitleFields);
 
           await this.prepareReport('Entry_Missing_Locale_and_Env_in_Publish_Details', missingEnvLocalesInEntries);
 

packages/contentstack-audit/src/audit-base-command.ts

@@ -116,17 +116,17 @@ const config = {
     "Passed",
   ],
   ReportTitleForEntries: {
-    Entries_Select_feild: 'Entries_Select_feild',
-    Entries_Mandatory_feild: 'Entries_Mandatory_feild',
-    Entries_Title_feild: 'Entries_Title_feild',
+    Entries_Select_field: 'Entries_Select_field',
+    Entries_Mandatory_field: 'Entries_Mandatory_field',
+    Entries_Title_field: 'Entries_Title_field',
     Entry_Missing_Locale_and_Env: 'Entry_Missing_Locale_and_Env',
     Entry_Missing_Locale_and_Env_in_Publish_Details: 'Entry_Missing_Locale_and_Env_in_Publish_Details',
     Entry_Multiple_Fields:"Entry_Multiple_Fields"
   },
   feild_level_modules: [
-    'Entries_Title_feild',
-    'Entries_Mandatory_feild',
-    'Entries_Select_feild',
+    'Entries_Title_field',
+    'Entries_Mandatory_field',
+    'Entries_Select_field',
     'Entry_Missing_Locale_and_Env_in_Publish_Details',
     'field-rules',
     'Entry_Multiple_Fields',

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

@@ -15,7 +15,7 @@ $ npm install -g @contentstack/cli-cm-bootstrap
 $ csdx COMMAND
 running command...
 $ csdx (--version)
-@contentstack/cli-cm-bootstrap/2.0.0-beta.1 darwin-arm64 node-v22.14.0
+@contentstack/cli-cm-bootstrap/2.0.0-beta.2 darwin-arm64 node-v22.14.0
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND

packages/contentstack-bootstrap/README.md

@@ -17,7 +17,7 @@
   },
   "dependencies": {
     "@contentstack/cli-cm-seed": "~2.0.0-beta.2",
-    "@contentstack/cli-command": "~1.6.1",
+    "@contentstack/cli-command": "~1.7.0",
     "@contentstack/cli-utilities": "~1.15.0",
     "@oclif/core": "^4.3.0",
     "@oclif/plugin-help": "^6.2.28",

packages/contentstack-bootstrap/package.json

@@ -138,7 +138,7 @@ export const setupEnvironments = async (
           cliux.print(messageHandler.parse('CLI_BOOTSTRAP_APP_FAILED_TO_CREATE_ENV_FILE_FOR_ENV', environment.name));
         }
       } else {
-        cliux.print('No environments name found for the environment');
+        cliux.print('No environment name found for the selected environment.');
       }
     }
   } else {

packages/contentstack-bootstrap/src/bootstrap/utils.ts

@@ -147,7 +147,7 @@ export default class BootstrapCommand extends Command {
         } else if (appType === 'starterapp') {
           selectedApp = await inquireApp(config.starterApps);
         } else {
-          this.error('Invalid app type provided ' + appType, { exit: 1 });
+          this.error('Invalid app type provided: ' + appType, { exit: 1 });
         }
       }
 

packages/contentstack-bootstrap/src/commands/cm/bootstrap.ts

@@ -5,7 +5,7 @@
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {
-    "@contentstack/cli-command": "~1.6.1",
+    "@contentstack/cli-command": "~1.7.0",
     "@oclif/core": "^4.3.0",
     "@oclif/plugin-help": "^6.2.28",
     "@contentstack/cli-utilities": "~1.15.0",

packages/contentstack-branches/package.json

@@ -280,7 +280,7 @@ export default class MergeHandler {
         mergeContent[module].deleted = moduleBranchCompareData.deleted;
         break;
       default:
-        cliux.error(`error: Invalid strategy ${strategy}`);
+        cliux.error(`Error: Invalid strategy '${strategy}'`);
         process.exit(1);
     }
   }

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

@@ -47,7 +47,7 @@ export default class BranchDeleteCommand extends Command {
     if (!branchDeleteFlags.yes) {
       const confirmBranch = await interactive.askBranchNameConfirmation();
       if (confirmBranch !== branchDeleteFlags.uid) {
-        cliux.error(`error: To delete the branch, enter a valid branch name '${branchDeleteFlags.uid}'`);
+        cliux.error(`Error: To delete the branch, enter a valid branch name '${branchDeleteFlags.uid}'`);
         process.exit(1);
       }
     }