diff --git a/packages/redux-devtools-core/package.json b/packages/redux-devtools-core/package.json index e5400843..b7851c7e 100644 --- a/packages/redux-devtools-core/package.json +++ b/packages/redux-devtools-core/package.json @@ -86,7 +86,7 @@ "redux-devtools-trace-monitor": "^0.1.1", "redux-persist": "^4.10.2", "remotedev-serialize": "^0.1.8", - "socketcluster-client": "^5.5.2", + "socketcluster-client": "^14.3.1", "styled-components": "^2.4.1" }, "peerDependencies": { diff --git a/packages/redux-devtools-core/src/app/constants/socketActionTypes.js b/packages/redux-devtools-core/src/app/constants/socketActionTypes.js index f1d87899..95e00b6a 100644 --- a/packages/redux-devtools-core/src/app/constants/socketActionTypes.js +++ b/packages/redux-devtools-core/src/app/constants/socketActionTypes.js @@ -7,7 +7,7 @@ export const { AUTHENTICATED, PENDING, UNAUTHENTICATED, -} = socketCluster.SCSocket; +} = socketCluster.SCClientSocket; export const CONNECT_REQUEST = 'socket/CONNECT_REQUEST'; export const CONNECT_SUCCESS = 'socket/CONNECT_SUCCESS'; export const CONNECT_ERROR = 'socket/CONNECT_ERROR'; diff --git a/packages/redux-devtools-core/src/app/middlewares/api.js b/packages/redux-devtools-core/src/app/middlewares/api.js index 666c8bde..7a6bedd4 100644 --- a/packages/redux-devtools-core/src/app/middlewares/api.js +++ b/packages/redux-devtools-core/src/app/middlewares/api.js @@ -147,7 +147,7 @@ function connect() { if (process.env.NODE_ENV === 'test') return; const connection = store.getState().connection; try { - socket = socketCluster.connect( + socket = socketCluster.create( connection.type === 'remotedev' ? socketOptions : connection.options ); handleConnection(store); diff --git a/yarn.lock b/yarn.lock index fdc3b084..cdecd0f2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4377,11 +4377,6 @@ balanced-match@^1.0.0: resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767" integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c= -base-64@0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/base-64/-/base-64-0.1.0.tgz#780a99c84e7d600260361511c4877613bf24f6bb" - integrity sha1-eAqZyE59YAJgNhURxId2E78k9rs= - base16@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/base16/-/base16-1.0.0.tgz#e297f60d7ec1014a7a971a39ebc8a98c0b681e70" @@ -5370,11 +5365,6 @@ compare-versions@^3.6.0: resolved "https://registry.yarnpkg.com/compare-versions/-/compare-versions-3.6.0.tgz#1a5689913685e5a87637b8d3ffca75514ec41d62" integrity sha512-W6Af2Iw1z4CB7q4uU4hv646dW9GQuBM+YpC0UvUCWSD8w90SJjp+ujJuXaEMtAXBtSqGfMPuFOVn4/+FlaqfBA== -component-emitter@1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.0.tgz#ccd113a86388d06482d03de3fc7df98526ba8efe" - integrity sha1-zNETqGOI0GSC0D3j/H35hSa6jv4= - component-emitter@1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6" @@ -14008,11 +13998,6 @@ safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== -safe-buffer@~5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.0.1.tgz#d263ca54696cd8a306b5ca6551e92de57918fbe7" - integrity sha1-0mPKVGls2KMGtcplUekt5XkY++c= - safe-regex@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e" @@ -14097,20 +14082,6 @@ sc-channel@^1.2.0: dependencies: component-emitter "1.2.1" -sc-channel@~1.0.6: - version "1.0.6" - resolved "https://registry.yarnpkg.com/sc-channel/-/sc-channel-1.0.6.tgz#b38bd47a993e78290fbc53467867f6b2a0a08639" - integrity sha1-s4vUepk+eCkPvFNGeGf2sqCghjk= - dependencies: - sc-emitter "1.x.x" - -sc-emitter@1.x.x, sc-emitter@~1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/sc-emitter/-/sc-emitter-1.1.0.tgz#ef119d4222f4c64f887b486964ef11116cdd0e75" - integrity sha1-7xGdQiL0xk+Ie0hpZO8REWzdDnU= - dependencies: - component-emitter "1.2.0" - sc-errors@^1.4.1: version "1.4.1" resolved "https://registry.yarnpkg.com/sc-errors/-/sc-errors-1.4.1.tgz#53e80030fe647e133d73b51eaa7d2b0f7591fd5b" @@ -14121,12 +14092,7 @@ sc-errors@^2.0.1: resolved "https://registry.yarnpkg.com/sc-errors/-/sc-errors-2.0.1.tgz#3af2d934dfd82116279a4b2c1552c1e021ddcb03" integrity sha512-JoVhq3Ud+3Ujv2SIG7W0XtjRHsrNgl6iXuHHsh0s+Kdt5NwI6N2EGAZD4iteitdDv68ENBkpjtSvN597/wxPSQ== -sc-errors@~1.3.0: - version "1.3.3" - resolved "https://registry.yarnpkg.com/sc-errors/-/sc-errors-1.3.3.tgz#c00bc4c766a970cc8d5937d08cd58e931d7dae05" - integrity sha1-wAvEx2apcMyNWTfQjNWOkx19rgU= - -sc-formatter@^3.0.1, sc-formatter@^3.0.2, sc-formatter@~3.0.0, sc-formatter@~3.0.1: +sc-formatter@^3.0.1, sc-formatter@^3.0.2, sc-formatter@~3.0.1: version "3.0.2" resolved "https://registry.yarnpkg.com/sc-formatter/-/sc-formatter-3.0.2.tgz#9abdb14e71873ce7157714d3002477bbdb33c4e6" integrity sha512-9PbqYBpCq+OoEeRQ3QfFIGE6qwjjBcd2j7UjgDlhnZbtSnuGgHdcRklPKYGuYFH82V/dwd+AIpu8XvA1zqTd+A== @@ -14543,21 +14509,6 @@ socketcluster-client@^14.3.1: uuid "3.2.1" ws "7.1.0" -socketcluster-client@^5.5.2: - version "5.5.2" - resolved "https://registry.yarnpkg.com/socketcluster-client/-/socketcluster-client-5.5.2.tgz#9d4369e0e722ff7e55e5422c2d44f5afe1aff128" - integrity sha1-nUNp4Oci/35V5UIsLUT1r+Gv8Sg= - dependencies: - base-64 "0.1.0" - clone "2.1.1" - linked-list "0.1.0" - querystring "0.2.0" - sc-channel "~1.0.6" - sc-emitter "~1.1.0" - sc-errors "~1.3.0" - sc-formatter "~3.0.0" - ws "3.0.0" - socketcluster-server@^14.7.0: version "14.7.1" resolved "https://registry.yarnpkg.com/socketcluster-server/-/socketcluster-server-14.7.1.tgz#7bc3ebbed9fb29b6de86e91b087acc579284aef0" @@ -15846,11 +15797,6 @@ uid-number@0.0.6: resolved "https://registry.yarnpkg.com/uid-number/-/uid-number-0.0.6.tgz#0ea10e8035e8eb5b8e4449f06da1c730663baa81" integrity sha1-DqEOgDXo61uOREnwbaHHMGY7qoE= -ultron@~1.1.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/ultron/-/ultron-1.1.1.tgz#9fe1536a10a664a65266a1e3ccf85fd36302bc9c" - integrity sha512-UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og== - umask@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/umask/-/umask-1.1.0.tgz#f29cebf01df517912bb58ff9c4e50fde8e33320d" @@ -16595,14 +16541,6 @@ write@^0.2.1: dependencies: mkdirp "^0.5.1" -ws@3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/ws/-/ws-3.0.0.tgz#98ddb00056c8390cb751e7788788497f99103b6c" - integrity sha1-mN2wAFbIOQy3Ued4h4hJf5kQO2w= - dependencies: - safe-buffer "~5.0.1" - ultron "~1.1.0" - ws@7.1.0: version "7.1.0" resolved "https://registry.yarnpkg.com/ws/-/ws-7.1.0.tgz#0395646c6fcc3ac56abf61ce1a42039637a6bd98"