Move vendor folder resolution into deno_config

denoland · dsherret · Jul 5, 2024 · Jul 4, 2024 · Jul 4, 2024 · Jul 4, 2024
commit 6c8768947707d41a127831b63e3714d315a8dff8
diff --git a/cli/args/mod.rs b/cli/args/mod.rs
@@ -13,6 13,7 @@ use deno_config::workspace::PackageJsonDepResolution;
 use deno_config::workspace::Workspace;
 use deno_config::workspace::WorkspaceDiscoverOptions;
 use deno_config::workspace::WorkspaceDiscoverStart;
 use deno_config::workspace::WorkspaceEmptyOptions;
 use deno_config::workspace::WorkspaceMemberContext;
 use deno_config::workspace::WorkspaceResolver;
 use deno_config::WorkspaceLintConfig;
@@ -778,7 779,6 @@ pub struct CliOptions {
  flags: Flags,
  initial_cwd: PathBuf,
  maybe_node_modules_folder: Option<PathBuf>,
- maybe_vendor_folder: Option<PathBuf>,
  npmrc: Arc<ResolvedNpmRc>,
  maybe_lockfile: Option<Arc<CliLockfile>>,
  overrides: CliOptionOverrides,
@@ -822,15 822,6 @@ impl CliOptions {
  root_folder.pkg_json.as_deref(),
  )
  .with_context(|| "Resolving node_modules folder.")?;
- let maybe_vendor_folder = if force_global_cache {
- None
- } else {
- resolve_vendor_folder(
- &initial_cwd,
- &flags,
- root_folder.deno_json.as_deref(),
- )
- };
 
  if let Some(env_file_name) = &flags.env_file {
  match from_filename(env_file_name) {
@@ -859,7 850,6 @@ impl CliOptions {
  maybe_lockfile,
  npmrc,
  maybe_node_modules_folder,
- maybe_vendor_folder,
  overrides: Default::default(),
  workspace,
  disable_deprecated_api_warning,
@@ -871,6 861,7 @@ impl CliOptions {
  let initial_cwd =
  std::env::current_dir().with_context(|| "Failed getting cwd.")?;
  let config_fs_adapter = DenoConfigFsAdapter::new(&RealFs);
  let vendor_flag = flags.vendor;
  let resolve_workspace_discover_options = || {
  let additional_config_file_names: &'static [&'static str] =
  if matches!(flags.subcommand, DenoSubcommand::Publish(..)) {
@@ -899,8 890,15 @@ impl CliOptions {
  config_parse_options,
  additional_config_file_names,
  discover_pkg_json,
  use_vendor_folder_override: vendor_flag,
  }
  };
  let resolve_empty_options = || WorkspaceEmptyOptions {
  root_dir: Arc::new(
  ModuleSpecifier::from_directory_path(&initial_cwd).unwrap(),
  ),
  use_vendor_dir: vendor_flag.unwrap_or(false),
  };
 
  let workspace = match &flags.config_flag {
  deno_config::ConfigFlag::Discover => {
@@ -910,9 908,7 @@ impl CliOptions {
  &resolve_workspace_discover_options(),
  )?
  } else {
- Workspace::empty(Arc::new(
- ModuleSpecifier::from_directory_path(&initial_cwd).unwrap(),
- ))
  Workspace::empty(resolve_empty_options())
  }
  }
  deno_config::ConfigFlag::Path(path) => {
@@ -922,9 918,9 @@ impl CliOptions {
  &resolve_workspace_discover_options(),
  )?
  }
- deno_config::ConfigFlag::Disabled => Workspace::empty(Arc::new(
- ModuleSpecifier::from_directory_path(&initial_cwd).unwrap(),
- )),
  deno_config::ConfigFlag::Disabled => {
  Workspace::empty(resolve_empty_options())
  }
  };
 
  for diagnostic in workspace.diagnostics() {
@@ -1262,7 1258,6 @@ impl CliOptions {
  flags: self.flags.clone(),
  initial_cwd: self.initial_cwd.clone(),
  maybe_node_modules_folder: Some(path),
- maybe_vendor_folder: self.maybe_vendor_folder.clone(),
  npmrc: self.npmrc.clone(),
  maybe_lockfile: self.maybe_lockfile.clone(),
  workspace: self.workspace.clone(),
@@ -1279,8 1274,8 @@ impl CliOptions {
  .or_else(|| self.workspace.node_modules_dir())
  }
 
- pub fn vendor_dir_path(&self) -> Option<&PathBuf> {
- self.maybe_vendor_folder.as_ref()
  pub fn vendor_dir_path(&self) -> Option<PathBuf> {
  self.workspace.vendor_dir_path()
  }
 
  pub fn resolve_root_cert_store_provider(
@@ -1805,31 1800,6 @@ fn resolve_node_modules_folder(
  Ok(Some(canonicalize_path_maybe_not_exists(&path)?))
 }
 
-fn resolve_vendor_folder(
- cwd: &Path,
- flags: &Flags,
- maybe_config_file: Option<&ConfigFile>,
-) -> Option<PathBuf> {
- let use_vendor_dir = flags
- .vendor
- .or_else(|| maybe_config_file.and_then(|c| c.json.vendor))
- .unwrap_or(false);
- // Unlike the node_modules directory, there is no need to canonicalize
- // this directory because it's just used as a cache and the resolved
- // specifier is not based on the canonicalized path (unlike the modules
- // in the node_modules folder).
- if !use_vendor_dir {
- None
- } else if let Some(config_path) = maybe_config_file
- .as_ref()
- .and_then(|c| c.specifier.to_file_path().ok())
- {
- Some(config_path.parent().unwrap().join("vendor"))
- } else {
- Some(cwd.join("vendor"))
- }
-}
-
 fn resolve_import_map_specifier(
  maybe_import_map_path: Option<&str>,
  maybe_config_file: Option<&ConfigFile>,

diff --git a/cli/factory.rs b/cli/factory.rs
@@ -502,7 502,7 @@ impl CliFactory {
  .options
  .workspace
  .to_maybe_jsx_import_source_config()?,
- maybe_vendor_dir: self.options.vendor_dir_path(),
  maybe_vendor_dir: self.options.vendor_dir_path().as_ref(),
  })))
  }
  .boxed_local(),

diff --git a/cli/lsp/config.rs b/cli/lsp/config.rs
@@ -1299,7 1299,13 @@ impl ConfigData {
  }
  };
 
- let vendor_dir = config_file.as_ref().and_then(|c| c.vendor_dir_path());
  let vendor_dir = config_file.as_ref().and_then(|c| {
  if c.vendor() == Some(true) {
  Some(c.specifier.to_file_path().ok()?.parent()?.join("vendor"))
  } else {
  None
  }
  });
 
  // Load lockfile
  let lockfile = config_file.as_ref().and_then(resolve_lockfile_from_config);

diff --git a/cli/lsp/language_server.rs b/cli/lsp/language_server.rs
@@ -3568,6 3568,11 @@ impl Inner {
  },
  additional_config_file_names: &[],
  discover_pkg_json: true,
  use_vendor_folder_override: if force_global_cache {
  Some(false)
  } else {
  None
  },
  },
  )?);
  let cli_options = CliOptions::new(

diff --git a/cli/tools/bench/mod.rs b/cli/tools/bench/mod.rs
@@ -424,7 424,7 @@ pub async fn run_benchmarks(
  .map(|(_, bench_options)| {
  collect_specifiers(
  bench_options.files.clone(),
- cli_options.vendor_dir_path().map(ToOwned::to_owned),
  cli_options.vendor_dir_path(),
  is_supported_bench_path,
  )
  })
@@ -509,7 509,7 @@ pub async fn run_benchmarks_with_watch(
  .map(|(_, bench_options)| {
  collect_specifiers(
  bench_options.files.clone(),
- cli_options.vendor_dir_path().map(ToOwned::to_owned),
  cli_options.vendor_dir_path(),
  is_supported_bench_path,
  )
  })

diff --git a/cli/tools/coverage/mod.rs b/cli/tools/coverage/mod.rs
@@ -407,7 407,7 @@ fn collect_coverages(
  })
  .ignore_git_folder()
  .ignore_node_modules()
- .set_vendor_folder(cli_options.vendor_dir_path().map(ToOwned::to_owned))
  .set_vendor_folder(cli_options.vendor_dir_path())
  .collect_file_patterns(&deno_config::fs::RealDenoConfigFs, file_patterns)?;
 
  let coverage_patterns = FilePatterns {

diff --git a/cli/tools/doc.rs b/cli/tools/doc.rs
@@ -115,7 115,7 @@ pub async fn doc(flags: Flags, doc_flags: DocFlags) -> Result<(), AnyError> {
  ),
  exclude: Default::default(),
  },
- cli_options.vendor_dir_path().map(ToOwned::to_owned),
  cli_options.vendor_dir_path(),
  |_| true,
  )?;
  let graph = module_graph_creator

diff --git a/cli/tools/fmt.rs b/cli/tools/fmt.rs
@@ -199,7 199,7 @@ fn collect_fmt_files(
  FileCollector::new(|e| is_supported_ext_fmt(e.path))
  .ignore_git_folder()
  .ignore_node_modules()
- .set_vendor_folder(cli_options.vendor_dir_path().map(ToOwned::to_owned))
  .set_vendor_folder(cli_options.vendor_dir_path())
  .collect_file_patterns(&deno_config::fs::RealDenoConfigFs, files)
 }
 

diff --git a/cli/tools/lint/mod.rs b/cli/tools/lint/mod.rs
@@ -400,7 400,7 @@ fn collect_lint_files(
  FileCollector::new(|e| is_script_ext(e.path))
  .ignore_git_folder()
  .ignore_node_modules()
- .set_vendor_folder(cli_options.vendor_dir_path().map(ToOwned::to_owned))
  .set_vendor_folder(cli_options.vendor_dir_path())
  .collect_file_patterns(&deno_config::fs::RealDenoConfigFs, files)
 }
 

diff --git a/cli/tools/registry/paths.rs b/cli/tools/registry/paths.rs
@@ -339,7 339,7 @@ fn collect_paths(
  })
  .ignore_git_folder()
  .ignore_node_modules()
- .set_vendor_folder(cli_options.vendor_dir_path().map(ToOwned::to_owned))
  .set_vendor_folder(cli_options.vendor_dir_path())
  .use_gitignore()
  .collect_file_patterns(&deno_config::fs::RealDenoConfigFs, file_patterns)
 }
diff --git a/cli/tools/test/mod.rs b/cli/tools/test/mod.rs
@@ -1660,16 1660,14 @@ fn collect_specifiers_with_test_mode(
  let vendor_folder = cli_options.vendor_dir_path();
  let module_specifiers = collect_specifiers(
  files.clone(),
- vendor_folder.map(ToOwned::to_owned),
  vendor_folder.clone(),
  is_supported_test_path_predicate,
  )?;
 
  if *include_inline {
- return collect_specifiers(
- files,
- vendor_folder.map(ToOwned::to_owned),
- |e| is_supported_test_ext(e.path),
- )
  return collect_specifiers(files, vendor_folder.clone(), |e| {
  is_supported_test_ext(e.path)
  })
  .map(|specifiers| {
  specifiers
  .into_iter()
@@ -1875,7 1873,7 @@ pub async fn run_tests_with_watch(
  .map(|(_, test_options)| {
  collect_specifiers(
  test_options.files.clone(),
- cli_options.vendor_dir_path().map(ToOwned::to_owned),
  cli_options.vendor_dir_path(),
  if workspace_test_options.doc {
  Box::new(|e: WalkEntry| is_supported_test_ext(e.path))
  as Box<dyn Fn(WalkEntry) -> bool>