Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix up type in 3.9 branch after merge #11362

Merged
merged 3 commits into from
Nov 14, 2023

Conversation

phryneas
Copy link
Member

@phryneas phryneas commented Nov 14, 2023

Doing this as a PR to check in CI if this fixes up all the type problems we got by merging main into 3.9.

The problem seems to have been introduced by adding the variableMatcher?: VariableMatcher<TVariables>; property and also referencing TVariables in the ResultFunction signature for result, both over in #11178.

Copy link

changeset-bot bot commented Nov 14, 2023

⚠️ No Changeset found

Latest commit: ebeda6f

Merging this PR will not cause a version bump for any packages. If these changes should not result in a new version, you're good to go. If these changes should result in a version bump, you need to add a changeset.

This PR includes no changesets

When changesets are added to this PR, you'll see the packages that this PR includes changesets for and the associated semver types

Click here to learn what changesets are, and how to add one.

Click here if you're a maintainer who wants to add a changeset to this PR

Copy link
Contributor

github-actions bot commented Nov 14, 2023

size-limit report 📦

Path Size
dist/apollo-client.min.cjs 37.25 KB (0%)
import { ApolloClient, InMemoryCache, HttpLink } from "dist/main.cjs" 43.71 KB (0%)
import { ApolloClient, InMemoryCache, HttpLink } from "dist/main.cjs" (production) 42.18 KB (0%)
import { ApolloClient, InMemoryCache, HttpLink } from "dist/index.js" 32.76 KB (0%)
import { ApolloClient, InMemoryCache, HttpLink } from "dist/index.js" (production) 31.41 KB (0%)
import { ApolloProvider } from "dist/react/index.js" 1.28 KB (0%)
import { ApolloProvider } from "dist/react/index.js" (production) 1.26 KB (0%)
import { useQuery } from "dist/react/index.js" 4.34 KB (0%)
import { useQuery } from "dist/react/index.js" (production) 4.16 KB (0%)
import { useLazyQuery } from "dist/react/index.js" 4.65 KB (0%)
import { useLazyQuery } from "dist/react/index.js" (production) 4.47 KB (0%)
import { useMutation } from "dist/react/index.js" 2.61 KB (0%)
import { useMutation } from "dist/react/index.js" (production) 2.6 KB (0%)
import { useSubscription } from "dist/react/index.js" 2.29 KB (0%)
import { useSubscription } from "dist/react/index.js" (production) 2.25 KB (0%)
import { useSuspenseQuery } from "dist/react/index.js" 4.33 KB (0%)
import { useSuspenseQuery } from "dist/react/index.js" (production) 3.79 KB (0%)
import { useBackgroundQuery } from "dist/react/index.js" 3.83 KB (0%)
import { useBackgroundQuery } from "dist/react/index.js" (production) 3.27 KB (0%)
import { useReadQuery } from "dist/react/index.js" 3.05 KB (0%)
import { useReadQuery } from "dist/react/index.js" (production) 3 KB (0%)
import { useFragment } from "dist/react/index.js" 2.15 KB (0%)
import { useFragment } from "dist/react/index.js" (production) 2.1 KB (0%)

@phryneas
Copy link
Member Author

I'm going to merge this already to un-block the 3.9 branch and other PRs, but if there are any post-merge review comments, I'd be happy to open a follow-up PR to address those :)

@phryneas phryneas merged commit b0bf0d8 into release-3.9 Nov 14, 2023
26 checks passed
@phryneas phryneas deleted the pr/3.9-fix-merge-main-strict-ts branch November 14, 2023 13:43
@@ -11,7 +11,7 @@ import type { Resolvers } from "../../core/index.js";
import type { ApolloCache } from "../../cache/index.js";

export interface MockedProviderProps<TSerializedCache = {}> {
mocks?: ReadonlyArray<MockedResponse>;
mocks?: ReadonlyArray<MockedResponse<any, any>>;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ha, I was just running into issues in my useLoadableQuery branch because of this. Thanks for fixing!

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Dec 15, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants