Skip to content

Commit

Permalink
Merge branch 'main' into pr/bundle-d_cts
Browse files Browse the repository at this point in the history
  • Loading branch information
jerelmiller authored Jun 25, 2024
2 parents f2d2c09 + a07c516 commit 5af068a
Show file tree
Hide file tree
Showing 46 changed files with 703 additions and 486 deletions.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -1801,7 +1801,7 @@ class QueryManager<TStore> {
getQueryStore(): Record<string, QueryStoreValue>;
// (undocumented)
protected inFlightLinkObservables: Trie<{
observable?: Observable<FetchResult<any>> | undefined;
observable?: Observable<FetchResult<any>>;
}>;
// (undocumented)
link: ApolloLink;
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -1577,7 +1577,7 @@ class QueryManager<TStore> {
getQueryStore(): Record<string, QueryStoreValue>;
// (undocumented)
protected inFlightLinkObservables: Trie<{
observable?: Observable<FetchResult<any>> | undefined;
observable?: Observable<FetchResult<any>>;
}>;
// (undocumented)
link: ApolloLink;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1391,7 +1391,7 @@ class QueryManager<TStore> {
getQueryStore(): Record<string, QueryStoreValue>;
// (undocumented)
protected inFlightLinkObservables: Trie<{
observable?: Observable<FetchResult<any>> | undefined;
observable?: Observable<FetchResult<any>>;
}>;
// (undocumented)
link: ApolloLink;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1322,7 +1322,7 @@ class QueryManager<TStore> {
getQueryStore(): Record<string, QueryStoreValue>;
// (undocumented)
protected inFlightLinkObservables: Trie<{
observable?: Observable<FetchResult<any>> | undefined;
observable?: Observable<FetchResult<any>>;
}>;
// (undocumented)
link: ApolloLink;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1367,7 +1367,7 @@ class QueryManager<TStore> {
getQueryStore(): Record<string, QueryStoreValue>;
// (undocumented)
protected inFlightLinkObservables: Trie<{
observable?: Observable<FetchResult<any>> | undefined;
observable?: Observable<FetchResult<any>>;
}>;
// (undocumented)
link: ApolloLink;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1446,7 +1446,7 @@ class QueryManager<TStore> {
getQueryStore(): Record<string, QueryStoreValue>;
// (undocumented)
protected inFlightLinkObservables: Trie<{
observable?: Observable<FetchResult<any>> | undefined;
observable?: Observable<FetchResult<any>>;
}>;
// (undocumented)
link: ApolloLink;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1446,7 +1446,7 @@ class QueryManager<TStore> {
getQueryStore(): Record<string, QueryStoreValue>;
// (undocumented)
protected inFlightLinkObservables: Trie<{
observable?: Observable<FetchResult<any>> | undefined;
observable?: Observable<FetchResult<any>>;
}>;
// (undocumented)
link: ApolloLink;
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -1307,7 +1307,7 @@ class QueryManager<TStore> {
getQueryStore(): Record<string, QueryStoreValue>;
// (undocumented)
protected inFlightLinkObservables: Trie<{
observable?: Observable<FetchResult<any>> | undefined;
observable?: Observable<FetchResult<any>>;
}>;
// (undocumented)
link: ApolloLink;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1388,7 +1388,7 @@ class QueryManager<TStore> {
getQueryStore(): Record<string, QueryStoreValue>;
// (undocumented)
protected inFlightLinkObservables: Trie<{
observable?: Observable<FetchResult<any>> | undefined;
observable?: Observable<FetchResult<any>>;
}>;
// (undocumented)
link: ApolloLink;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1345,7 +1345,7 @@ class QueryManager<TStore> {
getQueryStore(): Record<string, QueryStoreValue>;
// (undocumented)
protected inFlightLinkObservables: Trie<{
observable?: Observable<FetchResult<any>> | undefined;
observable?: Observable<FetchResult<any>>;
}>;
// (undocumented)
link: ApolloLink;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@

```ts

/// <reference types="node" />

import type { FieldNode } from 'graphql';
import type { FragmentDefinitionNode } from 'graphql';
import type { GraphQLSchema } from 'graphql';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2109,7 +2109,7 @@ class QueryManager<TStore> {
getQueryStore(): Record<string, QueryStoreValue>;
// (undocumented)
protected inFlightLinkObservables: Trie<{
observable?: Observable<FetchResult<any>> | undefined;
observable?: Observable<FetchResult<any>>;
}>;
// (undocumented)
link: ApolloLink;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2149,7 +2149,7 @@ class QueryManager<TStore> {
getQueryStore(): Record<string, QueryStoreValue>;
// (undocumented)
protected inFlightLinkObservables: Trie<{
observable?: Observable<FetchResult<any>> | undefined;
observable?: Observable<FetchResult<any>>;
}>;
// (undocumented)
link: ApolloLink;
Expand Down
5 changes: 5 additions & 0 deletions .changeset/brave-cups-swim.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@apollo/client": patch
---

update `canUseLayoutEffect` check to also allow for layout effects in React Native
5 changes: 5 additions & 0 deletions .changeset/proud-swans-attend.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@apollo/client": patch
---

chore: update TypeScript to 5.5
12 changes: 6 additions & 6 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:

Lint:
docker:
- image: cimg/node:22.2.0
- image: cimg/node:22.3.0
steps:
- checkout
- run: npm version
Expand All @@ -24,15 +24,15 @@ jobs:

Formatting:
docker:
- image: cimg/node:22.2.0
- image: cimg/node:22.3.0
steps:
- checkout
- run: npm ci
- run: npm run check:format

Tests:
docker:
- image: cimg/node:22.2.0
- image: cimg/node:22.3.0
parameters:
project:
type: string
Expand All @@ -54,7 +54,7 @@ jobs:

BuildTarball:
docker:
- image: cimg/node:22.2.0
- image: cimg/node:22.3.0
steps:
- checkout
- run: npm run ci:precheck
Expand All @@ -73,7 +73,7 @@ jobs:
react:
type: string
docker:
- image: cimg/node:22.2.0-browsers
- image: cimg/node:22.3.0-browsers
steps:
- checkout
- attach_workspace:
Expand Down Expand Up @@ -111,7 +111,7 @@ jobs:
externalPackage:
type: string
docker:
- image: cimg/node:22.2.0
- image: cimg/node:22.3.0
steps:
- checkout
- attach_workspace:
Expand Down
4 changes: 2 additions & 2 deletions .size-limits.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"dist/apollo-client.min.cjs": 39561,
"import { ApolloClient, InMemoryCache, HttpLink } from \"dist/index.js\" (production)": 32821
"dist/apollo-client.min.cjs": 39581,
"import { ApolloClient, InMemoryCache, HttpLink } from \"dist/index.js\" (production)": 32830
}
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# @apollo/client

## 3.10.6

### Patch Changes

- [#11900](https://github.com/apollographql/apollo-client/pull/11900) [`f745558`](https://github.com/apollographql/apollo-client/commit/f74555826995009a6bb9d824506cecb3508e3365) Thanks [@phryneas](https://github.com/phryneas)! - `useMutation`: use `useIsomorphicLayoutEffect` instead of `useLayoutEffect`

## 3.10.5

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion config/apiExtractor.ts
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ try {
buildReport(
mainEntryPointFilePath,
"apiReport",
`api-report${path ? "-" + path.replace(/\//g, "_") : ""}.md`
`api-report${path ? "-" + path.replace(/\//g, "_") : ""}.api.md`
);
});
}
Expand Down
47 changes: 13 additions & 34 deletions integration-tests/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 5af068a

Please sign in to comment.