diff options
Diffstat (limited to 'cli/tools')
-rw-r--r-- | cli/tools/compile.rs (renamed from cli/tools/standalone.rs) | 15 | ||||
-rw-r--r-- | cli/tools/mod.rs | 2 | ||||
-rw-r--r-- | cli/tools/task.rs | 3 | ||||
-rw-r--r-- | cli/tools/vendor/test.rs | 9 |
4 files changed, 11 insertions, 18 deletions
diff --git a/cli/tools/standalone.rs b/cli/tools/compile.rs index d34e5da83..f10a2d025 100644 --- a/cli/tools/standalone.rs +++ b/cli/tools/compile.rs @@ -5,7 +5,6 @@ use crate::args::Flags; use crate::factory::CliFactory; use crate::graph_util::error_for_any_npm_specifier; use crate::standalone::is_standalone_binary; -use crate::standalone::DenoCompileBinaryWriter; use crate::util::path::path_has_trailing_slash; use deno_core::anyhow::bail; use deno_core::anyhow::Context; @@ -25,14 +24,9 @@ pub async fn compile( ) -> Result<(), AnyError> { let factory = CliFactory::from_flags(flags).await?; let cli_options = factory.cli_options(); - let file_fetcher = factory.file_fetcher()?; - let http_client = factory.http_client(); - let deno_dir = factory.deno_dir()?; let module_graph_builder = factory.module_graph_builder().await?; let parsed_source_cache = factory.parsed_source_cache()?; - - let binary_writer = - DenoCompileBinaryWriter::new(file_fetcher, http_client, deno_dir); + let binary_writer = factory.create_compile_binary_writer().await?; let module_specifier = cli_options.resolve_main_module()?; let module_roots = { let mut vec = Vec::with_capacity(compile_flags.include.len() + 1); @@ -56,8 +50,11 @@ pub async fn compile( ) .unwrap(); - // at the moment, we don't support npm specifiers in deno_compile, so show an error - error_for_any_npm_specifier(&graph)?; + if !cli_options.unstable() { + error_for_any_npm_specifier(&graph).context( + "Using npm specifiers with deno compile requires the --unstable flag.", + )?; + } let parser = parsed_source_cache.as_capturing_parser(); let eszip = eszip::EszipV2::from_graph(graph, &parser, Default::default())?; diff --git a/cli/tools/mod.rs b/cli/tools/mod.rs index cf29435a7..c4a8306ab 100644 --- a/cli/tools/mod.rs +++ b/cli/tools/mod.rs @@ -3,6 +3,7 @@ pub mod bench; pub mod bundle; pub mod check; +pub mod compile; pub mod coverage; pub mod doc; pub mod fmt; @@ -12,7 +13,6 @@ pub mod installer; pub mod lint; pub mod repl; pub mod run; -pub mod standalone; pub mod task; pub mod test; pub mod upgrade; diff --git a/cli/tools/task.rs b/cli/tools/task.rs index 6380d3822..bf972e2db 100644 --- a/cli/tools/task.rs +++ b/cli/tools/task.rs @@ -64,12 +64,13 @@ pub async fn execute_script( .await; Ok(exit_code) } else if let Some(script) = package_json_scripts.get(task_name) { + let package_json_deps_provider = factory.package_json_deps_provider(); let package_json_deps_installer = factory.package_json_deps_installer().await?; let npm_resolver = factory.npm_resolver().await?; let node_resolver = factory.node_resolver().await?; - if let Some(package_deps) = package_json_deps_installer.package_deps() { + if let Some(package_deps) = package_json_deps_provider.deps() { for (key, value) in package_deps { if let Err(err) = value { log::info!( diff --git a/cli/tools/vendor/test.rs b/cli/tools/vendor/test.rs index 774ff0d58..e8a474ed3 100644 --- a/cli/tools/vendor/test.rs +++ b/cli/tools/vendor/test.rs @@ -22,7 +22,6 @@ use import_map::ImportMap; use crate::cache::ParsedSourceCache; use crate::npm::CliNpmRegistryApi; use crate::npm::NpmResolution; -use crate::npm::PackageJsonDepsInstaller; use crate::resolver::CliGraphResolver; use super::build::VendorEnvironment; @@ -270,18 +269,14 @@ async fn build_test_graph( None, None, )); - let deps_installer = Arc::new(PackageJsonDepsInstaller::new( - npm_registry_api.clone(), - npm_resolution.clone(), - None, - )); CliGraphResolver::new( None, Some(Arc::new(original_import_map)), false, npm_registry_api, npm_resolution, - deps_installer, + Default::default(), + Default::default(), ) }); let mut graph = ModuleGraph::default(); |