From a13ea5979243451c2f8d4ff387de7c392a7120c1 Mon Sep 17 00:00:00 2001 From: Kelvin Lu Date: Thu, 5 Jan 2023 13:30:58 -0800 Subject: [PATCH 1/3] fix: allow retry to be overriden from use-request hook --- packages/redux-query-react/src/hooks/use-request.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/redux-query-react/src/hooks/use-request.js b/packages/redux-query-react/src/hooks/use-request.js index 1bf40f9f..97211219 100644 --- a/packages/redux-query-react/src/hooks/use-request.js +++ b/packages/redux-query-react/src/hooks/use-request.js @@ -36,9 +36,10 @@ const useRequest = ( const transformQueryConfig = useConstCallback( (queryConfig: ?QueryConfig): ?QueryConfig => { return { + // Note: This is the default retry option. Retry can and should be overridden by passed in configuration. + retry: true, ...queryConfig, unstable_preDispatchCallback: finishedCallback, - retry: true, }; }, ); From 1217d00944d72e08ce151e790e59c87a01e7ef6f Mon Sep 17 00:00:00 2001 From: Kelvin Lu Date: Thu, 5 Jan 2023 13:31:28 -0800 Subject: [PATCH 2/3] fix: allow retry to be overriden from use-requests hook --- packages/redux-query-react/src/hooks/use-requests.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/redux-query-react/src/hooks/use-requests.js b/packages/redux-query-react/src/hooks/use-requests.js index c671aded..f32affb5 100644 --- a/packages/redux-query-react/src/hooks/use-requests.js +++ b/packages/redux-query-react/src/hooks/use-requests.js @@ -92,9 +92,10 @@ const useRequests = ( const transformQueryConfig = useConstCallback( (queryConfig: ?QueryConfig): ?QueryConfig => { return { + // Note: This is the default retry option. Retry can and should be overridden by passed in configuration. + retry: true, ...queryConfig, unstable_preDispatchCallback: finishedCallback(getQueryKey(queryConfig)), - retry: true, }; }, ); From f7d3426447c1d26bb3aad959216d4875e228bb4c Mon Sep 17 00:00:00 2001 From: Kelvin Lu Date: Thu, 5 Jan 2023 13:34:58 -0800 Subject: [PATCH 3/3] feat: export use query state and fix export statements for other exports --- packages/redux-query-react/src/index.js | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/packages/redux-query-react/src/index.js b/packages/redux-query-react/src/index.js index 9a85c3a0..cc464220 100644 --- a/packages/redux-query-react/src/index.js +++ b/packages/redux-query-react/src/index.js @@ -1,15 +1,9 @@ // @flow - -import connectRequest from './components/connect-request'; -import Provider from './components/Provider'; -import useMutation from './hooks/use-mutation'; -import useRequest from './hooks/use-request'; -import useRequestOnDemand from './hooks/use-request-on-demand'; -import useRequests from './hooks/use-requests'; - -export { connectRequest }; -export { Provider }; -export { useMutation }; -export { useRequest }; -export { useRequestOnDemand }; -export { useRequests }; +export { default as connectRequest } from './components/connect-request'; +export { default as Provider } from './components/Provider'; +export { default as useMutation } from './hooks/use-mutation'; +export { default as useQueryState } from './hooks/use-query-state'; +export { default as useQueriesState } from './hooks/use-queries-state'; +export { default as useRequest } from './hooks/use-request'; +export { default as useRequestOnDemand } from './hooks/use-request-on-demand'; +export { default as useRequests } from './hooks/use-requests';