foster/denoland-deno
1
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2025-01-03 12:58:54 -05:00
Code Issues Packages 1 Wiki Activity

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

Browse source
This commit is contained in:
Yoshiya Hinosawa 2021-05-13 08:07:22 +09:00 committed by GitHub
parent ea83f18f90
commit e8a7f237de
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 52 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
cli/file_fetcher.rs
View file

@ -327,7 +327,12 @@ impl FileFetcher {
let (media_type, maybe_charset) = let (media_type, maybe_charset) =
map_content_type(specifier, maybe_content_type); map_content_type(specifier, maybe_content_type);
let source = strip_shebang(get_source_from_bytes(bytes, maybe_charset)?); 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 { Ok(File {
local, local,
@ -1593,7 +1598,7 @@ mod tests {
} }
#[tokio::test] #[tokio::test]
async fn test_fetch_remote_with_types() { async fn test_fetch_remote_javascript_with_types() {
let specifier = let specifier =
resolve_url_or_path("http://127.0.0.1:4545/xTypeScriptTypes.js").unwrap(); resolve_url_or_path("http://127.0.0.1:4545/xTypeScriptTypes.js").unwrap();
let (file, _) = test_fetch_remote(&specifier).await; let (file, _) = test_fetch_remote(&specifier).await;
@ -1603,6 +1608,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] #[tokio::test]
async fn test_fetch_remote_utf16_le() { async fn test_fetch_remote_utf16_le() {
let expected = let expected =

24
test_util/src/lib.rs
View file

@ -497,6 +497,30 @@ async fn main_server(req: Request<Body>) -> hyper::Result<Response<Body>> {
); );
Ok(res) Ok(res)
} }
(_, "/xTypeScriptTypes.jsx") => {
let mut res = Response::new(Body::from("export const foo = 'foo';"));
res
.headers_mut()
.insert("Content-type", HeaderValue::from_static("text/jsx"));
res.headers_mut().insert(
"X-TypeScript-Types",
HeaderValue::from_static("./xTypeScriptTypes.d.ts"),
);
Ok(res)
}
(_, "/xTypeScriptTypes.ts") => {
let mut res =
Response::new(Body::from("export const foo: string = 'foo';"));
res.headers_mut().insert(
"Content-type",
HeaderValue::from_static("application/typescript"),
);
res.headers_mut().insert(
"X-TypeScript-Types",
HeaderValue::from_static("./xTypeScriptTypes.d.ts"),
);
Ok(res)
}
(_, "/xTypeScriptTypes.d.ts") => { (_, "/xTypeScriptTypes.d.ts") => {
let mut res = Response::new(Body::from("export const foo: 'foo';")); let mut res = Response::new(Body::from("export const foo: 'foo';"));
res.headers_mut().insert( res.headers_mut().insert(