Skip to content

Commit 0e9b840

Browse files
committed
Merge branch 'alpha' into pr/9693
2 parents b8e085d + 177de4d commit 0e9b840

File tree

3 files changed

+42
-35
lines changed

3 files changed

+42
-35
lines changed

Diff for: package-lock.json

+31-28
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"license": "Apache-2.0",
2222
"dependencies": {
2323
"@apollo/server": "4.11.3",
24-
"@babel/eslint-parser": "7.26.10",
24+
"@babel/eslint-parser": "7.27.0",
2525
"@graphql-tools/merge": "9.0.24",
2626
"@graphql-tools/schema": "10.0.23",
2727
"@graphql-tools/utils": "10.8.4",
@@ -45,7 +45,7 @@
4545
"ldapjs": "3.0.7",
4646
"lodash": "4.17.21",
4747
"lru-cache": "10.4.0",
48-
"mime": "4.0.6",
48+
"mime": "4.0.7",
4949
"mongodb": "6.15.0",
5050
"mustache": "4.2.0",
5151
"otpauth": "9.3.6",
@@ -108,10 +108,10 @@
108108
"node-fetch": "3.2.10",
109109
"nyc": "17.1.0",
110110
"prettier": "2.0.5",
111-
"semantic-release": "24.2.1",
111+
"semantic-release": "24.2.3",
112112
"typescript": "5.8.2",
113113
"typescript-eslint": "8.29.0",
114-
"yaml": "2.7.0"
114+
"yaml": "2.7.1"
115115
},
116116
"scripts": {
117117
"ci:check": "node ./ci/ciCheck.js",

Diff for: spec/ParseLiveQuery.spec.js

+7-3
Original file line numberDiff line numberDiff line change
@@ -1173,14 +1173,18 @@ describe('ParseLiveQuery', function () {
11731173
const client = await Parse.CoreManager.getLiveQueryController().getDefaultLiveQueryClient();
11741174
client.serverURL = 'ws://localhost:1345/1';
11751175
const query = await new Parse.Query('Yolo').subscribe();
1176+
let liveQueryConnectionCount = await getConnectionsCount(server.liveQueryServer.server);
1177+
expect(liveQueryConnectionCount > 0).toBe(true);
11761178
await Promise.all([
11771179
server.handleShutdown(),
11781180
new Promise(resolve => query.on('close', resolve)),
11791181
]);
1180-
await new Promise(resolve => setTimeout(resolve, 100));
1182+
await sleep(100);
11811183
expect(server.liveQueryServer.server.address()).toBeNull();
11821184
expect(server.liveQueryServer.subscriber.isOpen).toBeFalse();
1183-
await new Promise(resolve => server.server.close(resolve));
1185+
1186+
liveQueryConnectionCount = await getConnectionsCount(server.liveQueryServer.server);
1187+
expect(liveQueryConnectionCount).toBe(0);
11841188
});
11851189

11861190
it_id('45655b74-716f-4fa1-a058-67eb21f3c3db')(it)('does shutdown separate liveQuery server', async () => {
@@ -1245,7 +1249,7 @@ describe('ParseLiveQuery', function () {
12451249
new Promise(resolve => query.on('close', resolve)),
12461250
]);
12471251
expect(close).toBe(true);
1248-
await new Promise(resolve => setTimeout(resolve, 100));
1252+
await sleep(100);
12491253
expect(parseServer.liveQueryServer.server.address()).toBeNull();
12501254
expect(parseServer.liveQueryServer.subscriber.isOpen).toBeFalse();
12511255

0 commit comments

Comments
 (0)