Back merge main to v2-beta

.talismanrc

@@ -1,8 +1,8 @@
 fileignoreconfig:
 - filename: package-lock.json
-  checksum: b07cb236b78aa3149b89e2ed18851ee005db8ef735062f91e0e91b2adf013c12
+  checksum: 1625bf05fa92826c389d702552d5027df7632a96bac74a970f78f866bbb59e7e
 - filename: pnpm-lock.yaml
-  checksum: 577582ed82062ad359d8bc2bc0a309ab4d344a2a4122573d8cf77aeb481268f2
+  checksum: 87a6d67aa28e2675ac544cebd0cad703382b799fb46abfe96398c96522374624
 - filename: packages/contentstack-import-setup/test/unit/backup-handler.test.ts
   checksum: 0582d62b88834554cf12951c8690a73ef3ddbb78b82d2804d994cf4148e1ef93
 - filename: packages/contentstack-import-setup/test/config.json
@@ -87,4 +87,4 @@ fileignoreconfig:
   checksum: 7db02c6f2627400b28fc96d505bf074d477080a45ba13943709d4845b6ca0908
 - filename: packages/contentstack-import/src/utils/backup-handler.ts
   checksum: 0a9accdafce01837166223ed00cd801e2ebb39a4ef952231f67232859a5beea8
-version: "1.0"
+version: "1.0"

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.5.0 darwin-arm64 node-v22.13.1
+@contentstack/cli-cm-import-setup/1.6.0 darwin-arm64 node-v22.13.1
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND
@@ -78,6 +78,8 @@ FLAGS
                                branches involved, then the path should point till the particular branch. For example,
                                “-d "C:\Users\Name\Desktop\cli\content\branch_name"
   -k, --stack-api-key=<value>  API key of the target stack
+      --branch-alias=<value>   The alias of the branch where you want to import your content. If you don't mention the
+                               branch alias, then by default the content will be imported to the main branch.
       --module=<option>...     [optional] Specify the modules/module to import into the target stack. currently options
                                are global-fields, content-types, entries
                                <options: global-fields|content-types|entries>
@@ -113,6 +115,8 @@ FLAGS
                                branches involved, then the path should point till the particular branch. For example,
                                “-d "C:\Users\Name\Desktop\cli\content\branch_name"
   -k, --stack-api-key=<value>  API key of the target stack
+      --branch-alias=<value>   The alias of the branch where you want to import your content. If you don't mention the
+                               branch alias, then by default the content will be imported to the main branch.
       --module=<option>...     [optional] Specify the modules/module to import into the target stack. currently options
                                are global-fields, content-types, entries
                                <options: global-fields|content-types|entries>

packages/contentstack-import-setup/package.json

@@ -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.5.0",
+  "version": "1.6.0",
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {

packages/contentstack-import-setup/src/commands/cm/stacks/import-setup.ts

@@ -50,6 +50,12 @@ export default class ImportSetupCommand extends Command {
       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']),
+      exclusive: ['branch-alias']
+    }),
+    'branch-alias': flags.string({
+      description:
+        "Specify the branch alias where you want to import your content. If not specified, the content is imported into the main branch by default.",
+      exclusive: ['branch'],
     }),
   };
 

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

@@ -1,5 +1,5 @@
 import { ImportConfig, Modules } from '../types';
-import { backupHandler, log } from '../utils';
+import { backupHandler, log, setupBranchConfig } from '../utils';
 import { ContentstackClient } from '@contentstack/cli-utilities';
 import { validateBranch } from '../utils';
 
