Merge pull request #107 from jenweber/mister-mime

update mime dependency to 2.x in order to support newer filetypes like wasm #105

Author: achambers

lib/s3.js

@@ -102,6 +102,12 @@ module.exports = CoreObject.extend({
     }
   },
 
+  _mimeCharsetsLookup: function(mimeType, fallback) {
+    // the node-mime library removed this method in v 2.0. This is the replacement
+    // code for what was formerly mime.charsets.lookup
+    return (/^text\/|^application\/(javascript|json)/).test(mimeType) ? 'UTF-8' : fallback;
+  },
+
   _putObject: function(filePath, options, filePaths) {
     var plugin                    = this.plugin;
     var cwd                       = options.cwd;
@@ -114,28 +120,28 @@ module.exports = CoreObject.extend({
     var expires                   = options.expires;
     var serverSideEncryption      = options.serverSideEncryption;
 
-    mime.default_type = options.defaultMimeType || mime.lookup('bin');
+    var defaultType = options.defaultMimeType || mime.getType('bin');
 
     var basePath    = path.join(cwd, filePath);
     var data        = fs.readFileSync(basePath);
-    var contentType = mime.lookup(basePath);
-    var encoding    = mime.charsets.lookup(contentType);
+    var contentType = mime.getType(basePath) || defaultType;
+    var encoding    = this._mimeCharsetsLookup(contentType);
     var key         = prefix === '' ? filePath : [prefix, filePath].join('/');
     var isGzipped   = gzippedFilePaths.indexOf(filePath) !== -1;
     var isBrotliCompressed = brotliCompressedFilePaths.indexOf(filePath) !== -1;
 
     if (isGzipped && path.extname(basePath) === '.gz') {
       var basePathUngzipped = path.basename(basePath, '.gz');
       if (filePaths && filePaths.indexOf(basePathUngzipped) !== -1) {
-        contentType = mime.lookup(basePathUngzipped);
-        encoding = mime.charsets.lookup(contentType);
+        contentType = mime.getType(basePathUngzipped) || defaultType;
+        encoding = this._mimeCharsetsLookup(contentType);
       }
     }
     if (isBrotliCompressed) {
       var basePathUncompressed = path.basename(basePath, '.br');
       if (filePaths && filePaths.indexOf(basePathUncompressed) !== -1) {
-        contentType = mime.lookup(basePathUncompressed);
-        encoding = mime.charsets.lookup(contentType);
+        contentType = mime.getType(basePathUncompressed) || defaultType;
+        encoding = this._mimeCharsetsLookup(contentType);
       }
     }
 

package.json

@@ -22,16 +22,16 @@
     "core-object": "^2.0.0",
     "ember-cli-deploy-plugin": "^0.2.2",
     "lodash": "^4.17.4",
-    "mime": "^1.3.4",
+    "mime": "^2.3.1",
     "minimatch": "^3.0.3",
     "proxy-agent": "^2.0.0",
     "rsvp": "^3.5.0"
   },
   "devDependencies": {
-    "chai-as-promised": "^6.0.0",
     "chai": "^3.5.0",
-    "ember-cli-release": "^1.0.0-beta.2",
+    "chai-as-promised": "^6.0.0",
     "ember-cli": "^2.18.0",
+    "ember-cli-release": "^1.0.0-beta.2",
     "eslint": "^3.18.0",
     "github": "^0.2.4",
     "glob": "^7.1.1",

yarn.lock

@@ -3810,10 +3810,14 @@ mime-types@^2.1.12:
   dependencies:
     mime-db "~1.30.0"
 
-[email protected], mime@^1.2.11, mime@^1.3.4:
+[email protected], mime@^1.2.11:
   version "1.3.4"
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.3.4.tgz#115f9e3b6b3daf2959983cb38f149a2d40eb5d53"
 
+[email protected]:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/mime/-/mime-2.3.1.tgz#b1621c54d63b97c47d3cfe7f7215f7d64517c369"
+
 mimic-fn@^1.0.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022"