Skip to content

Commit c064a20

Browse files
committed
Merge branch 'main' into main-docs-replatform
2 parents a29a409 + d172ac3 commit c064a20

26 files changed

+927
-155
lines changed

.api-reports/api-report-react.api.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -1178,7 +1178,7 @@ export interface MutationResult<TData = any> {
11781178
data?: TData | null;
11791179
error?: ApolloError;
11801180
loading: boolean;
1181-
reset(): void;
1181+
reset: () => void;
11821182
}
11831183

11841184
// Warning: (ae-forgotten-export) The symbol "MutationBaseOptions" needs to be exported by the entry point index.d.ts
@@ -2228,7 +2228,7 @@ export interface UseReadQueryResult<TData = unknown> {
22282228

22292229
// @public
22302230
export function useSubscription<TData = any, TVariables extends OperationVariables = OperationVariables>(subscription: DocumentNode | TypedDocumentNode<TData, TVariables>, options?: SubscriptionHookOptions<NoInfer_2<TData>, NoInfer_2<TVariables>>): {
2231-
restart(): void;
2231+
restart: () => void;
22322232
loading: boolean;
22332233
data?: TData | undefined;
22342234
error?: ApolloError;

.api-reports/api-report-react_components.api.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1059,7 +1059,7 @@ interface MutationResult<TData = any> {
10591059
data?: TData | null;
10601060
error?: ApolloError;
10611061
loading: boolean;
1062-
reset(): void;
1062+
reset: () => void;
10631063
}
10641064

10651065
// Warning: (ae-forgotten-export) The symbol "MutationBaseOptions" needs to be exported by the entry point index.d.ts

.api-reports/api-report-react_hoc.api.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1052,7 +1052,7 @@ interface MutationResult<TData = any> {
10521052
data?: TData | null;
10531053
error?: ApolloError;
10541054
loading: boolean;
1055-
reset(): void;
1055+
reset: () => void;
10561056
}
10571057

10581058
// Warning: (ae-forgotten-export) The symbol "MutationBaseOptions" needs to be exported by the entry point index.d.ts

.api-reports/api-report-react_hooks.api.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -1120,7 +1120,7 @@ interface MutationResult<TData = any> {
11201120
data?: TData | null;
11211121
error?: ApolloError;
11221122
loading: boolean;
1123-
reset(): void;
1123+
reset: () => void;
11241124
}
11251125

11261126
// Warning: (ae-forgotten-export) The symbol "MutationBaseOptions" needs to be exported by the entry point index.d.ts
@@ -2061,7 +2061,7 @@ export interface UseReadQueryResult<TData = unknown> {
20612061
//
20622062
// @public
20632063
export function useSubscription<TData = any, TVariables extends OperationVariables = OperationVariables>(subscription: DocumentNode | TypedDocumentNode<TData, TVariables>, options?: SubscriptionHookOptions<NoInfer_2<TData>, NoInfer_2<TVariables>>): {
2064-
restart(): void;
2064+
restart: () => void;
20652065
loading: boolean;
20662066
data?: TData | undefined;
20672067
error?: ApolloError;

.api-reports/api-report.api.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -1629,7 +1629,7 @@ export interface MutationResult<TData = any> {
16291629
data?: TData | null;
16301630
error?: ApolloError;
16311631
loading: boolean;
1632-
reset(): void;
1632+
reset: () => void;
16331633
}
16341634

16351635
// Warning: (ae-forgotten-export) The symbol "MutationBaseOptions" needs to be exported by the entry point index.d.ts
@@ -2889,7 +2889,7 @@ export interface UseReadQueryResult<TData = unknown> {
28892889

28902890
// @public
28912891
export function useSubscription<TData = any, TVariables extends OperationVariables = OperationVariables>(subscription: DocumentNode | TypedDocumentNode<TData, TVariables>, options?: SubscriptionHookOptions<NoInfer_2<TData>, NoInfer_2<TVariables>>): {
2892-
restart(): void;
2892+
restart: () => void;
28932893
loading: boolean;
28942894
data?: TData | undefined;
28952895
error?: ApolloError;

.circleci/config.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515

1616
Lint:
1717
docker:
18-
- image: cimg/node:22.6.0
18+
- image: cimg/node:22.9.0
1919
steps:
2020
- checkout
2121
- run: npm version
@@ -24,15 +24,15 @@ jobs:
2424

2525
Formatting:
2626
docker:
27-
- image: cimg/node:22.6.0
27+
- image: cimg/node:22.9.0
2828
steps:
2929
- checkout
3030
- run: npm ci
3131
- run: npm run check:format
3232

3333
Tests:
3434
docker:
35-
- image: cimg/node:22.6.0
35+
- image: cimg/node:22.9.0
3636
parameters:
3737
project:
3838
type: string
@@ -54,7 +54,7 @@ jobs:
5454

5555
BuildTarball:
5656
docker:
57-
- image: cimg/node:22.6.0
57+
- image: cimg/node:22.9.0
5858
steps:
5959
- checkout
6060
- run: npm run ci:precheck
@@ -73,7 +73,7 @@ jobs:
7373
react:
7474
type: string
7575
docker:
76-
- image: cimg/node:22.6.0-browsers
76+
- image: cimg/node:22.9.0-browsers
7777
steps:
7878
- checkout
7979
- attach_workspace:
@@ -111,7 +111,7 @@ jobs:
111111
externalPackage:
112112
type: string
113113
docker:
114-
- image: cimg/node:22.6.0
114+
- image: cimg/node:22.9.0
115115
steps:
116116
- checkout
117117
- attach_workspace:

.github/workflows/prerelease.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ jobs:
103103
- name: Send a Slack notification on publish
104104
if: steps.changesets.outcome == 'success'
105105
id: slack
106-
uses: slackapi/slack-github-action@v1.26.0
106+
uses: slackapi/slack-github-action@v1.27.0
107107
with:
108108
# Slack channel id, channel name, or user id to post message
109109
# See also: https://api.slack.com/methods/chat.postMessage#channels
+28
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
name: Pull Request Prerelease
2+
3+
on:
4+
pull_request:
5+
push:
6+
branches:
7+
- "**"
8+
tags:
9+
- "!**"
10+
11+
jobs:
12+
prerelease:
13+
name: Pull Request Prerelease
14+
runs-on: ubuntu-latest
15+
steps:
16+
- name: Checkout repo
17+
uses: actions/checkout@v4
18+
19+
- name: Setup Node.js 20.x
20+
uses: actions/setup-node@v4
21+
with:
22+
node-version: 20.x
23+
24+
- name: Install dependencies with cache
25+
uses: bahmutov/npm-install@v1
26+
27+
- name: Build and publish to pkg.pr.new
28+
run: npm run pkg-pr-new-publish

.github/workflows/release.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ jobs:
6565
- name: Send a Slack notification on publish
6666
if: steps.changesets.outcome == 'success' && steps.changesets.outputs.published == 'true'
6767
id: slack
68-
uses: slackapi/slack-github-action@v1.26.0
68+
uses: slackapi/slack-github-action@v1.27.0
6969
with:
7070
# Slack channel id, channel name, or user id to post message
7171
# See also: https://api.slack.com/methods/chat.postMessage#channels

.size-limits.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
2-
"dist/apollo-client.min.cjs": 40271,
3-
"import { ApolloClient, InMemoryCache, HttpLink } from \"dist/index.js\" (production)": 33059
2+
"dist/apollo-client.min.cjs": 40251,
3+
"import { ApolloClient, InMemoryCache, HttpLink } from \"dist/index.js\" (production)": 33061
44
}

CHANGELOG.md

+28
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,33 @@
11
# @apollo/client
22

3+
## 3.11.8
4+
5+
### Patch Changes
6+
7+
- [#12054](https://github.com/apollographql/apollo-client/pull/12054) [`35cf186`](https://github.com/apollographql/apollo-client/commit/35cf186ed9237e41735f150e0cbf4edd995ab0d9) Thanks [@phryneas](https://github.com/phryneas)! - Fixed a bug where incorrect object access in some Safari extensions could cause a crash.
8+
9+
## 3.11.7
10+
11+
### Patch Changes
12+
13+
- [#12052](https://github.com/apollographql/apollo-client/pull/12052) [`e471cef`](https://github.com/apollographql/apollo-client/commit/e471cef875eadef04f8ee18ef431ee70e7b9bcab) Thanks [@jerelmiller](https://github.com/jerelmiller)! - Fixes a regression from where passing an invalid identifier to `from` in `useFragment` would result in the warning `TypeError: Cannot read properties of undefined (reading '__typename')`.
14+
15+
## 3.11.6
16+
17+
### Patch Changes
18+
19+
- [#12049](https://github.com/apollographql/apollo-client/pull/12049) [`9c26892`](https://github.com/apollographql/apollo-client/commit/9c268927b1f8e5921b9440a53c9979a37f594e75) Thanks [@phryneas](https://github.com/phryneas) and [@maciesielka](https://github.com/maciesielka)! - Fix a bug where `useFragment` did not re-render as expected
20+
21+
- [#12044](https://github.com/apollographql/apollo-client/pull/12044) [`04462a2`](https://github.com/apollographql/apollo-client/commit/04462a274ad39b392142385a2f052abbf3014749) Thanks [@DoctorJohn](https://github.com/DoctorJohn)! - Cache the `useSubscription` hook's `restart` function definition between re-renders.
22+
23+
## 3.11.5
24+
25+
### Patch Changes
26+
27+
- [#12027](https://github.com/apollographql/apollo-client/pull/12027) [`eb3e21b`](https://github.com/apollographql/apollo-client/commit/eb3e21b9f7fa6a3161705c2c7270129c17b65095) Thanks [@JavaScriptBach](https://github.com/JavaScriptBach)! - Type `MutationResult.reset` as an arrow function
28+
29+
- [#12020](https://github.com/apollographql/apollo-client/pull/12020) [`82d8cb4`](https://github.com/apollographql/apollo-client/commit/82d8cb4255be497748829f12eb25ac87c11ee5e4) Thanks [@jerelmiller](https://github.com/jerelmiller)! - Better conform to Rules of React by avoiding write of ref in render for `useFragment`.
30+
331
## 3.11.4
432

533
### Patch Changes

ROADMAP.md

+8-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# 🔮 Apollo Client Ecosystem Roadmap
22

3-
**Last updated: 2024-08-12**
3+
**Last updated: 2024-09-23**
44

55
For up to date release notes, refer to the project's [Changelog](https://github.com/apollographql/apollo-client/blob/main/CHANGELOG.md).
66

@@ -17,16 +17,16 @@ For up to date release notes, refer to the project's [Changelog](https://github.
1717

1818
### Apollo Client
1919

20-
#### [3.12.0](https://github.com/apollographql/apollo-client/milestone/42) - October 7, 2024
21-
_Release candidate - September 30, 2024_
20+
#### [3.12.0](https://github.com/apollographql/apollo-client/milestone/42) - October 21, 2024
21+
_Release candidate - October 24, 2024_
2222

2323
- Data masking
24-
- Introduce a suspenseful `useFragment` that will suspend when the data is not yet loaded
2524

2625
#### Upcoming features
2726

2827
- Leaner client (under alternate entry point)
2928
- Better types for `useQuery`/`useMutation`/`useSubscription`
29+
- Introduce a suspenseful `useFragment` that will suspend when the data is not yet loaded
3030

3131
#### 4.0
3232

@@ -41,15 +41,18 @@ _Release candidate - September 30, 2024_
4141
### VSCode Extension
4242

4343
- Bug fixes and long-requested features
44+
- Apollo Client Devtools integration
4445

4546
### GraphQL Tag
4647

4748
_no work in progress_
4849

4950
### Apollo Client DevTools
5051

51-
_no work in progress_
52+
- Ongoing work with fixing error messages shown in devtools
53+
- Add a memory panel to monitor Apollo Client devtools internal caches
5254

5355
### Apollo Client NextJS
5456

5557
- New/more robust documentation
58+
- Support for `@defer` in RSC

docs/source/api/link/community-links.md

+1
Original file line numberDiff line numberDiff line change
@@ -27,3 +27,4 @@ Thank you to all the Apollo community members who have contributed custom Apollo
2727
| [apollo-link-observable](https://github.com/dragozin/apollo-link-observable) | [@dragozin](https://github.com/dragozin) | Link that allows you to make side effects of graphql queries using [RxJS](http://github.com/ReactiveX/RxJS). |
2828
| [apollo-multi-endpoint-link](https://github.com/habx/apollo-multi-endpoint-link) | [@habx](https://github.com/habx) | Add directive to redirect requests to right endpoint |
2929
| [@grafbase/apollo-link](https://github.com/grafbase/playground/tree/main/packages/grafbase-apollo-link) | [@grafbase](https://github.com/grafbase) | Use GraphQL `@live` queries with Server-Sent Events.
30+
| [apollo-link-printer](https://github.com/egorlem/apollo-link-printer) | [@egorlem](https://github.com/egorlem) | Pretty logger of Apollo GraphQL network operations.

docs/source/pagination/core-api.mdx

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ return (
6161
}
6262
```
6363

64-
Here, we set the `offset` variable to `feed.length` to fetch items _after_ the last item in our cached list. The `variables` we provide here are merged with the `variables` provided for the original query, which means that variables _omitted_ here (such as `limit`) retain their original value (`10`) in the followup query.
64+
Here, we set the `offset` variable to `feed.length` to fetch items _after_ the last item in our cached list. The `variables` we provide here are shallow merged with the `variables` provided for the original query, which means that variables _omitted_ here (such as `limit`) retain their original value (`10`) in the followup query.
6565

6666
In addition to `variables`, you can optionally provide an entirely different shape of `query` to execute. This can be useful when `fetchMore` needs to fetch only a single paginated field, but the original query contained unrelated fields.
6767

0 commit comments

Comments
 (0)