diff --git a/lavamoat/browserify/beta/policy.json b/lavamoat/browserify/beta/policy.json
index 70552b0d32a7..380e38cd7a63 100644
--- a/lavamoat/browserify/beta/policy.json
+++ b/lavamoat/browserify/beta/policy.json
@@ -4509,6 +4509,14 @@
"define": true
}
},
+ "history": {
+ "globals": {
+ "console": true,
+ "define": true,
+ "document.defaultView": true,
+ "document.querySelector": true
+ }
+ },
"https-browserify": {
"packages": {
"browserify>url": true,
@@ -5086,37 +5094,59 @@
"react-router-dom>tiny-warning": true
}
},
- "react-router-dom>history": {
+ "react-router-dom-v5-compat": {
"globals": {
+ "FormData": true,
+ "URL": true,
+ "URLSearchParams": true,
+ "__reactRouterVersion": "write",
"addEventListener": true,
"confirm": true,
+ "define": true,
"document": true,
- "history": true,
- "location": true,
- "navigator.userAgent": true,
- "removeEventListener": true
+ "history.scrollRestoration": true,
+ "location.href": true,
+ "removeEventListener": true,
+ "scrollTo": true,
+ "scrollY": true,
+ "sessionStorage.getItem": true,
+ "sessionStorage.setItem": true,
+ "setTimeout": true
},
"packages": {
- "react-router-dom>history>resolve-pathname": true,
- "react-router-dom>history>value-equal": true,
- "react-router-dom>tiny-invariant": true,
- "react-router-dom>tiny-warning": true
+ "history": true,
+ "react": true,
+ "react-dom": true,
+ "react-router-dom": true,
+ "react-router-dom-v5-compat>@remix-run/router": true,
+ "react-router-dom-v5-compat>react-router": true
}
},
- "react-router-dom>react-router": {
+ "react-router-dom-v5-compat>@remix-run/router": {
+ "globals": {
+ "AbortController": true,
+ "DOMException": true,
+ "FormData": true,
+ "Headers": true,
+ "Request": true,
+ "Response": true,
+ "URL": true,
+ "URLSearchParams": true,
+ "console": true,
+ "document.defaultView": true
+ }
+ },
+ "react-router-dom-v5-compat>react-router": {
+ "globals": {
+ "console.error": true,
+ "define": true
+ },
"packages": {
- "prop-types": true,
- "prop-types>react-is": true,
"react": true,
- "react-redux>hoist-non-react-statics": true,
- "react-router-dom>react-router>history": true,
- "react-router-dom>react-router>mini-create-react-context": true,
- "react-router-dom>tiny-invariant": true,
- "react-router-dom>tiny-warning": true,
- "serve-handler>path-to-regexp": true
+ "react-router-dom-v5-compat>@remix-run/router": true
}
},
- "react-router-dom>react-router>history": {
+ "react-router-dom>history": {
"globals": {
"addEventListener": true,
"confirm": true,
@@ -5133,13 +5163,16 @@
"react-router-dom>tiny-warning": true
}
},
- "react-router-dom>react-router>mini-create-react-context": {
+ "react-router-dom>react-router": {
"packages": {
- "@babel/runtime": true,
"prop-types": true,
+ "prop-types>react-is": true,
"react": true,
- "react-router-dom>react-router>mini-create-react-context>gud": true,
- "react-router-dom>tiny-warning": true
+ "react-redux>hoist-non-react-statics": true,
+ "react-router-dom>history": true,
+ "react-router-dom>tiny-invariant": true,
+ "react-router-dom>tiny-warning": true,
+ "serve-handler>path-to-regexp": true
}
},
"react-router-dom>tiny-warning": {
diff --git a/lavamoat/browserify/flask/policy.json b/lavamoat/browserify/flask/policy.json
index 70552b0d32a7..380e38cd7a63 100644
--- a/lavamoat/browserify/flask/policy.json
+++ b/lavamoat/browserify/flask/policy.json
@@ -4509,6 +4509,14 @@
"define": true
}
},
+ "history": {
+ "globals": {
+ "console": true,
+ "define": true,
+ "document.defaultView": true,
+ "document.querySelector": true
+ }
+ },
"https-browserify": {
"packages": {
"browserify>url": true,
@@ -5086,37 +5094,59 @@
"react-router-dom>tiny-warning": true
}
},
- "react-router-dom>history": {
+ "react-router-dom-v5-compat": {
"globals": {
+ "FormData": true,
+ "URL": true,
+ "URLSearchParams": true,
+ "__reactRouterVersion": "write",
"addEventListener": true,
"confirm": true,
+ "define": true,
"document": true,
- "history": true,
- "location": true,
- "navigator.userAgent": true,
- "removeEventListener": true
+ "history.scrollRestoration": true,
+ "location.href": true,
+ "removeEventListener": true,
+ "scrollTo": true,
+ "scrollY": true,
+ "sessionStorage.getItem": true,
+ "sessionStorage.setItem": true,
+ "setTimeout": true
},
"packages": {
- "react-router-dom>history>resolve-pathname": true,
- "react-router-dom>history>value-equal": true,
- "react-router-dom>tiny-invariant": true,
- "react-router-dom>tiny-warning": true
+ "history": true,
+ "react": true,
+ "react-dom": true,
+ "react-router-dom": true,
+ "react-router-dom-v5-compat>@remix-run/router": true,
+ "react-router-dom-v5-compat>react-router": true
}
},
- "react-router-dom>react-router": {
+ "react-router-dom-v5-compat>@remix-run/router": {
+ "globals": {
+ "AbortController": true,
+ "DOMException": true,
+ "FormData": true,
+ "Headers": true,
+ "Request": true,
+ "Response": true,
+ "URL": true,
+ "URLSearchParams": true,
+ "console": true,
+ "document.defaultView": true
+ }
+ },
+ "react-router-dom-v5-compat>react-router": {
+ "globals": {
+ "console.error": true,
+ "define": true
+ },
"packages": {
- "prop-types": true,
- "prop-types>react-is": true,
"react": true,
- "react-redux>hoist-non-react-statics": true,
- "react-router-dom>react-router>history": true,
- "react-router-dom>react-router>mini-create-react-context": true,
- "react-router-dom>tiny-invariant": true,
- "react-router-dom>tiny-warning": true,
- "serve-handler>path-to-regexp": true
+ "react-router-dom-v5-compat>@remix-run/router": true
}
},
- "react-router-dom>react-router>history": {
+ "react-router-dom>history": {
"globals": {
"addEventListener": true,
"confirm": true,
@@ -5133,13 +5163,16 @@
"react-router-dom>tiny-warning": true
}
},
- "react-router-dom>react-router>mini-create-react-context": {
+ "react-router-dom>react-router": {
"packages": {
- "@babel/runtime": true,
"prop-types": true,
+ "prop-types>react-is": true,
"react": true,
- "react-router-dom>react-router>mini-create-react-context>gud": true,
- "react-router-dom>tiny-warning": true
+ "react-redux>hoist-non-react-statics": true,
+ "react-router-dom>history": true,
+ "react-router-dom>tiny-invariant": true,
+ "react-router-dom>tiny-warning": true,
+ "serve-handler>path-to-regexp": true
}
},
"react-router-dom>tiny-warning": {
diff --git a/lavamoat/browserify/main/policy.json b/lavamoat/browserify/main/policy.json
index 70552b0d32a7..380e38cd7a63 100644
--- a/lavamoat/browserify/main/policy.json
+++ b/lavamoat/browserify/main/policy.json
@@ -4509,6 +4509,14 @@
"define": true
}
},
+ "history": {
+ "globals": {
+ "console": true,
+ "define": true,
+ "document.defaultView": true,
+ "document.querySelector": true
+ }
+ },
"https-browserify": {
"packages": {
"browserify>url": true,
@@ -5086,37 +5094,59 @@
"react-router-dom>tiny-warning": true
}
},
- "react-router-dom>history": {
+ "react-router-dom-v5-compat": {
"globals": {
+ "FormData": true,
+ "URL": true,
+ "URLSearchParams": true,
+ "__reactRouterVersion": "write",
"addEventListener": true,
"confirm": true,
+ "define": true,
"document": true,
- "history": true,
- "location": true,
- "navigator.userAgent": true,
- "removeEventListener": true
+ "history.scrollRestoration": true,
+ "location.href": true,
+ "removeEventListener": true,
+ "scrollTo": true,
+ "scrollY": true,
+ "sessionStorage.getItem": true,
+ "sessionStorage.setItem": true,
+ "setTimeout": true
},
"packages": {
- "react-router-dom>history>resolve-pathname": true,
- "react-router-dom>history>value-equal": true,
- "react-router-dom>tiny-invariant": true,
- "react-router-dom>tiny-warning": true
+ "history": true,
+ "react": true,
+ "react-dom": true,
+ "react-router-dom": true,
+ "react-router-dom-v5-compat>@remix-run/router": true,
+ "react-router-dom-v5-compat>react-router": true
}
},
- "react-router-dom>react-router": {
+ "react-router-dom-v5-compat>@remix-run/router": {
+ "globals": {
+ "AbortController": true,
+ "DOMException": true,
+ "FormData": true,
+ "Headers": true,
+ "Request": true,
+ "Response": true,
+ "URL": true,
+ "URLSearchParams": true,
+ "console": true,
+ "document.defaultView": true
+ }
+ },
+ "react-router-dom-v5-compat>react-router": {
+ "globals": {
+ "console.error": true,
+ "define": true
+ },
"packages": {
- "prop-types": true,
- "prop-types>react-is": true,
"react": true,
- "react-redux>hoist-non-react-statics": true,
- "react-router-dom>react-router>history": true,
- "react-router-dom>react-router>mini-create-react-context": true,
- "react-router-dom>tiny-invariant": true,
- "react-router-dom>tiny-warning": true,
- "serve-handler>path-to-regexp": true
+ "react-router-dom-v5-compat>@remix-run/router": true
}
},
- "react-router-dom>react-router>history": {
+ "react-router-dom>history": {
"globals": {
"addEventListener": true,
"confirm": true,
@@ -5133,13 +5163,16 @@
"react-router-dom>tiny-warning": true
}
},
- "react-router-dom>react-router>mini-create-react-context": {
+ "react-router-dom>react-router": {
"packages": {
- "@babel/runtime": true,
"prop-types": true,
+ "prop-types>react-is": true,
"react": true,
- "react-router-dom>react-router>mini-create-react-context>gud": true,
- "react-router-dom>tiny-warning": true
+ "react-redux>hoist-non-react-statics": true,
+ "react-router-dom>history": true,
+ "react-router-dom>tiny-invariant": true,
+ "react-router-dom>tiny-warning": true,
+ "serve-handler>path-to-regexp": true
}
},
"react-router-dom>tiny-warning": {
diff --git a/lavamoat/browserify/mmi/policy.json b/lavamoat/browserify/mmi/policy.json
index 2116f0a1a7c8..576041b08cfb 100644
--- a/lavamoat/browserify/mmi/policy.json
+++ b/lavamoat/browserify/mmi/policy.json
@@ -4601,6 +4601,14 @@
"define": true
}
},
+ "history": {
+ "globals": {
+ "console": true,
+ "define": true,
+ "document.defaultView": true,
+ "document.querySelector": true
+ }
+ },
"https-browserify": {
"packages": {
"browserify>url": true,
@@ -5154,37 +5162,59 @@
"react-router-dom>tiny-warning": true
}
},
- "react-router-dom>history": {
+ "react-router-dom-v5-compat": {
"globals": {
+ "FormData": true,
+ "URL": true,
+ "URLSearchParams": true,
+ "__reactRouterVersion": "write",
"addEventListener": true,
"confirm": true,
+ "define": true,
"document": true,
- "history": true,
- "location": true,
- "navigator.userAgent": true,
- "removeEventListener": true
+ "history.scrollRestoration": true,
+ "location.href": true,
+ "removeEventListener": true,
+ "scrollTo": true,
+ "scrollY": true,
+ "sessionStorage.getItem": true,
+ "sessionStorage.setItem": true,
+ "setTimeout": true
},
"packages": {
- "react-router-dom>history>resolve-pathname": true,
- "react-router-dom>history>value-equal": true,
- "react-router-dom>tiny-invariant": true,
- "react-router-dom>tiny-warning": true
+ "history": true,
+ "react": true,
+ "react-dom": true,
+ "react-router-dom": true,
+ "react-router-dom-v5-compat>@remix-run/router": true,
+ "react-router-dom-v5-compat>react-router": true
}
},
- "react-router-dom>react-router": {
+ "react-router-dom-v5-compat>@remix-run/router": {
+ "globals": {
+ "AbortController": true,
+ "DOMException": true,
+ "FormData": true,
+ "Headers": true,
+ "Request": true,
+ "Response": true,
+ "URL": true,
+ "URLSearchParams": true,
+ "console": true,
+ "document.defaultView": true
+ }
+ },
+ "react-router-dom-v5-compat>react-router": {
+ "globals": {
+ "console.error": true,
+ "define": true
+ },
"packages": {
- "prop-types": true,
- "prop-types>react-is": true,
"react": true,
- "react-redux>hoist-non-react-statics": true,
- "react-router-dom>react-router>history": true,
- "react-router-dom>react-router>mini-create-react-context": true,
- "react-router-dom>tiny-invariant": true,
- "react-router-dom>tiny-warning": true,
- "serve-handler>path-to-regexp": true
+ "react-router-dom-v5-compat>@remix-run/router": true
}
},
- "react-router-dom>react-router>history": {
+ "react-router-dom>history": {
"globals": {
"addEventListener": true,
"confirm": true,
@@ -5201,13 +5231,16 @@
"react-router-dom>tiny-warning": true
}
},
- "react-router-dom>react-router>mini-create-react-context": {
+ "react-router-dom>react-router": {
"packages": {
- "@babel/runtime": true,
"prop-types": true,
+ "prop-types>react-is": true,
"react": true,
- "react-router-dom>react-router>mini-create-react-context>gud": true,
- "react-router-dom>tiny-warning": true
+ "react-redux>hoist-non-react-statics": true,
+ "react-router-dom>history": true,
+ "react-router-dom>tiny-invariant": true,
+ "react-router-dom>tiny-warning": true,
+ "serve-handler>path-to-regexp": true
}
},
"react-router-dom>tiny-warning": {
diff --git a/package.json b/package.json
index 238f1c6c0c95..6f378c0ee6a7 100644
--- a/package.json
+++ b/package.json
@@ -397,6 +397,7 @@
"fast-json-patch": "^3.1.1",
"fuse.js": "^3.2.0",
"he": "^1.2.0",
+ "history": "^5.3.0",
"human-standard-token-abi": "^2.0.0",
"immer": "^9.0.6",
"is-retry-allowed": "^2.2.0",
@@ -426,7 +427,8 @@
"react-popper": "^2.2.3",
"react-redux": "^7.2.9",
"react-responsive-carousel": "^3.2.21",
- "react-router-dom": "^5.1.2",
+ "react-router-dom": "^5.3.4",
+ "react-router-dom-v5-compat": "^6.26.2",
"react-simple-file-input": "^2.0.0",
"react-tippy": "^1.2.2",
"react-toggle-button": "^2.2.0",
@@ -603,7 +605,6 @@
"gulp-stylelint": "^13.0.0",
"gulp-watch": "^5.0.1",
"gulp-zip": "^5.1.0",
- "history": "^5.0.0",
"html-bundler-webpack-plugin": "^3.17.3",
"https-browserify": "^1.0.0",
"husky": "^8.0.3",
diff --git a/ui/components/app/assets/nfts/nft-details/nft-full-image.tsx b/ui/components/app/assets/nfts/nft-details/nft-full-image.tsx
index 64e2a3191c0e..42b4ddacbf95 100644
--- a/ui/components/app/assets/nfts/nft-details/nft-full-image.tsx
+++ b/ui/components/app/assets/nfts/nft-details/nft-full-image.tsx
@@ -30,6 +30,7 @@ export default function NftFullImage() {
const nfts = useSelector(getNfts);
const nft = nfts.find(
({ address, tokenId }: { address: string; tokenId: string }) =>
+ // @ts-expect-error TODO: Fix this type error by handling undefined parameters
isEqualCaseInsensitive(address, asset) && id === tokenId.toString(),
);
diff --git a/ui/components/multichain/account-list-menu/account-list-menu.test.tsx b/ui/components/multichain/account-list-menu/account-list-menu.test.tsx
index 0f6b64f557f2..7a849577dfa4 100644
--- a/ui/components/multichain/account-list-menu/account-list-menu.test.tsx
+++ b/ui/components/multichain/account-list-menu/account-list-menu.test.tsx
@@ -105,7 +105,6 @@ describe('AccountListMenu', () => {
jest
.spyOn(reactRouterDom, 'useHistory')
.mockImplementation()
- // @ts-expect-error mocking history return
.mockReturnValue({ push: historyPushMock });
});
diff --git a/ui/components/multichain/pages/connections/connections.test.tsx b/ui/components/multichain/pages/connections/connections.test.tsx
index a9b37e585ae3..0840e3a2f9ed 100644
--- a/ui/components/multichain/pages/connections/connections.test.tsx
+++ b/ui/components/multichain/pages/connections/connections.test.tsx
@@ -1,13 +1,12 @@
import React from 'react';
-import { Router, Route } from 'react-router-dom'; // Import Router and Route
-import { createMemoryHistory } from 'history';
+import { MemoryRouter, Route } from 'react-router-dom';
+import mockState from '../../../../../test/data/mock-state.json';
import {
fireEvent,
renderWithProvider,
waitFor,
} from '../../../../../test/jest';
import configureStore from '../../../../store/store';
-import mockState from '../../../../../test/data/mock-state.json';
import { Connections } from './connections';
describe('Connections Content', () => {
@@ -88,15 +87,14 @@ describe('Connections Content', () => {
});
it('should render correctly', () => {
- const history = createMemoryHistory();
- history.push('/connect/https%3A%2F%2Fmetamask.github.io');
-
const { container, getByTestId } = renderWithProvider(
-
+
- ,
+ ,
connectedStore,
);
expect(container).toMatchSnapshot();
@@ -104,30 +102,28 @@ describe('Connections Content', () => {
});
it('it should render Disconnect all Account button of the page', () => {
- const history = createMemoryHistory();
- history.push('/connect/https%3A%2F%2Fmetamask.github.io');
-
const { getByText } = renderWithProvider(
-
+
- ,
+ ,
connectedStore,
);
expect(getByText('Disconnect all accounts')).toBeInTheDocument();
});
it('it should trigger disconnect all accounts modal flow when disconnect all accounts button is clicked', async () => {
- const history = createMemoryHistory();
- history.push('/connect/https%3A%2F%2Fmetamask.github.io');
-
const { getByText, getByTestId } = renderWithProvider(
-
+
- ,
+ ,
connectedStore,
);
diff --git a/ui/components/multichain/pages/connections/connections.tsx b/ui/components/multichain/pages/connections/connections.tsx
index ae1f5b88193e..4a8b188b86b6 100644
--- a/ui/components/multichain/pages/connections/connections.tsx
+++ b/ui/components/multichain/pages/connections/connections.tsx
@@ -85,10 +85,10 @@ export const Connections = () => {
setShowDisconnectedAllAccountsUpdatedToast,
] = useState(false);
- const urlParams: { origin: string } = useParams();
- const securedOrigin = decodeURIComponent(urlParams.origin);
+ const urlParams = useParams<{ origin: string }>();
+ // @ts-expect-error TODO: Fix this type error by handling undefined parameters
+ const activeTabOrigin = decodeURIComponent(urlParams.origin);
- const activeTabOrigin: string = securedOrigin;
// TODO: Replace `any` with type
// eslint-disable-next-line @typescript-eslint/no-explicit-any
const subjectMetadata: { [key: string]: any } = useSelector(
@@ -246,7 +246,7 @@ export const Connections = () => {
textAlign={TextAlign.Center}
ellipsis
>
- {getURLHost(securedOrigin)}
+ {getURLHost(activeTabOrigin)}
diff --git a/ui/components/multichain/pages/review-permissions-page/review-permissions-page.tsx b/ui/components/multichain/pages/review-permissions-page/review-permissions-page.tsx
index 303d9dc2df4a..4b7da8f525fa 100644
--- a/ui/components/multichain/pages/review-permissions-page/review-permissions-page.tsx
+++ b/ui/components/multichain/pages/review-permissions-page/review-permissions-page.tsx
@@ -60,7 +60,8 @@ export const ReviewPermissions = () => {
const t = useI18nContext();
const dispatch = useDispatch();
const history = useHistory();
- const urlParams: { origin: string } = useParams();
+ const urlParams = useParams<{ origin: string }>();
+ // @ts-expect-error TODO: Fix this type error by handling undefined parameters
const securedOrigin = decodeURIComponent(urlParams.origin);
const [showAccountToast, setShowAccountToast] = useState(false);
const [showNetworkToast, setShowNetworkToast] = useState(false);
diff --git a/ui/pages/asset/asset.tsx b/ui/pages/asset/asset.tsx
index 975ff2e5cc25..933c39872265 100644
--- a/ui/pages/asset/asset.tsx
+++ b/ui/pages/asset/asset.tsx
@@ -21,11 +21,13 @@ const Asset = () => {
const { asset, id } = useParams<{ asset: string; id: string }>();
const token = tokens.find(({ address }: { address: string }) =>
+ // @ts-expect-error TODO: Fix this type error by handling undefined parameters
isEqualCaseInsensitive(address, asset),
);
const nft = nfts.find(
({ address, tokenId }: { address: string; tokenId: string }) =>
+ // @ts-expect-error TODO: Fix this type error by handling undefined parameters
isEqualCaseInsensitive(address, asset) && id === tokenId.toString(),
);
diff --git a/ui/pages/bridge/index.tsx b/ui/pages/bridge/index.tsx
index f216a52ec71d..780a19bd71f4 100644
--- a/ui/pages/bridge/index.tsx
+++ b/ui/pages/bridge/index.tsx
@@ -40,7 +40,6 @@ const CrossChainSwap = () => {
const redirectToDefaultRoute = async () => {
history.push({
pathname: DEFAULT_ROUTE,
- // @ts-expect-error - property 'state' does not exist on type PartialPath.
state: { stayOnHomePage: true },
});
dispatch(clearSwapsState());
diff --git a/ui/pages/confirmations/confirm/stories/utils.tsx b/ui/pages/confirmations/confirm/stories/utils.tsx
index dd194d574109..9c68a392cbd7 100644
--- a/ui/pages/confirmations/confirm/stories/utils.tsx
+++ b/ui/pages/confirmations/confirm/stories/utils.tsx
@@ -46,7 +46,7 @@ export function ConfirmStoryTemplate(
}`,
]}
>
- } />
+ } />
);
diff --git a/ui/pages/index.js b/ui/pages/index.js
index 208436c9127a..0b1cdcef78cd 100644
--- a/ui/pages/index.js
+++ b/ui/pages/index.js
@@ -2,6 +2,7 @@ import React, { PureComponent } from 'react';
import PropTypes from 'prop-types';
import { Provider } from 'react-redux';
import { HashRouter } from 'react-router-dom';
+import { CompatRouter } from 'react-router-dom-v5-compat';
import * as Sentry from '@sentry/browser';
import { I18nProvider, LegacyI18nProvider } from '../contexts/i18n';
import {
@@ -43,19 +44,21 @@ class Index extends PureComponent {
return (
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
);
diff --git a/yarn.lock b/yarn.lock
index 1434d86d4e62..cdde2e6fce0c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7830,6 +7830,13 @@ __metadata:
languageName: node
linkType: hard
+"@remix-run/router@npm:1.19.2":
+ version: 1.19.2
+ resolution: "@remix-run/router@npm:1.19.2"
+ checksum: 10/31b62b66ea68bd62018189047de7b262700113438f62407df019f81a9856a08a705b2b77454be9293518e2f5f3bbf3f8b858ac19f48cb7d89f8ab56b7b630c19
+ languageName: node
+ linkType: hard
+
"@scure/base@npm:^1.0.0, @scure/base@npm:^1.1.1, @scure/base@npm:^1.1.3, @scure/base@npm:~1.1.0, @scure/base@npm:~1.1.3, @scure/base@npm:~1.1.6":
version: 1.1.7
resolution: "@scure/base@npm:1.1.7"
@@ -14385,9 +14392,9 @@ __metadata:
linkType: hard
"caniuse-lite@npm:^1.0.30001109, caniuse-lite@npm:^1.0.30001587, caniuse-lite@npm:^1.0.30001599":
- version: 1.0.30001600
- resolution: "caniuse-lite@npm:1.0.30001600"
- checksum: 10/4c52f83ed71bc5f6e443bd17923460f1c77915adc2c2aa79ddaedceccc690b5917054b0c41b79e9138cbbd9abcdc0db9e224e79e3e734e581dfec06505f3a2b4
+ version: 1.0.30001660
+ resolution: "caniuse-lite@npm:1.0.30001660"
+ checksum: 10/5d83f0b7e2075b7e31f114f739155dc6c21b0afe8cb61180f625a4903b0ccd3d7591a5f81c930f14efddfa57040203ba0890850b8a3738f6c7f17c7dd83b9de8
languageName: node
linkType: hard
@@ -20804,13 +20811,6 @@ __metadata:
languageName: node
linkType: hard
-"gud@npm:^1.0.0":
- version: 1.0.0
- resolution: "gud@npm:1.0.0"
- checksum: 10/3e2eb37cf794364077c18f036d6aa259c821c7fd188f2b7935cb00d589d82a41e0ebb1be809e1a93679417f62f1ad0513e745c3cf5329596e489aef8c5e5feae
- languageName: node
- linkType: hard
-
"gulp-autoprefixer@npm:^8.0.0":
version: 8.0.0
resolution: "gulp-autoprefixer@npm:8.0.0"
@@ -21301,12 +21301,12 @@ __metadata:
languageName: node
linkType: hard
-"history@npm:^5.0.0":
- version: 5.0.0
- resolution: "history@npm:5.0.0"
+"history@npm:^5.3.0":
+ version: 5.3.0
+ resolution: "history@npm:5.3.0"
dependencies:
"@babel/runtime": "npm:^7.7.6"
- checksum: 10/d0b744c2028a163aebcee8df89400d6ed7eadc5ea877b0324040d1127a88d6b39395ea5a5f28a1912c75473953e3782c6fb682d363efb98e87a0cc49de95a2c9
+ checksum: 10/52ba685b842ca6438ff11ef459951eb13d413ae715866a8dc5f7c3b1ea0cdeb8db6aabf7254551b85f56abc205e6e2d7e1d5afb36b711b401cdaff4f2cf187e9
languageName: node
linkType: hard
@@ -26320,7 +26320,7 @@ __metadata:
gulp-watch: "npm:^5.0.1"
gulp-zip: "npm:^5.1.0"
he: "npm:^1.2.0"
- history: "npm:^5.0.0"
+ history: "npm:^5.3.0"
html-bundler-webpack-plugin: "npm:^3.17.3"
https-browserify: "npm:^1.0.0"
human-standard-token-abi: "npm:^2.0.0"
@@ -26383,7 +26383,8 @@ __metadata:
react-popper: "npm:^2.2.3"
react-redux: "npm:^7.2.9"
react-responsive-carousel: "npm:^3.2.21"
- react-router-dom: "npm:^5.1.2"
+ react-router-dom: "npm:^5.3.4"
+ react-router-dom-v5-compat: "npm:^6.26.2"
react-simple-file-input: "npm:^2.0.0"
react-syntax-highlighter: "npm:^15.5.0"
react-tippy: "npm:^1.2.2"
@@ -26961,20 +26962,6 @@ __metadata:
languageName: node
linkType: hard
-"mini-create-react-context@npm:^0.3.0":
- version: 0.3.2
- resolution: "mini-create-react-context@npm:0.3.2"
- dependencies:
- "@babel/runtime": "npm:^7.4.0"
- gud: "npm:^1.0.0"
- tiny-warning: "npm:^1.0.2"
- peerDependencies:
- prop-types: ^15.0.0
- react: ^0.14.0 || ^15.0.0 || ^16.0.0
- checksum: 10/507e36241965e2dad99ffe191809b0b9dc5e949df03b68000a91a845e12ea3bda8fd4cd35a1f033f3781a72942c7b0208fc1876f37656c7fc7be7d4472f45589
- languageName: node
- linkType: hard
-
"minimalistic-assert@npm:^1.0.0, minimalistic-assert@npm:^1.0.1":
version: 1.0.1
resolution: "minimalistic-assert@npm:1.0.1"
@@ -30683,32 +30670,46 @@ __metadata:
languageName: node
linkType: hard
-"react-router-dom@npm:^5.1.2":
- version: 5.1.2
- resolution: "react-router-dom@npm:5.1.2"
+"react-router-dom-v5-compat@npm:^6.26.2":
+ version: 6.26.2
+ resolution: "react-router-dom-v5-compat@npm:6.26.2"
dependencies:
- "@babel/runtime": "npm:^7.1.2"
+ "@remix-run/router": "npm:1.19.2"
+ history: "npm:^5.3.0"
+ react-router: "npm:6.26.2"
+ peerDependencies:
+ react: ">=16.8"
+ react-dom: ">=16.8"
+ react-router-dom: 4 || 5
+ checksum: 10/0662c16f8fbed2d89b79d7977c94961c331f576bf1c638ba9782656d72a57ab49f081940effc796913870f34a3ebac01287b1bdcb67750b2b04d35e6b59f8180
+ languageName: node
+ linkType: hard
+
+"react-router-dom@npm:^5.3.4":
+ version: 5.3.4
+ resolution: "react-router-dom@npm:5.3.4"
+ dependencies:
+ "@babel/runtime": "npm:^7.12.13"
history: "npm:^4.9.0"
loose-envify: "npm:^1.3.1"
prop-types: "npm:^15.6.2"
- react-router: "npm:5.1.2"
+ react-router: "npm:5.3.4"
tiny-invariant: "npm:^1.0.2"
tiny-warning: "npm:^1.0.0"
peerDependencies:
react: ">=15"
- checksum: 10/a6225fc454780db6afa5da97ac862abe8514f373a6c81d59a8c4d15c6c42eac0ccce76a468ec0ca216d327e84640561fc12af9759de4e12be09ed7fe1db08bb2
+ checksum: 10/5e0696ae2d86f466ff700944758a227e1dcd79b48797d567776506e4e3b4a08b81336155feb86a33be9f38c17c4d3d94212b5c60c8ee9a086022e4fd3961db29
languageName: node
linkType: hard
-"react-router@npm:5.1.2":
- version: 5.1.2
- resolution: "react-router@npm:5.1.2"
+"react-router@npm:5.3.4":
+ version: 5.3.4
+ resolution: "react-router@npm:5.3.4"
dependencies:
- "@babel/runtime": "npm:^7.1.2"
+ "@babel/runtime": "npm:^7.12.13"
history: "npm:^4.9.0"
hoist-non-react-statics: "npm:^3.1.0"
loose-envify: "npm:^1.3.1"
- mini-create-react-context: "npm:^0.3.0"
path-to-regexp: "npm:^1.7.0"
prop-types: "npm:^15.6.2"
react-is: "npm:^16.6.0"
@@ -30716,7 +30717,18 @@ __metadata:
tiny-warning: "npm:^1.0.0"
peerDependencies:
react: ">=15"
- checksum: 10/bba4a23090fa02364e21e03ad7b2ff4136ff262871be197b3031e4a03180e36bc9f03fc91c060ebbca58e00d4b59d3a99281a6ef26b6dea37479a5097b8ca2e2
+ checksum: 10/99d54a99af6bc6d7cad2e5ea7eee9485b62a8b8e16a1182b18daa7fad7dafa5e526850eaeebff629848b297ae055a9cb5b4aba8760e81af8b903efc049d48f5c
+ languageName: node
+ linkType: hard
+
+"react-router@npm:6.26.2":
+ version: 6.26.2
+ resolution: "react-router@npm:6.26.2"
+ dependencies:
+ "@remix-run/router": "npm:1.19.2"
+ peerDependencies:
+ react: ">=16.8"
+ checksum: 10/496e855b53e61066c1791e354f5d79eab56a128d9722fdc6486c3ecd3b3a0bf9968e927028f429893b157f3cc10fc09e890a055847723ee242663e7995fedc9d
languageName: node
linkType: hard