From 6e143c1fe63ceca65b692232f02755370c0ba57b Mon Sep 17 00:00:00 2001
From: Dominic Gannaway <dg@domgan.com>
Date: Wed, 11 Dec 2024 11:09:40 +0000
Subject: [PATCH 1/2] fix: better handle hydration of script/style elements

---
 .changeset/rotten-yaks-nail.md                        |  5 +++++
 packages/svelte/src/internal/client/dom/hydration.js  | 11 ++++++++++-
 packages/svelte/src/internal/server/index.js          |  2 +-
 .../svelte/tests/hydration/samples/script/_config.js  | 11 +++++++++++
 .../svelte/tests/hydration/samples/script/main.svelte |  1 +
 5 files changed, 28 insertions(+), 2 deletions(-)
 create mode 100644 .changeset/rotten-yaks-nail.md
 create mode 100644 packages/svelte/tests/hydration/samples/script/_config.js
 create mode 100644 packages/svelte/tests/hydration/samples/script/main.svelte

diff --git a/.changeset/rotten-yaks-nail.md b/.changeset/rotten-yaks-nail.md
new file mode 100644
index 000000000000..bbe9b777ae81
--- /dev/null
+++ b/.changeset/rotten-yaks-nail.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: better handle hydration of script/style elements
diff --git a/packages/svelte/src/internal/client/dom/hydration.js b/packages/svelte/src/internal/client/dom/hydration.js
index 8523ff97d559..58a7efeaa902 100644
--- a/packages/svelte/src/internal/client/dom/hydration.js
+++ b/packages/svelte/src/internal/client/dom/hydration.js
@@ -40,7 +40,16 @@ export function set_hydrate_node(node) {
 }
 
 export function hydrate_next() {
-	return set_hydrate_node(/** @type {TemplateNode} */ (get_next_sibling(hydrate_node)));
+	var sibling = /** @type {TemplateNode} */ (get_next_sibling(hydrate_node));
+	if (sibling === null) {
+		var parent_node_name = hydrate_node.parentNode?.nodeName;
+		// If we're hydrating inside a <script> or <style> element then there is no
+		// closing anchor
+		if (parent_node_name === 'SCRIPT' || parent_node_name === 'STYLE') {
+			return;
+		}
+	}
+	return set_hydrate_node(sibling);
 }
 
 /** @param {TemplateNode} node */
diff --git a/packages/svelte/src/internal/server/index.js b/packages/svelte/src/internal/server/index.js
index b944c602b884..918cdf25cb21 100644
--- a/packages/svelte/src/internal/server/index.js
+++ b/packages/svelte/src/internal/server/index.js
@@ -64,7 +64,7 @@ export function element(payload, tag, attributes_fn = noop, children_fn = noop)
 	payload.out += '<!---->';
 
 	if (tag) {
-		payload.out += `<${tag} `;
+		payload.out += `<${tag}`;
 		attributes_fn();
 		payload.out += `>`;
 
diff --git a/packages/svelte/tests/hydration/samples/script/_config.js b/packages/svelte/tests/hydration/samples/script/_config.js
new file mode 100644
index 000000000000..4723e4e454bc
--- /dev/null
+++ b/packages/svelte/tests/hydration/samples/script/_config.js
@@ -0,0 +1,11 @@
+import { test } from '../../test';
+
+export default test({
+	snapshot(target) {
+		const script = target.querySelector('script');
+
+		return {
+			script
+		};
+	}
+});
diff --git a/packages/svelte/tests/hydration/samples/script/main.svelte b/packages/svelte/tests/hydration/samples/script/main.svelte
new file mode 100644
index 000000000000..3904d47f730f
--- /dev/null
+++ b/packages/svelte/tests/hydration/samples/script/main.svelte
@@ -0,0 +1 @@
+<svelte:element this={"script"}>{"{}"}</svelte:element>

From b71003005e73bb3f020b2f423bb007e9fdb32944 Mon Sep 17 00:00:00 2001
From: Dominic Gannaway <dg@domgan.com>
Date: Wed, 11 Dec 2024 11:45:24 +0000
Subject: [PATCH 2/2] fix: better handle hydration of script/style elements

---
 packages/svelte/src/internal/client/dom/hydration.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/svelte/src/internal/client/dom/hydration.js b/packages/svelte/src/internal/client/dom/hydration.js
index 58a7efeaa902..f2dae36bdec3 100644
--- a/packages/svelte/src/internal/client/dom/hydration.js
+++ b/packages/svelte/src/internal/client/dom/hydration.js
@@ -46,7 +46,7 @@ export function hydrate_next() {
 		// If we're hydrating inside a <script> or <style> element then there is no
 		// closing anchor
 		if (parent_node_name === 'SCRIPT' || parent_node_name === 'STYLE') {
-			return;
+			return hydrate_node;
 		}
 	}
 	return set_hydrate_node(sibling);