fix(cli): ignore x-typescript-types header when media type is not js/jsx (#10574)

1 files changed, 28 insertions, 2 deletions

diff --git a/cli/file_fetcher.rs b/cli/file_fetcher.rs
index 471873195..7ab2f5cce 100644
--- a/cli/file_fetcher.rs
+++ b/cli/file_fetcher.rs
@@ -327,7 +327,12 @@ impl FileFetcher {
     let (media_type, maybe_charset) =
       map_content_type(specifier, maybe_content_type);
     let source = strip_shebang(get_source_from_bytes(bytes, maybe_charset)?);
-    let maybe_types = headers.get("x-typescript-types").cloned();
+    let maybe_types = match media_type {
+      MediaType::JavaScript | MediaType::Jsx => {
+        headers.get("x-typescript-types").cloned()
+      }
+      _ => None,
+    };
 
     Ok(File {
       local,
@@ -1593,7 +1598,7 @@ mod tests {
   }
 
   #[tokio::test]
-  async fn test_fetch_remote_with_types() {
+  async fn test_fetch_remote_javascript_with_types() {
     let specifier =
       resolve_url_or_path("http://127.0.0.1:4545/xTypeScriptTypes.js").unwrap();
     let (file, _) = test_fetch_remote(&specifier).await;
@@ -1604,6 +1609,27 @@ mod tests {
   }
 
   #[tokio::test]
+  async fn test_fetch_remote_jsx_with_types() {
+    let specifier =
+      resolve_url_or_path("http://127.0.0.1:4545/xTypeScriptTypes.jsx")
+        .unwrap();
+    let (file, _) = test_fetch_remote(&specifier).await;
+    assert_eq!(file.media_type, MediaType::Jsx,);
+    assert_eq!(
+      file.maybe_types,
+      Some("./xTypeScriptTypes.d.ts".to_string())
+    );
+  }
+
+  #[tokio::test]
+  async fn test_fetch_remote_typescript_with_types() {
+    let specifier =
+      resolve_url_or_path("http://127.0.0.1:4545/xTypeScriptTypes.ts").unwrap();
+    let (file, _) = test_fetch_remote(&specifier).await;
+    assert_eq!(file.maybe_types, None);
+  }
+
+  #[tokio::test]
   async fn test_fetch_remote_utf16_le() {
     let expected =
       std::str::from_utf8(b"\xEF\xBB\xBFconsole.log(\"Hello World\");\x0A")