Skip to content

Commit a95ecc0

Browse files
Merge pull request #315 from apollographql/main
Create a new pull request by comparing changes across two branches
2 parents 5ac2c47 + f805942 commit a95ecc0

12 files changed

Lines changed: 251 additions & 92 deletions

File tree

.changeset/curly-cameras-carry.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

.changeset/metal-hats-cough.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

.github/workflows/close-stale-issues.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,8 @@ jobs:
9898
# # Only issues or pull requests with at least one of these labels are checked if stale. Defaults to `` (disabled) and can be a comma-separated list of labels.
9999
# any-of-labels: # optional, default is
100100

101-
# # Only issues with at least one of these labels are checked if stale. Defaults to `` (disabled) and can be a comma-separated list of labels. Override "any-of-labels" option regarding only the issues.
102-
# any-of-issue-labels: # optional, default is
101+
# Only issues with at least one of these labels are checked if stale. Defaults to `` (disabled) and can be a comma-separated list of labels. Override "any-of-labels" option regarding only the issues.
102+
any-of-issue-labels: "🏓 awaiting-contributor-response"
103103

104104
# # Only pull requests with at least one of these labels are checked if stale. Defaults to `` (disabled) and can be a comma-separated list of labels. Override "any-of-labels" option regarding only the pull requests.
105105
# any-of-pr-labels: # optional, default is
@@ -110,8 +110,8 @@ jobs:
110110
# # Only pull requests with all of these labels are checked if stale. Defaults to `[]` (disabled) and can be a comma-separated list of labels. Override "only-labels" option regarding only the pull requests.
111111
# only-pr-labels: # optional, default is
112112

113-
# # The maximum number of operations per run, used to control rate limiting (GitHub API CRUD related).
114-
# operations-per-run: # optional, default is 30
113+
# The maximum number of operations per run, used to control rate limiting (GitHub API CRUD related).
114+
operations-per-run: 100 # optional, default is 30
115115

116116
# Remove stale labels from issues and pull requests when they are updated or commented on.
117117
remove-stale-when-updated: false

.github/workflows/prerelease.yml

Lines changed: 40 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
- name: Enter alpha prerelease mode
4848
# If .changeset/pre.json does not exist and we did not recently exit
4949
# prerelease mode, enter prerelease mode with tag alpha
50-
if: ${{ steps.check_files.outputs.files_exists == 'false' && !contains(github.event.head_commit.message, 'Exit prerelease')}}
50+
if: steps.check_files.outputs.files_exists == 'false' && !contains(github.event.head_commit.message, 'Exit prerelease')
5151
run: npx changeset pre enter alpha
5252

5353
- name: Create alpha release PR
@@ -57,15 +57,19 @@ jobs:
5757
env:
5858
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
5959

60+
- name: get-npm-version
61+
id: package-version
62+
uses: martinbeentjes/npm-get-version-action@main
63+
6064
- name: Run publish
6165
id: changesets
6266
# Only run publish if we're still in pre mode and the last commit was
6367
# via an automatically created Version Packages PR
64-
if: ${{ steps.check_files.outputs.files_exists == 'true' && startsWith(github.event.head_commit.message, 'Version Packages')}}
68+
if: steps.check_files.outputs.files_exists == 'true' && startsWith(github.event.head_commit.message, 'Version Packages')
6569
run: npm run changeset-publish
6670

