From ecbe927af256de10d8ab568fdb963bca5a652ac9 Mon Sep 17 00:00:00 2001 From: Vlad Velici Date: Wed, 5 Feb 2025 19:35:04 +0000 Subject: [PATCH 1/3] make npm lint:fix to also format --- package-lock.json | 1 - package.json | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index ed0eb4f1..27b3e4dc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,7 +9,6 @@ "version": "0.4.0", "license": "Apache-2.0", "dependencies": { - "@rollup/rollup-linux-x64-gnu": "^4.18", "async-mutex": "^0.5.0", "dequal": "^2.0.3", "lodash.clonedeep": "^4.5.0" diff --git a/package.json b/package.json index 7a2b7a3b..32ca9a34 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ }, "scripts": { "lint": "eslint . && npm run cspell", - "lint:fix": "eslint --fix .", + "lint:fix": "eslint --fix .; npm run format", "format": "prettier --write src test __mocks__ demo/src", "format:check": "prettier --check src test __mocks__ demo/src", "test": "vitest run", From f0c2b9f4d85fd80e3dd785be02229c76c6da4d32 Mon Sep 17 00:00:00 2001 From: Vlad Velici Date: Thu, 6 Feb 2025 15:14:28 +0000 Subject: [PATCH 2/3] update dependencies --- demo/api/ably-token-request/package-lock.json | 8 ++++---- demo/api/ably-token-request/package.json | 2 +- demo/package-lock.json | 10 ++++++---- demo/package.json | 2 +- package-lock.json | 6 ++++-- package.json | 2 +- 6 files changed, 17 insertions(+), 13 deletions(-) diff --git a/demo/api/ably-token-request/package-lock.json b/demo/api/ably-token-request/package-lock.json index e539dbfd..6b6099e7 100644 --- a/demo/api/ably-token-request/package-lock.json +++ b/demo/api/ably-token-request/package-lock.json @@ -11,7 +11,7 @@ "dependencies": { "@netlify/functions": "^2.8.2", "@types/node": "^22.10.1", - "ably": "^2.5.0", + "ably": "^2.6.3", "dotenv": "^16.4.5", "typescript": "^5.7.2" } @@ -119,9 +119,9 @@ } }, "node_modules/ably": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/ably/-/ably-2.5.0.tgz", - "integrity": "sha512-PgZk1gDO7K5p5QbTGAV6n2un6otbu91J8n+2Bv/sCoNmfFqyAtQFnj/dWpcJTC3kwbxX/E3kimZAgnSXeNG8dg==", + "version": "2.6.3", + "resolved": "https://registry.npmjs.org/ably/-/ably-2.6.3.tgz", + "integrity": "sha512-M3YP4+fX1SrJXPPf5wTIWTZoKKqygxTYvrEGuqorOXFo19/ezbSIPZaY+U2znFfuK82k/LAEF7Q4sJ4oIgO1AA==", "license": "Apache-2.0", "dependencies": { "@ably/msgpack-js": "^0.4.0", diff --git a/demo/api/ably-token-request/package.json b/demo/api/ably-token-request/package.json index 2c3eca78..512a468c 100644 --- a/demo/api/ably-token-request/package.json +++ b/demo/api/ably-token-request/package.json @@ -10,7 +10,7 @@ "dependencies": { "@netlify/functions": "^2.8.2", "@types/node": "^22.10.1", - "ably": "^2.5.0", + "ably": "^2.6.3", "dotenv": "^16.4.5", "typescript": "^5.7.2" } diff --git a/demo/package-lock.json b/demo/package-lock.json index 0b7ad8d3..f063c8b0 100644 --- a/demo/package-lock.json +++ b/demo/package-lock.json @@ -9,7 +9,7 @@ "version": "0.0.0", "dependencies": { "@ably/chat": "file:..", - "ably": "^2.6.2", + "ably": "^2.6.3", "clsx": "^2.1.1", "nanoid": "^5.0.9", "react": "^18.3.1", @@ -78,7 +78,7 @@ "typedoc": "^0.27.2", "typedoc-plugin-no-inherit": "^1.4.0", "typescript": "^5.5.2", - "vite": "^6.0.2", + "vite": "^6.0.11", "vite-plugin-dts": "^4.2.4", "vitest": "^2.1.3" }, @@ -90,7 +90,7 @@ "@rollup/rollup-linux-x64-gnu": "^4.18" }, "peerDependencies": { - "ably": "^2.6.2", + "ably": "^2.6.3", "react": "^18.0.0 || ^19.0.0", "react-dom": "^18.0.0 || ^19.0.0" }, @@ -9800,7 +9800,9 @@ } }, "node_modules/ably": { - "version": "2.6.2", + "version": "2.6.3", + "resolved": "https://registry.npmjs.org/ably/-/ably-2.6.3.tgz", + "integrity": "sha512-M3YP4+fX1SrJXPPf5wTIWTZoKKqygxTYvrEGuqorOXFo19/ezbSIPZaY+U2znFfuK82k/LAEF7Q4sJ4oIgO1AA==", "license": "Apache-2.0", "dependencies": { "@ably/msgpack-js": "^0.4.0", diff --git a/demo/package.json b/demo/package.json index 873ba3d8..e75ec9ef 100644 --- a/demo/package.json +++ b/demo/package.json @@ -14,7 +14,7 @@ }, "dependencies": { "@ably/chat": "file:..", - "ably": "^2.6.2", + "ably": "^2.6.3", "clsx": "^2.1.1", "nanoid": "^5.0.9", "react": "^18.3.1", diff --git a/package-lock.json b/package-lock.json index 27b3e4dc..e039e918 100644 --- a/package-lock.json +++ b/package-lock.json @@ -61,7 +61,7 @@ "@rollup/rollup-linux-x64-gnu": "^4.18" }, "peerDependencies": { - "ably": "^2.6.2", + "ably": "^2.6.3", "react": "^18.0.0 || ^19.0.0", "react-dom": "^18.0.0 || ^19.0.0" }, @@ -2716,7 +2716,9 @@ "license": "MIT" }, "node_modules/ably": { - "version": "2.6.2", + "version": "2.6.3", + "resolved": "https://registry.npmjs.org/ably/-/ably-2.6.3.tgz", + "integrity": "sha512-M3YP4+fX1SrJXPPf5wTIWTZoKKqygxTYvrEGuqorOXFo19/ezbSIPZaY+U2znFfuK82k/LAEF7Q4sJ4oIgO1AA==", "license": "Apache-2.0", "peer": true, "dependencies": { diff --git a/package.json b/package.json index 32ca9a34..b38492f2 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,7 @@ "node": ">=18.0.0" }, "peerDependencies": { - "ably": "^2.6.2", + "ably": "^2.6.3", "react": "^18.0.0 || ^19.0.0", "react-dom": "^18.0.0 || ^19.0.0" }, From a6ff8d58409546430c9a67c87189080965f66eaa Mon Sep 17 00:00:00 2001 From: Vlad Velici Date: Thu, 6 Feb 2025 15:23:56 +0000 Subject: [PATCH 3/3] increase presence test wait and timeouts --- test/core/presence.integration.test.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/test/core/presence.integration.test.ts b/test/core/presence.integration.test.ts index 8a824d73..933c013e 100644 --- a/test/core/presence.integration.test.ts +++ b/test/core/presence.integration.test.ts @@ -23,7 +23,7 @@ interface TestContext { chat: ChatClient; } -// Wait a maximum of 5 seconds for a particular presence event to be received +// Wait a maximum of 20 seconds for a particular presence event to be received const waitForPresenceEvent = async ( events: PresenceEvent[], action: PresenceEvents, @@ -44,11 +44,11 @@ const waitForPresenceEvent = async ( clearInterval(interval); const eventType = Array.isArray(action) ? action.join(',') : action; reject(new Error('Timed out waiting for presence event of type ' + eventType)); - }, 5000); + }, 20000); }); }; -// Wait a maximum of 3 seconds to assert that a presence event has not been received +// Wait a maximum of 10 seconds to assert that a presence event has not been received const assertNoPresenceEvent = async (events: PresenceEvent[], action: PresenceEvents, clientId: string) => { return new Promise((resolve, reject) => { const interval = setInterval(() => { @@ -65,7 +65,7 @@ const assertNoPresenceEvent = async (events: PresenceEvent[], action: PresenceEv setTimeout(() => { clearInterval(interval); resolve(); - }, 3000); + }, 10000); }); }; @@ -95,7 +95,7 @@ const waitForEvent = ( }); }; -describe('UserPresence', { timeout: 10000 }, () => { +describe('UserPresence', { timeout: 30000 }, () => { // Setup before each test, create a new Ably Realtime client and a new Room beforeEach(async (context) => { context.realtime = ablyRealtimeClient();