mirror of
https://github.com/denoland/deno.git
synced 2024-12-11 01:58:05 -05:00
b34e751a5b
Makes the resolver required and prints a warning when vendoring and a dynamic import can't be resolved. Closes #16522
582 lines
16 KiB
Rust
582 lines
16 KiB
Rust
// Copyright 2018-2023 the Deno authors. All rights reserved. MIT license.
|
|
|
|
use deno_core::serde_json;
|
|
use deno_core::serde_json::json;
|
|
use pretty_assertions::assert_eq;
|
|
use std::fmt::Write as _;
|
|
use std::path::PathBuf;
|
|
use std::process::Stdio;
|
|
use test_util as util;
|
|
use test_util::TempDir;
|
|
use util::http_server;
|
|
use util::new_deno_dir;
|
|
|
|
#[test]
|
|
fn output_dir_exists() {
|
|
let t = TempDir::new();
|
|
t.write("mod.ts", "");
|
|
t.create_dir_all("vendor");
|
|
t.write("vendor/mod.ts", "");
|
|
|
|
let deno = util::deno_cmd()
|
|
.current_dir(t.path())
|
|
.env("NO_COLOR", "1")
|
|
.arg("vendor")
|
|
.arg("mod.ts")
|
|
.stderr(Stdio::piped())
|
|
.spawn()
|
|
.unwrap();
|
|
let output = deno.wait_with_output().unwrap();
|
|
assert_eq!(
|
|
String::from_utf8_lossy(&output.stderr).trim(),
|
|
concat!(
|
|
"error: Output directory was not empty. Please specify an empty ",
|
|
"directory or use --force to ignore this error and potentially ",
|
|
"overwrite its contents.",
|
|
),
|
|
);
|
|
assert!(!output.status.success());
|
|
|
|
// ensure it errors when using the `--output` arg too
|
|
let deno = util::deno_cmd()
|
|
.current_dir(t.path())
|
|
.env("NO_COLOR", "1")
|
|
.arg("vendor")
|
|
.arg("--output")
|
|
.arg("vendor")
|
|
.arg("mod.ts")
|
|
.stderr(Stdio::piped())
|
|
.spawn()
|
|
.unwrap();
|
|
let output = deno.wait_with_output().unwrap();
|
|
assert_eq!(
|
|
String::from_utf8_lossy(&output.stderr).trim(),
|
|
concat!(
|
|
"error: Output directory was not empty. Please specify an empty ",
|
|
"directory or use --force to ignore this error and potentially ",
|
|
"overwrite its contents.",
|
|
),
|
|
);
|
|
assert!(!output.status.success());
|
|
|
|
// now use `--force`
|
|
let status = util::deno_cmd()
|
|
.current_dir(t.path())
|
|
.env("NO_COLOR", "1")
|
|
.arg("vendor")
|
|
.arg("mod.ts")
|
|
.arg("--force")
|
|
.spawn()
|
|
.unwrap()
|
|
.wait()
|
|
.unwrap();
|
|
assert!(status.success());
|
|
}
|
|
|
|
#[test]
|
|
fn standard_test() {
|
|
let _server = http_server();
|
|
let t = TempDir::new();
|
|
let vendor_dir = t.path().join("vendor2");
|
|
t.write(
|
|
"my_app.ts",
|
|
"import {Logger} from 'http://localhost:4545/vendor/query_reexport.ts?testing'; new Logger().log('outputted');",
|
|
);
|
|
|
|
let deno = util::deno_cmd()
|
|
.current_dir(t.path())
|
|
.arg("vendor")
|
|
.arg("my_app.ts")
|
|
.arg("--output")
|
|
.arg("vendor2")
|
|
.env("NO_COLOR", "1")
|
|
.stdout(Stdio::piped())
|
|
.stderr(Stdio::piped())
|
|
.spawn()
|
|
.unwrap();
|
|
let output = deno.wait_with_output().unwrap();
|
|
assert_eq!(
|
|
String::from_utf8_lossy(&output.stderr).trim(),
|
|
format!(
|
|
concat!(
|
|
"Download http://localhost:4545/vendor/query_reexport.ts?testing\n",
|
|
"Download http://localhost:4545/vendor/logger.ts?test\n",
|
|
"{}",
|
|
),
|
|
success_text("2 modules", "vendor2", true),
|
|
)
|
|
);
|
|
assert_eq!(String::from_utf8_lossy(&output.stdout).trim(), "");
|
|
assert!(output.status.success());
|
|
|
|
assert!(vendor_dir.exists());
|
|
assert!(!t.path().join("vendor").exists());
|
|
let import_map: serde_json::Value =
|
|
serde_json::from_str(&t.read_to_string("vendor2/import_map.json")).unwrap();
|
|
assert_eq!(
|
|
import_map,
|
|
json!({
|
|
"imports": {
|
|
"http://localhost:4545/vendor/query_reexport.ts?testing": "./localhost_4545/vendor/query_reexport.ts",
|
|
"http://localhost:4545/": "./localhost_4545/",
|
|
},
|
|
"scopes": {
|
|
"./localhost_4545/": {
|
|
"./localhost_4545/vendor/logger.ts?test": "./localhost_4545/vendor/logger.ts"
|
|
}
|
|
}
|
|
}),
|
|
);
|
|
|
|
// try running the output with `--no-remote`
|
|
let deno = util::deno_cmd()
|
|
.current_dir(t.path())
|
|
.env("NO_COLOR", "1")
|
|
.arg("run")
|
|
.arg("--no-remote")
|
|
.arg("--check")
|
|
.arg("--quiet")
|
|
.arg("--import-map")
|
|
.arg("vendor2/import_map.json")
|
|
.arg("my_app.ts")
|
|
.stdout(Stdio::piped())
|
|
.stderr(Stdio::piped())
|
|
.spawn()
|
|
.unwrap();
|
|
let output = deno.wait_with_output().unwrap();
|
|
assert_eq!(String::from_utf8_lossy(&output.stderr).trim(), "");
|
|
assert_eq!(String::from_utf8_lossy(&output.stdout).trim(), "outputted");
|
|
assert!(output.status.success());
|
|
}
|
|
|
|
#[test]
|
|
fn import_map_output_dir() {
|
|
let _server = http_server();
|
|
let t = TempDir::new();
|
|
t.write("mod.ts", "");
|
|
t.create_dir_all("vendor");
|
|
t.write(
|
|
"vendor/import_map.json",
|
|
// will be ignored
|
|
"{ \"imports\": { \"https://localhost:4545/\": \"./localhost/\" }}",
|
|
);
|
|
t.write(
|
|
"deno.json",
|
|
"{ \"import_map\": \"./vendor/import_map.json\" }",
|
|
);
|
|
t.write(
|
|
"my_app.ts",
|
|
"import {Logger} from 'http://localhost:4545/vendor/logger.ts'; new Logger().log('outputted');",
|
|
);
|
|
|
|
let deno = util::deno_cmd()
|
|
.current_dir(t.path())
|
|
.env("NO_COLOR", "1")
|
|
.arg("vendor")
|
|
.arg("--force")
|
|
.arg("--import-map")
|
|
.arg("vendor/import_map.json")
|
|
.arg("my_app.ts")
|
|
.stdout(Stdio::piped())
|
|
.stderr(Stdio::piped())
|
|
.spawn()
|
|
.unwrap();
|
|
let output = deno.wait_with_output().unwrap();
|
|
assert_eq!(
|
|
String::from_utf8_lossy(&output.stderr).trim(),
|
|
format!(
|
|
concat!(
|
|
"Ignoring import map. Specifying an import map file ({}) in the deno ",
|
|
"vendor output directory is not supported. If you wish to use an ",
|
|
"import map while vendoring, please specify one located outside this ",
|
|
"directory.\n",
|
|
"Download http://localhost:4545/vendor/logger.ts\n",
|
|
"{}",
|
|
),
|
|
PathBuf::from("vendor").join("import_map.json").display(),
|
|
success_text_updated_deno_json("1 module", "vendor/"),
|
|
)
|
|
);
|
|
assert!(output.status.success());
|
|
}
|
|
|
|
#[test]
|
|
fn remote_module_test() {
|
|
let _server = http_server();
|
|
let t = TempDir::new();
|
|
let vendor_dir = t.path().join("vendor");
|
|
|
|
let deno = util::deno_cmd()
|
|
.current_dir(t.path())
|
|
.env("NO_COLOR", "1")
|
|
.arg("vendor")
|
|
.arg("http://localhost:4545/vendor/query_reexport.ts")
|
|
.stdout(Stdio::piped())
|
|
.stderr(Stdio::piped())
|
|
.spawn()
|
|
.unwrap();
|
|
let output = deno.wait_with_output().unwrap();
|
|
assert_eq!(
|
|
String::from_utf8_lossy(&output.stderr).trim(),
|
|
format!(
|
|
concat!(
|
|
"Download http://localhost:4545/vendor/query_reexport.ts\n",
|
|
"Download http://localhost:4545/vendor/logger.ts?test\n",
|
|
"{}",
|
|
),
|
|
success_text("2 modules", "vendor/", true),
|
|
)
|
|
);
|
|
assert_eq!(String::from_utf8_lossy(&output.stdout).trim(), "");
|
|
assert!(output.status.success());
|
|
assert!(vendor_dir.exists());
|
|
assert!(vendor_dir
|
|
.join("localhost_4545/vendor/query_reexport.ts")
|
|
.exists());
|
|
assert!(vendor_dir.join("localhost_4545/vendor/logger.ts").exists());
|
|
let import_map: serde_json::Value =
|
|
serde_json::from_str(&t.read_to_string("vendor/import_map.json")).unwrap();
|
|
assert_eq!(
|
|
import_map,
|
|
json!({
|
|
"imports": {
|
|
"http://localhost:4545/": "./localhost_4545/",
|
|
},
|
|
"scopes": {
|
|
"./localhost_4545/": {
|
|
"./localhost_4545/vendor/logger.ts?test": "./localhost_4545/vendor/logger.ts",
|
|
}
|
|
}
|
|
}),
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn existing_import_map_no_remote() {
|
|
let _server = http_server();
|
|
let t = TempDir::new();
|
|
t.write(
|
|
"mod.ts",
|
|
"import {Logger} from 'http://localhost:4545/vendor/logger.ts';",
|
|
);
|
|
let import_map_filename = "imports2.json";
|
|
let import_map_text =
|
|
r#"{ "imports": { "http://localhost:4545/vendor/": "./logger/" } }"#;
|
|
t.write(import_map_filename, import_map_text);
|
|
t.create_dir_all("logger");
|
|
t.write("logger/logger.ts", "export class Logger {}");
|
|
|
|
let deno = util::deno_cmd()
|
|
.current_dir(t.path())
|
|
.env("NO_COLOR", "1")
|
|
.arg("vendor")
|
|
.arg("mod.ts")
|
|
.arg("--import-map")
|
|
.arg(import_map_filename)
|
|
.stderr(Stdio::piped())
|
|
.spawn()
|
|
.unwrap();
|
|
let output = deno.wait_with_output().unwrap();
|
|
assert_eq!(
|
|
String::from_utf8_lossy(&output.stderr).trim(),
|
|
success_text("0 modules", "vendor/", false)
|
|
);
|
|
assert!(output.status.success());
|
|
// it should not have found any remote dependencies because
|
|
// the provided import map mapped it to a local directory
|
|
assert_eq!(t.read_to_string(import_map_filename), import_map_text);
|
|
}
|
|
|
|
#[test]
|
|
fn existing_import_map_mixed_with_remote() {
|
|
let _server = http_server();
|
|
let deno_dir = new_deno_dir();
|
|
let t = TempDir::new();
|
|
t.write(
|
|
"mod.ts",
|
|
"import {Logger} from 'http://localhost:4545/vendor/logger.ts';",
|
|
);
|
|
|
|
let status = util::deno_cmd_with_deno_dir(&deno_dir)
|
|
.current_dir(t.path())
|
|
.arg("vendor")
|
|
.arg("mod.ts")
|
|
.spawn()
|
|
.unwrap()
|
|
.wait()
|
|
.unwrap();
|
|
assert!(status.success());
|
|
|
|
assert_eq!(
|
|
t.read_to_string("vendor/import_map.json"),
|
|
r#"{
|
|
"imports": {
|
|
"http://localhost:4545/": "./localhost_4545/"
|
|
}
|
|
}
|
|
"#,
|
|
);
|
|
|
|
// make the import map specific to support vendoring mod.ts in the next step
|
|
t.write(
|
|
"vendor/import_map.json",
|
|
r#"{
|
|
"imports": {
|
|
"http://localhost:4545/vendor/logger.ts": "./localhost_4545/vendor/logger.ts"
|
|
}
|
|
}
|
|
"#,
|
|
);
|
|
|
|
t.write(
|
|
"mod.ts",
|
|
concat!(
|
|
"import {Logger} from 'http://localhost:4545/vendor/logger.ts';\n",
|
|
"import {Logger as OtherLogger} from 'http://localhost:4545/vendor/mod.ts';\n",
|
|
),
|
|
);
|
|
|
|
// now vendor with the existing import map in a separate vendor directory
|
|
let deno = util::deno_cmd_with_deno_dir(&deno_dir)
|
|
.env("NO_COLOR", "1")
|
|
.current_dir(t.path())
|
|
.arg("vendor")
|
|
.arg("mod.ts")
|
|
.arg("--import-map")
|
|
.arg("vendor/import_map.json")
|
|
.arg("--output")
|
|
.arg("vendor2")
|
|
.stderr(Stdio::piped())
|
|
.stdout(Stdio::piped())
|
|
.spawn()
|
|
.unwrap();
|
|
let output = deno.wait_with_output().unwrap();
|
|
assert_eq!(
|
|
String::from_utf8_lossy(&output.stderr).trim(),
|
|
format!(
|
|
concat!("Download http://localhost:4545/vendor/mod.ts\n", "{}",),
|
|
success_text("1 module", "vendor2", true),
|
|
)
|
|
);
|
|
assert!(output.status.success());
|
|
|
|
// tricky scenario here where the output directory now contains a mapping
|
|
// back to the previous vendor location
|
|
assert_eq!(
|
|
t.read_to_string("vendor2/import_map.json"),
|
|
r#"{
|
|
"imports": {
|
|
"http://localhost:4545/vendor/logger.ts": "../vendor/localhost_4545/vendor/logger.ts",
|
|
"http://localhost:4545/": "./localhost_4545/"
|
|
},
|
|
"scopes": {
|
|
"./localhost_4545/": {
|
|
"./localhost_4545/vendor/logger.ts": "../vendor/localhost_4545/vendor/logger.ts"
|
|
}
|
|
}
|
|
}
|
|
"#,
|
|
);
|
|
|
|
// ensure it runs
|
|
let status = util::deno_cmd()
|
|
.current_dir(t.path())
|
|
.arg("run")
|
|
.arg("--check")
|
|
.arg("--no-remote")
|
|
.arg("--import-map")
|
|
.arg("vendor2/import_map.json")
|
|
.arg("mod.ts")
|
|
.spawn()
|
|
.unwrap()
|
|
.wait()
|
|
.unwrap();
|
|
assert!(status.success());
|
|
}
|
|
|
|
#[test]
|
|
fn dynamic_import() {
|
|
let _server = http_server();
|
|
let t = TempDir::new();
|
|
t.write(
|
|
"mod.ts",
|
|
"import {Logger} from 'http://localhost:4545/vendor/dynamic.ts'; new Logger().log('outputted');",
|
|
);
|
|
|
|
let status = util::deno_cmd()
|
|
.current_dir(t.path())
|
|
.arg("vendor")
|
|
.arg("mod.ts")
|
|
.spawn()
|
|
.unwrap()
|
|
.wait()
|
|
.unwrap();
|
|
assert!(status.success());
|
|
let import_map: serde_json::Value =
|
|
serde_json::from_str(&t.read_to_string("vendor/import_map.json")).unwrap();
|
|
assert_eq!(
|
|
import_map,
|
|
json!({
|
|
"imports": {
|
|
"http://localhost:4545/": "./localhost_4545/",
|
|
}
|
|
}),
|
|
);
|
|
|
|
// try running the output with `--no-remote`
|
|
let deno = util::deno_cmd()
|
|
.current_dir(t.path())
|
|
.env("NO_COLOR", "1")
|
|
.arg("run")
|
|
.arg("--allow-read=.")
|
|
.arg("--no-remote")
|
|
.arg("--check")
|
|
.arg("--quiet")
|
|
.arg("--import-map")
|
|
.arg("vendor/import_map.json")
|
|
.arg("mod.ts")
|
|
.stdout(Stdio::piped())
|
|
.stderr(Stdio::piped())
|
|
.spawn()
|
|
.unwrap();
|
|
let output = deno.wait_with_output().unwrap();
|
|
assert_eq!(String::from_utf8_lossy(&output.stderr).trim(), "");
|
|
assert_eq!(String::from_utf8_lossy(&output.stdout).trim(), "outputted");
|
|
assert!(output.status.success());
|
|
}
|
|
|
|
#[test]
|
|
fn dynamic_non_analyzable_import() {
|
|
let _server = http_server();
|
|
let t = TempDir::new();
|
|
t.write(
|
|
"mod.ts",
|
|
"import {Logger} from 'http://localhost:4545/vendor/dynamic_non_analyzable.ts'; new Logger().log('outputted');",
|
|
);
|
|
|
|
let deno = util::deno_cmd()
|
|
.current_dir(t.path())
|
|
.env("NO_COLOR", "1")
|
|
.arg("vendor")
|
|
.arg("--reload")
|
|
.arg("mod.ts")
|
|
.stdout(Stdio::piped())
|
|
.stderr(Stdio::piped())
|
|
.spawn()
|
|
.unwrap();
|
|
let output = deno.wait_with_output().unwrap();
|
|
// todo(https://github.com/denoland/deno_graph/issues/138): it should warn about
|
|
// how it couldn't analyze the dynamic import
|
|
assert_eq!(
|
|
String::from_utf8_lossy(&output.stderr).trim(),
|
|
format!(
|
|
"Download http://localhost:4545/vendor/dynamic_non_analyzable.ts\n{}",
|
|
success_text("1 module", "vendor/", true),
|
|
)
|
|
);
|
|
assert_eq!(String::from_utf8_lossy(&output.stdout).trim(), "");
|
|
assert!(output.status.success());
|
|
}
|
|
|
|
itest!(dynamic_non_existent {
|
|
args: "vendor http://localhost:4545/vendor/dynamic_non_existent.ts",
|
|
temp_cwd: true,
|
|
exit_code: 0,
|
|
http_server: true,
|
|
output: "vendor/dynamic_non_existent.ts.out",
|
|
});
|
|
|
|
#[test]
|
|
fn update_existing_config_test() {
|
|
let _server = http_server();
|
|
let t = TempDir::new();
|
|
t.write(
|
|
"my_app.ts",
|
|
"import {Logger} from 'http://localhost:4545/vendor/logger.ts'; new Logger().log('outputted');",
|
|
);
|
|
t.write("deno.json", "{\n}");
|
|
|
|
let deno = util::deno_cmd()
|
|
.current_dir(t.path())
|
|
.arg("vendor")
|
|
.arg("my_app.ts")
|
|
.arg("--output")
|
|
.arg("vendor2")
|
|
.env("NO_COLOR", "1")
|
|
.stdout(Stdio::piped())
|
|
.stderr(Stdio::piped())
|
|
.spawn()
|
|
.unwrap();
|
|
let output = deno.wait_with_output().unwrap();
|
|
assert_eq!(
|
|
String::from_utf8_lossy(&output.stderr).trim(),
|
|
format!(
|
|
"Download http://localhost:4545/vendor/logger.ts\n{}",
|
|
success_text_updated_deno_json("1 module", "vendor2",)
|
|
)
|
|
);
|
|
assert_eq!(String::from_utf8_lossy(&output.stdout).trim(), "");
|
|
assert!(output.status.success());
|
|
|
|
// try running the output with `--no-remote` and not specifying a `--vendor`
|
|
let deno = util::deno_cmd()
|
|
.current_dir(t.path())
|
|
.env("NO_COLOR", "1")
|
|
.arg("run")
|
|
.arg("--no-remote")
|
|
.arg("--check")
|
|
.arg("--quiet")
|
|
.arg("my_app.ts")
|
|
.stdout(Stdio::piped())
|
|
.stderr(Stdio::piped())
|
|
.spawn()
|
|
.unwrap();
|
|
let output = deno.wait_with_output().unwrap();
|
|
assert_eq!(String::from_utf8_lossy(&output.stderr).trim(), "");
|
|
assert_eq!(String::from_utf8_lossy(&output.stdout).trim(), "outputted");
|
|
assert!(output.status.success());
|
|
}
|
|
|
|
fn success_text(module_count: &str, dir: &str, has_import_map: bool) -> String {
|
|
let mut text = format!("Vendored {module_count} into {dir} directory.");
|
|
if has_import_map {
|
|
let f = format!(
|
|
concat!(
|
|
"\n\nTo use vendored modules, specify the `--import-map {}import_map.json` flag when ",
|
|
r#"invoking Deno subcommands or add an `"importMap": "<path_to_vendored_import_map>"` "#,
|
|
"entry to a deno.json file.",
|
|
),
|
|
if dir != "vendor/" {
|
|
format!("{}{}", dir.trim_end_matches('/'), if cfg!(windows) { '\\' } else {'/'})
|
|
} else {
|
|
dir.to_string()
|
|
}
|
|
);
|
|
write!(text, "{f}").unwrap();
|
|
}
|
|
text
|
|
}
|
|
|
|
fn success_text_updated_deno_json(module_count: &str, dir: &str) -> String {
|
|
format!(
|
|
concat!(
|
|
"Vendored {} into {} directory.\n\n",
|
|
"Updated your local Deno configuration file with a reference to the ",
|
|
"new vendored import map at {}import_map.json. Invoking Deno subcommands will ",
|
|
"now automatically resolve using the vendored modules. You may override ",
|
|
"this by providing the `--import-map <other-import-map>` flag or by ",
|
|
"manually editing your Deno configuration file.",
|
|
),
|
|
module_count,
|
|
dir,
|
|
if dir != "vendor/" {
|
|
format!(
|
|
"{}{}",
|
|
dir.trim_end_matches('/'),
|
|
if cfg!(windows) { '\\' } else { '/' }
|
|
)
|
|
} else {
|
|
dir.to_string()
|
|
}
|
|
)
|
|
}
|