From 7f26fd0258f2f717a2bd2651070e4893c4232e31 Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Thu, 27 Jun 2024 13:38:54 -0400
Subject: [PATCH] tidy up

---
 .../src/internal/client/dom/operations.js     |  8 ----
 .../src/internal/client/dom/template.js       | 46 +------------------
 .../src/internal/client/reactivity/effects.js |  1 -
 .../src/internal/client/reactivity/types.d.ts |  1 -
 4 files changed, 1 insertion(+), 55 deletions(-)

diff --git a/packages/svelte/src/internal/client/dom/operations.js b/packages/svelte/src/internal/client/dom/operations.js
index a28207395d..c18dc0cef2 100644
--- a/packages/svelte/src/internal/client/dom/operations.js
+++ b/packages/svelte/src/internal/client/dom/operations.js
@@ -126,15 +126,7 @@ export function sibling(node, is_text = false) {
 	// text node to hydrate — we must therefore create one
 	if (is_text && type !== 3) {
 		var text = empty();
-		var dom = /** @type {import('#client').TemplateNode[]} */ (
-			/** @type {import('#client').Effect} */ (current_effect).dom
-		);
-
-		// TODO something needs to happen here but i'm not quite sure what
-
-		dom.unshift(text);
 		next_sibling?.before(text);
-
 		return text;
 	}
 
diff --git a/packages/svelte/src/internal/client/dom/template.js b/packages/svelte/src/internal/client/dom/template.js
index 70b6cf16df..1835a8037f 100644
--- a/packages/svelte/src/internal/client/dom/template.js
+++ b/packages/svelte/src/internal/client/dom/template.js
@@ -7,35 +7,8 @@ import {
 	TEMPLATE_UNSET_START,
 	TEMPLATE_USE_IMPORT_NODE
 } from '../../../constants.js';
-import { is_array } from '../utils.js';
 import { queue_micro_task } from './task.js';
 
-/**
- * @template {import("#client").TemplateNode | import("#client").TemplateNode[]} T
- * @param {T} dom
- * @param {import("#client").Effect} effect
- */
-function push_template_node(
-	dom,
-	effect = /** @type {import('#client').Effect} */ (current_effect)
-) {
-	var current_dom = effect.dom;
-	if (current_dom === null) {
-		effect.dom = dom;
-	} else {
-		if (!is_array(current_dom)) {
-			current_dom = effect.dom = [current_dom];
-		}
-
-		if (is_array(dom)) {
-			current_dom.push(...dom);
-		} else {
-			current_dom.push(dom);
-		}
-	}
-	return dom;
-}
-
 /**
  *
  * @param {import('#client').TemplateNode | null | undefined} start
@@ -76,7 +49,6 @@ export function template(content, flags) {
 				hydrate_nodes[hydrate_nodes.length - 1]
 			);
 
-			push_template_node(is_fragment ? hydrate_nodes : hydrate_start);
 			return hydrate_start;
 		}
 
@@ -99,12 +71,6 @@ export function template(content, flags) {
 
 		assign_nodes(start, end);
 
-		push_template_node(
-			is_fragment
-				? /** @type {import('#client').TemplateNode[]} */ ([...clone.childNodes])
-				: /** @type {import('#client').TemplateNode} */ (clone)
-		);
-
 		return clone;
 	};
 }
@@ -153,7 +119,6 @@ export function ns_template(content, flags, ns = 'svg') {
 		if (hydrating) {
 			assign_nodes(has_start ? hydrate_nodes[0] : null, hydrate_nodes[hydrate_nodes.length - 1]);
 
-			push_template_node(is_fragment ? hydrate_nodes : hydrate_start);
 			return hydrate_start;
 		}
 
@@ -183,12 +148,6 @@ export function ns_template(content, flags, ns = 'svg') {
 
 		assign_nodes(start, end);
 
-		push_template_node(
-			is_fragment
-				? /** @type {import('#client').TemplateNode[]} */ ([...clone.childNodes])
-				: /** @type {import('#client').TemplateNode} */ (clone)
-		);
-
 		return clone;
 	};
 }
@@ -267,7 +226,7 @@ export function text(anchor) {
 	if (!hydrating) {
 		var t = empty();
 		assign_nodes(t, t);
-		return push_template_node(t);
+		return t;
 	}
 
 	var node = hydrate_start;
@@ -279,7 +238,6 @@ export function text(anchor) {
 	}
 
 	assign_nodes(node, node);
-	push_template_node(node);
 	return node;
 }
 
@@ -294,7 +252,6 @@ export function comment(flags = 0) {
 			hydrate_nodes[hydrate_nodes.length - 1]
 		);
 
-		push_template_node(hydrate_nodes);
 		return hydrate_start;
 	}
 
@@ -303,7 +260,6 @@ export function comment(flags = 0) {
 	frag.append(anchor);
 
 	assign_nodes((flags & TEMPLATE_UNSET_START) !== 0 ? undefined : null, anchor);
-	push_template_node([anchor]);
 
 	return frag;
 }
diff --git a/packages/svelte/src/internal/client/reactivity/effects.js b/packages/svelte/src/internal/client/reactivity/effects.js
index d5316b18c4..0f4d70872a 100644
--- a/packages/svelte/src/internal/client/reactivity/effects.js
+++ b/packages/svelte/src/internal/client/reactivity/effects.js
@@ -85,7 +85,6 @@ function create_effect(type, fn, sync) {
 	var effect = {
 		ctx: current_component_context,
 		deps: null,
-		dom: null,
 		nodes: null,
 		f: type | DIRTY,
 		first: null,
diff --git a/packages/svelte/src/internal/client/reactivity/types.d.ts b/packages/svelte/src/internal/client/reactivity/types.d.ts
index 8dffe7001e..b5397230cf 100644
--- a/packages/svelte/src/internal/client/reactivity/types.d.ts
+++ b/packages/svelte/src/internal/client/reactivity/types.d.ts
@@ -36,7 +36,6 @@ export interface Derived<V = unknown> extends Value<V>, Reaction {
 
 export interface Effect extends Reaction {
 	parent: Effect | null;
-	dom: Dom | null;
 	nodes: null | { start: undefined | null | TemplateNode; end: TemplateNode };
 	/** The associated component context */
 	ctx: null | ComponentContext;