Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: Upgrade @tanstack/query to v5 #33898

Merged
merged 34 commits into from
Jan 2, 2025
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
de80ffb
bump: tanstack query
hugocostadev Nov 6, 2024
b0b8ca9
fixing v4 to v5 errors
hugocostadev Nov 11, 2024
242cf12
chore: patching react-query v5 to work with react 17
hugocostadev Nov 19, 2024
09ae60b
fix: react-query v5 breaking changes
hugocostadev Nov 19, 2024
6a70682
fix: null check
hugocostadev Nov 19, 2024
741275b
Merge remote-tracking branch 'origin/develop' into chore/tanstack-bump
hugocostadev Nov 19, 2024
40c5c9d
fix: lint
hugocostadev Nov 19, 2024
03e49fa
lint
hugocostadev Nov 21, 2024
d62b8ba
Merge remote-tracking branch 'origin/develop' into chore/tanstack-bump
hugocostadev Nov 21, 2024
b3fff98
lint
hugocostadev Nov 21, 2024
57228a3
fix: avatar cache time
hugocostadev Nov 21, 2024
6965ed1
fix: invite token redirect
hugocostadev Nov 21, 2024
7c239a9
fix: invite route navigation
hugocostadev Nov 27, 2024
5be3196
Merge remote-tracking branch 'origin/develop' into chore/tanstack-bump
hugocostadev Nov 27, 2024
8750e6d
fix: lint
hugocostadev Nov 27, 2024
dd4f52e
Merge branch 'develop' into chore/tanstack-bump
hugocostadev Nov 27, 2024
b10dad0
Merge branch 'develop' of github.com:RocketChat/Rocket.Chat into chor…
tassoevan Dec 27, 2024
62493dc
Merge branch 'develop' of github.com:RocketChat/Rocket.Chat into chor…
tassoevan Dec 30, 2024
7214825
Merge branch 'develop' of github.com:RocketChat/Rocket.Chat into chor…
tassoevan Dec 31, 2024
e4e3aa7
Merge branch 'develop' of github.com:RocketChat/Rocket.Chat into chor…
tassoevan Dec 31, 2024
f01fda3
Fix hook
tassoevan Dec 28, 2024
0a12ee1
Revert invite handling
tassoevan Dec 30, 2024
41ba1d4
Prefer `isLoading` over `isPending`
tassoevan Dec 30, 2024
006c13d
Revert server-side change
tassoevan Dec 31, 2024
b67a9e3
Handle previous data on `useSearchItems`
tassoevan Dec 31, 2024
bf52cc6
Remove debugging logs
tassoevan Dec 31, 2024
9cceb83
Remove excessive spacing
tassoevan Dec 31, 2024
e1e8154
Revert spacing
tassoevan Dec 31, 2024
4870e57
Revert weird lint issues
tassoevan Dec 31, 2024
7e0fb34
Move effect
tassoevan Dec 31, 2024
7f03d39
Use `useQueryClient` instead of the global singleton
tassoevan Dec 31, 2024
270839f
Handle previous data on `SearchList`
tassoevan Dec 31, 2024
3893c33
Revert lint
tassoevan Dec 31, 2024
6d0dd97
Fix `ShareLocationModal`
tassoevan Dec 31, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
chore: patching react-query v5 to work with react 17
  • Loading branch information
