From 1d5c061f0ce94f4435751e3f75e5db293dd5c038 Mon Sep 17 00:00:00 2001 From: moonrailgun Date: Wed, 19 Apr 2023 17:57:14 +0800 Subject: [PATCH] fix: fix the problem that the version of react-query is not uniform --- client/shared/package.json | 2 +- client/web/package.json | 2 +- pnpm-lock.yaml | 48 +++++++++++--------------------------- 3 files changed, 15 insertions(+), 37 deletions(-) diff --git a/client/shared/package.json b/client/shared/package.json index baf0301b..7964d674 100644 --- a/client/shared/package.json +++ b/client/shared/package.json @@ -8,7 +8,7 @@ "private": true, "dependencies": { "@reduxjs/toolkit": "^1.7.1", - "@tanstack/react-query": "^4.3.4", + "@tanstack/react-query": "4.29.3", "axios": "^0.21.1", "crc": "^3.8.0", "dayjs": "^1.10.6", diff --git a/client/web/package.json b/client/web/package.json index 97180752..09225cd1 100644 --- a/client/web/package.json +++ b/client/web/package.json @@ -30,7 +30,7 @@ "@emoji-mart/data": "^1.1.2", "@emoji-mart/react": "^1.1.1", "@loadable/component": "^5.15.3", - "@tanstack/react-query-devtools": "^4.24.10", + "@tanstack/react-query-devtools": "4.29.3", "@use-gesture/react": "^10.2.24", "ahooks": "^3.7.4", "antd": "^4.24.8", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index a37c2fe9..bfc0a17c 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -465,8 +465,8 @@ importers: specifier: ^1.7.1 version: 1.8.5(react-redux@8.0.2)(react@18.2.0) '@tanstack/react-query': - specifier: ^4.3.4 - version: 4.3.4(react-dom@18.2.0)(react@18.2.0) + specifier: 4.29.3 + version: 4.29.3(react-dom@18.2.0)(react@18.2.0) axios: specifier: ^0.21.1 version: 0.21.4 @@ -559,8 +559,8 @@ importers: specifier: ^5.15.3 version: 5.15.3(react@18.2.0) '@tanstack/react-query-devtools': - specifier: ^4.24.10 - version: 4.24.10(@tanstack/react-query@4.24.10)(react-dom@18.2.0)(react@18.2.0) + specifier: 4.29.3 + version: 4.29.3(@tanstack/react-query@4.29.3)(react-dom@18.2.0)(react@18.2.0) '@use-gesture/react': specifier: ^10.2.24 version: 10.2.24(react@18.2.0) @@ -13265,49 +13265,27 @@ packages: remove-accents: 0.4.2 dev: false - /@tanstack/query-core@4.24.10: - resolution: {integrity: sha512-2QywqXEAGBIUoTdgn1lAB4/C8QEqwXHj2jrCLeYTk2xVGtLiPEUD8jcMoeB2noclbiW2mMt4+Fq7fZStuz3wAQ==} + /@tanstack/query-core@4.29.1: + resolution: {integrity: sha512-vkPewLEG8ua0efo3SsVT0BcBtkq5RZX8oPhDAyKL+k/rdOYSQTEocfGEXSaBwIwsXeOGBUpfKqI+UmHvNqdWXg==} dev: false - /@tanstack/query-core@4.3.4: - resolution: {integrity: sha512-NLAe3j5Vk1yYEtoPP5fPGPjRzkZPx67KUM3f14L3InziJZJ0wVecCh7uKfgYkbRKJSeq6PlbND7iuCGdTplN6Q==} - dev: false - - /@tanstack/react-query-devtools@4.24.10(@tanstack/react-query@4.24.10)(react-dom@18.2.0)(react@18.2.0): - resolution: {integrity: sha512-1uzJNLdLjRsNt4O5ldv1SYPevWvSdHtKIyVJeUv4hSERPEhrKKfa8WC3dBOX24CdLEYH2ndLZW4ZiC9nzSKCtg==} + /@tanstack/react-query-devtools@4.29.3(@tanstack/react-query@4.29.3)(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-Ne/K9+gskn8zM4sbLWl4mq5x0ha0JIg7I078K+t6seorL6oq9Y9E30wlP4y/IVa9hgn8DHB1Q6GoPtA2iu6p2g==} peerDependencies: - '@tanstack/react-query': 4.24.10 + '@tanstack/react-query': 4.29.3 react: ^16.8.0 || ^17.0.0 || ^18.0.0 react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 dependencies: '@tanstack/match-sorter-utils': 8.7.6 - '@tanstack/react-query': 4.24.10(react-dom@18.2.0)(react@18.2.0) + '@tanstack/react-query': 4.29.3(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) superjson: 1.12.2 use-sync-external-store: 1.2.0(react@18.2.0) dev: false - /@tanstack/react-query@4.24.10(react-dom@18.2.0)(react@18.2.0): - resolution: {integrity: sha512-FY1DixytOcNNCydPQXLxuKEV7VSST32CAuJ55BjhDNqASnMLZn+6c30yQBMrODjmWMNwzfjMZnq0Vw7C62Fwow==} - peerDependencies: - react: ^16.8.0 || ^17.0.0 || ^18.0.0 - react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 - react-native: '*' - peerDependenciesMeta: - react-dom: - optional: true - react-native: - optional: true - dependencies: - '@tanstack/query-core': 4.24.10 - react: 18.2.0 - react-dom: 18.2.0(react@18.2.0) - use-sync-external-store: 1.2.0(react@18.2.0) - dev: false - - /@tanstack/react-query@4.3.4(react-dom@18.2.0)(react@18.2.0): - resolution: {integrity: sha512-IiAo+B8bxphEpO7xwLQaCptd2rY4Ef3pW1q9J3pT66G+J/st4QpGQ+cSm9iESp9ccRy1YNUk3klk/hQtWewl6g==} + /@tanstack/react-query@4.29.3(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-FPQrMu7PbCgBcVzoRJm7WmQnAFv+LUgZM9KBZ7Vk/+yERH2BDLvQRuAgczQd5Tb1s3HbOktECRDaOkUxdyBAjw==} peerDependencies: react: ^16.8.0 || ^17.0.0 || ^18.0.0 react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 @@ -13318,7 +13296,7 @@ packages: react-native: optional: true dependencies: - '@tanstack/query-core': 4.3.4 + '@tanstack/query-core': 4.29.1 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) use-sync-external-store: 1.2.0(react@18.2.0)