diff --git a/packages/core/strapi/lib/utils/machine-id.js b/packages/core/strapi/lib/utils/machine-id.js index 92e32452f1..a5557a487e 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 uuid = require('uuid'); +const { v4: uuidv4 } = require('uuid'); module.exports = () => { try { const deviceId = machineIdSync(); return deviceId; } catch (error) { - const deviceId = uuid(); + const deviceId = uuidv4(); return deviceId; } }; diff --git a/packages/core/strapi/package.json b/packages/core/strapi/package.json index 577b820559..21a849702c 100644 --- a/packages/core/strapi/package.json +++ b/packages/core/strapi/package.json @@ -128,7 +128,7 @@ "resolve-cwd": "3.0.0", "semver": "7.3.7", "statuses": "2.0.1", - "uuid": "^3.3.2" + "uuid": "^8.3.2" }, "devDependencies": { "supertest": "6.2.4" diff --git a/packages/generators/app/lib/index.js b/packages/generators/app/lib/index.js index 1d683426fb..c299ce099b 100644 --- a/packages/generators/app/lib/index.js +++ b/packages/generators/app/lib/index.js @@ -3,7 +3,7 @@ const { join, resolve, basename } = require('path'); const os = require('os'); const crypto = require('crypto'); -const uuid = require('uuid/v4'); +const { v4: uuidv4 } = require('uuid'); const sentry = require('@sentry/node'); // FIXME /* eslint-disable import/extensions */ @@ -42,7 +42,7 @@ const generateNewApp = (projectDirectory, cliArguments) => { template: cliArguments.template, starter: cliArguments.starter, }, - uuid: (process.env.STRAPI_UUID_PREFIX || '') + uuid(), + uuid: (process.env.STRAPI_UUID_PREFIX || '') + uuidv4(), docker: process.env.DOCKER === 'true', deviceId: machineID(), tmpPath, diff --git a/packages/generators/app/lib/utils/machine-id.js b/packages/generators/app/lib/utils/machine-id.js index 92e32452f1..a5557a487e 100644 --- a/packages/generators/app/lib/utils/machine-id.js +++ b/packages/generators/app/lib/utils/machine-id.js @@ -1,14 +1,14 @@ 'use strict'; const { machineIdSync } = require('node-machine-id'); -const uuid = require('uuid'); +const { v4: uuidv4 } = require('uuid'); module.exports = () => { try { const deviceId = machineIdSync(); return deviceId; } catch (error) { - const deviceId = uuid(); + const deviceId = uuidv4(); return deviceId; } }; diff --git a/packages/generators/app/package.json b/packages/generators/app/package.json index 666e4f65d4..b56a24bf39 100644 --- a/packages/generators/app/package.json +++ b/packages/generators/app/package.json @@ -46,7 +46,7 @@ "node-machine-id": "^1.1.10", "ora": "^5.4.0", "tar": "6.1.11", - "uuid": "^3.3.2" + "uuid": "^8.3.2" }, "engines": { "node": ">=14.19.1 <=16.x.x",