From 2e88936a298972c27849e033b4c2860b30de604c Mon Sep 17 00:00:00 2001 From: Anton Nikolaev Date: Tue, 31 Mar 2020 02:43:29 -0700 Subject: [PATCH] Import ws package Summary: Import ws package in a usual way instead of importing it as source code Reviewed By: jknoxville Differential Revision: D20724584 fbshipit-source-id: 39cad6e544b71e66560a9351f1e5a0c89be2c152 --- desktop/app/package.json | 2 +- desktop/app/src/server.tsx | 5 +---- desktop/package.json | 2 +- desktop/static/package.json | 3 ++- desktop/yarn.lock | 15 ++++----------- 5 files changed, 9 insertions(+), 18 deletions(-) diff --git a/desktop/app/package.json b/desktop/app/package.json index 2d389c589..c39e5feeb 100644 --- a/desktop/app/package.json +++ b/desktop/app/package.json @@ -76,7 +76,7 @@ "uuid": "^7.0.1", "websocket": "^1.0.31", "which": "^2.0.1", - "ws": "^7.2.0", + "ws": "^7.2.3", "xdg-basedir": "^4.0.0", "xml2js": "^0.4.19", "yargs": "^15.0.1", diff --git a/desktop/app/src/server.tsx b/desktop/app/src/server.tsx index 81afb0ce7..3536da08c 100644 --- a/desktop/app/src/server.tsx +++ b/desktop/app/src/server.tsx @@ -32,10 +32,7 @@ import JSDevice from './devices/JSDevice'; import {WebsocketClientFlipperConnection} from './utils/js-client/websocketClientFlipperConnection'; import querystring from 'querystring'; import {IncomingMessage} from 'http'; -import {isTest} from './utils/isProduction'; -// Electron tries to get you to use browser's ws instead, so can't use import. -// @ts-ignore -const ws = isTest() ? require('ws') : require('../../node_modules/ws/index.js'); +import ws from 'ws'; type ClientInfo = { connection: FlipperClientConnection | null | undefined; diff --git a/desktop/package.json b/desktop/package.json index 1d5916295..396a319f4 100644 --- a/desktop/package.json +++ b/desktop/package.json @@ -79,7 +79,7 @@ "acorn": "7.1.1", "minimist": "1.2.2", "metro/temp": "0.9.0", - "ws": "7.2.0" + "ws": "7.2.3" }, "jest": { "transform": { diff --git a/desktop/static/package.json b/desktop/static/package.json index e1a92ef69..f8cf4ba39 100644 --- a/desktop/static/package.json +++ b/desktop/static/package.json @@ -18,6 +18,7 @@ "recursive-readdir": "2.2.2", "uuid": "^7.0.1", "xdg-basedir": "^4.0.0", - "yargs": "^15.0.1" + "yargs": "^15.0.1", + "ws": "^7.2.3" } } diff --git a/desktop/yarn.lock b/desktop/yarn.lock index e104acbdd..dcac20e51 100644 --- a/desktop/yarn.lock +++ b/desktop/yarn.lock @@ -2776,11 +2776,6 @@ async-exit-hook@^2.0.1: resolved "https://registry.yarnpkg.com/async-exit-hook/-/async-exit-hook-2.0.1.tgz#8bd8b024b0ec9b1c01cccb9af9db29bd717dfaf3" integrity sha512-NW2cX8m1Q7KPA7a5M2ULQeZ2wR5qI5PAbw5L0UOMxdioVk9PMZ0h1TmyZEkPYrCvYjDlFICusOu1dlEKAAeXBw== -async-limiter@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.1.tgz#dd379e94f0db8310b08291f9d64c3209766617fd" - integrity sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ== - async-mutex@^0.1.3: version "0.1.4" resolved "https://registry.yarnpkg.com/async-mutex/-/async-mutex-0.1.4.tgz#a47d1eebf584f7dcdd760e3642dc2c58613bef5c" @@ -11789,12 +11784,10 @@ write@1.0.3: dependencies: mkdirp "^0.5.1" -ws@7.1.0, ws@7.2.0, ws@^1.1.5, ws@^5.2.0, ws@^7, ws@^7.0.0, ws@^7.1.2, ws@^7.2.0, ws@~6.1.0: - version "7.2.0" - resolved "https://registry.yarnpkg.com/ws/-/ws-7.2.0.tgz#422eda8c02a4b5dba7744ba66eebbd84bcef0ec7" - integrity sha512-+SqNqFbwTm/0DC18KYzIsMTnEWpLwJsiasW/O17la4iDRRIO9uaHbvKiAS3AHgTiuuWerK/brj4O6MYZkei9xg== - dependencies: - async-limiter "^1.0.0" +ws@7.1.0, ws@7.2.3, ws@^1.1.5, ws@^5.2.0, ws@^7, ws@^7.0.0, ws@^7.1.2, ws@^7.2.3, ws@~6.1.0: + version "7.2.3" + resolved "https://registry.yarnpkg.com/ws/-/ws-7.2.3.tgz#a5411e1fb04d5ed0efee76d26d5c46d830c39b46" + integrity sha512-HTDl9G9hbkNDk98naoR/cHDws7+EyYMOdL1BmjsZXRUjf7d+MficC4B7HLUPlSiho0vg+CWKrGIt/VJBd1xunQ== x-is-string@^0.1.0: version "0.1.0"