diff --git a/packages/core/data-transfer/package.json b/packages/core/data-transfer/package.json index 7183d80ccb..db4475449d 100644 --- a/packages/core/data-transfer/package.json +++ b/packages/core/data-transfer/package.json @@ -50,7 +50,6 @@ "stream-json": "1.7.4", "tar": "6.1.13", "tar-stream": "2.2.0", - "uuid": "9.0.0", "ws": "8.13.0" }, "devDependencies": { diff --git a/packages/core/data-transfer/src/strapi/providers/remote-destination/index.ts b/packages/core/data-transfer/src/strapi/providers/remote-destination/index.ts index 804be60887..13fef83cde 100644 --- a/packages/core/data-transfer/src/strapi/providers/remote-destination/index.ts +++ b/packages/core/data-transfer/src/strapi/providers/remote-destination/index.ts @@ -1,5 +1,5 @@ import { WebSocket } from 'ws'; -import { v4 } from 'uuid'; +import { randomUUID } from 'crypto'; import { Writable } from 'stream'; import { once } from 'lodash/fp'; @@ -336,7 +336,7 @@ class RemoteStrapiDestinationProvider implements IDestinationProvider { hasStarted = true; - const assetID = v4(); + const assetID = randomUUID(); const { filename, filepath, stats, stream } = asset; try { diff --git a/packages/core/data-transfer/src/strapi/providers/utils.ts b/packages/core/data-transfer/src/strapi/providers/utils.ts index 3ad88f1763..7fa744c2c8 100644 --- a/packages/core/data-transfer/src/strapi/providers/utils.ts +++ b/packages/core/data-transfer/src/strapi/providers/utils.ts @@ -1,4 +1,4 @@ -import { v4 } from 'uuid'; +import { randomUUID } from 'crypto'; import { RawData, WebSocket } from 'ws'; import type { client, server } from '../../../types/remote/protocol'; @@ -28,7 +28,7 @@ export const createDispatcher = (ws: WebSocket) => { } return new Promise((resolve, reject) => { - const uuid = v4(); + const uuid = randomUUID(); const payload = { ...message, uuid }; if (options.attachTransfer) { diff --git a/packages/core/strapi/lib/commands/actions/telemetry/enable/action.js b/packages/core/strapi/lib/commands/actions/telemetry/enable/action.js index 685587f446..09be27726e 100644 --- a/packages/core/strapi/lib/commands/actions/telemetry/enable/action.js +++ b/packages/core/strapi/lib/commands/actions/telemetry/enable/action.js @@ -4,7 +4,7 @@ const { resolve } = require('path'); const fse = require('fs-extra'); const chalk = require('chalk'); const fetch = require('node-fetch'); -const { v4: uuidv4 } = require('uuid'); +const { randomUUID } = require('crypto'); const machineID = require('../../../../utils/machine-id'); const readPackageJSON = async (path) => { @@ -36,7 +36,7 @@ const generateNewPackageJSON = (packageObj) => { return { ...packageObj, strapi: { - uuid: uuidv4(), + uuid: randomUUID(), telemetryDisabled: false, }, }; @@ -45,7 +45,7 @@ const generateNewPackageJSON = (packageObj) => { ...packageObj, strapi: { ...packageObj.strapi, - uuid: packageObj.strapi.uuid ? packageObj.strapi.uuid : uuidv4(), + uuid: packageObj.strapi.uuid ? packageObj.strapi.uuid : randomUUID(), telemetryDisabled: false, }, }; diff --git a/packages/core/strapi/lib/utils/machine-id.js b/packages/core/strapi/lib/utils/machine-id.js index a5557a487e..eb22f90c79 100644 --- a/packages/core/strapi/lib/utils/machine-id.js +++ b/packages/core/strapi/lib/utils/machine-id.js @@ -1,14 +1,14 @@ 'use strict'; const { machineIdSync } = require('node-machine-id'); -const { v4: uuidv4 } = require('uuid'); +const { randomUUID } = require('crypto'); module.exports = () => { try { const deviceId = machineIdSync(); return deviceId; } catch (error) { - const deviceId = uuidv4(); + const deviceId = randomUUID(); return deviceId; } }; diff --git a/packages/core/strapi/package.json b/packages/core/strapi/package.json index 5b8e95e23a..d3e79ff117 100644 --- a/packages/core/strapi/package.json +++ b/packages/core/strapi/package.json @@ -132,8 +132,7 @@ "qs": "6.11.1", "resolve-cwd": "3.0.0", "semver": "7.3.8", - "statuses": "2.0.1", - "uuid": "^8.3.2" + "statuses": "2.0.1" }, "devDependencies": { "supertest": "6.3.3", diff --git a/packages/generators/app/package.json b/packages/generators/app/package.json index dccfc29e89..8c86b1d473 100644 --- a/packages/generators/app/package.json +++ b/packages/generators/app/package.json @@ -53,8 +53,7 @@ "node-machine-id": "^1.1.10", "ora": "^5.4.1", "semver": "7.3.8", - "tar": "6.1.13", - "uuid": "^8.3.2" + "tar": "6.1.13" }, "engines": { "node": ">=14.19.1 <=18.x.x", diff --git a/packages/generators/app/src/index.ts b/packages/generators/app/src/index.ts index e277f2f06d..c456fda6ea 100644 --- a/packages/generators/app/src/index.ts +++ b/packages/generators/app/src/index.ts @@ -3,7 +3,6 @@ import { readFileSync } from 'node:fs'; import os from 'node:os'; import readline from 'node:readline'; import crypto from 'crypto'; -import { v4 as uuidv4 } from 'uuid'; import * as sentry from '@sentry/node'; import hasYarn from './utils/has-yarn'; import checkRequirements from './utils/check-requirements'; @@ -44,7 +43,7 @@ export const generateNewApp = (projectDirectory: string, options: Partial { try { const deviceId = machineIdSync(); return deviceId; } catch (error) { - const deviceId = uuidv4(); + const deviceId = randomUUID(); return deviceId; } }; diff --git a/yarn.lock b/yarn.lock index 0bbb6576c6..16cc809704 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7449,7 +7449,6 @@ __metadata: tar: 6.1.13 tar-stream: 2.2.0 typescript: 5.0.4 - uuid: 9.0.0 ws: 8.13.0 languageName: unknown linkType: soft @@ -7531,7 +7530,6 @@ __metadata: ora: ^5.4.1 semver: 7.3.8 tar: 6.1.13 - uuid: ^8.3.2 languageName: unknown linkType: soft @@ -8133,7 +8131,6 @@ __metadata: statuses: 2.0.1 supertest: 6.3.3 typescript: 5.0.4 - uuid: ^8.3.2 bin: strapi: ./bin/strapi.js languageName: unknown @@ -31880,15 +31877,6 @@ __metadata: languageName: node linkType: hard -"uuid@npm:9.0.0, uuid@npm:^9.0.0": - version: 9.0.0 - resolution: "uuid@npm:9.0.0" - bin: - uuid: dist/bin/uuid - checksum: 8dd2c83c43ddc7e1c71e36b60aea40030a6505139af6bee0f382ebcd1a56f6cd3028f7f06ffb07f8cf6ced320b76aea275284b224b002b289f89fe89c389b028 - languageName: node - linkType: hard - "uuid@npm:^3.3.2": version: 3.4.0 resolution: "uuid@npm:3.4.0" @@ -31898,6 +31886,15 @@ __metadata: languageName: node linkType: hard +"uuid@npm:^9.0.0": + version: 9.0.0 + resolution: "uuid@npm:9.0.0" + bin: + uuid: dist/bin/uuid + checksum: 8dd2c83c43ddc7e1c71e36b60aea40030a6505139af6bee0f382ebcd1a56f6cd3028f7f06ffb07f8cf6ced320b76aea275284b224b002b289f89fe89c389b028 + languageName: node + linkType: hard + "v8-compile-cache@npm:2.3.0, v8-compile-cache@npm:^2.3.0": version: 2.3.0 resolution: "v8-compile-cache@npm:2.3.0"