From 3ea2d51dccafdfac152f358edf1c4a09bea02e85 Mon Sep 17 00:00:00 2001 From: Rich Harris Date: Fri, 22 Mar 2024 15:10:27 -0400 Subject: [PATCH] remove current_block --- .../src/internal/client/dom/blocks/svelte-element.js | 2 +- packages/svelte/src/internal/client/dom/elements/misc.js | 3 +-- packages/svelte/src/internal/client/dom/template.js | 2 +- .../svelte/src/internal/client/reactivity/effects.js | 9 ++++----- packages/svelte/src/internal/client/runtime.js | 4 ---- 5 files changed, 7 insertions(+), 13 deletions(-) diff --git a/packages/svelte/src/internal/client/dom/blocks/svelte-element.js b/packages/svelte/src/internal/client/dom/blocks/svelte-element.js index b71c0de043..4aac458a4f 100644 --- a/packages/svelte/src/internal/client/dom/blocks/svelte-element.js +++ b/packages/svelte/src/internal/client/dom/blocks/svelte-element.js @@ -12,7 +12,7 @@ import { is_array } from '../../utils.js'; import { set_should_intro } from '../../render.js'; import { current_each_item, set_current_each_item } from './each.js'; import { create_block } from './utils.js'; -import { current_block, current_effect } from '../../runtime.js'; +import { current_effect } from '../../runtime.js'; /** * @param {import('#client').Effect} effect diff --git a/packages/svelte/src/internal/client/dom/elements/misc.js b/packages/svelte/src/internal/client/dom/elements/misc.js index e0fc8d2a19..97790ca4ec 100644 --- a/packages/svelte/src/internal/client/dom/elements/misc.js +++ b/packages/svelte/src/internal/client/dom/elements/misc.js @@ -1,6 +1,5 @@ import { hydrating } from '../hydration.js'; import { render_effect } from '../../reactivity/effects.js'; -import { current_block } from '../../runtime.js'; /** * @param {HTMLElement} dom @@ -17,7 +16,7 @@ export function autofocus(dom, value) { dom.focus(); } }, - current_block, + null, true, false ); diff --git a/packages/svelte/src/internal/client/dom/template.js b/packages/svelte/src/internal/client/dom/template.js index 5070011a17..76fb609b77 100644 --- a/packages/svelte/src/internal/client/dom/template.js +++ b/packages/svelte/src/internal/client/dom/template.js @@ -5,7 +5,7 @@ import { create_fragment_with_script_from_html, insert } from './reconciler.js'; -import { current_block, current_effect } from '../runtime.js'; +import { current_effect } from '../runtime.js'; import { is_array } from '../utils.js'; /** diff --git a/packages/svelte/src/internal/client/reactivity/effects.js b/packages/svelte/src/internal/client/reactivity/effects.js index 32548c8d67..8e2da9a624 100644 --- a/packages/svelte/src/internal/client/reactivity/effects.js +++ b/packages/svelte/src/internal/client/reactivity/effects.js @@ -1,7 +1,6 @@ import { DEV } from 'esm-env'; import { check_dirtiness, - current_block, current_component_context, current_effect, current_reaction, @@ -34,7 +33,7 @@ import { noop } from '../../common.js'; * @param {boolean} init * @returns {import('#client').Effect} */ -function create_effect(type, fn, sync, block = current_block, init = true) { +function create_effect(type, fn, sync, block = null, init = true) { /** @type {import('#client').Effect} */ const signal = { parent: current_effect, @@ -99,7 +98,7 @@ export function user_effect(fn) { current_component_context !== null && !current_component_context.m; - const effect = create_effect(EFFECT, fn, false, current_block, !defer); + const effect = create_effect(EFFECT, fn, false, null, !defer); if (defer) { const context = /** @type {import('#client').ComponentContext} */ (current_component_context); @@ -115,7 +114,7 @@ export function user_effect(fn) { * @returns {() => void} */ export function user_root_effect(fn) { - const effect = render_effect(fn, current_block, true); + const effect = render_effect(fn, null, true); return () => { destroy_effect(effect); }; @@ -221,7 +220,7 @@ export function invalidate_effect(fn) { * @param {any} sync * @returns {import('#client').Effect} */ -export function render_effect(fn, block = current_block, managed = false, sync = true) { +export function render_effect(fn, block = null, managed = false, sync = true) { let flags = RENDER_EFFECT; if (managed) { flags |= MANAGED; diff --git a/packages/svelte/src/internal/client/runtime.js b/packages/svelte/src/internal/client/runtime.js index d00a7bbc35..e93fb6ce36 100644 --- a/packages/svelte/src/internal/client/runtime.js +++ b/packages/svelte/src/internal/client/runtime.js @@ -107,11 +107,7 @@ export let inspect_fn = null; /** @type {Array} */ let inspect_captured_signals = []; -// Handle rendering tree blocks and anchors -/** @type {null | import('./types.js').Block} */ -export let current_block = null; // Handling runtime component context - /** @type {import('./types.js').ComponentContext | null} */ export let current_component_context = null;