From 1bcc38271ee18cfd927e2ed0cc456022b71b5c79 Mon Sep 17 00:00:00 2001
From: 43081j <43081j@users.noreply.github.com>
Date: Wed, 27 Jun 2018 12:59:18 +0100
Subject: [PATCH] [polyserve] bump mime to 2.x

---
 packages/polyserve/package-lock.json | 24 +++++++++++++++---------
 packages/polyserve/package.json      |  4 ++--
 packages/polyserve/src/util/push.ts  |  2 +-
 3 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/packages/polyserve/package-lock.json b/packages/polyserve/package-lock.json
index 115865218..d5a295ad2 100644
--- a/packages/polyserve/package-lock.json
+++ b/packages/polyserve/package-lock.json
@@ -1267,9 +1267,9 @@
 			"dev": true
 		},
 		"@types/mime": {
-			"version": "0.0.29",
-			"resolved": "https://registry.npmjs.org/@types/mime/-/mime-0.0.29.tgz",
-			"integrity": "sha1-+8/TMFc7kS71nu7hRgK/rOYwdUs="
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/@types/mime/-/mime-2.0.0.tgz",
+			"integrity": "sha512-A2TAGbTFdBw9azHbpVd+/FkdW2T6msN1uct1O9bH3vTerEHKZhTXJUQXy+hNq1B0RagfU8U+KBdqiZpxjhOUQA=="
 		},
 		"@types/minimatch": {
 			"version": "3.0.3",
@@ -4039,9 +4039,9 @@
 			}
 		},
 		"mime": {
-			"version": "1.6.0",
-			"resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
-			"integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="
+			"version": "2.3.1",
+			"resolved": "https://registry.npmjs.org/mime/-/mime-2.3.1.tgz",
+			"integrity": "sha512-OEUllcVoydBHGN1z84yfQDimn58pZNNNXgZlHXSboxMlFvgI6MXSWpWKpFRra7H1HxpVhHTkrghfRW49k6yjeg=="
 		},
 		"mime-db": {
 			"version": "1.33.0",
@@ -5674,6 +5674,12 @@
 					"requires": {
 						"ms": "2.0.0"
 					}
+				},
+				"mime": {
+					"version": "1.6.0",
+					"resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
+					"integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
+					"dev": true
 				}
 			}
 		},
@@ -6283,9 +6289,9 @@
 			}
 		},
 		"winston": {
-			"version": "2.4.3",
-			"resolved": "https://registry.npmjs.org/winston/-/winston-2.4.3.tgz",
-			"integrity": "sha512-GYKuysPz2pxYAVJD2NPsDLP5Z79SDEzPm9/j4tCjkF/n89iBNGBMJcR+dMUqxgPNgoSs6fVygPi+Vl2oxIpBuw==",
+			"version": "2.4.2",
+			"resolved": "https://registry.npmjs.org/winston/-/winston-2.4.2.tgz",
+			"integrity": "sha512-4S/Ad4ZfSNl8OccCLxnJmNISWcm2joa6Q0YGDxlxMzH0fgSwWsjMt+SmlNwCqdpaPg3ev1HKkMBsIiXeSUwpbA==",
 			"requires": {
 				"async": "~1.0.0",
 				"colors": "1.0.x",
diff --git a/packages/polyserve/package.json b/packages/polyserve/package.json
index 4a8182c28..1282bb6b0 100644
--- a/packages/polyserve/package.json
+++ b/packages/polyserve/package.json
@@ -30,7 +30,7 @@
     "@types/content-type": "^1.1.0",
     "@types/escape-html": "0.0.20",
     "@types/express": "^4.0.36",
-    "@types/mime": "0.0.29",
+    "@types/mime": "^2.0.0",
     "@types/mz": "0.0.29",
     "@types/node": "^9.6.4",
     "@types/opn": "^3.0.28",
@@ -50,7 +50,7 @@
     "find-port": "^1.0.1",
     "http-proxy-middleware": "^0.17.2",
     "lru-cache": "^4.0.2",
-    "mime": "^1.3.4",
+    "mime": "^2.3.1",
     "mz": "^2.4.0",
     "opn": "^3.0.2",
     "pem": "^1.8.3",
diff --git a/packages/polyserve/src/util/push.ts b/packages/polyserve/src/util/push.ts
index 98cdd76ff..df6adba97 100644
--- a/packages/polyserve/src/util/push.ts
+++ b/packages/polyserve/src/util/push.ts
@@ -90,7 +90,7 @@ export function pushResources(
             res.push(filename, {
                  request: {accept: '*/*'},
                  response: {
-                   'content-type': mime.lookup(filename),
+                   'content-type': mime.getType(filename),
 
                    // Add an X-header to the pushed request so we don't trigger
                    // pushes for pushes