Fixed merge conflits

Author: sunil-lakshman

.talismanrc

@@ -1,6 +1,6 @@
 fileignoreconfig:
   - filename: package-lock.json
-    checksum: d3b93fad9630655f037e36b78fea3354f1a038988562254afdad0f6e54ece12d
+    checksum: 5e64367e6f00c41d8fec66e335f66202d97a0e75006c9ecd331ce8f5856e296a
   - filename: pnpm-lock.yaml
     checksum: aa6177859aaa87caf2892e8034657fd485c3abe7c13a833fd28449a1d33fa950
   - filename: packages/contentstack-import-setup/test/unit/backup-handler.test.ts
@@ -30,7 +30,7 @@ fileignoreconfig:
   - filename: packages/contentstack-import-setup/test/unit/import-setup.test.ts
     checksum: 1eee4f461fa5b115894d1806a14af6f45336cbe6c0392f16078bd2877fadff67
   - filename: packages/contentstack-import-setup/test/unit/login-handler.test.ts
-    checksum: e549f9ca3a9aae0d93b7284f7e771d55c0610725ddcb4333612df2f215e92769
+    checksum: 258b92de292ab1a99aef277709fb41a95e57ce294eef445f77a9edd3b93b87f4
   - filename: packages/contentstack/README.md
     checksum: 10f580c697d0b70b813428954b946e60609f41c42e78ca95ca3232443e725615
   - filename: packages/contentstack-import-setup/test/unit/modules/assets.test.ts

MIGRATION.md

@@ -112,6 +112,24 @@ csdx config:set:log --no-show-console-logs
 [2025-08-22 16:12:25] SUCCESS: Exported stack settings successfully!
 ```
 
+### 4. 🏷️ Taxonomy Migration Deprecation
+
+**What Changed:**
+- Taxonomy migration functionality has been deprecated in 2.x.x
+- The taxonomy migration script examples have been removed
+
+**Before (1.x.x):**
+```bash
+csdx cm:stacks:migration -k b*******9ca0 --file-path "../contentstack-migration/examples/taxonomies/import-taxonomies.js" --config data-dir:'./data/Taxonomy Stack_taxonomies.csv'
+```
+- Taxonomy migration supports only in version 1.x.x
+
+**After (2.x.x-beta):**
+- Taxonomy migration is no longer supported through the migration plugin
+- Use the standard import/export commands for taxonomy data migration
+
+**Migration Action:** use the import/export commands instead.
+
 ## Troubleshooting
 
 ### Common Issues

package-lock.json

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

packages/contentstack-import-setup/README.md

@@ -1,7 +1,7 @@
 {
   "name": "@contentstack/cli-cm-import-setup",
   "description": "Contentstack CLI plugin to setup the mappers and configurations for the import command",
-  "version": "1.7.1",
+  "version": "2.0.0-beta",
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {

packages/contentstack-import-setup/package.json

@@ -40,7 +40,6 @@ export default interface ImportConfig extends DefaultConfig, ExternalConfig {
   authtoken?: string;
   destinationStackName?: string;
   org_uid?: string;
-  contentVersion: number;
   stackName?: string;
   branchName: string;
   selectedModules: Modules[];

packages/contentstack-import-setup/src/types/import-config.ts

@@ -32,12 +32,6 @@ const setupConfig = async (importCmdFlags: any): Promise<ImportConfig> => {
   config.contentDir = path.resolve(config.contentDir);
   //Note to support the old key
   config.data = config.contentDir;
-  if (fileExistsSync(path.join(config.contentDir, 'export-info.json'))) {
-    config.contentVersion =
-      ((await readFile(path.join(config.contentDir, 'export-info.json'))) || {}).contentVersion || 2;
-  } else {
-    config.contentVersion = 1;
-  }
 
   const managementTokenAlias = importCmdFlags['management-token-alias'] || importCmdFlags['alias'];
 

packages/contentstack-import-setup/src/utils/import-config-handler.ts

@@ -8,7 +8,7 @@ import { ImportConfig } from '../types';
 let logger: Logger;
 
 export function isImportConfig(config: ImportConfig | MessageType): config is ImportConfig {
-  return (config as ImportConfig).data !== undefined && (config as ImportConfig)?.contentVersion !== undefined;
+  return (config as ImportConfig).data !== undefined;
 }
 
 export function log(entry: LogEntry): void;

packages/contentstack-import-setup/src/utils/log.ts

@@ -25,7 +25,6 @@ describe('Backup Handler', () => {
     branchName: '',
     selectedModules: ['entries'],
     backupDir: '',
-    contentVersion: 1,
     region: 'us',
   };
 

packages/contentstack-import-setup/test/unit/backup-handler.test.ts

@@ -23,7 +23,6 @@ describe('Common Helper Utilities', () => {
     branchName: '',
     selectedModules: ['entries'],
     backupDir: '',
-    contentVersion: 1,
     region: 'us',
   };