Merge pull request #128 from contentstack/fix/back-merge

cs-raj · web-flow · commit 9b7a589e41e7 · 2026-05-08T13:00:53.000+05:30
Back merge development to v2-dev
diff --git a/packages/contentstack-audit/README.md b/packages/contentstack-audit/README.md
@@ -32,7 +32,6 @@ USAGE
 <!-- commands -->
 * [`csdx cm:stacks:audit`](#csdx-cmstacksaudit)
 * [`csdx cm:stacks:audit:fix`](#csdx-cmstacksauditfix)
-* [`csdx help [COMMAND]`](#csdx-help-command)
 
 ## `csdx cm:stacks:audit`
 
diff --git a/packages/contentstack-audit/package.json b/packages/contentstack-audit/package.json
@@ -21,12 +21,10 @@
     "@contentstack/cli-command": "~2.0.0-beta.6",
     "@contentstack/cli-utilities": "~2.0.0-beta.7",
     "@oclif/core": "^4.3.0",
-    "@oclif/plugin-help": "^6.2.28",
     "chalk": "^5.6.2",
     "fast-csv": "^4.3.6",
     "fs-extra": "^11.3.0",
     "lodash": "^4.18.1",
-    "uuid": "^9.0.1",
     "winston": "^3.19.0"
   },
   "devDependencies": {
@@ -35,9 +33,8 @@
     "@types/fs-extra": "^11.0.4",
     "@types/mocha": "^10.0.10",
     "@types/node": "^20.17.50",
-    "@types/uuid": "^9.0.8",
     "chai": "^4.5.0",
-    "eslint": "^8.57.1",
+    "eslint": "^9.26.0",
     "eslint-config-oclif": "^6.0.62",
     "eslint-config-oclif-typescript": "^3.1.14",
     "mocha": "^10.8.2",
@@ -51,9 +48,6 @@
   "oclif": {
     "bin": "csdx",
     "commands": "./lib/commands",
-    "plugins": [
-      "@oclif/plugin-help"
-    ],
     "topicSeparator": ":",
     "additionalHelpFlags": [
       "-h"
diff --git a/packages/contentstack-audit/src/audit-base-command.ts b/packages/contentstack-audit/src/audit-base-command.ts
@@ -1,7 +1,6 @@
 import { getChalk } from '@contentstack/cli-utilities';
 import * as csv from 'fast-csv';
 import { copy } from 'fs-extra';
-import { v4 as uuid } from 'uuid';
 import isEmpty from 'lodash/isEmpty';
 import { join, resolve } from 'path';
 import cloneDeep from 'lodash/cloneDeep';
@@ -15,6 +14,7 @@ import {
   CLIProgressManager,
   clearProgressModuleSetting,
   readContentTypeSchemas,
+  generateUid
 } from '@contentstack/cli-utilities';
 import { createWriteStream, existsSync, mkdirSync, readFileSync, writeFileSync, rmSync } from 'fs';
 import config from './config';
@@ -471,7 +471,7 @@ export abstract class AuditBaseCommand extends BaseCommand<typeof AuditBaseComma
         this.flags['copy-path'] ||
         this.flags['data-dir'] ||
         this.sharedConfig.basePath
-      ).replace(/\/+$/, '')}_backup_${uuid()}`;
+      ).replace(/\/+$/, '')}_backup_${generateUid()}`;
 
       if (!existsSync(backupDirPath)) {
         mkdirSync(backupDirPath, { recursive: true });
diff --git a/packages/contentstack-bootstrap/package.json b/packages/contentstack-bootstrap/package.json
@@ -21,9 +21,8 @@
     "@contentstack/cli-utilities": "~2.0.0-beta.7",
     "@contentstack/cli-config": "~2.0.0-beta.8",
     "@oclif/core": "^4.3.0",
-    "@oclif/plugin-help": "^6.2.37",
     "inquirer": "12.11.1",
-    "mkdirp": "^1.0.4",
+    "mkdirp": "^2.1.6",
     "tar": "^7.5.11"
   },
   "devDependencies": {
@@ -33,9 +32,7 @@
     "@types/node": "^18.11.9",
     "@types/tar": "^6.1.13",
     "chai": "^4.5.0",
-    "eslint": "^8.57.1",
-    "eslint-config-oclif": "^6.0.62",
-    "eslint-config-oclif-typescript": "^3.1.14",
+    "eslint": "^9.26.0",
     "mocha": "10.8.2",
     "nyc": "^15.1.0",
     "oclif": "^4.17.46",
diff --git a/packages/contentstack-branches/package.json b/packages/contentstack-branches/package.json
@@ -7,20 +7,16 @@
   "dependencies": {
     "@contentstack/cli-command": "~2.0.0-beta.6",
     "@oclif/core": "^4.3.0",
-    "@oclif/plugin-help": "^6.2.28",
     "@contentstack/cli-utilities": "~2.0.0-beta.7",
     "chalk": "^5.6.2",
     "just-diff": "^6.0.2",
     "lodash": "^4.18.1"
   },
   "devDependencies": {
-    "@contentstack/cli-dev-dependencies": "~2.0.0-beta.0",
-    "@oclif/plugin-help": "^6.2.28",
-    "@types/flat": "^5.0.5",
     "chai": "^4.5.0",
     "dotenv": "^16.5.0",
     "dotenv-expand": "^9.0.0",
-    "eslint": "^8.57.1",
+    "eslint": "^9.26.0",
     "eslint-config-oclif": "^6.0.62",
     "mocha": "10.8.2",
     "nyc": "^15.1.0",
@@ -80,4 +76,4 @@
     }
   },
   "repository": "https://github.com/contentstack/cli"
-}
+}
diff --git a/packages/contentstack-clone/package.json b/packages/contentstack-clone/package.json
@@ -11,7 +11,6 @@
     "@contentstack/cli-command": "~2.0.0-beta.6",
     "@contentstack/cli-utilities": "~2.0.0-beta.7",
     "@oclif/core": "^4.3.0",
-    "@oclif/plugin-help": "^6.2.28",
     "chalk": "^5.6.2",
     "inquirer": "12.11.1",
     "lodash": "^4.18.1",
@@ -28,7 +27,7 @@
     "@types/sinon": "^10.0.0",
     "@typescript-eslint/eslint-plugin": "^5.62.0",
     "chai": "^4.5.0",
-    "eslint": "^8.57.1",
+    "eslint": "^9.26.0",
     "eslint-config-oclif": "^6.0.62",
     "mocha": "^10.8.2",
     "nyc": "^15.1.0",
diff --git a/packages/contentstack-export-to-csv/package.json b/packages/contentstack-export-to-csv/package.json
@@ -8,7 +8,6 @@
     "@contentstack/cli-command": "~2.0.0-beta.6",
     "@contentstack/cli-utilities": "~2.0.0-beta.7",
     "@oclif/core": "^4.8.0",
-    "@oclif/plugin-help": "^6.2.32",
     "fast-csv": "^4.3.6"
   },
   "devDependencies": {
@@ -18,11 +17,10 @@
     "@types/mocha": "^10.0.10",
     "@types/node": "^20.17.50",
     "chai": "^4.5.0",
-    "eslint": "^8.57.1",
+    "eslint": "^9.26.0",
     "eslint-config-oclif": "^6.0.62",
     "eslint-config-oclif-typescript": "^3.1.14",
     "mocha": "^10.8.2",
-    "nock": "^13.5.6",
     "nyc": "^15.1.0",
     "oclif": "^4.17.46",
     "sinon": "^21.0.1",
@@ -73,4 +71,4 @@
     "test:unit:report": "nyc --extension .ts mocha --forbid-only \"test/unit/**/*.test.ts\"",
     "version": "oclif readme && git add README.md"
   }
