stop using AbortSignal.any

Author: alerizzo

src/templates/core/fetch/sendRequest.hbs

@@ -9,13 +9,11 @@ export const sendRequest = async (
 ): Promise<Response> => {
 	const controller = new AbortController();
 
-	const combinedSignal = AbortSignal.any(controller.signal, options.abortSignal);
-
 	const request: RequestInit = {
 		headers,
 		body: body ?? formData,
 		method: options.method,
-		signal: combinedSignal,
+		signal: options.abortSignal ?? controller.signal,
 	};
 
 	if (config.WITH_CREDENTIALS) {

src/templates/core/node/sendRequest.hbs

@@ -8,13 +8,11 @@ export const sendRequest = async (
 ): Promise<Response> => {
 	const controller = new AbortController();
 
-	const combinedSignal = AbortSignal.any(controller.signal, options.abortSignal);
-
 	const request: RequestInit = {
 		headers,
 		method: options.method,
 		body: body ?? formData,
-		signal: combinedSignal as AbortSignal,
+		signal: (options.abortSignal ?? controller.signal) as AbortSignal,
 	};
 
 	onCancel(() => controller.abort());

test/__snapshots__/index.spec.ts.snap

@@ -447,13 +447,11 @@ export const sendRequest = async (
 ): Promise<Response> => {
     const controller = new AbortController();
 
-    const combinedSignal = AbortSignal.any(controller.signal, options.abortSignal);
-
     const request: RequestInit = {
         headers,
         body: body ?? formData,
         method: options.method,
-        signal: combinedSignal,
+        signal: options.abortSignal ?? controller.signal,
     };
 
     if (config.WITH_CREDENTIALS) {
@@ -3572,13 +3570,11 @@ export const sendRequest = async (
 ): Promise<Response> => {
     const controller = new AbortController();
 
-    const combinedSignal = AbortSignal.any(controller.signal, options.abortSignal);
-
     const request: RequestInit = {
         headers,
         body: body ?? formData,
         method: options.method,
-        signal: combinedSignal,
+        signal: options.abortSignal ?? controller.signal,
     };
 
     if (config.WITH_CREDENTIALS) {