` can take one of:
+- a `element` prop that is passed a component
- children components
### `LoginCallback`
diff --git a/package.json b/package.json
index 5e5670c3..372241c2 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "@okta/okta-react",
- "version": "4.2.0",
+ "version": "5.0.0",
"description": "React support for Okta",
"private": true,
"scripts": {
@@ -43,10 +43,9 @@
},
"peerDependencies": {
"@okta/okta-auth-js": "^4.1.0",
- "@types/react-router-dom": "^5.1.6",
"react": ">=16.8.0",
"react-dom": ">=16.8.0",
- "react-router-dom": ">=5.1.0"
+ "react-router-dom": "^5.1.2 || ^6.0.0-beta.0"
},
"devDependencies": {
"@babel/cli": "^7.11.6",
@@ -63,17 +62,17 @@
"@types/enzyme": "^3.10.8",
"@types/enzyme-adapter-react-16": "^1.0.6",
"@types/jest": "^26.0.15",
- "@types/react-router-dom": "^5.1.6",
"@typescript-eslint/eslint-plugin": "^4.8.1",
"@typescript-eslint/parser": "^4.8.1",
"axios": "^0.21.0",
"babel-jest": "^26.6.3",
"chalk": "^4.1.0",
"dotenv": "^8.2.0",
- "enzyme": "^3.5.1",
- "enzyme-adapter-react-16": "^1.4.0",
+ "enzyme": "^3.11.0",
+ "enzyme-adapter-react-16": "^1.15.5",
"eslint": "^7.10.0",
"eslint-plugin-import": "^2.7.0",
+ "eslint-plugin-jasmine": "^4.1.1",
"eslint-plugin-jest": "^24.0.2",
"eslint-plugin-jsx-a11y": "^6.0.2",
"eslint-plugin-node": "^11.1.0",
@@ -89,6 +88,9 @@
"polished": "^1.7.0",
"prop-types": "^15.5.10",
"protractor": "^5.4.2",
+ "react": "^16.14.0",
+ "react-dom": "^16.14.0",
+ "react-router-dom": ">=6.0.0-beta.0",
"rimraf": "^2.6.2",
"rollup": "^2.33.1",
"rollup-plugin-cleanup": "^3.2.1",
@@ -106,4 +108,4 @@
"./",
"test/e2e/harness"
]
-}
\ No newline at end of file
+}
diff --git a/src/SecureRoute.tsx b/src/SecureRoute.tsx
index 32d66e2d..d148ab36 100644
--- a/src/SecureRoute.tsx
+++ b/src/SecureRoute.tsx
@@ -12,7 +12,11 @@
import * as React from 'react';
import { useOktaAuth, OnAuthRequiredFunction } from './OktaContext';
-import { Route, useRouteMatch, RouteProps } from 'react-router-dom';
+import { RouteProps } from 'react-router';
+import * as RR from 'react-router-dom';
+const { Route } = RR;
+// react-router v6 exports useMatch, react-router v5 exports useRouteMatch
+const useMatch = Object.entries(RR).filter(([k, _v]) => k == 'useMatch' || k == 'useRouteMatch')[0][1];
const SecureRoute: React.FC<{
onAuthRequired?: OnAuthRequiredFunction;
@@ -21,7 +25,8 @@ const SecureRoute: React.FC<{
...routeProps
}) => {
const { oktaAuth, authState, _onAuthRequired } = useOktaAuth();
- const match = useRouteMatch(routeProps);
+ const { path, caseSensitive } = routeProps;
+ const match = path ? useMatch.call(null, { path, caseSensitive }) : null;
const pendingLogin = React.useRef(false);
React.useEffect(() => {
diff --git a/src/Security.tsx b/src/Security.tsx
index 029b81a0..be24186d 100644
--- a/src/Security.tsx
+++ b/src/Security.tsx
@@ -11,7 +11,6 @@
*/
import * as React from 'react';
-import { useHistory } from 'react-router-dom';
import { toRelativeUrl, AuthSdkError, OktaAuth } from '@okta/okta-auth-js';
import OktaContext, { OnAuthRequiredFunction } from './OktaContext';
import OktaError from './OktaError';
@@ -24,8 +23,7 @@ const Security: React.FC<{
oktaAuth,
onAuthRequired,
children
-}) => {
- const history = useHistory();
+}) => {
const [authState, setAuthState] = React.useState(() => {
if (!oktaAuth) {
return {
@@ -46,7 +44,9 @@ const Security: React.FC<{
// Add default restoreOriginalUri callback
if (!oktaAuth.options.restoreOriginalUri) {
oktaAuth.options.restoreOriginalUri = async (_, originalUri) => {
- history.replace(toRelativeUrl(originalUri, window.location.origin));
+ //todo: use required restoreOriginalUri prop (see PR #71)
+ const relativeUrl = toRelativeUrl(originalUri, window.location.origin);
+ window.location.href = relativeUrl;
};
}
@@ -64,7 +64,7 @@ const Security: React.FC<{
}
return () => oktaAuth.authStateManager.unsubscribe();
- }, [oktaAuth, history]);
+ }, [oktaAuth]);
if (!oktaAuth) {
const err = new AuthSdkError('No oktaAuth instance passed to Security Component.');
diff --git a/test/e2e/harness/package.json b/test/e2e/harness/package.json
index ad8c958b..ef17cd39 100644
--- a/test/e2e/harness/package.json
+++ b/test/e2e/harness/package.json
@@ -10,8 +10,9 @@
"@types/react-dom": "^16.9.9",
"react": "^16.8.0",
"react-dom": "^16.8.0",
- "react-router": "^5.1.2",
- "react-router-dom": "^5.1.2",
+ "react-router": "^6.0.0-beta.0",
+ "react-router-dom": "^6.0.0-beta.0",
+ "history": "^5.0.0",
"react-scripts": "3.4.0"
},
"devDependencies": {
diff --git a/test/e2e/harness/src/App.tsx b/test/e2e/harness/src/App.tsx
index bd02c114..b8812017 100644
--- a/test/e2e/harness/src/App.tsx
+++ b/test/e2e/harness/src/App.tsx
@@ -11,7 +11,7 @@
*/
import * as React from 'react';
-import { Route, Switch, useHistory } from 'react-router-dom';
+import { Route, Routes, useNavigate } from 'react-router-dom';
import { OktaAuth } from '@okta/okta-auth-js';
import { Security, LoginCallback, SecureRoute } from '@okta/okta-react';
import Home from './Home';
@@ -19,14 +19,14 @@ import Protected from './Protected';
import CustomLogin from './CustomLogin';
import SessionTokenLogin from './SessionTokenLogin';
-const App: React.FC<{
- oktaAuth: OktaAuth,
- customLogin: boolean
+const App: React.FC<{
+ oktaAuth: OktaAuth;
+ customLogin: boolean;
}> = ({ oktaAuth, customLogin }) => {
- const history = useHistory();
+ const navigate = useNavigate();
const onAuthRequired = async () => {
- history.push('/login');
+ navigate('/login');
};
return (
@@ -35,14 +35,14 @@ const App: React.FC<{
oktaAuth={oktaAuth}
onAuthRequired={customLogin ? onAuthRequired : undefined}
>
-
-
-
-
-
-
-
-
+
+ }/>
+ }/>
+ }/>
+ } />
+ } />
+ }/>
+
PKCE Flow | Implicit Flow
diff --git a/test/jest/secureRoute.test.tsx b/test/jest/secureRoute.test.tsx
index 22819056..3039ad5b 100644
--- a/test/jest/secureRoute.test.tsx
+++ b/test/jest/secureRoute.test.tsx
@@ -13,7 +13,7 @@
import * as React from 'react';
import { mount } from 'enzyme';
import { act } from 'react-dom/test-utils';
-import { MemoryRouter, Route } from 'react-router-dom';
+import { MemoryRouter, Route, Routes } from 'react-router-dom';
import SecureRoute from '../../src/SecureRoute';
import Security from '../../src/Security';
@@ -94,28 +94,16 @@ describe('', () => {
authState.isPending = false;
});
- it('will render wrapped component using "component"', () => {
+ it('will render wrapped component using "element"', () => {
const MyComponent = function() { return hello world
; };
const wrapper = mount(
-
-
-
- );
- expect(wrapper.find(MyComponent).html()).toBe('hello world
');
- });
-
- it('will render wrapped component using "render"', () => {
- const MyComponent = function() { return hello world
; };
- const wrapper = mount(
-
-
- }
- />
+
+ }
+ />
+
);
@@ -127,9 +115,11 @@ describe('', () => {
const wrapper = mount(
-
-
-
+
+
+
+
+
);
@@ -144,28 +134,16 @@ describe('', () => {
authState.isPending = false;
});
- it('will not render wrapped component using "component"', () => {
+ it('will not render wrapped component using "element"', () => {
const MyComponent = function() { return hello world
; };
const wrapper = mount(
-
-
-
- );
- expect(wrapper.find(MyComponent).length).toBe(0);
- });
-
- it('will not render wrapped component using "render"', () => {
- const MyComponent = function() { return hello world
; };
- const wrapper = mount(
-
-
- }
- />
+
+ }
+ />
+
);
@@ -173,17 +151,19 @@ describe('', () => {
});
it('will not render wrapped component with children', () => {
- const MyComponent = function() { return hello world
; };
- const wrapper = mount(
-
-
-
-
-
-
-
- );
- expect(wrapper.find(MyComponent).length).toBe(0);
+ const MyComponent = function() { return hello world
; };
+ const wrapper = mount(
+
+
+
+
+
+
+
+
+
+ );
+ expect(wrapper.find(MyComponent).length).toBe(0);
});
describe('isPending: false', () => {
@@ -197,7 +177,9 @@ describe('', () => {
mount(
-
+
+
+
);
@@ -210,7 +192,9 @@ describe('', () => {
mount(
-
+
+
+
);
@@ -225,7 +209,9 @@ describe('', () => {
mount(
-
+
+
+
);
@@ -241,7 +227,9 @@ describe('', () => {
mount(
-
+
+
+
);
@@ -261,7 +249,9 @@ describe('', () => {
mount(
-
+
+
+
);
@@ -281,10 +271,12 @@ describe('', () => {
const wrapper = mount(
-
+
+ }
+ />
+
);
@@ -292,99 +284,37 @@ describe('', () => {
expect(wrapper.find(MyComponent).html()).toBe('hello world
');
});
- it('should accept an "exact" prop and pass it to an internal Route', () => {
- const wrapper = mount(
-
-
-
-
-
- );
- const secureRoute = wrapper.find(SecureRoute);
- expect(secureRoute.find(Route).props().exact).toBe(true);
- expect(wrapper.find(MyComponent).html()).toBe('hello world
');
- });
-
- it('should accept a "strict" prop and pass it to an internal Route', () => {
+ it('should accept a "caseSensitive" prop and pass it to an internal Route', () => {
const wrapper = mount(
-
+
+ }
+ />
+
);
const secureRoute = wrapper.find(SecureRoute);
- expect(secureRoute.find(Route).props().strict).toBe(true);
+ expect(secureRoute.find(Route).props().caseSensitive).toBe(true);
expect(wrapper.find(MyComponent).html()).toBe('hello world
');
});
- it('should accept a "sensitive" prop and pass it to an internal Route', () => {
- const wrapper = mount(
-
-
-
-
-
- );
- const secureRoute = wrapper.find(SecureRoute);
- expect(secureRoute.find(Route).props().sensitive).toBe(true);
- expect(wrapper.find(MyComponent).html()).toBe('hello world
');
- });
-
- it('should pass react-router props to an component', () => {
- authState.isAuthenticated = true;
- const MyComponent = function(props) { return { props.history ? 'has history' : 'lacks history'}
; };
- const wrapper = mount(
-
-
-
-
-
- );
- expect(wrapper.find(MyComponent).html()).toBe('has history
');
- });
-
- it('should pass react-router props to a render call', () => {
- authState.isAuthenticated = true;
- const MyComponent = function(props) { return { props.history ? 'has history' : 'lacks history'}
; };
- const wrapper = mount(
-
-
- }
- />
-
-
- );
- expect(wrapper.find(MyComponent).html()).toBe('has history
');
- });
-
- it('should pass props using the "render" prop', () => {
+ it('should pass props using the "element" prop', () => {
authState.isAuthenticated = true;
const MyComponent = function(props) { return { props.someProp ? 'has someProp' : 'lacks someProp'}
; };
const wrapper = mount(
- }
- />
+
+ }
+ />
+
);
diff --git a/yarn.lock b/yarn.lock
index 6505139d..5346ffe8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1198,7 +1198,7 @@
dependencies:
regenerator-runtime "^0.13.4"
-"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.10.2", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.1", "@babel/runtime@^7.3.4", "@babel/runtime@^7.4.5", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.4":
+"@babel/runtime@^7.0.0", "@babel/runtime@^7.10.2", "@babel/runtime@^7.11.2", "@babel/runtime@^7.3.4", "@babel/runtime@^7.4.5", "@babel/runtime@^7.7.2", "@babel/runtime@^7.7.6", "@babel/runtime@^7.8.4":
version "7.12.5"
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.12.5.tgz#410e7e487441e1b360c29be715d870d9b985882e"
integrity sha512-plcc+hbExy3McchJCEQG3knOsuh3HH+Prx1P6cLIkET/0dLuQDEnrT+s27Axgc9bqfsmNUNHfscgMUdBpC9xfg==
@@ -2791,11 +2791,6 @@
dependencies:
"@types/node" "*"
-"@types/history@*":
- version "4.7.8"
- resolved "https://registry.yarnpkg.com/@types/history/-/history-4.7.8.tgz#49348387983075705fe8f4e02fb67f7daaec4934"
- integrity sha512-S78QIYirQcUoo6UJZx9CSP0O2ix9IaeAXwQi26Rhr/+mg7qqPy8TzaxHSUut7eGjL8WmLccT7/MXf304WjqHcA==
-
"@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0", "@types/istanbul-lib-coverage@^2.0.1":
version "2.0.3"
resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz#4ba8ddb720221f432e443bd5f9117fd22cfd4762"
@@ -2893,23 +2888,6 @@
dependencies:
"@types/react" "*"
-"@types/react-router-dom@^5.1.6":
- version "5.1.6"
- resolved "https://registry.yarnpkg.com/@types/react-router-dom/-/react-router-dom-5.1.6.tgz#07b14e7ab1893a837c8565634960dc398564b1fb"
- integrity sha512-gjrxYqxz37zWEdMVvQtWPFMFj1dRDb4TGOcgyOfSXTrEXdF92L00WE3C471O3TV/RF1oskcStkXsOU0Ete4s/g==
- dependencies:
- "@types/history" "*"
- "@types/react" "*"
- "@types/react-router" "*"
-
-"@types/react-router@*":
- version "5.1.8"
- resolved "https://registry.yarnpkg.com/@types/react-router/-/react-router-5.1.8.tgz#4614e5ba7559657438e17766bb95ef6ed6acc3fa"
- integrity sha512-HzOyJb+wFmyEhyfp4D4NYrumi+LQgQL/68HvJO+q6XtuHSDvw6Aqov7sCAhjbNq3bUPgPqbdvjXC5HeB2oEAPg==
- dependencies:
- "@types/history" "*"
- "@types/react" "*"
-
"@types/react@*", "@types/react@^16.9.56":
version "16.14.0"
resolved "https://registry.yarnpkg.com/@types/react/-/react-16.14.0.tgz#bc022cfe1609899b0f2196376b267724e7300f0e"
@@ -6198,7 +6176,7 @@ envinfo@^7.3.1:
resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.7.3.tgz#4b2d8622e3e7366afb8091b23ed95569ea0208cc"
integrity sha512-46+j5QxbPWza0PB1i15nZx0xQ4I/EfQxg9J8Had3b408SV63nEtor2e+oiY63amTo9KTuh2a3XLObNwduxYwwA==
-enzyme-adapter-react-16@^1.4.0:
+enzyme-adapter-react-16@^1.15.5:
version "1.15.5"
resolved "https://registry.yarnpkg.com/enzyme-adapter-react-16/-/enzyme-adapter-react-16-1.15.5.tgz#7a6f0093d3edd2f7025b36e7fbf290695473ee04"
integrity sha512-33yUJGT1nHFQlbVI5qdo5Pfqvu/h4qPwi1o0a6ZZsjpiqq92a3HjynDhwd1IeED+Su60HDWV8mxJqkTnLYdGkw==
@@ -6233,7 +6211,7 @@ enzyme-shallow-equal@^1.0.1, enzyme-shallow-equal@^1.0.4:
has "^1.0.3"
object-is "^1.1.2"
-enzyme@^3.5.1:
+enzyme@^3.11.0:
version "3.11.0"
resolved "https://registry.yarnpkg.com/enzyme/-/enzyme-3.11.0.tgz#71d680c580fe9349f6f5ac6c775bc3e6b7a79c28"
integrity sha512-Dw8/Gs4vRjxY6/6i9wU0V+utmQO9kvh9XLnz3LIudviOnVYDEe2ec+0k+NQoMamn1VrjKgCUOWj5jG/5M5M0Qw==
@@ -7827,17 +7805,12 @@ hex-color-regex@^1.1.0:
resolved "https://registry.yarnpkg.com/hex-color-regex/-/hex-color-regex-1.1.0.tgz#4c06fccb4602fe2602b3c93df82d7e7dbf1a8a8e"
integrity sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ==
-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.0.0:
+ version "5.0.0"
+ resolved "https://registry.yarnpkg.com/history/-/history-5.0.0.tgz#0cabbb6c4bbf835addb874f8259f6d25101efd08"
+ integrity sha512-3NyRMKIiFSJmIPdq7FxkNMJkQ7ZEtVblOQ38VtKaA0zZMW1Eo6Q6W8oDKEflr1kNNTItSnk4JMCO1deeSgbLLg==
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"
hmac-drbg@^1.0.0:
version "1.0.1"
@@ -7853,13 +7826,6 @@ hoek@4.x.x:
resolved "https://registry.yarnpkg.com/hoek/-/hoek-4.2.1.tgz#9634502aa12c445dd5a7c5734b572bb8738aacbb"
integrity sha512-QLg82fGkfnJ/4iy1xZ81/9SIJiq1NGFUMGs6ParyjBZr6jW2Ufj/snDqTHixNlHdPNwN2RLVD0Pi3igeK9+JfA==
-hoist-non-react-statics@^3.1.0:
- 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==
- dependencies:
- react-is "^16.7.0"
-
homedir-polyfill@^1.0.1:
version "1.0.3"
resolved "https://registry.yarnpkg.com/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz#743298cef4e5af3e194161fbadcc2151d3a058e8"
@@ -8764,11 +8730,6 @@ is-wsl@^2.1.1, 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, isarray@~1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
@@ -10294,7 +10255,7 @@ loglevel@^1.6.6:
resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.7.0.tgz#728166855a740d59d38db01cf46f042caa041bb0"
integrity sha512-i2sY04nal5jDcagM3FMfG++T69GEEM8CYuOfeOIvmXzOIcwE9a/CJPR0MFM97pYMj/u10lzz7/zd7+qwhrBTqQ==
-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.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==
@@ -10640,14 +10601,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@0.9.0:
version "0.9.0"
resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.9.0.tgz#47f2cf07aa165ab35733b1fc97d4c46c0564339e"
@@ -11782,13 +11735,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@^1.0.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/path-type/-/path-type-1.1.0.tgz#59c44f7ee491da704da415da5a4070ba4f8fe441"
@@ -12981,7 +12927,7 @@ react-dev-utils@^10.2.0:
strip-ansi "6.0.0"
text-table "0.2.0"
-react-dom@^16.8.0:
+react-dom@^16.14.0, react-dom@^16.8.0:
version "16.14.0"
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.14.0.tgz#7ad838ec29a777fb3c75c3a190f661cf92ab8b89"
integrity sha512-1gCeQXDLoIqMgqD3IO2Ah9bnf0w9kzhwN5q4FGnHZ67hBm9yePzB5JJAIQCc8x3pFnNlwFq4RidZggNAAkzWWw==
@@ -12996,7 +12942,7 @@ react-error-overlay@^6.0.7:
resolved "https://registry.yarnpkg.com/react-error-overlay/-/react-error-overlay-6.0.8.tgz#474ed11d04fc6bda3af643447d85e9127ed6b5de"
integrity sha512-HvPuUQnLp5H7TouGq3kzBeioJmXms1wHy9EGjz2OURWBp4qZO6AfGEcnxts1D/CbwPLRAgTMPCEgYhA3sEM4vw==
-react-is@^16.13.1, react-is@^16.6.0, react-is@^16.7.0, react-is@^16.8.1, react-is@^16.8.4, react-is@^16.8.6:
+react-is@^16.13.1, react-is@^16.8.1, react-is@^16.8.4, react-is@^16.8.6:
version "16.13.1"
resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"
integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==
@@ -13006,34 +12952,20 @@ react-is@^17.0.1:
resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.1.tgz#5b3531bd76a645a4c9fb6e693ed36419e3301339"
integrity sha512-NAnt2iGDXohE5LI7uBnLnqvLQMtzhkiAOLXTmv+qnF9Ky7xAPcX8Up/xWIhxvLVGJvuLiNc4xQLtuqDRzb4fSA==
-react-router-dom@^5.1.2:
- version "5.2.0"
- resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-5.2.0.tgz#9e65a4d0c45e13289e66c7b17c7e175d0ea15662"
- integrity sha512-gxAmfylo2QUjcwxI63RhQ5G85Qqt4voZpUXSEqCwykV0baaOTQDR1f0PmY8AELqIyVc0NEZUj0Gov5lNGcXgsA==
+react-router-dom@>=6.0.0-beta.0, react-router-dom@^6.0.0-beta.0:
+ version "6.0.0-beta.0"
+ resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-6.0.0-beta.0.tgz#9dcc8555365f22f7fbd09f26b6b82543f3eb97d6"
+ integrity sha512-36yNNGMT8RB9FRPL9nKJi6HKDkgOakU+o/2hHpSzR6e37gN70MpOU6QQlmif4oAWWBwjyGc3ZNOMFCsFuHUY5w==
dependencies:
- "@babel/runtime" "^7.1.2"
- history "^4.9.0"
- loose-envify "^1.3.1"
- prop-types "^15.6.2"
- react-router "5.2.0"
- tiny-invariant "^1.0.2"
- tiny-warning "^1.0.0"
+ prop-types "^15.7.2"
+ react-router "6.0.0-beta.0"
-react-router@5.2.0, react-router@^5.1.2:
- version "5.2.0"
- resolved "https://registry.yarnpkg.com/react-router/-/react-router-5.2.0.tgz#424e75641ca8747fbf76e5ecca69781aa37ea293"
- integrity sha512-smz1DUuFHRKdcJC0jobGo8cVbhO3x50tCL4icacOlcwDOEQPq4TMqwx3sY1TP+DvtTgz4nm3thuo7A+BK2U0Dw==
- dependencies:
- "@babel/runtime" "^7.1.2"
- 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"
+react-router@6.0.0-beta.0, react-router@^6.0.0-beta.0:
+ version "6.0.0-beta.0"
+ resolved "https://registry.yarnpkg.com/react-router/-/react-router-6.0.0-beta.0.tgz#3e11f39b6ded4412c2fed9e4f989dd4c8156724d"
+ integrity sha512-VgMdfpVcmFQki/LZuLh8E/MNACekDetz4xqft+a6fBZvvJnVqKbLqebF7hyoawGrV1HcO5tVaUang2Og4W2j1Q==
+ dependencies:
+ prop-types "^15.7.2"
react-scripts@3.4.0:
version "3.4.0"
@@ -13105,7 +13037,7 @@ react-test-renderer@^16.0.0-0:
react-is "^16.8.6"
scheduler "^0.19.1"
-react@^16.8.0:
+react@^16.14.0, react@^16.8.0:
version "16.14.0"
resolved "https://registry.yarnpkg.com/react/-/react-16.14.0.tgz#94d776ddd0aaa37da3eda8fc5b6b18a4c9a3114d"
integrity sha512-0X2CImDkJGApiAlcf0ODKIneSwBPhqJawOa5wCtKbu7ZECrmS26NvtSILynQ66cgkT/RJ4LidJOc3bUESwmU8g==
@@ -13541,11 +13473,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-loader@3.1.1:
version "3.1.1"
resolved "https://registry.yarnpkg.com/resolve-url-loader/-/resolve-url-loader-3.1.1.tgz#28931895fa1eab9be0647d3b2958c100ae3c0bf0"
@@ -14962,16 +14889,6 @@ tiny-emitter@1.1.0:
resolved "https://registry.yarnpkg.com/tiny-emitter/-/tiny-emitter-1.1.0.tgz#ab405a21ffed814a76c19739648093d70654fecb"
integrity sha1-q0BaIf/tgUp2wZc5ZICT1wZU/ss=
-tiny-invariant@^1.0.2:
- version "1.1.0"
- resolved "https://registry.yarnpkg.com/tiny-invariant/-/tiny-invariant-1.1.0.tgz#634c5f8efdc27714b7f386c35e6760991d230875"
- integrity sha512-ytxQvrb1cPc9WBEI/HSeYYoGD0kWnGEOR8RY6KomWLBVhqz0RgTwVO9dLrGz7dC+nN9llyI7OKAgRq8Vq4ZBSw==
-
-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==
-
tmp@0.0.30:
version "0.0.30"
resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.30.tgz#72419d4a8be7d6ce75148fd8b324e593a711c2ed"
@@ -15505,11 +15422,6 @@ 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.1.2:
version "1.1.2"
resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"