fix: same fix for network-only

marko-js · Jun 1, 2024 · e0e52c2 · e0e52c2
1 parent f26a8f5
commit e0e52c2
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/src/node_modules/@internal/gql-query/components/gql-query-client/index.marko b/src/node_modules/@internal/gql-query/components/gql-query-client/index.marko
@@ -16,11 +16,12 @@ class {
       const ready = readyLookup[this.id];
       if (ready) {
         // Hydration takes a double render pass, we avoid doing a new query until that's done.
-        let skipQueries = input.requestPolicy === "network-only" ? 2 : 1;
+        let skipQueries = 2;
         const onRender = () => {
           this.shouldQuery = false;
           if (!--skipQueries) {
             this.removeListener("render", onRender);
+            this.doQuery({ requestPolicy: "cache-first" });
           }
         };
         this.on("render", onRender);
@@ -86,16 +87,20 @@ class {
     }
 
     this.unsubscribe = pipe(
-      getClient(undefined, this.input.name).query(this.input.query, this.input.variables, {
-        requestPolicy: this.input.requestPolicy,
-        ...options,
-      }),
+      getClient(undefined, this.input.name).query(
+        this.input.query,
+        this.input.variables,
+        {
+          requestPolicy: this.input.requestPolicy,
+          ...options,
+        },
+      ),
       subscribe(({ data, error, stale }) => {
         this.stopTimeout();
         this.state.data = data;
         this.state.error = error;
         this.state.fetching = !!stale;
-      })
+      }),
     ).unsubscribe;
   }
 }
@@ -105,7 +110,7 @@ class {
     state,
     (options) => {
       component.doQuery({ requestPolicy: "network-only", ...options });
-    }
+    },
   )/>
 </if>
 <else>

diff --git a/src/node_modules/@internal/gql-query/node.marko b/src/node_modules/@internal/gql-query/node.marko
@@ -19,7 +19,6 @@ static function errorToJSON() {
         <gql-query-client
           key="gqlc"
           name=input.name
-          requestPolicy=input.requestPolicy
           data=data
           error=error
           opKey=operation.key