Merge branch 'releases/4.3.0' into features/ML-folder

strapi · Jul 27, 2022 · 608c4e6 · 608c4e6
2 parents 887e7b8 + b18253f
commit 608c4e6
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git 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
@@ -129,7 +129,7 @@
     "resolve-cwd": "3.0.0",
     "semver": "7.3.7",
     "statuses": "2.0.1",
-    "uuid": "^3.3.2"
+    "uuid": "^8.3.2"
   },
   "devDependencies": {
     "typescript": "4.6.2",

diff --git 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
@@ -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
@@ -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",