yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2026-01-06 12:13:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13197 from finnsnape/fix/deprecated-uuid

Browse Source 
Fix deprecated UUID
This commit is contained in:
Jean-Sébastien Herbaux 2022-07-27 14:10:35 +02:00 committed by GitHub
commit 6b447a7b67
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/core/strapi/lib/utils/machine-id.js
View File

@ -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;
}
};

2
packages/core/strapi/package.json
View File

@ -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"

4
packages/generators/app/lib/index.js
View File

@ -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,

4
packages/generators/app/lib/utils/machine-id.js
View File

@ -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;
}
};

2
packages/generators/app/package.json
View File

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