From bc448b6f787d3b7176bee799ef574d2e130a650e Mon Sep 17 00:00:00 2001
From: Netraj Patel <netraj.patel@contentstack.com>
Date: Tue, 28 Apr 2026 22:27:11 +0530
Subject: [PATCH] Centralise uuid and short-uuid helpers from utilities

---
 packages/contentstack-audit/package.json      |  1 -
 .../src/audit-base-command.ts                 |  4 +-
 packages/contentstack-import/package.json     |  1 -
 .../src/import/modules/assets.ts              |  5 +--
 pnpm-lock.yaml                                | 39 ++++++-------------
 pnpm-workspace.yaml                           |  1 +
 6 files changed, 16 insertions(+), 35 deletions(-)

diff --git a/packages/contentstack-audit/package.json b/packages/contentstack-audit/package.json
index acff7db27..6647fbcd5 100644
--- a/packages/contentstack-audit/package.json
+++ b/packages/contentstack-audit/package.json
@@ -25,7 +25,6 @@
     "fast-csv": "^4.3.6",
     "fs-extra": "^11.3.0",
     "lodash": "^4.18.1",
-    "uuid": "^14.0.0",
     "winston": "^3.19.0"
   },
   "devDependencies": {
diff --git a/packages/contentstack-audit/src/audit-base-command.ts b/packages/contentstack-audit/src/audit-base-command.ts
index 402d3906e..1c66fbf0f 100644
--- a/packages/contentstack-audit/src/audit-base-command.ts
+++ b/packages/contentstack-audit/src/audit-base-command.ts
@@ -1,7 +1,6 @@
 import chalk from 'chalk';
 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';
@@ -13,6 +12,7 @@ import {
   log,
   configHandler,
   createLogContext,
+  generateUid,
 } from '@contentstack/cli-utilities';
 import { createWriteStream, existsSync, mkdirSync, readFileSync, writeFileSync, rmSync } from 'fs';
 import config from './config';
@@ -437,7 +437,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-import/package.json b/packages/contentstack-import/package.json
index 1794fece1..f7428ea42 100644
--- a/packages/contentstack-import/package.json
+++ b/packages/contentstack-import/package.json
@@ -20,7 +20,6 @@
     "merge": "^2.1.1",
     "mkdirp": "^1.0.4",
     "promise-limit": "^2.7.0",
-    "uuid": "^14.0.0",
     "winston": "^3.19.0"
   },
   "devDependencies": {
diff --git a/packages/contentstack-import/src/import/modules/assets.ts b/packages/contentstack-import/src/import/modules/assets.ts
index e78f97929..e8b792f0b 100644
--- 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 config from '../../config';
 import { ModuleClassParams } from '../../types';
@@ -424,7 +423,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/pnpm-lock.yaml b/pnpm-lock.yaml
index 7f372c3d5..0e31b5cf1 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -7,6 +7,7 @@ settings:
 overrides:
   tmp: 0.2.4
   axios: 1.15.2
+  uuid: 14.0.0
 
 importers:
 
@@ -42,9 +43,6 @@ importers:
       lodash:
         specifier: ^4.18.1
         version: 4.18.1
-      uuid:
-        specifier: ^14.0.0
-        version: 14.0.0
       winston:
         specifier: ^3.19.0
         version: 3.19.0
@@ -583,9 +581,6 @@ importers:
       promise-limit:
         specifier: ^2.7.0
         version: 2.7.0
-      uuid:
-        specifier: ^14.0.0
-        version: 14.0.0
       winston:
         specifier: ^3.19.0
         version: 3.19.0
@@ -6092,14 +6087,6 @@ packages:
     resolution: {integrity: sha512-Qo+uWgilfSmAhXCMav1uYFynlQO7fMFiMVZsQqZRMIXp0O7rR7qjkj+cPvBHLgBqi960QCoo/PH2/6ZtVqKvrg==}
     hasBin: true
 
-  uuid@8.3.2:
-    resolution: {integrity: sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==}
-    hasBin: true
-
-  uuid@9.0.1:
-    resolution: {integrity: sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==}
-    hasBin: true
-
   v8-compile-cache-lib@3.0.1:
     resolution: {integrity: sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==}
 
@@ -7077,7 +7064,7 @@ snapshots:
       traverse: 0.6.11
       tty-table: 4.2.3
       unique-string: 2.0.0
-      uuid: 9.0.1
+      uuid: 14.0.0
       winston: 3.19.0
       xdg-basedir: 4.0.0
     transitivePeerDependencies:
@@ -7112,7 +7099,7 @@ snapshots:
       traverse: 0.6.11
       tty-table: 4.2.3
       unique-string: 2.0.0
-      uuid: 9.0.1
+      uuid: 14.0.0
       winston: 3.19.0
       xdg-basedir: 4.0.0
     transitivePeerDependencies:
@@ -7147,7 +7134,7 @@ snapshots:
       traverse: 0.6.11
       tty-table: 4.2.3
       unique-string: 2.0.0
-      uuid: 9.0.1
+      uuid: 14.0.0
       winston: 3.19.0
       xdg-basedir: 4.0.0
     transitivePeerDependencies:
@@ -7182,7 +7169,7 @@ snapshots:
       traverse: 0.6.11
       tty-table: 4.2.3
       unique-string: 2.0.0
-      uuid: 9.0.1
+      uuid: 14.0.0
       winston: 3.19.0
       xdg-basedir: 4.0.0
     transitivePeerDependencies:
@@ -10273,7 +10260,7 @@ snapshots:
       '@typescript-eslint/parser': 6.21.0(eslint@9.39.4)(typescript@5.9.3)
       eslint-config-xo-space: 0.35.0(eslint@9.39.4)
       eslint-import-resolver-typescript: 3.10.1(eslint-plugin-import@2.32.0(@typescript-eslint/parser@6.21.0(eslint@9.39.4)(typescript@5.9.3))(eslint@9.39.4))(eslint@9.39.4)
-      eslint-plugin-import: 2.32.0(@typescript-eslint/parser@6.21.0(eslint@9.39.4)(typescript@5.9.3))(eslint-import-resolver-typescript@3.10.1(eslint-plugin-import@2.32.0(@typescript-eslint/parser@6.21.0(eslint@9.39.4)(typescript@5.9.3))(eslint@9.39.4))(eslint@9.39.4))(eslint@9.39.4)
+      eslint-plugin-import: 2.32.0(@typescript-eslint/parser@6.21.0(eslint@9.39.4)(typescript@5.9.3))(eslint-import-resolver-typescript@3.10.1)(eslint@9.39.4)
       eslint-plugin-mocha: 10.5.0(eslint@9.39.4)
       eslint-plugin-n: 15.7.0(eslint@9.39.4)
       eslint-plugin-perfectionist: 2.11.0(eslint@9.39.4)(typescript@5.9.3)
@@ -10335,7 +10322,7 @@ snapshots:
       eslint-config-xo: 0.49.0(eslint@9.39.4)
       eslint-config-xo-space: 0.35.0(eslint@9.39.4)
       eslint-import-resolver-typescript: 3.10.1(eslint-plugin-import@2.32.0(@typescript-eslint/parser@6.21.0(eslint@9.39.4)(typescript@5.9.3))(eslint@9.39.4))(eslint@9.39.4)
-      eslint-plugin-import: 2.32.0(@typescript-eslint/parser@8.59.0(eslint@9.39.4)(typescript@5.9.3))(eslint-import-resolver-typescript@3.10.1(eslint-plugin-import@2.32.0(@typescript-eslint/parser@6.21.0(eslint@9.39.4)(typescript@5.9.3))(eslint@9.39.4))(eslint@9.39.4))(eslint@9.39.4)
+      eslint-plugin-import: 2.32.0(@typescript-eslint/parser@8.59.0(eslint@9.39.4)(typescript@5.9.3))(eslint-import-resolver-typescript@3.10.1)(eslint@9.39.4)
       eslint-plugin-jsdoc: 50.8.0(eslint@9.39.4)
       eslint-plugin-mocha: 10.5.0(eslint@9.39.4)
       eslint-plugin-n: 17.24.0(eslint@9.39.4)(typescript@5.9.3)
@@ -10387,7 +10374,7 @@ snapshots:
       tinyglobby: 0.2.16
       unrs-resolver: 1.11.1
     optionalDependencies:
-      eslint-plugin-import: 2.32.0(@typescript-eslint/parser@6.21.0(eslint@9.39.4)(typescript@5.9.3))(eslint-import-resolver-typescript@3.10.1(eslint-plugin-import@2.32.0(@typescript-eslint/parser@6.21.0(eslint@9.39.4)(typescript@5.9.3))(eslint@9.39.4))(eslint@9.39.4))(eslint@9.39.4)
+      eslint-plugin-import: 2.32.0(@typescript-eslint/parser@6.21.0(eslint@9.39.4)(typescript@5.9.3))(eslint-import-resolver-typescript@3.10.1)(eslint@9.39.4)
     transitivePeerDependencies:
       - supports-color
 
@@ -10492,7 +10479,7 @@ snapshots:
       - eslint-import-resolver-webpack
       - supports-color
 
-  eslint-plugin-import@2.32.0(@typescript-eslint/parser@6.21.0(eslint@9.39.4)(typescript@5.9.3))(eslint-import-resolver-typescript@3.10.1(eslint-plugin-import@2.32.0(@typescript-eslint/parser@6.21.0(eslint@9.39.4)(typescript@5.9.3))(eslint@9.39.4))(eslint@9.39.4))(eslint@9.39.4):
+  eslint-plugin-import@2.32.0(@typescript-eslint/parser@6.21.0(eslint@9.39.4)(typescript@5.9.3))(eslint-import-resolver-typescript@3.10.1)(eslint@9.39.4):
     dependencies:
       '@rtsao/scc': 1.1.0
       array-includes: 3.1.9
@@ -10550,7 +10537,7 @@ snapshots:
       - eslint-import-resolver-webpack
       - supports-color
 
-  eslint-plugin-import@2.32.0(@typescript-eslint/parser@8.59.0(eslint@9.39.4)(typescript@5.9.3))(eslint-import-resolver-typescript@3.10.1(eslint-plugin-import@2.32.0(@typescript-eslint/parser@6.21.0(eslint@9.39.4)(typescript@5.9.3))(eslint@9.39.4))(eslint@9.39.4))(eslint@9.39.4):
+  eslint-plugin-import@2.32.0(@typescript-eslint/parser@8.59.0(eslint@9.39.4)(typescript@5.9.3))(eslint-import-resolver-typescript@3.10.1)(eslint@9.39.4):
     dependencies:
       '@rtsao/scc': 1.1.0
       array-includes: 3.1.9
@@ -11639,7 +11626,7 @@ snapshots:
       istanbul-lib-coverage: 3.2.2
       p-map: 3.0.0
       rimraf: 3.0.2
-      uuid: 8.3.2
+      uuid: 14.0.0
 
   istanbul-lib-report@3.0.1:
     dependencies:
@@ -13895,10 +13882,6 @@ snapshots:
 
   uuid@14.0.0: {}
 
-  uuid@8.3.2: {}
-
-  uuid@9.0.1: {}
-
   v8-compile-cache-lib@3.0.1: {}
 
   v8-to-istanbul@9.3.0:
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index abf504f5e..2daf20671 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -3,3 +3,4 @@ packages:
 overrides:
   tmp: 0.2.4
   axios: 1.15.2
+  uuid: 14.0.0