From c2a5c96f77e23abc608a4b7f49e0c3b2bfb25c35 Mon Sep 17 00:00:00 2001 From: Mark Stacey Date: Thu, 11 Feb 2021 11:35:01 -0330 Subject: [PATCH] Update `uuid` from `v3.3.3` to `v8.3.2` This update includes changes to the package export. The various different versions of `uuid` that used to be provided by path are now named exports, and the default export has been removed. Our imports have been updated to use the new named export, as per the migration guide [1]. [1]: https://github.com/uuidjs/uuid#upgrading-from-uuid3x --- package.json | 2 +- src/assets/AssetsController.ts | 2 +- src/message-manager/MessageManager.ts | 2 +- src/message-manager/PersonalMessageManager.ts | 2 +- src/message-manager/TypedMessageManager.ts | 2 +- src/transaction/TransactionController.ts | 2 +- yarn.lock | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index 88f60b54f23..199f7af8f19 100644 --- a/package.json +++ b/package.json @@ -53,7 +53,7 @@ "jsonschema": "^1.2.4", "nanoid": "^3.1.12", "single-call-balance-checker-abi": "^1.0.0", - "uuid": "^3.3.2", + "uuid": "^8.3.2", "web3": "^0.20.7", "web3-provider-engine": "^16.0.1" }, diff --git a/src/assets/AssetsController.ts b/src/assets/AssetsController.ts index fc7714b27e3..61a504b1981 100644 --- a/src/assets/AssetsController.ts +++ b/src/assets/AssetsController.ts @@ -9,7 +9,7 @@ import { AssetsContractController } from './AssetsContractController'; import { ApiCollectibleResponse } from './AssetsDetectionController'; const { Mutex } = require('async-mutex'); -const random = require('uuid/v1'); +const random = require('uuid').v1; /** * @type Collectible diff --git a/src/message-manager/MessageManager.ts b/src/message-manager/MessageManager.ts index e835fcddb2a..a4edc846968 100644 --- a/src/message-manager/MessageManager.ts +++ b/src/message-manager/MessageManager.ts @@ -6,7 +6,7 @@ import AbstractMessageManager, { OriginalRequest, } from './AbstractMessageManager'; -const random = require('uuid/v1'); +const random = require('uuid').v1; /** * @type Message diff --git a/src/message-manager/PersonalMessageManager.ts b/src/message-manager/PersonalMessageManager.ts index f343efa849a..1a6a174e271 100644 --- a/src/message-manager/PersonalMessageManager.ts +++ b/src/message-manager/PersonalMessageManager.ts @@ -6,7 +6,7 @@ import AbstractMessageManager, { OriginalRequest, } from './AbstractMessageManager'; -const random = require('uuid/v1'); +const random = require('uuid').v1; /** * @type Message diff --git a/src/message-manager/TypedMessageManager.ts b/src/message-manager/TypedMessageManager.ts index 368fbbce457..891374f7d69 100644 --- a/src/message-manager/TypedMessageManager.ts +++ b/src/message-manager/TypedMessageManager.ts @@ -6,7 +6,7 @@ import AbstractMessageManager, { OriginalRequest, } from './AbstractMessageManager'; -const random = require('uuid/v1'); +const random = require('uuid').v1; /** * @type TypedMessage diff --git a/src/transaction/TransactionController.ts b/src/transaction/TransactionController.ts index 478d98ae227..243dd1cc04d 100644 --- a/src/transaction/TransactionController.ts +++ b/src/transaction/TransactionController.ts @@ -19,7 +19,7 @@ import { const MethodRegistry = require('eth-method-registry'); const EthQuery = require('eth-query'); const Transaction = require('ethereumjs-tx'); -const random = require('uuid/v1'); +const random = require('uuid').v1; const { BN } = require('ethereumjs-util'); const { Mutex } = require('async-mutex'); diff --git a/yarn.lock b/yarn.lock index a1b2fdf36e2..c909478187c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7124,7 +7124,7 @@ uuid@^3.3.2: resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.3.tgz#4568f0216e78760ee1dbf3a4d2cf53e224112866" integrity sha512-pW0No1RGHgzlpHJO1nsVrHKpOEIxkGg1xB+v0ZmdNH5OAeAwzAVrCnI2/6Mtx+Uys6iaylxa+D3g4j63IKKjSQ== -uuid@^8.3.0: +uuid@^8.3.0, uuid@^8.3.2: version "8.3.2" resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2" integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==