diff options
Diffstat (limited to 'cli')
| -rw-r--r-- | cli/factory.rs | 10 | ||||
| -rw-r--r-- | cli/npm/resolvers/mod.rs | 5 | ||||
| -rw-r--r-- | cli/standalone/mod.rs | 10 | ||||
| -rw-r--r-- | cli/tools/repl/session.rs | 14 | ||||
| -rw-r--r-- | cli/worker.rs | 78 |
5 files changed, 11 insertions, 106 deletions
diff --git a/cli/factory.rs b/cli/factory.rs index 9c553620d..6a99bb2da 100644 --- a/cli/factory.rs +++ b/cli/factory.rs @@ -44,7 +44,6 @@ use crate::util::progress_bar::ProgressBar; use crate::util::progress_bar::ProgressBarStyle; use crate::worker::CliMainWorkerFactory; use crate::worker::CliMainWorkerOptions; -use crate::worker::HasNodeSpecifierChecker; use deno_core::error::AnyError; use deno_core::parking_lot::Mutex; @@ -623,7 +622,6 @@ impl CliFactory { StorageKeyResolver::from_options(&self.options), self.npm_resolver().await?.clone(), node_resolver.clone(), - Box::new(CliHasNodeSpecifierChecker(self.graph_container().clone())), self.blob_store().clone(), Box::new(CliModuleLoaderFactory::new( &self.options, @@ -683,11 +681,3 @@ impl CliFactory { }) } } - -struct CliHasNodeSpecifierChecker(Arc<ModuleGraphContainer>); - -impl HasNodeSpecifierChecker for CliHasNodeSpecifierChecker { - fn has_node_specifier(&self) -> bool { - self.0.graph().has_node_specifier - } -} diff --git a/cli/npm/resolvers/mod.rs b/cli/npm/resolvers/mod.rs index 9ae84d7f9..1b3f57c9a 100644 --- a/cli/npm/resolvers/mod.rs +++ b/cli/npm/resolvers/mod.rs @@ -179,11 +179,6 @@ impl CliNpmResolver { specifier.as_ref().starts_with(root_dir_url.as_str()) } - /// If the resolver has resolved any npm packages. - pub fn has_packages(&self) -> bool { - self.resolution.has_packages() - } - /// Adds package requirements to the resolver and ensures everything is setup. pub async fn add_package_reqs( &self, diff --git a/cli/standalone/mod.rs b/cli/standalone/mod.rs index 92aba6d29..f6c489487 100644 --- a/cli/standalone/mod.rs +++ b/cli/standalone/mod.rs @@ -26,7 +26,6 @@ use crate::util::progress_bar::ProgressBarStyle; use crate::util::v8::construct_v8_flags; use crate::worker::CliMainWorkerFactory; use crate::worker::CliMainWorkerOptions; -use crate::worker::HasNodeSpecifierChecker; use crate::worker::ModuleLoaderFactory; use deno_ast::MediaType; use deno_core::anyhow::Context; @@ -266,14 +265,6 @@ impl ModuleLoaderFactory for StandaloneModuleLoaderFactory { } } -struct StandaloneHasNodeSpecifierChecker; - -impl HasNodeSpecifierChecker for StandaloneHasNodeSpecifierChecker { - fn has_node_specifier(&self) -> bool { - false - } -} - struct StandaloneRootCertStoreProvider { ca_stores: Option<Vec<String>>, ca_data: Option<CaData>, @@ -438,7 +429,6 @@ pub async fn run( StorageKeyResolver::empty(), npm_resolver.clone(), node_resolver, - Box::new(StandaloneHasNodeSpecifierChecker), Default::default(), Box::new(module_loader_factory), root_cert_store_provider, diff --git a/cli/tools/repl/session.rs b/cli/tools/repl/session.rs index 4a30c93c4..9261299df 100644 --- a/cli/tools/repl/session.rs +++ b/cli/tools/repl/session.rs @@ -25,7 +25,6 @@ use deno_core::serde_json; use deno_core::serde_json::Value; use deno_core::LocalInspectorSession; use deno_graph::source::Resolver; -use deno_runtime::deno_node; use deno_runtime::worker::MainWorker; use deno_semver::npm::NpmPackageReqReference; use once_cell::sync::Lazy; @@ -123,7 +122,6 @@ struct TsEvaluateResponse { } pub struct ReplSession { - has_node_modules_dir: bool, npm_resolver: Arc<CliNpmResolver>, resolver: Arc<CliGraphResolver>, pub worker: MainWorker, @@ -131,7 +129,6 @@ pub struct ReplSession { pub context_id: u64, pub language_server: ReplLanguageServer, pub notifications: Rc<RefCell<UnboundedReceiver<Value>>>, - has_initialized_node_runtime: bool, referrer: ModuleSpecifier, } @@ -183,14 +180,12 @@ impl ReplSession { .unwrap(); let mut repl_session = ReplSession { - has_node_modules_dir: cli_options.has_node_modules_dir(), npm_resolver, resolver, worker, session, context_id, language_server, - has_initialized_node_runtime: false, referrer, notifications: Rc::new(RefCell::new(notification_rx)), }; @@ -515,15 +510,6 @@ impl ReplSession { let has_node_specifier = resolved_imports.iter().any(|url| url.scheme() == "node"); if !npm_imports.is_empty() || has_node_specifier { - if !self.has_initialized_node_runtime { - deno_node::initialize_runtime( - &mut self.worker.js_runtime, - self.has_node_modules_dir, - None, - )?; - self.has_initialized_node_runtime = true; - } - self.npm_resolver.add_package_reqs(&npm_imports).await?; // prevent messages in the repl about @types/node not being cached diff --git a/cli/worker.rs b/cli/worker.rs index a712dc9c6..b451cdbed 100644 --- a/cli/worker.rs +++ b/cli/worker.rs @@ -8,7 +8,6 @@ use deno_ast::ModuleSpecifier; use deno_core::anyhow::bail; use deno_core::anyhow::Context; use deno_core::error::AnyError; -use deno_core::futures::task::LocalFutureObj; use deno_core::futures::FutureExt; use deno_core::located_script_name; use deno_core::parking_lot::Mutex; @@ -32,7 +31,6 @@ use deno_runtime::deno_web::BlobStore; use deno_runtime::fmt_errors::format_js_error; use deno_runtime::inspector_server::InspectorServer; use deno_runtime::ops::worker_host::CreateWebWorkerCb; -use deno_runtime::ops::worker_host::WorkerEventCb; use deno_runtime::permissions::PermissionsContainer; use deno_runtime::web_worker::WebWorker; use deno_runtime::web_worker::WebWorkerOptions; @@ -97,7 +95,6 @@ struct SharedWorkerState { storage_key_resolver: StorageKeyResolver, npm_resolver: Arc<CliNpmResolver>, node_resolver: Arc<NodeResolver>, - has_node_specifier_checker: Box<dyn HasNodeSpecifierChecker>, blob_store: Arc<BlobStore>, broadcast_channel: InMemoryBroadcastChannel, shared_array_buffer_store: SharedArrayBufferStore, @@ -110,11 +107,7 @@ struct SharedWorkerState { } impl SharedWorkerState { - pub fn should_initialize_node_runtime(&self) -> bool { - self.npm_resolver.has_packages() - || self.has_node_specifier_checker.has_node_specifier() - || self.options.is_npm_main - } + // Currently empty } pub struct CliMainWorker { @@ -140,7 +133,6 @@ impl CliMainWorker { log::debug!("main_module {}", self.main_module); if self.is_main_cjs { - self.initialize_main_module_for_node()?; deno_node::load_cjs_module( &mut self.worker.js_runtime, &self.main_module.to_file_path().unwrap().to_string_lossy(), @@ -266,22 +258,9 @@ impl CliMainWorker { &mut self, id: ModuleId, ) -> Result<(), AnyError> { - if self.shared.should_initialize_node_runtime() { - self.initialize_main_module_for_node()?; - } self.worker.evaluate_module(id).await } - fn initialize_main_module_for_node(&mut self) -> Result<(), AnyError> { - deno_node::initialize_runtime( - &mut self.worker.js_runtime, - self.shared.options.has_node_modules_dir, - self.shared.options.maybe_binary_npm_command_name.as_deref(), - )?; - - Ok(()) - } - pub async fn maybe_setup_coverage_collector( &mut self, ) -> Result<Option<CoverageCollector>, AnyError> { @@ -312,7 +291,6 @@ impl CliMainWorkerFactory { storage_key_resolver: StorageKeyResolver, npm_resolver: Arc<CliNpmResolver>, node_resolver: Arc<NodeResolver>, - has_node_specifier_checker: Box<dyn HasNodeSpecifierChecker>, blob_store: Arc<BlobStore>, module_loader_factory: Box<dyn ModuleLoaderFactory>, root_cert_store_provider: Arc<dyn RootCertStoreProvider>, @@ -327,7 +305,6 @@ impl CliMainWorkerFactory { storage_key_resolver, npm_resolver, node_resolver, - has_node_specifier_checker, blob_store, broadcast_channel: Default::default(), shared_array_buffer_store: Default::default(), @@ -404,10 +381,6 @@ impl CliMainWorkerFactory { let create_web_worker_cb = create_web_worker_callback(shared.clone(), stdio.clone()); - let web_worker_preload_module_cb = - create_web_worker_preload_module_callback(shared); - let web_worker_pre_execute_module_cb = - create_web_worker_pre_execute_module_callback(shared.clone()); let maybe_storage_key = shared .storage_key_resolver @@ -448,6 +421,11 @@ impl CliMainWorkerFactory { unstable: shared.options.unstable, user_agent: version::get_user_agent().to_string(), inspect: shared.options.is_inspecting, + has_node_modules_dir: shared.options.has_node_modules_dir, + maybe_binary_npm_command_name: shared + .options + .maybe_binary_npm_command_name + .clone(), }, extensions, startup_snapshot: crate::js::deno_isolate_init(), @@ -461,8 +439,6 @@ impl CliMainWorkerFactory { source_map_getter: maybe_source_map_getter, format_js_error_fn: Some(Arc::new(format_js_error)), create_web_worker_cb, - web_worker_preload_module_cb, - web_worker_pre_execute_module_cb, maybe_inspector_server, should_break_on_first_statement: shared.options.inspect_brk, should_wait_for_inspector_session: shared.options.inspect_wait, @@ -555,38 +531,6 @@ impl CliMainWorkerFactory { } } -// TODO(bartlomieju): this callback could have default value -// and not be required -fn create_web_worker_preload_module_callback( - _shared: &Arc<SharedWorkerState>, -) -> Arc<WorkerEventCb> { - Arc::new(move |worker| { - let fut = async move { Ok(worker) }; - LocalFutureObj::new(Box::new(fut)) - }) -} - -fn create_web_worker_pre_execute_module_callback( - shared: Arc<SharedWorkerState>, -) -> Arc<WorkerEventCb> { - Arc::new(move |mut worker| { - let shared = shared.clone(); - let fut = async move { - // this will be up to date after pre-load - if shared.should_initialize_node_runtime() { - deno_node::initialize_runtime( - &mut worker.js_runtime, - shared.options.has_node_modules_dir, - None, - )?; - } - - Ok(worker) - }; - LocalFutureObj::new(Box::new(fut)) - }) -} - fn create_web_worker_callback( shared: Arc<SharedWorkerState>, stdio: deno_runtime::deno_io::Stdio, @@ -602,9 +546,6 @@ fn create_web_worker_callback( shared.module_loader_factory.create_source_map_getter(); let create_web_worker_cb = create_web_worker_callback(shared.clone(), stdio.clone()); - let preload_module_cb = create_web_worker_preload_module_callback(&shared); - let pre_execute_module_cb = - create_web_worker_pre_execute_module_callback(shared.clone()); let extensions = ops::cli_exts(shared.npm_resolver.clone()); @@ -636,6 +577,11 @@ fn create_web_worker_callback( unstable: shared.options.unstable, user_agent: version::get_user_agent().to_string(), inspect: shared.options.is_inspecting, + has_node_modules_dir: shared.options.has_node_modules_dir, + maybe_binary_npm_command_name: shared + .options + .maybe_binary_npm_command_name + .clone(), }, extensions, startup_snapshot: crate::js::deno_isolate_init(), @@ -646,8 +592,6 @@ fn create_web_worker_callback( root_cert_store_provider: Some(shared.root_cert_store_provider.clone()), seed: shared.options.seed, create_web_worker_cb, - preload_module_cb, - pre_execute_module_cb, format_js_error_fn: Some(Arc::new(format_js_error)), source_map_getter: maybe_source_map_getter, module_loader, |