@@ -102,9 +102,7 @@ export default class ImportSetup {
       if (backupDir) {
         this.config.backupDir = backupDir;
       }
-      if (this.config.branchName) {
-        await validateBranch(this.stackAPIClient, this.config, this.config.branchName);
-      }
+      await setupBranchConfig(this.config, this.stackAPIClient);
 
       await this.generateDependencyTree();
       await this.runModuleImports();

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

@@ -22,6 +22,7 @@ export default interface ImportConfig extends DefaultConfig, ExternalConfig {
   branches?: branch[];
   branchEnabled?: boolean;
   branchDir?: string;
+  branchAlias?: string;
   moduleName?: Modules;
   master_locale: masterLocale;
   headers?: {

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

@@ -80,6 +80,10 @@ const setupConfig = async (importCmdFlags: any): Promise<ImportConfig> => {
     config.branchName = importCmdFlags['branch'];
   }
 
+  if (importCmdFlags['branch-alias']) {
+    config.branchAlias = importCmdFlags['branch-alias'];
+  }
+
   config.selectedModules = importCmdFlags['module'] || [await askSelectedModules()];
   if (importCmdFlags['backup-dir']) {
     config.useBackedupDir = importCmdFlags['backup-dir'];

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

@@ -6,3 +6,4 @@ export { default as backupHandler } from './backup-handler';
 export { log, unlinkFileLogger } from './logger';
 export * from './log';
 export * from './common-helper';
+export { setupBranchConfig } from './setup-branch';

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

@@ -0,0 +1,35 @@
+import { ContentstackClient, getBranchFromAlias, log } from '@contentstack/cli-utilities';
+import { validateBranch } from './common-helper';
+import { ImportConfig } from 'src/types';
+
+export const setupBranchConfig = async (
+  config: ImportConfig,
+  stackAPIClient: ReturnType<ContentstackClient['stack']>,
+): Promise<void> => {
+
+  if (config.branchName) {
+    await validateBranch(stackAPIClient, config, config.branchName);
+    return;
+  }
+
+  if (config.branchAlias) {
+    config.branchName = await getBranchFromAlias(stackAPIClient, config.branchAlias);
+    return;
+  }
+
+    try {
+      const branches = await stackAPIClient
+        .branch()
+        .query()
+        .find()
+        .then(({ items }) => items);
+      if (branches.length) {
+        log.info(`The stack is branch-enabled, and branches exist. By default, content will be imported into the main branch.`);
+
+        config.branchName = 'main';
+        log.debug(`Setting default target branch to 'main'`);
+      }
+    } catch (error) {
+      log.debug('Failed to fetch branches', { error });
+    }
+};

packages/contentstack-import/src/commands/cm/stacks/import.ts

@@ -91,7 +91,7 @@ export default class ImportCommand extends Command {
     }),
     'branch-alias': flags.string({
       description:
-        "The alias of the branch where you want to import your content. If you don't mention the branch alias, then by default the content will be imported to the main branch.",
+        "Specify the branch alias where you want to import your content. If not specified, the content is imported into the main branch by default.",
       exclusive: ['branch'],
     }),
     'import-webhook-status': flags.string({

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

@@ -24,7 +24,7 @@ export const setupBranchConfig = async (
         .find()
         .then(({ items }) => items);
       if (branches.length) {
-        log.info(`Stack is branch enabled and branches exist. Default import will be done in main branch.`);
+        log.info(`The stack is branch-enabled, and branches exist. By default, content will be imported into the main branch.`);
 
         config.branchName = 'main';
         log.debug(`Setting default target branch to 'main'`);

packages/contentstack-utilities/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentstack/cli-utilities",
-  "version": "1.14.2",
+  "version": "1.14.3",
   "description": "Utilities for contentstack projects",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",

packages/contentstack-utilities/src/config-handler.ts

@@ -23,13 +23,23 @@ const cwd = process.env.CS_CLI_CONFIG_PATH;
 
 class Config {
   private config: Conf;
+  private inMemoryStore: Map<string, any> = new Map();
+  private isPrepackMode: boolean;
 
   constructor() {
+    this.isPrepackMode = process.env.NODE_ENV === 'PREPACK_MODE';
     this.init();
-    this.importOldConfig();
+    if (!this.isPrepackMode) {
+      this.importOldConfig();
+    }
   }
 
   init() {
+    // Skip file-based config during prepack to prevent race conditions
+    if (this.isPrepackMode) {
+      // Initialize with empty in-memory store for prepack
+      return;
+    }
     return ENCRYPT_CONF === true ? this.getEncryptedConfig() : this.getDecryptedConfig();
   }
 
@@ -204,20 +214,35 @@ class Config {
   }
 
   get(key): string | any {
+    if (this.isPrepackMode) {
+      return this.inMemoryStore.get(key);
+    }
     return this.config?.get(key);
   }
 
   set(key, value) {
+    if (this.isPrepackMode) {
+      this.inMemoryStore.set(key, value);
+      return this;
+    }
     this.config?.set(key, value);
     return this.config;
   }
 
   delete(key) {
+    if (this.isPrepackMode) {
+      this.inMemoryStore.delete(key);
+      return this;
+    }
     this.config?.delete(key);
     return this.config;
   }
 
   clear() {
+    if (this.isPrepackMode) {
+      this.inMemoryStore.clear();
+      return;
+    }
     this.config?.clear();
   }
 }

packages/contentstack/README.md

@@ -2424,6 +2424,8 @@ FLAGS
                                branches involved, then the path should point till the particular branch. For example,
                                “-d "C:\Users\Name\Desktop\cli\content\branch_name"
   -k, --stack-api-key=<value>  API key of the target stack
+      --branch-alias=<value>   The alias of the branch where you want to import your content. If you don't mention the
+                               branch alias, then by default the content will be imported to the main branch.
       --module=<option>...     [optional] Specify the modules/module to import into the target stack. currently options
                                are global-fields, content-types, entries
                                <options: global-fields|content-types|entries>
@@ -2945,6 +2947,8 @@ FLAGS
                                branches involved, then the path should point till the particular branch. For example,
                                “-d "C:\Users\Name\Desktop\cli\content\branch_name"
   -k, --stack-api-key=<value>  API key of the target stack
+      --branch-alias=<value>   The alias of the branch where you want to import your content. If you don't mention the
+                               branch alias, then by default the content will be imported to the main branch.
       --module=<option>...     [optional] Specify the modules/module to import into the target stack. currently options
                                are global-fields, content-types, entries
                                <options: global-fields|content-types|entries>

packages/contentstack/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@contentstack/cli",
   "description": "Command-line tool (CLI) to interact with Contentstack",
-  "version": "1.48.0",
+  "version": "1.49.0",
   "author": "Contentstack",
   "bin": {
     "csdx": "./bin/run.js"
@@ -31,14 +31,14 @@
     "@contentstack/cli-cm-export": "~1.20.1",
     "@contentstack/cli-cm-export-to-csv": "~1.9.1",
     "@contentstack/cli-cm-import": "~1.28.1",
-    "@contentstack/cli-cm-import-setup": "1.5.0",
+    "@contentstack/cli-cm-import-setup": "1.6.0",
     "@contentstack/cli-cm-migrate-rte": "~1.6.1",
     "@contentstack/cli-cm-seed": "~1.12.2",
     "@contentstack/cli-command": "~1.6.1",
     "@contentstack/cli-config": "~1.15.2",
     "@contentstack/cli-launch": "^1.9.2",
     "@contentstack/cli-migration": "~1.8.1",
-    "@contentstack/cli-utilities": "~1.14.2",
+    "@contentstack/cli-utilities": "~1.14.3",
     "@contentstack/cli-variants": "~1.3.1",
     "@contentstack/management": "~1.22.0",
     "@oclif/core": "^4.3.0",