Merge branch 'v2-dev' into fix/dx-3922

netrajpatel · netrajpatel · commit 44b9a2a54835 · 2026-03-04T13:38:37.000+05:30
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -0,0 +1,5 @@
+* @contentstack/devex-pr-reviewers
+.github/workflows/sca-scan.yml @contentstack/security-admin
+.github/workflows/issues-jira.yml @contentstack/security-admin
+.github/workflows/policy-scan.yml @contentstack/security-admin
+**/.snyk @contentstack/security-admin
diff --git a/.github/workflows/sca-scan.yml b/.github/workflows/sca-scan.yml
@@ -13,3 +13,6 @@ jobs:
           SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
         with:
           args: --all-projects --fail-on=all
+          json: true
+        continue-on-error: true
+      - uses: contentstack/sca-policy@main
diff --git a/.talismanrc b/.talismanrc
@@ -1,4 +1,6 @@
 fileignoreconfig:
-  - filename: package-lock.json
-    checksum: 192758bcc96f1e4b1a1ad583a18e945926006b39d66515e032723aff3977faaf
+  - filename: pnpm-lock.yaml
+    checksum: 69c9fefd1240e00e7efa17658a53292444de3eecc70fb93c719b3b92a8cac0f0
+  - filename: packages/contentstack-migration/src/commands/cm/stacks/migration.ts
+    checksum: 8690833f285db085aa1431d4a708c243e2bf5b4ed366c5c15e2daf66eb24c19e
 version: '1.0'
diff --git a/package.json b/package.json
@@ -10,16 +10,17 @@
   },
   "private": true,
   "scripts": {
-    "clean": "pnpm -r --filter './packages/*' run clean",
+    "clean:packages": "pnpm -r --filter './packages/*' run clean",
     "build": "pnpm -r --filter './packages/*' run build",
     "test": "pnpm -r --filter './packages/*' run test",
     "prepack": "pnpm -r --filter './packages/*' run prepack",
     "bootstrap": "pnpm install",
     "clean:modules": "rm -rf node_modules packages/**/node_modules",
     "clean:lock": "rm -f pnpm-lock.yaml",
-    "clean:all": "pnpm store prune && rm -rf node_modules && pnpm run clean",
+    "clean:all": "pnpm store prune && rm -rf node_modules && pnpm run clean:packages",
     "setup": "pnpm run clean:all && pnpm run bootstrap && pnpm run build",
-    "prepare": "npx husky && chmod +x .husky/pre-commit"
+    "prepare": "npx husky && chmod +x .husky/pre-commit",
+    "update:lockfile": "pnpm install --lockfile-only"
   },
   "license": "MIT",
   "packageManager": "pnpm@10.28.0",
diff --git a/packages/contentstack-audit/package.json b/packages/contentstack-audit/package.json
@@ -64,15 +64,15 @@
     "repositoryPrefix": "<%- repo %>/blob/main/packages/contentstack-audit/<%- commandPath %>"
   },
   "scripts": {
-    "build": "pnpm compile",
+    "build": "pnpm compile && oclif manifest",
     "lint": "eslint . --ext .ts --config .eslintrc",
     "postpack": "shx rm -f oclif.manifest.json",
     "posttest": "npm run lint",
-    "compile": "shx rm -rf lib tsconfig.tsbuildinfo && tsc -b",
+    "compile": "tsc -b tsconfig.json",
     "prepack": "pnpm compile && oclif manifest && oclif readme",
     "test": "mocha --forbid-only \"test/**/*.test.ts\"",
     "version": "oclif readme && git add README.md",
-    "clean": "rm -rf ./lib ./node_modules .tsbuildinfo oclif.manifest.json",
+    "clean": "rm -rf ./lib ./node_modules tsconfig.tsbuildinfo oclif.manifest.json",
     "test:unit:report": "nyc --extension .ts mocha --forbid-only \"test/unit/**/*.test.ts\"",
     "test:unit": "mocha --timeout 10000 --forbid-only \"test/unit/**/*.test.ts\""
   },
