diff options
author | David Sherret <dsherret@users.noreply.github.com> | 2024-05-14 14:15:43 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-05-14 18:15:43 +0000 |
commit | c0e3b6ed9d955bc59a8d88e177219b541881c63d (patch) | |
tree | 36a763a6d4d62d03bec703d73fd048cd57499a32 /cli/tools/registry/mod.rs | |
parent | 432792a46c71b402408e1bed0affdb1c3a90d8c6 (diff) |
fix(publish): always include config file when publishing (#23797)
Closes https://github.com/denoland/deno/issues/23796
Diffstat (limited to 'cli/tools/registry/mod.rs')
-rw-r--r-- | cli/tools/registry/mod.rs | 63 |
1 files changed, 34 insertions, 29 deletions
diff --git a/cli/tools/registry/mod.rs b/cli/tools/registry/mod.rs index 1d1e5c54e..495f24588 100644 --- a/cli/tools/registry/mod.rs +++ b/cli/tools/registry/mod.rs @@ -151,35 +151,40 @@ async fn prepare_publish( .map(|c| c.files) .unwrap_or_else(|| FilePatterns::new_with_base(root_dir.to_path_buf())); - let diagnostics_collector = diagnostics_collector.clone(); - let tarball = deno_core::unsync::spawn_blocking(move || { - let bare_node_builtins = cli_options.unstable_bare_node_builtins(); - let unfurler = SpecifierUnfurler::new( - &mapped_resolver, - sloppy_imports_resolver.as_ref(), - bare_node_builtins, - ); - let root_specifier = - ModuleSpecifier::from_directory_path(&root_dir).unwrap(); - let publish_paths = paths::collect_publish_paths( - &root_dir, - &cli_options, - &diagnostics_collector, - file_patterns, - )?; - collect_excluded_module_diagnostics( - &root_specifier, - &graph, - &publish_paths, - &diagnostics_collector, - ); - tar::create_gzipped_tarball( - &publish_paths, - LazyGraphSourceParser::new(&source_cache, &graph), - &diagnostics_collector, - &unfurler, - ) - .context("Failed to create a tarball") + let tarball = deno_core::unsync::spawn_blocking({ + let diagnostics_collector = diagnostics_collector.clone(); + let config_path = config_path.clone(); + move || { + let bare_node_builtins = cli_options.unstable_bare_node_builtins(); + let unfurler = SpecifierUnfurler::new( + &mapped_resolver, + sloppy_imports_resolver.as_ref(), + bare_node_builtins, + ); + let root_specifier = + ModuleSpecifier::from_directory_path(&root_dir).unwrap(); + let publish_paths = + paths::collect_publish_paths(paths::CollectPublishPathsOptions { + root_dir: &root_dir, + cli_options: &cli_options, + diagnostics_collector: &diagnostics_collector, + file_patterns, + force_include_paths: vec![config_path], + })?; + collect_excluded_module_diagnostics( + &root_specifier, + &graph, + &publish_paths, + &diagnostics_collector, + ); + tar::create_gzipped_tarball( + &publish_paths, + LazyGraphSourceParser::new(&source_cache, &graph), + &diagnostics_collector, + &unfurler, + ) + .context("Failed to create a tarball") + } }) .await??; |