do not forward signals for lifecycle scripts

denoland · Nov 29, 2024 · 1d2fc91 · 1d2fc91
1 parent 3071baf
commit 1d2fc91
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 11 deletions.
diff --git a/cli/npm/managed/resolvers/common/lifecycle_scripts.rs b/cli/npm/managed/resolvers/common/lifecycle_scripts.rs
@@ -2,7 +2,6 @@
 
 use super::bin_entries::BinEntries;
 use crate::args::LifecycleScriptsConfig;
-use crate::task_runner::run_future_with_kill_signal;
 use crate::task_runner::TaskStdio;
 use crate::util::progress_bar::ProgressBar;
 use deno_core::anyhow::Context;
@@ -159,17 +158,18 @@ impl<'a> LifecycleScripts<'a> {
     progress_bar: &ProgressBar,
   ) -> Result<(), AnyError> {
     let kill_signal = KillSignal::default();
-    run_future_with_kill_signal(
-      kill_signal.clone(),
-      self.finish_with_cancellation(
+    let _drop_signal = kill_signal.clone().drop_guard();
+    // we don't run with signals forwarded because once signals
+    // are setup then they're process wide.
+    self
+      .finish_with_cancellation(
         snapshot,
         packages,
         root_node_modules_dir_path,
         progress_bar,
         kill_signal,
-      ),
-    )
-    .await
+      )
+      .await
   }
 
   async fn finish_with_cancellation(

diff --git a/cli/task_runner.rs b/cli/task_runner.rs
@@ -546,10 +546,11 @@ fn resolve_managed_npm_commands(
   Ok(result)
 }
 
-/// Runs a deno task future with the specified kill signal.
+/// Runs a deno task future forwarding any signals received
+/// to the process.
 ///
 /// Signal listeners and ctrl+c listening will be setup.
-pub async fn run_future_with_kill_signal<TOutput>(
+pub async fn run_future_forwarding_signals<TOutput>(
   kill_signal: KillSignal,
   future: impl std::future::Future<Output = TOutput>,
 ) -> TOutput {

diff --git a/cli/tools/task.rs b/cli/tools/task.rs
@@ -38,7 +38,7 @@ use crate::colors;
 use crate::factory::CliFactory;
 use crate::npm::CliNpmResolver;
 use crate::task_runner;
-use crate::task_runner::run_future_with_kill_signal;
+use crate::task_runner::run_future_forwarding_signals;
 use crate::util::fs::canonicalize_path;
 
 #[derive(Debug)]
@@ -229,7 +229,7 @@ pub async fn execute_script(
   };
 
   let kill_signal = KillSignal::default();
-  run_future_with_kill_signal(kill_signal.clone(), async {
+  run_future_forwarding_signals(kill_signal.clone(), async {
     if task_flags.eval {
       return task_runner
         .run_deno_task(