summaryrefslogtreecommitdiff
path: root/cli/factory.rs
diff options
context:
space:
mode:
authorDavid Sherret <dsherret@users.noreply.github.com>2024-07-04 20:41:01 -0400
committerGitHub <noreply@github.com>2024-07-05 00:41:01 +0000
commitf396b3d1c8aaa7bf40fb1960f9ec81c3708ea2a8 (patch)
treed86b8190d9273c676063552c478ebf7ae32bd5b1 /cli/factory.rs
parentf00f0f92983d6966a5b97e539ec3f3407c3d851f (diff)
fix(publish): unfurling should always be done with the package json (#24435)
Closes https://github.com/denoland/deno/issues/24430
Diffstat (limited to 'cli/factory.rs')
-rw-r--r--cli/factory.rs12
1 files changed, 11 insertions, 1 deletions
diff --git a/cli/factory.rs b/cli/factory.rs
index 62ab251f1..5b066c67f 100644
--- a/cli/factory.rs
+++ b/cli/factory.rs
@@ -55,6 +55,7 @@ use std::collections::BTreeSet;
use std::path::PathBuf;
use deno_config::package_json::PackageJsonDepValue;
+use deno_config::workspace::PackageJsonDepResolution;
use deno_config::workspace::WorkspaceResolver;
use deno_config::ConfigFile;
use deno_core::error::AnyError;
@@ -458,7 +459,15 @@ impl CliFactory {
.get_or_try_init_async(async {
let resolver = self
.options
- .create_workspace_resolver(self.file_fetcher()?)
+ .create_workspace_resolver(
+ self.file_fetcher()?,
+ if self.options.use_byonm() {
+ PackageJsonDepResolution::Disabled
+ } else {
+ // todo(dsherret): this should be false for nodeModulesDir: true
+ PackageJsonDepResolution::Enabled
+ },
+ )
.await?;
if !resolver.diagnostics().is_empty() {
warn!(
@@ -759,6 +768,7 @@ impl CliFactory {
self.file_fetcher()?,
self.http_client_provider(),
self.npm_resolver().await?.as_ref(),
+ self.workspace_resolver().await?.as_ref(),
self.options.npm_system_info(),
))
}