svelte 5.49.0 → 5.49.1

package/package.json

@@ -2,7 +2,7 @@
   "name": "svelte",
   "description": "Cybernetically enhanced web apps",
   "license": "MIT",
-  "version": "5.49.0",
+  "version": "5.49.1",
   "type": "module",
   "types": "./types/index.d.ts",
   "engines": {
@@ -139,7 +139,7 @@
   ],
   "devDependencies": {
     "@jridgewell/trace-mapping": "^0.3.25",
-    "@playwright/test": "^1.46.1",
+    "@playwright/test": "^1.58.0",
     "@rollup/plugin-commonjs": "^28.0.1",
     "@rollup/plugin-node-resolve": "^15.3.0",
     "@rollup/plugin-terser": "^0.4.4",
@@ -165,7 +165,7 @@
     "clsx": "^2.1.1",
     "devalue": "^5.6.2",
     "esm-env": "^1.2.1",
-    "esrap": "^2.2.1",
+    "esrap": "^2.2.2",
     "is-reference": "^3.0.3",
     "locate-character": "^3.0.0",
     "magic-string": "^0.30.11",

package/src/compiler/phases/3-transform/server/visitors/RegularElement.js

@@ -70,8 +70,7 @@ export function RegularElement(node, context) {
 		if (optimiser.expressions.length > 0) {
 			context.state.template.push(
 				create_child_block(
-					b.block([optimiser.apply(), ...state.init, ...build_template(state.template)]),
-					true
+					b.block([optimiser.apply(), ...state.init, ...build_template(state.template)])
 				)
 			);
 		} else {
@@ -133,7 +132,7 @@ export function RegularElement(node, context) {
 
 		if (optimiser.expressions.length > 0) {
 			context.state.template.push(
-				create_child_block(b.block([optimiser.apply(), ...state.init, statement]), true)
+				create_child_block(b.block([optimiser.apply(), ...state.init, statement]))
 			);
 		} else {
 			context.state.template.push(...state.init, statement);
@@ -186,7 +185,7 @@ export function RegularElement(node, context) {
 
 		if (optimiser.expressions.length > 0) {
 			context.state.template.push(
-				create_child_block(b.block([optimiser.apply(), ...state.init, statement]), true)
+				create_child_block(b.block([optimiser.apply(), ...state.init, statement]))
 			);
 		} else {
 			context.state.template.push(...state.init, statement);
@@ -236,18 +235,19 @@ export function RegularElement(node, context) {
 	}
 
 	if (optimiser.is_async()) {
-		let statement = create_child_block(
-			b.block([optimiser.apply(), ...state.init, ...build_template(state.template)]),
-			true
-		);
+		let statements = [...state.init, ...build_template(state.template)];
+
+		if (optimiser.has_await) {
+			statements = [create_child_block(b.block([optimiser.apply(), ...statements]))];
+		}
 
 		const blockers = optimiser.blockers();
 
 		if (blockers.elements.length > 0) {
-			statement = create_async_block(b.block([statement]), blockers, false, false);
+			statements = [create_async_block(b.block(statements), blockers, false, false)];
 		}
 
-		context.state.template.push(statement);
+		context.state.template.push(...statements);
 	} else {
 		context.state.init.push(...state.init);
 		context.state.template.push(...state.template);

package/src/compiler/phases/3-transform/server/visitors/SvelteElement.js

@@ -79,7 +79,7 @@ export function SvelteElement(node, context) {
 	);
 
 	if (optimiser.expressions.length > 0) {
-		statement = create_child_block(b.block([optimiser.apply(), statement]), true);
+		statement = create_child_block(b.block([optimiser.apply(), statement]));
 	}
 
 	statements.push(statement);

package/src/compiler/phases/3-transform/server/visitors/shared/utils.js

@@ -264,11 +264,10 @@ export function build_getter(node, state) {
 /**
  * Creates a `$$renderer.child(...)` expression statement
  * @param {BlockStatement | Expression} body
- * @param {boolean} async
  * @returns {Statement}
  */
-export function create_child_block(body, async) {
-	return b.stmt(b.call('$$renderer.child', b.arrow([b.id('$$renderer')], body, async)));
+export function create_child_block(body) {
+	return b.stmt(b.call('$$renderer.child', b.arrow([b.id('$$renderer')], body, true)));
 }
 
 /**

package/src/compiler/print/index.js

@@ -115,57 +115,17 @@ function base_element(node, context) {
 	const is_doctype_node = node.name.toLowerCase() === '!doctype';
 	const is_self_closing =
 		is_void(node.name) || (node.type === 'Component' && node.fragment.nodes.length === 0);
-	let multiline_content = false;
 
 	if (is_doctype_node) child_context.write(`>`);
 	else if (is_self_closing) {
 		child_context.write(`${multiline_attributes ? '' : ' '}/>`);
 	} else {
 		child_context.write('>');
-
-		// Process the element's content in a separate context for measurement
-		const content_context = child_context.new();
-		const allow_inline_content = child_context.measure() < LINE_BREAK_THRESHOLD;
-		block(content_context, node.fragment, allow_inline_content);
-
-		// Determine if content should be formatted on multiple lines
-		multiline_content = content_context.measure() > LINE_BREAK_THRESHOLD;
-
-		if (multiline_content) {
-			child_context.newline();
-
-			// Only indent if attributes are inline and content itself isn't already multiline
-			const should_indent = !multiline_attributes && !content_context.multiline;
-			if (should_indent) {
-				child_context.indent();
-			}
-
-			child_context.append(content_context);
-
-			if (should_indent) {
-				child_context.dedent();
-			}
-
-			child_context.newline();
-		} else {
-			child_context.append(content_context);
-		}
-
+		block(child_context, node.fragment, true);
 		child_context.write(`</${node.name}>`);
 	}
 
-	const break_line_after = child_context.measure() > LINE_BREAK_THRESHOLD;
-
-	if ((multiline_content || multiline_attributes) && !context.empty()) {
-		context.newline();
-	}
-
 	context.append(child_context);
-
-	if (is_self_closing) return;
-	if (multiline_content || multiline_attributes || break_line_after) {
-		context.newline();
-	}
 }
 
 /** @type {Visitors<AST.SvelteNode>} */
@@ -412,6 +372,8 @@ const svelte_visitors = {
 				}
 			} else {
 				sequence.push(child_node);
+
+				if (child_node.type === 'RegularElement') flush();
 			}
 		}
 
@@ -420,18 +382,20 @@ const svelte_visitors = {
 		let multiline = false;
 		let width = 0;
 
-		const child_contexts = items.map((sequence) => {
-			const child_context = context.new();
+		const child_contexts = items
+			.filter((x) => x.length > 0)
+			.map((sequence) => {
+				const child_context = context.new();
 
-			for (const node of sequence) {
-				child_context.visit(node);
-				multiline ||= child_context.multiline;
-			}
+				for (const node of sequence) {
+					child_context.visit(node);
+					multiline ||= child_context.multiline;
+				}
 
-			width += child_context.measure();
+				width += child_context.measure();
 
-			return child_context;
-		});
+				return child_context;
+			});
 
 		multiline ||= width > LINE_BREAK_THRESHOLD;
 

package/src/internal/client/dom/operations.js

@@ -122,6 +122,10 @@ export function child(node, is_text) {
 		return text;
 	}
 
+	if (is_text) {
+		merge_text_nodes(/** @type {Text} */ (child));
+	}
+
 	set_hydrate_node(child);
 	return child;
 }
@@ -142,14 +146,18 @@ export function first_child(node, is_text = false) {
 		return first;
 	}
 
-	// if an {expression} is empty during SSR, there might be no
-	// text node to hydrate — we must therefore create one
-	if (is_text && hydrate_node?.nodeType !== TEXT_NODE) {
-		var text = create_text();
+	if (is_text) {
+		// if an {expression} is empty during SSR, there might be no
+		// text node to hydrate — we must therefore create one
+		if (hydrate_node?.nodeType !== TEXT_NODE) {
+			var text = create_text();
 
-		hydrate_node?.before(text);
-		set_hydrate_node(text);
-		return text;
+			hydrate_node?.before(text);
+			set_hydrate_node(text);
+			return text;
+		}
+
+		merge_text_nodes(/** @type {Text} */ (hydrate_node));
 	}
 
 	return hydrate_node;
@@ -175,20 +183,24 @@ export function sibling(node, count = 1, is_text = false) {
 		return next_sibling;
 	}
 
-	// if a sibling {expression} is empty during SSR, there might be no
-	// text node to hydrate — we must therefore create one
-	if (is_text && next_sibling?.nodeType !== TEXT_NODE) {
-		var text = create_text();
-		// If the next sibling is `null` and we're handling text then it's because
-		// the SSR content was empty for the text, so we need to generate a new text
-		// node and insert it after the last sibling
-		if (next_sibling === null) {
-			last_sibling?.after(text);
-		} else {
-			next_sibling.before(text);
+	if (is_text) {
+		// if a sibling {expression} is empty during SSR, there might be no
+		// text node to hydrate — we must therefore create one
+		if (next_sibling?.nodeType !== TEXT_NODE) {
+			var text = create_text();
+			// If the next sibling is `null` and we're handling text then it's because
+			// the SSR content was empty for the text, so we need to generate a new text
+			// node and insert it after the last sibling
+			if (next_sibling === null) {
+				last_sibling?.after(text);
+			} else {
+				next_sibling.before(text);
+			}
+			set_hydrate_node(text);
+			return text;
 		}
-		set_hydrate_node(text);
-		return text;
+
+		merge_text_nodes(/** @type {Text} */ (next_sibling));
 	}
 
 	set_hydrate_node(next_sibling);
@@ -258,3 +270,24 @@ export function set_attribute(element, key, value = '') {
 	}
 	return element.setAttribute(key, value);
 }
+
+/**
+ * Browsers split text nodes larger than 65536 bytes when parsing.
+ * For hydration to succeed, we need to stitch them back together
+ * @param {Text} text
+ */
+export function merge_text_nodes(text) {
+	if (/** @type {string} */ (text.nodeValue).length < 65536) {
+		return;
+	}
+
+	let next = text.nextSibling;
+
+	while (next !== null && next.nodeType === TEXT_NODE) {
+		next.remove();
+
+		/** @type {string} */ (text.nodeValue) += /** @type {string} */ (next.nodeValue);
+
+		next = text.nextSibling;
+	}
+}

package/src/internal/client/dom/template.js

@@ -4,11 +4,13 @@ import { hydrate_next, hydrate_node, hydrating, set_hydrate_node } from './hydra
 import {
 	create_text,
 	get_first_child,
+	get_next_sibling,
 	is_firefox,
 	create_element,
 	create_fragment,
 	create_comment,
-	set_attribute
+	set_attribute,
+	merge_text_nodes
 } from './operations.js';
 import { create_fragment_from_html } from './reconciler.js';
 import { active_effect } from '../runtime.js';
@@ -310,6 +312,8 @@ export function text(value = '') {
 		// if an {expression} is empty during SSR, we need to insert an empty text node
 		node.before((node = create_text()));
 		set_hydrate_node(node);
+	} else {
+		merge_text_nodes(/** @type {Text} */ (node));
 	}
 
 	assign_nodes(node, node);

package/src/internal/server/renderer.js

@@ -11,6 +11,7 @@ import { attributes } from './index.js';
 import { get_render_context, with_render_context, init_render_context } from './render-context.js';
 import { sha256 } from './crypto.js';
 import * as devalue from 'devalue';
+import { noop } from '../shared/utils.js';
 
 /** @typedef {'head' | 'body'} RendererType */
 /** @typedef {{ [key in RendererType]: string }} AccumulatedContent */
@@ -162,6 +163,11 @@ export class Renderer {
 			promises.push(promise);
 		}
 
+		// prevent unhandled rejections, and attach the promise to the renderer instance
+		// so that rejections correctly cause rendering to fail
+		promise.catch(noop);
+		this.promise = promise;
+
 		return promises;
 	}
 

package/src/version.js

@@ -4,5 +4,5 @@
  * The current version, as set in package.json.
  * @type {string}
  */
-export const VERSION = '5.49.0';
+export const VERSION = '5.49.1';
 export const PUBLIC_VERSION = '5';