Skip to content
This repository has been archived by the owner on Nov 27, 2018. It is now read-only.

Update MimeType #134

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions lib/page_server.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
var Url = require("url");
var Mime = require("mime");
var mime = require('mime-types')
var Fresh = require("fresh");

var Renderer = require("./page_renderer");
Expand Down Expand Up @@ -47,8 +47,8 @@ module.exports = {
if (preset) {
header["Content-Type"] = preset;
} else {
var content_type = Mime.lookup(file_extension);
var charset = Mime.charsets.lookup(content_type);
var content_type = mime.lookup(file_extension);
var charset = mime.charsets(content_type);

header["Content-Type"] = content_type + (charset ? "; charset=" + charset.toLowerCase() : "");
}
Expand Down
4 changes: 2 additions & 2 deletions lib/publishers/s3.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
var _ = require("underscore");
var Knox = require("knox");
var Mime = require("mime");
var mime = require('mime-types')
var Fs = require("fs");
var Path = require("path");

Expand Down Expand Up @@ -41,7 +41,7 @@ module.exports = {

var content_headers = {
"Content-Length": buf.length,
"Content-Type": Mime.lookup(local_path)
"Content-Type": mime.lookup(local_path)
};

var request_headers = _.extend( _.omit(self.publishOptions, "key", "secret", "bucket"), content_headers);
Expand Down
4 changes: 2 additions & 2 deletions lib/utils/path_utils.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
var _ = require("underscore");
var Path = require("path");
var Mime = require("mime");
var mime = require('mime-types')
var Os = require("os");

module.exports = {
Expand All @@ -15,7 +15,7 @@ module.exports = {

var best_access_type = accept_types.length && accept_types.shift()["mediarange"];

ext = "." + (best_access_type && Mime.extension(best_access_type) || "html");
ext = "." + (best_access_type && mime.extension(best_access_type) || "html");

return ext;
},
Expand Down
13 changes: 13 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
"less": ">= 1.4.1",
"marked": ">= 0.2.5",
"mime": ">= 1.2.5",
"mime-types": ">= 2.1.17",
"mustache": "0.7.3",
"uglify-js": ">= 2.2.3",
"underscore": ">= 1.4.2"
Expand Down