Skip to content

Commit

Permalink
chore: Ready for node@4 and npm@3
Browse files Browse the repository at this point in the history
  • Loading branch information
dignifiedquire committed Sep 21, 2015
1 parent 7068d9e commit a927d8a
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 9 deletions.
8 changes: 0 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 6 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand All @@ -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",
Expand All @@ -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": "*",
Expand All @@ -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",
Expand Down

0 comments on commit a927d8a

Please sign in to comment.