summaryrefslogtreecommitdiff
path: root/cli/tsc.rs
diff options
context:
space:
mode:
authorKitson Kelly <me@kitsonkelly.com>2021-12-10 09:12:21 +1100
committerGitHub <noreply@github.com>2021-12-10 09:12:21 +1100
commit345f0fbe5cdaa71af067c7072537f1823fe4ada5 (patch)
treec37062607fe23ef9d1826c1d43a10a712b827f3c /cli/tsc.rs
parenta3d024ac2ec8d73f7bf268823866d2342d1c1eb1 (diff)
feat(cli): update to TypeScript 4.5 (#12410)
Co-authored-by: Bartek IwaƄczuk <biwanczuk@gmail.com>
Diffstat (limited to 'cli/tsc.rs')
-rw-r--r--cli/tsc.rs29
1 files changed, 12 insertions, 17 deletions
diff --git a/cli/tsc.rs b/cli/tsc.rs
index 184fbd144..c2b4daef2 100644
--- a/cli/tsc.rs
+++ b/cli/tsc.rs
@@ -144,31 +144,26 @@ fn get_tsc_media_type(specifier: &ModuleSpecifier) -> MediaType {
if let Some(os_str) = path.file_stem() {
if let Some(file_name) = os_str.to_str() {
if file_name.ends_with(".d") {
- // todo(#12410): Use Dmts for TS 4.5
- return MediaType::Dts;
+ return MediaType::Dmts;
}
}
}
- // todo(#12410): Use Mts for TS 4.5
- MediaType::TypeScript
+ MediaType::Mts
}
Some("cts") => {
if let Some(os_str) = path.file_stem() {
if let Some(file_name) = os_str.to_str() {
if file_name.ends_with(".d") {
- // todo(#12410): Use Dcts for TS 4.5
- return MediaType::Dts;
+ return MediaType::Dcts;
}
}
}
- // todo(#12410): Use Cts for TS 4.5
- MediaType::TypeScript
+ MediaType::Cts
}
Some("tsx") => MediaType::Tsx,
Some("js") => MediaType::JavaScript,
- // todo(#12410): Use correct media type for TS 4.5
- Some("mjs") => MediaType::JavaScript,
- Some("cjs") => MediaType::JavaScript,
+ Some("mjs") => MediaType::Mjs,
+ Some("cjs") => MediaType::Cjs,
Some("jsx") => MediaType::Jsx,
_ => MediaType::Unknown,
},
@@ -756,16 +751,16 @@ mod tests {
fn test_get_tsc_media_type() {
let fixtures = vec![
("file:///a.ts", MediaType::TypeScript),
- ("file:///a.cts", MediaType::TypeScript),
- ("file:///a.mts", MediaType::TypeScript),
+ ("file:///a.cts", MediaType::Cts),
+ ("file:///a.mts", MediaType::Mts),
("file:///a.tsx", MediaType::Tsx),
("file:///a.d.ts", MediaType::Dts),
- ("file:///a.d.cts", MediaType::Dts),
- ("file:///a.d.mts", MediaType::Dts),
+ ("file:///a.d.cts", MediaType::Dcts),
+ ("file:///a.d.mts", MediaType::Dmts),
("file:///a.js", MediaType::JavaScript),
("file:///a.jsx", MediaType::Jsx),
- ("file:///a.cjs", MediaType::JavaScript),
- ("file:///a.mjs", MediaType::JavaScript),
+ ("file:///a.cjs", MediaType::Cjs),
+ ("file:///a.mjs", MediaType::Mjs),
("file:///a.json", MediaType::Unknown),
("file:///a.wasm", MediaType::Unknown),
("file:///a.js.map", MediaType::Unknown),