Skip to content

Commit fbb9e40

Browse files
authored
Merge pull request #9409 from GilbertCherrie/upgrade_react_router
Upgrade react router
2 parents e147c66 + b569576 commit fbb9e40

File tree

2 files changed

+33
-50
lines changed

2 files changed

+33
-50
lines changed

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,8 @@
9393
"react-markdown": "6.0.0",
9494
"react-query": "^3.39.3",
9595
"react-redux": "^7.1.1",
96-
"react-router": "~5.1.2",
97-
"react-router-dom": "~5.1.2",
96+
"react-router": "~6.3.0",
97+
"react-router-dom": "~6.3.0",
9898
"react-wooden-tree": "^2.2.0",
9999
"redux": "^4.0.0",
100100
"redux-mock-store": "^1.5.3",

yarn.lock

Lines changed: 31 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1210,7 +1210,7 @@ __metadata:
12101210
languageName: node
12111211
linkType: hard
12121212

1213-
"@babel/runtime@npm:^7.1.2, @babel/runtime@npm:^7.10.0, @babel/runtime@npm:^7.10.2, @babel/runtime@npm:^7.11.2, @babel/runtime@npm:^7.12.1, @babel/runtime@npm:^7.15.4, @babel/runtime@npm:^7.16.7, @babel/runtime@npm:^7.19.4, @babel/runtime@npm:^7.23.8, @babel/runtime@npm:^7.3.1, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.6.2, @babel/runtime@npm:^7.6.3, @babel/runtime@npm:^7.7.2, @babel/runtime@npm:^7.8.3, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.9.1, @babel/runtime@npm:^7.9.2":
1213+
"@babel/runtime@npm:^7.1.2, @babel/runtime@npm:^7.10.0, @babel/runtime@npm:^7.10.2, @babel/runtime@npm:^7.11.2, @babel/runtime@npm:^7.15.4, @babel/runtime@npm:^7.16.7, @babel/runtime@npm:^7.19.4, @babel/runtime@npm:^7.23.8, @babel/runtime@npm:^7.3.1, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.6.2, @babel/runtime@npm:^7.6.3, @babel/runtime@npm:^7.7.2, @babel/runtime@npm:^7.7.6, @babel/runtime@npm:^7.8.3, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.9.1, @babel/runtime@npm:^7.9.2":
12141214
version: 7.27.0
12151215
resolution: "@babel/runtime@npm:7.27.0"
12161216
dependencies:
@@ -9012,7 +9012,7 @@ __metadata:
90129012
languageName: node
90139013
linkType: hard
90149014

9015-
"history@npm:^4.7.2, history@npm:^4.9.0":
9015+
"history@npm:^4.7.2":
90169016
version: 4.10.1
90179017
resolution: "history@npm:4.10.1"
90189018
dependencies:
@@ -9026,6 +9026,15 @@ __metadata:
90269026
languageName: node
90279027
linkType: hard
90289028

9029+
"history@npm:^5.2.0":
9030+
version: 5.3.0
9031+
resolution: "history@npm:5.3.0"
9032+
dependencies:
9033+
"@babel/runtime": "npm:^7.7.6"
9034+
checksum: 10/52ba685b842ca6438ff11ef459951eb13d413ae715866a8dc5f7c3b1ea0cdeb8db6aabf7254551b85f56abc205e6e2d7e1d5afb36b711b401cdaff4f2cf187e9
9035+
languageName: node
9036+
linkType: hard
9037+
90299038
"hmac-drbg@npm:^1.0.1":
90309039
version: 1.0.1
90319040
resolution: "hmac-drbg@npm:1.0.1"
@@ -9037,7 +9046,7 @@ __metadata:
90379046
languageName: node
90389047
linkType: hard
90399048

9040-
"hoist-non-react-statics@npm:^3.1.0, hoist-non-react-statics@npm:^3.2.0, hoist-non-react-statics@npm:^3.3.0, hoist-non-react-statics@npm:^3.3.2":
9049+
"hoist-non-react-statics@npm:^3.2.0, hoist-non-react-statics@npm:^3.3.0, hoist-non-react-statics@npm:^3.3.2":
90419050
version: 3.3.2
90429051
resolution: "hoist-non-react-statics@npm:3.3.2"
90439052
dependencies:
@@ -11556,7 +11565,7 @@ __metadata:
1155611565
languageName: node
1155711566
linkType: hard
1155811567

11559-
"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":
11568+
"loose-envify@npm:^1.0.0, loose-envify@npm:^1.1.0, loose-envify@npm:^1.2.0, loose-envify@npm:^1.4.0":
1156011569
version: 1.4.0
1156111570
resolution: "loose-envify@npm:1.4.0"
1156211571
dependencies:
@@ -11752,8 +11761,8 @@ __metadata:
1175211761
react-markdown: "npm:6.0.0"
1175311762
react-query: "npm:^3.39.3"
1175411763
react-redux: "npm:^7.1.1"
11755-
react-router: "npm:~5.1.2"
11756-
react-router-dom: "npm:~5.1.2"
11764+
react-router: "npm:~6.3.0"
11765+
react-router-dom: "npm:~6.3.0"
1175711766
react-test-renderer: "npm:~16.8.0"
1175811767
react-wooden-tree: "npm:^2.2.0"
1175911768
redux: "npm:^4.0.0"
@@ -12092,19 +12101,6 @@ __metadata:
1209212101
languageName: node
1209312102
linkType: hard
1209412103