-}
+}
diff --git a/packages/contentstack-export/package.json b/packages/contentstack-export/package.json
@@ -36,8 +36,7 @@
     "chai": "^4.4.1",
     "dotenv": "^16.5.0",
     "dotenv-expand": "^9.0.0",
-    "eslint": "^8.57.1",
-    "eslint-config-oclif": "^6.0.68",
+    "eslint": "^9.26.0",
     "mocha": "10.8.2",
     "nyc": "^15.1.0",
     "oclif": "^4.17.46",
diff --git a/packages/contentstack-import-setup/package.json b/packages/contentstack-import-setup/package.json
@@ -18,7 +18,6 @@
   },
   "devDependencies": {
     "@types/big-json": "^3.2.5",
-    "@types/bluebird": "^3.5.42",
     "@types/chai": "^4.3.20",
     "@types/fs-extra": "^11.0.4",
     "@types/mkdirp": "^1.0.2",
@@ -30,15 +29,13 @@
     "@types/uuid": "^9.0.8",
     "@typescript-eslint/eslint-plugin": "^5.62.0",
     "chai": "^4.5.0",
-    "eslint": "^8.57.1",
-    "eslint-config-oclif": "^6.0.62",
+    "eslint": "^9.26.0",
     "mocha": "^10.8.2",
     "nyc": "^15.1.0",
     "oclif": "^4.17.46",
     "rewire": "^9.0.1",
     "sinon": "^21.0.1",
     "ts-node": "^10.9.2",
-    "tsx": "^4.20.3",
     "typescript": "^4.9.5"
   },
   "scripts": {
@@ -85,4 +82,4 @@
     }
   },
   "repository": "https://github.com/contentstack/cli"
-}
+}
diff --git a/packages/contentstack-import/package.json b/packages/contentstack-import/package.json
@@ -21,7 +21,6 @@
     "merge": "^2.1.1",
     "mkdirp": "^1.0.4",
     "promise-limit": "^2.7.0",
