Use clientState cache if provided in apollo-boost

packages/apollo-boost/CHANGELOG.md

@@ -2,6 +2,8 @@
 
 ### vNext
 
+- Use clientState cache if provided [#3439](https://github.com/apollographql/apollo-client/pull/3439)
+
 ## 1.1.4
 - Map coverage to original source
 - fix request parameter type [#3056](https://github.com/apollographql/apollo-client/pull/3056)

packages/apollo-boost/src/__tests__/config.ts

@@ -66,4 +66,16 @@ describe('config', () => {
 
     expect(client.cache.config.cacheRedirects).toEqual(cacheRedirects);
   });
+
+  it('allows you to pass in cache in clientState', () => {
+    class MockCache {}
+
+    const mockCache = new MockCache();
+
+    const client = new ApolloClient({
+      clientState: { cache: mockCache, resolvers },
+    });
+
+    expect(client.cache instanceof MockCache).toEqual(true);
+  });
 });

packages/apollo-boost/src/index.ts

@@ -25,10 +25,19 @@ export interface PresetConfig {
 
 export default class DefaultClient<TCache> extends ApolloClient<TCache> {
   constructor(config: PresetConfig) {
-    const cache =
-      config && config.cacheRedirects
-        ? new InMemoryCache({ cacheRedirects: config.cacheRedirects })
-        : new InMemoryCache();
+    let cache = null;
+
+    if (config) {
+      if (config.clientState && config.clientState.cache) {
+        cache = config.clientState.cache;
+      } else if (config.cacheRedirects) {
+        cache = new InMemoryCache({ cacheRedirects: config.cacheRedirects });
+      } else {
+        cache = new InMemoryCache();
+      }
+    } else {
+      cache = new InMemoryCache();
+    }
 
     const stateLink =
       config && config.clientState
@@ -50,24 +59,25 @@ export default class DefaultClient<TCache> extends ApolloClient<TCache> {
 
     const requestHandler =
       config && config.request
-        ? new ApolloLink((operation, forward) =>
-            new Observable(observer => {
-              let handle: any;
-              Promise.resolve(operation)
-                .then(oper => config.request(oper))
-                .then(() => {
-                  handle = forward(operation).subscribe({
-                    next: observer.next.bind(observer),
-                    error: observer.error.bind(observer),
-                    complete: observer.complete.bind(observer),
-                  });
-                })
-                .catch(observer.error.bind(observer));
+        ? new ApolloLink(
+            (operation, forward) =>
+              new Observable(observer => {
+                let handle: any;
+                Promise.resolve(operation)
+                  .then(oper => config.request(oper))
+                  .then(() => {
+                    handle = forward(operation).subscribe({
+                      next: observer.next.bind(observer),
+                      error: observer.error.bind(observer),
+                      complete: observer.complete.bind(observer),
+                    });
+                  })
+                  .catch(observer.error.bind(observer));
 
-              return () => {
-                if (handle) handle.unsubscribe;
-              };
-            })
+                return () => {
+                  if (handle) handle.unsubscribe;
+                };
+              }),
           )
         : false;
 

packages/apollo-client/AUTHORS

@@ -47,6 +47,7 @@ Oleksandr Stubailo <sashko@Oleksandrs-MacBook-Pro.local>
 Olivier Ricordeau <olivier@ricordeau.org>
 Pavol Fulop <pavol.fulop@regex.sk>
 Pavol Fulop <pavolfulop@gmail.com>
+Pete Nykänen <pete.a.nykanen@gmail.com>
 Rasmus Eneman <rasmus@eneman.eu>
 Robert Dickert <robert.dickert@gmail.com>
 Robin Ricard <ricard.robin@gmail.com>