From a927d8accafc4a0b1f1ebe604319aa5006d90017 Mon Sep 17 00:00:00 2001
From: dignifiedquire <dignifiedquire@gmail.com>
Date: Mon, 21 Sep 2015 10:32:08 +0200
Subject: [PATCH] chore: Ready for node@4 and npm@3

---
 .travis.yml  | 8 --------
 package.json | 7 ++++++-
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 2afeee148..714f8a83c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,14 +5,6 @@ node_js:
   - "0.12"
   - "4"
 
-# Node.js 4 is supported but an optional socket.io dependency doesn't work yet, causing
-# a lot of error messages on Travis. Travis then terminates the build because of excessive
-# logging. All tests pass locally on Node.js 4.
-# TODO remove this exception when https://github.com/socketio/socket.io/issues/2228 is fixed.
-matrix:
-  allow_failures:
-    - node_js: "4"
-
 env:
   global:
   - SAUCE_USERNAME: vojtajina
diff --git a/package.json b/package.json
index 7d43436a4..296ad519a 100644
--- a/package.json
+++ b/package.json
@@ -239,7 +239,7 @@
     "minimatch": "^2.0.7",
     "optimist": "^0.6.1",
     "rimraf": "^2.3.3",
-    "socket.io": "~1.3.5",
+    "socket.io": "^1.3.7",
     "source-map": "^0.4.4",
     "useragent": "^2.1.6"
   },
@@ -255,6 +255,7 @@
     "eslint": "^1.0.0",
     "eslint-config-standard": "^4.0.0",
     "eslint-plugin-react": "^3.2.0",
+    "eslint-plugin-standard": "^1.3.1",
     "grunt": "^0.4",
     "grunt-auto-release": "^0.0.6",
     "grunt-browserify": "^3.8.0",
@@ -266,6 +267,7 @@
     "grunt-eslint": "^17.0.0",
     "grunt-mocha-test": "^0.12.7",
     "grunt-npm": "0.0.2",
+    "jasmine-core": "^2.3.4",
     "karma-browserify": "^4.1.2",
     "karma-browserstack-launcher": "*",
     "karma-chrome-launcher": "*",
@@ -289,7 +291,10 @@
     "mkdirp": "^0.5.0",
     "mocha": "^2.2.5",
     "mocks": "^0.0.15",
+    "phantomjs": "^1.9.18",
     "proxyquire": "^1.5.0",
+    "qunitjs": "^1.19.0",
+    "requirejs": "^2.1.20",
     "sinon": "^1.14.1",
     "sinon-chai": "^2.7.0",
     "supertest": "^1.0.1",