From bf80294e83c7f3e9419884d57daf69c8f680b278 Mon Sep 17 00:00:00 2001 From: NullVoxPopuli Date: Sat, 4 Dec 2021 20:04:06 -0500 Subject: [PATCH] fix(types): better ember-concurrency@v1 support in typescript Issue: https://github.com/NullVoxPopuli/ember-resources/issues/297 Resolves this issue: ``` Argument of type 'TaskForAsyncTaskFunction<() => Promise>' is not assignable to parameter of type 'TaskIsh'. The types returned by 'perform(...).cancel(...)' are incompatible between these types. Type 'void' is not assignable to type 'Promise'. ``` --- .../src/-private/resources/ember-concurrency-task.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ember-resources/src/-private/resources/ember-concurrency-task.ts b/ember-resources/src/-private/resources/ember-concurrency-task.ts index 155f96460..d8c441e9c 100644 --- a/ember-resources/src/-private/resources/ember-concurrency-task.ts +++ b/ember-resources/src/-private/resources/ember-concurrency-task.ts @@ -34,7 +34,7 @@ export interface TaskInstance extends Promise { readonly isFinished: boolean; readonly isRunning: boolean; readonly isDropped: boolean; - cancel(reason?: string): Promise; + cancel(reason?: string): void | Promise; } // @private