From b490985c6e165ba978d3f80078a45b44e18728fc Mon Sep 17 00:00:00 2001 From: dignifiedquire Date: Sun, 17 May 2015 22:19:01 +0200 Subject: [PATCH] fix(deps): Upgrade connect 3. This means dropping support for node 0.8. Fixes part of #1410 --- .travis.yml | 1 - lib/middleware/common.js | 2 +- lib/middleware/runner.js | 2 +- lib/middleware/source_files.js | 8 ++------ package.json | 3 ++- 5 files changed, 6 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index f17cdb625..23a243308 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 6f0c40952..5f40ad4ac 100644 --- a/lib/middleware/common.js +++ b/lib/middleware/common.js @@ -83,7 +83,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 b056bcc9c..fdc735c9a 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 7592bf513..8f8926bb7 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) { @@ -29,10 +28,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 @@ -52,7 +48,7 @@ var createSourceFilesMiddleware = function(filesPromise, serveFile, next(); } - pausedRequest.resume(); + request.resume(); }); }; }; diff --git a/package.json b/package.json index 2cfa35694..935dfbdb8 100644 --- a/package.json +++ b/package.json @@ -194,9 +194,10 @@ "Jeff Lage " ], "dependencies": { + "body-parser": "^1.12.4", "chokidar": "^1.0.1", "colors": "^1.1.0", - "connect": "^2.29.2", + "connect": "^3.3.5", "di": "^0.0.1", "expand-braces": "^0.1.1", "glob": "^5.0.6",