Skip to content

Commit a9ea198

Browse files
abhinavsauAbhinav Sau
and
Abhinav Sau
authored
feat: replace react-router with react-router-dom (#125)
* feat: replace react-router with react-router-dom * chore: increment version Co-authored-by: Abhinav Sau <[email protected]>
1 parent d548a9b commit a9ea198

File tree

5 files changed

+60
-22
lines changed

5 files changed

+60
-22
lines changed

package.json

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "react-router-breadcrumbs-hoc",
3-
"version": "4.0.1",
3+
"version": "4.1.0",
44
"description": "small, flexible, higher order component for rendering breadcrumbs with react-router 4.x",
55
"repository": "icd2k3/react-router-breadcrumbs-hoc",
66
"main": "dist/cjs/index.js",
@@ -21,7 +21,7 @@
2121
"license": "MIT",
2222
"peerDependencies": {
2323
"react": ">=16.8",
24-
"react-router": ">=5"
24+
"react-router-dom": ">=5"
2525
},
2626
"devDependencies": {
2727
"@babel/cli": "^7.14.5",
@@ -36,7 +36,7 @@
3636
"@rollup/plugin-typescript": "^8.2.1",
3737
"@types/react": "^17.0.11",
3838
"@types/react-dom": "^17.0.7",
39-
"@types/react-router": "^5.1.15",
39+
"@types/react-router-dom": "^5.3.0",
4040
"@typescript-eslint/eslint-plugin": "^4.26.1",
4141
"@typescript-eslint/parser": "^4.26.1",
4242
"@wojtekmaj/enzyme-adapter-react-17": "^0.6.1",
@@ -56,7 +56,7 @@
5656
"prop-types": "^15.7.2",
5757
"react": "17.0.2",
5858
"react-dom": "17.0.2",
59-
"react-router": "^5.2.0",
59+
"react-router-dom": "^5.3.0",
6060
"rollup": "^2.51.1",
6161
"rollup-plugin-size": "^0.2.2",
6262
"rollup-plugin-terser": "^7.0.2",
@@ -68,6 +68,7 @@
6868
"breadcrumbs",
6969
"react-router",
7070
"react-router 4",
71-
"react-router 5"
71+
"react-router 5",
72+
"react-router-dom"
7273
]
7374
}

