Merge pull request #1932 from contentstack/development

harshithad0703 · web-flow · commit c3ca98954eac · 2025-05-26T10:33:34.000+05:30
26-05-2025 | staging
diff --git a/.talismanrc b/.talismanrc
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/contentstack-audit/README.md b/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.11.0
+@contentstack/cli-audit/1.12.1 darwin-arm64 node-v22.14.0
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND
diff --git a/packages/contentstack-audit/package.json b/packages/contentstack-audit/package.json
@@ -20,7 +20,7 @@
   "dependencies": {
     "@contentstack/cli-command": "~1.5.0",
     "@oclif/plugin-help": "^6.2.27",
-    "@contentstack/cli-utilities": "~1.11.0",
+    "@contentstack/cli-utilities": "~1.11.1",
     "@oclif/plugin-plugins": "^5.4.36",
     "chalk": "^4.1.2",
     "fast-csv": "^4.3.6",
diff --git a/packages/contentstack-auth/README.md b/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.11.0
+@contentstack/cli-auth/1.4.0 darwin-arm64 node-v22.14.0
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND
diff --git a/packages/contentstack-auth/package.json b/packages/contentstack-auth/package.json
@@ -23,7 +23,7 @@
   },
   "dependencies": {
     "@contentstack/cli-command": "~1.5.0",
-    "@contentstack/cli-utilities": "~1.11.0"
+    "@contentstack/cli-utilities": "~1.11.1"
   },
   "devDependencies": {
     "@fancy-test/nock": "^0.1.1",
diff --git a/packages/contentstack-bootstrap/README.md b/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.14.0 darwin-arm64 node-v23.11.0
+@contentstack/cli-cm-bootstrap/1.14.0 darwin-arm64 node-v22.14.0
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND
diff --git a/packages/contentstack-bootstrap/package.json b/packages/contentstack-bootstrap/package.json
@@ -17,9 +17,9 @@
     "test:report": "nyc --reporter=lcov mocha \"test/**/*.test.js\""
   },
   "dependencies": {
-    "@contentstack/cli-cm-seed": "~1.11.0",
+    "@contentstack/cli-cm-seed": "~1.11.1",
     "@contentstack/cli-command": "~1.5.0",
-    "@contentstack/cli-utilities": "~1.11.0",
+    "@contentstack/cli-utilities": "~1.11.1",
     "inquirer": "8.2.6",
     "mkdirp": "^1.0.4",
     "tar": "^6.2.1 "
diff --git a/packages/contentstack-branches/package.json b/packages/contentstack-branches/package.json
@@ -7,7 +7,7 @@
   "dependencies": {
     "@contentstack/cli-command": "~1.5.0",
     "@oclif/core": "^4.2.7",
-    "@contentstack/cli-utilities": "~1.11.0",
+    "@contentstack/cli-utilities": "~1.11.1",
     "chalk": "^4.1.2",
     "just-diff": "^6.0.2",
     "lodash": "^4.17.21"
diff --git a/packages/contentstack-bulk-publish/README.md b/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.8.0 darwin-arm64 node-v23.11.0
+@contentstack/cli-cm-bulk-publish/1.8.0 darwin-arm64 node-v22.14.0
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND
diff --git a/packages/contentstack-bulk-publish/package.json b/packages/contentstack-bulk-publish/package.json
@@ -6,7 +6,7 @@
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {
     "@contentstack/cli-command": "~1.5.0",
-    "@contentstack/cli-utilities": "~1.11.0",
+    "@contentstack/cli-utilities": "~1.11.1",
     "chalk": "^4.1.2",
     "dotenv": "^16.4.7",
     "inquirer": "8.2.6",
diff --git a/packages/contentstack-clone/README.md b/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.14.0 darwin-arm64 node-v23.11.0
+@contentstack/cli-cm-clone/1.14.1 darwin-arm64 node-v23.11.0
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND
diff --git a/packages/contentstack-clone/package.json b/packages/contentstack-clone/package.json
@@ -1,15 +1,15 @@
 {
   "name": "@contentstack/cli-cm-clone",
   "description": "Contentstack stack clone plugin",
-  "version": "1.14.0",
+  "version": "1.14.1",
   "author": "Contentstack",
   "bugs": "https://github.com/rohitmishra209/cli-cm-clone/issues",
   "dependencies": {
     "@colors/colors": "^1.6.0",
     "@contentstack/cli-cm-export": "~1.16.1",
-    "@contentstack/cli-cm-import": "~1.21.3",
+    "@contentstack/cli-cm-import": "~1.22.0",
     "@contentstack/cli-command": "~1.5.0",
-    "@contentstack/cli-utilities": "~1.11.0",
+    "@contentstack/cli-utilities": "~1.11.1",
     "chalk": "^4.1.2",
     "inquirer": "8.2.6",
     "lodash": "^4.17.21",
diff --git a/packages/contentstack-command/package.json b/packages/contentstack-command/package.json
@@ -17,7 +17,7 @@
     "format": "eslint src/**/*.ts --fix"
   },
   "dependencies": {
-    "@contentstack/cli-utilities": "~1.11.0",
+    "@contentstack/cli-utilities": "~1.11.1",
     "contentstack": "^3.25.2"
   },
   "devDependencies": {
diff --git a/packages/contentstack-config/README.md b/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.11.1 darwin-arm64 node-v23.11.0
+@contentstack/cli-config/1.12.0 darwin-arm64 node-v22.14.0
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND
diff --git a/packages/contentstack-config/package.json b/packages/contentstack-config/package.json
@@ -22,7 +22,7 @@
   },
   "dependencies": {
     "@contentstack/cli-command": "~1.5.0",
-    "@contentstack/cli-utilities": "~1.11.0",
+    "@contentstack/cli-utilities": "~1.11.1",
     "lodash": "^4.17.21"
   },
   "devDependencies": {
diff --git a/packages/contentstack-export-to-csv/package.json b/packages/contentstack-export-to-csv/package.json
@@ -6,7 +6,7 @@
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {
     "@contentstack/cli-command": "~1.5.0",
-    "@contentstack/cli-utilities": "~1.11.0",
+    "@contentstack/cli-utilities": "~1.11.1",
     "fast-csv": "^4.3.6",
     "inquirer": "8.2.6",
     "inquirer-checkbox-plus-prompt": "1.4.2",
diff --git a/packages/contentstack-export/package.json b/packages/contentstack-export/package.json
@@ -8,7 +8,7 @@
     "@contentstack/cli-command": "~1.5.0",
     "@contentstack/cli-variants": "~1.2.1",
     "@oclif/core": "^4.2.7",
-    "@contentstack/cli-utilities": "~1.11.0",
+    "@contentstack/cli-utilities": "~1.11.1",
     "async": "^3.2.6",
     "big-json": "^3.2.0",
     "bluebird": "^3.7.2",
diff --git a/packages/contentstack-import-setup/README.md b/packages/contentstack-import-setup/README.md
@@ -47,7 +47,7 @@ $ npm install -g @contentstack/cli-cm-import-setup
 $ csdx COMMAND
 running command...
 $ csdx (--version)
-@contentstack/cli-cm-import-setup/1.2.0 darwin-arm64 node-v23.11.0
+@contentstack/cli-cm-import-setup/1.2.0 darwin-arm64 node-v22.14.0
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND
diff --git a/packages/contentstack-import-setup/package.json b/packages/contentstack-import-setup/package.json
@@ -7,7 +7,7 @@
   "dependencies": {
     "@contentstack/cli-command": "~1.5.0",
     "@oclif/core": "^4.2.7",
-    "@contentstack/cli-utilities": "~1.11.0",
+    "@contentstack/cli-utilities": "~1.11.1",
     "big-json": "^3.2.0",
     "chalk": "^4.1.2",
     "fs-extra": "^11.1.1",
diff --git a/packages/contentstack-import/README.md b/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.11.0
+@contentstack/cli-cm-import/1.22.0 darwin-arm64 node-v22.11.0
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND
diff --git a/packages/contentstack-import/package.json b/packages/contentstack-import/package.json
@@ -1,13 +1,13 @@
 {
   "name": "@contentstack/cli-cm-import",
   "description": "Contentstack CLI plugin to import content into stack",
-  "version": "1.21.4",
+  "version": "1.22.0",
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {
     "@contentstack/cli-audit": "~1.12.1",
     "@contentstack/cli-command": "~1.5.0",
-    "@contentstack/cli-utilities": "~1.11.0",
+    "@contentstack/cli-utilities": "~1.11.1",
     "@contentstack/management": "~1.20.2",
     "@contentstack/cli-variants": "~1.2.1",
     "@oclif/core": "^4.2.7",
diff --git a/packages/contentstack-import/src/commands/cm/stacks/import.ts b/packages/contentstack-import/src/commands/cm/stacks/import.ts
@@ -70,7 +70,8 @@ export default class ImportCommand extends Command {
     module: flags.string({
       required: false,
       char: 'm',
-      description: '[optional] Specify the module to import into the target stack. If not specified, the import command will import all the modules into the stack. The available modules are assets, content-types, entries, environments, extensions, marketplace-apps, global-fields, labels, locales, webhooks, workflows, custom-roles, and taxonomies.',
+      description:
+        '[optional] Specify the module to import into the target stack. If not specified, the import command will import all the modules into the stack. The available modules are assets, content-types, entries, environments, extensions, marketplace-apps, global-fields, labels, locales, webhooks, workflows, custom-roles, and taxonomies.',
       parse: printFlagDeprecation(['-m'], ['--module']),
     }),
     'backup-dir': flags.string({
@@ -80,11 +81,13 @@ export default class ImportCommand extends Command {
     }),
     branch: flags.string({
       char: 'B',
-      description: 'The name of the branch where you want to import your content. If you don\'t mention the branch name, then by default the content will be imported to the main branch.',
+      description:
+        "The name of the branch where you want to import your content. If you don't mention the branch name, then by default the content will be imported to the main branch.",
       parse: printFlagDeprecation(['-B'], ['--branch']),
     }),
     'import-webhook-status': flags.string({
-      description: '[default: disable] (optional) This webhook state keeps the same state of webhooks as the source stack. <options: disable|current>',
+      description:
+        '[default: disable] (optional) This webhook state keeps the same state of webhooks as the source stack. <options: disable|current>',
       options: ['disable', 'current'],
       required: false,
       default: 'disable',
@@ -96,6 +99,7 @@ export default class ImportCommand extends Command {
     }),
     'skip-app-recreation': flags.boolean({
       description: '(optional) Skips the recreation of private apps if they already exist.',
+      parse: printFlagDeprecation(['--skip-app-recreation']),
     }),
     'replace-existing': flags.boolean({
       required: false,
@@ -156,7 +160,7 @@ export default class ImportCommand extends Command {
             .branch()
             .query()
             .find()
-            .then(({ items }: any) => items)
+            .then(({ items }: any) => items);
           if (branches.length) {
             flags.branch = 'main';
           }
diff --git a/packages/contentstack-import/src/import/modules/marketplace-apps.ts b/packages/contentstack-import/src/import/modules/marketplace-apps.ts
@@ -238,7 +238,7 @@ export default class ImportMarketplaceApps {
     if (canCreatePrivateApp) {
       log(this.importConfig, 'Starting developer hub private apps re-creation', 'success');
       for (let app of privateApps) {
-        if (this.importConfig.skipPrivateAppRecreationIfExist && (await this.isPrivateAppExistInDeveloperHub(app))) {
+        if (await this.isPrivateAppExistInDeveloperHub(app)) {
           // NOTE Found app already exist in the same org
           this.appUidMapping[app.uid] = app.uid;
           cliux.print(`App '${app.manifest.name}' already exist. skipping app recreation.!`, { color: 'yellow' });
diff --git a/packages/contentstack-import/src/utils/import-config-handler.ts b/packages/contentstack-import/src/utils/import-config-handler.ts
@@ -20,7 +20,9 @@ const setupConfig = async (importCmdFlags: any): Promise<ImportConfig> => {
     config = merge.recursive(config, externalConfig);
   }
 
-  config.contentDir = sanitizePath(importCmdFlags['data'] || importCmdFlags['data-dir'] || config.data || (await askContentDir()));
+  config.contentDir = sanitizePath(
+    importCmdFlags['data'] || importCmdFlags['data-dir'] || config.data || (await askContentDir()),
+  );
   const pattern = /[*$%#<>{}!&?]/g;
   if (pattern.test(config.contentDir)) {
     cliux.print(`\nPlease add a directory path without any of the special characters: (*,&,{,},[,],$,%,<,>,?,!)`, {
@@ -75,7 +77,7 @@ const setupConfig = async (importCmdFlags: any): Promise<ImportConfig> => {
   config.skipAudit = importCmdFlags['skip-audit'];
   config.forceStopMarketplaceAppsPrompt = importCmdFlags.yes;
   config.importWebhookStatus = importCmdFlags['import-webhook-status'];
-  config.skipPrivateAppRecreationIfExist = importCmdFlags['skip-app-recreation'];
+  config.skipPrivateAppRecreationIfExist = !importCmdFlags['skip-app-recreation'];
 
   if (importCmdFlags['branch']) {
     config.branchName = importCmdFlags['branch'];
@@ -89,7 +91,7 @@ const setupConfig = async (importCmdFlags: any): Promise<ImportConfig> => {
   if (importCmdFlags['backup-dir']) {
     config.useBackedupDir = importCmdFlags['backup-dir'];
   }
-  
+
   if (importCmdFlags['skip-assets-publish']) {
     config.skipAssetsPublish = importCmdFlags['skip-assets-publish'];
   }
diff --git a/packages/contentstack-migrate-rte/README.md b/packages/contentstack-migrate-rte/README.md
@@ -16,7 +16,7 @@ $ npm install -g @contentstack/cli-cm-migrate-rte
 $ csdx COMMAND
 running command...
 $ csdx (--version)
-@contentstack/cli-cm-migrate-rte/1.5.0 darwin-arm64 node-v23.11.0
+@contentstack/cli-cm-migrate-rte/1.5.1 darwin-arm64 node-v22.14.0
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND
diff --git a/packages/contentstack-migrate-rte/package.json b/packages/contentstack-migrate-rte/package.json
@@ -6,7 +6,7 @@
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {
     "@contentstack/cli-command": "~1.5.0",
-    "@contentstack/cli-utilities": "~1.11.0",
+    "@contentstack/cli-utilities": "~1.11.1",
     "@contentstack/json-rte-serializer": "~2.0.11",
     "collapse-whitespace": "^1.1.7",
     "chalk": "^4.1.2",
diff --git a/packages/contentstack-migration/package.json b/packages/contentstack-migration/package.json
@@ -5,7 +5,7 @@
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {
     "@contentstack/cli-command": "~1.5.0",
-    "@contentstack/cli-utilities": "~1.11.0",
+    "@contentstack/cli-utilities": "~1.11.1",
     "async": "^3.2.6",
     "callsites": "^3.1.0",
     "cardinal": "^2.1.1",
diff --git a/packages/contentstack-seed/package.json b/packages/contentstack-seed/package.json
@@ -1,13 +1,13 @@
 {
   "name": "@contentstack/cli-cm-seed",
   "description": "create a Stack from existing content types, entries, assets, etc.",
-  "version": "1.11.0",
+  "version": "1.11.1",
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {
-    "@contentstack/cli-cm-import": "~1.21.3",
+    "@contentstack/cli-cm-import": "~1.22.0",
     "@contentstack/cli-command": "~1.5.0",
-    "@contentstack/cli-utilities": "~1.11.0",
+    "@contentstack/cli-utilities": "~1.11.1",
     "@contentstack/management": "~1.20.2",
     "inquirer": "8.2.6",
     "mkdirp": "^1.0.4",
diff --git a/packages/contentstack-utilities/package.json b/packages/contentstack-utilities/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@contentstack/cli-utilities",
-  "version": "1.11.0",
+  "version": "1.11.1",
   "description": "Utilities for contentstack projects",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
diff --git a/packages/contentstack-utilities/src/config-handler.ts b/packages/contentstack-utilities/src/config-handler.ts
@@ -63,6 +63,23 @@ class Config {
     }
   }
 
+  isConfigFileValid(configPath: string): boolean {
+    try {
+      const content = readFileSync(configPath, 'utf8');
+      JSON.parse(content);
+      return true;
+    } catch (e) {
+      return false;
+    }
+  }
+
+  safeDeleteConfigIfInvalid(configFilePath: string) {
+    if (existsSync(configFilePath) && !this.isConfigFileValid(configFilePath)) {
+      console.warn(chalk.yellow(`Warning: Detected corrupted config at ${configFilePath}. Removing...`));
+      unlinkSync(configFilePath);
+    }
+  }
+
   removeOldConfigStoreFile() {
     if (existsSync(oldConfigPath)) {
       unlinkSync(oldConfigPath); // NOTE remove old configstore file
@@ -110,8 +127,10 @@ class Config {
   private getEncryptedConfig(configData?: Record<string, unknown>, skip = false) {
     const getEncryptedDataElseFallBack = () => {
       try {
+        
         // NOTE reading current code base encrypted file if exist
         const encryptionKey: any = this.getObfuscationKey();
+        this.safeDeleteConfigIfInvalid(oldConfigPath);
         this.config = new Conf({ configName: CONFIG_NAME, encryptionKey, cwd });
 
         if (Object.keys(configData || {})?.length) {
@@ -133,6 +152,7 @@ class Config {
 
     try {
       if (skip === false) {
+        this.safeDeleteConfigIfInvalid(oldConfigPath);
         const config = new Conf({ configName: CONFIG_NAME });
         const oldConfigData = this.getConfigDataAndUnlinkConfigFile(config);
         this.getEncryptedConfig(oldConfigData, true);
@@ -150,6 +170,7 @@ class Config {
 
   private getDecryptedConfig(configData?: Record<string, unknown>) {
     try {
+      this.safeDeleteConfigIfInvalid(oldConfigPath);
       this.config = new Conf({ configName: CONFIG_NAME, cwd });
 
       if (Object.keys(configData || {})?.length) {
@@ -160,6 +181,7 @@ class Config {
 
       try {
         const encryptionKey: any = this.getObfuscationKey();
+        this.safeDeleteConfigIfInvalid(oldConfigPath);
         let config = new Conf({ configName: CONFIG_NAME, encryptionKey, cwd });
         const oldConfigData = this.getConfigDataAndUnlinkConfigFile(config);
         this.getDecryptedConfig(oldConfigData); // NOTE NOTE reinitialize the config with old data and new decrypted file
diff --git a/packages/contentstack/README.md b/packages/contentstack/README.md
diff --git a/packages/contentstack/package.json b/packages/contentstack/package.json
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
