diff --git a/docs/reference/react-integration.md b/docs/reference/react-integration.md index 94d6d9589..18c2cc93c 100644 --- a/docs/reference/react-integration.md +++ b/docs/reference/react-integration.md @@ -138,7 +138,7 @@ When the route is rendered lazily with components using `React.lazy` or a simila ```js import React, { Component, Suspense, lazy } from 'react' -import { Route, Switch } from 'react-router-dom' +import { Route, Switch } from 'react-router' import { withTransaction } from '@elastic/apm-rum-react' const Loading = () =>
Loading
@@ -157,6 +157,4 @@ function Routes() { // lazy-component.jsx class LazyComponent extends Component {} export default withTransaction('LazyComponent', 'component')(LazyComponent) -``` - - +``` \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 4a676a4d4..0f41a2d70 100644 --- a/package-lock.json +++ b/package-lock.json @@ -110,7 +110,6 @@ "react": "^17.0.2", "react-dom": "^17.0.2", "react-router": "^6.14.2", - "react-router-dom": "^6.14.2", "regenerator-runtime": "^0.13.3", "rimraf": "^3.0.0", "rxjs": "^6.6.6", @@ -41058,23 +41057,6 @@ "react": ">=16.8" } }, - "node_modules/react-router-dom": { - "version": "6.14.2", - "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.14.2.tgz", - "integrity": "sha512-5pWX0jdKR48XFZBuJqHosX3AAHjRAzygouMTyimnBPOLdY3WjzUSKhus2FVMihUFWzeLebDgr4r8UeQFAct7Bg==", - "dev": true, - "dependencies": { - "@remix-run/router": "1.7.2", - "react-router": "6.14.2" - }, - "engines": { - "node": ">=14" - }, - "peerDependencies": { - "react": ">=16.8", - "react-dom": ">=16.8" - } - }, "node_modules/react-shallow-renderer": { "version": "16.14.1", "resolved": "https://registry.npmjs.org/react-shallow-renderer/-/react-shallow-renderer-16.14.1.tgz", @@ -49833,7 +49815,7 @@ }, "peerDependencies": { "react": ">16.0.0", - "react-router-dom": ">=6.0.0" + "react-router": ">=6.0.0" } }, "packages/rum-react/node_modules/hoist-non-react-statics": { diff --git a/package.json b/package.json index 57f8a317d..5c62797bc 100644 --- a/package.json +++ b/package.json @@ -165,7 +165,6 @@ "react": "^17.0.2", "react-dom": "^17.0.2", "react-router": "^6.14.2", - "react-router-dom": "^6.14.2", "regenerator-runtime": "^0.13.3", "rimraf": "^3.0.0", "rxjs": "^6.6.6", diff --git a/packages/rum-react/package.json b/packages/rum-react/package.json index f39d50e7f..b64799a51 100644 --- a/packages/rum-react/package.json +++ b/packages/rum-react/package.json @@ -46,7 +46,7 @@ }, "peerDependencies": { "react": ">16.0.0", - "react-router-dom": ">=6.0.0" + "react-router": ">=6.0.0" }, "browserslist": [ "ie 11" diff --git a/packages/rum-react/src/get-apm-routes.js b/packages/rum-react/src/get-apm-routes.js index 0fea1ed2f..8e1b9bb5f 100644 --- a/packages/rum-react/src/get-apm-routes.js +++ b/packages/rum-react/src/get-apm-routes.js @@ -31,7 +31,7 @@ import { useNavigationType, matchRoutes, createRoutesFromChildren -} from 'react-router-dom' +} from 'react-router' import hoistNonReactStatics from 'hoist-non-react-statics' function getApmRoutes(apm) { diff --git a/packages/rum-react/test/e2e/with-router/general.js b/packages/rum-react/test/e2e/with-router/general.js index ab6d4b044..57d00f7bb 100644 --- a/packages/rum-react/test/e2e/with-router/general.js +++ b/packages/rum-react/test/e2e/with-router/general.js @@ -27,13 +27,7 @@ import '@babel/polyfill' import 'whatwg-fetch' import React, { Suspense, lazy } from 'react' import { render } from 'react-dom' -import { - BrowserRouter, - Route, - Link, - Navigate, - useLocation -} from 'react-router-dom' +import { BrowserRouter, Route, Link, Navigate, useLocation } from 'react-router' import MainComponent from '../components/main-component' import TopicComponent from '../components/topic-component' import FunctionalComponent from '../components/func-component' diff --git a/packages/rum-react/test/e2e/with-router/routes.js b/packages/rum-react/test/e2e/with-router/routes.js index 640dca087..fd5bded4c 100644 --- a/packages/rum-react/test/e2e/with-router/routes.js +++ b/packages/rum-react/test/e2e/with-router/routes.js @@ -27,13 +27,7 @@ import '@babel/polyfill' import 'whatwg-fetch' import React, { Suspense } from 'react' import { render } from 'react-dom' -import { - BrowserRouter, - Link, - Route, - Navigate, - useLocation -} from 'react-router-dom' +import { BrowserRouter, Link, Route, Navigate, useLocation } from 'react-router' import FunctionalComponent from '../components/func-component' import { ApmRoutes } from '../../../src' import createApmBase from '..' diff --git a/packages/rum-react/test/specs/get-apm-routes.spec.js b/packages/rum-react/test/specs/get-apm-routes.spec.js index d1c72cd43..05d7eb24b 100644 --- a/packages/rum-react/test/specs/get-apm-routes.spec.js +++ b/packages/rum-react/test/specs/get-apm-routes.spec.js @@ -41,7 +41,7 @@ import { useLocation, useSearchParams, Navigate -} from 'react-router-dom' +} from 'react-router' import { ApmBase } from '@elastic/apm-rum' import { createServiceFactory,