Skip to content

fix(solid-query): Fix Infinite Query SSR payload #6909

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Feb 16, 2024
Merged

fix(solid-query): Fix Infinite Query SSR payload #6909

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 17 additions & 3 deletions packages/solid-query/src/createBaseQuery.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import type { CreateBaseQueryOptions } from './types'
import type { Accessor } from 'solid-js'
import type { QueryClient } from './QueryClient'
import type {
InfiniteQueryObserverResult,
Query,
QueryKey,
QueryObserver,
Expand All @@ -47,7 +48,8 @@ function reconcileFn<TData, TError>(
}

type HydratableQueryState<TData, TError> = QueryObserverResult<TData, TError> &
QueryState<TData, TError>
QueryState<TData, TError> &
InfiniteQueryObserverResult<TData, TError>

/**
* Solid's `onHydrated` functionality will silently "fail" (hydrate with an empty object)
Expand All @@ -62,7 +64,7 @@ const hydratableObserverResult = <
>(
query: Query<TQueryFnData, TError, TData, TQueryKey>,
result: QueryObserverResult<TDataHydratable, TError>,
): HydratableQueryState<TDataHydratable, TError> => {
) => {
// Including the extra properties is only relevant on the server
if (!isServer) return result as HydratableQueryState<TDataHydratable, TError>

Expand All @@ -76,6 +78,18 @@ const hydratableObserverResult = <
TError
>['refetch'],

// cast to fetchNextPage function should be safe, since we only remove it on the server,
fetchNextPage: undefined as unknown as HydratableQueryState<
TDataHydratable,
TError
>['fetchNextPage'],

// cast to fetchPreviousPage function should be safe, since we only remove it on the server,
fetchPreviousPage: undefined as unknown as HydratableQueryState<
TDataHydratable,
TError
>['fetchPreviousPage'],

// hydrate() expects a QueryState object, which is similar but not
// quite the same as a QueryObserverResult object. Thus, for now, we're
// copying over the missing properties from state in order to support hydration
Expand All @@ -86,7 +100,7 @@ const hydratableObserverResult = <
// Unsetting these properties on the server since they might not be serializable
fetchFailureReason: null,
fetchMeta: null,
}
} as HydratableQueryState<TDataHydratable, TError>
}

// Base Query Function that is used to create the query.
Expand Down