Skip to content

Commit 89cfb79

Browse files
committed
chore: replace react-router-dom with react-router
1 parent 3640506 commit 89cfb79

File tree

8 files changed

+8
-41
lines changed

8 files changed

+8
-41
lines changed

docs/reference/react-integration.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ When the route is rendered lazily with components using `React.lazy` or a simila
138138

139139
```js
140140
import React, { Component, Suspense, lazy } from 'react'
141-
import { Route, Switch } from 'react-router-dom'
141+
import { Route, Switch } from 'react-router'
142142
import { withTransaction } from '@elastic/apm-rum-react'
143143

144144
const Loading = () => <div>Loading</div>
@@ -157,6 +157,4 @@ function Routes() {
157157
// lazy-component.jsx
158158
class LazyComponent extends Component {}
159159
export default withTransaction('LazyComponent', 'component')(LazyComponent)
160-
```
161-
162-
160+
```

package-lock.json

Lines changed: 1 addition & 19 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,6 @@
165165
"react": "^17.0.2",
166166
"react-dom": "^17.0.2",
167167
"react-router": "^6.14.2",
168-
"react-router-dom": "^6.14.2",
169168
"regenerator-runtime": "^0.13.3",
170169
"rimraf": "^3.0.0",
171170
"rxjs": "^6.6.6",

packages/rum-react/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
},
4747
"peerDependencies": {
4848
"react": ">16.0.0",
49-
"react-router-dom": ">=6.0.0"
49+
"react-router": ">=6.0.0"
5050
},
5151
"browserslist": [
5252
"ie 11"

packages/rum-react/src/get-apm-routes.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import {
3131
useNavigationType,
3232
matchRoutes,
3333
createRoutesFromChildren
34-
} from 'react-router-dom'
34+
} from 'react-router'
3535
import hoistNonReactStatics from 'hoist-non-react-statics'
3636

3737
function getApmRoutes(apm) {

packages/rum-react/test/e2e/with-router/general.js

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,7 @@ import '@babel/polyfill'
2727
import 'whatwg-fetch'
2828
import React, { Suspense, lazy } from 'react'
2929
import { render } from 'react-dom'
30-
import {
31-
BrowserRouter,
32-
Route,
33-
Link,
34-
Navigate,
35-
useLocation
36-
} from 'react-router-dom'
30+
import { BrowserRouter, Route, Link, Navigate, useLocation } from 'react-router'
3731
import MainComponent from '../components/main-component'
3832
import TopicComponent from '../components/topic-component'
3933
import FunctionalComponent from '../components/func-component'

packages/rum-react/test/e2e/with-router/routes.js

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,7 @@ import '@babel/polyfill'
2727
import 'whatwg-fetch'
2828
import React, { Suspense } from 'react'
2929
import { render } from 'react-dom'
30-
import {
31-
BrowserRouter,
32-
Link,
33-
Route,
34-
Navigate,
35-
useLocation
36-
} from 'react-router-dom'
30+
import { BrowserRouter, Link, Route, Navigate, useLocation } from 'react-router'
3731
import FunctionalComponent from '../components/func-component'
3832
import { ApmRoutes } from '../../../src'
3933
import createApmBase from '..'

packages/rum-react/test/specs/get-apm-routes.spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ import {
4141
useLocation,
4242
useSearchParams,
4343
Navigate
44-
} from 'react-router-dom'
44+
} from 'react-router'
4545
import { ApmBase } from '@elastic/apm-rum'
4646
import {
4747
createServiceFactory,

0 commit comments

Comments
 (0)