summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/integration/mod.rs2
-rw-r--r--tests/integration/vendor_tests.rs751
-rw-r--r--tests/specs/vendor/removed/__test__.jsonc13
-rw-r--r--tests/specs/vendor/removed/vendor.out3
-rw-r--r--tests/specs/vendor/removed/vendor_help.out10
-rw-r--r--tests/testdata/vendor/dynamic.ts3
-rw-r--r--tests/testdata/vendor/dynamic_non_analyzable.ts4
-rw-r--r--tests/testdata/vendor/dynamic_non_existent.ts11
-rw-r--r--tests/testdata/vendor/dynamic_non_existent.ts.out9
-rw-r--r--tests/testdata/vendor/logger.ts5
-rw-r--r--tests/testdata/vendor/mod.ts1
-rw-r--r--tests/testdata/vendor/npm_and_node_specifier.ts2
-rw-r--r--tests/testdata/vendor/query_reexport.ts1
13 files changed, 26 insertions, 789 deletions
diff --git a/tests/integration/mod.rs b/tests/integration/mod.rs
index ea3269aaa..d12abcde6 100644
--- a/tests/integration/mod.rs
+++ b/tests/integration/mod.rs
@@ -68,8 +68,6 @@ mod task;
mod test;
#[path = "upgrade_tests.rs"]
mod upgrade;
-#[path = "vendor_tests.rs"]
-mod vendor;
#[path = "watcher_tests.rs"]
mod watcher;
#[path = "worker_tests.rs"]
diff --git a/tests/integration/vendor_tests.rs b/tests/integration/vendor_tests.rs
deleted file mode 100644
index 550fbf8b7..000000000
--- a/tests/integration/vendor_tests.rs
+++ /dev/null
@@ -1,751 +0,0 @@
-// Copyright 2018-2024 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 test_util as util;
-use test_util::itest;
-use test_util::TempDir;
-use util::http_server;
-use util::new_deno_dir;
-use util::TestContextBuilder;
-
-const DEPRECATION_NOTICE: &str = "⚠️ Warning: `deno vendor` is deprecated and will be removed in Deno 2.0.\nAdd `\"vendor\": true` to your `deno.json` or use the `--vendor` flag instead.\n";
-
-#[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_piped()
- .spawn()
- .unwrap();
- let output = deno.wait_with_output().unwrap();
- assert_eq!(
- String::from_utf8_lossy(&output.stderr).trim(),
- format!("{}error: Output directory was not empty. Please specify an empty directory or use --force to ignore this error and potentially overwrite its contents.", &DEPRECATION_NOTICE)
- );
- 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_piped()
- .spawn()
- .unwrap();
- let output = deno.wait_with_output().unwrap();
- assert_eq!(
- String::from_utf8_lossy(&output.stderr).trim(),
- format!("{}error: Output directory was not empty. Please specify an empty directory or use --force to ignore this error and potentially overwrite its contents.", &DEPRECATION_NOTICE)
- );
- 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")
- .piped_output()
- .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",
- "{}",
- ),
- &DEPRECATION_NOTICE,
- 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")
- .piped_output()
- .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")
- .piped_output()
- .spawn()
- .unwrap();
- let output = deno.wait_with_output().unwrap();
- assert_eq!(
- String::from_utf8_lossy(&output.stderr).trim(),
- format!(
- concat!(
- "{}{}\n",
- "Download http://localhost:4545/vendor/logger.ts\n",
- "{}\n\n{}",
- ),
- &DEPRECATION_NOTICE,
- ignoring_import_map_text(),
- vendored_text("1 module", "vendor/"),
- success_text_updated_deno_json("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")
- .piped_output()
- .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",
- "{}",
- ),
- &DEPRECATION_NOTICE,
- 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_piped()
- .spawn()
- .unwrap();
- let output = deno.wait_with_output().unwrap();
- assert_eq!(
- String::from_utf8_lossy(&output.stderr).trim(),
- format!(
- "{}{}",
- &DEPRECATION_NOTICE,
- 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")
- .piped_output()
- .spawn()
- .unwrap();
- let output = deno.wait_with_output().unwrap();
- assert_eq!(
- String::from_utf8_lossy(&output.stderr).trim(),
- format!(
- "{}Download http://localhost:4545/vendor/mod.ts\n{}",
- &DEPRECATION_NOTICE,
- 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")
- .piped_output()
- .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")
- .piped_output()
- .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{}",
- &DEPRECATION_NOTICE,
- 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")
- .piped_output()
- .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{}\n\n{}",
- &DEPRECATION_NOTICE,
- vendored_text("1 module", "vendor2"),
- success_text_updated_deno_json("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")
- .piped_output()
- .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 update_existing_empty_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", "");
-
- let deno = util::deno_cmd()
- .current_dir(t.path())
- .arg("vendor")
- .arg("my_app.ts")
- .arg("--output")
- .arg("vendor2")
- .env("NO_COLOR", "1")
- .piped_output()
- .spawn()
- .unwrap();
- let output = deno.wait_with_output().unwrap();
- assert_eq!(
- String::from_utf8_lossy(&output.stderr).trim(),
- format!(
- "⚠️ Warning: `deno vendor` is deprecated and will be removed in Deno 2.0.
-Add `\"vendor\": true` to your `deno.json` or use the `--vendor` flag instead.
-Download http://localhost:4545/vendor/logger.ts\n{}\n\n{}",
- vendored_text("1 module", "vendor2"),
- success_text_updated_deno_json("vendor2",)
- )
- );
- assert_eq!(String::from_utf8_lossy(&output.stdout).trim(), "");
- assert!(output.status.success());
-}
-
-// TODO(2.0): decide if this test should be updated or removed
-#[test]
-#[ignore]
-fn vendor_npm_node_specifiers() {
- let context = TestContextBuilder::for_npm().use_temp_cwd().build();
- let temp_dir = context.temp_dir();
- temp_dir.write(
- "my_app.ts",
- concat!(
- "import { path, getValue, setValue } from 'http://localhost:4545/vendor/npm_and_node_specifier.ts';\n",
- "setValue(5);\n",
- "console.log(path.isAbsolute(Deno.cwd()), getValue());",
- ),
- );
- temp_dir.write("deno.json", "{}");
-
- let output = context.new_command().args("vendor my_app.ts").run();
- output.assert_matches_text(format!(
- concat!(
- "⚠️ Warning: `deno vendor` is deprecated and will be removed in Deno 2.0.\n",
- "Add `\"vendor\": true` to your `deno.json` or use the `--vendor` flag instead.\n",
- "Download http://localhost:4545/vendor/npm_and_node_specifier.ts\n",
- "Download http://localhost:4260/@denotest/esm-basic\n",
- "Download http://localhost:4260/@denotest/esm-basic/1.0.0.tgz\n",
- "{}\n",
- "Initialize @denotest/esm-basic@1.0.0\n",
- "{}\n\n",
- "{}\n",
- ),
- vendored_text("1 module", "vendor/"),
- vendored_npm_package_text("1 npm package"),
- success_text_updated_deno_json("vendor/")
- ));
- let output = context.new_command().args("run -A -q my_app.ts").run();
- output.assert_matches_text("true 5\n");
- assert!(temp_dir.path().join("node_modules").exists());
- assert!(temp_dir.path().join("deno.lock").exists());
-
- // now try re-vendoring with a lockfile
- let output = context.new_command().args("vendor --force my_app.ts").run();
- output.assert_matches_text(format!(
- "{}{}\n{}\n\n{}\n",
- &DEPRECATION_NOTICE,
- ignoring_import_map_text(),
- vendored_text("1 module", "vendor/"),
- success_text_updated_deno_json("vendor/"),
- ));
-
- // delete the node_modules folder
- temp_dir.remove_dir_all("node_modules");
-
- // vendor with --node-modules-dir=false
- let output = context
- .new_command()
- .args("vendor --node-modules-dir=false --force my_app.ts")
- .run();
- output.assert_matches_text(format!(
- "{}{}\n{}\n\n{}\n",
- &DEPRECATION_NOTICE,
- ignoring_import_map_text(),
- vendored_text("1 module", "vendor/"),
- success_text_updated_deno_json("vendor/")
- ));
- assert!(!temp_dir.path().join("node_modules").exists());
-
- // delete the deno.json
- temp_dir.remove_file("deno.json");
-
- // vendor with --node-modules-dir
- let output = context
- .new_command()
- .args("vendor --node-modules-dir --force my_app.ts")
- .run();
- output.assert_matches_text(format!(
- "{}Initialize @denotest/esm-basic@1.0.0\n{}\n\n{}\n",
- &DEPRECATION_NOTICE,
- vendored_text("1 module", "vendor/"),
- use_import_map_text("vendor/")
- ));
-}
-
-#[test]
-fn vendor_only_npm_specifiers() {
- let context = TestContextBuilder::for_npm().use_temp_cwd().build();
- let temp_dir = context.temp_dir();
- temp_dir.write(
- "my_app.ts",
- concat!(
- "import { getValue, setValue } from 'npm:@denotest/esm-basic';\n",
- "setValue(5);\n",
- "console.log(path.isAbsolute(Deno.cwd()), getValue());",
- ),
- );
- temp_dir.write("deno.json", "{}");
-
- let output = context.new_command().args("vendor my_app.ts").run();
- output.assert_matches_text(format!(
- concat!(
- "⚠️ Warning: `deno vendor` is deprecated and will be removed in Deno 2.0.\n",
- "Add `\"vendor\": true` to your `deno.json` or use the `--vendor` flag instead.\n",
- "Download http://localhost:4260/@denotest/esm-basic\n",
- "Download http://localhost:4260/@denotest/esm-basic/1.0.0.tgz\n",
- "{}\n",
- "Initialize @denotest/esm-basic@1.0.0\n",
- "{}\n",
- ),
- vendored_text("0 modules", "vendor/"),
- vendored_npm_package_text("1 npm package"),
- ));
-}
-
-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 {
- write!(text, "\n\n{}", use_import_map_text(dir)).unwrap();
- }
- text
-}
-
-fn use_import_map_text(dir: &str) -> String {
- format!(
- concat!(
- "To 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()
- }
- )
-}
-
-fn vendored_text(module_count: &str, dir: &str) -> String {
- format!("Vendored {} into {} directory.", module_count, dir)
-}
-
-fn vendored_npm_package_text(package_count: &str) -> String {
- format!(
- concat!(
- "Vendored {} into node_modules directory. Set `nodeModulesDir: false` ",
- "in the Deno configuration file to disable vendoring npm packages in the future.",
- ),
- package_count
- )
-}
-
-fn success_text_updated_deno_json(dir: &str) -> String {
- format!(
- concat!(
- "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.",
- ),
- if dir != "vendor/" {
- format!(
- "{}{}",
- dir.trim_end_matches('/'),
- if cfg!(windows) { '\\' } else { '/' }
- )
- } else {
- dir.to_string()
- }
- )
-}
-
-fn ignoring_import_map_text() -> String {
- 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.",
- ),
- PathBuf::from("vendor").join("import_map.json").display(),
- )
-}
diff --git a/tests/specs/vendor/removed/__test__.jsonc b/tests/specs/vendor/removed/__test__.jsonc
new file mode 100644
index 000000000..abbcfe465
--- /dev/null
+++ b/tests/specs/vendor/removed/__test__.jsonc
@@ -0,0 +1,13 @@
+{
+ "steps": [
+ {
+ "args": "vendor",
+ "output": "vendor.out",
+ "exitCode": 1
+ },
+ {
+ "args": "vendor --help",
+ "output": "vendor_help.out"
+ }
+ ]
+}
diff --git a/tests/specs/vendor/removed/vendor.out b/tests/specs/vendor/removed/vendor.out
new file mode 100644
index 000000000..ee7e9ca55
--- /dev/null
+++ b/tests/specs/vendor/removed/vendor.out
@@ -0,0 +1,3 @@
+error: ⚠️ `deno vendor` was removed in Deno 2.
+
+See the Deno 1.x to 2.x Migration Guide for migration instructions: https://docs.deno.com/runtime/manual/advanced/migrate_deprecations
diff --git a/tests/specs/vendor/removed/vendor_help.out b/tests/specs/vendor/removed/vendor_help.out
new file mode 100644
index 000000000..176b2211a
--- /dev/null
+++ b/tests/specs/vendor/removed/vendor_help.out
@@ -0,0 +1,10 @@
+⚠️ `deno vendor` was removed in Deno 2.
+
+See the Deno 1.x to 2.x Migration Guide for migration instructions: https://docs.deno.com/runtime/manual/advanced/migrate_deprecations
+
+Usage: deno vendor [OPTIONS]
+
+Options:
+ -q, --quiet Suppress diagnostic output
+ --unstable Enable all unstable features and APIs. Instead of using this flag, consider enabling individual unstable features
+ To view the list of individual unstable feature flags, run this command again with --help=unstable
diff --git a/tests/testdata/vendor/dynamic.ts b/tests/testdata/vendor/dynamic.ts
deleted file mode 100644
index e2cbb0e59..000000000
--- a/tests/testdata/vendor/dynamic.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-const { Logger } = await import("./logger.ts");
-
-export { Logger };
diff --git a/tests/testdata/vendor/dynamic_non_analyzable.ts b/tests/testdata/vendor/dynamic_non_analyzable.ts
deleted file mode 100644
index 1847939f6..000000000
--- a/tests/testdata/vendor/dynamic_non_analyzable.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-const value = (() => "./logger.ts")();
-const { Logger } = await import(value);
-
-export { Logger };
diff --git a/tests/testdata/vendor/dynamic_non_existent.ts b/tests/testdata/vendor/dynamic_non_existent.ts
deleted file mode 100644
index a48e2accb..000000000
--- a/tests/testdata/vendor/dynamic_non_existent.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-// this should still vendor
-// deno-lint-ignore no-constant-condition
-if (false) {
- await import("./non-existent.js");
-}
-
-export class Logger {
- log(text: string) {
- console.log(text);
- }
-}
diff --git a/tests/testdata/vendor/dynamic_non_existent.ts.out b/tests/testdata/vendor/dynamic_non_existent.ts.out
deleted file mode 100644
index 1bbd01f7b..000000000
--- a/tests/testdata/vendor/dynamic_non_existent.ts.out
+++ /dev/null
@@ -1,9 +0,0 @@
-⚠️ Warning: `deno vendor` is deprecated and will be removed in Deno 2.0.
-Add `"vendor": true` to your `deno.json` or use the `--vendor` flag instead.
-Download http://localhost:4545/vendor/dynamic_non_existent.ts
-Download http://localhost:4545/vendor/non-existent.js
-Ignoring: Dynamic import not found "http://localhost:4545/vendor/non-existent.js".
- at http://localhost:4545/vendor/dynamic_non_existent.ts:4:16
-Vendored 1 module into vendor/ directory.
-
-To use vendored modules, specify the `--import-map vendor/import_map.json` flag when invoking Deno subcommands or add an `"importMap": "<path_to_vendored_import_map>"` entry to a deno.json file.
diff --git a/tests/testdata/vendor/logger.ts b/tests/testdata/vendor/logger.ts
deleted file mode 100644
index 97f603a48..000000000
--- a/tests/testdata/vendor/logger.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export class Logger {
- log(text: string) {
- console.log(text);
- }
-}
diff --git a/tests/testdata/vendor/mod.ts b/tests/testdata/vendor/mod.ts
deleted file mode 100644
index 8824d1b2a..000000000
--- a/tests/testdata/vendor/mod.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./logger.ts";
diff --git a/tests/testdata/vendor/npm_and_node_specifier.ts b/tests/testdata/vendor/npm_and_node_specifier.ts
deleted file mode 100644
index 61962e836..000000000
--- a/tests/testdata/vendor/npm_and_node_specifier.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export { default as path } from "node:path";
-export { getValue, setValue } from "npm:@denotest/esm-basic";
diff --git a/tests/testdata/vendor/query_reexport.ts b/tests/testdata/vendor/query_reexport.ts
deleted file mode 100644
index 5dfafb532..000000000
--- a/tests/testdata/vendor/query_reexport.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./logger.ts?test";
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-27 11:48:34 +0000