diff options
Diffstat (limited to 'cli/tools/registry')
| -rw-r--r-- | cli/tools/registry/mod.rs | 6 | ||||
| -rw-r--r-- | cli/tools/registry/pm.rs | 13 |
2 files changed, 10 insertions, 9 deletions
diff --git a/cli/tools/registry/mod.rs b/cli/tools/registry/mod.rs index a22384a52..2e781ccee 100644 --- a/cli/tools/registry/mod.rs +++ b/cli/tools/registry/mod.rs @@ -82,9 +82,9 @@ pub async fn publish( let directory_path = cli_factory.cli_options().initial_cwd(); let cli_options = cli_factory.cli_options(); - let publish_configs = cli_options.workspace.jsr_packages_for_publish(); + let publish_configs = cli_options.start_dir.jsr_packages_for_publish(); if publish_configs.is_empty() { - match cli_options.workspace.resolve_start_ctx().maybe_deno_json() { + match cli_options.start_dir.maybe_deno_json() { Some(deno_json) => { debug_assert!(!deno_json.is_package()); bail!( @@ -437,7 +437,7 @@ impl PublishPreparer { let Some((scope, name_no_scope)) = name_no_at.split_once('/') else { bail!("Invalid package name, use '@<scope_name>/<package_name> format"); }; - let file_patterns = package.member_ctx.to_publish_config()?.files; + let file_patterns = package.member_dir.to_publish_config()?.files; let tarball = deno_core::unsync::spawn_blocking({ let diagnostics_collector = diagnostics_collector.clone(); diff --git a/cli/tools/registry/pm.rs b/cli/tools/registry/pm.rs index e3e2f1b55..4573f196d 100644 --- a/cli/tools/registry/pm.rs +++ b/cli/tools/registry/pm.rs @@ -5,7 +5,7 @@ use std::path::PathBuf; use std::sync::Arc; use deno_ast::TextChange; -use deno_config::FmtOptionsConfig; +use deno_config::deno_json::FmtOptionsConfig; use deno_core::anyhow::anyhow; use deno_core::anyhow::bail; use deno_core::anyhow::Context; @@ -49,7 +49,7 @@ impl DenoConfigFormat { } enum DenoOrPackageJson { - Deno(Arc<deno_config::ConfigFile>, DenoConfigFormat), + Deno(Arc<deno_config::deno_json::ConfigFile>, DenoConfigFormat), Npm(Arc<deno_node::PackageJson>, Option<FmtOptionsConfig>), } @@ -122,9 +122,9 @@ impl DenoOrPackageJson { fn from_flags(flags: Flags) -> Result<(Self, CliFactory), AnyError> { let factory = CliFactory::from_flags(flags.clone())?; let options = factory.cli_options(); - let start_ctx = options.workspace.resolve_start_ctx(); + let start_dir = &options.start_dir; - match (start_ctx.maybe_deno_json(), start_ctx.maybe_pkg_json()) { + match (start_dir.maybe_deno_json(), start_dir.maybe_pkg_json()) { // when both are present, for now, // default to deno.json (Some(deno), Some(_) | None) => Ok(( @@ -140,13 +140,14 @@ impl DenoOrPackageJson { (None, Some(_) | None) => { std::fs::write(options.initial_cwd().join("deno.json"), "{}\n") .context("Failed to create deno.json file")?; + drop(factory); // drop to prevent use log::info!("Created deno.json configuration file."); let factory = CliFactory::from_flags(flags.clone())?; let options = factory.cli_options().clone(); - let start_ctx = options.workspace.resolve_start_ctx(); + let start_dir = &options.start_dir; Ok(( DenoOrPackageJson::Deno( - start_ctx.maybe_deno_json().cloned().ok_or_else(|| { + start_dir.maybe_deno_json().cloned().ok_or_else(|| { anyhow!("config not found, but it was just created") })?, DenoConfigFormat::Json, |