Merge pull request #2525 from contentstack/fix/back-merge-v2-dev

Back merge v2 dev

Author: cs-raj

.github/workflows/lint.yml

@@ -0,0 +1,21 @@
+name: Lint
+
+on:
+  pull_request:
+    types: [opened, synchronize, reopened]
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: pnpm/action-setup@v4
+        with:
+          version: 10.28.0
+      - uses: actions/setup-node@v4
+        with:
+          node-version: '22.x'
+          cache: 'pnpm'
+      - run: pnpm install --no-frozen-lockfile
+      - run: pnpm -r --sort --workspace-concurrency=1 run build
+      - run: pnpm run lint

.github/workflows/policy-scan.yml

@@ -43,4 +43,4 @@ jobs:
           if [ "$license_file_found" = false ]; then
               echo "No license file found. Please add a license file to the repository."
               exit 1
-          fi
+          fi

.github/workflows/sca-scan.yml

@@ -15,4 +15,4 @@ jobs:
           args: --fail-on=all --all-projects
           json: true
         continue-on-error: true
-      - uses: contentstack/sca-policy@main 
+      - uses: contentstack/sca-policy@main

.github/workflows/unit-test.yml

@@ -1,48 +1,36 @@
-name: Run Unit Tests
+name: Unit Tests
 
 on:
   pull_request:
     types: [opened, synchronize, reopened]
 
 jobs:
-  run-tests:
+  test:
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Setup pnpm
-        uses: pnpm/action-setup@v4
+      - uses: actions/checkout@v4
+      - uses: pnpm/action-setup@v4
         with:
-          version: 10.28.0 # or your local pnpm version
-
-      - name: Set up Node.js
-        uses: actions/setup-node@v4
+          version: 10.28.0
+      - uses: actions/setup-node@v4
         with:
           node-version: '22.x'
-          cache: 'pnpm' # optional but recommended
-
-      # - name: Temporarily disable contentstack package
-      #   run: mv packages/contentstack/package.json packages/contentstack/package.json.disabled || true
-
-      - name: Install Dependencies (Excluding Contentstack)
-        run: pnpm install --no-frozen-lockfile
-
-      - name: Build all plugins (Excluding Contentstack)
-        run: |
-          NODE_ENV=PREPACK_MODE pnpm -r --sort run build
-
-      # - name: Restore contentstack package
-      #   run: mv packages/contentstack/package.json.disabled packages/contentstack/package.json || true
-
-      - name: Run tests for Contentstack Command
+          cache: 'pnpm'
+      - run: pnpm install --no-frozen-lockfile
+      - run: pnpm -r --sort --workspace-concurrency=1 run build
+      - name: Test contentstack
+        working-directory: ./packages/contentstack
+        run: pnpm test
+      - name: Test contentstack-command
         working-directory: ./packages/contentstack-command
-        run: npm run test:unit
-
-      - name: Run tests for Contentstack Config
+        run: pnpm test
+      - name: Test contentstack-config
         working-directory: ./packages/contentstack-config
-        run: npm run test:unit
-
-      - name: Run tests for Contentstack Auth
+        run: pnpm test
+      - name: Test contentstack-auth
         working-directory: ./packages/contentstack-auth
-        run: NODE_ENV=PREPACK_MODE npm run test:unit
+        run: pnpm test
+      # Commented out in v2-beta production
+      # - name: Test contentstack-utilities
+      #   working-directory: ./packages/contentstack-utilities
+      #   run: pnpm test

.talismanrc

@@ -1,4 +1,14 @@
 fileignoreconfig:
+  - filename: .github/workflows/release-production-pipeline.yml
+    checksum: 4aef94feea3ea0538162a9454cfd30457ec85e3123672f0933713e3d113d4504
+  - filename: packages/contentstack-utilities/src/proxy-helper.ts
+    checksum: 2169f25563bca3a0fe54edd00c73646ed56d36aa7e8effe904de26b0c1633759
+  - filename: packages/contentstack-config/test/unit/commands/proxy.test.ts
+    checksum: b92210826693683300728e7e82e6789f0ad697b17e6b99a8a004c9a041bced00
+  - filename: packages/contentstack/test/unit/context-handler.test.ts
+    checksum: 6ef78899d3089685271bd16c156d057c807fd9b8560189387ae44e9576d23095
+  - filename: packages/contentstack/README.md
+    checksum: cdd03f1f11ef3ecf04f71ed0a468501633ce92f0d487ee097312644578cb3cdc
   - filename: pnpm-lock.yaml
