From dc42df3bf28f83285dad8ea0abf8f5b4b55d31d2 Mon Sep 17 00:00:00 2001 From: Sean Yesmunt Date: Fri, 2 Oct 2020 14:16:37 -0400 Subject: [PATCH] fix uuid import with new version --- ui/component/common/icon-custom.jsx | 3 ++- ui/redux/actions/notifications.js | 3 ++- web/bundle-id.js | 2 +- yarn.lock | 9 +++++++-- 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/ui/component/common/icon-custom.jsx b/ui/component/common/icon-custom.jsx index 9f4aacc33..0b6c3e4ca 100644 --- a/ui/component/common/icon-custom.jsx +++ b/ui/component/common/icon-custom.jsx @@ -2,7 +2,8 @@ // A housing for all of our icons. Mostly taken from https://github.com/feathericons/react-feather import * as ICONS from 'constants/icons'; import React, { forwardRef } from 'react'; -import uuid from 'uuid/v4'; +// $FlowFixMe +import { v4 as uuid } from 'uuid'; type IconProps = { size: number, diff --git a/ui/redux/actions/notifications.js b/ui/redux/actions/notifications.js index 072a028ec..29a72d184 100644 --- a/ui/redux/actions/notifications.js +++ b/ui/redux/actions/notifications.js @@ -1,7 +1,8 @@ // @flow import * as ACTIONS from 'constants/action_types'; import { Lbryio } from 'lbryinc'; -import uuid from 'uuid/v4'; +// $FlowFixMe +import { v4 as uuid } from 'uuid'; import { selectNotifications } from 'redux/selectors/notifications'; import { doResolveUris } from 'lbry-redux'; diff --git a/web/bundle-id.js b/web/bundle-id.js index 80530a28d..ac768afaf 100644 --- a/web/bundle-id.js +++ b/web/bundle-id.js @@ -1,4 +1,4 @@ -const uuid = require('uuid/v4'); +const { v4: uuid } = require('uuid'); const jsBundleId = uuid(); function getJsBundleId() { diff --git a/yarn.lock b/yarn.lock index 6a15132d3..00e778f29 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6411,9 +6411,9 @@ lazy-val@^1.0.4: yargs "^13.2.2" zstd-codec "^0.1.1" -lbry-redux@lbryio/lbry-redux#04015155796bc588bdf5b10762cfc874e6a1b00c: +lbry-redux@lbryio/lbry-redux#ba5d6b84bec6bdb2f0a1a6b23e695212c65f650e: version "0.0.1" - resolved "https://codeload.github.com/lbryio/lbry-redux/tar.gz/04015155796bc588bdf5b10762cfc874e6a1b00c" + resolved "https://codeload.github.com/lbryio/lbry-redux/tar.gz/ba5d6b84bec6bdb2f0a1a6b23e695212c65f650e" dependencies: proxy-polyfill "0.1.6" reselect "^3.0.0" @@ -11201,6 +11201,11 @@ uuid@^3.0.1, uuid@^3.3.2: version "3.4.0" resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee" +uuid@^8.3.0: + version "8.3.0" + resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.0.tgz#ab738085ca22dc9a8c92725e459b1d507df5d6ea" + integrity sha512-fX6Z5o4m6XsXBdli9g7DtWgAx+osMsRRZFKma1mIUsLCz6vRvv+pz5VNbyu9UEDzpMWulZfvpgb/cmDXVulYFQ== + v8-compile-cache@2.0.3: version "2.0.3" resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.0.3.tgz#00f7494d2ae2b688cfe2899df6ed2c54bef91dbe"