fix: ws types (#6083)

vitejs · Dec 12, 2021 · 1ded1a8 · 1ded1a8
1 parent 745c2ec
commit 1ded1a8
Show file tree

Hide file tree

Showing 5 changed files with 297 additions and 294 deletions.
diff --git a/packages/vite/package.json b/packages/vite/package.json
@@ -74,7 +74,7 @@
     "@types/resolve": "^1.20.1",
     "@types/sass": "~1.43.0",
     "@types/stylus": "^0.48.36",
-    "@types/ws": "^8.2.0",
+    "@types/ws": "^8.2.2",
     "@vue/compiler-dom": "^3.2.22",
     "acorn": "^8.6.0",
     "acorn-class-fields": "^1.0.0",
@@ -117,7 +117,7 @@
     "tsconfck": "1.1.1",
     "tslib": "^2.3.1",
     "types": "link:./types",
-    "ws": "^8.2.3"
+    "ws": "^8.3.0"
   },
   "peerDependencies": {
     "less": "*",

diff --git a/packages/vite/src/node/index.ts b/packages/vite/src/node/index.ts
@@ -83,7 +83,7 @@ export type {
   ErrorPayload
 } from 'types/hmrPayload'
 export type { Connect } from 'types/connect'
-export type { WebSocket } from 'types/ws'
+export type { WebSocket, WebSocketAlias } from 'types/ws'
 export type { HttpProxy } from 'types/http-proxy'
 export type { FSWatcher, WatchOptions } from 'types/chokidar'
 export type { Terser } from 'types/terser'

diff --git a/packages/vite/src/node/server/ws.ts b/packages/vite/src/node/server/ws.ts
@@ -5,15 +5,16 @@ import {
   ServerOptions as HttpsServerOptions
 } from 'https'
 import { WebSocketServer as WebSocket, ServerOptions } from 'ws'
+import { WebSocket as WebSocketTypes } from 'types/ws'
 import { ErrorPayload, HMRPayload } from 'types/hmrPayload'
 import { ResolvedConfig } from '..'
 import { isObject } from '../utils'
 import { Socket } from 'net'
 export const HMR_HEADER = 'vite-hmr'
 
 export interface WebSocketServer {
-  on: WebSocket['on']
-  off: WebSocket['off']
+  on: WebSocketTypes.Server['on']
+  off: WebSocketTypes.Server['off']
   send(payload: HMRPayload): void
   close(): Promise<void>
 }