From 49661a95ab4b29885e21ae0496304ee82c93349b Mon Sep 17 00:00:00 2001
From: Calvin Montgomery <calzoneman@gmail.com>
Date: Thu, 15 Feb 2018 19:58:33 -0800
Subject: [PATCH] Upgrade dependencies

---
 package.json         | 31 +++++++++++++++----------------
 src/web/webserver.js |  4 +++-
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/package.json b/package.json
index 58c69c16..b4809afc 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "author": "Calvin Montgomery",
   "name": "CyTube",
   "description": "Online media synchronizer and chat",
-  "version": "3.53.4",
+  "version": "3.54.0",
   "repository": {
     "url": "http://github.com/calzoneman/sync"
   },
@@ -10,39 +10,38 @@
   "dependencies": {
     "@calzoneman/express-babel-decorators": "^1.0.0",
     "@calzoneman/jsli": "^2.0.1",
-    "bcrypt": "^0.8.5",
-    "bluebird": "^2.10.1",
-    "body-parser": "^1.14.0",
-    "cheerio": "^0.19.0",
-    "clone": "^1.0.2",
+    "bcrypt": "^1.0.3",
+    "bluebird": "^3.5.1",
+    "body-parser": "^1.18.2",
+    "cheerio": "^1.0.0-rc.2",
+    "clone": "^2.1.1",
     "compression": "^1.5.2",
     "cookie-parser": "^1.4.0",
     "create-error": "^0.3.1",
     "csrf": "^3.0.0",
     "cytube-mediaquery": "git://github.com/CyTube/mediaquery",
     "cytubefilters": "git://github.com/calzoneman/cytubefilters#67c7c69a",
-    "express": "^4.13.3",
-    "express-minify": "^0.1.6",
+    "express": "^4.16.2",
+    "express-minify": "^1.0.0",
     "graceful-fs": "^4.1.2",
-    "http-errors": "^1.3.1",
     "json-typecheck": "^0.1.3",
-    "knex": "^0.13.0",
-    "lodash": "^4.13.1",
+    "knex": "^0.14.3",
+    "lodash": "^4.17.5",
     "morgan": "^1.6.1",
     "mysql": "^2.9.0",
-    "nodemailer": "^4.1.1",
+    "nodemailer": "^4.4.2",
     "prom-client": "^10.0.2",
-    "proxy-addr": "^1.1.4",
+    "proxy-addr": "^2.0.2",
     "pug": "^2.0.0-beta3",
     "q": "^1.4.1",
     "redis": "^2.4.2",
     "sanitize-html": "^1.14.1",
-    "serve-static": "^1.10.0",
+    "serve-static": "^1.13.2",
     "socket.io": "^2.0.3",
-    "source-map-support": "^0.4.0",
+    "source-map-support": "^0.5.3",
     "sprintf-js": "^1.0.3",
     "toml": "^2.3.0",
-    "uuid": "^2.0.1",
+    "uuid": "^3.2.1",
     "yamljs": "^0.2.8"
   },
   "scripts": {
diff --git a/src/web/webserver.js b/src/web/webserver.js
index 298ddc51..a25b4498 100644
--- a/src/web/webserver.js
+++ b/src/web/webserver.js
@@ -187,8 +187,10 @@ module.exports = {
                 fs.mkdirSync(cacheDir);
             }
             app.use((req, res, next) => {
+                res.minifyOptions = res.minifyOptions || {};
+
                 if (/\.user\.js/.test(req.url)) {
-                    res._no_minify = true;
+                    res.minifyOptions.minify = false;
                 }
 
                 next();