Skip to content

Commit 26847ff

Browse files
Merge pull request #466 from apollographql/main
Create a new pull request by comparing changes across two branches
2 parents e0b1aab + 2944f70 commit 26847ff

File tree

3 files changed

+11
-9
lines changed

3 files changed

+11
-9
lines changed

.circleci/config.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515

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

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

3333
Tests:
3434
docker:
35-
- image: cimg/node:23.3.0
35+
- image: cimg/node:23.5.0
3636
parameters:
3737
project:
3838
type: string
@@ -53,15 +53,15 @@ jobs:
5353
path: reports/junit
5454
Attest:
5555
docker:
56-
- image: cimg/node:23.3.0
56+
- image: cimg/node:23.5.0
5757
steps:
5858
- checkout
5959
- run: npm ci
6060
- run: npm run test:type-benches
6161

6262
BuildTarball:
6363
docker:
64-
- image: cimg/node:23.3.0
64+
- image: cimg/node:23.5.0
6565
steps:
6666
- checkout
6767
- run: npm run ci:precheck
@@ -80,7 +80,7 @@ jobs:
8080
react:
8181
type: string
8282
docker:
83-
- image: cimg/node:23.3.0-browsers
83+
- image: cimg/node:23.5.0-browsers
8484
steps:
8585
- checkout
8686
- attach_workspace:
@@ -118,7 +118,7 @@ jobs:
118118
externalPackage:
119119
type: string
120120
docker:
121-
- image: cimg/node:23.3.0
121+
- image: cimg/node:23.5.0
122122
steps:
123123
- checkout
124124
- attach_workspace:

.size-limits.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
2-
"dist/apollo-client.min.cjs": 41639,
2+
"dist/apollo-client.min.cjs": 41640,
33
"import { ApolloClient, InMemoryCache, HttpLink } from \"dist/index.js\" (production)": 34381
44
}

src/react/hooks/__tests__/useSubscription.test.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import {
1212
import { PROTOCOL_ERRORS_SYMBOL } from "../../../errors";
1313
import { InMemoryCache as Cache } from "../../../cache";
1414
import { ApolloProvider } from "../../context";
15-
import { MockSubscriptionLink } from "../../../testing";
15+
import { MockSubscriptionLink, wait } from "../../../testing";
1616
import { useSubscription } from "../useSubscription";
1717
import { spyOnConsole } from "../../../testing/internal";
1818
import { SubscriptionHookOptions } from "../../types/types";
@@ -1961,6 +1961,7 @@ describe("ignoreResults", () => {
19611961
}
19621962
);
19631963
if (!IS_REACT_17) {
1964+
await wait(0);
19641965
expect(subscriptionCreated).toHaveBeenCalledTimes(1);
19651966
}
19661967

@@ -2034,6 +2035,7 @@ describe("ignoreResults", () => {
20342035
}
20352036
);
20362037
if (!IS_REACT_17) {
2038+
await wait(0);
20372039
expect(subscriptionCreated).toHaveBeenCalledTimes(1);
20382040
}
20392041

0 commit comments

Comments
 (0)