refactor: move PackageJson to deno_config (denoland#24348)

Author: dsherret

Cargo.lock

@@ -101,6 +101,7 @@ console_static_text = "=0.8.1"
 data-encoding = "2.3.3"
 data-url = "=0.3.0"
 deno_cache_dir = "=0.10.0"
+deno_config = { version = "=0.17.0", default-features = false }
 dlopen2 = "0.6.1"
 ecb = "=0.1.2"
 elliptic-curve = { version = "0.13.4", features = ["alloc", "arithmetic", "ecdh", "std", "pem"] }
@@ -170,7 +171,7 @@ spki = "0.7.2"
 tar = "=0.4.40"
 tempfile = "3.4.0"
 termcolor = "1.1.3"
-thiserror = "1.0.40"
+thiserror = "1.0.61"
 tokio = { version = "1.36.0", features = ["full"] }
 tokio-metrics = { version = "0.3.0", features = ["rt"] }
 tokio-util = "0.7.4"

Cargo.toml

@@ -65,7 +65,7 @@ winres.workspace = true
 [dependencies]
 deno_ast = { workspace = true, features = ["bundler", "cjs", "codegen", "proposal", "react", "sourcemap", "transforms", "typescript", "view", "visit"] }
 deno_cache_dir = { workspace = true }
-deno_config = "=0.16.4"
+deno_config = { workspace = true, features = ["deno_json", "package_json"] }
 deno_core = { workspace = true, features = ["include_js_files_for_snapshotting"] }
 deno_doc = { version = "=0.140.0", features = ["html", "syntect"] }
 deno_emit = "=0.43.0"

cli/Cargo.toml

@@ -8,9 +8,9 @@ mod lockfile;
 pub mod package_json;
 
 pub use self::import_map::resolve_import_map;
-use self::package_json::PackageJsonDeps;
 use ::import_map::ImportMap;
 use deno_ast::SourceMapOption;
+use deno_config::package_json::PackageJsonDeps;
 use deno_core::resolve_url_or_path;
 use deno_graph::GraphKind;
 use deno_npm::npm_rc::NpmRc;
@@ -537,7 +537,7 @@ fn discover_package_json(
   flags: &Flags,
   maybe_stop_at: Option<PathBuf>,
   current_dir: &Path,
-) -> Result<Option<PackageJson>, AnyError> {
+) -> Result<Option<Arc<PackageJson>>, AnyError> {
   // TODO(bartlomieju): discover for all subcommands, but print warnings that
   // `package.json` is ignored in bundle/compile/etc.
 
@@ -798,7 +798,7 @@ pub struct CliOptions {
   maybe_node_modules_folder: Option<PathBuf>,
   maybe_vendor_folder: Option<PathBuf>,
   maybe_config_file: Option<ConfigFile>,
-  maybe_package_json: Option<PackageJson>,
+  maybe_package_json: Option<Arc<PackageJson>>,
   npmrc: Arc<ResolvedNpmRc>,
   maybe_lockfile: Option<Arc<Mutex<Lockfile>>>,
   overrides: CliOptionOverrides,
@@ -813,7 +813,7 @@ impl CliOptions {
     initial_cwd: PathBuf,
     maybe_config_file: Option<ConfigFile>,
     maybe_lockfile: Option<Arc<Mutex<Lockfile>>>,
-    maybe_package_json: Option<PackageJson>,
+    maybe_package_json: Option<Arc<PackageJson>>,
     npmrc: Arc<ResolvedNpmRc>,
     force_global_cache: bool,
   ) -> Result<Self, AnyError> {
@@ -839,7 +839,7 @@ impl CliOptions {
       &initial_cwd,
       &flags,
       maybe_config_file.as_ref(),
-      maybe_package_json.as_ref(),
+      maybe_package_json.as_deref(),
     )
     .with_context(|| "Resolving node_modules folder.")?;
     let maybe_vendor_folder = if force_global_cache {
@@ -949,7 +949,7 @@ impl CliOptions {
     let maybe_lock_file = lockfile::discover(
       &flags,
       maybe_config_file.as_ref(),
-      maybe_package_json.as_ref(),
+      maybe_package_json.as_deref(),
     )?;
     Self::new(
       flags,
@@ -1395,8 +1395,8 @@ impl CliOptions {
     &self.maybe_workspace_config
   }
 
-  pub fn maybe_package_json(&self) -> &Option<PackageJson> {
-    &self.maybe_package_json
+  pub fn maybe_package_json(&self) -> Option<&Arc<PackageJson>> {
+    self.maybe_package_json.as_ref()
   }
 
   pub fn npmrc(&self) -> &Arc<ResolvedNpmRc> {
@@ -1414,7 +1414,7 @@ impl CliOptions {
       self
         .maybe_package_json()
         .as_ref()
-        .map(package_json::get_local_package_json_version_reqs)
+        .map(|p| p.resolve_local_package_json_version_reqs())
     }
   }