diff --git a/cli/tools/installer/mod.rs b/cli/tools/installer/mod.rs index d8d8f64f14..1153034c75 100644 --- a/cli/tools/installer/mod.rs +++ b/cli/tools/installer/mod.rs @@ -52,6 +52,7 @@ use crate::jsr::JsrFetchResolver; use crate::npm::CliNpmResolver; use crate::npm::NpmFetchResolver; use crate::sys::CliSys; +use crate::util::display; use crate::util::fs::canonicalize_path_maybe_not_exists; mod bin_name_resolver; @@ -426,6 +427,7 @@ pub(crate) async fn install_from_entrypoints( flags: Arc, entrypoints: &[String], ) -> Result<(), AnyError> { + let started = std::time::Instant::now(); let factory = CliFactory::from_flags(flags.clone()); let emitter = factory.emitter()?; let main_graph_container = factory.main_module_graph_container().await?; @@ -450,6 +452,7 @@ pub(crate) async fn install_from_entrypoints( print_install_report( &factory.sys(), + started.elapsed(), &factory.install_reporter()?.unwrap().clone(), factory.workspace_resolver().await?, factory.npm_resolver().await?, @@ -469,14 +472,16 @@ async fn install_local( install_from_entrypoints(flags, &entrypoints).await } InstallFlagsLocal::TopLevel => { + let start = std::time::Instant::now(); let factory = CliFactory::from_flags(flags); - install_top_level(&factory).await + install_top_level(&factory, start).await } } } pub fn print_install_report( sys: &dyn sys_traits::boxed::FsOpenBoxed, + elapsed: std::time::Duration, install_reporter: &InstallReporter, workspace: &WorkspaceResolver, npm_resolver: &CliNpmResolver, @@ -564,36 +569,71 @@ pub fn print_install_report( if !rep.stats.intialized_npm.is_empty() || !rep.stats.downloaded_jsr.is_empty() { + let total_installed = + rep.stats.intialized_npm.len() + rep.stats.downloaded_jsr.len(); log::info!( - "Packages: {}", - rep.stats.intialized_npm.len() + rep.stats.downloaded_jsr.len() - ); - log::info!( - "{}", - deno_terminal::colors::green("+".repeat( - rep.stats.intialized_npm.len() + rep.stats.downloaded_jsr.len() - )) + "{} {} {} {} {}", + deno_terminal::colors::gray("Installed"), + total_installed, + deno_terminal::colors::gray(format!( + "package{}", + if total_installed > 1 { "s" } else { "" }, + )), + deno_terminal::colors::gray("in"), + display::human_elapsed_with_ms_limit(elapsed.as_millis(), 3_000) ); + let total_reused = rep.stats.reused_npm.get() + rep.stats.reused_jsr.len(); log::info!( - "Resolved: {}, reused: {}, downloaded: {}, added: {}", - deno_terminal::colors::green( - rep.stats.resolved_npm.len() + rep.stats.resolved_jsr.len() - ), - deno_terminal::colors::green( - rep.stats.reused_npm.get() + rep.stats.reused_jsr.len() - ), - deno_terminal::colors::green( - rep.stats.downloaded_npm.get() + rep.stats.downloaded_jsr.len() - ), - deno_terminal::colors::green( - rep.stats.intialized_npm.len() + rep.stats.downloaded_jsr.len() - ), + "{} {} {}", + deno_terminal::colors::gray("Reused"), + total_reused, + deno_terminal::colors::gray(format!( + "package{} from cache", + if total_reused == 1 { "" } else { "s" }, + )), ); - log::info!(""); + if total_reused > 0 { + log::info!( + "{}", + deno_terminal::colors::yellow_bold("+".repeat(total_reused)) + ); + } + + let jsr_downloaded = rep.stats.downloaded_jsr.len(); + log::info!( + "{} {} {}", + deno_terminal::colors::gray("Downloaded"), + jsr_downloaded, + deno_terminal::colors::gray(format!( + "package{} from JSR", + if jsr_downloaded == 1 { "" } else { "s" }, + )), + ); + if jsr_downloaded > 0 { + log::info!( + "{}", + deno_terminal::colors::green("+".repeat(jsr_downloaded)) + ); + } + + let npm_download = rep.stats.downloaded_npm.get(); + log::info!( + "{} {} {}", + deno_terminal::colors::gray("Downloaded"), + npm_download, + deno_terminal::colors::gray(format!( + "package{} from npm", + if npm_download == 1 { "" } else { "s" }, + )), + ); + if npm_download > 0 { + log::info!("{}", deno_terminal::colors::green("+".repeat(npm_download))); + } } if !installed_normal_deps.is_empty() || !rep.stats.downloaded_jsr.is_empty() { + log::info!(""); log::info!("{}", deno_terminal::colors::cyan("Dependencies:")); let mut jsr_packages = rep .stats @@ -647,7 +687,10 @@ pub fn print_install_report( } } -async fn install_top_level(factory: &CliFactory) -> Result<(), AnyError> { +async fn install_top_level( + factory: &CliFactory, + started: std::time::Instant, +) -> Result<(), AnyError> { // surface any errors in the package.json factory .npm_installer() @@ -668,6 +711,7 @@ async fn install_top_level(factory: &CliFactory) -> Result<(), AnyError> { let npm_resolver = factory.npm_resolver().await?; print_install_report( &factory.sys(), + started.elapsed(), &install_reporter, workspace, npm_resolver, diff --git a/cli/tools/pm/mod.rs b/cli/tools/pm/mod.rs index dfe6fd5f24..84461ad7b7 100644 --- a/cli/tools/pm/mod.rs +++ b/cli/tools/pm/mod.rs @@ -891,6 +891,7 @@ async fn npm_install_after_modification( // make a new CliFactory to pick up the updated config file let cli_factory = CliFactory::from_flags(flags); // surface any errors in the package.json + let start = std::time::Instant::now(); let npm_installer = cli_factory.npm_installer().await?; npm_installer.ensure_no_pkg_json_dep_errors()?; // npm install @@ -901,6 +902,7 @@ async fn npm_install_after_modification( let npm_resolver = cli_factory.npm_resolver().await?; super::installer::print_install_report( &cli_factory.sys(), + start.elapsed(), install_reporter, workspace, npm_resolver, diff --git a/cli/util/display.rs b/cli/util/display.rs index 8a1005a22d..e7bdcac951 100644 --- a/cli/util/display.rs +++ b/cli/util/display.rs @@ -49,7 +49,11 @@ pub fn human_download_size(byte_count: u64, total_bytes: u64) -> String { /// A function that converts a millisecond elapsed time to a string that /// represents a human readable version of that time. pub fn human_elapsed(elapsed: u128) -> String { - if elapsed < 1_000 { + human_elapsed_with_ms_limit(elapsed, 1_000) +} + +pub fn human_elapsed_with_ms_limit(elapsed: u128, ms_limit: u128) -> String { + if elapsed < ms_limit { return format!("{elapsed}ms"); } if elapsed < 1_000 * 60 { diff --git a/tests/integration/npm_tests.rs b/tests/integration/npm_tests.rs index c0897cafa8..99c90fb9c4 100644 --- a/tests/integration/npm_tests.rs +++ b/tests/integration/npm_tests.rs @@ -1356,9 +1356,11 @@ fn top_level_install_package_json_explicit_opt_in() { "Download http://localhost:4260/@denotest%2fesm-basic\n", "Download http://localhost:4260/@denotest/esm-basic/1.0.0.tgz\n", "Initialize @denotest/esm-basic@1.0.0\n", - "Packages: 1\n", - "+\n", - "Resolved: 0, reused: 0, downloaded: 2, added: 1\n", + "Installed 1 package in [WILDCARD]\n", + "Reused 0 packages from cache\n", + "Downloaded 0 packages from JSR\n", + "Downloaded 2 packages from npm\n", + "++\n", "\n", "Dependencies:\n", "+ npm:@denotest/esm-basic 1.0.0\n", diff --git a/tests/specs/add/dev/add.out b/tests/specs/add/dev/add.out index 7a2169f9d5..dd0e63272f 100644 --- a/tests/specs/add/dev/add.out +++ b/tests/specs/add/dev/add.out @@ -2,9 +2,11 @@ Add npm:@denotest/esm-basic@1.0.0 Download http://localhost:4260/@denotest%2fesm-basic Download http://localhost:4260/@denotest/esm-basic/1.0.0.tgz Initialize @denotest/esm-basic@1.0.0 -Packages: 1 -+ -Resolved: 0, reused: 0, downloaded: 2, added: 1 +Installed 1 package in [WILDLINE] +Reused 0 packages from cache +Downloaded 0 packages from JSR +Downloaded 2 packages from npm +++ Dependencies: + npm:@denotest/esm-basic 1.0.0 diff --git a/tests/specs/add/dev/add_packagejson.out b/tests/specs/add/dev/add_packagejson.out index 1b51163fb3..3eedf0701a 100644 --- a/tests/specs/add/dev/add_packagejson.out +++ b/tests/specs/add/dev/add_packagejson.out @@ -2,9 +2,10 @@ Add npm:@denotest/esm-basic@1.0.0 Download http://localhost:4260/@denotest%2fesm-basic Download http://localhost:4260/@denotest/esm-basic/1.0.0.tgz Initialize @denotest/esm-basic@1.0.0 -Packages: 1 -+ -Resolved: 0, reused: 0, downloaded: 2, added: 1 - +Installed 1 package in [WILDLINE] +Reused 0 packages from cache +Downloaded 0 packages from JSR +Downloaded 2 packages from npm +++ Dev dependencies: + npm:@denotest/esm-basic 1.0.0 diff --git a/tests/specs/add/package_json_and_deno_json/add.out b/tests/specs/add/package_json_and_deno_json/add.out index 604a20daa4..6935e7ac46 100644 --- a/tests/specs/add/package_json_and_deno_json/add.out +++ b/tests/specs/add/package_json_and_deno_json/add.out @@ -10,9 +10,11 @@ Initialize @denotest/esm-basic@1.0.0 Initialize @denotest/say-hello@1.0.0 Download http://127.0.0.1:4250/@denotest/add/1.0.0/mod.ts [UNORDERED_END] -Packages: 2 -++ -Resolved: 0, reused: 0, downloaded: 4, added: 2 +Installed 2 packages in [WILDLINE] +Reused 0 packages from cache +Downloaded 0 packages from JSR +Downloaded 4 packages from npm +++++ Dependencies: + npm:@denotest/esm-basic 1.0.0 diff --git a/tests/specs/add/package_json_and_deno_json/add_esm_basic.out b/tests/specs/add/package_json_and_deno_json/add_esm_basic.out index 7a2169f9d5..dd0e63272f 100644 --- a/tests/specs/add/package_json_and_deno_json/add_esm_basic.out +++ b/tests/specs/add/package_json_and_deno_json/add_esm_basic.out @@ -2,9 +2,11 @@ Add npm:@denotest/esm-basic@1.0.0 Download http://localhost:4260/@denotest%2fesm-basic Download http://localhost:4260/@denotest/esm-basic/1.0.0.tgz Initialize @denotest/esm-basic@1.0.0 -Packages: 1 -+ -Resolved: 0, reused: 0, downloaded: 2, added: 1 +Installed 1 package in [WILDLINE] +Reused 0 packages from cache +Downloaded 0 packages from JSR +Downloaded 2 packages from npm +++ Dependencies: + npm:@denotest/esm-basic 1.0.0 diff --git a/tests/specs/bench/package_json/install.out b/tests/specs/bench/package_json/install.out index bfc092c978..2015e259b3 100644 --- a/tests/specs/bench/package_json/install.out +++ b/tests/specs/bench/package_json/install.out @@ -1,9 +1,11 @@ Download http://localhost:4260/@denotest%2fesm-basic Download http://localhost:4260/@denotest/esm-basic/1.0.0.tgz Initialize @denotest/esm-basic@1.0.0 -Packages: [WILDLINE] -[WILDLINE] -Resolved: [WILDLINE], reused: [WILDLINE], downloaded: [WILDLINE], added: [WILDLINE] +Installed 1 package in [WILDLINE] +Reused 0 packages from cache +Downloaded 0 packages from JSR +Downloaded 2 packages from npm +++ Dependencies: [WILDCARD] diff --git a/tests/specs/check/package_json/install.out b/tests/specs/check/package_json/install.out index bfc092c978..2015e259b3 100644 --- a/tests/specs/check/package_json/install.out +++ b/tests/specs/check/package_json/install.out @@ -1,9 +1,11 @@ Download http://localhost:4260/@denotest%2fesm-basic Download http://localhost:4260/@denotest/esm-basic/1.0.0.tgz Initialize @denotest/esm-basic@1.0.0 -Packages: [WILDLINE] -[WILDLINE] -Resolved: [WILDLINE], reused: [WILDLINE], downloaded: [WILDLINE], added: [WILDLINE] +Installed 1 package in [WILDLINE] +Reused 0 packages from cache +Downloaded 0 packages from JSR +Downloaded 2 packages from npm +++ Dependencies: [WILDCARD] diff --git a/tests/specs/check/package_json_fail_check/install.out b/tests/specs/check/package_json_fail_check/install.out index bfc092c978..2015e259b3 100644 --- a/tests/specs/check/package_json_fail_check/install.out +++ b/tests/specs/check/package_json_fail_check/install.out @@ -1,9 +1,11 @@ Download http://localhost:4260/@denotest%2fesm-basic Download http://localhost:4260/@denotest/esm-basic/1.0.0.tgz Initialize @denotest/esm-basic@1.0.0 -Packages: [WILDLINE] -[WILDLINE] -Resolved: [WILDLINE], reused: [WILDLINE], downloaded: [WILDLINE], added: [WILDLINE] +Installed 1 package in [WILDLINE] +Reused 0 packages from cache +Downloaded 0 packages from JSR +Downloaded 2 packages from npm +++ Dependencies: [WILDCARD] diff --git a/tests/specs/check/package_json_with_deno_json/install.out b/tests/specs/check/package_json_with_deno_json/install.out index bfc092c978..2015e259b3 100644 --- a/tests/specs/check/package_json_with_deno_json/install.out +++ b/tests/specs/check/package_json_with_deno_json/install.out @@ -1,9 +1,11 @@ Download http://localhost:4260/@denotest%2fesm-basic Download http://localhost:4260/@denotest/esm-basic/1.0.0.tgz Initialize @denotest/esm-basic@1.0.0 -Packages: [WILDLINE] -[WILDLINE] -Resolved: [WILDLINE], reused: [WILDLINE], downloaded: [WILDLINE], added: [WILDLINE] +Installed 1 package in [WILDLINE] +Reused 0 packages from cache +Downloaded 0 packages from JSR +Downloaded 2 packages from npm +++ Dependencies: [WILDCARD] diff --git a/tests/specs/compile/npmrc_byonm/install.out b/tests/specs/compile/npmrc_byonm/install.out index e0e4ae7289..671c97c727 100644 --- a/tests/specs/compile/npmrc_byonm/install.out +++ b/tests/specs/compile/npmrc_byonm/install.out @@ -6,9 +6,11 @@ Download http://localhost:4262/@denotest2/basic/1.0.0.tgz Initialize @denotest2/basic@1.0.0 Initialize @denotest/basic@1.0.0 [UNORDERED_END] -Packages: [WILDLINE] -[WILDLINE] -Resolved: [WILDLINE], reused: [WILDLINE], downloaded: [WILDLINE], added: [WILDLINE] +Installed 2 packages in [WILDLINE] +Reused 0 packages from cache +Downloaded 0 packages from JSR +Downloaded 4 packages from npm +++++ Dependencies: [WILDCARD] diff --git a/tests/specs/future_install_node_modules/install.out b/tests/specs/future_install_node_modules/install.out index bfc092c978..2015e259b3 100644 --- a/tests/specs/future_install_node_modules/install.out +++ b/tests/specs/future_install_node_modules/install.out @@ -1,9 +1,11 @@ Download http://localhost:4260/@denotest%2fesm-basic Download http://localhost:4260/@denotest/esm-basic/1.0.0.tgz Initialize @denotest/esm-basic@1.0.0 -Packages: [WILDLINE] -[WILDLINE] -Resolved: [WILDLINE], reused: [WILDLINE], downloaded: [WILDLINE], added: [WILDLINE] +Installed 1 package in [WILDLINE] +Reused 0 packages from cache +Downloaded 0 packages from JSR +Downloaded 2 packages from npm +++ Dependencies: [WILDCARD] diff --git a/tests/specs/future_install_node_modules/install_lockfile.out b/tests/specs/future_install_node_modules/install_lockfile.out index aa682f99fc..e5df66ea4a 100644 --- a/tests/specs/future_install_node_modules/install_lockfile.out +++ b/tests/specs/future_install_node_modules/install_lockfile.out @@ -1,7 +1,9 @@ Initialize @denotest/esm-basic@1.0.0 -Packages: [WILDLINE] -[WILDLINE] -Resolved: [WILDLINE], reused: [WILDLINE], downloaded: [WILDLINE], added: [WILDLINE] +Installed 1 package in [WILDLINE] +Reused 1 package from cache ++ +Downloaded 0 packages from JSR +Downloaded 0 packages from npm Dependencies: [WILDCARD] diff --git a/tests/specs/info/package_json_basic/install.out b/tests/specs/info/package_json_basic/install.out index bfc092c978..2015e259b3 100644 --- a/tests/specs/info/package_json_basic/install.out +++ b/tests/specs/info/package_json_basic/install.out @@ -1,9 +1,11 @@ Download http://localhost:4260/@denotest%2fesm-basic Download http://localhost:4260/@denotest/esm-basic/1.0.0.tgz Initialize @denotest/esm-basic@1.0.0 -Packages: [WILDLINE] -[WILDLINE] -Resolved: [WILDLINE], reused: [WILDLINE], downloaded: [WILDLINE], added: [WILDLINE] +Installed 1 package in [WILDLINE] +Reused 0 packages from cache +Downloaded 0 packages from JSR +Downloaded 2 packages from npm +++ Dependencies: [WILDCARD] diff --git a/tests/specs/install/entrypoint_only_used_packages/install-entrypoint.out b/tests/specs/install/entrypoint_only_used_packages/install-entrypoint.out index c430abee8c..1d18e2caaf 100644 --- a/tests/specs/install/entrypoint_only_used_packages/install-entrypoint.out +++ b/tests/specs/install/entrypoint_only_used_packages/install-entrypoint.out @@ -4,9 +4,11 @@ Download http://localhost:4260/@denotest%2fsay-hello Download http://localhost:4260/@denotest/add/1.0.0.tgz [UNORDERED_END] Initialize @denotest/add@1.0.0 -Packages: 1 -+ -Resolved: 0, reused: 0, downloaded: 2, added: 1 +Installed 1 package in [WILDCARD]ms +Reused 0 packages from cache +Downloaded 0 packages from JSR +Downloaded 2 packages from npm +++ Dependencies: + npm:@denotest/add 1.0.0 diff --git a/tests/specs/install/entrypoint_only_used_packages/install.out b/tests/specs/install/entrypoint_only_used_packages/install.out index 2467403be1..4b063d4b63 100644 --- a/tests/specs/install/entrypoint_only_used_packages/install.out +++ b/tests/specs/install/entrypoint_only_used_packages/install.out @@ -1,8 +1,10 @@ Download http://localhost:4260/@denotest/say-hello/1.0.0.tgz Initialize @denotest/say-hello@1.0.0 -Packages: [WILDLINE] +Installed [WILDLINE] package in [WILDCARD]ms +Reused [WILDLINE] packages from cache +Downloaded [WILDLINE] packages from JSR +Downloaded [WILDLINE] packages from npm [WILDLINE] -Resolved: [WILDLINE], reused: [WILDLINE], downloaded: [WILDLINE], added: [WILDLINE] Dependencies: [WILDCARD] diff --git a/tests/specs/install/future_install_local_add_npm/install.out b/tests/specs/install/future_install_local_add_npm/install.out index 7a2169f9d5..759962bac9 100644 --- a/tests/specs/install/future_install_local_add_npm/install.out +++ b/tests/specs/install/future_install_local_add_npm/install.out @@ -2,9 +2,11 @@ Add npm:@denotest/esm-basic@1.0.0 Download http://localhost:4260/@denotest%2fesm-basic Download http://localhost:4260/@denotest/esm-basic/1.0.0.tgz Initialize @denotest/esm-basic@1.0.0 -Packages: 1 -+ -Resolved: 0, reused: 0, downloaded: 2, added: 1 +Installed 1 package in [WILDCARD]ms +Reused 0 packages from cache +Downloaded 0 packages from JSR +Downloaded 2 packages from npm +++ Dependencies: + npm:@denotest/esm-basic 1.0.0 diff --git a/tests/specs/install/future_install_node_modules/install.out b/tests/specs/install/future_install_node_modules/install.out index bfc092c978..78bfca210d 100644 --- a/tests/specs/install/future_install_node_modules/install.out +++ b/tests/specs/install/future_install_node_modules/install.out @@ -1,9 +1,11 @@ Download http://localhost:4260/@denotest%2fesm-basic Download http://localhost:4260/@denotest/esm-basic/1.0.0.tgz Initialize @denotest/esm-basic@1.0.0 -Packages: [WILDLINE] +Installed [WILDLINE] package in [WILDCARD]ms +Reused [WILDLINE] packages from cache +Downloaded [WILDLINE] packages from JSR +Downloaded [WILDLINE] packages from npm [WILDLINE] -Resolved: [WILDLINE], reused: [WILDLINE], downloaded: [WILDLINE], added: [WILDLINE] Dependencies: [WILDCARD] diff --git a/tests/specs/install/future_install_node_modules/install_lockfile.out b/tests/specs/install/future_install_node_modules/install_lockfile.out index aa682f99fc..8e2af6f098 100644 --- a/tests/specs/install/future_install_node_modules/install_lockfile.out +++ b/tests/specs/install/future_install_node_modules/install_lockfile.out @@ -1,7 +1,9 @@ Initialize @denotest/esm-basic@1.0.0 -Packages: [WILDLINE] -[WILDLINE] -Resolved: [WILDLINE], reused: [WILDLINE], downloaded: [WILDLINE], added: [WILDLINE] +Installed [WILDLINE] package in [WILDCARD]ms +Reused [WILDLINE] package from cache ++ +Downloaded [WILDLINE] packages from JSR +Downloaded [WILDLINE] packages from npm Dependencies: [WILDCARD] diff --git a/tests/specs/install/future_install_node_modules_tag/install.out b/tests/specs/install/future_install_node_modules_tag/install.out index 0342e8bdb2..0b57f45792 100644 --- a/tests/specs/install/future_install_node_modules_tag/install.out +++ b/tests/specs/install/future_install_node_modules_tag/install.out @@ -18,9 +18,11 @@ Initialize json-schema-traverse@1.0.0 Initialize uri-js@4.4.1 Initialize ajv@8.11.0 [UNORDERED_END] -Packages: [WILDLINE] +Installed [WILDLINE] packages in [WILDCARD]ms +Reused [WILDLINE] packages from cache +Downloaded [WILDLINE] packages from JSR +Downloaded [WILDLINE] packages from npm [WILDLINE] -Resolved: [WILDLINE], reused: [WILDLINE], downloaded: [WILDLINE], added: [WILDLINE] Dependencies: [WILDCARD] diff --git a/tests/specs/install/install_add_dep_existing/install.out b/tests/specs/install/install_add_dep_existing/install.out index 7a2169f9d5..759962bac9 100644 --- a/tests/specs/install/install_add_dep_existing/install.out +++ b/tests/specs/install/install_add_dep_existing/install.out @@ -2,9 +2,11 @@ Add npm:@denotest/esm-basic@1.0.0 Download http://localhost:4260/@denotest%2fesm-basic Download http://localhost:4260/@denotest/esm-basic/1.0.0.tgz Initialize @denotest/esm-basic@1.0.0 -Packages: 1 -+ -Resolved: 0, reused: 0, downloaded: 2, added: 1 +Installed 1 package in [WILDCARD]ms +Reused 0 packages from cache +Downloaded 0 packages from JSR +Downloaded 2 packages from npm +++ Dependencies: + npm:@denotest/esm-basic 1.0.0 diff --git a/tests/specs/install/install_add_dev/install.out b/tests/specs/install/install_add_dev/install.out index 1b51163fb3..7dc9964f5a 100644 --- a/tests/specs/install/install_add_dev/install.out +++ b/tests/specs/install/install_add_dev/install.out @@ -2,9 +2,10 @@ Add npm:@denotest/esm-basic@1.0.0 Download http://localhost:4260/@denotest%2fesm-basic Download http://localhost:4260/@denotest/esm-basic/1.0.0.tgz Initialize @denotest/esm-basic@1.0.0 -Packages: 1 -+ -Resolved: 0, reused: 0, downloaded: 2, added: 1 - +Installed 1 package in [WILDCARD]ms +Reused 0 packages from cache +Downloaded 0 packages from JSR +Downloaded 2 packages from npm +++ Dev dependencies: + npm:@denotest/esm-basic 1.0.0 diff --git a/tests/specs/install/install_add_dev_existing/install.out b/tests/specs/install/install_add_dev_existing/install.out index 1b51163fb3..7dc9964f5a 100644 --- a/tests/specs/install/install_add_dev_existing/install.out +++ b/tests/specs/install/install_add_dev_existing/install.out @@ -2,9 +2,10 @@ Add npm:@denotest/esm-basic@1.0.0 Download http://localhost:4260/@denotest%2fesm-basic Download http://localhost:4260/@denotest/esm-basic/1.0.0.tgz Initialize @denotest/esm-basic@1.0.0 -Packages: 1 -+ -Resolved: 0, reused: 0, downloaded: 2, added: 1 - +Installed 1 package in [WILDCARD]ms +Reused 0 packages from cache +Downloaded 0 packages from JSR +Downloaded 2 packages from npm +++ Dev dependencies: + npm:@denotest/esm-basic 1.0.0 diff --git a/tests/specs/install/install_deprecated_package/install.out b/tests/specs/install/install_deprecated_package/install.out index 4f45eb3f87..124f803c3b 100644 --- a/tests/specs/install/install_deprecated_package/install.out +++ b/tests/specs/install/install_deprecated_package/install.out @@ -2,9 +2,11 @@ Add npm:@denotest/deprecated-package@1.0.0 Download http://localhost:4260/@denotest%2fdeprecated-package Download http://localhost:4260/@denotest/deprecated-package/1.0.0.tgz Initialize @denotest/deprecated-package@1.0.0 -Packages: 1 -+ -Resolved: 0, reused: 0, downloaded: 2, added: 1 +Installed 1 package in [WILDCARD]ms +Reused 0 packages from cache +Downloaded 0 packages from JSR +Downloaded 2 packages from npm +++ Dependencies: + npm:@denotest/deprecated-package 1.0.0 diff --git a/tests/specs/install/install_entrypoint/lifecycle.out b/tests/specs/install/install_entrypoint/lifecycle.out index 65a488bba6..d594a48ed1 100644 --- a/tests/specs/install/install_entrypoint/lifecycle.out +++ b/tests/specs/install/install_entrypoint/lifecycle.out @@ -9,9 +9,11 @@ Initialize @denotest/node-lifecycle-scripts@1.0.0: running 'preinstall' script Initialize @denotest/node-lifecycle-scripts@1.0.0: running 'install' script Initialize @denotest/node-lifecycle-scripts@1.0.0: running 'postinstall' script [UNORDERED_END] -Packages: 2 -++ -Resolved: 1, reused: 0, downloaded: 4, added: 2 +Installed 2 packages in [WILDCARD] +Reused 0 packages from cache +Downloaded 0 packages from JSR +Downloaded 4 packages from npm +++++ Dependencies: + npm:@denotest/node-lifecycle-scripts 1.0.0 diff --git a/tests/specs/install/invalid_scheme/install.out b/tests/specs/install/invalid_scheme/install.out index f4f43801c3..e73926288b 100644 --- a/tests/specs/install/invalid_scheme/install.out +++ b/tests/specs/install/invalid_scheme/install.out @@ -5,9 +5,11 @@ Warning Not implemented scheme 'git' Download http://localhost:4260/@denotest%2fadd Download http://localhost:4260/@denotest/add/1.0.0.tgz Initialize @denotest/add@1.0.0 -Packages: [WILDLINE] +Installed [WILDLINE] package in [WILDCARD]ms +Reused [WILDLINE] packages from cache +Downloaded [WILDLINE] packages from JSR +Downloaded [WILDLINE] packages from npm [WILDLINE] -Resolved: [WILDLINE], reused: [WILDLINE], downloaded: [WILDLINE], added: [WILDLINE] Dependencies: [WILDCARD] diff --git a/tests/specs/install/non_existent_optional_peer/install.out b/tests/specs/install/non_existent_optional_peer/install.out index a47393de2e..f5c6bef393 100644 --- a/tests/specs/install/non_existent_optional_peer/install.out +++ b/tests/specs/install/non_existent_optional_peer/install.out @@ -4,9 +4,11 @@ Download http://localhost:4260/uWebSockets.js Download http://localhost:4260/@denotest/non-existent-optional-peer/1.0.0.tgz [UNORDERED_END] Initialize @denotest/non-existent-optional-peer@1.0.0 -Packages: [WILDLINE] +Installed [WILDLINE] package in [WILDCARD]ms +Reused [WILDLINE] packages from cache +Downloaded [WILDLINE] packages from JSR +Downloaded [WILDLINE] packages from npm [WILDLINE] -Resolved: [WILDLINE], reused: [WILDLINE], downloaded: [WILDLINE], added: [WILDLINE] Dependencies: [WILDCARD] diff --git a/tests/specs/install/packagejson_missing_extra/missingbin.out b/tests/specs/install/packagejson_missing_extra/missingbin.out index 53968f2d6a..19d85755c4 100644 --- a/tests/specs/install/packagejson_missing_extra/missingbin.out +++ b/tests/specs/install/packagejson_missing_extra/missingbin.out @@ -2,9 +2,11 @@ Add npm:denotest-packagejson-missing-info@1.0.0-missingbin Download http://localhost:4260/denotest-packagejson-missing-info Download http://localhost:4260/denotest-packagejson-missing-info/denotest-packagejson-missing-info-1.0.0-missingbin.tgz Initialize denotest-packagejson-missing-info@1.0.0-missingbin -Packages: 1 -+ -Resolved: 0, reused: 0, downloaded: 2, added: 1 +Installed 1 package in [WILDCARD]ms +Reused 0 packages from cache +Downloaded 0 packages from JSR +Downloaded 2 packages from npm +++ Dependencies: + npm:denotest-packagejson-missing-info 1.0.0-missingbin diff --git a/tests/specs/install/packagejson_missing_extra/missingdeprecated.out b/tests/specs/install/packagejson_missing_extra/missingdeprecated.out index dd5a20dc02..c306b7dbeb 100644 --- a/tests/specs/install/packagejson_missing_extra/missingdeprecated.out +++ b/tests/specs/install/packagejson_missing_extra/missingdeprecated.out @@ -2,9 +2,11 @@ Add npm:denotest-packagejson-missing-info@0.2.5-missingdeprecated Download http://localhost:4260/denotest-packagejson-missing-info Download http://localhost:4260/denotest-packagejson-missing-info/denotest-packagejson-missing-info-0.2.5-missingdeprecated.tgz Initialize denotest-packagejson-missing-info@0.2.5-missingdeprecated -Packages: 1 -+ -Resolved: 0, reused: 0, downloaded: 2, added: 1 +Installed 1 package in [WILDCARD]ms +Reused 0 packages from cache +Downloaded 0 packages from JSR +Downloaded 2 packages from npm +++ Dependencies: + npm:denotest-packagejson-missing-info 0.2.5-missingdeprecated diff --git a/tests/specs/install/packagejson_missing_extra/missingscripts.out b/tests/specs/install/packagejson_missing_extra/missingscripts.out index bcb3a47660..9c594d0135 100644 --- a/tests/specs/install/packagejson_missing_extra/missingscripts.out +++ b/tests/specs/install/packagejson_missing_extra/missingscripts.out @@ -2,9 +2,11 @@ Add npm:denotest-packagejson-missing-info@0.5.0-missingscripts Download http://localhost:4260/denotest-packagejson-missing-info Download http://localhost:4260/denotest-packagejson-missing-info/denotest-packagejson-missing-info-0.5.0-missingscripts.tgz Initialize denotest-packagejson-missing-info@0.5.0-missingscripts -Packages: 1 -+ -Resolved: 0, reused: 0, downloaded: 2, added: 1 +Installed 1 package in [WILDCARD]ms +Reused 0 packages from cache +Downloaded 0 packages from JSR +Downloaded 2 packages from npm +++ Dependencies: + npm:denotest-packagejson-missing-info 0.5.0-missingscripts diff --git a/tests/specs/install/peer_dep_specific_constraint/install.out b/tests/specs/install/peer_dep_specific_constraint/install.out index 4577d1f9a6..2661b5d4b5 100644 --- a/tests/specs/install/peer_dep_specific_constraint/install.out +++ b/tests/specs/install/peer_dep_specific_constraint/install.out @@ -10,9 +10,11 @@ Download http://localhost:4260/@denotest/add/1.0.0.tgz Initialize @denotest/peer-dep-specific-constraint@1.0.0 Initialize @denotest/add@1.0.0 [UNORDERED_END] -Packages: [WILDLINE] +Installed [WILDLINE] packages in [WILDCARD]ms +Reused [WILDLINE] packages from cache +Downloaded [WILDLINE] packages from JSR +Downloaded [WILDLINE] packages from npm [WILDLINE] -Resolved: [WILDLINE], reused: [WILDLINE], downloaded: [WILDLINE], added: [WILDLINE] Dependencies: [WILDCARD] diff --git a/tests/specs/install/scripts_install_launch_cjs_temp_dir/output.out b/tests/specs/install/scripts_install_launch_cjs_temp_dir/output.out index d1f4ae9faa..1afd5d9036 100644 --- a/tests/specs/install/scripts_install_launch_cjs_temp_dir/output.out +++ b/tests/specs/install/scripts_install_launch_cjs_temp_dir/output.out @@ -2,9 +2,11 @@ Download http://localhost:4260/@denotest%2finstall-launch-cjs-temp-dir Download http://localhost:4260/@denotest/install-launch-cjs-temp-dir/1.0.0.tgz Initialize @denotest/install-launch-cjs-temp-dir@1.0.0 Initialize @denotest/install-launch-cjs-temp-dir@1.0.0: running 'install' script -Packages: [WILDLINE] +Installed [WILDLINE] package in [WILDCARD]ms +Reused [WILDLINE] packages from cache +Downloaded [WILDLINE] packages from JSR +Downloaded [WILDLINE] packages from npm [WILDLINE] -Resolved: [WILDLINE], reused: [WILDLINE], downloaded: [WILDLINE], added: [WILDLINE] Dependencies: [WILDCARD] diff --git a/tests/specs/install/scripts_install_no_ext/output.out b/tests/specs/install/scripts_install_no_ext/output.out index eecb7f87a9..90a8c89a6a 100644 --- a/tests/specs/install/scripts_install_no_ext/output.out +++ b/tests/specs/install/scripts_install_no_ext/output.out @@ -2,9 +2,11 @@ Download http://localhost:4260/@denotest%2finstall-no-ext Download http://localhost:4260/@denotest/install-no-ext/1.0.0.tgz Initialize @denotest/install-no-ext@1.0.0 Initialize @denotest/install-no-ext@1.0.0: running 'install' script -Packages: [WILDLINE] +Installed [WILDLINE] package in [WILDCARD]ms +Reused [WILDLINE] packages from cache +Downloaded [WILDLINE] packages from JSR +Downloaded [WILDLINE] packages from npm [WILDLINE] -Resolved: [WILDLINE], reused: [WILDLINE], downloaded: [WILDLINE], added: [WILDLINE] Dependencies: [WILDCARD] diff --git a/tests/specs/install/workspace_member_with_tag_dep/install.out b/tests/specs/install/workspace_member_with_tag_dep/install.out index bfc092c978..78bfca210d 100644 --- a/tests/specs/install/workspace_member_with_tag_dep/install.out +++ b/tests/specs/install/workspace_member_with_tag_dep/install.out @@ -1,9 +1,11 @@ Download http://localhost:4260/@denotest%2fesm-basic Download http://localhost:4260/@denotest/esm-basic/1.0.0.tgz Initialize @denotest/esm-basic@1.0.0 -Packages: [WILDLINE] +Installed [WILDLINE] package in [WILDCARD]ms +Reused [WILDLINE] packages from cache +Downloaded [WILDLINE] packages from JSR +Downloaded [WILDLINE] packages from npm [WILDLINE] -Resolved: [WILDLINE], reused: [WILDLINE], downloaded: [WILDLINE], added: [WILDLINE] Dependencies: [WILDCARD] diff --git a/tests/specs/install/workspace_node_modules_not_exists/install.out b/tests/specs/install/workspace_node_modules_not_exists/install.out index b2592d17be..1cba5ebf46 100644 --- a/tests/specs/install/workspace_node_modules_not_exists/install.out +++ b/tests/specs/install/workspace_node_modules_not_exists/install.out @@ -20,9 +20,11 @@ Initialize color-convert@2.0.1 Initialize has-flag@4.0.0 Initialize chalk@5.0.1 [UNORDERED_END] -Packages: [WILDLINE] +Installed [WILDLINE] packages in [WILDCARD]ms +Reused [WILDLINE] packages from cache +Downloaded [WILDLINE] packages from JSR +Downloaded [WILDLINE] packages from npm [WILDLINE] -Resolved: [WILDLINE], reused: [WILDLINE], downloaded: [WILDLINE], added: [WILDLINE] Dependencies: [WILDCARD] diff --git a/tests/specs/lockfile/frozen_lockfile/update_lockfile.out b/tests/specs/lockfile/frozen_lockfile/update_lockfile.out index 05123911d8..7a36aa335e 100644 --- a/tests/specs/lockfile/frozen_lockfile/update_lockfile.out +++ b/tests/specs/lockfile/frozen_lockfile/update_lockfile.out @@ -1,8 +1,10 @@ Download http://localhost:4260/@denotest/subtract/1.0.0.tgz Initialize @denotest/subtract@1.0.0 -Packages: 1 -+ -Resolved: 0, reused: 0, downloaded: 2, added: 1 +Installed 1 package in [WILDLINE] +Reused 0 packages from cache +Downloaded 0 packages from JSR +Downloaded 2 packages from npm +++ Dependencies: + npm:@denotest/subtract 1.0.0 diff --git a/tests/specs/lockfile/only_package_json/install.out b/tests/specs/lockfile/only_package_json/install.out index bfc092c978..2015e259b3 100644 --- a/tests/specs/lockfile/only_package_json/install.out +++ b/tests/specs/lockfile/only_package_json/install.out @@ -1,9 +1,11 @@ Download http://localhost:4260/@denotest%2fesm-basic Download http://localhost:4260/@denotest/esm-basic/1.0.0.tgz Initialize @denotest/esm-basic@1.0.0 -Packages: [WILDLINE] -[WILDLINE] -Resolved: [WILDLINE], reused: [WILDLINE], downloaded: [WILDLINE], added: [WILDLINE] +Installed 1 package in [WILDLINE] +Reused 0 packages from cache +Downloaded 0 packages from JSR +Downloaded 2 packages from npm +++ Dependencies: [WILDCARD] diff --git a/tests/specs/npm/bin_entries_prefer_closer/install.out b/tests/specs/npm/bin_entries_prefer_closer/install.out index cae832bc78..02c2f5abba 100644 --- a/tests/specs/npm/bin_entries_prefer_closer/install.out +++ b/tests/specs/npm/bin_entries_prefer_closer/install.out @@ -8,9 +8,11 @@ Initialize @denotest/transitive-bin@1.0.0 Initialize @denotest/bin@1.0.0 Initialize @denotest/bin@0.7.0 [UNORDERED_END] -Packages: [WILDLINE] +Installed [WILDLINE] packages in [WILDCARD]ms +Reused [WILDLINE] packages from cache +Downloaded [WILDLINE] packages from JSR +Downloaded [WILDLINE] packages from npm [WILDLINE] -Resolved: [WILDLINE], reused: [WILDLINE], downloaded: [WILDLINE], added: [WILDLINE] Dependencies: [WILDCARD] diff --git a/tests/specs/npm/bin_entry_created_by_lifecycle/all_at_once_install.out b/tests/specs/npm/bin_entry_created_by_lifecycle/all_at_once_install.out index dc599b807f..fd292412be 100644 --- a/tests/specs/npm/bin_entry_created_by_lifecycle/all_at_once_install.out +++ b/tests/specs/npm/bin_entry_created_by_lifecycle/all_at_once_install.out @@ -2,9 +2,11 @@ Download http://localhost:4260/@denotest%2fbin-created-by-lifecycle Download http://localhost:4260/@denotest/bin-created-by-lifecycle/1.0.0.tgz Initialize @denotest/bin-created-by-lifecycle@1.0.0 Initialize @denotest/bin-created-by-lifecycle@1.0.0: running 'install' script -Packages: [WILDLINE] +Installed [WILDLINE] package in [WILDCARD]ms +Reused [WILDLINE] packages from cache +Downloaded [WILDLINE] packages from JSR +Downloaded [WILDLINE] packages from npm [WILDLINE] -Resolved: [WILDLINE], reused: [WILDLINE], downloaded: [WILDLINE], added: [WILDLINE] Dependencies: [WILDCARD] diff --git a/tests/specs/npm/bin_entry_created_by_lifecycle/install_warn.out b/tests/specs/npm/bin_entry_created_by_lifecycle/install_warn.out index 45361d3466..87d63302ed 100644 --- a/tests/specs/npm/bin_entry_created_by_lifecycle/install_warn.out +++ b/tests/specs/npm/bin_entry_created_by_lifecycle/install_warn.out @@ -2,9 +2,11 @@ Download http://localhost:4260/@denotest%2fbin-created-by-lifecycle Download http://localhost:4260/@denotest/bin-created-by-lifecycle/1.0.0.tgz Initialize @denotest/bin-created-by-lifecycle@1.0.0 Warning Trying to set up 'testbin' bin for "[WILDCARD]bin-created-by-lifecycle", but the entry point "[WILDCARD]testbin.js" doesn't exist. -Packages: [WILDLINE] +Installed [WILDLINE] package in [WILDCARD]ms +Reused [WILDLINE] packages from cache +Downloaded [WILDLINE] packages from JSR +Downloaded [WILDLINE] packages from npm [WILDLINE] -Resolved: [WILDLINE], reused: [WILDLINE], downloaded: [WILDLINE], added: [WILDLINE] Dependencies: [WILDCARD] diff --git a/tests/specs/npm/bin_entry_created_by_lifecycle/install_warn_windows.out b/tests/specs/npm/bin_entry_created_by_lifecycle/install_warn_windows.out index 91c0cf098e..6587db039b 100644 --- a/tests/specs/npm/bin_entry_created_by_lifecycle/install_warn_windows.out +++ b/tests/specs/npm/bin_entry_created_by_lifecycle/install_warn_windows.out @@ -1,9 +1,11 @@ Download http://localhost:4260/@denotest%2fbin-created-by-lifecycle Download http://localhost:4260/@denotest/bin-created-by-lifecycle/1.0.0.tgz Initialize @denotest/bin-created-by-lifecycle@1.0.0 -Packages: [WILDLINE] +Installed [WILDLINE] package in [WILDCARD]ms +Reused [WILDLINE] packages from cache +Downloaded [WILDLINE] packages from JSR +Downloaded [WILDLINE] packages from npm [WILDLINE] -Resolved: [WILDLINE], reused: [WILDLINE], downloaded: [WILDLINE], added: [WILDLINE] Dependencies: [WILDCARD] diff --git a/tests/specs/npm/bundle_dependencies/install.out b/tests/specs/npm/bundle_dependencies/install.out index 8f9fa96baa..d7c79008ac 100644 --- a/tests/specs/npm/bundle_dependencies/install.out +++ b/tests/specs/npm/bundle_dependencies/install.out @@ -1,3 +1,6 @@ [WILDCARD] -Packages: 1 +Installed 1 package in [WILDCARD]ms +Reused [WILDCARD] packages from cache +Downloaded [WILDCARD] packages from JSR +Downloaded [WILDCARD] packages from npm [WILDCARD] diff --git a/tests/specs/npm/lifecycle_scripts/conflicting_bin.out b/tests/specs/npm/lifecycle_scripts/conflicting_bin.out index c87ba476de..f15bda1633 100644 --- a/tests/specs/npm/lifecycle_scripts/conflicting_bin.out +++ b/tests/specs/npm/lifecycle_scripts/conflicting_bin.out @@ -10,9 +10,11 @@ Initialize @denotest/say-hello-on-install@1.0.0 Initialize @denotest/say-hello@1.0.0 Initialize @denotest/say-hello-on-install@1.0.0: running 'install' script [UNORDERED_END] -Packages: 3 -+++ -Resolved: 1, reused: 0, downloaded: 6, added: 3 +Installed 3 packages in [WILDCARD]ms +Reused 0 packages from cache +Downloaded 0 packages from JSR +Downloaded 6 packages from npm +++++++ Dependencies: + npm:@denotest/better-say-hello 1.0.0 diff --git a/tests/specs/npm/lifecycle_scripts/fsevents.out b/tests/specs/npm/lifecycle_scripts/fsevents.out index 1f047c2653..57de10a1d1 100644 --- a/tests/specs/npm/lifecycle_scripts/fsevents.out +++ b/tests/specs/npm/lifecycle_scripts/fsevents.out @@ -1,9 +1,11 @@ Download http://localhost:4260/fsevents Download http://localhost:4260/fsevents/fsevents-2.3.3.tgz Initialize fsevents@2.3.3 -Packages: 1 -+ -Resolved: 0, reused: 0, downloaded: 2, added: 1 +Installed 1 package in [WILDCARD]ms +Reused 0 packages from cache +Downloaded 0 packages from JSR +Downloaded 2 packages from npm +++ Dependencies: + npm:fsevents 2.3.3 diff --git a/tests/specs/npm/lifecycle_scripts/future_install_all_lifecycles_not_run.out b/tests/specs/npm/lifecycle_scripts/future_install_all_lifecycles_not_run.out index 568bc5f1d7..6198790cd3 100644 --- a/tests/specs/npm/lifecycle_scripts/future_install_all_lifecycles_not_run.out +++ b/tests/specs/npm/lifecycle_scripts/future_install_all_lifecycles_not_run.out @@ -6,9 +6,11 @@ Download http://localhost:4260/@denotest/bin/1.0.0.tgz Initialize @denotest/node-lifecycle-scripts@1.0.0 Initialize @denotest/bin@1.0.0 [UNORDERED_END] -Packages: [WILDLINE] +Installed [WILDLINE] packages in [WILDCARD]ms +Reused [WILDLINE] packages from cache +Downloaded [WILDLINE] packages from JSR +Downloaded [WILDLINE] packages from npm [WILDLINE] -Resolved: [WILDLINE], reused: [WILDLINE], downloaded: [WILDLINE], added: [WILDLINE] Dependencies: [WILDCARD] diff --git a/tests/specs/npm/lifecycle_scripts/no_deno_json.out b/tests/specs/npm/lifecycle_scripts/no_deno_json.out index 9d6a6844b0..06bd46c59f 100644 --- a/tests/specs/npm/lifecycle_scripts/no_deno_json.out +++ b/tests/specs/npm/lifecycle_scripts/no_deno_json.out @@ -8,9 +8,11 @@ Initialize @denotest/bin@1.0.0 Initialize @denotest/lifecycle-scripts-cjs@1.0.0: running 'preinstall' script Initialize @denotest/lifecycle-scripts-cjs@1.0.0: running 'install' script [UNORDERED_END] -Packages: 2 -++ -Resolved: 1, reused: 0, downloaded: 4, added: 2 +Installed 2 packages in [WILDCARD]ms +Reused 0 packages from cache +Downloaded 0 packages from JSR +Downloaded 4 packages from npm +++++ Dependencies: + npm:@denotest/lifecycle-scripts-cjs 1.0.0 diff --git a/tests/specs/npm/local_dir_resolves_symlinks/install.out b/tests/specs/npm/local_dir_resolves_symlinks/install.out index 6833ab30ec..890c061b9a 100644 --- a/tests/specs/npm/local_dir_resolves_symlinks/install.out +++ b/tests/specs/npm/local_dir_resolves_symlinks/install.out @@ -21,9 +21,11 @@ Initialize get-intrinsic@1.2.0 Initialize function-bind@1.1.1 Initialize has-symbols@1.0.3 [UNORDERED_END] -Packages: [WILDLINE] +Installed [WILDLINE] packages in [WILDCARD]ms +Reused [WILDLINE] packages from cache +Downloaded [WILDLINE] packages from JSR +Downloaded [WILDLINE] packages from npm [WILDLINE] -Resolved: [WILDLINE], reused: [WILDLINE], downloaded: [WILDLINE], added: [WILDLINE] Dependencies: [WILDCARD] diff --git a/tests/specs/npm/node_modules_import/install.out b/tests/specs/npm/node_modules_import/install.out index bfc092c978..78bfca210d 100644 --- a/tests/specs/npm/node_modules_import/install.out +++ b/tests/specs/npm/node_modules_import/install.out @@ -1,9 +1,11 @@ Download http://localhost:4260/@denotest%2fesm-basic Download http://localhost:4260/@denotest/esm-basic/1.0.0.tgz Initialize @denotest/esm-basic@1.0.0 -Packages: [WILDLINE] +Installed [WILDLINE] package in [WILDCARD]ms +Reused [WILDLINE] packages from cache +Downloaded [WILDLINE] packages from JSR +Downloaded [WILDLINE] packages from npm [WILDLINE] -Resolved: [WILDLINE], reused: [WILDLINE], downloaded: [WILDLINE], added: [WILDLINE] Dependencies: [WILDCARD] diff --git a/tests/specs/npm/npmrc/install.out b/tests/specs/npm/npmrc/install.out index e0e4ae7289..f1efaacf9f 100644 --- a/tests/specs/npm/npmrc/install.out +++ b/tests/specs/npm/npmrc/install.out @@ -6,9 +6,11 @@ Download http://localhost:4262/@denotest2/basic/1.0.0.tgz Initialize @denotest2/basic@1.0.0 Initialize @denotest/basic@1.0.0 [UNORDERED_END] -Packages: [WILDLINE] +Installed [WILDLINE] packages in [WILDCARD]ms +Reused [WILDLINE] packages from cache +Downloaded [WILDLINE] packages from JSR +Downloaded [WILDLINE] packages from npm [WILDLINE] -Resolved: [WILDLINE], reused: [WILDLINE], downloaded: [WILDLINE], added: [WILDLINE] Dependencies: [WILDCARD] diff --git a/tests/specs/npm/npmrc_basic_auth/install.out b/tests/specs/npm/npmrc_basic_auth/install.out index e0e4ae7289..f1efaacf9f 100644 --- a/tests/specs/npm/npmrc_basic_auth/install.out +++ b/tests/specs/npm/npmrc_basic_auth/install.out @@ -6,9 +6,11 @@ Download http://localhost:4262/@denotest2/basic/1.0.0.tgz Initialize @denotest2/basic@1.0.0 Initialize @denotest/basic@1.0.0 [UNORDERED_END] -Packages: [WILDLINE] +Installed [WILDLINE] packages in [WILDCARD]ms +Reused [WILDLINE] packages from cache +Downloaded [WILDLINE] packages from JSR +Downloaded [WILDLINE] packages from npm [WILDLINE] -Resolved: [WILDLINE], reused: [WILDLINE], downloaded: [WILDLINE], added: [WILDLINE] Dependencies: [WILDCARD] diff --git a/tests/specs/npm/npmrc_homedir/install.out b/tests/specs/npm/npmrc_homedir/install.out index e0e4ae7289..f1efaacf9f 100644 --- a/tests/specs/npm/npmrc_homedir/install.out +++ b/tests/specs/npm/npmrc_homedir/install.out @@ -6,9 +6,11 @@ Download http://localhost:4262/@denotest2/basic/1.0.0.tgz Initialize @denotest2/basic@1.0.0 Initialize @denotest/basic@1.0.0 [UNORDERED_END] -Packages: [WILDLINE] +Installed [WILDLINE] packages in [WILDCARD]ms +Reused [WILDLINE] packages from cache +Downloaded [WILDLINE] packages from JSR +Downloaded [WILDLINE] packages from npm [WILDLINE] -Resolved: [WILDLINE], reused: [WILDLINE], downloaded: [WILDLINE], added: [WILDLINE] Dependencies: [WILDCARD] diff --git a/tests/specs/npm/npmrc_homedir_package_both/install.out b/tests/specs/npm/npmrc_homedir_package_both/install.out index b01fa91347..6709aea0dc 100644 --- a/tests/specs/npm/npmrc_homedir_package_both/install.out +++ b/tests/specs/npm/npmrc_homedir_package_both/install.out @@ -6,9 +6,11 @@ Download http://localhost:4261/@denotest/basic/1.0.0.tgz Initialize @denotest2/basic@1.0.0 Initialize @denotest/basic@1.0.0 [UNORDERED_END] -Packages: [WILDLINE] +Installed [WILDLINE] packages in [WILDCARD]ms +Reused [WILDLINE] packages from cache +Downloaded [WILDLINE] packages from JSR +Downloaded [WILDLINE] packages from npm [WILDLINE] -Resolved: [WILDLINE], reused: [WILDLINE], downloaded: [WILDLINE], added: [WILDLINE] Dependencies: [WILDCARD] diff --git a/tests/specs/npm/npmrc_install_arg/add.out b/tests/specs/npm/npmrc_install_arg/add.out index 6d912c0a80..a0a8eff828 100644 --- a/tests/specs/npm/npmrc_install_arg/add.out +++ b/tests/specs/npm/npmrc_install_arg/add.out @@ -2,9 +2,11 @@ Add npm:@denotest/basic@1.0.0 Download http://localhost:4261/@denotest%2fbasic Download http://localhost:4261/@denotest/basic/1.0.0.tgz Initialize @denotest/basic@1.0.0 -Packages: 1 -+ -Resolved: 0, reused: 0, downloaded: 2, added: 1 +Installed 1 package in [WILDCARD]ms +Reused 0 packages from cache +Downloaded 0 packages from JSR +Downloaded 2 packages from npm +++ Dependencies: + npm:@denotest/basic 1.0.0 diff --git a/tests/specs/npm/npmrc_install_arg/install.out b/tests/specs/npm/npmrc_install_arg/install.out index 6d912c0a80..a0a8eff828 100644 --- a/tests/specs/npm/npmrc_install_arg/install.out +++ b/tests/specs/npm/npmrc_install_arg/install.out @@ -2,9 +2,11 @@ Add npm:@denotest/basic@1.0.0 Download http://localhost:4261/@denotest%2fbasic Download http://localhost:4261/@denotest/basic/1.0.0.tgz Initialize @denotest/basic@1.0.0 -Packages: 1 -+ -Resolved: 0, reused: 0, downloaded: 2, added: 1 +Installed 1 package in [WILDCARD]ms +Reused 0 packages from cache +Downloaded 0 packages from JSR +Downloaded 2 packages from npm +++ Dependencies: + npm:@denotest/basic 1.0.0 diff --git a/tests/specs/npm/npmrc_no_auth/add.out b/tests/specs/npm/npmrc_no_auth/add.out index 8c026ea9bc..d28f2197d0 100644 --- a/tests/specs/npm/npmrc_no_auth/add.out +++ b/tests/specs/npm/npmrc_no_auth/add.out @@ -2,9 +2,11 @@ Add npm:@denotest3/basic@1.0.0 Download http://localhost:4263/@denotest3%2fbasic Download http://localhost:4263/@denotest3/basic/1.0.0.tgz Initialize @denotest3/basic@1.0.0 -Packages: 1 -+ -Resolved: 0, reused: 0, downloaded: 2, added: 1 +Installed 1 package in [WILDCARD]ms +Reused 0 packages from cache +Downloaded 0 packages from JSR +Downloaded 2 packages from npm +++ Dependencies: + npm:@denotest3/basic 1.0.0 diff --git a/tests/specs/npm/npmrc_no_auth/install.out b/tests/specs/npm/npmrc_no_auth/install.out index 8c026ea9bc..d28f2197d0 100644 --- a/tests/specs/npm/npmrc_no_auth/install.out +++ b/tests/specs/npm/npmrc_no_auth/install.out @@ -2,9 +2,11 @@ Add npm:@denotest3/basic@1.0.0 Download http://localhost:4263/@denotest3%2fbasic Download http://localhost:4263/@denotest3/basic/1.0.0.tgz Initialize @denotest3/basic@1.0.0 -Packages: 1 -+ -Resolved: 0, reused: 0, downloaded: 2, added: 1 +Installed 1 package in [WILDCARD]ms +Reused 0 packages from cache +Downloaded 0 packages from JSR +Downloaded 2 packages from npm +++ Dependencies: + npm:@denotest3/basic 1.0.0 diff --git a/tests/specs/npm/npmrc_no_auth_install/install.out b/tests/specs/npm/npmrc_no_auth_install/install.out index 64ceac904c..ad89f8b1e4 100644 --- a/tests/specs/npm/npmrc_no_auth_install/install.out +++ b/tests/specs/npm/npmrc_no_auth_install/install.out @@ -1,9 +1,11 @@ Download http://localhost:4263/@denotest3%2fbasic Download http://localhost:4263/@denotest3/basic/1.0.0.tgz Initialize @denotest3/basic@1.0.0 -Packages: [WILDLINE] +Installed [WILDLINE] package in [WILDCARD]ms +Reused [WILDLINE] packages from cache +Downloaded [WILDLINE] packages from JSR +Downloaded [WILDLINE] packages from npm [WILDLINE] -Resolved: [WILDLINE], reused: [WILDLINE], downloaded: [WILDLINE], added: [WILDLINE] Dependencies: [WILDCARD] diff --git a/tests/specs/npm/npmrc_not_next_to_package_json/main.out b/tests/specs/npm/npmrc_not_next_to_package_json/main.out index 665c1d6e00..470c96e8b7 100644 --- a/tests/specs/npm/npmrc_not_next_to_package_json/main.out +++ b/tests/specs/npm/npmrc_not_next_to_package_json/main.out @@ -4,9 +4,11 @@ [WILDCARD]Download http://localhost:4260/@denotest%2fesm-basic [WILDCARD]Download http://localhost:4260/@denotest/esm-basic/1.0.0.tgz [WILDCARD]Initialize @denotest/esm-basic@1.0.0 -Packages: [WILDLINE] +Installed [WILDLINE] package in [WILDCARD]ms +Reused [WILDLINE] packages from cache +Downloaded [WILDLINE] packages from JSR +Downloaded [WILDLINE] packages from npm [WILDLINE] -Resolved: [WILDLINE], reused: [WILDLINE], downloaded: [WILDLINE], added: [WILDLINE] Dependencies: [WILDCARD] diff --git a/tests/specs/npm/npmrc_username_password/install.out b/tests/specs/npm/npmrc_username_password/install.out index e0e4ae7289..f1efaacf9f 100644 --- a/tests/specs/npm/npmrc_username_password/install.out +++ b/tests/specs/npm/npmrc_username_password/install.out @@ -6,9 +6,11 @@ Download http://localhost:4262/@denotest2/basic/1.0.0.tgz Initialize @denotest2/basic@1.0.0 Initialize @denotest/basic@1.0.0 [UNORDERED_END] -Packages: [WILDLINE] +Installed [WILDLINE] packages in [WILDCARD]ms +Reused [WILDLINE] packages from cache +Downloaded [WILDLINE] packages from JSR +Downloaded [WILDLINE] packages from npm [WILDLINE] -Resolved: [WILDLINE], reused: [WILDLINE], downloaded: [WILDLINE], added: [WILDLINE] Dependencies: [WILDCARD] diff --git a/tests/specs/run/no_deno_json/code/install.out b/tests/specs/run/no_deno_json/code/install.out index d5ae71e38d..47093fa409 100644 --- a/tests/specs/run/no_deno_json/code/install.out +++ b/tests/specs/run/no_deno_json/code/install.out @@ -24,9 +24,11 @@ Initialize color-convert@2.0.1 Initialize chalk@4.1.2 Initialize @denotest/check-error@1.0.0 [UNORDERED_END] -Packages: [WILDLINE] -[WILDLINE] -Resolved: [WILDLINE], reused: [WILDLINE], downloaded: [WILDLINE], added: [WILDLINE] +Installed 8 packages in [WILDLINE] +Reused 0 packages from cache +Downloaded 0 packages from JSR +Downloaded 16 packages from npm +++++++++++++++++ Dependencies: [WILDCARD] diff --git a/tests/specs/run/workspaces/explicit_import_map/install.out b/tests/specs/run/workspaces/explicit_import_map/install.out index 5b751fa777..f475c6c82a 100644 --- a/tests/specs/run/workspaces/explicit_import_map/install.out +++ b/tests/specs/run/workspaces/explicit_import_map/install.out @@ -1,9 +1,11 @@ Download http://localhost:4260/chalk Download http://localhost:4260/chalk/chalk-5.0.1.tgz Initialize chalk@5.0.1 -Packages: [WILDLINE] -[WILDLINE] -Resolved: [WILDLINE], reused: [WILDLINE], downloaded: [WILDLINE], added: [WILDLINE] +Installed 1 package in [WILDLINE] +Reused 0 packages from cache +Downloaded 0 packages from JSR +Downloaded 2 packages from npm +++ Dependencies: [WILDCARD] diff --git a/tests/specs/task/both_package_json_selected/install.out b/tests/specs/task/both_package_json_selected/install.out index 57ef93f07e..c433ba4153 100644 --- a/tests/specs/task/both_package_json_selected/install.out +++ b/tests/specs/task/both_package_json_selected/install.out @@ -1,9 +1,11 @@ Download http://localhost:4260/@denotest%2fbin Download http://localhost:4260/@denotest/bin/1.0.0.tgz Initialize @denotest/bin@1.0.0 -Packages: [WILDLINE] -[WILDLINE] -Resolved: [WILDLINE], reused: [WILDLINE], downloaded: [WILDLINE], added: [WILDLINE] +Installed 1 package in [WILDLINE] +Reused 0 packages from cache +Downloaded 0 packages from JSR +Downloaded 2 packages from npm +++ Dependencies: [WILDCARD] diff --git a/tests/specs/test/package_json_basic/install.out b/tests/specs/test/package_json_basic/install.out index bfc092c978..2015e259b3 100644 --- a/tests/specs/test/package_json_basic/install.out +++ b/tests/specs/test/package_json_basic/install.out @@ -1,9 +1,11 @@ Download http://localhost:4260/@denotest%2fesm-basic Download http://localhost:4260/@denotest/esm-basic/1.0.0.tgz Initialize @denotest/esm-basic@1.0.0 -Packages: [WILDLINE] -[WILDLINE] -Resolved: [WILDLINE], reused: [WILDLINE], downloaded: [WILDLINE], added: [WILDLINE] +Installed 1 package in [WILDLINE] +Reused 0 packages from cache +Downloaded 0 packages from JSR +Downloaded 2 packages from npm +++ Dependencies: [WILDCARD]