From 7d9808cd1753a28c6027b46cae8aedc2c5fedfd0 Mon Sep 17 00:00:00 2001 From: Rich Harris Date: Fri, 23 Feb 2024 17:14:21 -0500 Subject: [PATCH] remove some unused stuff --- packages/svelte/src/internal/client/block.js | 34 ------------------- .../src/internal/client/dom/blocks/each.js | 11 +++--- packages/svelte/src/internal/client/render.js | 7 +--- .../svelte/src/internal/client/runtime.js | 1 - 4 files changed, 6 insertions(+), 47 deletions(-) delete mode 100644 packages/svelte/src/internal/client/block.js diff --git a/packages/svelte/src/internal/client/block.js b/packages/svelte/src/internal/client/block.js deleted file mode 100644 index 65b30bb07e..0000000000 --- a/packages/svelte/src/internal/client/block.js +++ /dev/null @@ -1,34 +0,0 @@ -import { DYNAMIC_ELEMENT_BLOCK, SNIPPET_BLOCK } from './constants.js'; -import { current_block } from './runtime.js'; - -/** @returns {import('./types.js').DynamicElementBlock} */ -export function create_dynamic_element_block() { - return { - // dom - d: null, - // effect - e: null, - // parent - p: /** @type {import('./types.js').Block} */ (current_block), - // transition - r: null, - // type - t: DYNAMIC_ELEMENT_BLOCK - }; -} - -/** @returns {import('./types.js').SnippetBlock} */ -export function create_snippet_block() { - return { - // dom - d: null, - // parent - p: /** @type {import('./types.js').Block} */ (current_block), - // effect - e: null, - // transition - r: null, - // type - t: SNIPPET_BLOCK - }; -} diff --git a/packages/svelte/src/internal/client/dom/blocks/each.js b/packages/svelte/src/internal/client/dom/blocks/each.js index f9f8f75251..f8ba810a3d 100644 --- a/packages/svelte/src/internal/client/dom/blocks/each.js +++ b/packages/svelte/src/internal/client/dom/blocks/each.js @@ -524,7 +524,7 @@ function mark_lis(a) { * @returns {Text | Element | Comment} */ function insert_each_item_block(block, dom, is_controlled, sibling) { - var current = /** @type {import('../../types.js').TemplateNode} */ (block.d); + var current = /** @type {import('../../types.js').TemplateNode} */ (block.e.dom); if (sibling === null) { if (is_controlled) { @@ -542,7 +542,7 @@ function insert_each_item_block(block, dom, is_controlled, sibling) { * @returns {Text | Element | Comment} */ function get_first_child(block) { - var current = block.d; + var current = block.e.dom; if (is_array(current)) { return /** @type {Text | Element | Comment} */ (current[0]); @@ -556,7 +556,7 @@ function get_first_child(block) { * @returns {Text | Element | Comment} */ export function get_first_element(block) { - const current = block.d; + const current = block.e.dom; if (is_array(current)) { for (let i = 0; i < current.length; i++) { @@ -628,7 +628,7 @@ export function destroy_each_item_block( return; } } - const dom = block.d; + const dom = block.e.dom; if (!controlled && dom !== null) { remove(dom); } @@ -657,8 +657,7 @@ function each_item_block(item, key, index, render_fn, flags) { const block = create_each_item_block(item_value, index_value, key); const effect = render_effect( - /** @param {import('../../types.js').EachItemBlock} block */ - (block) => { + () => { render_fn(null, block.v, block.i); }, block, diff --git a/packages/svelte/src/internal/client/render.js b/packages/svelte/src/internal/client/render.js index 9e240b6451..7646e8988b 100644 --- a/packages/svelte/src/internal/client/render.js +++ b/packages/svelte/src/internal/client/render.js @@ -10,7 +10,6 @@ import { map_set, set_class_name } from './operations.js'; -import { create_dynamic_element_block, create_snippet_block } from './block.js'; import { PassiveDelegatedEvents, DelegatedEvents, @@ -31,10 +30,8 @@ import { import { destroy_signal, push_destroy_fn, - execute_effect, untrack, flush_sync, - current_block, push, pop, current_component_context, @@ -267,8 +264,6 @@ export function comment(anchor) { * @returns {void} */ function close_template(dom, is_fragment, anchor) { - const block = /** @type {import('./types.js').Block} */ (current_block); - const effect = /** @type {import('./types.js').BlockEffect} */ (current_effect); /** @type {import('./types.js').TemplateNode | Array} */ @@ -280,7 +275,7 @@ function close_template(dom, is_fragment, anchor) { if (!hydrating && anchor !== null) { insert(current, null, anchor); } - block.d = current; + effect.dom = current; } diff --git a/packages/svelte/src/internal/client/runtime.js b/packages/svelte/src/internal/client/runtime.js index 65544b201c..a405a1e4df 100644 --- a/packages/svelte/src/internal/client/runtime.js +++ b/packages/svelte/src/internal/client/runtime.js @@ -1,5 +1,4 @@ import { DEV } from 'esm-env'; -import { run_all } from '../common.js'; import { array_prototype, get_descriptors,