From 8b4267b6d295b8bcbc0de40dba8c51093f12a2d8 Mon Sep 17 00:00:00 2001 From: Mark Bjerke Date: Sat, 29 Jul 2017 08:50:55 -0700 Subject: [PATCH 1/2] support WebPack, changed Server.prototype.init so that default choices don't preclude bundling with WebPack for node target --- lib/server.js | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/lib/server.js b/lib/server.js index 09ab49ca0..e732229e2 100644 --- a/lib/server.js +++ b/lib/server.js @@ -112,7 +112,20 @@ Server.prototype.init = function () { var wsModule; try { - wsModule = require(this.wsEngine); + // support WebPack with static require(s) if possible... + switch(this.wsEngine) { + case 'uws': + wsModule = require('uws'); + break; + + case 'ws': + wsModule = require('ws'); + break; + // only this case breaks the ability to WebPack engine.io, warning can be safely ignored + default: + wsModule = require(this.wsEngine); + } + } catch (ex) { this.wsEngine = 'ws'; // keep require('ws') as separate expression for packers (browserify, etc) From cc05cf39af1c54e52fe3a4d8188870ff7eecb912 Mon Sep 17 00:00:00 2001 From: Damien Arrachequesne Date: Sat, 2 Sep 2017 13:45:41 +0200 Subject: [PATCH 2/2] fix style --- lib/server.js | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/lib/server.js b/lib/server.js index e732229e2..51f5c0ae4 100644 --- a/lib/server.js +++ b/lib/server.js @@ -112,20 +112,11 @@ Server.prototype.init = function () { var wsModule; try { - // support WebPack with static require(s) if possible... - switch(this.wsEngine) { - case 'uws': - wsModule = require('uws'); - break; - - case 'ws': - wsModule = require('ws'); - break; - // only this case breaks the ability to WebPack engine.io, warning can be safely ignored - default: - wsModule = require(this.wsEngine); + switch (this.wsEngine) { + case 'uws': wsModule = require('uws'); break; + case 'ws': wsModule = require('ws'); break; + default: throw new Error('unknown wsEngine'); } - } catch (ex) { this.wsEngine = 'ws'; // keep require('ws') as separate expression for packers (browserify, etc)