diff --git a/packages/contentstack-bootstrap/.gitignore b/packages/contentstack-bootstrap/.gitignore
@@ -7,4 +7,5 @@
 /yarn.lock
 node_modules
 .DS_Store
-coverage
+coverage
+/tsconfig.tsbuildinfo
diff --git a/packages/contentstack-bootstrap/package.json b/packages/contentstack-bootstrap/package.json
@@ -5,8 +5,8 @@
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "scripts": {
-    "build": "pnpm compile",
-    "clean": "rm -rf ./lib ./node_modules tsconfig.build.tsbuildinfo",
+    "build": "pnpm compile && oclif manifest",
+    "clean": "rm -rf ./lib ./node_modules tsconfig.tsbuildinfo",
     "compile": "tsc -b tsconfig.json",
     "postpack": "rm -f oclif.manifest.json",
     "prepack": "pnpm compile && oclif manifest && oclif readme",
diff --git a/packages/contentstack-branches/.gitignore b/packages/contentstack-branches/.gitignore
@@ -12,3 +12,4 @@ coverage
 .vscode
 branch-config.json
 /merge_scripts
+/tsconfig.tsbuildinfo
diff --git a/packages/contentstack-branches/package.json b/packages/contentstack-branches/package.json
@@ -30,8 +30,8 @@
     "typescript": "^4.9.5"
   },
   "scripts": {
-    "build": "pnpm compile",
-    "clean": "rm -rf ./lib ./node_modules tsconfig.build.tsbuildinfo",
+    "build": "pnpm compile && oclif manifest",
+    "clean": "rm -rf ./lib ./node_modules tsconfig.tsbuildinfo",
     "compile": "tsc -b tsconfig.json",
     "postpack": "rm -f oclif.manifest.json",
     "prepack": "pnpm compile && oclif manifest && oclif readme",
diff --git a/packages/contentstack-clone/.gitignore b/packages/contentstack-clone/.gitignore
@@ -6,4 +6,5 @@
 /yarn.lock
 node_modules
 coverage
-/lib
+/lib
+/tsconfig.tsbuildinfo
diff --git a/packages/contentstack-clone/package.json b/packages/contentstack-clone/package.json
@@ -61,8 +61,8 @@
   },
   "repository": "https://github.com/contentstack/cli",
   "scripts": {
-    "build": "pnpm compile",
-    "clean": "rm -rf ./lib ./node_modules tsconfig.build.tsbuildinfo",
+    "build": "pnpm compile && oclif manifest",
+    "clean": "rm -rf ./lib ./node_modules tsconfig.tsbuildinfo",
     "compile": "tsc -b tsconfig.json",
     "postpack": "rm -f oclif.manifest.json",
     "prepack": "pnpm compile && oclif manifest && oclif readme",
diff --git a/packages/contentstack-export-to-csv/package.json b/packages/contentstack-export-to-csv/package.json
@@ -63,7 +63,7 @@
   },
   "repository": "https://github.com/contentstack/cli",
   "scripts": {
-    "build": "pnpm compile",
+    "build": "pnpm compile && oclif manifest",
     "clean": "rm -rf ./lib ./node_modules tsconfig.tsbuildinfo oclif.manifest.json",
     "compile": "tsc -b tsconfig.json",
     "lint": "eslint src/**/*.ts",
diff --git a/packages/contentstack-export/.gitignore b/packages/contentstack-export/.gitignore
@@ -12,3 +12,4 @@ coverage
 .vscode/
 /lib
 .env
+/tsconfig.tsbuildinfo
diff --git a/packages/contentstack-export/package.json b/packages/contentstack-export/package.json
@@ -46,8 +46,8 @@
     "typescript": "^4.9.5"
   },
   "scripts": {
-    "build": "pnpm compile",
-    "clean": "rm -rf ./lib ./node_modules tsconfig.build.tsbuildinfo",
+    "build": "pnpm compile && oclif manifest",
+    "clean": "rm -rf ./lib ./node_modules tsconfig.tsbuildinfo",
     "compile": "tsc -b tsconfig.json",
     "postpack": "rm -f oclif.manifest.json",
     "prepack": "pnpm compile && oclif manifest && oclif readme",
diff --git a/packages/contentstack-import-setup/.gitignore b/packages/contentstack-import-setup/.gitignore
@@ -10,5 +10,6 @@ node_modules
 coverage
 .vscode/
 /lib
+/tsconfig.tsbuildinfo
 
 .env
diff --git a/packages/contentstack-import-setup/package.json b/packages/contentstack-import-setup/package.json
@@ -42,8 +42,8 @@
     "typescript": "^4.9.5"
   },
   "scripts": {
-    "build": "pnpm compile",
-    "clean": "rm -rf ./lib ./node_modules tsconfig.build.tsbuildinfo",
+    "build": "pnpm compile && oclif manifest",
+    "clean": "rm -rf ./lib ./node_modules tsconfig.tsbuildinfo",
     "compile": "tsc -b tsconfig.json",
     "postpack": "rm -f oclif.manifest.json",
     "prepack": "pnpm compile && oclif manifest && oclif readme",
diff --git a/packages/contentstack-import/.gitignore b/packages/contentstack-import/.gitignore
@@ -10,5 +10,5 @@ node_modules
 coverage
 .vscode/
 /lib
-
+/tsconfig.tsbuildinfo
 .env
diff --git a/packages/contentstack-import/package.json b/packages/contentstack-import/package.json
@@ -45,8 +45,8 @@
     "typescript": "^4.9.5"
   },
   "scripts": {
-    "build": "pnpm compile",
-    "clean": "rm -rf ./lib ./node_modules tsconfig.build.tsbuildinfo",
+    "build": "pnpm compile && oclif manifest",
+    "clean": "rm -rf ./lib ./node_modules tsconfig.tsbuildinfo",
     "compile": "tsc -b tsconfig.json",
     "postpack": "rm -f oclif.manifest.json",
     "prepack": "pnpm compile && oclif manifest && oclif readme",
diff --git a/packages/contentstack-migration/package.json b/packages/contentstack-migration/package.json
@@ -54,7 +54,7 @@
   },
   "repository": "contentstack/cli",
   "scripts": {
-    "build": "pnpm compile",
+    "build": "pnpm compile && oclif manifest",
     "postpack": "rm -f oclif.manifest.json",
     "generate-api-ref-md-doc": "nyc jsdoc2md ./src/modules/*.ts > ./docs/api-reference.md || true",
     "compile": "tsc -b tsconfig.json",
@@ -64,7 +64,7 @@
     "test:unit": "mocha --timeout 10000 --forbid-only \"test/unit/**/*.test.ts\"",
     "test:unit:report": "nyc --extension .ts mocha --forbid-only \"test/unit/**/*.test.ts\"",
     "version": "oclif readme && git add README.md",
-    "clean": "rm -rf ./lib ./node_modules tsconfig.build.tsbuildinfo"
+    "clean": "rm -rf ./lib ./node_modules tsconfig.tsbuildinfo"
   },
   "csdxConfig": {
     "shortCommandName": {
diff --git a/packages/contentstack-migration/src/commands/cm/stacks/migration.ts b/packages/contentstack-migration/src/commands/cm/stacks/migration.ts
@@ -52,12 +52,14 @@ export default class MigrationCommand extends Command {
   static flags: FlagInput = {
     'stack-api-key': flags.string({
       char: 'k',
-      description: 'Use this flag to add the API key of your stack. You must use either the --stack-api-key flag or the --alias flag.',
+      description:
+        'Use this flag to add the API key of your stack. You must use either the --stack-api-key flag or the --alias flag.',
       exclusive: ['alias'],
     }),
     alias: flags.string({
       char: 'a',
-      description: 'Use this flag to add the management token alias. You must use either the --alias flag or the --stack-api-key flag.',
+      description:
+        'Use this flag to add the management token alias. You must use either the --alias flag or the --stack-api-key flag.',
     }),
     'file-path': flags.string({
       description: 'Use this flag to provide the path of the file of the migration script.',
@@ -69,11 +71,13 @@ export default class MigrationCommand extends Command {
       description: '[optional] Path of the JSON configuration file.',
     }),
     config: flags.string({
-      description: '[optional] Inline configuration, <key1>:<value1>. Passing an external configuration makes the script re-usable.',
+      description:
+        '[optional] Inline configuration, <key1>:<value1>. Passing an external configuration makes the script re-usable.',
       multiple: true,
     }),
     multiple: flags.boolean({
-      description: 'This flag helps you to migrate multiple content files in a single instance. Mention the folder path where your migration script files are stored.',
+      description:
+        'This flag helps you to migrate multiple content files in a single instance. Mention the folder path where your migration script files are stored.',
     }),
 
     // To be deprecated
@@ -85,7 +89,8 @@ export default class MigrationCommand extends Command {
       hidden: true,
     }),
     authtoken: flags.boolean({
-      description: 'Use this flag to use the auth token of the current session. After logging in CLI, an auth token is generated for each new session.',
+      description:
+        'Use this flag to use the auth token of the current session. After logging in CLI, an auth token is generated for each new session.',
       dependsOn: ['api-key'],
       exclusive: ['alias'],
       hidden: true,
@@ -112,7 +117,7 @@ export default class MigrationCommand extends Command {
 
   async run(): Promise<void> {
     // TODO: filePath validation required.
-    const { flags: migrationCommandFlags } = await this.parse(MigrationCommand) as any;
+    const { flags: migrationCommandFlags } = (await this.parse(MigrationCommand)) as any;
     const branch = (migrationCommandFlags as any).branch;
     const filePath = (migrationCommandFlags as any)['file-path'] || (migrationCommandFlags as any).filePath;
     const multi = (migrationCommandFlags as any).multiple || (migrationCommandFlags as any).multi;
diff --git a/packages/contentstack-migration/tsconfig.json b/packages/contentstack-migration/tsconfig.json
@@ -14,22 +14,13 @@
     "inlineSources": true,
     "esModuleInterop": true,
     "noImplicitAny": true,
-    "lib": [
-      "ES2019",
-      "es2020.promise"
-    ],
+    "lib": ["ES2019", "es2020.promise"],
     "strictPropertyInitialization": false,
     "forceConsistentCasingInFileNames": true,
     "composite": true
   },
-  "include": [
-    "src/**/*",
-    "types/*"
-  ],
-  "exclude": [
-    "node_modules",
-    "lib"
-  ],
+  "include": ["src/**/*", "types/*"],
+  "exclude": ["node_modules", "lib"],
   "ts-node": {
     "transpileOnly": false,
     "files": true,
diff --git a/packages/contentstack-seed/.gitignore b/packages/contentstack-seed/.gitignore
@@ -7,4 +7,5 @@
 /yarn.lock
 node_modules
 .DS_Store
-coverage
+coverage
+/tsconfig.tsbuildinfo
diff --git a/packages/contentstack-seed/package.json b/packages/contentstack-seed/package.json
@@ -67,8 +67,8 @@
     "postpack": "rm -f oclif.manifest.json",
     "prepack": "pnpm compile && oclif manifest && oclif readme",
     "version": "oclif readme && git add README.md",
-    "clean": "rm -rf ./lib ./node_modules tsconfig.build.tsbuildinfo",
+    "clean": "rm -rf ./lib ./node_modules tsconfig.tsbuildinfo",
     "compile": "tsc -b tsconfig.json",
-    "build": "pnpm compile"
+    "build": "pnpm compile && oclif manifest"
   }
 }
diff --git a/packages/contentstack-variants/package.json b/packages/contentstack-variants/package.json
@@ -9,7 +9,7 @@
     "prepack": "pnpm compile",
     "compile": "tsc -b tsconfig.json",
     "test": "mocha --require ts-node/register --forbid-only \"test/**/*.test.ts\"",
-    "clean": "rm -rf ./lib ./node_modules tsconfig.build.tsbuildinfo",
+    "clean": "rm -rf ./lib ./node_modules tsconfig.tsbuildinfo",
     "test:unit:report": "nyc --extension .ts mocha --require ts-node/register --forbid-only \"test/unit/**/*.test.ts\""
   },
   "keywords": [
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
