diff options
| author | David Sherret <dsherret@users.noreply.github.com> | 2023-04-24 19:44:35 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-24 19:44:35 -0400 |
| commit | aa286fdecb15461ef8ddd4c372f5a13e01e1cb7b (patch) | |
| tree | 47ddc4e428b650fae536c3c1eb73ae5a64c4fe6a /cli/module_loader.rs | |
| parent | bb74e75a049768c2949aa08de6752a16813b97de (diff) | |
refactor(ext/node): allow injecting `NodeFs` from CLI (#18829)
This allows providing a `NodeFs` as part of the `WorkerOptions`.
Diffstat (limited to 'cli/module_loader.rs')
| -rw-r--r-- | cli/module_loader.rs | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/cli/module_loader.rs b/cli/module_loader.rs index c4ef0ed7e..5a7743ef2 100644 --- a/cli/module_loader.rs +++ b/cli/module_loader.rs @@ -12,7 +12,6 @@ use crate::graph_util::ModuleGraphBuilder; use crate::graph_util::ModuleGraphContainer; use crate::node; use crate::node::CliNodeCodeTranslator; -use crate::node::CliNodeResolver; use crate::proc_state::CjsResolutionStore; use crate::proc_state::FileWatcherReporter; use crate::proc_state::ProcState; @@ -51,7 +50,7 @@ use deno_lockfile::Lockfile; use deno_runtime::deno_node; use deno_runtime::deno_node::NodeResolution; use deno_runtime::deno_node::NodeResolutionMode; -use deno_runtime::deno_node::RealFs; +use deno_runtime::deno_node::NodeResolver; use deno_runtime::permissions::PermissionsContainer; use deno_semver::npm::NpmPackageReqReference; use std::borrow::Cow; @@ -244,7 +243,7 @@ pub struct CliModuleLoader { graph_container: Arc<ModuleGraphContainer>, module_load_preparer: Arc<ModuleLoadPreparer>, node_code_translator: Arc<CliNodeCodeTranslator>, - node_resolver: Arc<CliNodeResolver>, + node_resolver: Arc<NodeResolver>, parsed_source_cache: Arc<ParsedSourceCache>, resolver: Arc<CliGraphResolver>, } @@ -387,7 +386,7 @@ impl CliModuleLoader { self.root_permissions.clone() }; // translate cjs to esm if it's cjs and inject node globals - self.node_code_translator.translate_cjs_to_esm::<RealFs>( + self.node_code_translator.translate_cjs_to_esm( specifier, &code, &mut permissions, @@ -466,7 +465,7 @@ impl ModuleLoader for CliModuleLoader { if self.node_resolver.in_npm_package(referrer) { // we're in an npm package, so use node resolution return self - .handle_node_resolve_result(self.node_resolver.resolve::<RealFs>( + .handle_node_resolve_result(self.node_resolver.resolve( specifier, referrer, NodeResolutionMode::Execution, @@ -492,7 +491,7 @@ impl ModuleLoader for CliModuleLoader { return match graph.get(specifier) { Some(Module::Npm(module)) => self .handle_node_resolve_result( - self.node_resolver.resolve_npm_reference::<RealFs>( + self.node_resolver.resolve_npm_reference( &module.nv_reference, NodeResolutionMode::Execution, &mut permissions, @@ -554,7 +553,7 @@ impl ModuleLoader for CliModuleLoader { { return self .handle_node_resolve_result( - self.node_resolver.resolve_npm_req_reference::<RealFs>( + self.node_resolver.resolve_npm_req_reference( &reference, NodeResolutionMode::Execution, &mut permissions, |