Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Task/remove all settled #3917

Merged
merged 2 commits into from
Jan 15, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 3 additions & 2 deletions packages/toolkit/src/listenerMiddleware/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ import {
addAbortSignalListener,
assertFunction,
catchRejection,
noop,
} from './utils'
import {
listenerCancelled,
Expand Down Expand Up @@ -113,7 +114,7 @@ const createFork = (
)

if (opts?.autoJoin) {
parentBlockingPromises.push(result)
parentBlockingPromises.push(result.catch(noop))
}

return {
Expand Down Expand Up @@ -439,7 +440,7 @@ export function createListenerMiddleware<
})
}
} finally {
await Promise.allSettled(autoJoinPromises)
await Promise.all(autoJoinPromises)

abortControllerWithReason(internalTaskController, listenerCompleted) // Notify that the task has completed
entry.pending.delete(internalTaskController)
Expand Down