Skip to content

fix: skipped SSR cache usage & precached data return #1604

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

Open
fabis94 wants to merge 2 commits into
base: v4
Choose a base branch
from
Open

fix: skipped SSR cache usage & precached data return #1604

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c2f831a
fix: remove forced SSR fetch policy
fabis94 Feb 26, 2026
7166f2f
fix: in SSR not returning precached data immediately
fabis94 Feb 27, 2026
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
14 changes: 7 additions & 7 deletions packages/vue-apollo-composable/src/useQuery.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,21 +280,21 @@ export function useQueryImpl<
query: currentDocument,
variables: currentVariables ?? {} as TVariables,
...currentOptions.value,
...(isServer && currentOptions.value?.fetchPolicy !== 'no-cache')
? {
fetchPolicy: 'network-only',
}
: {},
})

startQuerySubscription()

// Make the cache data available to the component immediately
// This prevents SSR hydration mismatches
if (!isServer && (firstStart || !currentOptions.value?.keepPreviousResult) && (currentOptions.value?.fetchPolicy !== 'no-cache' || currentOptions.value.notifyOnNetworkStatusChange)) {
if ((firstStart || !currentOptions.value?.keepPreviousResult) && (currentOptions.value?.fetchPolicy !== 'no-cache' || currentOptions.value.notifyOnNetworkStatusChange)) {
const currentResult = query.value.getCurrentResult(false)

if (!currentResult.loading || currentResult.partial || currentOptions.value?.notifyOnNetworkStatusChange) {
// SSR: Allow reusing cached results
// CSR: Allow showing cached results immediately, but also show loading state if the query is currently loading and not showing partial data
const ssrCheck = isServer && currentOptions.value?.prefetch !== false && !currentResult.loading
const csrCheck = !isServer && (!currentResult.loading || currentResult.partial || currentOptions.value?.notifyOnNetworkStatusChange)

if (ssrCheck || csrCheck) {
onNextResult(currentResult)
ignoreNextResult = !currentResult.loading
}
Expand Down
4 changes: 0 additions & 4 deletions packages/vue-apollo-option/src/smart-query.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,6 @@ export default class SmartQuery extends SmartApollo {
})
}

if (isServer) {
this.options.fetchPolicy = 'network-only'
}

if (!options.manual) {
this.hasDataField = Object.prototype.hasOwnProperty.call(this.vm.$data, key)
if (this.hasDataField) {
Expand Down
Loading