6771
- name: Send a Slack notification on publish
68-
if: steps.changesets.outcome == 'success' && steps.changesets.outputs.published == 'true'
72+
if: steps.changesets.outcome == 'success'
6973
id: slack
7074
uses: slackapi/slack-github-action@v1.23.0
7175
with:
@@ -75,6 +79,38 @@ jobs:
7579
# a comma-delimited list of channel IDs
7680
channel-id: 'C01PS0CB41G'
7781
# For posting a simple plain text message
78-
slack-message: "Published @apollo/client v${{ fromJson(steps.changesets.outputs.publishedPackages)[0].version }}"
82+
payload: |
83+
{
84+
"blocks": [
85+
{
86+
"type": "section",
87+
"text": {
88+
"type": "mrkdwn",
89+
"text": "A new version of `@apollo/client` was released :rocket:"
90+
}
91+
},
92+
{
93+
"type": "section",
94+
"fields": [
95+
{
96+
"type": "mrkdwn",
97+
"text": "*Version:*\n`${{ steps.package-version.outputs.current-version}}`"
98+
},
99+
{
100+
"type": "mrkdwn",
101+
"text": "*Tag:*\n`alpha`"
102+
},
103+
{
104+
"type": "mrkdwn",
105+
"text": "*GitHub release:*\nN/A"
106+
},
107+
{
108+
"type": "mrkdwn",
109+
"text": "*npm releases:*\n<https://www.npmjs.com/package/@apollo/client?activeTab=versions|link>"
110+
}
111+
]
112+
}
113+
]
114+
}
79115
env:
80116
SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}

.github/workflows/release.yml

Lines changed: 33 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,6 @@ jobs:
4545
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4646
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
4747

48-
- name: Echo values from changesets step
49-
if: steps.changesets.outcome == 'success'
50-
run: echo "${{steps.changesets.outcome}} v${{ fromJson(steps.changesets.outputs.publishedPackages)[0].version }}"
51-
5248
- name: Send a Slack notification on publish
5349
if: steps.changesets.outcome == 'success' && steps.changesets.outputs.published == 'true'
5450
id: slack
@@ -59,7 +55,38 @@ jobs:
5955
# You can pass in multiple channels to post to by providing
6056
# a comma-delimited list of channel IDs
6157
channel-id: 'C01PS0CB41G'
62-
# For posting a simple plain text message
63-
slack-message: "Published v${{ fromJson(steps.changesets.outputs.publishedPackages)[0].version }}"
58+
payload: |
59+
{
60+
"blocks": [
61+
{
62+
"type": "section",
63+
"text": {
64+
"type": "mrkdwn",
65+
"text": "A new version of `@apollo/client` was released :rocket:"
66+
}
67+
},
68+
{
69+
"type": "section",
70+
"fields": [
71+
{
72+
"type": "mrkdwn",
73+
"text": "*Version:*\n`${{ fromJson(steps.changesets.outputs.publishedPackages)[0].version }}`"
74+
},
75+
{
76+
"type": "mrkdwn",
77+
"text": "*Tag:*\n`next`"
78+
},
79+
{
80+
"type": "mrkdwn",
81+
"text": "*GitHub release:*\n<https://github.com/apollographql/apollo-client/releases/tag/v${{ fromJson(steps.changesets.outputs.publishedPackages)[0].version }}|link>"
82+
},
83+
{
84+
"type": "mrkdwn",
85+
"text": "*npm releases:*\n<https://www.npmjs.com/package/@apollo/client?activeTab=versions|link>"
86+
}
87+
]
88+
}
89+
]
90+
}
6491
env:
6592
SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}

CHANGELOG.md

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
11
# @apollo/client
22

