summaryrefslogtreecommitdiff
path: root/cli/file_fetcher.rs
diff options
context:
space:
mode:
authorBartek IwaƄczuk <biwanczuk@gmail.com>2020-05-31 21:08:26 +0200
committerGitHub <noreply@github.com>2020-05-31 21:08:26 +0200
commit02d46bae9f60e8114af2a107c05d717be3a7e70d (patch)
tree4b5b094930f2dfaf4a7d55ca1afb0fe5a441b51d /cli/file_fetcher.rs
parentaa514c058ae71be85dd45fa95cd7c11b6d6e3c13 (diff)
fix: media type for .cjs and application/node (#6005)
Diffstat (limited to 'cli/file_fetcher.rs')
-rw-r--r--cli/file_fetcher.rs16
1 files changed, 15 insertions, 1 deletions
diff --git a/cli/file_fetcher.rs b/cli/file_fetcher.rs
index 375142e07..be3bc6efc 100644
--- a/cli/file_fetcher.rs
+++ b/cli/file_fetcher.rs
@@ -544,6 +544,7 @@ pub fn map_file_extension(path: &Path) -> msg::MediaType {
Some("js") => msg::MediaType::JavaScript,
Some("jsx") => msg::MediaType::JSX,
Some("mjs") => msg::MediaType::JavaScript,
+ Some("cjs") => msg::MediaType::JavaScript,
Some("json") => msg::MediaType::Json,
Some("wasm") => msg::MediaType::Wasm,
_ => msg::MediaType::Unknown,
@@ -572,7 +573,8 @@ fn map_content_type(path: &Path, content_type: Option<&str>) -> msg::MediaType {
| "text/javascript"
| "application/ecmascript"
| "text/ecmascript"
- | "application/x-javascript" => {
+ | "application/x-javascript"
+ | "application/node" => {
map_js_like_extension(path, msg::MediaType::JavaScript)
}
"application/json" | "text/json" => msg::MediaType::Json,
@@ -1597,6 +1599,10 @@ mod tests {
msg::MediaType::Wasm
);
assert_eq!(
+ map_file_extension(Path::new("foo/bar.cjs")),
+ msg::MediaType::JavaScript
+ );
+ assert_eq!(
map_file_extension(Path::new("foo/bar.txt")),
msg::MediaType::Unknown
);
@@ -1642,6 +1648,10 @@ mod tests {
msg::MediaType::Wasm
);
assert_eq!(
+ map_content_type(Path::new("foo/bar.cjs"), None),
+ msg::MediaType::JavaScript
+ );
+ assert_eq!(
map_content_type(Path::new("foo/bar"), None),
msg::MediaType::Unknown
);
@@ -1695,6 +1705,10 @@ mod tests {
msg::MediaType::Json
);
assert_eq!(
+ map_content_type(Path::new("foo/bar"), Some("application/node")),
+ msg::MediaType::JavaScript
+ );
+ assert_eq!(
map_content_type(Path::new("foo/bar"), Some("text/json")),
msg::MediaType::Json
);