More.

denoland · dsherret · Jul 4, 2024 · Jun 17, 2024 · Jun 18, 2024 · Jun 18, 2024
commit 271df70c30a95b7f40a1b0064e671461cfcb48f0
diff --git a/cli/args/mod.rs b/cli/args/mod.rs
@@ -1381,21 1381,6 @@ impl CliOptions {
  &self.npmrc
  }
 
- pub fn maybe_package_json_deps(&self) -> Option<PackageJsonDeps> {
- if matches!(
- self.flags.subcommand,
- DenoSubcommand::Task(TaskFlags { task: None, .. })
- ) {
- // don't have any package json dependencies for deno task with no args
- None
- } else {
- self
- .maybe_package_json()
- .as_ref()
- .map(package_json::get_local_package_json_version_reqs)
- }
- }
-
  pub fn resolve_fmt_options(
  &self,
  fmt_flags: FmtFlags,
@@ -1441,16 1426,6 @@ impl CliOptions {
  })
  }
 
- pub fn resolve_config_excludes(&self) -> Result<PathOrPatternSet, AnyError> {
- let maybe_config_files = if let Some(config_file) = &self.maybe_config_file
- {
- Some(config_file.to_files_config()?)
- } else {
- None
- };
- Ok(maybe_config_files.map(|f| f.exclude).unwrap_or_default())
- }
-
  pub fn resolve_test_options(
  &self,
  test_flags: TestFlags,
@@ -1555,11 1530,7 @@ impl CliOptions {
  }
 
  pub fn check_js(&self) -> bool {
- self
- .maybe_config_file
- .as_ref()
- .map(|cf| cf.get_check_js())
- .unwrap_or(false)
  self.workspace.check_js()
  }
 
  pub fn coverage_dir(&self) -> Option<String> {
@@ -1706,11 1677,7 @@ impl CliOptions {
 
  pub fn unstable_bare_node_builtins(&self) -> bool {
  self.flags.unstable_config.bare_node_builtins
- || self
- .maybe_config_file()
- .as_ref()
- .map(|c| c.has_unstable("bare-node-builtins"))
- .unwrap_or(false)
  || self.workspace.has_unstable("bare-node-builtins")
  }
 
  pub fn use_byonm(&self) -> bool {
@@ -1727,28 1694,16 @@ impl CliOptions {
  .as_ref()
  .map(|s| matches!(s.kind, NpmProcessStateKind::Byonm))
  .unwrap_or(false)
- || self
- .maybe_config_file()
- .as_ref()
- .map(|c| c.has_unstable("byonm"))
- .unwrap_or(false)
  || self.workspace.has_unstable("byonm")
  }
 
  pub fn unstable_sloppy_imports(&self) -> bool {
  self.flags.unstable_config.sloppy_imports
- || self
- .maybe_config_file()
- .as_ref()
- .map(|c| c.has_unstable("sloppy-imports"))
- .unwrap_or(false)
  || self.workspace.has_unstable("sloppy-imports")
  }
 
  pub fn unstable_features(&self) -> Vec<String> {
- let mut from_config_file = self
- .maybe_config_file()
- .as_ref()
- .map(|c| c.json.unstable.clone())
- .unwrap_or_default();
  let mut from_config_file = self.workspace.unstable_features().to_vec();
 
  from_config_file.extend_from_slice(&self.flags.unstable_config.features);
 
@@ -1787,12 1742,18 @@ impl CliOptions {
  {
  full_paths.push(import_map_path);
  }
- if let Some(specifier) = self.maybe_config_file_specifier() {
- if specifier.scheme() == "file" {
- if let Ok(path) = specifier.to_file_path() {
- full_paths.push(path);
 
  for (_, folder) in self.workspace.config_folders() {
  if let Some(deno_json) = &folder.deno_json {
  if deno_json.specifier.scheme() == "file" {
  if let Ok(path) = deno_json.specifier.to_file_path() {
  full_paths.push(path);
  }
  }
  }
  if let Some(pkg_json) = &folder.pkg_json {
  full_paths.push(pkg_json.path.clone());
  }
  }
  full_paths
  }
@@ -1901,8 1862,9 @@ impl StorageKeyResolver {
  // otherwise we will use the path to the config file or None to
  // fall back to using the main module's path
  options
- .maybe_config_file
- .as_ref()
  .workspace
  .resolve_start_ctx()
  .deno_json()
  .map(|config_file| Some(config_file.specifier.to_string()))
  })
  }
@@ -1990,7 1952,7 @@ mod test {
  let config_file = ConfigFile::new(
  config_text,
  config_specifier,
- &deno_config::ParseOptions::default(),
  &deno_config::ConfigParseOptions::default(),
  )
  .unwrap();
  let actual = resolve_import_map_specifier(
@@ -2014,7 1976,7 @@ mod test {
  let config_file = ConfigFile::new(
  config_text,
  config_specifier,
- &deno_config::ParseOptions::default(),
  &deno_config::ConfigParseOptions::default(),
  )
  .unwrap();
  let actual = resolve_import_map_specifier(

diff --git a/cli/factory.rs b/cli/factory.rs
@@ -1,6 1,5 @@
 // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license.
 
-use crate::args::deno_json::deno_json_deps;
 use crate::args::CliOptions;
 use crate::args::DenoSubcommand;
 use crate::args::Flags;
@@ -57,6 56,7 @@ use std::path::PathBuf;
 
 use deno_config::workspace::Workspace;
 use deno_config::workspace::WorkspaceResolver;
 use deno_config::ConfigFile;
 use deno_core::error::AnyError;
 use deno_core::futures::FutureExt;
 use deno_core::parking_lot::Mutex;
@@ -321,44 321,53 @@ impl CliFactory {
  .collect()
  }
 
  fn deno_json_deps(
  maybe_deno_json: Option<&ConfigFile>,
  ) -> BTreeSet<String> {
  maybe_deno_json
  .map(|c| {
  crate::args::deno_json::deno_json_deps(c)
  .into_iter()
  .map(|req| req.to_string())
  .collect()
  })
  .unwrap_or_default()
  }
 
  self.services.lockfile.get_or_init(|| {
  let maybe_lockfile = self.options.maybe_lockfile();
 
  // initialize the lockfile with the workspace's configuration
  if let Some(lockfile) = &maybe_lockfile {
- let package_json_deps = (!self.options.no_npm())
- .then(|| {
- self
- .package_json_deps_provider()
- .reqs()
- .map(|reqs| {
- reqs.into_iter().map(|s| format!("npm:{}", s)).collect()
- })
- .unwrap_or_default()
- })
- .unwrap_or_default();
  let mut lockfile = lockfile.lock();
- let root_folder = self.options.workspace.root_folder().1;
  let (root_url, root_folder) = self.options.workspace.root_folder();
  let config = deno_lockfile::WorkspaceConfig {
  root: WorkspaceMemberConfig {
- package_json_deps: pkg_json_deps(root_folder.pkg_json.as_ref()),
- dependencies: deno_json_deps(root_folder.deno_json.as_ref())
- .into_iter()
- .map(|req| req.to_string())
- .collect(),
  package_json_deps: pkg_json_deps(root_folder.pkg_json.as_deref()),
  dependencies: deno_json_deps(root_folder.deno_json.as_deref()),
  },
- members: workspace_config
- .members
  members: self
  .options
  .workspace
  .config_folders()
  .iter()
- .map(|member| {
  .enumerate()
  .filter(|(_, (folder_url, _))| *folder_url != root_url)
  .map(|(i, (folder_url, folder))| {
  (
- member.package_name.clone(),
  folder
  .deno_json
  .as_ref()
  .and_then(|d| d.json.name.clone())
  .or_else(|| {
  folder.pkg_json.as_ref().and_then(|d| d.name.clone())
  })
  .or_else(|| root_url.make_relative(folder_url))
  // todo(THIS PR): what would be better here?
  .unwrap_or_else(|| format!("member_{}", i)),
  WorkspaceMemberConfig {
- package_json_deps: Default::default(),
- dependencies: deno_json_deps(&member.config_file)
- .into_iter()
- .map(|req| req.to_string())
- .collect(),
  package_json_deps: pkg_json_deps(folder.pkg_json.as_deref()),
  dependencies: deno_json_deps(folder.deno_json.as_deref()),
  },
  )
  })

diff --git a/cli/graph_container.rs b/cli/graph_container.rs
@@ -98,7 98,7 @@ impl MainModuleGraphContainer {
  &self,
  files: &[String],
  ) -> Result<Vec<ModuleSpecifier>, AnyError> {
- let excludes = self.cli_options.resolve_config_excludes()?;
  let excludes = self.cli_options.workspace.resolve_config_excludes()?;
  Ok(
  files
  .iter()