From 3d8a4d3b81e107bbb152ad69047f64d16ca800f3 Mon Sep 17 00:00:00 2001 From: Nayeem Rahman Date: Wed, 26 Apr 2023 21:23:28 +0100 Subject: feat(cli): don't check permissions for statically analyzable dynamic imports (#18713) Closes #17697 Closes #17658 --- cli/cache/mod.rs | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) (limited to 'cli/cache') diff --git a/cli/cache/mod.rs b/cli/cache/mod.rs index 24712d08a..40d74ff66 100644 --- a/cli/cache/mod.rs +++ b/cli/cache/mod.rs @@ -45,10 +45,9 @@ pub const CACHE_PERM: u32 = 0o644; /// a concise interface to the DENO_DIR when building module graphs. pub struct FetchCacher { emit_cache: EmitCache, - dynamic_permissions: PermissionsContainer, file_fetcher: Arc, file_header_overrides: HashMap>, - root_permissions: PermissionsContainer, + permissions: PermissionsContainer, cache_info_enabled: bool, maybe_local_node_modules_url: Option, } @@ -58,16 +57,14 @@ impl FetchCacher { emit_cache: EmitCache, file_fetcher: Arc, file_header_overrides: HashMap>, - root_permissions: PermissionsContainer, - dynamic_permissions: PermissionsContainer, + permissions: PermissionsContainer, maybe_local_node_modules_url: Option, ) -> Self { Self { emit_cache, - dynamic_permissions, file_fetcher, file_header_overrides, - root_permissions, + permissions, cache_info_enabled: false, maybe_local_node_modules_url, } @@ -105,7 +102,7 @@ impl Loader for FetchCacher { fn load( &mut self, specifier: &ModuleSpecifier, - is_dynamic: bool, + _is_dynamic: bool, ) -> LoadFuture { if let Some(node_modules_url) = self.maybe_local_node_modules_url.as_ref() { // The specifier might be in a completely different symlinked tree than @@ -124,11 +121,7 @@ impl Loader for FetchCacher { } } - let permissions = if is_dynamic { - self.dynamic_permissions.clone() - } else { - self.root_permissions.clone() - }; + let permissions = self.permissions.clone(); let file_fetcher = self.file_fetcher.clone(); let file_header_overrides = self.file_header_overrides.clone(); let specifier = specifier.clone(); -- cgit v1.2.3