From 1568131d8c9e0a621cc363f6f7d7f53416095e01 Mon Sep 17 00:00:00 2001 From: salfield Date: Sat, 27 Feb 2016 02:34:36 +0800 Subject: [PATCH 1/8] Delete engine.io-client@1.5.1.json This is causing an old and broken version of has-cors to get installed when you try and install socket.io. --- package-overrides/npm/engine.io-client@1.5.1.json | 15 --------------- 1 file changed, 15 deletions(-) delete mode 100644 package-overrides/npm/engine.io-client@1.5.1.json diff --git a/package-overrides/npm/engine.io-client@1.5.1.json b/package-overrides/npm/engine.io-client@1.5.1.json deleted file mode 100644 index e310771..0000000 --- a/package-overrides/npm/engine.io-client@1.5.1.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "dependencies": { - "xmlhttprequest" : "git+https://github.com/rase-/node-XMLHttpRequest.git#add/ssl-support", - "has-cors": "1.0.3", - "ws": "0.7.1", - "component-emitter": "1.1.2", - "indexof": "0.0.1", - "engine.io-parser": "1.2.1", - "debug": "2.1.3", - "parseuri": "0.0.4", - "parsejson": "0.0.1", - "parseqs": "0.0.2", - "component-inherit": "0.0.3" - } -} From d1776fc0d08a8a0629cd9ec6142949ea3c144786 Mon Sep 17 00:00:00 2001 From: salfield Date: Sat, 27 Feb 2016 17:41:18 +0800 Subject: [PATCH 2/8] Create engine.io@1.6.8.json Don't use the old version of "accepts", which requires a version of "negotiator" using dynamic requires. --- package-overrides/npm/engine.io@1.6.8.json | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 package-overrides/npm/engine.io@1.6.8.json diff --git a/package-overrides/npm/engine.io@1.6.8.json b/package-overrides/npm/engine.io@1.6.8.json new file mode 100644 index 0000000..76d1ca6 --- /dev/null +++ b/package-overrides/npm/engine.io@1.6.8.json @@ -0,0 +1,5 @@ +{ + "dependencies":{ + "accepts": "1.3.1" + } +} From f1a2ddc2c7c134f6af894e7c40d94f6892900e80 Mon Sep 17 00:00:00 2001 From: salfield Date: Sat, 27 Feb 2016 18:00:01 +0800 Subject: [PATCH 3/8] Create socket.io@1.4.5 Allow socket.io to import the socket.io-client package.json. --- package-overrides/npm/socket.io@1.4.5 | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 package-overrides/npm/socket.io@1.4.5 diff --git a/package-overrides/npm/socket.io@1.4.5 b/package-overrides/npm/socket.io@1.4.5 new file mode 100644 index 0000000..bc9019d --- /dev/null +++ b/package-overrides/npm/socket.io@1.4.5 @@ -0,0 +1,5 @@ +{"map": + { + "socket.io-client/package":"socket.io-client/package.json!" + } +} From f673ee066b51b1a924bd3929374c96bfc39e15ac Mon Sep 17 00:00:00 2001 From: salfield Date: Sat, 27 Feb 2016 18:17:40 +0800 Subject: [PATCH 4/8] Rename socket.io@1.4.5 to socket.io@1.4.5.json --- package-overrides/npm/{socket.io@1.4.5 => socket.io@1.4.5.json} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename package-overrides/npm/{socket.io@1.4.5 => socket.io@1.4.5.json} (100%) diff --git a/package-overrides/npm/socket.io@1.4.5 b/package-overrides/npm/socket.io@1.4.5.json similarity index 100% rename from package-overrides/npm/socket.io@1.4.5 rename to package-overrides/npm/socket.io@1.4.5.json From 118e220d1bbf5dd1996866aecd37f9b6698b046b Mon Sep 17 00:00:00 2001 From: salfield Date: Sat, 27 Feb 2016 18:33:51 +0800 Subject: [PATCH 5/8] Update socket.io@1.4.5.json This doesn't need the json loader - it can just be loaded as javascript. --- package-overrides/npm/socket.io@1.4.5.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package-overrides/npm/socket.io@1.4.5.json b/package-overrides/npm/socket.io@1.4.5.json index bc9019d..43c3877 100644 --- a/package-overrides/npm/socket.io@1.4.5.json +++ b/package-overrides/npm/socket.io@1.4.5.json @@ -1,5 +1,5 @@ {"map": { - "socket.io-client/package":"socket.io-client/package.json!" + "socket.io-client/package":"socket.io-client/package.json" } } From e2a907b2b74c5e324b6bd81c4aab8704b8028970 Mon Sep 17 00:00:00 2001 From: salfield Date: Sat, 27 Feb 2016 19:15:55 +0800 Subject: [PATCH 6/8] Update engine.io@1.6.8.json It seems that I must override all dependencies if I override 1. Which is a shame because I only want to override "accepts". --- package-overrides/npm/engine.io@1.6.8.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package-overrides/npm/engine.io@1.6.8.json b/package-overrides/npm/engine.io@1.6.8.json index 76d1ca6..70729a1 100644 --- a/package-overrides/npm/engine.io@1.6.8.json +++ b/package-overrides/npm/engine.io@1.6.8.json @@ -1,5 +1,9 @@ { "dependencies":{ + "base64id": "0.1.0", + "debug": "2.2.0", + "ws": "1.0.1", + "engine.io-parser": "1.2.4", "accepts": "1.3.1" } } From 1870adfaab6196b1f9c77dbbe8ca3a27140504fd Mon Sep 17 00:00:00 2001 From: salfield Date: Sat, 27 Feb 2016 19:32:22 +0800 Subject: [PATCH 7/8] Create ws@1.0.1.json utf-8-validate and bufferutil are conditionally required causing this module to fail. --- package-overrides/npm/ws@1.0.1.json | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 package-overrides/npm/ws@1.0.1.json diff --git a/package-overrides/npm/ws@1.0.1.json b/package-overrides/npm/ws@1.0.1.json new file mode 100644 index 0000000..13a46a9 --- /dev/null +++ b/package-overrides/npm/ws@1.0.1.json @@ -0,0 +1,8 @@ +{ + "dependencies":{ + "options": ">=0.0.5", + "ultron": "1.0.x", + "utf-8-validate": "1.2.x", + "bufferutil": "1.2.x" + } +} From 2513314c6d8bb7561d33d70328a9282fa26ea114 Mon Sep 17 00:00:00 2001 From: Tom Salfield Date: Sun, 28 Feb 2016 03:57:06 +0800 Subject: [PATCH 8/8] re-add engine.io-client as suggested --- package-overrides/npm/engine.io-client@1.5.1.json | 15 +++++++++++++++ package-overrides/npm/engine.io-client@1.6.8.json | 1 + package-overrides/npm/engine.io@1.6.8.json | 2 +- package-overrides/npm/socket.io@1.4.5.json | 6 +++--- package-overrides/npm/ws@1.0.1.json | 2 +- 5 files changed, 21 insertions(+), 5 deletions(-) create mode 100644 package-overrides/npm/engine.io-client@1.5.1.json create mode 100644 package-overrides/npm/engine.io-client@1.6.8.json diff --git a/package-overrides/npm/engine.io-client@1.5.1.json b/package-overrides/npm/engine.io-client@1.5.1.json new file mode 100644 index 0000000..e310771 --- /dev/null +++ b/package-overrides/npm/engine.io-client@1.5.1.json @@ -0,0 +1,15 @@ +{ + "dependencies": { + "xmlhttprequest" : "git+https://github.com/rase-/node-XMLHttpRequest.git#add/ssl-support", + "has-cors": "1.0.3", + "ws": "0.7.1", + "component-emitter": "1.1.2", + "indexof": "0.0.1", + "engine.io-parser": "1.2.1", + "debug": "2.1.3", + "parseuri": "0.0.4", + "parsejson": "0.0.1", + "parseqs": "0.0.2", + "component-inherit": "0.0.3" + } +} diff --git a/package-overrides/npm/engine.io-client@1.6.8.json b/package-overrides/npm/engine.io-client@1.6.8.json new file mode 100644 index 0000000..0967ef4 --- /dev/null +++ b/package-overrides/npm/engine.io-client@1.6.8.json @@ -0,0 +1 @@ +{} diff --git a/package-overrides/npm/engine.io@1.6.8.json b/package-overrides/npm/engine.io@1.6.8.json index 70729a1..9d76fbc 100644 --- a/package-overrides/npm/engine.io@1.6.8.json +++ b/package-overrides/npm/engine.io@1.6.8.json @@ -1,5 +1,5 @@ { - "dependencies":{ + "dependencies": { "base64id": "0.1.0", "debug": "2.2.0", "ws": "1.0.1", diff --git a/package-overrides/npm/socket.io@1.4.5.json b/package-overrides/npm/socket.io@1.4.5.json index 43c3877..441fb42 100644 --- a/package-overrides/npm/socket.io@1.4.5.json +++ b/package-overrides/npm/socket.io@1.4.5.json @@ -1,5 +1,5 @@ -{"map": - { - "socket.io-client/package":"socket.io-client/package.json" +{ + "map": { + "socket.io-client/package": "socket.io-client/package.json" } } diff --git a/package-overrides/npm/ws@1.0.1.json b/package-overrides/npm/ws@1.0.1.json index 13a46a9..30fd5a3 100644 --- a/package-overrides/npm/ws@1.0.1.json +++ b/package-overrides/npm/ws@1.0.1.json @@ -1,5 +1,5 @@ { - "dependencies":{ + "dependencies": { "options": ">=0.0.5", "ultron": "1.0.x", "utf-8-validate": "1.2.x",