Skip to content
This repository was archived by the owner on Apr 13, 2023. It is now read-only.

Commit

Permalink
Merge branch 'master' into 406-ssr-errors
Browse files Browse the repository at this point in the history
  • Loading branch information
calebmer authored Mar 17, 2017
2 parents 10fe30a + a92f608 commit 3356c48
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions Changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
Expect active development and potentially significant breaking changes in the `0.x` track. We'll try to be diligent about releasing a `1.0` version in a timely fashion (ideally within 1 or 2 months), so that we can take advantage of SemVer to signify breaking changes from that point on.

### vNext
- Fix bug where `options` was mutated causing variables to not update appropriately. [PR #537](https://github.com/apollographql/react-apollo/pull/537)
- Make sure that all queries resolve or reject if an error was thrown when server side rendering. [PR #488](https://github.com/apollographql/react-apollo/pull/488)

### 1.0.0-rc.1
Expand Down
2 changes: 1 addition & 1 deletion src/graphql.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,7 @@ export default function graphql(
`passed to '${graphQLDisplayName}'`,
);
}
opts.variables = variables;
opts = { ...opts, variables };
return opts;
};

Expand Down

0 comments on commit 3356c48

Please sign in to comment.