Merge branch 'main' into fix/back-merge-main

harshitha-cstk · harshitha-cstk · commit 1e67f6a537a3 · 2026-04-16T16:06:21.000+05:30
diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml
@@ -30,7 +30,13 @@ jobs:
       - name: Test contentstack-auth
         working-directory: ./packages/contentstack-auth
         run: pnpm test
+<<<<<<< HEAD
       # Commented out in v2-beta production
       # - name: Test contentstack-utilities
       #   working-directory: ./packages/contentstack-utilities
-      #   run: pnpm test
+      #   run: pnpm test
+=======
+      - name: Test contentstack-utilities
+        working-directory: ./packages/contentstack-utilities
+        run: pnpm test
+>>>>>>> main
diff --git a/packages/contentstack-auth/.mocharc.json b/packages/contentstack-auth/.mocharc.json
@@ -1,9 +1,14 @@
 {
   "require": [
     "test/helpers/init.js",
+<<<<<<< HEAD
     "ts-node/register",
     "source-map-support/register",
     "test/helpers/mocha-root-hooks.js"
+=======
+    "ts-node/register/transpile-only",
+    "source-map-support/register"
+>>>>>>> main
   ],
   "watch-extensions": ["ts"],
   "recursive": true,
diff --git a/packages/contentstack-auth/package.json b/packages/contentstack-auth/package.json
@@ -1,7 +1,11 @@
 {
   "name": "@contentstack/cli-auth",
   "description": "Contentstack CLI plugin for authentication activities",
+<<<<<<< HEAD
   "version": "2.0.0-beta.10",
+=======
+  "version": "1.8.0",
+>>>>>>> main
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "scripts": {
@@ -15,8 +19,13 @@
     "lint": "eslint src/**/*.ts"
   },
   "dependencies": {
+<<<<<<< HEAD
     "@contentstack/cli-command": "~2.0.0-beta.5",
     "@contentstack/cli-utilities": "~2.0.0-beta.5",
+=======
+    "@contentstack/cli-command": "~1.8.0",
+    "@contentstack/cli-utilities": "~1.18.0",
+>>>>>>> main
     "@oclif/core": "^4.8.3",
     "@oclif/plugin-help": "^6.2.28",
     "otplib": "^12.0.1"
diff --git a/packages/contentstack-auth/test/unit/auth-handler.test.ts b/packages/contentstack-auth/test/unit/auth-handler.test.ts
@@ -3,10 +3,15 @@ import * as sinon from 'sinon';
 import { authHandler, interactive } from '../../src/utils';
 import { CLIError, cliux } from '@contentstack/cli-utilities';
 import { User } from '../../src/interfaces';
+<<<<<<< HEAD
 import { readFileSync } from 'fs';
 import { join } from 'path';
 
 const config = JSON.parse(readFileSync(join(__dirname, './config.json'), 'utf-8'));
+=======
+// @ts-ignore
+import * as config from './config.json';
+>>>>>>> main
 
 const user: User = { email: '***REMOVED***', authtoken: 'testtoken' };
 const credentials = { email: '***REMOVED***', password: config.password };
diff --git a/packages/contentstack-auth/test/unit/commands/login.test.ts b/packages/contentstack-auth/test/unit/commands/login.test.ts
@@ -9,10 +9,15 @@ import {
   authHandler as oauthHandler
 } from '@contentstack/cli-utilities';
 import * as managementSDK from '@contentstack/cli-utilities';
+<<<<<<< HEAD
 import { readFileSync } from 'fs';
 import { join } from 'path';
 
 const conf = JSON.parse(readFileSync(join(__dirname, '../config.json'), "utf-8"));
+=======
+// @ts-ignore
+import * as conf from '../config.json';
+>>>>>>> main
 
 const config = configHandler;
 
diff --git a/packages/contentstack-auth/test/unit/commands/logout.test.ts b/packages/contentstack-auth/test/unit/commands/logout.test.ts
@@ -9,10 +9,15 @@ import {
   authHandler as oauthHandler
 } from '@contentstack/cli-utilities';
 import * as managementSDK from '@contentstack/cli-utilities';
+<<<<<<< HEAD
 import { readFileSync } from 'fs';
 import { join } from 'path';
 
 const conf = JSON.parse(readFileSync(join(__dirname, '../config.json'), "utf-8"));
+=======
+// @ts-ignore
+import * as conf from '../config.json';
+>>>>>>> main
 
 const config = configHandler;
 
diff --git a/packages/contentstack-auth/test/unit/commands/tokens-add.test.ts b/packages/contentstack-auth/test/unit/commands/tokens-add.test.ts
@@ -5,10 +5,15 @@ import TokensAddCommand from '../../../src/commands/auth/tokens/add';
 import { stub, assert } from 'sinon';
 import { config as dotenvConfig } from 'dotenv';
 import nock from 'nock';
+<<<<<<< HEAD
 import { readFileSync } from 'fs';
 import { join } from 'path';
 
 const conf = JSON.parse(readFileSync(join(__dirname, '../config.json'), "utf-8"));
+=======
+// @ts-ignore
+import * as conf from '../config.json';
+>>>>>>> main
 
 dotenvConfig();
 
diff --git a/packages/contentstack-auth/test/unit/interactive.test.ts b/packages/contentstack-auth/test/unit/interactive.test.ts
@@ -2,10 +2,15 @@ import { expect } from 'chai';
 import * as sinon from 'sinon';
 import { interactive } from '../../src/utils';
 import { cliux } from '@contentstack/cli-utilities';
+<<<<<<< HEAD
 import { readFileSync } from 'fs';
 import { join } from 'path';
 
 const config = JSON.parse(readFileSync(join(__dirname, './config.json'), "utf-8"));
+=======
+//@ts-ignore
+import * as config from './config.json'
+>>>>>>> main
 
 describe('Interactive', () => {
   let inquireStub: sinon.SinonStub;
diff --git a/packages/contentstack-auth/test/unit/mfa-handler.test.ts b/packages/contentstack-auth/test/unit/mfa-handler.test.ts
@@ -46,6 +46,10 @@ describe('MFAHandler', () => {
     });
 
     it.skip('should fallback to stored configuration when environment variable is not set', async () => {
+<<<<<<< HEAD
+=======
+      // Stubbing NodeCrypto.prototype does not affect already-created mfaHandler instance
+>>>>>>> main
       const encryptedSecret = 'encrypted-secret';
       configStub.returns({ secret: encryptedSecret });
       encrypterStub.decrypt.returns(validSecret);
@@ -65,4 +69,8 @@ describe('MFAHandler', () => {
       expect(authenticator.verify({ token: code, secret: envSecret })).to.be.true;
     });
   });
+<<<<<<< HEAD
+=======
+
+>>>>>>> main
 });
diff --git a/packages/contentstack-command/package.json b/packages/contentstack-command/package.json
@@ -1,7 +1,11 @@
 {
   "name": "@contentstack/cli-command",
   "description": "Contentstack CLI plugin for configuration",
+<<<<<<< HEAD
   "version": "2.0.0-beta.5",
+=======
+  "version": "1.8.0",
+>>>>>>> main
   "author": "Contentstack",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -14,7 +18,11 @@
     "lint": "eslint src/**/*.ts"
   },
   "dependencies": {
+<<<<<<< HEAD
     "@contentstack/cli-utilities": "~2.0.0-beta.5",
+=======
+    "@contentstack/cli-utilities": "~1.18.0",
+>>>>>>> main
     "contentstack": "^3.25.3",
     "@oclif/core": "^4.8.3",
     "@oclif/plugin-help": "^6.2.28"
diff --git a/packages/contentstack-config/.mocharc.json b/packages/contentstack-config/.mocharc.json
@@ -1,5 +1,6 @@
 {
   "require": [
+<<<<<<< HEAD
     "ts-node/register",
     "source-map-support/register",
     "test/helpers/mocha-root-hooks.js"
@@ -9,4 +10,16 @@
   ],
   "recursive": true,
   "timeout": 10000
-}
+}
+=======
+    "test/helpers/init.js",
+    "ts-node/register/transpile-only",
+    "source-map-support/register"
+  ],
+  "watch-extensions": ["ts"],
+  "recursive": true,
+  "reporter": "spec",
+  "timeout": 10000,
+  "exit": true
+}
+>>>>>>> main
diff --git a/packages/contentstack-config/package.json b/packages/contentstack-config/package.json
@@ -1,7 +1,11 @@
 {
   "name": "@contentstack/cli-config",
   "description": "Contentstack CLI plugin for configuration",
+<<<<<<< HEAD
   "version": "2.0.0-beta.7",
+=======
+  "version": "1.20.1",
+>>>>>>> main
   "author": "Contentstack",
   "scripts": {
     "build": "pnpm compile && oclif manifest && oclif readme",
@@ -14,8 +18,13 @@
     "lint": "eslint src/**/*.ts"
   },
   "dependencies": {
+<<<<<<< HEAD
     "@contentstack/cli-command": "~2.0.0-beta.5",
     "@contentstack/cli-utilities": "~2.0.0-beta.5",
+=======
+    "@contentstack/cli-command": "~1.8.0",
+    "@contentstack/cli-utilities": "~1.18.0",
+>>>>>>> main
     "@contentstack/utils": "~1.7.0",
     "@oclif/core": "^4.8.3",
     "@oclif/plugin-help": "^6.2.28",
diff --git a/packages/contentstack-config/test/tsconfig.json b/packages/contentstack-config/test/tsconfig.json
@@ -5,11 +5,17 @@
     "sourceMap": true,
     "resolveJsonModule": true,
     "esModuleInterop": true,
+<<<<<<< HEAD
     "allowSyntheticDefaultImports": true,
     "rootDir": ".."
   },
   "include": [
     "../src/**/*",
     "**/*.ts"
   ]
+=======
+    "module": "commonjs"
+  },
+  "include": ["../src/**/*"]
+>>>>>>> main
 }
