Skip to content

Commit

Permalink
upgrade to react-router v7
Browse files Browse the repository at this point in the history
  • Loading branch information
jonesmac committed Dec 18, 2024
1 parent 38c2dc0 commit a969b90
Show file tree
Hide file tree
Showing 12 changed files with 80 additions and 53 deletions.
6 changes: 3 additions & 3 deletions packages/appbar/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
"@xylabs/tsconfig-react": "^4.2.4",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-router-dom": "^6.28.0",
"react-router-dom": "^7.0.2",
"storybook": "^8.4.7",
"typescript": "^5.7.2"
},
Expand All @@ -61,9 +61,9 @@
"@mui/material": "^6",
"react": "^18",
"react-dom": "^18",
"react-router-dom": "^6"
"react-router-dom": "^7"
},
"publishConfig": {
"access": "public"
}
}
}
6 changes: 3 additions & 3 deletions packages/base-page/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
"@xylabs/tsconfig-react": "^4.2.4",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-router-dom": "^6.28.0",
"react-router-dom": "^7.0.2",
"storybook": "^8.4.7",
"typescript": "^5.7.2"
},
Expand All @@ -62,9 +62,9 @@
"@mui/material": "^6",
"react": "^18",
"react-dom": "^18",
"react-router-dom": "^6"
"react-router-dom": "^7"
},
"publishConfig": {
"access": "public"
}
}
}
2 changes: 1 addition & 1 deletion packages/button/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"dependencies": {
"@xylabs/react-pixel": "workspace:^",
"@xylabs/react-shared": "workspace:^",
"react-router-dom": "^6.28.0"
"react-router-dom": "^7.0.2"
},
"devDependencies": {
"@mui/material": "^6.2.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/common/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
"@xylabs/react-flexbox": "workspace:^",
"@xylabs/react-portal": "workspace:^",
"@xylabs/react-select": "workspace:^",
"react-router-dom": "^6.28.0"
"react-router-dom": "^7.0.2"
},
"devDependencies": {
"@mui/material": "^6.2.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/crypto/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
"@xylabs/react-promise": "workspace:^",
"ethers": "^6.13.4",
"lru-cache": "^11.0.2",
"react-router-dom": "^6.28.0",
"react-router-dom": "^7.0.2",
"viem": "^2.21.55",
"webextension-polyfill": "^0.12.0"
},
Expand Down
6 changes: 3 additions & 3 deletions packages/error/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
"@xylabs/tsconfig-react": "^4.2.4",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-router-dom": "^6.28.0",
"react-router-dom": "^7.0.2",
"storybook": "^8.4.7",
"typescript": "^5.7.2"
},
Expand All @@ -60,7 +60,7 @@
"@mui/material": "^6",
"react": "^18",
"react-dom": "^18",
"react-router-dom": "^6",
"react-router-dom": "^7",
"rollbar": "^2.26.4"
},
"peerDependenciesMeta": {
Expand All @@ -71,4 +71,4 @@
"publishConfig": {
"access": "public"
}
}
}
6 changes: 3 additions & 3 deletions packages/hooks/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"@xylabs/tsconfig-react": "^4.2.4",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-router-dom": "^6.28.0",
"react-router-dom": "^7.0.2",
"storybook": "^8.4.7",
"typescript": "^5.7.2"
},
Expand All @@ -53,9 +53,9 @@
"@mui/material": "^6",
"react": "^18",
"react-dom": "^18",
"react-router-dom": "^6"
"react-router-dom": "^7"
},
"publishConfig": {
"access": "public"
}
}
}
4 changes: 2 additions & 2 deletions packages/link/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
],
"dependencies": {
"@xylabs/react-pixel": "workspace:^",
"react-router-dom": "^6.28.0"
"react-router-dom": "^7.0.2"
},
"devDependencies": {
"@mui/material": "^6.2.1",
Expand All @@ -50,7 +50,7 @@
"@xylabs/tsconfig-react": "^4.2.4",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-router-dom": "^6.28.0",
"react-router-dom": "^7.0.2",
"storybook": "^8.4.7",
"typescript": "^5.7.2"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/scroll-to-top/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"packages/*"
],
"dependencies": {
"react-router-dom": "^6.28.0"
"react-router-dom": "^7.0.2"
},
"devDependencies": {
"@types/react": "^18.3.17",
Expand Down
4 changes: 2 additions & 2 deletions packages/theme/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"@xylabs/react-flexbox": "workspace:^",
"@xylabs/react-invertible-theme": "workspace:^",
"react-dom": "^18.3.1",
"react-router-dom": "^6.28.0",
"react-router-dom": "^7.0.2",
"recharts": "^2.15.0"
},
"devDependencies": {
Expand All @@ -56,7 +56,7 @@
"@xylabs/tsconfig-react": "^4.2.4",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-router-dom": "^6.28.0",
"react-router-dom": "^7.0.2",
"recharts": "^2.15.0",
"storybook": "^8.4.7",
"typescript": "^5.7.2"
Expand Down
2 changes: 1 addition & 1 deletion packages/webapp/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-helmet": "^6.1.0",
"react-router-dom": "^6.28.0"
"react-router-dom": "^7.0.2"
},
"devDependencies": {
"@storybook/react": "^8.4.7",
Expand Down
91 changes: 59 additions & 32 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2876,13 +2876,6 @@ __metadata:
languageName: node
linkType: hard

"@remix-run/router@npm:1.21.0":
version: 1.21.0
resolution: "@remix-run/router@npm:1.21.0"
checksum: 10c0/570792211c083a1c7146613b79cbb8e0d1e14f34e974052e060e7f9dcad38c800d80fe0a18bf42811bc278ab12c0e8fd62cfce649e905046c4e55bd5a09eafdc
languageName: node
linkType: hard

"@rollbar/react@npm:0.12.0-beta":
version: 0.12.0-beta
resolution: "@rollbar/react@npm:0.12.0-beta"
Expand Down Expand Up @@ -3943,6 +3936,13 @@ __metadata:
languageName: node
linkType: hard

"@types/cookie@npm:^0.6.0":
version: 0.6.0
resolution: "@types/cookie@npm:0.6.0"
checksum: 10c0/5b326bd0188120fb32c0be086b141b1481fec9941b76ad537f9110e10d61ee2636beac145463319c71e4be67a17e85b81ca9e13ceb6e3bb63b93d16824d6c149
languageName: node
linkType: hard

"@types/css-font-loading-module@npm:0.0.7":
version: 0.0.7
resolution: "@types/css-font-loading-module@npm:0.0.7"
Expand Down Expand Up @@ -4896,7 +4896,7 @@ __metadata:
"@xylabs/tsconfig-react": "npm:^4.2.4"
react: "npm:^18.3.1"
react-dom: "npm:^18.3.1"
react-router-dom: "npm:^6.28.0"
react-router-dom: "npm:^7.0.2"
storybook: "npm:^8.4.7"
typescript: "npm:^5.7.2"
peerDependencies:
Expand Down Expand Up @@ -4945,7 +4945,7 @@ __metadata:
react: "npm:^18.3.1"
react-dom: "npm:^18.3.1"
react-helmet: "npm:^6.1.0"
react-router-dom: "npm:^6.28.0"
react-router-dom: "npm:^7.0.2"
storybook: "npm:^8.4.7"
typescript: "npm:^5.7.2"
peerDependencies:
Expand All @@ -4971,7 +4971,7 @@ __metadata:
"@xylabs/tsconfig-react": "npm:^4.2.4"
react: "npm:^18.3.1"
react-dom: "npm:^18.3.1"
react-router-dom: "npm:^6.28.0"
react-router-dom: "npm:^7.0.2"
storybook: "npm:^8.4.7"
typescript: "npm:^5.7.2"
peerDependencies:
Expand All @@ -4998,7 +4998,7 @@ __metadata:
"@xylabs/tsconfig-react": "npm:^4.2.4"
react: "npm:^18.3.1"
react-dom: "npm:^18.3.1"
react-router-dom: "npm:^6.28.0"
react-router-dom: "npm:^7.0.2"
storybook: "npm:^8.4.7"
typescript: "npm:^5.7.2"
peerDependencies:
Expand Down Expand Up @@ -5058,7 +5058,7 @@ __metadata:
lru-cache: "npm:^11.0.2"
react: "npm:^18.3.1"
react-dom: "npm:^18.3.1"
react-router-dom: "npm:^6.28.0"
react-router-dom: "npm:^7.0.2"
storybook: "npm:^8.4.7"
typescript: "npm:^5.7.2"
viem: "npm:^2.21.55"
Expand Down Expand Up @@ -5110,7 +5110,7 @@ __metadata:
prop-types: "npm:^15.8.1"
react: "npm:^18.3.1"
react-dom: "npm:^18.3.1"
react-router-dom: "npm:^6.28.0"
react-router-dom: "npm:^7.0.2"
storybook: "npm:^8.4.7"
typescript: "npm:^5.7.2"
peerDependencies:
Expand Down Expand Up @@ -5186,7 +5186,7 @@ __metadata:
"@xylabs/tsconfig-react": "npm:^4.2.4"
react: "npm:^18.3.1"
react-dom: "npm:^18.3.1"
react-router-dom: "npm:^6.28.0"
react-router-dom: "npm:^7.0.2"
storybook: "npm:^8.4.7"
typescript: "npm:^5.7.2"
peerDependencies:
Expand Down Expand Up @@ -5258,7 +5258,7 @@ __metadata:
"@xylabs/tsconfig-react": "npm:^4.2.4"
react: "npm:^18.3.1"
react-dom: "npm:^18.3.1"
react-router-dom: "npm:^6.28.0"
react-router-dom: "npm:^7.0.2"
storybook: "npm:^8.4.7"
typescript: "npm:^5.7.2"
peerDependencies:
Expand Down Expand Up @@ -5459,7 +5459,7 @@ __metadata:
"@xylabs/tsconfig-react": "npm:^4.2.4"
react: "npm:^18.3.1"
react-dom: "npm:^18.3.1"
react-router-dom: "npm:^6.28.0"
react-router-dom: "npm:^7.0.2"
typescript: "npm:^5.7.2"
peerDependencies:
"@mui/material": ^6
Expand Down Expand Up @@ -5525,7 +5525,7 @@ __metadata:
"@xylabs/tsconfig-react": "npm:^4.2.4"
react: "npm:^18.3.1"
react-dom: "npm:^18.3.1"
react-router-dom: "npm:^6.28.0"
react-router-dom: "npm:^7.0.2"
recharts: "npm:^2.15.0"
storybook: "npm:^8.4.7"
typescript: "npm:^5.7.2"
Expand Down Expand Up @@ -5559,7 +5559,7 @@ __metadata:
react: "npm:^18.3.1"
react-dom: "npm:^18.3.1"
react-helmet: "npm:^6.1.0"
react-router-dom: "npm:^6.28.0"
react-router-dom: "npm:^7.0.2"
storybook: "npm:^8.4.7"
typescript: "npm:^5.7.2"
languageName: unknown
Expand Down Expand Up @@ -6884,6 +6884,13 @@ __metadata:
languageName: node
linkType: hard

"cookie@npm:^1.0.1":
version: 1.0.2
resolution: "cookie@npm:1.0.2"
checksum: 10c0/fd25fe79e8fbcfcaf6aa61cd081c55d144eeeba755206c058682257cb38c4bd6795c6620de3f064c740695bb65b7949ebb1db7a95e4636efb8357a335ad3f54b
languageName: node
linkType: hard

"cookiejar@npm:^2.1.4":
version: 2.1.4
resolution: "cookiejar@npm:2.1.4"
Expand Down Expand Up @@ -12685,27 +12692,33 @@ __metadata:
languageName: node
linkType: hard

"react-router-dom@npm:^6.28.0":
version: 6.28.0
resolution: "react-router-dom@npm:6.28.0"
"react-router-dom@npm:^7.0.2":
version: 7.0.2
resolution: "react-router-dom@npm:7.0.2"
dependencies:
"@remix-run/router": "npm:1.21.0"
react-router: "npm:6.28.0"
react-router: "npm:7.0.2"
peerDependencies:
react: ">=16.8"
react-dom: ">=16.8"
checksum: 10c0/e2930cf83e8c843a932b008c7ce11059fd83390502a433f0e41f192e3cb80081a621d069eeda7af3cf4bf74d7f8029f0141cdce741bca3f0af82d4bbbc7f7f10
react: ">=18"
react-dom: ">=18"
checksum: 10c0/eb6fe524792f6cf645872c15ed1beb6aeb778c7c5ebcf6c1d4ccf2bdab7a969313b3fc3b4ec6bc4516bbc91b238f0ef651d9ad2551b2aa9ea54b01653dcd1c98
languageName: node
linkType: hard

"react-router@npm:6.28.0":
version: 6.28.0
resolution: "react-router@npm:6.28.0"
"react-router@npm:7.0.2":
version: 7.0.2
resolution: "react-router@npm:7.0.2"
dependencies:
"@remix-run/router": "npm:1.21.0"
"@types/cookie": "npm:^0.6.0"
cookie: "npm:^1.0.1"
set-cookie-parser: "npm:^2.6.0"
turbo-stream: "npm:2.4.0"
peerDependencies:
react: ">=16.8"
checksum: 10c0/b435510de78fd882bf6ca9800a73cd90cee418bd1d19efd91b8dcaebde36929bbb589e25d9f7eec24ceb84255e8d538bc1fe54e6ddb5c43c32798e2b720fa76d
react: ">=18"
react-dom: ">=18"
peerDependenciesMeta:
react-dom:
optional: true
checksum: 10c0/f6c04939218a3d7f2b03b215c2299eab4dbb0dea4a16e0acfd8bf181ec69ff42d66abdba10a25cc3297c514f052a0d03bfb80431225eb763bb27e4e5b0b4a106
languageName: node
linkType: hard

Expand Down Expand Up @@ -14152,6 +14165,13 @@ __metadata:
languageName: node
linkType: hard

"set-cookie-parser@npm:^2.6.0":
version: 2.7.1
resolution: "set-cookie-parser@npm:2.7.1"
checksum: 10c0/060c198c4c92547ac15988256f445eae523f57f2ceefeccf52d30d75dedf6bff22b9c26f756bd44e8e560d44ff4ab2130b178bd2e52ef5571bf7be3bd7632d9a
languageName: node
linkType: hard

"set-function-length@npm:^1.2.1":
version: 1.2.2
resolution: "set-function-length@npm:1.2.2"
Expand Down Expand Up @@ -15242,6 +15262,13 @@ __metadata:
languageName: node
linkType: hard

"turbo-stream@npm:2.4.0":
version: 2.4.0
resolution: "turbo-stream@npm:2.4.0"
checksum: 10c0/e68b2569f1f16e6e9633d090c6024b2ae9f0e97bfeacb572451ca3732e120ebbb546f3bc4afc717c46cb57b5aea6104e04ef497f9912eef6a7641e809518e98a
languageName: node
linkType: hard

"tween-functions@npm:^1.2.0":
version: 1.2.0
resolution: "tween-functions@npm:1.2.0"
Expand Down

0 comments on commit a969b90

Please sign in to comment.