Only restore uncached operation data into ssr-cache

urql-graphql · Jul 6, 2021 · 08e7c06 · 08e7c06
1 parent 891a17a
commit 08e7c06
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/exchanges/graphcache/default-storage/package.json b/exchanges/graphcache/default-storage/package.json
@@ -16,7 +16,7 @@
     "./package.json": "./package.json"
   },
   "dependencies": {
-    "@urql/core": ">=2.0.0",
+    "@urql/core": ">=2.1.4",
     "wonka": "^4.0.14"
   }
 }
diff --git a/packages/core/src/exchanges/ssr.ts b/packages/core/src/exchanges/ssr.ts
@@ -159,7 +159,16 @@ export const ssrExchange = (params?: SSRExchangeParams): SSRExchange => {
     return merge([forwardedOps$, cachedOps$]);
   };
 
-  ssr.restoreData = (restore: SSRData) => Object.assign(data, restore);
+  ssr.restoreData = (restore: SSRData) => {
+    // Only restore data for uncached operations
+    const uncached = {};
+    Object.entries(restore).forEach(([key, value]) => {
+      if (false === key in data) {
+        uncached[key] = value;
+      }
+    });
+    return Object.assign(data, uncached);
+  };
   ssr.extractData = () => Object.assign({}, data);
 
   if (params && params.initialState) {