Merge pull request #1648 from borisnieuwenhuis/fix-more-object-assign

fix more object assign

CHANGELOG.md

@@ -1,6 +1,7 @@
 # Change log
 
 ### vNEXT
+- Fix: Replace more usage of Object.assign with util.assign to make it work in IE, previous fix was not complete [PR #1648](https://github.com/apollographql/apollo-client/pull/1648)
 
 ### 1.1.2
 - Feature+Fix: Introduce "standby" fetchPolicy to mark queries that are not currently active, but should be available for refetchQueries and updateQueries [PR #1636](https://github.com/apollographql/apollo-client/pull/1636)

src/data/readFromStore.ts

@@ -32,6 +32,10 @@ import {
   isEqual,
 } from '../util/isEqual';
 
+import {
+  assign,
+} from '../util/assign';
+
 import {
   isTest,
 } from '../util/environment';
@@ -205,7 +209,7 @@ export function diffQueryAgainstStore({
   // Throw the right validation error by trying to find a query in the document
   const queryDefinition = getQueryDefinition(query);
 
-  variables = Object.assign(getDefaultValues(queryDefinition), variables);
+  variables = assign({}, getDefaultValues(queryDefinition), variables);
 
   const context: ReadStoreContext = {
     // Global settings

src/data/writeToStore.ts

@@ -39,6 +39,10 @@ import {
   shouldInclude,
 } from '../queries/directives';
 
+import {
+  assign,
+} from '../util/assign';
+
 /**
  * Writes the result of a query to the store.
  *
@@ -74,7 +78,7 @@ export function writeQueryToStore({
 }): NormalizedCache {
   const queryDefinition: OperationDefinitionNode = getQueryDefinition(query);
 
-  variables = Object.assign(getDefaultValues(queryDefinition), variables);
+  variables = assign({}, getDefaultValues(queryDefinition), variables);
 
   return writeSelectionSetToStore({
     dataId: 'ROOT_QUERY',
@@ -117,7 +121,7 @@ export function writeResultToStore({
   const selectionSet = operationDefinition.selectionSet;
   const fragmentMap = createFragmentMap(getFragmentDefinitions(document));
 
-  variables = Object.assign(getDefaultValues(operationDefinition), variables);
+  variables = assign({}, getDefaultValues(operationDefinition), variables);
 
   return writeSelectionSetToStore({
     result,