better server attribute stringification

sveltejs · Dec 18, 2024 · eb7a516 · eb7a516
1 parent 7c629e8
commit eb7a516
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/packages/svelte/src/internal/server/blocks/svelte-html.js b/packages/svelte/src/internal/server/blocks/svelte-html.js
@@ -1,6 +1,5 @@
 /** @import { Payload } from '#server' */
 
-import { escape_html } from '../../../escaping.js';
 import { svelte_html_duplicate_attribute } from '../../shared/warnings.js';
 
 /**
@@ -14,12 +13,12 @@ export function svelte_html(payload, attributes) {
 		if (payload.htmlAttributes.has(name)) {
 			if (name === 'class') {
 				// Don't bother deduplicating class names, the browser handles it just fine
-				value = `${payload.htmlAttributes.get(name)} ${value}`;
+				value = `${payload.htmlAttributes.get(name)} ${value}`.trim();
 			} else {
 				svelte_html_duplicate_attribute(name);
 			}
 		}
 
-		payload.htmlAttributes.set(name, escape_html(value, true));
+		payload.htmlAttributes.set(name, value);
 	}
 }
diff --git a/packages/svelte/src/internal/server/index.js b/packages/svelte/src/internal/server/index.js
@@ -143,8 +143,9 @@ export function render(component, options = {}) {
 		html: payload.out,
 		body: payload.out,
 		htmlAttributes: [...payload.htmlAttributes]
-			.map(([name, value]) => `${name}="${value}"`)
-			.join(' ')
+			.map(([name, value]) => attr(name, value, is_boolean_attribute(name)))
+			.join('')
+			.trim()
 	};
 }