-    checksum: 840d10a9ef1d60aeb0edd46a5cf8ae8306c9eee321aff72a9bb0e1a7e5031159
+    checksum: 848b0690be9700254135dda7f87f01249c0f20fc9109055236c63aa608cd7967
 version: '1.0'

package.json

@@ -13,6 +13,7 @@
     "clean:packages": "pnpm -r --filter './packages/*' run clean",
     "build": "pnpm -r --filter './packages/*' run build",
     "test": "pnpm -r --filter './packages/*' run test",
+    "lint": "pnpm -r --filter './packages/*' run lint",
     "prepack": "pnpm -r --filter './packages/*' run prepack",
     "bootstrap": "pnpm install",
     "clean:modules": "rm -rf node_modules packages/**/node_modules",

packages/contentstack-auth/.mocharc.json

@@ -5,9 +5,9 @@
     "source-map-support/register",
     "test/helpers/mocha-root-hooks.js"
   ],
-  "watch-extensions": [
-    "ts"
-  ],
+  "watch-extensions": ["ts"],
   "recursive": true,
-  "timeout": 5000
-}
+  "reporter": "spec",
+  "timeout": 10000,
+  "exit": true
+}

packages/contentstack-auth/.nycrc.json

@@ -1,5 +1,5 @@
 {
-    "inlcude": [
+    "include": [
         "lib/**/*.js"
     ]
 }

packages/contentstack-auth/package.json

@@ -11,41 +11,39 @@
     "postpack": "rm -f oclif.manifest.json",
     "prepack": "pnpm compile && oclif manifest && oclif readme",
     "version": "oclif readme && git add README.md",
-    "test:report": "tsc -p test && nyc --reporter=lcov --extension .ts mocha --forbid-only \"test/**/*.test.ts\"",
-    "pretest": "tsc -p test",
-    "test": "nyc --extension .ts mocha --forbid-only \"test/**/*.test.ts\"",
-    "posttest": "npm run lint",
-    "lint": "eslint src/**/*.ts",
-    "format": "eslint src/**/*.ts --fix",
-    "test:integration": "mocha --forbid-only \"test/integration/*.test.ts\"",
-    "test:unit": "mocha --forbid-only \"test/unit/**/*.test.ts\"",
-    "test:unit:report": "nyc --extension .ts mocha --forbid-only \"test/unit/**/*.test.ts\""
+    "test": "mocha \"test/unit/**/*.test.ts\"",
+    "lint": "eslint src/**/*.ts"
   },
   "dependencies": {
     "@contentstack/cli-command": "~2.0.0-beta.5",
     "@contentstack/cli-utilities": "~2.0.0-beta.5",
-    "@oclif/core": "^4.3.0",
-    "@oclif/plugin-help": "^6.2.28",
+    "@oclif/core": "^4.10.5",
+    "@oclif/plugin-help": "^6.2.44",
     "otplib": "^12.0.1"
   },
+  "overrides": {
+    "@oclif/core": {
+      "picomatch": "^4.0.4"
+    }
+  },
   "devDependencies": {
     "@fancy-test/nock": "^0.1.1",
-    "@oclif/plugin-help": "^6.2.28",
-    "@oclif/test": "^4.1.13",
+    "@oclif/plugin-help": "^6.2.44",
+    "@oclif/test": "^4.1.18",
     "@types/chai": "^4.3.20",
     "@types/mkdirp": "^1.0.2",
     "@types/mocha": "^8.2.3",
     "@types/node": "^14.18.63",
-    "@types/sinon": "^21.0.0",
+    "@types/sinon": "^21.0.1",
     "chai": "^4.5.0",
-    "dotenv": "^16.4.7",
+    "dotenv": "^16.6.1",
     "eslint": "^8.57.1",
     "eslint-config-oclif": "^5.2.2",
     "eslint-config-oclif-typescript": "^3.1.14",
     "mocha": "10.8.2",
     "nyc": "^15.1.0",
-    "oclif": "^4.17.46",
-    "sinon": "^21.0.1",
+    "oclif": "^4.23.0",
+    "sinon": "^21.1.2",
     "ts-node": "^10.9.2",
     "typescript": "^4.9.5"
   },
@@ -81,4 +79,4 @@
     }
   },
   "repository": "contentstack/cli"
-}
+}

packages/contentstack-auth/src/base-command.ts

@@ -3,9 +3,7 @@ import {
   configHandler,
   createLogContext,
   Flags,
-  getAuthenticationMethod,
   Interfaces,
-  log,
 } from '@contentstack/cli-utilities';
 import { Context } from './interfaces';