3+
## 3.7.4
4+
5+
### Patch Changes
6+
7+
- [#10427](https://github.com/apollographql/apollo-client/pull/10427) [`28d909cff`](https://github.com/apollographql/apollo-client/commit/28d909cff086f8352e2ea75421a1cac590917573) Thanks [@jerelmiller](https://github.com/jerelmiller)! - Ensure in-flight promises executed by `useLazyQuery` are rejected when `useLazyQuery` unmounts.
8+
9+
- [#10383](https://github.com/apollographql/apollo-client/pull/10383) [`5c5ca9b01`](https://github.com/apollographql/apollo-client/commit/5c5ca9b01a2b9905f94de85e5b80ffc29522e2e3) Thanks [@jerelmiller](https://github.com/jerelmiller)! - Ensure the `onError` callback is called when the `errorPolicy` is set to "all" and partial data is returned.
10+
11+
- [#10425](https://github.com/apollographql/apollo-client/pull/10425) [`86e35a6d2`](https://github.com/apollographql/apollo-client/commit/86e35a6d25e9838f39a9de652e52a358b9c08488) Thanks [@jerelmiller](https://github.com/jerelmiller)! - Prefer the `onError` and `onCompleted` callback functions passed to the execute function returned from `useMutation` instead of calling both callback handlers.
12+
313
## 3.7.3
414

515
### Patch Changes
@@ -1422,8 +1432,7 @@ In upcoming v3.6.x and v3.7 (beta) releases, we will be completely overhauling o
14221432
14231433
- The `InMemoryCache` constructor should now be imported directly from `@apollo/client`, rather than from a separate package. The `apollo-cache-inmemory` package is no longer supported.
14241434

1425-
> The `@apollo/client/cache` entry point can be used to import `InMemoryCache` without importing other parts of the Apollo Client codebase. <br/>
1426-
> [@hwillson](https://github.com/hwillson) in [#5577](https://github.com/apollographql/apollo-client/pull/5577)
1435+
> The `@apollo/client/cache` entry point can be used to import `InMemoryCache` without importing other parts of the Apollo Client codebase. <br/> > [@hwillson](https://github.com/hwillson) in [#5577](https://github.com/apollographql/apollo-client/pull/5577)
14271436
14281437
- **[BREAKING]** `FragmentMatcher`, `HeuristicFragmentMatcher`, and `IntrospectionFragmentMatcher` have all been removed. We now recommend using `InMemoryCache`’s `possibleTypes` option instead. For more information see the [Defining `possibleTypes` manually](https://www.apollographql.com/docs/react/v3.0-beta/data/fragments/#defining-possibletypes-manually) section of the docs. <br/>
14291438
[@benjamn](https://github.com/benjamn) in [#5073](https://github.com/apollographql/apollo-client/pull/5073)
@@ -1559,8 +1568,7 @@ In upcoming v3.6.x and v3.7 (beta) releases, we will be completely overhauling o
15591568
- **[BREAKING]** We are no longer exporting certain (intended to be) internal utilities. If you are depending on some of the lesser known exports from `apollo-cache`, `apollo-cache-inmemory`, or `apollo-utilities`, they may no longer be available from `@apollo/client`. <br/>
15601569
[@hwillson](https://github.com/hwillson) in [#5437](https://github.com/apollographql/apollo-client/pull/5437) and [#5514](https://github.com/apollographql/apollo-client/pull/5514)
15611570

1562-
> Utilities that were previously externally available through the `apollo-utilities` package are now only available by importing from `@apollo/client/utilities`. <br/>
1563-
> [@hwillson](https://github.com/hwillson) in [#5683](https://github.com/apollographql/apollo-client/pull/5683)
1571+
> Utilities that were previously externally available through the `apollo-utilities` package are now only available by importing from `@apollo/client/utilities`. <br/> > [@hwillson](https://github.com/hwillson) in [#5683](https://github.com/apollographql/apollo-client/pull/5683)
15641572
15651573
- Make sure all `graphql-tag` public exports are re-exported. <br/>
15661574
[@hwillson](https://github.com/hwillson) in [#5861](https://github.com/apollographql/apollo-client/pull/5861)

config/bundlesize.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { join } from "path";
33
import { gzipSync } from "zlib";
44
import bytes from "bytes";
55

6-
const gzipBundleByteLengthLimit = bytes("32.03KB");
6+
const gzipBundleByteLengthLimit = bytes("32.12KB");
77
const minFile = join("dist", "apollo-client.min.cjs");
88
const minPath = join(__dirname, "..", minFile);
99
const gzipByteLen = gzipSync(readFileSync(minPath)).byteLength;

0 commit comments

Comments
 (0)