From 769e2e3edcd49f52467c01f9a3d7319117532125 Mon Sep 17 00:00:00 2001 From: Rishi Ghan Date: Tue, 1 Mar 2022 15:20:17 -0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=BC=20Upgraded=20to=20react-router=20v?= =?UTF-8?q?6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 20 +- src/client/actions/fileops.actions.tsx | 1 + src/client/components/App.tsx | 41 +-- src/client/components/ComicDetail.tsx | 43 ++-- .../components/ComicDetail/RawFileDetails.tsx | 48 ++-- .../components/Dashboard/RecentlyImported.tsx | 2 +- src/client/components/Library.tsx | 12 +- src/client/index.tsx | 12 +- src/client/reducers/airdcpp.reducer.ts | 2 +- ...icinfo.reducer.js => comicinfo.reducer.ts} | 2 +- src/client/reducers/fileops.reducer.ts | 2 +- src/client/reducers/index.js | 18 +- src/client/store/index.ts | 44 ++-- yarn.lock | 233 ++++-------------- 14 files changed, 164 insertions(+), 316 deletions(-) rename src/client/reducers/{comicinfo.reducer.js => comicinfo.reducer.ts} (98%) diff --git a/package.json b/package.json index 5761d43..72e09c3 100644 --- a/package.json +++ b/package.json @@ -51,18 +51,21 @@ "jsdoc": "^3.6.7", "opds-extra": "^3.0.9", "pretty-bytes": "^5.6.0", - "react": "^17.0.1", + "react": "^17.0.2", "react-collapsible": "^2.8.3", "react-datepicker": "^4.5.0", - "react-dom": "^17.0.1", + "react-dom": "^17.0.2", "react-fast-compare": "^3.2.0", "react-final-form": "^6.5.3", "react-final-form-arrays": "^3.1.3", - "react-lazylog": "^4.5.3", + "react-hot-loader": "^4.13.0", "react-loader-spinner": "^4.0.0", "react-masonry-css": "^1.0.16", "react-notification-system": "^0.4.0", "react-notification-system-redux": "^2.0.1", + "react-redux": "^7.2.6", + "react-router": "^6.2.2", + "react-router-dom": "^6.2.2", "react-select": "^5.2.1", "react-select-async-paginate": "^0.6.1", "react-slick": "^0.28.1", @@ -71,7 +74,10 @@ "react-table": "^7.7.0", "react-textarea-autosize": "^8.3.3", "react-window-dynamic-list": "^2.3.5", + "redux-devtools-extension": "^2.13.9", + "redux-first-history": "^5.0.8", "redux-socket.io-middleware": "^1.0.4", + "redux-thunk": "^2.4.1", "sharp": "^0.28.1", "slick-carousel": "^1.8.1", "socket.io-client": "^4.3.2", @@ -116,7 +122,6 @@ "comlink": "^4.3.0", "compromise-strict": "^0.0.2", "concurrently": "^4.0.0", - "connected-react-router": "^6.9.1", "copy-webpack-plugin": "^9.0.1", "css-loader": "^5.1.2", "eslint": "^7.22.0", @@ -146,13 +151,6 @@ "pino-pretty": "^4.7.1", "prettier": "^2.2.1", "qs": "^6.10.1", - "react": "^17.0.1", - "react-dom": "^17.0.1", - "react-hot-loader": "^4.13.0", - "react-redux": "^7.2.3", - "react-router": "^5.2.0", - "react-router-dom": "^5.2.0", - "redux-thunk": "^2.3.0", "rimraf": "^3.0.2", "sass-loader": "^11.0.1", "source-map-loader": "^0.2.4", diff --git a/src/client/actions/fileops.actions.tsx b/src/client/actions/fileops.actions.tsx index dfbc5f6..3cc0f93 100644 --- a/src/client/actions/fileops.actions.tsx +++ b/src/client/actions/fileops.actions.tsx @@ -257,6 +257,7 @@ export const extractComicArchive = }); }; +export const searchIssue = (options) => async (dispatch) => {}; export const analyzeImage = (imageFilePath: string | Buffer) => async (dispatch) => { dispatch({ diff --git a/src/client/components/App.tsx b/src/client/components/App.tsx index 5a74306..8ae47ab 100644 --- a/src/client/components/App.tsx +++ b/src/client/components/App.tsx @@ -1,6 +1,5 @@ import React, { ReactElement, useState } from "react"; import { useSelector } from "react-redux"; -import { hot } from "react-hot-loader"; import Dashboard from "./Dashboard/Dashboard"; import Import from "./Import"; @@ -11,14 +10,11 @@ import Search from "./Search"; import Settings from "./Settings"; import VolumeDetail from "./VolumeDetail/VolumeDetail"; -import { Switch, Route } from "react-router"; +import { Routes, Route } from "react-router-dom"; import Navbar from "./Navbar"; import "../assets/scss/App.scss"; import Notifications from "react-notification-system-redux"; -import { getSettings } from "../actions/settings.actions"; import { AirDCPPSocketContext } from "../context/AirDCPPSocket"; -import { isEmpty, isUndefined } from "lodash"; -import AirDCPPSocket from "../services/DcppSearchService"; //Optional styling const style = { @@ -66,7 +62,6 @@ const style = { export const App = (): ReactElement => { const notifications = useSelector((state: RootState) => state.notifications); - const [ADCPPSocket, setADCPPSocket] = useState({}); return ( @@ -79,37 +74,25 @@ export const App = (): ReactElement => { newOnTop={true} allowHTML={true} /> - - - - - - - - - - - - - - - - + + } /> + } /> + } /> + } /> + } /> } /> } /> - - - - + } /> + ); }; -export default hot(module)(App); +export default App; diff --git a/src/client/components/ComicDetail.tsx b/src/client/components/ComicDetail.tsx index 42c535b..9eb95c5 100644 --- a/src/client/components/ComicDetail.tsx +++ b/src/client/components/ComicDetail.tsx @@ -12,7 +12,7 @@ import DownloadsPanel from "./ComicDetail/DownloadsPanel"; import { EditMetadataPanel } from "./ComicDetail/EditMetadataPanel"; import { Menu } from "./ComicDetail/ActionMenu/Menu"; -import { isEmpty, isUndefined, isNil } from "lodash"; +import { isEmpty, isUndefined, isNil, findIndex } from "lodash"; import { RootState } from "threetwo-ui-typings"; import { getComicBookDetailById } from "../actions/comicinfo.actions"; @@ -41,8 +41,8 @@ type ComicDetailProps = {}; */ export const ComicDetail = ({}: ComicDetailProps): ReactElement => { - const [active, setActive] = useState(1); const [page, setPage] = useState(1); + const [active, setActive] = useState(1); const [visible, setVisible] = useState(false); const [slidingPanelContentId, setSlidingPanelContentId] = useState(""); @@ -165,7 +165,9 @@ export const ComicDetail = ({}: ComicDetailProps): ReactElement => { icon: , name: "Archive Operations", content: , - include: !isNil(comicBookDetailData.rawFileDetails), + include: + !isUndefined(comicBookDetailData.rawFileDetails) && + !isEmpty(comicBookDetailData.rawFileDetails.cover), }, { id: 4, @@ -195,10 +197,12 @@ export const ComicDetail = ({}: ComicDetailProps): ReactElement => { include: !isNil(comicBookDetailData.rawFileDetails), }, ]; + // filtered Tabs + const filteredTabs = tabGroup.filter((tab) => tab.include); + + // Tabs const MetadataTabGroup = () => { - const filteredTabs = tabGroup.filter((tab) => tab.include); - console.log("filter:m", filteredTabs); return ( <>
@@ -211,7 +215,7 @@ export const ComicDetail = ({}: ComicDetailProps): ReactElement => { > {/* Downloads tab and count badge */} - {id === 4 && + {id === 5 && !isNil(comicBookDetailData) && !isEmpty(comicBookDetailData) ? ( @@ -241,7 +245,10 @@ export const ComicDetail = ({}: ComicDetailProps): ReactElement => { // 2. from the CV-scraped version let imagePath = ""; let comicBookTitle = ""; - if (!isNil(comicBookDetailData.rawFileDetails)) { + if ( + !isUndefined(comicBookDetailData.rawFileDetails) && + !isEmpty(comicBookDetailData.rawFileDetails.cover) + ) { const encodedFilePath = encodeURI( `${LIBRARY_SERVICE_HOST}/${comicBookDetailData.rawFileDetails.cover.filePath}`, ); @@ -276,16 +283,18 @@ export const ComicDetail = ({}: ComicDetailProps): ReactElement => {
{/* raw file details */}
- {!isNil(comicBookDetailData.rawFileDetails) && ( - <> - - - )} + {!isUndefined(comicBookDetailData.rawFileDetails) && + !isEmpty(comicBookDetailData.rawFileDetails.cover) && ( + <> + + + )}
diff --git a/src/client/components/ComicDetail/RawFileDetails.tsx b/src/client/components/ComicDetail/RawFileDetails.tsx index c601f1f..0965cc6 100644 --- a/src/client/components/ComicDetail/RawFileDetails.tsx +++ b/src/client/components/ComicDetail/RawFileDetails.tsx @@ -38,35 +38,35 @@ export const RawFileDetails = (props): ReactElement => { - -
-
- {/* inferred metadata */} -
Inferred Issue Metadata
-
-
+
+
+
+ {/* inferred metadata */} +
Inferred Issue Metadata
+
+
+
+
+ Name + + {inferredMetadata.issue.name} + +
+
+ {!isUndefined(inferredMetadata.issue.number) ? (
- Name - - {inferredMetadata.issue.name} + Number + + {inferredMetadata.issue.number}
- {!isUndefined(inferredMetadata.issue.number) ? ( -
-
- Number - - {inferredMetadata.issue.number} - -
-
- ) : null} -
-
-
-
+ ) : null} +
+ + + ); }; diff --git a/src/client/components/Dashboard/RecentlyImported.tsx b/src/client/components/Dashboard/RecentlyImported.tsx index 2867480..00137ab 100644 --- a/src/client/components/Dashboard/RecentlyImported.tsx +++ b/src/client/components/Dashboard/RecentlyImported.tsx @@ -45,7 +45,7 @@ export const RecentlyImported = ({ !isEmpty(sourcedMetadata); let imagePath = ""; let comicName = ""; - if (!isNil(rawFileDetails)) { + if (!isEmpty(rawFileDetails.cover)) { const encodedFilePath = encodeURI( `${LIBRARY_SERVICE_HOST}/${rawFileDetails.cover.filePath}`, ); diff --git a/src/client/components/Library.tsx b/src/client/components/Library.tsx index 47458c1..4648f25 100644 --- a/src/client/components/Library.tsx +++ b/src/client/components/Library.tsx @@ -1,6 +1,6 @@ import React, { useState, useEffect, useMemo, ReactElement } from "react"; import PropTypes from "prop-types"; -import { useHistory } from "react-router"; +import { useNavigate } from "react-router-dom"; import { useTable, usePagination } from "react-table"; import { useDispatch, useSelector } from "react-redux"; import { getComicBooks } from "../actions/fileops.actions"; @@ -27,9 +27,9 @@ export const Library = ({}: IComicBookLibraryProps): ReactElement => { collapsePageSizeDropdown(!isPageSizeDropdownCollapsed); // programatically navigate to comic detail - const history = useHistory(); + const navigate = useNavigate(); const navigateToComicDetail = (id) => { - history.push(`/comic/details/${id}`); + navigate(`/comic/details/${id}`); }; const ImportStatus = ({ value }) => { @@ -49,7 +49,7 @@ export const Library = ({}: IComicBookLibraryProps): ReactElement => { Header: "File Details", id: "fileDetails", accessor: (row) => - !isNil(row.rawFileDetails) + !isEmpty(row.rawFileDetails.cover) ? row.rawFileDetails : row.sourcedMetadata, Cell: ({ value }) => { @@ -102,7 +102,7 @@ export const Library = ({}: IComicBookLibraryProps): ReactElement => { accessor: "sourcedMetadata.comicvine", Cell(props) { return ( - !isNil(props.cell.value) && ( + !isEmpty(props.cell.value) && ( {props.cell.value.resource_type} @@ -189,7 +189,7 @@ export const Library = ({}: IComicBookLibraryProps): ReactElement => {

Library

- + {/* Search bar */}
diff --git a/src/client/index.tsx b/src/client/index.tsx index ed79691..f8bd66a 100644 --- a/src/client/index.tsx +++ b/src/client/index.tsx @@ -1,19 +1,17 @@ import React from "react"; import { render } from "react-dom"; -import { Provider } from "react-redux"; -import { ConnectedRouter } from "connected-react-router"; -import configureStore, { history } from "./store/index"; - +import { Provider, connect } from "react-redux"; +import { HistoryRouter as Router } from "redux-first-history/rr6"; +import { store, history } from "./store/index"; import App from "./components/App"; -const store = configureStore({}); const rootEl = document.getElementById("root"); render( - + - + , rootEl, ); diff --git a/src/client/reducers/airdcpp.reducer.ts b/src/client/reducers/airdcpp.reducer.ts index c9e43c9..73fecce 100644 --- a/src/client/reducers/airdcpp.reducer.ts +++ b/src/client/reducers/airdcpp.reducer.ts @@ -7,7 +7,7 @@ import { AIRDCPP_DOWNLOAD_PROGRESS_TICK, AIRDCPP_BUNDLES_FETCHED, } from "../constants/action-types"; -import { LOCATION_CHANGE } from "connected-react-router"; +import { LOCATION_CHANGE } from "redux-first-history"; import { difference } from "../shared/utils/object.utils"; const initialState = { diff --git a/src/client/reducers/comicinfo.reducer.js b/src/client/reducers/comicinfo.reducer.ts similarity index 98% rename from src/client/reducers/comicinfo.reducer.js rename to src/client/reducers/comicinfo.reducer.ts index 71dc21f..2a0ad72 100644 --- a/src/client/reducers/comicinfo.reducer.js +++ b/src/client/reducers/comicinfo.reducer.ts @@ -1,4 +1,4 @@ -import { isEmpty, pull } from "lodash"; +import { isEmpty } from "lodash"; import { CV_API_CALL_IN_PROGRESS, CV_SEARCH_SUCCESS, diff --git a/src/client/reducers/fileops.reducer.ts b/src/client/reducers/fileops.reducer.ts index c8af742..f44ebff 100644 --- a/src/client/reducers/fileops.reducer.ts +++ b/src/client/reducers/fileops.reducer.ts @@ -1,4 +1,4 @@ -import { LOCATION_CHANGE } from "connected-react-router"; +import { LOCATION_CHANGE } from "redux-first-history"; import { RMQ_SOCKET_CONNECTED, IMS_COMICBOOK_METADATA_FETCHED, diff --git a/src/client/reducers/index.js b/src/client/reducers/index.js index 49f61c0..a2f4d87 100644 --- a/src/client/reducers/index.js +++ b/src/client/reducers/index.js @@ -1,17 +1,13 @@ -import { combineReducers } from "redux"; -import { connectRouter } from "connected-react-router"; import comicinfoReducer from "../reducers/comicinfo.reducer"; import fileOpsReducer from "../reducers/fileops.reducer"; import airdcppReducer from "../reducers/airdcpp.reducer"; import settingsReducer from "../reducers/settings.reducer"; import { reducer as notifications } from "react-notification-system-redux"; -export default (history) => - combineReducers({ - notifications, - comicInfo: comicinfoReducer, - fileOps: fileOpsReducer, - airdcpp: airdcppReducer, - settings: settingsReducer, - router: connectRouter(history), - }); +export const reducers = { + notifications, + comicInfo: comicinfoReducer, + fileOps: fileOpsReducer, + airdcpp: airdcppReducer, + settings: settingsReducer, +}; diff --git a/src/client/store/index.ts b/src/client/store/index.ts index 7ad76a4..d5cee77 100644 --- a/src/client/store/index.ts +++ b/src/client/store/index.ts @@ -1,28 +1,32 @@ -import { routerMiddleware } from "connected-react-router"; -import { createStore, applyMiddleware, compose } from "redux"; +import { createStore, combineReducers, applyMiddleware } from "redux"; import { createBrowserHistory } from "history"; +import { composeWithDevTools } from "redux-devtools-extension"; import thunk from "redux-thunk"; -import createRootReducer from "../reducers"; +import { createReduxHistoryContext } from "redux-first-history"; +import { reducers } from "../reducers/index"; + import { io } from "socket.io-client"; import socketIoMiddleware from "redux-socket.io-middleware"; import { SOCKET_BASE_URI } from "../constants/endpoints"; - const socketConnection = io(SOCKET_BASE_URI, { transports: ["websocket"] }); -export const history = createBrowserHistory(); -const configureStore = (initialState) => { - const store = createStore( - createRootReducer(history), - initialState, - compose( - applyMiddleware( - socketIoMiddleware(socketConnection), - thunk, - routerMiddleware(history), - ), - // window.__REDUX_DEVTOOLS_EXTENSION__ && window.__REDUX_DEVTOOLS_EXTENSION__(), +const { createReduxHistory, routerMiddleware, routerReducer } = + createReduxHistoryContext({ + history: createBrowserHistory(), + }); + +export const store = createStore( + combineReducers({ + router: routerReducer, + ...reducers, + }), + composeWithDevTools( + applyMiddleware( + socketIoMiddleware(socketConnection), + thunk, + routerMiddleware, ), - ); - return store; -}; -export default configureStore; + // window.__REDUX_DEVTOOLS_EXTENSION__ && window.__REDUX_DEVTOOLS_EXTENSION__(), + ), +); +export const history = createReduxHistory(store); diff --git a/yarn.lock b/yarn.lock index 323ae23..df72222 100644 --- a/yarn.lock +++ b/yarn.lock @@ -990,7 +990,7 @@ core-js-pure "^3.20.2" regenerator-runtime "^0.13.4" -"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.10.0", "@babel/runtime@^7.10.2", "@babel/runtime@^7.12.0", "@babel/runtime@^7.12.1", "@babel/runtime@^7.12.13", "@babel/runtime@^7.13.10", "@babel/runtime@^7.13.17", "@babel/runtime@^7.15.4", "@babel/runtime@^7.16.3", "@babel/runtime@^7.16.5", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.2", "@babel/runtime@^7.7.6", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2": +"@babel/runtime@^7.0.0", "@babel/runtime@^7.10.0", "@babel/runtime@^7.10.2", "@babel/runtime@^7.12.0", "@babel/runtime@^7.12.1", "@babel/runtime@^7.13.10", "@babel/runtime@^7.13.17", "@babel/runtime@^7.15.4", "@babel/runtime@^7.16.3", "@babel/runtime@^7.16.5", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.6", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.16.7.tgz#03ff99f64106588c9c403c6ecb8c3bafbbdff1fa" integrity sha512-9E9FJowqAsytyOY6LG+1KuueckRL+aQW+mKvXRXnuFGyRAyepJPmEo9vgMfXUA6O9u3IeEdv9MAkppFcaQwogQ== @@ -1404,13 +1404,6 @@ "@types/yargs" "^15.0.0" chalk "^4.0.0" -"@mattiasbuelens/web-streams-polyfill@^0.2.0": - version "0.2.1" - resolved "https://registry.yarnpkg.com/@mattiasbuelens/web-streams-polyfill/-/web-streams-polyfill-0.2.1.tgz#d7c4aa94f98084ec0787be084d47167d62ea5f67" - integrity sha512-oKuFCQFa3W7Hj7zKn0+4ypI8JFm4ZKIoncwAC6wd5WwFW2sL7O1hpPoJdSWpynQ4DJ4lQ6MvFoVDmCLilonDFg== - dependencies: - "@types/whatwg-streams" "^0.0.7" - "@nicolo-ribaudo/chokidar-2@2.1.8-no-fsevents.3": version "2.1.8-no-fsevents.3" resolved "https://registry.yarnpkg.com/@nicolo-ribaudo/chokidar-2/-/chokidar-2-2.1.8-no-fsevents.3.tgz#323d72dd25103d0c4fbdce89dadf574a787b1f9b" @@ -1914,7 +1907,7 @@ dependencies: "@types/react" "*" -"@types/react-redux@^7.1.16", "@types/react-redux@^7.1.20": +"@types/react-redux@^7.1.16": version "7.1.22" resolved "https://registry.yarnpkg.com/@types/react-redux/-/react-redux-7.1.22.tgz#0eab76a37ef477cc4b53665aeaf29cb60631b72a" integrity sha512-GxIA1kM7ClU73I6wg9IRTVwSO9GS+SAKZKe0Enj+82HMU6aoESFU2HNAdNi3+J53IaOHPiUfT3kSG4L828joDQ== @@ -1924,6 +1917,16 @@ hoist-non-react-statics "^3.3.0" redux "^4.0.0" +"@types/react-redux@^7.1.20": + version "7.1.23" + resolved "https://registry.yarnpkg.com/@types/react-redux/-/react-redux-7.1.23.tgz#3c2bb1bcc698ae69d70735f33c5a8e95f41ac528" + integrity sha512-D02o3FPfqQlfu2WeEYwh3x2otYd2Dk1o8wAfsA0B1C2AJEFxE663Ozu7JzuWbznGgW248NaOF6wsqCGNq9d3qw== + dependencies: + "@types/hoist-non-react-statics" "^3.3.0" + "@types/react" "*" + hoist-non-react-statics "^3.3.0" + redux "^4.0.0" + "@types/react-router-dom@^5.1.7": version "5.3.2" resolved "https://registry.yarnpkg.com/@types/react-router-dom/-/react-router-dom-5.3.2.tgz#ebd8e145cf056db5c66eb1dac63c72f52e8542ee" @@ -2003,11 +2006,6 @@ resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.1.tgz#20f18294f797f2209b5f65c8e3b5c8e8261d127c" integrity sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw== -"@types/whatwg-streams@^0.0.7": - version "0.0.7" - resolved "https://registry.yarnpkg.com/@types/whatwg-streams/-/whatwg-streams-0.0.7.tgz#28bfe73dc850562296367249c4b32a50db81e9d3" - integrity sha512-6sDiSEP6DWcY2ZolsJ2s39ZmsoGQ7KVwBDI3sESQsEm9P2dHTcqnDIHRZFRNtLCzWp7hCFGqYbw5GyfpQnJ01A== - "@types/yargs-parser@*": version "20.2.1" resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-20.2.1.tgz#3b9ce2489919d9e4fea439b76916abc34b2df129" @@ -3863,11 +3861,6 @@ clone@^1.0.2: resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e" integrity sha1-2jCcwmPfFZlMaIypAheco8fNfH4= -clsx@^1.0.4: - version "1.1.1" - resolved "https://registry.yarnpkg.com/clsx/-/clsx-1.1.1.tgz#98b3134f9abbdf23b2663491ace13c5c03a73188" - integrity sha512-6/bPho624p3S2pMyvP5kKBPXnI3ufHLObBFCfgx+LkeR5lg2XYy2hqZqUf45ypD8COn2bhgGJSUE+l5dhNBieA== - cmd-shim@^4.0.1: version "4.1.0" resolved "https://registry.yarnpkg.com/cmd-shim/-/cmd-shim-4.1.0.tgz#b3a904a6743e9fede4148c6f3800bf2a08135bdd" @@ -4120,17 +4113,6 @@ connect-history-api-fallback@^1.6.0: resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz#8b32089359308d111115d81cad3fceab888f97bc" integrity sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg== -connected-react-router@^6.9.1: - version "6.9.2" - resolved "https://registry.yarnpkg.com/connected-react-router/-/connected-react-router-6.9.2.tgz#f89fa87f0e977fcabf17475fb4552e170cc7e48e" - integrity sha512-bE8kNBiZv9Mivp7pYn9JvLH5ItTjLl45kk1/Vha0rmAK9I/ETb5JPJrAm0h2KCG9qLfv7vqU3Jo4UUDo0oJnQg== - dependencies: - lodash.isequalwith "^4.4.0" - prop-types "^15.7.2" - optionalDependencies: - immutable "^3.8.1 || ^4.0.0" - seamless-immutable "^7.1.3" - console-control-strings@^1.0.0, console-control-strings@^1.1.0, console-control-strings@~1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e" @@ -4760,7 +4742,7 @@ dom-converter@^0.2.0: dependencies: utila "~0.4" -dom-helpers@^5.0.1, dom-helpers@^5.1.3: +dom-helpers@^5.0.1: version "5.2.1" resolved "https://registry.yarnpkg.com/dom-helpers/-/dom-helpers-5.2.1.tgz#d9400536b2bf8225ad98fe052e029451ac40e902" integrity sha512-nRCa7CK3VTrM2NmGkIy4cbK7IZlgBE/PYMn55rrXefr5xXDP0LdtfPnblFDoVdcAfslJ7or6iqAUnx0CCGIWQA== @@ -5748,11 +5730,6 @@ fd-slicer@~1.1.0: dependencies: pend "~1.2.0" -fetch-readablestream@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/fetch-readablestream/-/fetch-readablestream-0.2.0.tgz#eaa6d1a76b12de2d4731a343393c6ccdcfe2c795" - integrity sha512-qu4mXWf4wus4idBIN/kVH+XSer8IZ9CwHP+Pd7DL7TuKNC1hP7ykon4kkBjwJF3EMX2WsFp4hH7gU7CyL7ucXw== - file-entry-cache@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz#211b2dd9659cb0394b073e7323ac3c933d522027" @@ -6596,19 +6573,14 @@ he@^1.1.0, he@^1.2.0: resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f" integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw== -history@^4.9.0: - version "4.10.1" - resolved "https://registry.yarnpkg.com/history/-/history-4.10.1.tgz#33371a65e3a83b267434e2b3f3b1b4c58aad4cf3" - integrity sha512-36nwAD620w12kuzPAsyINPWJqlNbij+hpK1k9XRloDtym8mxzGYl2c17LnV6IAGB2Dmg4tEa7G7DlawS0+qjew== +history@^5.2.0: + version "5.3.0" + resolved "https://registry.yarnpkg.com/history/-/history-5.3.0.tgz#1548abaa245ba47992f063a0783db91ef201c73b" + integrity sha512-ZqaKwjjrAYUYfLG+htGaIIZ4nioX2L70ZUMIFysS3xvBsSG4x/n1V6TXV3N8ZYNuFGlDirFg32T7B6WOUPDYcQ== dependencies: - "@babel/runtime" "^7.1.2" - loose-envify "^1.2.0" - resolve-pathname "^3.0.0" - tiny-invariant "^1.0.2" - tiny-warning "^1.0.0" - value-equal "^1.0.1" + "@babel/runtime" "^7.7.6" -hoist-non-react-statics@^3.0.0, hoist-non-react-statics@^3.1.0, hoist-non-react-statics@^3.3.0, hoist-non-react-statics@^3.3.1, hoist-non-react-statics@^3.3.2: +hoist-non-react-statics@^3.0.0, hoist-non-react-statics@^3.3.0, hoist-non-react-statics@^3.3.1, hoist-non-react-statics@^3.3.2: version "3.3.2" resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz#ece0acaf71d62c2969c2ec59feff42a4b1a85b45" integrity sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw== @@ -6948,16 +6920,6 @@ imagemin@^7.0.1: p-pipe "^3.0.0" replace-ext "^1.0.0" -"immutable@^3.8.1 || ^4.0.0": - version "4.0.0" - resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.0.0.tgz#b86f78de6adef3608395efb269a91462797e2c23" - integrity sha512-zIE9hX70qew5qTUjSS7wi1iwj/l7+m54KWU247nhM3v806UdGj1yDndXj+IOYxxtW9zyLI+xqFNZjTuDaLUqFw== - -immutable@^3.8.2: - version "3.8.2" - resolved "https://registry.yarnpkg.com/immutable/-/immutable-3.8.2.tgz#c2439951455bb39913daf281376f1530e104adf3" - integrity sha1-wkOZUUVbs5kT2vKBN28VMOEErfM= - import-fresh@^3.0.0, import-fresh@^3.2.1: version "3.3.0" resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b" @@ -7541,11 +7503,6 @@ is-wsl@^2.2.0: dependencies: is-docker "^2.0.0" -isarray@0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf" - integrity sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8= - isarray@1.0.0, isarray@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" @@ -8568,11 +8525,6 @@ lodash.isequal@^4.5.0: resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0" integrity sha1-QVxEePK8wwEgwizhDtMib30+GOA= -lodash.isequalwith@^4.4.0: - version "4.4.0" - resolved "https://registry.yarnpkg.com/lodash.isequalwith/-/lodash.isequalwith-4.4.0.tgz#266726ddd528f854f21f4ea98a065606e0fbc6b0" - integrity sha1-Jmcm3dUo+FTyH06pigZWBuD7xrA= - lodash.merge@^4.6.2: version "4.6.2" resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a" @@ -8613,7 +8565,7 @@ longest@^1.0.1: resolved "https://registry.yarnpkg.com/longest/-/longest-1.0.1.tgz#30a0b2da38f73770e8294a0d22e6625ed77d0097" integrity sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc= -loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.2.0, loose-envify@^1.3.1, loose-envify@^1.4.0: +loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.3.1, loose-envify@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf" integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q== @@ -8912,14 +8864,6 @@ min-indent@^1.0.0: resolved "https://registry.yarnpkg.com/min-indent/-/min-indent-1.0.1.tgz#a63f681673b30571fbe8bc25686ae746eefa9869" integrity sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg== -mini-create-react-context@^0.4.0: - version "0.4.1" - resolved "https://registry.yarnpkg.com/mini-create-react-context/-/mini-create-react-context-0.4.1.tgz#072171561bfdc922da08a60c2197a497cc2d1d5e" - integrity sha512-YWCYEmd5CQeHGSAKrYvXgmzzkrvssZcuuQDDeqkT+PziKGMgE+0MCCtcKbROzocGBG1meBLl2FotlRwf4gAzbQ== - dependencies: - "@babel/runtime" "^7.12.1" - tiny-warning "^1.0.3" - mini-css-extract-plugin@^1.4.1: version "1.6.2" resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-1.6.2.tgz#83172b4fd812f8fc4a09d6f6d16f924f53990ca8" @@ -9017,11 +8961,6 @@ minizlib@^2.0.0, minizlib@^2.1.1: minipass "^3.0.0" yallist "^4.0.0" -mitt@^1.1.2: - version "1.2.0" - resolved "https://registry.yarnpkg.com/mitt/-/mitt-1.2.0.tgz#cb24e6569c806e31bd4e3995787fe38a04fdf90d" - integrity sha512-r6lj77KlwqLhIUku9UWYes7KJtsczvolZkzp8hbaDPPaE24OmWl5s539Mytlj22siEQKosZ26qCBgda2PKwoJw== - mixin-deep@^1.2.0: version "1.3.2" resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.2.tgz#1120b43dc359a785dce65b55b82e257ccf479566" @@ -10144,13 +10083,6 @@ path-to-regexp@0.1.7: resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c" integrity sha1-32BBeABfUi8V60SQ5yR6G/qmf4w= -path-to-regexp@^1.7.0: - version "1.8.0" - resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-1.8.0.tgz#887b3ba9d84393e87a0a0b9f4cb756198b53548a" - integrity sha512-n43JRhlUKUAlibEJhPeir1ncUID16QnEjNpwzNdO3Lm4ywrBpBZ5oLD0I6br9evr1Y9JTqwRtAh7JLoOzAQdVA== - dependencies: - isarray "0.0.1" - path-type@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b" @@ -10887,7 +10819,7 @@ react-docgen@^5.3.0: node-dir "^0.1.10" strip-indent "^3.0.0" -react-dom@^17.0.1: +react-dom@^17.0.2: version "17.0.2" resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-17.0.2.tgz#ecffb6845e3ad8dbfcdc498f0d0a939736502c23" integrity sha512-s4h96KtLDUQlsENhMn1ar8t2bEa+q/YAtj8pPPdIjPDGBDIVNsrD9aXNWqspUe6AzKCIG0C1HZZLqLV7qpOBGA== @@ -10939,7 +10871,7 @@ react-is-mounted-hook@^1.1.2: resolved "https://registry.yarnpkg.com/react-is-mounted-hook/-/react-is-mounted-hook-1.1.2.tgz#0e57d237c0ed60f6a8dc0520634608a80ae864ff" integrity sha512-yjq3Tj34CiFcdVOS/h6JerWLOLdJqEGKMNpTHc4kWebzz2YtIpgqMRrqxdmQhewM1KJREojdAV2tsNvBsUWyhA== -react-is@^16.13.1, react-is@^16.6.0, react-is@^16.7.0: +react-is@^16.13.1, react-is@^16.7.0: version "16.13.1" resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4" integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ== @@ -10949,21 +10881,6 @@ react-is@^17.0.1, react-is@^17.0.2: resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.2.tgz#e691d4a8e9c789365655539ab372762b0efb54f0" integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w== -react-lazylog@^4.5.3: - version "4.5.3" - resolved "https://registry.yarnpkg.com/react-lazylog/-/react-lazylog-4.5.3.tgz#289e24995b5599e75943556ac63f5e2c04d0001e" - integrity sha512-lyov32A/4BqihgXgtNXTHCajXSXkYHPlIEmV8RbYjHIMxCFSnmtdg4kDCI3vATz7dURtiFTvrw5yonHnrS+NNg== - dependencies: - "@mattiasbuelens/web-streams-polyfill" "^0.2.0" - fetch-readablestream "^0.2.0" - immutable "^3.8.2" - mitt "^1.1.2" - prop-types "^15.6.1" - react-string-replace "^0.4.1" - react-virtualized "^9.21.0" - text-encoding-utf-8 "^1.0.1" - whatwg-fetch "^2.0.4" - react-lifecycles-compat@^3.0.0, react-lifecycles-compat@^3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz#4f1a273afdfc8f3488a8c516bfda78f872352362" @@ -11029,7 +10946,7 @@ react-popper@^2.2.5: react-fast-compare "^3.0.1" warning "^4.0.2" -react-redux@^7.2.3: +react-redux@^7.2.6: version "7.2.6" resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-7.2.6.tgz#49633a24fe552b5f9caf58feb8a138936ddfe9aa" integrity sha512-10RPdsz0UUrRL1NZE0ejTkucnclYSgXp5q+tB5SWx2qeG2ZJQJyymgAhwKy73yiL/13btfB6fPr+rgbMAaZIAQ== @@ -11041,34 +10958,20 @@ react-redux@^7.2.3: prop-types "^15.7.2" react-is "^17.0.2" -react-router-dom@^5.2.0: - version "5.3.0" - resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-5.3.0.tgz#da1bfb535a0e89a712a93b97dd76f47ad1f32363" - integrity sha512-ObVBLjUZsphUUMVycibxgMdh5jJ1e3o+KpAZBVeHcNQZ4W+uUGGWsokurzlF4YOldQYRQL4y6yFRWM4m3svmuQ== +react-router-dom@^6.2.2: + version "6.2.2" + resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-6.2.2.tgz#f1a2c88365593c76b9612ae80154a13fcb72e442" + integrity sha512-AtYEsAST7bDD4dLSQHDnk/qxWLJdad5t1HFa1qJyUrCeGgEuCSw0VB/27ARbF9Fi/W5598ujvJOm3ujUCVzuYQ== dependencies: - "@babel/runtime" "^7.12.13" - history "^4.9.0" - loose-envify "^1.3.1" - prop-types "^15.6.2" - react-router "5.2.1" - tiny-invariant "^1.0.2" - tiny-warning "^1.0.0" + history "^5.2.0" + react-router "6.2.2" -react-router@5.2.1, react-router@^5.2.0: - version "5.2.1" - resolved "https://registry.yarnpkg.com/react-router/-/react-router-5.2.1.tgz#4d2e4e9d5ae9425091845b8dbc6d9d276239774d" - integrity sha512-lIboRiOtDLFdg1VTemMwud9vRVuOCZmUIT/7lUoZiSpPODiiH1UQlfXy+vPLC/7IWdFYnhRwAyNqA/+I7wnvKQ== +react-router@6.2.2, react-router@^6.2.2: + version "6.2.2" + resolved "https://registry.yarnpkg.com/react-router/-/react-router-6.2.2.tgz#495e683a0c04461eeb3d705fe445d6cf42f0c249" + integrity sha512-/MbxyLzd7Q7amp4gDOGaYvXwhEojkJD5BtExkuKmj39VEE0m3l/zipf6h2WIB2jyAO0lI6NGETh4RDcktRm4AQ== dependencies: - "@babel/runtime" "^7.12.13" - history "^4.9.0" - hoist-non-react-statics "^3.1.0" - loose-envify "^1.3.1" - mini-create-react-context "^0.4.0" - path-to-regexp "^1.7.0" - prop-types "^15.6.2" - react-is "^16.6.0" - tiny-invariant "^1.0.2" - tiny-warning "^1.0.0" + history "^5.2.0" react-select-async-paginate@^0.6.1: version "0.6.1" @@ -11123,13 +11026,6 @@ react-stickynode@^4.0.0: shallowequal "^1.0.0" subscribe-ui-event "^2.0.6" -react-string-replace@^0.4.1: - version "0.4.4" - resolved "https://registry.yarnpkg.com/react-string-replace/-/react-string-replace-0.4.4.tgz#24006fbe0db573d5be583133df38b1a735cb4225" - integrity sha512-FAMkhxmDpCsGTwTZg7p/2v+/GTmxAp73so3fbSvlAcBBX36ujiGRNEaM/1u+jiYQrArhns+7eE92g2pi5E5FUA== - dependencies: - lodash "^4.17.4" - react-table@^7.7.0: version "7.7.0" resolved "https://registry.yarnpkg.com/react-table/-/react-table-7.7.0.tgz#e2ce14d7fe3a559f7444e9ecfe8231ea8373f912" @@ -11154,18 +11050,6 @@ react-transition-group@^4.3.0: loose-envify "^1.4.0" prop-types "^15.6.2" -react-virtualized@^9.21.0: - version "9.22.3" - resolved "https://registry.yarnpkg.com/react-virtualized/-/react-virtualized-9.22.3.tgz#f430f16beb0a42db420dbd4d340403c0de334421" - integrity sha512-MKovKMxWTcwPSxE1kK1HcheQTWfuCxAuBoSTf2gwyMM21NdX/PXUhnoP8Uc5dRKd+nKm8v41R36OellhdCpkrw== - dependencies: - "@babel/runtime" "^7.7.2" - clsx "^1.0.4" - dom-helpers "^5.1.3" - loose-envify "^1.4.0" - prop-types "^15.7.2" - react-lifecycles-compat "^3.0.4" - react-window-dynamic-list@^2.3.5: version "2.4.2" resolved "https://registry.yarnpkg.com/react-window-dynamic-list/-/react-window-dynamic-list-2.4.2.tgz#e9cabcd067cb066619613af00f5dd42bca9f4b19" @@ -11183,7 +11067,7 @@ react-window@^1.8.5: "@babel/runtime" "^7.0.0" memoize-one ">=3.1.1 <6" -react@^17.0.1: +react@^17.0.2: version "17.0.2" resolved "https://registry.yarnpkg.com/react/-/react-17.0.2.tgz#d0b5cc516d29eb3eee383f75b62864cfb6800037" integrity sha512-gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA== @@ -11322,12 +11206,22 @@ redent@^3.0.0: indent-string "^4.0.0" strip-indent "^3.0.0" +redux-devtools-extension@^2.13.9: + version "2.13.9" + resolved "https://registry.yarnpkg.com/redux-devtools-extension/-/redux-devtools-extension-2.13.9.tgz#6b764e8028b507adcb75a1cae790f71e6be08ae7" + integrity sha512-cNJ8Q/EtjhQaZ71c8I9+BPySIBVEKssbPpskBfsXqb8HJ002A3KRVHfeRzwRo6mGPqsm7XuHTqNSNeS1Khig0A== + +redux-first-history@^5.0.8: + version "5.0.8" + resolved "https://registry.yarnpkg.com/redux-first-history/-/redux-first-history-5.0.8.tgz#672ccee4837f2453d071f8e4c9e47137bc293152" + integrity sha512-JwTKQwEiIxhRk0g234+GlSQtiAUBcBOeHZJvY2YEFMO80ANTHme16Ip2a998hkhzGtKJxUKragOCUiGaTiwOHw== + redux-socket.io-middleware@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/redux-socket.io-middleware/-/redux-socket.io-middleware-1.0.4.tgz#5ab34821629383889fe871525d8c257f8416910b" integrity sha1-WrNIIWKTg4if6HFSXYwlf4QWkQs= -redux-thunk@^2.3.0: +redux-thunk@^2.4.1: version "2.4.1" resolved "https://registry.yarnpkg.com/redux-thunk/-/redux-thunk-2.4.1.tgz#0dd8042cf47868f4b29699941de03c9301a75714" integrity sha512-OOYGNY5Jy2TWvTL1KgAlVy6dcx3siPJ1wTq741EPyUKfn6W6nChdICjZwCd0p8AZBs5kWpZlbkXW2nE/zjUa+Q== @@ -11587,11 +11481,6 @@ resolve-from@^5.0.0: resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69" integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw== -resolve-pathname@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/resolve-pathname/-/resolve-pathname-3.0.0.tgz#99d02224d3cf263689becbb393bc560313025dcd" - integrity sha512-C7rARubxI8bXFNB/hqcp/4iUeIXJhJZvFPFPiSPRnhU5UPxzMFIl+2E6yY6c4k9giDJAhtV+enfA+G89N6Csng== - resolve-url@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a" @@ -11804,11 +11693,6 @@ scss-tokenizer@^0.3.0: js-base64 "^2.4.3" source-map "^0.7.1" -seamless-immutable@^7.1.3: - version "7.1.4" - resolved "https://registry.yarnpkg.com/seamless-immutable/-/seamless-immutable-7.1.4.tgz#6e9536def083ddc4dea0207d722e0e80d0f372f8" - integrity sha512-XiUO1QP4ki4E2PHegiGAlu6r82o5A+6tRh7IkGGTVg/h+UoeX4nFBeCGPOhb4CYjvkqsfm/TUtvOMYC1xmV30A== - seek-bzip@^1.0.5: version "1.0.6" resolved "https://registry.yarnpkg.com/seek-bzip/-/seek-bzip-1.0.6.tgz#35c4171f55a680916b52a07859ecf3b5857f21c4" @@ -12893,11 +12777,6 @@ test-exclude@^6.0.0: glob "^7.1.4" minimatch "^3.0.4" -text-encoding-utf-8@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/text-encoding-utf-8/-/text-encoding-utf-8-1.0.2.tgz#585b62197b0ae437e3c7b5d0af27ac1021e10d13" - integrity sha512-8bw4MY9WjdsD2aMtO0OzOCY3pXGYNx2d2FfHRVUKkiCPDWjKuOlhLVASS+pD7VkLTVjW268LYJHwsnPFlBpbAg== - text-table@^0.2.0, text-table@~0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" @@ -12930,21 +12809,11 @@ timed-out@^4.0.0, timed-out@^4.0.1: resolved "https://registry.yarnpkg.com/timed-out/-/timed-out-4.0.1.tgz#f32eacac5a175bea25d7fab565ab3ed8741ef56f" integrity sha1-8y6srFoXW+ol1/q1Zas+2HQe9W8= -tiny-invariant@^1.0.2: - version "1.2.0" - resolved "https://registry.yarnpkg.com/tiny-invariant/-/tiny-invariant-1.2.0.tgz#a1141f86b672a9148c72e978a19a73b9b94a15a9" - integrity sha512-1Uhn/aqw5C6RI4KejVeTg6mIS7IqxnLJ8Mv2tV5rTc0qWobay7pDUz6Wi392Cnc8ak1H0F2cjoRzb2/AW4+Fvg== - tiny-relative-date@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/tiny-relative-date/-/tiny-relative-date-1.3.0.tgz#fa08aad501ed730f31cc043181d995c39a935e07" integrity sha512-MOQHpzllWxDCHHaDno30hhLfbouoYlOI8YlMNtvKe1zXbjEVhbcEovQxvZrPvtiYW630GQDoMMarCnjfyfHA+A== -tiny-warning@^1.0.0, tiny-warning@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/tiny-warning/-/tiny-warning-1.0.3.tgz#94a30db453df4c643d0fd566060d60a875d84754" - integrity sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA== - tmpl@1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.5.tgz#8683e0b902bb9c20c4f726e3c0b69f36518c07cc" @@ -13571,11 +13440,6 @@ validate-npm-package-name@^3.0.0, validate-npm-package-name@~3.0.0: dependencies: builtins "^1.0.3" -value-equal@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/value-equal/-/value-equal-1.0.1.tgz#1e0b794c734c5c0cade179c437d356d931a34d6c" - integrity sha512-NOJ6JZCAWr0zlxZt+xqCHNTEKOsrks2HQd4MqhP1qy4z1SkbEP467eNx6TgDKXMvUOb+OENfJCZwM+16n7fRfw== - vary@^1, vary@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc" @@ -13881,11 +13745,6 @@ whatwg-encoding@^1.0.5: dependencies: iconv-lite "0.4.24" -whatwg-fetch@^2.0.4: - version "2.0.4" - resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-2.0.4.tgz#dde6a5df315f9d39991aa17621853d720b85566f" - integrity sha512-dcQ1GWpOD/eEQ97k66aiEVpNnapVj90/+R+SXTPYGHpYBBypfKJEQjLrvMZ7YXbKm21gXd4NcuxUTjiv1YtLng== - whatwg-mimetype@^2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz#3d4b1e0312d2079879f826aff18dbeeca5960fbf"