rollup.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ const formats = [
2727

2828
const globals = {
2929
react: 'React',
30-
'react-router': 'ReactRouter',
30+
'react-router-dom': 'ReactRouterDom',
3131
};
3232

3333
export default formats.map(({ plugins, file, format }) => ({

src/index.test.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import React from 'react';
55
import PropTypes from 'prop-types';
66
import { mount } from 'enzyme';
7-
import { MemoryRouter as Router } from 'react-router';
7+
import { MemoryRouter as Router, NavLink } from 'react-router-dom';
88
import withBreadcrumbs, { getBreadcrumbs } from './index.tsx';
99

1010
// imports to test compiled builds
@@ -31,7 +31,7 @@ const components = {
3131
</h1>
3232
),
3333
BreadcrumbMatchTest: ({ match }) => <span>{match.params.number}</span>,
34-
BreadcrumbNavLinkTest: ({ match }) => <a to={match.url}>Link</a>,
34+
BreadcrumbNavLinkTest: ({ match }) => <NavLink to={match.url}>Link</NavLink>,
3535
BreadcrumbLocationTest: ({ location: { state: { isLocationTest } } }) => (
3636
<span>
3737
{isLocationTest ? 'pass' : 'fail'}
@@ -150,7 +150,7 @@ describe('react-router-breadcrumbs-hoc', () => {
150150
];
151151
const { breadcrumbs, wrapper } = render({ pathname: '/1/2/3/4', routes });
152152
expect(breadcrumbs).toBe('Home / One / TWO / 3 / Link');
153-
expect(wrapper.find('a').props().to).toBe('/1/2/3/4');
153+
expect(wrapper.find('NavLink').props().to).toBe('/1/2/3/4');
154154
});
155155
});
156156

src/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
*/
2020

2121
import React, { createElement } from 'react';
22-
import { useLocation, matchPath } from 'react-router';
22+
import { useLocation, matchPath } from 'react-router-dom';
2323

2424
const DEFAULT_MATCH_OPTIONS = { exact: true };
2525
const NO_BREADCRUMB = 'NO_BREADCRUMB';

yarn.lock

Lines changed: 49 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1364,6 +1364,15 @@ __metadata:
13641364
languageName: node
13651365
linkType: hard
13661366

1367+
"@babel/runtime@npm:^7.12.13":
1368+
version: 7.15.4
1369+
resolution: "@babel/runtime@npm:7.15.4"
1370+
dependencies:
1371+
regenerator-runtime: ^0.13.4
1372+
checksum: 64b6c250fd02a664f40835b7bfc3ec0b473d251bf4881b06b689b60662bf2ae17adc6fa32fb0e0de308de5d4bc383738c6030ad93d823066fb9fd7c18f552b56
1373+
languageName: node
1374+
linkType: hard
1375+
13671376
"@babel/template@npm:^7.14.5, @babel/template@npm:^7.3.3":
13681377
version: 7.14.5
13691378
resolution: "@babel/template@npm:7.14.5"
@@ -2097,13 +2106,24 @@ __metadata:
20972106
languageName: node
20982107
linkType: hard
20992108

2100-
"@types/react-router@npm:^5.1.15":
2101-
version: 5.1.15
2102-
resolution: "@types/react-router@npm:5.1.15"
2109+
"@types/react-router-dom@npm:^5.3.0":
2110+
version: 5.3.1
2111+
resolution: "@types/react-router-dom@npm:5.3.1"
2112+
dependencies:
2113+
"@types/history": "*"
2114+
"@types/react": "*"
2115+
"@types/react-router": "*"
2116+
checksum: ce430ff0e2e595d8af4ce672e364a3e366de711e3556223738950bb28332ea1cf3efa8176d8f37a5c2f8e49b1abbb2b03ee607b7ec49171d249cbfec346a4808
2117+
languageName: node
2118+
linkType: hard
2119+
2120+
"@types/react-router@npm:*":
2121+
version: 5.1.17
2122+
resolution: "@types/react-router@npm:5.1.17"
21032123
dependencies:
21042124
"@types/history": "*"
21052125
"@types/react": "*"
2106-
checksum: 6761d711ed42c4c3bc75c84aa486119d440bdab8025ef8602f189ad309d48f57a28dabfad3d2791133279fd8d65e962ad09a752eb54ff946a569e89ffc942fb6
2126+
checksum: 1194b2bc49ea663232c211e7d912c9092f78b69ee14a2602569070b7749cc77e50947bf8399fc55256bb6db252536d9d733ef307b18569cee670d48dfae0b7a2
21072127
languageName: node
21082128
linkType: hard
21092129

@@ -7796,7 +7816,7 @@ __metadata:
77967816
"@rollup/plugin-typescript": ^8.2.1
77977817
"@types/react": ^17.0.11
77987818
"@types/react-dom": ^17.0.7
7799-
"@types/react-router": ^5.1.15
7819+
"@types/react-router-dom": ^5.3.0
78007820
"@typescript-eslint/eslint-plugin": ^4.26.1
78017821
"@typescript-eslint/parser": ^4.26.1
78027822
"@wojtekmaj/enzyme-adapter-react-17": ^0.6.1
@@ -7816,22 +7836,39 @@ __metadata:
78167836
prop-types: ^15.7.2
78177837
react: 17.0.2
78187838
react-dom: 17.0.2
7819-
react-router: ^5.2.0
7839+
react-router-dom: ^5.3.0
78207840
rollup: ^2.51.1
78217841
rollup-plugin-size: ^0.2.2
78227842
rollup-plugin-terser: ^7.0.2
78237843
typescript: 4.3.2
78247844
peerDependencies:
78257845
react: ">=16.8"
7826-
react-router: ">=5"
7846+
react-router-dom: ">=5"
78277847
languageName: unknown
78287848
linkType: soft
78297849

7830-
"react-router@npm:^5.2.0":
7831-
version: 5.2.0
7832-
resolution: "react-router@npm:5.2.0"
7850+
"react-router-dom@npm:^5.3.0":
7851+
version: 5.3.0
7852+
resolution: "react-router-dom@npm:5.3.0"
78337853
dependencies:
7834-
"@babel/runtime": ^7.1.2
7854+
"@babel/runtime": ^7.12.13
7855+
history: ^4.9.0
7856+
loose-envify: ^1.3.1
7857+
prop-types: ^15.6.2
7858+
react-router: 5.2.1
7859+
tiny-invariant: ^1.0.2
7860+
tiny-warning: ^1.0.0
7861+
peerDependencies:
7862+
react: ">=15"
7863+
checksum: 921c7f08354c6d7a64682d6015b46aec4d7cd89d5d3b0b9e478330630cf1c5de4adc8e5a28b871246bb91c86dc679790c76cccfefad4d4bfd3860655b0778fb3
7864+
languageName: node
7865+
linkType: hard
7866+
7867+
"react-router@npm:5.2.1":
7868+
version: 5.2.1
7869+
resolution: "react-router@npm:5.2.1"
7870+
dependencies:
7871+
"@babel/runtime": ^7.12.13
78357872
history: ^4.9.0
78367873
hoist-non-react-statics: ^3.1.0
78377874
loose-envify: ^1.3.1
@@ -7843,7 +7880,7 @@ __metadata:
78437880
tiny-warning: ^1.0.0
78447881
peerDependencies:
78457882
react: ">=15"
7846-
checksum: 4437eaa9bab02d46a7d6ea4915731c1f31642d6c3e3f7b9f951f5c6a9a73f35d4deb43a2d6b4be85f27816a20de96c3b9a9239f4b7e9136742106794ad20e95c
7883+
checksum: fd2fb21a46caabd4cc8ebaeb54c1e74733658e90eee50fd585c52e37110576ac479072d919b8a422586c361f7939c2d43dbf6d072700f6c8342808839948088a
78477884
languageName: node
78487885
linkType: hard
78497886

0 commit comments

Comments
 (0)