diff options
Diffstat (limited to 'cli/npm/managed/resolvers')
-rw-r--r-- | cli/npm/managed/resolvers/common.rs | 2 | ||||
-rw-r--r-- | cli/npm/managed/resolvers/global.rs | 3 | ||||
-rw-r--r-- | cli/npm/managed/resolvers/local.rs | 6 | ||||
-rw-r--r-- | cli/npm/managed/resolvers/mod.rs | 5 |
4 files changed, 8 insertions, 8 deletions
diff --git a/cli/npm/managed/resolvers/common.rs b/cli/npm/managed/resolvers/common.rs index 4076579bf..b0f375779 100644 --- a/cli/npm/managed/resolvers/common.rs +++ b/cli/npm/managed/resolvers/common.rs @@ -20,7 +20,7 @@ use deno_runtime::deno_fs::FileSystem; use deno_runtime::deno_node::NodePermissions; use deno_runtime::deno_node::NodeResolutionMode; -use crate::npm::NpmCache; +use super::super::cache::NpmCache; /// Part of the resolution that interacts with the file system. #[async_trait] diff --git a/cli/npm/managed/resolvers/global.rs b/cli/npm/managed/resolvers/global.rs index 25db62f73..3f042a38b 100644 --- a/cli/npm/managed/resolvers/global.rs +++ b/cli/npm/managed/resolvers/global.rs @@ -20,8 +20,7 @@ use deno_runtime::deno_fs::FileSystem; use deno_runtime::deno_node::NodePermissions; use deno_runtime::deno_node::NodeResolutionMode; -use crate::npm::NpmCache; - +use super::super::cache::NpmCache; use super::super::resolution::NpmResolution; use super::common::cache_packages; use super::common::types_package_name; diff --git a/cli/npm/managed/resolvers/local.rs b/cli/npm/managed/resolvers/local.rs index 57170eccd..8e4d72f26 100644 --- a/cli/npm/managed/resolvers/local.rs +++ b/cli/npm/managed/resolvers/local.rs @@ -12,7 +12,7 @@ use std::path::PathBuf; use std::sync::Arc; use crate::cache::CACHE_PERM; -use crate::npm::cache::mixed_case_package_name_decode; +use crate::npm::cache_dir::mixed_case_package_name_decode; use crate::util::fs::atomic_write_file; use crate::util::fs::canonicalize_path_maybe_not_exists_with_fs; use crate::util::fs::symlink_dir; @@ -41,11 +41,11 @@ use deno_semver::package::PackageNv; use serde::Deserialize; use serde::Serialize; -use crate::npm::cache::mixed_case_package_name_encode; -use crate::npm::NpmCache; +use crate::npm::cache_dir::mixed_case_package_name_encode; use crate::util::fs::copy_dir_recursive; use crate::util::fs::hard_link_dir_recursive; +use super::super::cache::NpmCache; use super::super::resolution::NpmResolution; use super::common::types_package_name; use super::common::NpmPackageFsResolver; diff --git a/cli/npm/managed/resolvers/mod.rs b/cli/npm/managed/resolvers/mod.rs index b6d96c4af..5fc140f26 100644 --- a/cli/npm/managed/resolvers/mod.rs +++ b/cli/npm/managed/resolvers/mod.rs @@ -11,14 +11,15 @@ use deno_core::url::Url; use deno_npm::NpmSystemInfo; use deno_runtime::deno_fs::FileSystem; -use crate::npm::NpmCache; use crate::util::progress_bar::ProgressBar; pub use self::common::NpmPackageFsResolver; + use self::global::GlobalNpmPackageResolver; use self::local::LocalNpmPackageResolver; -use super::NpmResolution; +use super::cache::NpmCache; +use super::resolution::NpmResolution; pub fn create_npm_fs_resolver( fs: Arc<dyn FileSystem>, |