summaryrefslogtreecommitdiff
path: root/cli/standalone
diff options
context:
space:
mode:
Diffstat (limited to 'cli/standalone')
-rw-r--r--cli/standalone/binary.rs4
-rw-r--r--cli/standalone/mod.rs18
2 files changed, 14 insertions, 8 deletions
diff --git a/cli/standalone/binary.rs b/cli/standalone/binary.rs
index 38fb3b08f..afe5a1b57 100644
--- a/cli/standalone/binary.rs
+++ b/cli/standalone/binary.rs
@@ -558,9 +558,7 @@ impl<'a> DenoCompileBinaryWriter<'a> {
let registry_url = self.npm_api.base_url();
let root_path = self.npm_cache.registry_folder(registry_url);
let mut builder = VfsBuilder::new(root_path)?;
- for package in self
- .npm_resolution
- .all_system_packages(&self.npm_system_info)
+ for package in npm_resolver.all_system_packages(&self.npm_system_info)
{
let folder =
npm_resolver.resolve_pkg_folder_from_pkg_id(&package.id)?;
diff --git a/cli/standalone/mod.rs b/cli/standalone/mod.rs
index 30bbd7f8b..442334e39 100644
--- a/cli/standalone/mod.rs
+++ b/cli/standalone/mod.rs
@@ -21,6 +21,7 @@ use crate::npm::ManagedCliNpmResolver;
use crate::npm::NpmCache;
use crate::npm::NpmCacheDir;
use crate::npm::NpmResolution;
+use crate::npm::PackageJsonDepsInstaller;
use crate::resolver::MappedSpecifierResolver;
use crate::util::progress_bar::ProgressBar;
use crate::util::progress_bar::ProgressBarStyle;
@@ -366,11 +367,23 @@ pub async fn run(
node_modules_path,
NpmSystemInfo::default(),
);
+ let package_json_deps_provider = Arc::new(PackageJsonDepsProvider::new(
+ metadata
+ .package_json_deps
+ .map(|serialized| serialized.into_deps()),
+ ));
+ let package_json_installer = Arc::new(PackageJsonDepsInstaller::new(
+ package_json_deps_provider.clone(),
+ npm_api.clone(),
+ npm_resolution.clone(),
+ ));
let npm_resolver = Arc::new(ManagedCliNpmResolver::new(
+ npm_api.clone(),
fs.clone(),
npm_resolution.clone(),
npm_fs_resolver,
None,
+ package_json_installer,
)) as Arc<dyn CliNpmResolver>;
let node_resolver = Arc::new(NodeResolver::new(
fs.clone(),
@@ -387,11 +400,6 @@ pub async fn run(
node_resolver.clone(),
npm_resolver.clone().into_npm_resolver(),
));
- let package_json_deps_provider = Arc::new(PackageJsonDepsProvider::new(
- metadata
- .package_json_deps
- .map(|serialized| serialized.into_deps()),
- ));
let maybe_import_map = metadata.maybe_import_map.map(|(base, source)| {
Arc::new(parse_from_json(&base, &source).unwrap().import_map)
});