From 6f12c0901e47f57c36899ebdee744ff5004c58a4 Mon Sep 17 00:00:00 2001 From: Rich Harris Date: Mon, 7 Jul 2025 21:40:29 -0400 Subject: [PATCH] move code where it belongs --- .../svelte/src/internal/client/reactivity/batch.js | 10 ++++++---- packages/svelte/src/internal/client/runtime.js | 11 +++++++---- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/packages/svelte/src/internal/client/reactivity/batch.js b/packages/svelte/src/internal/client/reactivity/batch.js index ddfccc2dad..3e4fc78bdc 100644 --- a/packages/svelte/src/internal/client/reactivity/batch.js +++ b/packages/svelte/src/internal/client/reactivity/batch.js @@ -17,7 +17,6 @@ import { get_pending_boundary } from '../dom/blocks/boundary.js'; import { active_effect, check_dirtiness, - dev_effect_stack, is_updating_effect, set_is_updating_effect, set_signal_status, @@ -45,6 +44,9 @@ export let current_batch = null; */ export let batch_deriveds = null; +/** @type {Effect[]} Stack of effects, dev only */ +export let dev_effect_stack = []; + /** @type {Effect[]} */ let queued_root_effects = []; @@ -365,7 +367,7 @@ export class Batch { last_scheduled_effect = null; if (DEV) { - dev_effect_stack.length = 0; + dev_effect_stack = []; } } } @@ -469,7 +471,7 @@ export function flushSync(fn) { last_scheduled_effect = null; if (DEV) { - dev_effect_stack.length = 0; + dev_effect_stack = []; } return /** @type {T} */ (result); @@ -485,7 +487,7 @@ function log_effect_stack() { 'Last ten effects were: ', dev_effect_stack.slice(-10).map((d) => d.fn) ); - dev_effect_stack.length = 0; + dev_effect_stack = []; } function infinite_loop_guard() { diff --git a/packages/svelte/src/internal/client/runtime.js b/packages/svelte/src/internal/client/runtime.js index 1f5621674f..c1bec75ae8 100644 --- a/packages/svelte/src/internal/client/runtime.js +++ b/packages/svelte/src/internal/client/runtime.js @@ -43,7 +43,13 @@ import { set_dev_stack } from './context.js'; import * as w from './warnings.js'; -import { Batch, batch_deriveds, flushSync, schedule_effect } from './reactivity/batch.js'; +import { + Batch, + batch_deriveds, + dev_effect_stack, + flushSync, + schedule_effect +} from './reactivity/batch.js'; import { handle_error } from './error-handling.js'; import { UNINITIALIZED } from '../../constants.js'; @@ -61,9 +67,6 @@ export function set_is_destroying_effect(value) { is_destroying_effect = value; } -/** @type {Effect[]} Stack of effects, dev only */ -export let dev_effect_stack = []; - /** @type {null | Reaction} */ export let active_reaction = null;