[pull] main from remix-run:main

contributors.yml

@@ -277,7 +277,6 @@
 - maximevtush
 - maxpou
 - mcansh
-- mcollina
 - MeatSim
 - MenouerBetty
 - Methuselah96

packages/react-router/lib/server-runtime/single-fetch.ts

@@ -385,14 +385,10 @@ export function encodeViaTurboStream(
     () => controller.abort(new Error("Server Timeout")),
     typeof streamTimeout === "number" ? streamTimeout : 4950,
   );
-
-  let clearStreamTimeout = () => clearTimeout(timeoutId);
-
-  requestSignal.addEventListener("abort", clearStreamTimeout);
+  requestSignal.addEventListener("abort", () => clearTimeout(timeoutId));
 
   return encode(data, {
     signal: controller.signal,
-    onComplete: clearStreamTimeout,
     plugins: [
       (value) => {
         // Even though we sanitized errors on context.errors prior to responding,

packages/react-router/vendor/turbo-stream-v2/turbo-stream.ts

@@ -138,10 +138,9 @@ export function encode(
     plugins?: EncodePlugin[];
     postPlugins?: EncodePlugin[];
     signal?: AbortSignal;
-    onComplete?: () => void;
   },
 ) {
-  const { plugins, postPlugins, signal, onComplete } = options ?? {};
+  const { plugins, postPlugins, signal } = options ?? {};
 
   const encoder: ThisEncode = {
     deferred: {},
@@ -275,7 +274,6 @@ export function encode(
       }
       await Promise.all(Object.values(encoder.deferred));
 
-      onComplete?.();
       controller.close();
     },
   });