-    "uuid": "^9.0.1",
     "winston": "^3.19.0"
   },
   "devDependencies": {
@@ -32,16 +31,12 @@
     "@types/mkdirp": "^1.0.2",
     "@types/mocha": "^8.2.3",
     "@types/node": "^14.18.63",
-    "@types/rewire": "^2.5.30",
-    "@types/tar": "^6.1.13",
-    "@types/uuid": "^9.0.8",
     "@typescript-eslint/eslint-plugin": "^5.62.0",
-    "eslint": "^8.57.1",
+    "eslint": "^9.26.0",
     "eslint-config-oclif": "^6.0.89",
     "mocha": "^10.8.2",
     "nyc": "^15.1.0",
     "oclif": "^4.17.46",
-    "rewire": "^9.0.1",
     "ts-node": "^10.9.2",
     "typescript": "^4.9.5"
   },
diff --git a/packages/contentstack-import/src/import/modules/assets.ts b/packages/contentstack-import/src/import/modules/assets.ts
@@ -7,9 +7,8 @@ import isEmpty from 'lodash/isEmpty';
 import uniq from 'lodash/uniq';
 import { existsSync } from 'node:fs';
 import includes from 'lodash/includes';
-import { v4 as uuid } from 'uuid';
 import { resolve as pResolve, join } from 'node:path';
-import { FsUtility, log, handleAndLogError } from '@contentstack/cli-utilities';
+import { FsUtility, log, handleAndLogError, generateUid } from '@contentstack/cli-utilities';
 import { ImportSpaces, type SpaceMapping } from '@contentstack/cli-asset-management';
 import { PATH_CONSTANTS } from '../../constants';
 
@@ -570,7 +569,7 @@ export default class ImportAssets extends BaseClass {
       // 2. if there are multiple assets fetched with same query, then check the parent uid against mapper created while importing folders
       // 3. Replace matched assets
       this.rootFolder = {
-        uid: uuid(),
+        uid: generateUid(),
         name: `Import-${formatDate()}`,
         parent_uid: null,
         created_at: null,
diff --git a/packages/contentstack-migration/package.json b/packages/contentstack-migration/package.json
@@ -7,7 +7,6 @@
     "@contentstack/cli-command": "~2.0.0-beta.6",
     "@contentstack/cli-utilities": "~2.0.0-beta.7",
     "@oclif/core": "^4.3.0",
-    "@oclif/plugin-help": "^6.2.28",
     "async": "^3.2.6",
     "callsites": "^3.1.0",
     "cardinal": "^2.1.1",
@@ -22,7 +21,7 @@
     "@types/mocha": "^8.2.3",
     "@types/node": "^14.18.63",
     "chai": "^4.5.0",
-    "eslint": "^8.57.1",
+    "eslint": "^9.26.0",
     "eslint-config-oclif": "^6.0.62",
     "jsdoc-to-markdown": "^8.0.3",
     "mocha": "^10.8.2",
@@ -71,4 +70,4 @@
       "cm:stacks:migration": "MGRTN"
     }
   }
-}
+}
diff --git a/packages/contentstack-query-export/test-export/main/assets/assets.json b/packages/contentstack-query-export/test-export/main/assets/assets.json
@@ -0,0 +1 @@
+{}
diff --git a/packages/contentstack-query-export/test-export/main/assets/metadata.json b/packages/contentstack-query-export/test-export/main/assets/metadata.json
@@ -0,0 +1 @@
+{}
diff --git a/packages/contentstack-seed/package.json b/packages/contentstack-seed/package.json
@@ -20,8 +20,7 @@
     "@types/node": "^18.11.9",
     "@types/tar": "^6.1.13",
     "@types/tmp": "^0.2.6",
-    "axios": "^1.15.1",
-    "eslint": "^8.57.1",
+    "eslint": "^9.26.0",
     "eslint-config-oclif": "^6.0.137",
     "eslint-config-oclif-typescript": "^3.1.14",
     "jest": "^29.7.0",
diff --git a/packages/contentstack-variants/package.json b/packages/contentstack-variants/package.json
@@ -19,7 +19,6 @@
   "license": "MIT",
   "devDependencies": {
     "@contentstack/cli-dev-dependencies": "^2.0.0-beta.0",
-    "@oclif/plugin-help": "^6.2.28",
     "@oclif/test": "^4.1.18",
     "@types/node": "^20.19.39",
     "mocha": "^10.8.2",
@@ -30,7 +29,6 @@
   "dependencies": {
     "@contentstack/cli-utilities": "~2.0.0-beta.7",
     "@oclif/core": "^4.3.0",
-    "@oclif/plugin-help": "^6.2.28",
     "lodash": "^4.18.1",
     "mkdirp": "^1.0.4",
     "winston": "^3.19.0"
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
