@@ -65,34 +65,32 @@ export async function persistQueryClientRestore({
65
65
buster = '' ,
66
66
hydrateOptions,
67
67
} : PersistedQueryClientRestoreOptions ) {
68
- if ( typeof window !== 'undefined' ) {
69
- try {
70
- const persistedClient = await persister . restoreClient ( )
71
-
72
- if ( persistedClient ) {
73
- if ( persistedClient . timestamp ) {
74
- const expired = Date . now ( ) - persistedClient . timestamp > maxAge
75
- const busted = persistedClient . buster !== buster
76
- if ( expired || busted ) {
77
- persister . removeClient ( )
78
- } else {
79
- hydrate ( queryClient , persistedClient . clientState , hydrateOptions )
80
- }
81
- } else {
68
+ try {
69
+ const persistedClient = await persister . restoreClient ( )
70
+
71
+ if ( persistedClient ) {
72
+ if ( persistedClient . timestamp ) {
73
+ const expired = Date . now ( ) - persistedClient . timestamp > maxAge
74
+ const busted = persistedClient . buster !== buster
75
+ if ( expired || busted ) {
82
76
persister . removeClient ( )
77
+ } else {
78
+ hydrate ( queryClient , persistedClient . clientState , hydrateOptions )
83
79
}
80
+ } else {
81
+ persister . removeClient ( )
84
82
}
85
- } catch ( err ) {
86
- if ( process . env . NODE_ENV !== 'production' ) {
87
- queryClient . getLogger ( ) . error ( err )
88
- queryClient
89
- . getLogger ( )
90
- . warn (
91
- 'Encountered an error attempting to restore client cache from persisted location. As a precaution, the persisted cache will be discarded.'
92
- )
93
- }
94
- persister . removeClient ( )
95
83
}
84
+ } catch ( err ) {
85
+ if ( process . env . NODE_ENV !== 'production' ) {
86
+ queryClient . getLogger ( ) . error ( err )
87
+ queryClient
88
+ . getLogger ( )
89
+ . warn (
90
+ 'Encountered an error attempting to restore client cache from persisted location. As a precaution, the persisted cache will be discarded.'
91
+ )
92
+ }
93
+ persister . removeClient ( )
96
94
}
97
95
}
98
96
@@ -107,15 +105,13 @@ export async function persistQueryClientSave({
107
105
buster = '' ,
108
106
dehydrateOptions,
109
107
} : PersistedQueryClientSaveOptions ) {
110
- if ( typeof window !== 'undefined' ) {
111
- const persistClient : PersistedClient = {
112
- buster,
113
- timestamp : Date . now ( ) ,
114
- clientState : dehydrate ( queryClient , dehydrateOptions ) ,
115
- }
116
-
117
- await persister . persistClient ( persistClient )
108
+ const persistClient : PersistedClient = {
109
+ buster,
110
+ timestamp : Date . now ( ) ,
111
+ clientState : dehydrate ( queryClient , dehydrateOptions ) ,
118
112
}
113
+
114
+ await persister . persistClient ( persistClient )
119
115
}
120
116
121
117
/**
@@ -156,17 +152,14 @@ export function persistQueryClient(
156
152
persistQueryClientUnsubscribe ?.( )
157
153
}
158
154
155
+ // Attempt restore
159
156
let restorePromise = Promise . resolve ( )
160
-
161
- if ( typeof window !== 'undefined' ) {
162
- // Attempt restore
163
- restorePromise = persistQueryClientRestore ( props ) . then ( ( ) => {
164
- if ( ! hasUnsubscribed ) {
165
- // Subscribe to changes in the query cache to trigger the save
166
- persistQueryClientUnsubscribe = persistQueryClientSubscribe ( props )
167
- }
168
- } )
169
- }
157
+ restorePromise = persistQueryClientRestore ( props ) . then ( ( ) => {
158
+ if ( ! hasUnsubscribed ) {
159
+ // Subscribe to changes in the query cache to trigger the save
160
+ persistQueryClientUnsubscribe = persistQueryClientSubscribe ( props )
161
+ }
162
+ } )
170
163
171
164
return [ unsubscribe , restorePromise ]
172
165
}
0 commit comments