From e8e5488f78027b4cb5d31ab2f0e5af4470e23e06 Mon Sep 17 00:00:00 2001 From: "autofix-ci[bot]" <114827586+autofix-ci[bot]@users.noreply.github.com> Date: Fri, 13 Dec 2024 11:05:42 +0000 Subject: [PATCH] ci: apply automated fixes --- packages/query-core/src/queryObserver.ts | 3 +-- .../src/__tests__/useQuery.promise.test.tsx | 10 +++------- packages/react-query/src/__tests__/utils.tsx | 15 +++++++-------- packages/react-query/src/useBaseQuery.ts | 11 ++++------- 4 files changed, 15 insertions(+), 24 deletions(-) diff --git a/packages/query-core/src/queryObserver.ts b/packages/query-core/src/queryObserver.ts index 27ec8c5d340..0461722b163 100644 --- a/packages/query-core/src/queryObserver.ts +++ b/packages/query-core/src/queryObserver.ts @@ -649,7 +649,6 @@ export class QueryObserver< } updateResult(notifyOptions?: NotifyOptions): void { - const prevResult = this.#currentResult as | QueryObserverResult | undefined @@ -712,7 +711,7 @@ export class QueryObserver< includedProps, }) - return changed; + return changed }) } diff --git a/packages/react-query/src/__tests__/useQuery.promise.test.tsx b/packages/react-query/src/__tests__/useQuery.promise.test.tsx index 5efc62473ac..6d7f9eab59f 100644 --- a/packages/react-query/src/__tests__/useQuery.promise.test.tsx +++ b/packages/react-query/src/__tests__/useQuery.promise.test.tsx @@ -14,8 +14,6 @@ import { import { QueryCache } from '../index' import { createDeferred, createQueryClient, queryKey, sleep } from './utils' - - describe('useQuery().promise', () => { const queryCache = new QueryCache() const queryClient = createQueryClient({ @@ -77,7 +75,7 @@ describe('useQuery().promise', () => { withinDOM().getByText('loading..') expect(renderedComponents).toEqual([Page, Loading]) } - + { const { renderedComponents, withinDOM } = await renderStream.takeRender() withinDOM().getByText('test') @@ -1041,7 +1039,6 @@ describe('useQuery().promise', () => { const key = queryKey() const renderStream = createRenderStream({ snapshotDOM: true }) - function MyComponent(props: { promise: Promise }) { useTrackRenders() const data = React.use(props.promise) @@ -1096,12 +1093,11 @@ describe('useQuery().promise', () => { { rendered.getByText('inc').click() - + const { renderedComponents, withinDOM } = await renderStream.takeRender() withinDOM().getByText('test0') - console.log({renderedComponents}) + console.log({ renderedComponents }) expect(renderedComponents).toEqual([Page, MyComponent]) - } { diff --git a/packages/react-query/src/__tests__/utils.tsx b/packages/react-query/src/__tests__/utils.tsx index 29105208b6b..f81ad38fa89 100644 --- a/packages/react-query/src/__tests__/utils.tsx +++ b/packages/react-query/src/__tests__/utils.tsx @@ -95,15 +95,14 @@ export function setIsServer(isServer: boolean) { export const doNotExecute = (_func: () => void) => true - export function createDeferred() { - let resolve: (value: TValue) => void; - let reject: (error: unknown) => void; + let resolve: (value: TValue) => void + let reject: (error: unknown) => void const promise = new Promise((res, rej) => { - resolve = res; - reject = rej; - }); + resolve = res + reject = rej + }) - return { promise, resolve: resolve!, reject: reject! }; + return { promise, resolve: resolve!, reject: reject! } } -export type Deferred = ReturnType>; \ No newline at end of file +export type Deferred = ReturnType> diff --git a/packages/react-query/src/useBaseQuery.ts b/packages/react-query/src/useBaseQuery.ts index ea865322b33..42bf94b4c7b 100644 --- a/packages/react-query/src/useBaseQuery.ts +++ b/packages/react-query/src/useBaseQuery.ts @@ -82,7 +82,9 @@ export function useBaseQuery< ), ) - const [result, setResult] = React.useState(() => observer.getOptimisticResult(defaultedOptions)) + const [result, setResult] = React.useState(() => + observer.getOptimisticResult(defaultedOptions), + ) // console.log('result', result) React.useEffect(() => { @@ -90,21 +92,17 @@ export function useBaseQuery< return } console.log('subscribing to observer') - const unsubscribe = observer.subscribe( notifyManager.batchCalls((newResult) => { - setResult((prev) => { console.log('got new result', { prev, newResult, }) return newResult - - }) - }) + }), ) // Update result to make sure we did not miss any query updates @@ -114,7 +112,6 @@ export function useBaseQuery< return unsubscribe }, [observer, isRestoring]) - React.useEffect(() => { console.log('setting options', defaultedOptions) // Do not notify on updates because of changes in the options because