Fix: removed the branchDir

Author: cs-raj

packages/contentstack-export/src/export/module-exporter.ts

@@ -65,7 +65,6 @@ class ModuleExporter {
     try {
       this.exportConfig.branchName = targetBranch.uid;
       this.stackAPIClient.stackHeaders.branch = targetBranch.uid;
-      this.exportConfig.branchDir = this.exportConfig.exportDir;
 
       // Initialize progress manager for the target branch
       CLIProgressManager.clearGlobalSummary();

packages/contentstack-export/src/types/export-config.ts

@@ -16,7 +16,6 @@ export default interface ExportConfig extends DefaultConfig {
   contentTypes?: string[];
   branches?: branch[];
   branchEnabled?: boolean;
-  branchDir?: string;
   singleModuleExport?: boolean;
   moduleName?: Modules;
   master_locale: masterLocale;

packages/contentstack-export/src/utils/path-helper.ts

@@ -5,5 +5,5 @@ import { ExportConfig } from '../types';
  * Content is always written directly under this path (no branch subfolder).
  */
 export function getExportBasePath(exportConfig: ExportConfig): string {
-  return exportConfig.branchDir ?? exportConfig.exportDir;
+  return exportConfig.exportDir;
 }

packages/contentstack-export/test/unit/export/module-exporter.test.ts

@@ -15,7 +15,7 @@ describe('ModuleExporter exportByBranches', () => {
     sandbox.restore();
   });
 
-  it('should set branchDir to exportDir when no branch specified (default main)', async () => {
+  it('should select main branch and call export when no branch specified', async () => {
     const branches = [
       { uid: 'main', source: '', name: 'main' },
       { uid: 'dev', source: 'main', name: 'dev' },
@@ -41,12 +41,11 @@ describe('ModuleExporter exportByBranches', () => {
 
     await exporter.exportByBranches();
 
-    expect(exportConfig.branchDir).to.equal(exportDir);
     expect(exportConfig.branchName).to.equal('main');
     expect(exportStub.calledOnce).to.be.true;
   });
 
-  it('should set branchDir to exportDir when branch is specified via branchName', async () => {
+  it('should select branch from branchName and call export', async () => {
     const branches = [
       { uid: 'main', source: '', name: 'main' },
       { uid: 'dev', source: 'main', name: 'dev' },
@@ -73,7 +72,6 @@ describe('ModuleExporter exportByBranches', () => {
 
     await exporter.exportByBranches();
 
-    expect(exportConfig.branchDir).to.equal(exportDir);
     expect(exportConfig.branchName).to.equal('dev');
     expect(exportStub.calledOnce).to.be.true;
   });

packages/contentstack-export/test/unit/export/modules/labels.test.ts

@@ -450,8 +450,7 @@ describe('ExportLabels', () => {
       expect(exportLabels.labelsFolderPath).to.include('labels');
     });
 
-    it('should use export path directly when branchDir is set (content at path, no branch subfolder)', async () => {
-      mockExportConfig.branchDir = '/test/export';
+    it('should use export path directly (content at path, no branch subfolder)', async () => {
       mockExportConfig.branchName = 'main';
       exportLabels = new ExportLabels({
         exportConfig: mockExportConfig,

packages/contentstack-export/test/unit/export/modules/marketplace-apps.test.ts

@@ -254,9 +254,8 @@ describe('ExportMarketplaceApps', () => {
       configHandlerGetStub.restore();
     });
 
-    // Skipped: path uses module dirName (e.g. marketplace-apps), not marketplace_assets; branchDir flow drift.
-    it.skip('should use export path directly when branchDir is set (content at path, no branch subfolder)', async () => {
-      mockExportConfig.branchDir = '/test/export';
+    // Skipped: path uses module dirName (e.g. marketplace-apps), not marketplace_assets; export path drift.
+    it.skip('should use export path directly (content at path, no branch subfolder)', async () => {
       mockExportConfig.branchName = 'main';
       exportMarketplaceApps = new ExportMarketplaceApps({
         exportConfig: mockExportConfig,

packages/contentstack-export/test/unit/utils/path-helper.test.ts

@@ -5,25 +5,9 @@ import { ExportConfig } from '../../../src/types';
 describe('path-helper getExportBasePath', () => {
   const exportDir = '/test/export';
 
-  it('should return branchDir when branchDir is set', () => {
+  it('should return exportDir', () => {
     const config = {
       exportDir,
-      branchDir: '/custom/branch/path',
-    } as Partial<ExportConfig> as ExportConfig;
-    expect(getExportBasePath(config)).to.equal('/custom/branch/path');
-  });
-
-  it('should return exportDir when branchDir is not set', () => {
-    const config = {
-      exportDir,
-    } as Partial<ExportConfig> as ExportConfig;
-    expect(getExportBasePath(config)).to.equal(exportDir);
-  });
-
-  it('should return exportDir when branchDir is undefined', () => {
-    const config = {
-      exportDir,
-      branchDir: undefined,
     } as Partial<ExportConfig> as ExportConfig;
     expect(getExportBasePath(config)).to.equal(exportDir);
   });

packages/contentstack-migration/README.md

@@ -21,7 +21,7 @@ $ npm install -g @contentstack/cli-migration
 $ csdx COMMAND
 running command...
 $ csdx (--version)
-@contentstack/cli-migration/2.0.0-beta.7 darwin-arm64 node-v24.13.0
+@contentstack/cli-migration/2.0.0-beta.10 darwin-arm64 node-v23.11.0
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND

packages/contentstack-variants/src/export/attributes.ts

@@ -22,7 +22,7 @@ export default class ExportAttributes extends PersonalizationAdapter<ExportConfi
     this.personalizeConfig = exportConfig.modules.personalize;
     this.attributesConfig = exportConfig.modules.attributes;
     this.attributesFolderPath = pResolve(
-      sanitizePath(exportConfig.branchDir ?? exportConfig.exportDir),
+      sanitizePath(exportConfig.exportDir),
       sanitizePath(this.personalizeConfig.dirName),
       sanitizePath(this.attributesConfig.dirName),
     );

packages/contentstack-variants/src/export/audiences.ts

@@ -22,7 +22,7 @@ export default class ExportAudiences extends PersonalizationAdapter<ExportConfig
     this.personalizeConfig = exportConfig.modules.personalize;
     this.audiencesConfig = exportConfig.modules.audiences;
     this.audiencesFolderPath = pResolve(
-      sanitizePath(exportConfig.branchDir ?? exportConfig.exportDir),
+      sanitizePath(exportConfig.exportDir),
       sanitizePath(this.personalizeConfig.dirName),
       sanitizePath(this.audiencesConfig.dirName),
     );