move getClient into the promise chain

apollographql · Apr 15, 2024 · 4e05fcb · 4e05fcb
1 parent f566049
commit 4e05fcb
Showing 1 changed file with 5 additions and 10 deletions.
diff --git a/packages/client-react-streaming/src/PreloadQuery.tsx b/packages/client-react-streaming/src/PreloadQuery.tsx
@@ -22,10 +22,7 @@ export type PreloadQueryOptions<TVariables, TData> = QueryOptions<
 > &
   RestrictedPreloadOptions;
 
-export async function PreloadQuery<
-  TData,
-  TVariables extends OperationVariables,
->({
+export function PreloadQuery<TData, TVariables extends OperationVariables>({
   options,
   getClient,
   children,
@@ -38,10 +35,6 @@ export async function PreloadQuery<
         queryRef: QueryReference<NoInfer<TData>, NoInfer<TVariables>>
       ) => ReactNode);
 }) {
-  // is this legal?
-  // https://twitter.com/phry/status/1779833984299532439
-  const queryKey = useId();
-
   const preloadOptions = {
     ...options,
     fetchPolicy: "cache-first" as const,
@@ -52,10 +45,12 @@ export async function PreloadQuery<
     serializeOptions(preloadOptions)
   );
 
-  const resultPromise = (await getClient())
-    .query<TData, TVariables>(preloadOptions)
+  const resultPromise = Promise.resolve(getClient())
+    .then((client) => client.query<TData, TVariables>(preloadOptions))
     .then(sanitizeForTransport);
 
+  const queryKey = useId();
+
   return (
     <SimulatePreloadedQuery<TData>
       options={transportedOptions}