hugocostadev committed Nov 19, 2024
commit 242cf12e567de94c94c30f5a1ecbd53882448739
830 changes: 830 additions & 0 deletions .yarn/patches/@tanstack-react-query-npm-5.60.5-04c500b172.patch

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion apps/meteor/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@
"@rocket.chat/web-ui-registration": "workspace:^",
"@slack/bolt": "^3.22.0",
"@slack/rtm-api": "^6.2.1",
"@tanstack/react-query": "^5.59.19",
"@tanstack/react-query": "patch:@tanstack/react-query@npm%3A5.60.5#~/.yarn/patches/@tanstack-react-query-npm-5.60.5-04c500b172.patch",
"@vector-im/matrix-bot-sdk": "0.7.1-element.6",
"@xmldom/xmldom": "^0.8.10",
"adm-zip": "0.5.16",
Expand Down
2 changes: 1 addition & 1 deletion packages/fuselage-ui-kit/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
"@storybook/react": "^8.4.1",
"@storybook/react-webpack5": "^8.4.1",
"@storybook/theming": "^8.4.1",
"@tanstack/react-query": "^5.59.19",
"@tanstack/react-query": "patch:@tanstack/react-query@npm%3A5.60.5#~/.yarn/patches/@tanstack-react-query-npm-5.60.5-04c500b172.patch",
"@testing-library/react": "~16.0.1",
"@testing-library/user-event": "~14.5.2",
"@types/react": "~17.0.80",
Expand Down
2 changes: 1 addition & 1 deletion packages/mock-providers/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"devDependencies": {
"@rocket.chat/ddp-client": "workspace:~",
"@rocket.chat/ui-contexts": "workspace:*",
"@tanstack/react-query": "^5.59.19",
"@tanstack/react-query": "patch:@tanstack/react-query@npm%3A5.60.5#~/.yarn/patches/@tanstack-react-query-npm-5.60.5-04c500b172.patch",
"@types/use-sync-external-store": "^0.0.6",
"eslint": "~8.45.0",
"react": "~17.0.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/ui-voip/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
},
"dependencies": {
"@rocket.chat/emitter": "~0.31.25",
"@tanstack/react-query": "^5.59.19",
"@tanstack/react-query": "patch:@tanstack/react-query@npm%3A5.60.5#~/.yarn/patches/@tanstack-react-query-npm-5.60.5-04c500b172.patch",
"react-i18next": "~13.2.2",
"sip.js": "^0.20.1"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/web-ui-registration/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"@storybook/react": "^8.4.1",
"@storybook/react-webpack5": "^8.4.1",
"@storybook/theming": "^8.4.1",
"@tanstack/react-query": "^5.59.19",
"@tanstack/react-query": "patch:@tanstack/react-query@npm%3A5.60.5#~/.yarn/patches/@tanstack-react-query-npm-5.60.5-04c500b172.patch",
"@testing-library/react": "~16.0.1",
"@types/react": "~17.0.80",
"babel-loader": "~9.2.1",
Expand Down
39 changes: 25 additions & 14 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -8788,7 +8788,7 @@ __metadata:
"@storybook/react": "npm:^8.4.1"
"@storybook/react-webpack5": "npm:^8.4.1"
"@storybook/theming": "npm:^8.4.1"
"@tanstack/react-query": "npm:^5.59.19"
"@tanstack/react-query": "patch:@tanstack/react-query@npm%3A5.60.5#~/.yarn/patches/@tanstack-react-query-npm-5.60.5-04c500b172.patch"
"@testing-library/react": "npm:~16.0.1"
"@testing-library/user-event": "npm:~14.5.2"
"@types/react": "npm:~17.0.80"
Expand Down Expand Up @@ -9281,7 +9281,7 @@ __metadata:
"@storybook/addon-webpack5-compiler-babel": "npm:^3.0.3"
"@storybook/react": "npm:^8.4.1"
"@storybook/react-webpack5": "npm:^8.4.1"
"@tanstack/react-query": "npm:^5.59.19"
"@tanstack/react-query": "patch:@tanstack/react-query@npm%3A5.60.5#~/.yarn/patches/@tanstack-react-query-npm-5.60.5-04c500b172.patch"
"@testing-library/react": "npm:~16.0.1"
"@testing-library/user-event": "npm:~14.5.2"
"@types/adm-zip": "npm:^0.5.6"
Expand Down Expand Up @@ -9574,7 +9574,7 @@ __metadata:
"@rocket.chat/i18n": "workspace:~"
"@rocket.chat/ui-contexts": "workspace:*"
"@storybook/react": "npm:^8.4.1"
"@tanstack/react-query": "npm:^5.59.19"
"@tanstack/react-query": "patch:@tanstack/react-query@npm%3A5.60.5#~/.yarn/patches/@tanstack-react-query-npm-5.60.5-04c500b172.patch"
"@types/use-sync-external-store": "npm:^0.0.6"
eslint: "npm:~8.45.0"
i18next: "npm:~23.4.9"
Expand Down Expand Up @@ -10390,7 +10390,7 @@ __metadata:
"@storybook/addon-webpack5-compiler-babel": "npm:^3.0.3"
"@storybook/react": "npm:^8.4.1"
"@storybook/react-webpack5": "npm:^8.4.1"
"@tanstack/react-query": "npm:^5.59.19"
"@tanstack/react-query": "patch:@tanstack/react-query@npm%3A5.60.5#~/.yarn/patches/@tanstack-react-query-npm-5.60.5-04c500b172.patch"
"@testing-library/react": "npm:~16.0.1"
"@testing-library/user-event": "npm:~14.5.2"
"@types/jest": "npm:~29.5.14"
Expand Down Expand Up @@ -10490,7 +10490,7 @@ __metadata:
"@storybook/react": "npm:^8.4.1"
"@storybook/react-webpack5": "npm:^8.4.1"
"@storybook/theming": "npm:^8.4.1"
"@tanstack/react-query": "npm:^5.59.19"
"@tanstack/react-query": "patch:@tanstack/react-query@npm%3A5.60.5#~/.yarn/patches/@tanstack-react-query-npm-5.60.5-04c500b172.patch"
"@testing-library/react": "npm:~16.0.1"
"@types/react": "npm:~17.0.80"
babel-loader: "npm:~9.2.1"
Expand Down Expand Up @@ -11468,21 +11468,32 @@ __metadata:
languageName: node
linkType: hard

"@tanstack/query-core@npm:5.59.17":
version: 5.59.17
resolution: "@tanstack/query-core@npm:5.59.17"
checksum: 10/9ba6612b65f8a4c65cbf264df01be9a18895ba4f8faaa115ca11364bbee6d79ba71327b1257b31283f3f7d25e3dc954e18204d3ec53154dd8d3e4ba0a53cee24
"@tanstack/query-core@npm:5.60.5":
version: 5.60.5
resolution: "@tanstack/query-core@npm:5.60.5"
checksum: 10/2c85ed3a26db31ea9fb2e44f94afee4564c8a5e47fc2c9f4e7a3b477e90642d1330ecdbc48f3b503205401772cedd94545eff23e628badd2bff5509b1da62e94
languageName: node
linkType: hard

"@tanstack/react-query@npm:^5.59.19":
version: 5.59.19
resolution: "@tanstack/react-query@npm:5.59.19"
"@tanstack/react-query@npm:5.60.5":
version: 5.60.5
resolution: "@tanstack/react-query@npm:5.60.5"
dependencies:
"@tanstack/query-core": "npm:5.59.17"
"@tanstack/query-core": "npm:5.60.5"
peerDependencies:
react: ^18 || ^19
checksum: 10/def87fc10646c79a355a05f9a76faa0b4ca511073cd80ebe2a701d05f43969c41498e42bd5228c3c6047d5af3e5805ced5a72a890504f776b861eaf4d17eea0d
checksum: 10/00a5ef74ceb50f6bbacec2545392de65d3d9e6dc6de2a7107943460a83d1988eb66740f40b8682c8de0e9a1faff76256ab1584a816c70dd4ff9205dedc209f0a
languageName: node
linkType: hard

"@tanstack/react-query@patch:@tanstack/react-query@npm%3A5.60.5#~/.yarn/patches/@tanstack-react-query-npm-5.60.5-04c500b172.patch":
version: 5.60.5
resolution: "@tanstack/react-query@patch:@tanstack/react-query@npm%3A5.60.5#~/.yarn/patches/@tanstack-react-query-npm-5.60.5-04c500b172.patch::version=5.60.5&hash=287929"
dependencies:
"@tanstack/query-core": "npm:5.60.5"
peerDependencies:
react: ^18 || ^19
checksum: 10/dbb0bb6598f5d095a2d632eade1c1b1b586e24befc6538412bde03a0dc6627a0ed0cde27974e9afeb2a406cc6ff08a2ada6ae497c81b819a4fd1d0c0ae4ed50a
languageName: node
linkType: hard

Expand Down