From eac029c7257f35376bdcd5315b6e617455c0c416 Mon Sep 17 00:00:00 2001 From: Rich Harris Date: Wed, 16 Jul 2025 11:25:57 -0400 Subject: [PATCH] fix/simplify --- packages/svelte/src/internal/client/reactivity/batch.js | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/packages/svelte/src/internal/client/reactivity/batch.js b/packages/svelte/src/internal/client/reactivity/batch.js index 638a42cbc6..30f6e249dc 100644 --- a/packages/svelte/src/internal/client/reactivity/batch.js +++ b/packages/svelte/src/internal/client/reactivity/batch.js @@ -59,7 +59,6 @@ let queued_root_effects = []; let last_scheduled_effect = null; let is_flushing = false; -let in_flush_sync = false; export class Batch { /** @@ -417,7 +416,7 @@ export class Batch { return (this.#deferred ??= deferred()).promise; } - static ensure() { + static ensure(in_flush_sync = false) { if (current_batch === null) { const batch = (current_batch = new Batch()); batches.add(current_batch); @@ -446,15 +445,13 @@ export class Batch { * @returns {T} */ export function flushSync(fn) { - in_flush_sync = true; - if (async_mode_flag && active_effect !== null) { e.flush_sync_in_effect(); } var result; - const batch = Batch.ensure(); + const batch = Batch.ensure(true); if (fn) { batch.flush_effects(); @@ -478,8 +475,6 @@ export function flushSync(fn) { dev_effect_stack = []; } - in_flush_sync = false; - return /** @type {T} */ (result); }