diff --git a/package.json b/package.json index cad4103a4..2249b52bb 100644 --- a/package.json +++ b/package.json @@ -41,18 +41,17 @@ "@testing-library/react": "^12.1.5", "@testing-library/user-event": "^14.4.3", "@types/enzyme": "^3.10.12", - "@types/enzyme-adapter-react-16": "^1.0.6", "@types/jest": "^27.0.2", "@types/js-base64": "3.3.1", "@types/react-test-renderer": "^18.0.0", "@types/selenium-webdriver": "^4.1.15", "@typescript-eslint/eslint-plugin": "^5.53.0", "@typescript-eslint/parser": "^5.53.0", + "@wojtekmaj/enzyme-adapter-react-17": "^0.8.0", "concurrently": "^8.2.0", "css-loader": "^6.7.3", "css-minimizer-webpack-plugin": "^4.2.2", "enzyme": "^3.11.0", - "enzyme-adapter-react-16": "^1.15.7", "enzyme-to-json": "^3.6.2", "eslint": "^8.34.0", "eslint-plugin-import": "^2.27.5", @@ -77,7 +76,6 @@ "prop-types": "^15.7.2", "raw-loader": "^4.0.2", "react-axe": "^3.4.1", - "react-docgen-typescript-loader": "^3.7.2", "react-router-dom": "^5.3.4", "regenerator-runtime": "^0.13.11", "rimraf": "^4.1.2", @@ -121,7 +119,6 @@ "react-i18next": "^12.3.1", "react-joyride": "^2.5.3", "react-redux": "^8.0.5", - "react-router-last-location": "^2.0.1", "semver": "^7.5.4", "showdown": "^2.1.0" }, diff --git a/src/app/routes.tsx b/src/app/routes.tsx index c5e1d7473..ee053872d 100644 --- a/src/app/routes.tsx +++ b/src/app/routes.tsx @@ -15,8 +15,7 @@ */ import * as React from 'react'; -import { Route, RouteComponentProps, Switch } from 'react-router-dom'; -import { LastLocationProvider, useLastLocation } from 'react-router-last-location'; +import { Route, RouteComponentProps, Switch, useLocation } from 'react-router-dom'; import About from './About/About'; import Archives from './Archives/Archives'; import CreateRecording from './CreateRecording/CreateRecording'; @@ -55,7 +54,6 @@ export interface IAppRoute { path: string; title: string; description?: string; // non-empty description is used to filter routes for the NotFound page - isAsync?: boolean; navGroup?: string; featureLevel?: FeatureLevel; children?: IAppRoute[]; @@ -208,20 +206,18 @@ const flatten = (routes: IAppRoute[]): IAppRoute[] => { // a custom hook for sending focus to the primary content container // after a view has loaded so that subsequent press of tab key // sends focus directly to relevant content -const useA11yRouteChange = (isAsync: boolean) => { - const lastNavigation = useLastLocation(); +const useA11yRouteChange = () => { + const { pathname } = useLocation(); React.useEffect(() => { - if (!isAsync && lastNavigation !== null) { - routeFocusTimer = accessibleRouteChangeHandler(); - } + routeFocusTimer = accessibleRouteChangeHandler(); return () => { window.clearTimeout(routeFocusTimer); }; - }, [isAsync, lastNavigation]); + }, [pathname]); }; -const RouteWithTitleUpdates = ({ component: Component, isAsync = false, path, title, ...rest }: IAppRoute) => { - useA11yRouteChange(isAsync); +const RouteWithTitleUpdates = ({ component: Component, title, path, ...rest }: IAppRoute) => { + useA11yRouteChange(); useDocumentTitle(title); const renderFallback = React.useCallback((error: Error) => { @@ -252,24 +248,15 @@ const AppRoutes: React.FC = (_) => { const activeLevel = useFeatureLevel(); return ( - - - {flatten(routes) - .filter((r) => (loggedIn ? r.component !== Login : r.anonymous)) - .filter((r) => r.featureLevel === undefined || r.featureLevel >= activeLevel) - .map(({ path, exact, component, title, isAsync }, idx) => ( - - ))} - - - + + {flatten(routes) + .filter((r) => (loggedIn ? r.component !== Login : r.anonymous)) + .filter((r) => r.featureLevel === undefined || r.featureLevel >= activeLevel) + .map(({ path, exact, component, title }, idx) => ( + + ))} + + ); }; diff --git a/yarn.lock b/yarn.lock index d14dec065..75121cd47 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1876,16 +1876,7 @@ __metadata: languageName: node linkType: hard -"@types/enzyme-adapter-react-16@npm:^1.0.6": - version: 1.0.6 - resolution: "@types/enzyme-adapter-react-16@npm:1.0.6" - dependencies: - "@types/enzyme": "*" - checksum: d668ed5fbb7bf72e647f212ab60e2208f96b566a1782cbaa35cd0be3bfc27c5d075367517d341155d35dd21834271df7d74bbf49d1f878e0b7be2a9c0daa17a3 - languageName: node - linkType: hard - -"@types/enzyme@npm:*, @types/enzyme@npm:^3.10.12": +"@types/enzyme@npm:^3.10.12": version: 3.10.12 resolution: "@types/enzyme@npm:3.10.12" dependencies: @@ -2664,19 +2655,35 @@ __metadata: languageName: node linkType: hard -"@webpack-contrib/schema-utils@npm:^1.0.0-beta.0": - version: 1.0.0-beta.0 - resolution: "@webpack-contrib/schema-utils@npm:1.0.0-beta.0" +"@wojtekmaj/enzyme-adapter-react-17@npm:^0.8.0": + version: 0.8.0 + resolution: "@wojtekmaj/enzyme-adapter-react-17@npm:0.8.0" dependencies: - ajv: ^6.1.0 - ajv-keywords: ^3.1.0 - chalk: ^2.3.2 - strip-ansi: ^4.0.0 - text-table: ^0.2.0 - webpack-log: ^1.1.2 + "@wojtekmaj/enzyme-adapter-utils": ^0.2.0 + enzyme-shallow-equal: ^1.0.0 + has: ^1.0.0 + prop-types: ^15.7.0 + react-is: ^17.0.0 + react-test-renderer: ^17.0.0 + peerDependencies: + enzyme: ^3.0.0 + react: ^17.0.0-0 + react-dom: ^17.0.0-0 + checksum: aa9674f06f6db269b72168ebf46c4513938993479eb60bac30cb6183b5aca6108ade3d08af4f56c142cb219415480d0c4b454ba9452b85c32f711c806b39cd8c + languageName: node + linkType: hard + +"@wojtekmaj/enzyme-adapter-utils@npm:^0.2.0": + version: 0.2.0 + resolution: "@wojtekmaj/enzyme-adapter-utils@npm:0.2.0" + dependencies: + function.prototype.name: ^1.1.0 + has: ^1.0.0 + object.fromentries: ^2.0.0 + prop-types: ^15.7.0 peerDependencies: - webpack: ^3.0.0 || ^4.0.0 - checksum: 8f09bdfaccbde24c1684daf4df79611e0addf744f5fe9ce4e856989cb2666e196e7073809b111b26a369738ffb82b8c1c653d9c7bcc72b6e455fe627913fc2a1 + react: ^17.0.0-0 + checksum: 837741f1382acdb02ce304745eccfdcff03f1cae2a4fb833056a7a753308cd1182b0b32a10a04be6bfedaaab8f4acd5b458bfe0b9ebaa6119c4aaaba74a14ae4 languageName: node linkType: hard @@ -2808,25 +2815,6 @@ __metadata: languageName: node linkType: hard -"airbnb-prop-types@npm:^2.16.0": - version: 2.16.0 - resolution: "airbnb-prop-types@npm:2.16.0" - dependencies: - array.prototype.find: ^2.1.1 - function.prototype.name: ^1.1.2 - is-regex: ^1.1.0 - object-is: ^1.1.2 - object.assign: ^4.1.0 - object.entries: ^1.1.2 - prop-types: ^15.7.2 - prop-types-exact: ^1.2.0 - react-is: ^16.13.1 - peerDependencies: - react: ^0.14 || ^15.0.0 || ^16.0.0-alpha - checksum: 393a5988b99f122c4b935296a6b8c8cbd10345418d67d547cdbcd71d57636cb9abdf9d6556940f70d0b76c3f83448627376557a75b5faf570fb8d262ed4a472f - languageName: node - linkType: hard - "ajv-formats@npm:^2.1.1": version: 2.1.1 resolution: "ajv-formats@npm:2.1.1" @@ -2841,7 +2829,7 @@ __metadata: languageName: node linkType: hard -"ajv-keywords@npm:^3.1.0, ajv-keywords@npm:^3.5.2": +"ajv-keywords@npm:^3.5.2": version: 3.5.2 resolution: "ajv-keywords@npm:3.5.2" peerDependencies: @@ -2861,7 +2849,7 @@ __metadata: languageName: node linkType: hard -"ajv@npm:^6.1.0, ajv@npm:^6.10.0, ajv@npm:^6.12.4, ajv@npm:^6.12.5": +"ajv@npm:^6.10.0, ajv@npm:^6.12.4, ajv@npm:^6.12.5": version: 6.12.6 resolution: "ajv@npm:6.12.6" dependencies: @@ -3071,18 +3059,6 @@ __metadata: languageName: node linkType: hard -"array.prototype.find@npm:^2.1.1": - version: 2.2.1 - resolution: "array.prototype.find@npm:2.2.1" - dependencies: - call-bind: ^1.0.2 - define-properties: ^1.1.4 - es-abstract: ^1.20.4 - es-shim-unscopables: ^1.0.0 - checksum: 3bde6c9137a1b11e28c8e098574ae93aa4c660f3b917ab08e7076ee8ca32704ee158d562437b38b8a5a03b0f0ccacf4df9b7a4e4b4497f4bbe66b8406dc334e5 - languageName: node - linkType: hard - "array.prototype.flat@npm:^1.2.3, array.prototype.flat@npm:^1.3.1": version: 1.3.1 resolution: "array.prototype.flat@npm:1.3.1" @@ -3532,7 +3508,7 @@ __metadata: languageName: node linkType: hard -"chalk@npm:^2.0.0, chalk@npm:^2.0.1, chalk@npm:^2.1.0, chalk@npm:^2.3.2, chalk@npm:^2.4.1": +"chalk@npm:^2.0.0, chalk@npm:^2.4.1": version: 2.4.2 resolution: "chalk@npm:2.4.2" dependencies: @@ -4070,7 +4046,6 @@ __metadata: "@testing-library/react": ^12.1.5 "@testing-library/user-event": ^14.4.3 "@types/enzyme": ^3.10.12 - "@types/enzyme-adapter-react-16": ^1.0.6 "@types/jest": ^27.0.2 "@types/js-base64": 3.3.1 "@types/lodash": ^4.14.191 @@ -4079,12 +4054,12 @@ __metadata: "@types/selenium-webdriver": ^4.1.15 "@typescript-eslint/eslint-plugin": ^5.53.0 "@typescript-eslint/parser": ^5.53.0 + "@wojtekmaj/enzyme-adapter-react-17": ^0.8.0 concurrently: ^8.2.0 css-loader: ^6.7.3 css-minimizer-webpack-plugin: ^4.2.2 dayjs: ^1.11.7 enzyme: ^3.11.0 - enzyme-adapter-react-16: ^1.15.7 enzyme-to-json: ^3.6.2 eslint: ^8.34.0 eslint-plugin-import: ^2.27.5 @@ -4113,13 +4088,11 @@ __metadata: raw-loader: ^4.0.2 react: ^17.0.2 react-axe: ^3.4.1 - react-docgen-typescript-loader: ^3.7.2 react-dom: ^17.0.2 react-i18next: ^12.3.1 react-joyride: ^2.5.3 react-redux: ^8.0.5 react-router-dom: ^5.3.4 - react-router-last-location: ^2.0.1 regenerator-runtime: ^0.13.11 rimraf: ^4.1.2 rxjs: ^7.8.0 @@ -4775,16 +4748,6 @@ __metadata: languageName: node linkType: hard -"d@npm:1, d@npm:^1.0.1": - version: 1.0.1 - resolution: "d@npm:1.0.1" - dependencies: - es5-ext: ^0.10.50 - type: ^1.0.1 - checksum: 49ca0639c7b822db670de93d4fbce44b4aa072cd848c76292c9978a8cd0fff1028763020ff4b0f147bd77bfe29b4c7f82e0f71ade76b2a06100543cdfd948d19 - languageName: node - linkType: hard - "dagre@npm:0.8.2": version: 0.8.2 resolution: "dagre@npm:0.8.2" @@ -5318,45 +5281,7 @@ __metadata: languageName: node linkType: hard -"enzyme-adapter-react-16@npm:^1.15.7": - version: 1.15.7 - resolution: "enzyme-adapter-react-16@npm:1.15.7" - dependencies: - enzyme-adapter-utils: ^1.14.1 - enzyme-shallow-equal: ^1.0.5 - has: ^1.0.3 - object.assign: ^4.1.4 - object.values: ^1.1.5 - prop-types: ^15.8.1 - react-is: ^16.13.1 - react-test-renderer: ^16.0.0-0 - semver: ^5.7.0 - peerDependencies: - enzyme: ^3.0.0 - react: ^16.0.0-0 - react-dom: ^16.0.0-0 - checksum: b721eb7304947ea8687fd7231ef3360e1ecafa462a4f476516b87568de24a5d6281228fe04b29d4101a063e5a04e59d4c40378ac378f61cc102eea75cf37b635 - languageName: node - linkType: hard - -"enzyme-adapter-utils@npm:^1.14.1": - version: 1.14.1 - resolution: "enzyme-adapter-utils@npm:1.14.1" - dependencies: - airbnb-prop-types: ^2.16.0 - function.prototype.name: ^1.1.5 - has: ^1.0.3 - object.assign: ^4.1.4 - object.fromentries: ^2.0.5 - prop-types: ^15.8.1 - semver: ^5.7.1 - peerDependencies: - react: 0.13.x || 0.14.x || ^15.0.0-0 || ^16.0.0-0 - checksum: 20a5840c37263c2e7f54ac82315b42a5746eefd5b741f7e586d0b144fec922e02ef069b2fd81a7417ba3cd6a9c8d1549a06e4596c186e82cb991d12b0956c397 - languageName: node - linkType: hard - -"enzyme-shallow-equal@npm:^1.0.1, enzyme-shallow-equal@npm:^1.0.5": +"enzyme-shallow-equal@npm:^1.0.0, enzyme-shallow-equal@npm:^1.0.1": version: 1.0.5 resolution: "enzyme-shallow-equal@npm:1.0.5" dependencies: @@ -5535,38 +5460,6 @@ __metadata: languageName: node linkType: hard -"es5-ext@npm:^0.10.35, es5-ext@npm:^0.10.50": - version: 0.10.62 - resolution: "es5-ext@npm:0.10.62" - dependencies: - es6-iterator: ^2.0.3 - es6-symbol: ^3.1.3 - next-tick: ^1.1.0 - checksum: 25f42f6068cfc6e393cf670bc5bba249132c5f5ec2dd0ed6e200e6274aca2fed8e9aec8a31c76031744c78ca283c57f0b41c7e737804c6328c7b8d3fbcba7983 - languageName: node - linkType: hard - -"es6-iterator@npm:^2.0.3": - version: 2.0.3 - resolution: "es6-iterator@npm:2.0.3" - dependencies: - d: 1 - es5-ext: ^0.10.35 - es6-symbol: ^3.1.1 - checksum: 6e48b1c2d962c21dee604b3d9f0bc3889f11ed5a8b33689155a2065d20e3107e2a69cc63a71bd125aeee3a589182f8bbcb5c8a05b6a8f38fa4205671b6d09697 - languageName: node - linkType: hard - -"es6-symbol@npm:^3.1.1, es6-symbol@npm:^3.1.3": - version: 3.1.3 - resolution: "es6-symbol@npm:3.1.3" - dependencies: - d: ^1.0.1 - ext: ^1.1.2 - checksum: cd49722c2a70f011eb02143ef1c8c70658d2660dead6641e160b94619f408b9cf66425515787ffe338affdf0285ad54f4eae30ea5bd510e33f8659ec53bcaa70 - languageName: node - linkType: hard - "esbuild@npm:^0.17.0": version: 0.17.8 resolution: "esbuild@npm:0.17.8" @@ -6103,15 +5996,6 @@ __metadata: languageName: node linkType: hard -"ext@npm:^1.1.2": - version: 1.7.0 - resolution: "ext@npm:1.7.0" - dependencies: - type: ^2.7.2 - checksum: ef481f9ef45434d8c867cfd09d0393b60945b7c8a1798bedc4514cb35aac342ccb8d8ecb66a513e6a2b4ec1e294a338e3124c49b29736f8e7c735721af352c31 - languageName: node - linkType: hard - "extend@npm:^3.0.0": version: 3.0.2 resolution: "extend@npm:3.0.2" @@ -6540,7 +6424,7 @@ __metadata: languageName: node linkType: hard -"function.prototype.name@npm:^1.1.2, function.prototype.name@npm:^1.1.5": +"function.prototype.name@npm:^1.1.0, function.prototype.name@npm:^1.1.2, function.prototype.name@npm:^1.1.5": version: 1.1.5 resolution: "function.prototype.name@npm:1.1.5" dependencies: @@ -6918,7 +6802,7 @@ __metadata: languageName: node linkType: hard -"has@npm:^1.0.3": +"has@npm:^1.0.0, has@npm:^1.0.3": version: 1.0.3 resolution: "has@npm:1.0.3" dependencies: @@ -7738,7 +7622,7 @@ __metadata: languageName: node linkType: hard -"is-regex@npm:^1.0.5, is-regex@npm:^1.1.0, is-regex@npm:^1.1.4": +"is-regex@npm:^1.0.5, is-regex@npm:^1.1.4": version: 1.1.4 resolution: "is-regex@npm:1.1.4" dependencies: @@ -8894,17 +8778,6 @@ __metadata: languageName: node linkType: hard -"loader-utils@npm:^1.2.3": - version: 1.4.2 - resolution: "loader-utils@npm:1.4.2" - dependencies: - big.js: ^5.2.2 - emojis-list: ^3.0.0 - json5: ^1.0.1 - checksum: eb6fb622efc0ffd1abdf68a2022f9eac62bef8ec599cf8adb75e94d1d338381780be6278534170e99edc03380a6d29bc7eb1563c89ce17c5fed3a0b17f1ad804 - languageName: node - linkType: hard - "loader-utils@npm:^2.0.0": version: 2.0.4 resolution: "loader-utils@npm:2.0.4" @@ -9150,25 +9023,6 @@ __metadata: languageName: node linkType: hard -"log-symbols@npm:^2.1.0": - version: 2.2.0 - resolution: "log-symbols@npm:2.2.0" - dependencies: - chalk: ^2.0.1 - checksum: 4c95e3b65f0352dbe91dc4989c10baf7a44e2ef5b0db7e6721e1476268e2b6f7090c3aa880d4f833a05c5c3ff18f4ec5215a09bd0099986d64a8186cfeb48ac8 - languageName: node - linkType: hard - -"loglevelnext@npm:^1.0.1": - version: 1.0.5 - resolution: "loglevelnext@npm:1.0.5" - dependencies: - es6-symbol: ^3.1.1 - object.assign: ^4.1.0 - checksum: f4eff8e178a37c45bbd107a81e34892f0c61398e1231bb25be88df330d1057b3719175348b426b8486a3d466ce5c7d5adbff6fcddd413a1dd67607a41326c9dd - languageName: node - linkType: hard - "loose-envify@npm:^1.0.0, loose-envify@npm:^1.1.0, loose-envify@npm:^1.2.0, loose-envify@npm:^1.3.1, loose-envify@npm:^1.4.0": version: 1.4.0 resolution: "loose-envify@npm:1.4.0" @@ -9736,13 +9590,6 @@ __metadata: languageName: node linkType: hard -"next-tick@npm:^1.1.0": - version: 1.1.0 - resolution: "next-tick@npm:1.1.0" - checksum: 83b5cf36027a53ee6d8b7f9c0782f2ba87f4858d977342bfc3c20c21629290a2111f8374d13a81221179603ffc4364f38374b5655d17b6a8f8a8c77bdea4fe8b - languageName: node - linkType: hard - "nice-try@npm:^1.0.4": version: 1.0.5 resolution: "nice-try@npm:1.0.5" @@ -9951,7 +9798,7 @@ __metadata: languageName: node linkType: hard -"object-is@npm:^1.0.2, object-is@npm:^1.1.2, object-is@npm:^1.1.5": +"object-is@npm:^1.0.2, object-is@npm:^1.1.5": version: 1.1.5 resolution: "object-is@npm:1.1.5" dependencies: @@ -9980,7 +9827,7 @@ __metadata: languageName: node linkType: hard -"object.entries@npm:^1.1.1, object.entries@npm:^1.1.2, object.entries@npm:^1.1.6": +"object.entries@npm:^1.1.1, object.entries@npm:^1.1.6": version: 1.1.6 resolution: "object.entries@npm:1.1.6" dependencies: @@ -9991,7 +9838,7 @@ __metadata: languageName: node linkType: hard -"object.fromentries@npm:^2.0.5, object.fromentries@npm:^2.0.6": +"object.fromentries@npm:^2.0.0, object.fromentries@npm:^2.0.6": version: 2.0.6 resolution: "object.fromentries@npm:2.0.6" dependencies: @@ -10012,7 +9859,7 @@ __metadata: languageName: node linkType: hard -"object.values@npm:^1.1.1, object.values@npm:^1.1.5, object.values@npm:^1.1.6": +"object.values@npm:^1.1.1, object.values@npm:^1.1.6": version: 1.1.6 resolution: "object.values@npm:1.1.6" dependencies: @@ -10978,17 +10825,6 @@ __metadata: languageName: node linkType: hard -"prop-types-exact@npm:^1.2.0": - version: 1.2.0 - resolution: "prop-types-exact@npm:1.2.0" - dependencies: - has: ^1.0.3 - object.assign: ^4.1.0 - reflect.ownkeys: ^0.2.0 - checksum: 21676a16d5b2623c345ca938554faba7bf29c6ad589eac3f490eda2207bcfd8d25cb3dfda5e5f8e6805239aabd2c6943f7bfbe726a1de708bae2b7a01c03eead - languageName: node - linkType: hard - "prop-types-extra@npm:^1.1.0": version: 1.1.1 resolution: "prop-types-extra@npm:1.1.1" @@ -11001,7 +10837,7 @@ __metadata: languageName: node linkType: hard -"prop-types@npm:^15.6.2, prop-types@npm:^15.7.2, prop-types@npm:^15.8.1": +"prop-types@npm:^15.6.2, prop-types@npm:^15.7.0, prop-types@npm:^15.7.2, prop-types@npm:^15.8.1": version: 15.8.1 resolution: "prop-types@npm:15.8.1" dependencies: @@ -11181,28 +11017,6 @@ __metadata: languageName: node linkType: hard -"react-docgen-typescript-loader@npm:^3.7.2": - version: 3.7.2 - resolution: "react-docgen-typescript-loader@npm:3.7.2" - dependencies: - "@webpack-contrib/schema-utils": ^1.0.0-beta.0 - loader-utils: ^1.2.3 - react-docgen-typescript: ^1.15.0 - peerDependencies: - typescript: "*" - checksum: d9d2fd8d7c6558450d06380c7cd1448883ca24b959fd8518d77451d09ed4e80177f4e776f78af1f99d4db052c8543731cd9403cb83d7f9074fe48b091e0802f7 - languageName: node - linkType: hard - -"react-docgen-typescript@npm:^1.15.0": - version: 1.22.0 - resolution: "react-docgen-typescript@npm:1.22.0" - peerDependencies: - typescript: ">= 3.x" - checksum: f5e5519cf3f1136b8e66bb3c459e02edf4d6c0d3bc1ee0fa848c8446f93f5332fb67c794f36e3597fd7374dea7433243537a4fd2b9311aa5d0c5a844ab8cb980 - languageName: node - linkType: hard - "react-dom@npm:^17.0.2": version: 17.0.2 resolution: "react-dom@npm:17.0.2" @@ -11273,27 +11087,27 @@ __metadata: languageName: node linkType: hard -"react-is@npm:^16.12.0, react-is@npm:^16.13.1, react-is@npm:^16.3.2, react-is@npm:^16.6.0, react-is@npm:^16.7.0, react-is@npm:^16.8.6": +"react-is@npm:^16.12.0 || ^17.0.0 || ^18.0.0, react-is@npm:^18.0.0": + version: 18.2.0 + resolution: "react-is@npm:18.2.0" + checksum: e72d0ba81b5922759e4aff17e0252bd29988f9642ed817f56b25a3e217e13eea8a7f2322af99a06edb779da12d5d636e9fda473d620df9a3da0df2a74141d53e + languageName: node + linkType: hard + +"react-is@npm:^16.12.0, react-is@npm:^16.13.1, react-is@npm:^16.3.2, react-is@npm:^16.6.0, react-is@npm:^16.7.0": version: 16.13.1 resolution: "react-is@npm:16.13.1" checksum: f7a19ac3496de32ca9ae12aa030f00f14a3d45374f1ceca0af707c831b2a6098ef0d6bdae51bd437b0a306d7f01d4677fcc8de7c0d331eb47ad0f46130e53c5f languageName: node linkType: hard -"react-is@npm:^17.0.1": +"react-is@npm:^17.0.0, react-is@npm:^17.0.1, react-is@npm:^17.0.2": version: 17.0.2 resolution: "react-is@npm:17.0.2" checksum: 9d6d111d8990dc98bc5402c1266a808b0459b5d54830bbea24c12d908b536df7883f268a7868cfaedde3dd9d4e0d574db456f84d2e6df9c4526f99bb4b5344d8 languageName: node linkType: hard -"react-is@npm:^18.0.0": - version: 18.2.0 - resolution: "react-is@npm:18.2.0" - checksum: e72d0ba81b5922759e4aff17e0252bd29988f9642ed817f56b25a3e217e13eea8a7f2322af99a06edb779da12d5d636e9fda473d620df9a3da0df2a74141d53e - languageName: node - linkType: hard - "react-joyride@npm:^2.5.3": version: 2.5.3 resolution: "react-joyride@npm:2.5.3" @@ -11385,18 +11199,6 @@ __metadata: languageName: node linkType: hard -"react-router-last-location@npm:^2.0.1": - version: 2.0.1 - resolution: "react-router-last-location@npm:2.0.1" - peerDependencies: - prop-types: ^15.6.0 - react: ^15.5.4 || ^16.0.0 - react-dom: ^15.5.4 || ^16.0.0 - react-router-dom: ^4.1.1 || ^5.0.1 - checksum: e96eecb97eee51b67e4d4dec9319a066ae054013dcccd294878f65fdd7fb1335aca8ced4e0fa4f9c954022267dc15500f7f02a5cc3784b5aa29fac2579e04764 - languageName: node - linkType: hard - "react-router@npm:5.3.4": version: 5.3.4 resolution: "react-router@npm:5.3.4" @@ -11416,17 +11218,29 @@ __metadata: languageName: node linkType: hard -"react-test-renderer@npm:^16.0.0-0": - version: 16.14.0 - resolution: "react-test-renderer@npm:16.14.0" +"react-shallow-renderer@npm:^16.13.1": + version: 16.15.0 + resolution: "react-shallow-renderer@npm:16.15.0" dependencies: object-assign: ^4.1.1 - prop-types: ^15.6.2 - react-is: ^16.8.6 - scheduler: ^0.19.1 + react-is: ^16.12.0 || ^17.0.0 || ^18.0.0 + peerDependencies: + react: ^16.0.0 || ^17.0.0 || ^18.0.0 + checksum: 6052c7e3e9627485120ebd8257f128aad8f56386fe8d42374b7743eac1be457c33506d153c7886b4e32923c0c352d402ab805ef9ca02dbcd8393b2bdeb6e5af8 + languageName: node + linkType: hard + +"react-test-renderer@npm:^17.0.0": + version: 17.0.2 + resolution: "react-test-renderer@npm:17.0.2" + dependencies: + object-assign: ^4.1.1 + react-is: ^17.0.2 + react-shallow-renderer: ^16.13.1 + scheduler: ^0.20.2 peerDependencies: - react: ^16.14.0 - checksum: 96eb8a2566e67ebd246ef6e1b36d8c8498c68ebfdb94ca8399c19b4e3b73368caf0ffbe44767593e3499f2f58b4b5e57ba0565a47628048d2ab01b23a422724e + react: 17.0.2 + checksum: e6b5c6ed2a0bde2c34f1ab9523ff9bc4c141a271daf730d6b852374e83acc0155d58ab71a318251e953ebfa65b8bebb9c5dce3eba1ccfcbef7cc4e1e8261c401 languageName: node linkType: hard @@ -11532,13 +11346,6 @@ __metadata: languageName: node linkType: hard -"reflect.ownkeys@npm:^0.2.0": - version: 0.2.0 - resolution: "reflect.ownkeys@npm:0.2.0" - checksum: 9530b166569e547c2cf25ade3cdc39c662212feeccf3e0ed46e6d8abf92f5683c82d7857011cee6230bf648eb0b99b6b419a007012b8571dcd4bb4d818d3b88d - languageName: node - linkType: hard - "regenerator-runtime@npm:^0.13.11": version: 0.13.11 resolution: "regenerator-runtime@npm:0.13.11" @@ -11945,16 +11752,6 @@ __metadata: languageName: node linkType: hard -"scheduler@npm:^0.19.1": - version: 0.19.1 - resolution: "scheduler@npm:0.19.1" - dependencies: - loose-envify: ^1.1.0 - object-assign: ^4.1.1 - checksum: 73e185a59e2ff5aa3609f5b9cb97ddd376f89e1610579d29939d952411ca6eb7a24907a4ea4556569dacb931467a1a4a56d94fe809ef713aa76748642cd96a6c - languageName: node - linkType: hard - "scheduler@npm:^0.20.2": version: 0.20.2 resolution: "scheduler@npm:0.20.2" @@ -12029,7 +11826,7 @@ __metadata: languageName: node linkType: hard -"semver@npm:2 || 3 || 4 || 5, semver@npm:^5.5.0, semver@npm:^5.7.0, semver@npm:^5.7.1": +"semver@npm:2 || 3 || 4 || 5, semver@npm:^5.5.0": version: 5.7.2 resolution: "semver@npm:5.7.2" bin: @@ -13316,20 +13113,6 @@ __metadata: languageName: node linkType: hard -"type@npm:^1.0.1": - version: 1.2.0 - resolution: "type@npm:1.2.0" - checksum: dae8c64f82c648b985caf321e9dd6e8b7f4f2e2d4f846fc6fd2c8e9dc7769382d8a52369ddbaccd59aeeceb0df7f52fb339c465be5f2e543e81e810e413451ee - languageName: node - linkType: hard - -"type@npm:^2.7.2": - version: 2.7.2 - resolution: "type@npm:2.7.2" - checksum: 0f42379a8adb67fe529add238a3e3d16699d95b42d01adfe7b9a7c5da297f5c1ba93de39265ba30ffeb37dfd0afb3fb66ae09f58d6515da442219c086219f6f4 - languageName: node - linkType: hard - "typed-array-length@npm:^1.0.4": version: 1.0.4 resolution: "typed-array-length@npm:1.0.4" @@ -13542,15 +13325,6 @@ __metadata: languageName: node linkType: hard -"uuid@npm:^3.1.0": - version: 3.4.0 - resolution: "uuid@npm:3.4.0" - bin: - uuid: ./bin/uuid - checksum: 58de2feed61c59060b40f8203c0e4ed7fd6f99d42534a499f1741218a1dd0c129f4aa1de797bcf822c8ea5da7e4137aa3673431a96dae729047f7aca7b27866f - languageName: node - linkType: hard - "uuid@npm:^8.3.2": version: 8.3.2 resolution: "uuid@npm:8.3.2" @@ -14210,18 +13984,6 @@ __metadata: languageName: node linkType: hard -"webpack-log@npm:^1.1.2": - version: 1.2.0 - resolution: "webpack-log@npm:1.2.0" - dependencies: - chalk: ^2.1.0 - log-symbols: ^2.1.0 - loglevelnext: ^1.0.1 - uuid: ^3.1.0 - checksum: 3e80579733bd3fdc0f878cecafc7f1546c880c8d21fae542b65543b7efa07e1dc9e1279ee7e11d396e56b462324f11ebe6cb2cf50786a598c5f3b877e730698f - languageName: node - linkType: hard - "webpack-merge@npm:^5.7.3, webpack-merge@npm:^5.8.0": version: 5.8.0 resolution: "webpack-merge@npm:5.8.0"