From 0134276f014aa2942cd2ed05b67d52dd58da5417 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Mon, 24 Feb 2020 13:27:25 +0000 Subject: [PATCH 1/2] Update dependency uuid to v7 --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index b8f1d17b..97bb2e19 100644 --- a/package.json +++ b/package.json @@ -64,7 +64,7 @@ "socket.io": "2.3.0", "tlds": "1.207.0", "ua-parser-js": "0.7.21", - "uuid": "3.4.0", + "uuid": "7.0.0", "web-push": "3.4.3", "yarn": "1.22.0" }, diff --git a/yarn.lock b/yarn.lock index fbb8528a..ac9f1ead 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9504,10 +9504,10 @@ utils-merge@1.0.1: resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713" integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM= -uuid@3.4.0: - version "3.4.0" - resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee" - integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A== +uuid@7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/uuid/-/uuid-7.0.0.tgz#1833d4b9ce50b732bfaa271f9cb74e974d303c79" + integrity sha512-LNUrNsXdI/fUsypJbWM8Jt4DgQdFAZh41p9C7WE9Cn+CULOEkoG2lgQyH68v3wnIy5K3fN4jdSt270K6IFA3MQ== uuid@^3.3.2, uuid@^3.3.3: version "3.3.3" From e0d5f4c2fff6e1ada67d489582604d8c80c487e6 Mon Sep 17 00:00:00 2001 From: Pavel Djundik Date: Mon, 24 Feb 2020 15:35:15 +0200 Subject: [PATCH 2/2] Change uuidv4 require --- src/client.js | 2 +- src/models/network.js | 2 +- src/plugins/uploader.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/client.js b/src/client.js index 72a4378d..c126aba7 100644 --- a/src/client.js +++ b/src/client.js @@ -9,7 +9,7 @@ const Msg = require("./models/msg"); const Network = require("./models/network"); const Helper = require("./helper"); const UAParser = require("ua-parser-js"); -const uuidv4 = require("uuid/v4"); +const {v4: uuidv4} = require("uuid"); const escapeRegExp = require("lodash/escapeRegExp"); const constants = require("../client/js/constants.js"); const inputs = require("./plugins/inputs"); diff --git a/src/models/network.js b/src/models/network.js index f621637b..41cab75b 100644 --- a/src/models/network.js +++ b/src/models/network.js @@ -1,7 +1,7 @@ "use strict"; const _ = require("lodash"); -const uuidv4 = require("uuid/v4"); +const {v4: uuidv4} = require("uuid"); const IrcFramework = require("irc-framework"); const Chan = require("./chan"); const Msg = require("./msg"); diff --git a/src/plugins/uploader.js b/src/plugins/uploader.js index 0c2242c3..3880f953 100644 --- a/src/plugins/uploader.js +++ b/src/plugins/uploader.js @@ -2,7 +2,7 @@ const Helper = require("../helper"); const busboy = require("busboy"); -const uuidv4 = require("uuid/v4"); +const {v4: uuidv4} = require("uuid"); const path = require("path"); const fsextra = require("fs-extra"); const fs = require("fs");