From fc83beb9163fbd28d41e8254f1c1a9048111acc7 Mon Sep 17 00:00:00 2001 From: Wolf Vollprecht Date: Mon, 13 Jan 2020 22:47:06 +0100 Subject: [PATCH 1/3] remove removing ws --- packages/services/package.json | 2 +- packages/services/src/serverconnection.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/services/package.json b/packages/services/package.json index 9ef76a240a88..06ad975ed9e1 100644 --- a/packages/services/package.json +++ b/packages/services/package.json @@ -30,7 +30,7 @@ "main": "lib/index.js", "browser": { "node-fetch": false, - "ws": false + "ws": "./lib/shim/ws.js" }, "typings": "lib/index.d.ts", "scripts": { diff --git a/packages/services/src/serverconnection.ts b/packages/services/src/serverconnection.ts index 6960866058f1..ed8a2e884ed4 100644 --- a/packages/services/src/serverconnection.ts +++ b/packages/services/src/serverconnection.ts @@ -21,7 +21,7 @@ if (typeof window === 'undefined') { FETCH = global.fetch ?? fetchMod; REQUEST = global.Request ?? fetchMod.Request; HEADERS = global.Headers ?? fetchMod.Headers; - WEBSOCKET = global.WebSocket ?? require('ws'); + WEBSOCKET = require('ws').ws; /* tslint:enable */ } else { FETCH = fetch; From 9431faa1f5942ac27419e1dc85b8f55210b794a5 Mon Sep 17 00:00:00 2001 From: Wolf Vollprecht Date: Tue, 14 Jan 2020 09:09:25 +0100 Subject: [PATCH 2/3] add missing shim file --- packages/services/src/shim/ws.ts | 1 + 1 file changed, 1 insertion(+) create mode 100644 packages/services/src/shim/ws.ts diff --git a/packages/services/src/shim/ws.ts b/packages/services/src/shim/ws.ts new file mode 100644 index 000000000000..193ea41efe51 --- /dev/null +++ b/packages/services/src/shim/ws.ts @@ -0,0 +1 @@ +export const ws = WebSocket; \ No newline at end of file From ade43868afe41099e18cf1a1c48de762c2d59530 Mon Sep 17 00:00:00 2001 From: Wolf Vollprecht Date: Tue, 14 Jan 2020 15:27:27 +0100 Subject: [PATCH 3/3] fix up the shim --- packages/services/src/serverconnection.ts | 2 +- packages/services/src/shim/ws.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/services/src/serverconnection.ts b/packages/services/src/serverconnection.ts index ed8a2e884ed4..b48d4825afa5 100644 --- a/packages/services/src/serverconnection.ts +++ b/packages/services/src/serverconnection.ts @@ -21,7 +21,7 @@ if (typeof window === 'undefined') { FETCH = global.fetch ?? fetchMod; REQUEST = global.Request ?? fetchMod.Request; HEADERS = global.Headers ?? fetchMod.Headers; - WEBSOCKET = require('ws').ws; + WEBSOCKET = require('ws'); /* tslint:enable */ } else { FETCH = fetch; diff --git a/packages/services/src/shim/ws.ts b/packages/services/src/shim/ws.ts index 193ea41efe51..5b82f34d0df3 100644 --- a/packages/services/src/shim/ws.ts +++ b/packages/services/src/shim/ws.ts @@ -1 +1 @@ -export const ws = WebSocket; \ No newline at end of file +export default WebSocket;