From 483c77fba80839ef216ec1ed39fb3bd2f424487e Mon Sep 17 00:00:00 2001 From: Lawrence Date: Thu, 7 Mar 2019 21:29:37 -0800 Subject: [PATCH 1/3] Remove websocket@1.0.25 entry from yarn.lock so yarn installs websocket@^1.0.26. Update order-watcher's websocket dependency from ^1.0.25 (broken on some node architectures) to ^1.0.26. --- packages/order-watcher/CHANGELOG.json | 8 ++++++++ packages/order-watcher/package.json | 4 ++-- yarn.lock | 9 --------- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/packages/order-watcher/CHANGELOG.json b/packages/order-watcher/CHANGELOG.json index 26aeb95726..2bcdf562e3 100644 --- a/packages/order-watcher/CHANGELOG.json +++ b/packages/order-watcher/CHANGELOG.json @@ -1,4 +1,12 @@ [ + { + "version": "4.0.4", + "changes": [ + { + "note": "Update websocket from ^1.0.25 to ^1.0.26" + } + ] + }, { "timestamp": 1551479279, "version": "4.0.3", diff --git a/packages/order-watcher/package.json b/packages/order-watcher/package.json index 2fa071522c..df8797fe66 100644 --- a/packages/order-watcher/package.json +++ b/packages/order-watcher/package.json @@ -1,6 +1,6 @@ { "name": "@0x/order-watcher", - "version": "4.0.3", + "version": "4.0.4", "description": "An order watcher daemon that watches for order validity", "keywords": [ "0x", @@ -81,7 +81,7 @@ "ethereumjs-blockstream": "6.0.0", "ethers": "~4.0.4", "lodash": "^4.17.11", - "websocket": "^1.0.25" + "websocket": "^1.0.26" }, "publishConfig": { "access": "public" diff --git a/yarn.lock b/yarn.lock index 61f7958fdf..0e511f4e15 100644 --- a/yarn.lock +++ b/yarn.lock @@ -17619,15 +17619,6 @@ websocket@1.0.26: typedarray-to-buffer "^3.1.2" yaeti "^0.0.6" -websocket@^1.0.25: - version "1.0.25" - resolved "https://registry.yarnpkg.com/websocket/-/websocket-1.0.25.tgz#998ec790f0a3eacb8b08b50a4350026692a11958" - dependencies: - debug "^2.2.0" - nan "^2.3.3" - typedarray-to-buffer "^3.1.2" - yaeti "^0.0.6" - "websocket@git://github.com/frozeman/WebSocket-Node.git#browserifyCompatible": version "1.0.26" resolved "git://github.com/frozeman/WebSocket-Node.git#6c72925e3f8aaaea8dc8450f97627e85263999f2" From 755c4da8cced24db5393779e5ded05819f9cce9f Mon Sep 17 00:00:00 2001 From: Lawrence Date: Fri, 8 Mar 2019 01:39:45 -0800 Subject: [PATCH 2/3] Add PR --- packages/order-watcher/CHANGELOG.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/order-watcher/CHANGELOG.json b/packages/order-watcher/CHANGELOG.json index 2bcdf562e3..8cff90d24e 100644 --- a/packages/order-watcher/CHANGELOG.json +++ b/packages/order-watcher/CHANGELOG.json @@ -3,7 +3,8 @@ "version": "4.0.4", "changes": [ { - "note": "Update websocket from ^1.0.25 to ^1.0.26" + "note": "Update websocket from ^1.0.25 to ^1.0.26", + "pr": 1685 } ] }, From 644f54bfba67f097f26eb1a3ce6b1cc4d2f74e18 Mon Sep 17 00:00:00 2001 From: Lawrence Date: Fri, 8 Mar 2019 02:20:23 -0800 Subject: [PATCH 3/3] Update connect package as well because it was also asking for websocket@^1.0.25. --- packages/connect/CHANGELOG.json | 9 +++++++++ packages/connect/package.json | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/packages/connect/CHANGELOG.json b/packages/connect/CHANGELOG.json index 3c8a2363d5..ca1104000a 100644 --- a/packages/connect/CHANGELOG.json +++ b/packages/connect/CHANGELOG.json @@ -1,4 +1,13 @@ [ + { + "version": "5.0.3", + "changes": [ + { + "note": "Update websocket@^1.0.25 -> websocket@^1.0.26", + "pr": 1685 + } + ] + }, { "timestamp": 1551479279, "version": "5.0.2", diff --git a/packages/connect/package.json b/packages/connect/package.json index 96b32537cb..94d0c0603d 100644 --- a/packages/connect/package.json +++ b/packages/connect/package.json @@ -54,7 +54,7 @@ "query-string": "^6.0.0", "sinon": "^4.0.0", "uuid": "^3.3.2", - "websocket": "^1.0.25" + "websocket": "^1.0.26" }, "devDependencies": { "@0x/tslint-config": "^3.0.0",