[chore] Release 3.0.0

socketio · Apr 5, 2017 · 51d7529 · 51d7529
1 parent 7a72404
commit 51d7529
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 35 deletions.
diff --git a/History.md b/History.md
@@ -1,4 +1,11 @@
 
+3.0.0 / 2017-04-06
+===================
+
+  * [chore] Bump dependencies (#560)
+  * [fix] Default `rejectUnauthorized` to `true` (#558)
+  * [chore] Drop support for old nodejs versions (0.10 & 0.12) (#557)
+
 2.1.1  / 2017-03-22
 ===================
 

diff --git a/engine.io.js b/engine.io.js
@@ -172,7 +172,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	  this.cert = opts.cert || null;
 	  this.ca = opts.ca || null;
 	  this.ciphers = opts.ciphers || null;
-	  this.rejectUnauthorized = opts.rejectUnauthorized === undefined ? null : opts.rejectUnauthorized;
+	  this.rejectUnauthorized = opts.rejectUnauthorized === undefined ? true : opts.rejectUnauthorized;
 	  this.forceNode = !!opts.forceNode;
 
 	  // other options for Node.js client
@@ -2445,7 +2445,8 @@ return /******/ (function(modules) { // webpackBootstrap
 /* 11 */
 /***/ function(module, exports, __webpack_require__) {
 
-	/* WEBPACK VAR INJECTION */(function(global) {
+	/* WEBPACK VAR INJECTION */(function(global) {/* global Blob File */
+
 	/*
 	 * Module requirements.
 	 */
@@ -2461,48 +2462,46 @@ return /******/ (function(modules) { // webpackBootstrap
 	/**
 	 * Checks for binary data.
 	 *
-	 * Right now only Buffer and ArrayBuffer are supported..
+	 * Supports Buffer, ArrayBuffer, Blob and File.
 	 *
 	 * @param {Object} anything
 	 * @api public
 	 */
 
-	function hasBinary(data) {
-
-	  function _hasBinary(obj) {
-	    if (!obj) return false;
+	function hasBinary (obj) {
+	  if (!obj || typeof obj !== 'object') {
+	    return false;
+	  }
 
-	    if ( (global.Buffer && global.Buffer.isBuffer && global.Buffer.isBuffer(obj)) ||
-	         (global.ArrayBuffer && obj instanceof ArrayBuffer) ||
-	         (global.Blob && obj instanceof Blob) ||
-	         (global.File && obj instanceof File)
-	        ) {
-	      return true;
+	  if (isArray(obj)) {
+	    for (var i = 0, l = obj.length; i < l; i++) {
+	      if (hasBinary(obj[i])) {
+	        return true;
+	      }
 	    }
+	    return false;
+	  }
 
-	    if (isArray(obj)) {
-	      for (var i = 0; i < obj.length; i++) {
-	          if (_hasBinary(obj[i])) {
-	              return true;
-	          }
-	      }
-	    } else if (obj && 'object' == typeof obj) {
-	      // see: https://github.com/Automattic/has-binary/pull/4
-	      if (obj.toJSON && 'function' == typeof obj.toJSON) {
-	        obj = obj.toJSON();
-	      }
+	  if ((typeof global.Buffer === 'function' && global.Buffer.isBuffer && global.Buffer.isBuffer(obj)) ||
+	     (typeof global.ArrayBuffer === 'function' && obj instanceof ArrayBuffer) ||
+	     (typeof global.Blob === 'function' && obj instanceof Blob) ||
+	     (typeof global.File === 'function' && obj instanceof File)
+	    ) {
+	    return true;
+	  }
 
-	      for (var key in obj) {
-	        if (Object.prototype.hasOwnProperty.call(obj, key) && _hasBinary(obj[key])) {
-	          return true;
-	        }
-	      }
-	    }
+	  // see: https://github.com/Automattic/has-binary/pull/4
+	  if (obj.toJSON && typeof obj.toJSON === 'function' && arguments.length === 1) {
+	    return hasBinary(obj.toJSON(), true);
+	  }
 
-	    return false;
+	  for (var key in obj) {
+	    if (Object.prototype.hasOwnProperty.call(obj, key) && hasBinary(obj[key])) {
+	      return true;
+	    }
 	  }
 
-	  return _hasBinary(data);
+	  return false;
 	}
 
 	/* WEBPACK VAR INJECTION */}.call(exports, (function() { return this; }())))
@@ -2511,8 +2510,10 @@ return /******/ (function(modules) { // webpackBootstrap
 /* 12 */
 /***/ function(module, exports) {
 
+	var toString = {}.toString;
+
 	module.exports = Array.isArray || function (arr) {
-	  return Object.prototype.toString.call(arr) == '[object Array]';
+	  return toString.call(arr) == '[object Array]';
 	};
 
 

diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "engine.io-client",
   "description": "Client for the realtime Engine",
   "license": "MIT",
-  "version": "2.1.1",
+  "version": "3.0.0",
   "homepage": "https://github.com/socketio/engine.io-client",
   "contributors": [
     {
@@ -45,7 +45,7 @@
     "concat-stream": "^1.6.0",
     "del": "^2.2.2",
     "derequire": "^2.0.6",
-    "engine.io": "2.1.1",
+    "engine.io": "3.0.0",
     "eslint-config-standard": "4.4.0",
     "eslint-plugin-standard": "1.3.1",
     "expect.js": "^0.3.1",