diff --git a/.travis.yml b/.travis.yml index 88a7c137e..afd56ffb9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,6 @@ node_js: - "iojs" - "0.12" - "0.10" - - "0.8" env: global: diff --git a/lib/middleware/common.js b/lib/middleware/common.js index 979efafee..323d65cc5 100644 --- a/lib/middleware/common.js +++ b/lib/middleware/common.js @@ -81,7 +81,7 @@ var setNoCacheHeaders = function(response) { var setHeavyCacheHeaders = function(response) { - response.setHeader('Cache-Control', ['public', 'max-age=31536000']); + response.setHeader('Cache-Control', 'public, max-age=31536000'); }; diff --git a/lib/middleware/runner.js b/lib/middleware/runner.js index a318ce90d..165ecd4f1 100644 --- a/lib/middleware/runner.js +++ b/lib/middleware/runner.js @@ -8,7 +8,7 @@ var path = require('path'); var helper = require('../helper'); var log = require('../logger').create(); var constant = require('../constants'); -var json = require('connect').json(); +var json = require('body-parser').json(); // TODO(vojta): disable when single-run mode var createRunnerMiddleware = function(emitter, fileList, capturedBrowsers, reporter, executor, diff --git a/lib/middleware/source_files.js b/lib/middleware/source_files.js index 7b46fdd9b..faeb0745b 100644 --- a/lib/middleware/source_files.js +++ b/lib/middleware/source_files.js @@ -4,7 +4,6 @@ var querystring = require('querystring'); var common = require('./common'); -var pause = require('connect').utils.pause; var findByPath = function(files, path) { @@ -28,10 +27,7 @@ var createSourceFilesMiddleware = function(filesPromise, serveFile, .replace(/^\/absolute/, '') .replace(/^\/base/, basePath); - // Need to pause the request because of proxying, see: - // https://groups.google.com/forum/#!topic/q-continuum/xr8znxc_K5E/discussion - // TODO(vojta): remove once we don't care about Node 0.8 - var pausedRequest = pause(request); + request.pause(); return filesPromise.then(function(files) { // TODO(vojta): change served to be a map rather then an array @@ -51,7 +47,7 @@ var createSourceFilesMiddleware = function(filesPromise, serveFile, next(); } - pausedRequest.resume(); + request.resume(); }); }; }; diff --git a/package.json b/package.json index a0ef1ae8a..9a92beb97 100644 --- a/package.json +++ b/package.json @@ -162,23 +162,24 @@ "Jeff Froom " ], "dependencies": { - "di": "~0.0.1", - "socket.io": "0.9.16", + "body-parser": "^1.12.4", "chokidar": ">=0.8.2", + "colors": "~0.6.2", + "connect": "^3.3.5", + "di": "~0.0.1", "glob": "~3.2.7", - "minimatch": "~0.2", + "graceful-fs": "~2.0.1", "http-proxy": "~0.10", - "optimist": "~0.6.0", - "rimraf": "~2.2.5", - "q": "~0.9.7", - "colors": "~0.6.2", "lodash": "~2.4.1", - "mime": "~1.2.11", "log4js": "~0.6.3", - "useragent": "~2.0.4", - "graceful-fs": "~2.0.1", - "connect": "~2.26.0", - "source-map": "~0.1.31" + "mime": "~1.2.11", + "minimatch": "~0.2", + "optimist": "~0.6.0", + "q": "~0.9.7", + "rimraf": "~2.2.5", + "socket.io": "0.9.16", + "source-map": "~0.1.31", + "useragent": "~2.0.4" }, "devDependencies": { "LiveScript": "^1.3.0", @@ -229,7 +230,7 @@ "main": "./lib/index", "bin": {}, "engines": { - "node": ">=0.8 <=0.12 || >=1 <=2" + "node": ">=0.10 <=0.12 || >=1 <=2" }, "version": "0.12.31", "license": "MIT"