patch in mime.charsets.lookup #105

Author: jenweber

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;
@@ -119,7 +125,7 @@ module.exports = CoreObject.extend({
     var basePath    = path.join(cwd, filePath);
     var data        = fs.readFileSync(basePath);
     var contentType = mime.getType(basePath);
-    var encoding    = mime.charsets.lookup(contentType);
+    var encoding    = this._mimeCharsetsLookup(contentType);
     var key         = prefix === '' ? filePath : [prefix, filePath].join('/');
     var isGzipped   = gzippedFilePaths.indexOf(filePath) !== -1;
     var isBrotliCompressed = brotliCompressedFilePaths.indexOf(filePath) !== -1;
@@ -128,14 +134,14 @@ module.exports = CoreObject.extend({
       var basePathUngzipped = path.basename(basePath, '.gz');
       if (filePaths && filePaths.indexOf(basePathUngzipped) !== -1) {
         contentType = mime.getType(basePathUngzipped);
-        encoding = mime.charsets.lookup(contentType);
+        encoding = this._mimeCharsetsLookup(contentType);
       }
     }
     if (isBrotliCompressed) {
       var basePathUncompressed = path.basename(basePath, '.br');
       if (filePaths && filePaths.indexOf(basePathUncompressed) !== -1) {
         contentType = mime.getType(basePathUncompressed);
-        encoding = mime.charsets.lookup(contentType);
+        encoding = this._mimeCharsetsLookup(contentType);
       }
     }