12095-
"mini-create-react-context@npm:^0.3.0":
12096-
version: 0.3.3
12097-
resolution: "mini-create-react-context@npm:0.3.3"
12098-
dependencies:
12099-
"@babel/runtime": "npm:^7.12.1"
12100-
tiny-warning: "npm:^1.0.3"
12101-
peerDependencies:
12102-
prop-types: ^15.0.0
12103-
react: ^0.14.0 || ^15.0.0 || ^16.0.0 || ^17.0.0
12104-
checksum: 10/49bca27d307f43f5f9bfabaa64dda17c0d4b48f5026f004be92e6e986ea1515b40019c0648bc106a19bd0e0c4d09bd702e0a7fc42347667142494c9ee670a38f
12105-
languageName: node
12106-
linkType: hard
12107-
1210812104
"minimalistic-assert@npm:^1.0.0, minimalistic-assert@npm:^1.0.1":
1210912105
version: 1.0.1
1211012106
resolution: "minimalistic-assert@npm:1.0.1"
@@ -14620,7 +14616,7 @@ __metadata:
1462014616
languageName: node
1462114617
linkType: hard
1462214618

14623-
"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.4, react-is@npm:^16.8.6":
14619+
"react-is@npm:^16.12.0, react-is@npm:^16.13.1, react-is@npm:^16.3.2, react-is@npm:^16.7.0, react-is@npm:^16.8.4, react-is@npm:^16.8.6":
1462414620
version: 16.13.1
1462514621
resolution: "react-is@npm:16.13.1"
1462614622
checksum: 10/5aa564a1cde7d391ac980bedee21202fc90bdea3b399952117f54fb71a932af1e5902020144fb354b4690b2414a0c7aafe798eb617b76a3d441d956db7726fdf
@@ -14752,40 +14748,27 @@ __metadata:
1475214748
languageName: node
1475314749
linkType: hard
1475414750

14755-
"react-router-dom@npm:~5.1.2":
14756-
version: 5.1.2
14757-
resolution: "react-router-dom@npm:5.1.2"
14751+
"react-router-dom@npm:~6.3.0":
14752+
version: 6.3.0
14753+
resolution: "react-router-dom@npm:6.3.0"
1475814754
dependencies:
14759-
"@babel/runtime": "npm:^7.1.2"
14760-
history: "npm:^4.9.0"
14761-
loose-envify: "npm:^1.3.1"
14762-
prop-types: "npm:^15.6.2"
14763-
react-router: "npm:5.1.2"
14764-
tiny-invariant: "npm:^1.0.2"
14765-
tiny-warning: "npm:^1.0.0"
14755+
history: "npm:^5.2.0"
14756+
react-router: "npm:6.3.0"
1476614757
peerDependencies:
14767-
react: ">=15"
14768-
checksum: 10/a6225fc454780db6afa5da97ac862abe8514f373a6c81d59a8c4d15c6c42eac0ccce76a468ec0ca216d327e84640561fc12af9759de4e12be09ed7fe1db08bb2
14758+
react: ">=16.8"
14759+
react-dom: ">=16.8"
14760+
checksum: 10/84fe5cd522f9faaff931fc78498b73af54bee66483a67def53090ae493544129c632510d3a87d24ada2e9f56cd72ae61bbb1ba71090863dfd04f06e697685757
1476914761
languageName: node
1477014762
linkType: hard
1477114763

14772-
"react-router@npm:5.1.2, react-router@npm:~5.1.2":
14773-
version: 5.1.2
14774-
resolution: "react-router@npm:5.1.2"
14764+
"react-router@npm:6.3.0, react-router@npm:~6.3.0":
14765+
version: 6.3.0
14766+
resolution: "react-router@npm:6.3.0"
1477514767
dependencies:
14776-
"@babel/runtime": "npm:^7.1.2"
14777-
history: "npm:^4.9.0"
14778-
hoist-non-react-statics: "npm:^3.1.0"
14779-
loose-envify: "npm:^1.3.1"
14780-
mini-create-react-context: "npm:^0.3.0"
14781-
path-to-regexp: "npm:^1.7.0"
14782-
prop-types: "npm:^15.6.2"
14783-
react-is: "npm:^16.6.0"
14784-
tiny-invariant: "npm:^1.0.2"
14785-
tiny-warning: "npm:^1.0.0"
14768+
history: "npm:^5.2.0"
1478614769
peerDependencies:
14787-
react: ">=15"
14788-
checksum: 10/bba4a23090fa02364e21e03ad7b2ff4136ff262871be197b3031e4a03180e36bc9f03fc91c060ebbca58e00d4b59d3a99281a6ef26b6dea37479a5097b8ca2e2
14770+
react: ">=16.8"
14771+
checksum: 10/eadb572d1d8192e19e9b74248a965af7bbb0ee24428c4cd3e7894146cd1f5a82823c22f52c7969badc5276271084078eb1c35aa19689f099316e05534da3a3db
1478914772
languageName: node
1479014773
linkType: hard
1479114774

@@ -17270,7 +17253,7 @@ __metadata:
1727017253
languageName: node
1727117254
linkType: hard
1727217255

17273-
"tiny-warning@npm:^1.0.0, tiny-warning@npm:^1.0.2, tiny-warning@npm:^1.0.3":
17256+
"tiny-warning@npm:^1.0.0, tiny-warning@npm:^1.0.2":
1727417257
version: 1.0.3
1727517258
resolution: "tiny-warning@npm:1.0.3"
1727617259
checksum: 10/da62c4acac565902f0624b123eed6dd3509bc9a8d30c06e017104bedcf5d35810da8ff72864400ad19c5c7806fc0a8323c68baf3e326af7cb7d969f846100d71

0 commit comments

Comments
 (0)