Skip to content

Commit 8e4f147

Browse files
ryanflorenceryanflorence
committed
Merge branch 'dev'
2 parents 8331fcb + 382c792 commit 8e4f147

File tree

40 files changed

+2777
-1447
lines changed

40 files changed

+2777
-1447
lines changed

‎.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,7 @@ node_modules/
1414
/packages/*/esm/
1515
/packages/*/umd/
1616

17+
# compat module copies
18+
/packages/react-router-dom-v5-compat/react-router-dom
19+
1720
.eslintcache

‎contributors.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@
4040
- paulsmithkc
4141
- petersendidit
4242
- RobHannay
43+
- ryanflorence
44+
- rtmann
4345
- sanketshah19
4446
- sergiodxa
4547
- shamsup

‎examples/auth/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
"history": "^5.2.0",
1111
"react": "^17.0.2",
1212
"react-dom": "^17.0.2",
13-
"react-router-dom": "6.2.2",
14-
"react-router": "6.2.2"
13+
"react-router-dom": "6.3.0",
14+
"react-router": "6.3.0"
1515
},
1616
"devDependencies": {
1717
"@rollup/plugin-replace": "^3.0.0",

‎examples/basic/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
"history": "^5.2.0",
1111
"react": "^17.0.2",
1212
"react-dom": "^17.0.2",
13-
"react-router-dom": "6.2.2",
14-
"react-router": "6.2.2"
13+
"react-router-dom": "6.3.0",
14+
"react-router": "6.3.0"
1515
},
1616
"devDependencies": {
1717
"@rollup/plugin-replace": "^2.2.1",

‎examples/custom-filter-link/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
"history": "^5.2.0",
1212
"react": "^17.0.2",
1313
"react-dom": "^17.0.2",
14-
"react-router-dom": "6.2.2",
15-
"react-router": "6.2.2"
14+
"react-router-dom": "6.3.0",
15+
"react-router": "6.3.0"
1616
},
1717
"devDependencies": {
1818
"@rollup/plugin-replace": "^3.0.0",

‎examples/custom-link/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
"history": "^5.2.0",
1111
"react": "^17.0.2",
1212
"react-dom": "^17.0.2",
13-
"react-router-dom": "6.2.2",
14-
"react-router": "6.2.2"
13+
"react-router-dom": "6.3.0",
14+
"react-router": "6.3.0"
1515
},
1616
"devDependencies": {
1717
"@rollup/plugin-replace": "^2.2.1",

‎examples/custom-query-parsing/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
"jsurl": "0.1.5",
1212
"react": "^17.0.2",
1313
"react-dom": "^17.0.2",
14-
"react-router-dom": "6.2.2",
15-
"react-router": "6.2.2"
14+
"react-router-dom": "6.3.0",
15+
"react-router": "6.3.0"
1616
},
1717
"devDependencies": {
1818
"@rollup/plugin-replace": "^2.2.1",

‎examples/lazy-loading/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
"history": "^5.2.0",
1111
"react": "^17.0.2",
1212
"react-dom": "^17.0.2",
13-
"react-router-dom": "6.2.2",
14-
"react-router": "6.2.2"
13+
"react-router-dom": "6.3.0",
14+
"react-router": "6.3.0"
1515
},
1616
"devDependencies": {
1717
"@rollup/plugin-replace": "^2.2.1",

‎examples/modal/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
"history": "^5.2.0",
1212
"react": "^17.0.2",
1313
"react-dom": "^17.0.2",
14-
"react-router-dom": "6.2.2",
15-
"react-router": "6.2.2"
14+
"react-router-dom": "6.3.0",
15+
"react-router": "6.3.0"
1616
},
1717
"devDependencies": {
1818
"@rollup/plugin-replace": "^2.2.1",

‎examples/multi-app/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
"history": "^5.2.0",
1515
"react": "^17.0.2",
1616
"react-dom": "^17.0.2",
17-
"react-router-dom": "6.2.2",
18-
"react-router": "6.2.2"
17+
"react-router-dom": "6.3.0",
18+
"react-router": "6.3.0"
1919
},
2020
"devDependencies": {
2121
"@rollup/plugin-replace": "^3.0.0",

0 commit comments

Comments
 (0)