foster/denoland-deno
1
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2024-11-21 15:04:11 -05:00
Code Issues Packages 1 Wiki Activity

Updates based on investigation

Browse source
This commit is contained in:
David Sherret 2022-08-25 10:55:15 -04:00
parent 7c0bbaada1
commit 710c15dd78
1 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
cli/tools/vendor/build.rs vendored
View file

@ -388,20 +388,23 @@ mod test {
"/mod.ts", "/mod.ts",
concat!( concat!(
r#"import "https://localhost";"#, r#"import "https://localhost";"#,
r#"import "https://localhost/file.js";"#,
r#"import "https://localhost/subdir/";"#,
r#"import "https://localhost/subdir/mod.ts";"#, r#"import "https://localhost/subdir/mod.ts";"#,
), ),
) )
.add_with_headers( .add_with_headers(
"https://localhost", "https://localhost",
"import './subdir'; export class Mod1 {}", "export class Mod1 {}",
&[("content-type", "application/typescript")], &[("content-type", "application/typescript")],
) )
.add("https://localhost/file.js", "export class Mod2 {}")
.add_with_headers( .add_with_headers(
"https://localhost/subdir", "https://localhost/subdir",
"import './subdir/mod.ts'; export class Mod2 {}", "export class Mod3 {}",
&[("content-type", "application/typescript")], &[("content-type", "application/typescript")],
) )
.add("https://localhost/subdir/mod.ts", "export class Mod3 {}"); .add("https://localhost/subdir/mod.ts", "export class Mod4 {}");
}) })
.build() .build()
.await .await
@ -411,9 +414,13 @@ mod test {
output.import_map, output.import_map,
Some(json!({ Some(json!({
"imports": { "imports": {
"https://localhost/": "./localhost/",
"https://localhost": "./localhost/root.ts", "https://localhost": "./localhost/root.ts",
// need to map all children of localhost because it's not
// possible to have an import map entry for the root path
// with a trialing slash and without a trailing slash
"https://localhost/file.js": "./localhost/file.js",
"https://localhost/subdir": "./localhost/subdir/root.ts", "https://localhost/subdir": "./localhost/subdir/root.ts",
"https://localhost/subdir/": "./localhost/subdir/",
} }
})) }))
); );
@ -421,8 +428,9 @@ mod test {
output.files, output.files,
to_file_vec(&[ to_file_vec(&[
("/vendor/localhost/root.ts", "export class Mod1 {}"), ("/vendor/localhost/root.ts", "export class Mod1 {}"),
("/vendor/localhost/subdir/root.ts", "export class Mod2 {}"), ("/vendor/localhost/file.js", "export class Mod2 {}"),
("/vendor/localhost/subdir/mod.ts", "export class Mod3 {}"), ("/vendor/localhost/subdir/root.ts", "export class Mod3 {}"),
("/vendor/localhost/subdir/mod.ts", "export class Mod4 {}"),
]), ]),
); );
} }