update type definition of withApollo

[liweinan0423]

this resolves #3392

[apollo-cla]

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

[shad-k]

When can we expect this fix to be released?

[abrahamcuenca]

@liweinan0423 What is the status of this PR?

[anka-213]

Wouldn't this fail if someone has given an explicit TProps argument to withApollo that excludes the WithApolloClient part to make the old version work. For example:

type Props = {user: string}
const ExampleC = ({user, client}: WithApolloClient<Props>) => {...}
const Example = withApollo<Props>(ExampleC)

Here, Props does not extend WithApolloClient<{}> and will cause a type error.