Skip to content

Commit 692f18c

Browse files
committed
Release 1.6.8
1 parent 52ad69c commit 692f18c

File tree

3 files changed

+14
-4
lines changed

3 files changed

+14
-4
lines changed

History.md

+5
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11

2+
1.6.8 / 2016-01-25
3+
==================
4+
5+
* safely resolve `ws` module
6+
27
1.6.7 / 2016-01-10
38
==================
49

engine.io.js

+8-3
Original file line numberDiff line numberDiff line change
@@ -1883,11 +1883,16 @@ var BrowserWebSocket = global.WebSocket || global.MozWebSocket;
18831883

18841884
/**
18851885
* Get either the `WebSocket` or `MozWebSocket` globals
1886-
* in the browser or the WebSocket-compatible interface
1887-
* exposed by `ws` for Node environment.
1886+
* in the browser or try to resolve WebSocket-compatible
1887+
* interface exposed by `ws` for Node-like environment.
18881888
*/
18891889

1890-
var WebSocket = BrowserWebSocket || (typeof window !== 'undefined' ? null : _dereq_('ws'));
1890+
var WebSocket = BrowserWebSocket;
1891+
if (!WebSocket && typeof window === 'undefined') {
1892+
try {
1893+
WebSocket = _dereq_('ws');
1894+
} catch (e) { }
1895+
}
18911896

18921897
/**
18931898
* Module exports.

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "engine.io-client",
33
"description": "Client for the realtime Engine",
44
"license": "MIT",
5-
"version": "1.6.7",
5+
"version": "1.6.8",
66
"homepage": "https://github.com/socketio/engine.io-client",
77
"contributors": [
88
{

0 commit comments

Comments
 (0)