Merge QueryBaseOptions, QueryOptions, and ModifiableQueryOptions into one type.

[DCtheTall]

Checklist:

• If this PR is a new feature, please reference an issue where a consensus about the design was reached (not necessary for small changes)
• Make sure all of the significant new logic is covered by tests

[apollo-cla]

@DCtheTall: Thank you for submitting a pull request! Before we can merge it, you'll need to sign the Apollo Contributor License Agreement here: https://contribute.apollographql.com/

[DCtheTall]

This PR fixes #6177

[DCtheTall]

@hwillson friendly ping 😄

[benjamn]

Great improvement, @DCtheTall!

I changed the target branch to release-3.3 just because the removal of QueryBaseOptions (which was exported) could theoretically be a disruptive change, but I don't anticipate that being a problem for many people, and the fix is easy (just use QueryOptions instead).

[DCtheTall]

I changed the target branch to release-3.3 just because the removal of QueryBaseOptions (which was exported) could theoretically be a disruptive change, but I don't anticipate that being a problem for many people, and the fix is easy (just use QueryOptions instead).

@benjamn totally understand/agree. I did a search on GitHub for its usage and found it is used virtually nowhere, but I can understand the desire to gate a potentially breaking change behind a release.