From 5d501d17936de234fa0e992e590f70bf958e98db Mon Sep 17 00:00:00 2001 From: Martijn Walraven Date: Thu, 7 Jan 2016 13:26:47 +0100 Subject: [PATCH] Update send and connect dependencies for webapp package Updating send was necessary to allow disabling setting Last-Modified, and version dependencies required updating connect as well. --- .../webapp/.npm/package/npm-shrinkwrap.json | 406 ++++++++++++++++-- packages/webapp/package.js | 4 +- packages/webapp/webapp_server.js | 8 +- 3 files changed, 370 insertions(+), 48 deletions(-) diff --git a/packages/webapp/.npm/package/npm-shrinkwrap.json b/packages/webapp/.npm/package/npm-shrinkwrap.json index dc8dc414d6..2bc74cdd05 100644 --- a/packages/webapp/.npm/package/npm-shrinkwrap.json +++ b/packages/webapp/.npm/package/npm-shrinkwrap.json @@ -1,65 +1,387 @@ { "dependencies": { "connect": { - "version": "2.9.0", + "version": "2.30.2", "dependencies": { - "qs": { - "version": "0.6.5" + "basic-auth-connect": { + "version": "1.0.0" }, - "cookie-signature": { - "version": "1.0.1" - }, - "buffer-crc32": { - "version": "0.2.1" - }, - "cookie": { - "version": "0.1.0" - }, - "bytes": { - "version": "0.2.0" - }, - "fresh": { - "version": "0.2.0" - }, - "pause": { - "version": "0.0.1" - }, - "uid2": { - "version": "0.0.2" - }, - "debug": { - "version": "0.7.2" - }, - "methods": { - "version": "0.0.1" - }, - "multiparty": { - "version": "2.1.8", + "body-parser": { + "version": "1.13.3", "dependencies": { - "readable-stream": { - "version": "1.0.17" + "iconv-lite": { + "version": "0.4.11" }, - "stream-counter": { - "version": "0.1.0" + "on-finished": { + "version": "2.3.0", + "dependencies": { + "ee-first": { + "version": "1.1.1" + } + } + }, + "raw-body": { + "version": "2.1.5", + "dependencies": { + "bytes": { + "version": "2.2.0" + }, + "iconv-lite": { + "version": "0.4.13" + }, + "unpipe": { + "version": "1.0.0" + } + } } } + }, + "bytes": { + "version": "2.1.0" + }, + "cookie": { + "version": "0.1.3" + }, + "cookie-parser": { + "version": "1.3.5" + }, + "cookie-signature": { + "version": "1.0.6" + }, + "compression": { + "version": "1.5.2", + "dependencies": { + "accepts": { + "version": "1.2.13", + "dependencies": { + "mime-types": { + "version": "2.1.9", + "dependencies": { + "mime-db": { + "version": "1.21.0" + } + } + }, + "negotiator": { + "version": "0.5.3" + } + } + }, + "compressible": { + "version": "2.0.6", + "dependencies": { + "mime-db": { + "version": "1.21.0" + } + } + }, + "vary": { + "version": "1.0.1" + } + } + }, + "connect-timeout": { + "version": "1.6.2", + "dependencies": { + "ms": { + "version": "0.7.1" + } + } + }, + "content-type": { + "version": "1.0.1" + }, + "csurf": { + "version": "1.8.3", + "dependencies": { + "csrf": { + "version": "3.0.0", + "dependencies": { + "base64-url": { + "version": "1.2.1" + }, + "rndm": { + "version": "1.1.1" + }, + "scmp": { + "version": "1.0.0" + }, + "uid-safe": { + "version": "2.0.0" + } + } + } + } + }, + "debug": { + "version": "2.2.0", + "dependencies": { + "ms": { + "version": "0.7.1" + } + } + }, + "depd": { + "version": "1.0.1" + }, + "errorhandler": { + "version": "1.4.2", + "dependencies": { + "accepts": { + "version": "1.2.13", + "dependencies": { + "mime-types": { + "version": "2.1.9", + "dependencies": { + "mime-db": { + "version": "1.21.0" + } + } + }, + "negotiator": { + "version": "0.5.3" + } + } + }, + "escape-html": { + "version": "1.0.2" + } + } + }, + "express-session": { + "version": "1.11.3", + "dependencies": { + "crc": { + "version": "3.3.0" + }, + "uid-safe": { + "version": "2.0.0", + "dependencies": { + "base64-url": { + "version": "1.2.1" + } + } + } + } + }, + "finalhandler": { + "version": "0.4.0", + "dependencies": { + "escape-html": { + "version": "1.0.2" + }, + "on-finished": { + "version": "2.3.0", + "dependencies": { + "ee-first": { + "version": "1.1.1" + } + } + }, + "unpipe": { + "version": "1.0.0" + } + } + }, + "fresh": { + "version": "0.3.0" + }, + "http-errors": { + "version": "1.3.1", + "dependencies": { + "inherits": { + "version": "2.0.1" + }, + "statuses": { + "version": "1.2.1" + } + } + }, + "method-override": { + "version": "2.3.5", + "dependencies": { + "methods": { + "version": "1.1.1" + }, + "vary": { + "version": "1.0.1" + } + } + }, + "morgan": { + "version": "1.6.1", + "dependencies": { + "basic-auth": { + "version": "1.0.3" + }, + "on-finished": { + "version": "2.3.0", + "dependencies": { + "ee-first": { + "version": "1.1.1" + } + } + } + } + }, + "multiparty": { + "version": "3.3.2", + "dependencies": { + "readable-stream": { + "version": "1.1.13", + "dependencies": { + "core-util-is": { + "version": "1.0.2" + }, + "isarray": { + "version": "0.0.1" + }, + "string_decoder": { + "version": "0.10.31" + }, + "inherits": { + "version": "2.0.1" + } + } + }, + "stream-counter": { + "version": "0.2.0" + } + } + }, + "on-headers": { + "version": "1.0.1" + }, + "parseurl": { + "version": "1.3.0" + }, + "pause": { + "version": "0.1.0" + }, + "qs": { + "version": "4.0.0" + }, + "response-time": { + "version": "2.3.1" + }, + "serve-favicon": { + "version": "2.3.0", + "dependencies": { + "etag": { + "version": "1.7.0" + }, + "ms": { + "version": "0.7.1" + } + } + }, + "serve-index": { + "version": "1.7.2", + "dependencies": { + "accepts": { + "version": "1.2.13", + "dependencies": { + "negotiator": { + "version": "0.5.3" + } + } + }, + "batch": { + "version": "0.5.2" + }, + "escape-html": { + "version": "1.0.2" + }, + "mime-types": { + "version": "2.1.9", + "dependencies": { + "mime-db": { + "version": "1.21.0" + } + } + } + } + }, + "serve-static": { + "version": "1.10.0", + "dependencies": { + "escape-html": { + "version": "1.0.2" + } + } + }, + "type-is": { + "version": "1.6.10", + "dependencies": { + "media-typer": { + "version": "0.3.0" + }, + "mime-types": { + "version": "2.1.9", + "dependencies": { + "mime-db": { + "version": "1.21.0" + } + } + } + } + }, + "utils-merge": { + "version": "1.0.0" + }, + "vhost": { + "version": "3.0.2" } } }, "send": { - "version": "0.1.4", + "version": "0.13.0", "dependencies": { "debug": { - "version": "0.7.2" + "version": "2.2.0" }, - "mime": { - "version": "1.2.11" + "depd": { + "version": "1.0.1" + }, + "destroy": { + "version": "1.0.3" + }, + "escape-html": { + "version": "1.0.2" + }, + "etag": { + "version": "1.7.0" }, "fresh": { - "version": "0.2.0" + "version": "0.3.0" + }, + "http-errors": { + "version": "1.3.1", + "dependencies": { + "inherits": { + "version": "2.0.1" + } + } + }, + "mime": { + "version": "1.3.4" + }, + "ms": { + "version": "0.7.1" + }, + "on-finished": { + "version": "2.3.0", + "dependencies": { + "ee-first": { + "version": "1.1.1" + } + } }, "range-parser": { - "version": "0.0.4" + "version": "1.0.3" + }, + "statuses": { + "version": "1.2.1" } } }, diff --git a/packages/webapp/package.js b/packages/webapp/package.js index 68ff08e369..5990364a2e 100644 --- a/packages/webapp/package.js +++ b/packages/webapp/package.js @@ -3,8 +3,8 @@ Package.describe({ version: '1.2.3' }); -Npm.depends({connect: "2.9.0", - send: "0.1.4", +Npm.depends({connect: "2.30.2", + send: "0.13.0", useragent: "2.0.7"}); Npm.strip({ diff --git a/packages/webapp/webapp_server.js b/packages/webapp/webapp_server.js index 7882c86ecb..3270230f69 100644 --- a/packages/webapp/webapp_server.js +++ b/packages/webapp/webapp_server.js @@ -411,10 +411,10 @@ WebAppInternals.staticFilesMiddleware = function (staticFiles, req, res, next) { res.write(info.content); res.end(); } else { - send(req, info.absolutePath) - .maxage(maxAge) - .hidden(true) // if we specified a dotfile in the manifest, serve it - .on('error', function (err) { + send(req, info.absolutePath, { + maxage: maxAge, + dotfiles: 'allow' // if we specified a dotfile in the manifest, serve it + }).on('error', function (err) { Log.error("Error serving static file " + err); res.writeHead(500); res.end();