From 34bcec242b8bc64c26e9455a8fd5781a59fbcf24 Mon Sep 17 00:00:00 2001
From: Vatsal Gor <vatsalkgor@gmail.com>
Date: Sat, 10 Jun 2023 02:29:00 +1200
Subject: [PATCH] fix(types): compatibility with `@types/ws` (#4899)

---
 package-lock.json                      | 14 +++++++-------
 package.json                           |  2 +-
 types/lib/servers/WebsocketServer.d.ts |  6 +++++-
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 9c5e827a8f..6ed1bba023 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -15,7 +15,7 @@
         "@types/serve-index": "^1.9.1",
         "@types/serve-static": "^1.13.10",
         "@types/sockjs": "^0.3.33",
-        "@types/ws": "^8.5.1",
+        "@types/ws": "^8.5.5",
         "ansi-html-community": "^0.0.8",
         "bonjour-service": "^1.0.11",
         "chokidar": "^3.5.3",
@@ -3845,9 +3845,9 @@
       }
     },
     "node_modules/@types/ws": {
-      "version": "8.5.4",
-      "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.4.tgz",
-      "integrity": "sha512-zdQDHKUgcX/zBc4GrwsE/7dVdAD8JR4EuiAXiiUhhfyIJXXb2+PrGshFyeXWQPMmmZ2XxgaqclgpIC7eTXc1mg==",
+      "version": "8.5.5",
+      "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.5.tgz",
+      "integrity": "sha512-lwhs8hktwxSjf9UaZ9tG5M03PGogvFaH8gUgLNbN9HKIg0dvv6q+gkSuJ8HN4/VbyxkuLzCjlN7GquQ0gUJfIg==",
       "dependencies": {
         "@types/node": "*"
       }
@@ -18925,9 +18925,9 @@
       }
     },
     "@types/ws": {
-      "version": "8.5.4",
-      "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.4.tgz",
-      "integrity": "sha512-zdQDHKUgcX/zBc4GrwsE/7dVdAD8JR4EuiAXiiUhhfyIJXXb2+PrGshFyeXWQPMmmZ2XxgaqclgpIC7eTXc1mg==",
+      "version": "8.5.5",
+      "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.5.tgz",
+      "integrity": "sha512-lwhs8hktwxSjf9UaZ9tG5M03PGogvFaH8gUgLNbN9HKIg0dvv6q+gkSuJ8HN4/VbyxkuLzCjlN7GquQ0gUJfIg==",
       "requires": {
         "@types/node": "*"
       }
diff --git a/package.json b/package.json
index 60829ed7dc..c1a0f98bfe 100644
--- a/package.json
+++ b/package.json
@@ -50,7 +50,7 @@
     "@types/serve-index": "^1.9.1",
     "@types/serve-static": "^1.13.10",
     "@types/sockjs": "^0.3.33",
-    "@types/ws": "^8.5.1",
+    "@types/ws": "^8.5.5",
     "ansi-html-community": "^0.0.8",
     "bonjour-service": "^1.0.11",
     "chokidar": "^3.5.3",
diff --git a/types/lib/servers/WebsocketServer.d.ts b/types/lib/servers/WebsocketServer.d.ts
index 28bee3d7d3..5a3880f09c 100644
--- a/types/lib/servers/WebsocketServer.d.ts
+++ b/types/lib/servers/WebsocketServer.d.ts
@@ -1,7 +1,11 @@
+/// <reference types="node" />
 export = WebsocketServer;
 declare class WebsocketServer extends BaseServer {
   static heartbeatInterval: number;
-  implementation: WebSocket.Server<WebSocket.WebSocket>;
+  implementation: WebSocket.Server<
+    typeof WebSocket,
+    typeof import("http").IncomingMessage
+  >;
 }
 declare namespace WebsocketServer {
   export { WebSocketServerConfiguration, ClientConnection };