diff --git a/packages/contentstack-config/test/unit/commands/region.test.ts b/packages/contentstack-config/test/unit/commands/region.test.ts
@@ -43,6 +43,7 @@ describe('Region command', function () {
     expect(cliuxPrintStub.callCount).to.equal(7);
   });
   it('should log an error and exit when the region is not set', async function () {
+<<<<<<< HEAD
     const command = new GetRegionCommand([], {} as any);
 
     // Stub the region property to return undefined
@@ -58,11 +59,22 @@ describe('Region command', function () {
     cliuxPrintStub.reset();
 
     // Call the run method directly, expect it to throw
+=======
+    configGetStub.callsFake((key) => {
+      if (key === 'region') return undefined;
+      return undefined;
+    });
+    const exitStub = sinon.stub(process, 'exit').callsFake((code) => {
+      throw new Error(`CLI_CONFIG_GET_REGION_NOT_FOUND EEXIT: ${code}`);
+    });
+    let result;
+>>>>>>> main
     try {
       await command.run();
     } catch (error) {
       // Expected to throw due to exit stub
     }
+<<<<<<< HEAD
 
     // Verify that cliux.error was called with the correct message
     expect(errorStub.calledWith('CLI_CONFIG_GET_REGION_NOT_FOUND')).to.be.true;
@@ -71,6 +83,10 @@ describe('Region command', function () {
     expect(exitStub.called).to.be.true;
 
     errorStub.restore();
+=======
+    exitStub.restore();
+    expect(result.message).to.include('CLI_CONFIG_GET_REGION_NOT_FOUND EEXIT: 1');
+>>>>>>> main
   });
 
   // Test cases for predefined regions
diff --git a/packages/contentstack-config/test/unit/commands/remove-base-branch.test.ts b/packages/contentstack-config/test/unit/commands/remove-base-branch.test.ts
@@ -65,6 +65,7 @@ describe('Delete config', () => {
     expect(askConfirmation.calledOnce).to.be.true;
   });
 
+<<<<<<< HEAD
   it('Should show base branch and stack-api-key before deletion', async () => {
     const successStub = stub(cliux, 'success');
     const askConfirmation = stub(interactive, 'askConfirmation').resolves(true);
@@ -105,5 +106,13 @@ describe('Delete config', () => {
     expect(deleteStub.called).to.be.false;
 
     deleteStub.restore();
+=======
+    const askConfirmation = stub(interactive, 'askConfirmation').resolves(true);
+    const showSuccess = stub(cliux, 'success');
+    await RemoveBranchConfigCommand.run(['--stack-api-key', removeConfigMockData.flags.apiKey]);
+    if (getConfig && askConfirmation.calledOnce) expect(showSuccess.called).to.be.true;
+    askConfirmation.restore();
+    showSuccess.restore();
+>>>>>>> main
   });
 });
diff --git a/packages/contentstack-utilities/.mocharc.json b/packages/contentstack-utilities/.mocharc.json
@@ -1,4 +1,5 @@
 {
+<<<<<<< HEAD
     "require": [
       "test/helpers/init.js",
       "ts-node/register",
@@ -11,3 +12,16 @@
     "recursive": true,
     "timeout": 5000
   }
+=======
+  "require": [
+    "test/helpers/init.js",
+    "ts-node/register/transpile-only",
+    "source-map-support/register"
+  ],
+  "watch-extensions": ["ts"],
+  "recursive": true,
+  "reporter": "spec",
+  "timeout": 10000,
+  "exit": true
+}
+>>>>>>> main
diff --git a/packages/contentstack-utilities/package.json b/packages/contentstack-utilities/package.json
@@ -1,6 +1,10 @@
 {
   "name": "@contentstack/cli-utilities",
+<<<<<<< HEAD
   "version": "2.0.0-beta.6",
+=======
+  "version": "1.18.1",
+>>>>>>> main
   "description": "Utilities for contentstack projects",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
diff --git a/packages/contentstack/package.json b/packages/contentstack/package.json
