From 7e5e4621948a2d930c855196f53fd56ab4b7cf79 Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Sun, 24 Mar 2024 11:25:18 -0400
Subject: [PATCH] feat: use short comments (#10899)

* use short comments

* fix
---
 .../phases/3-transform/server/transform-server.js  |  6 +++---
 packages/svelte/src/internal/server/index.js       |  2 +-
 packages/svelte/tests/html_equal.js                | 14 +++++++-------
 .../_expected-head.html                            |  4 ++--
 .../head-meta-hydrate-duplicate/_expected.html     |  2 +-
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/packages/svelte/src/compiler/phases/3-transform/server/transform-server.js b/packages/svelte/src/compiler/phases/3-transform/server/transform-server.js
index fc5ef8e57e..35b8ef28a8 100644
--- a/packages/svelte/src/compiler/phases/3-transform/server/transform-server.js
+++ b/packages/svelte/src/compiler/phases/3-transform/server/transform-server.js
@@ -1521,7 +1521,7 @@ const template_visitors = {
 		if (node.fallback) {
 			const fallback_stmts = create_block(node, node.fallback.nodes, context);
 			fallback_stmts.unshift(
-				b.stmt(b.assignment('+=', b.id('$$payload.out'), b.literal('<!--ssr:each_else-->')))
+				b.stmt(b.assignment('+=', b.id('$$payload.out'), b.literal('<!ssr:each_else>')))
 			);
 			state.template.push(
 				t_statement(
@@ -1549,14 +1549,14 @@ const template_visitors = {
 
 		const consequent = create_block(node, node.consequent.nodes, context);
 		consequent.unshift(
-			b.stmt(b.assignment('+=', b.id('$$payload.out'), b.literal('<!--ssr:if:true-->')))
+			b.stmt(b.assignment('+=', b.id('$$payload.out'), b.literal('<!ssr:if:true>')))
 		);
 
 		const alternate = node.alternate
 			? /** @type {import('estree').BlockStatement} */ (context.visit(node.alternate))
 			: b.block([]);
 		alternate.body.unshift(
-			b.stmt(b.assignment('+=', b.id('$$payload.out'), b.literal('<!--ssr:if:false-->')))
+			b.stmt(b.assignment('+=', b.id('$$payload.out'), b.literal('<!ssr:if:false>')))
 		);
 
 		state.template.push(
diff --git a/packages/svelte/src/internal/server/index.js b/packages/svelte/src/internal/server/index.js
index bc1caf2d36..8e0651ff93 100644
--- a/packages/svelte/src/internal/server/index.js
+++ b/packages/svelte/src/internal/server/index.js
@@ -637,7 +637,7 @@ export function ensure_array_like(array_like_or_iterator) {
 /** @param {{ anchor: number }} payload */
 export function create_anchor(payload) {
 	const depth = payload.anchor++;
-	return `<!--ssr:${depth}-->`;
+	return `<!ssr:${depth}>`;
 }
 
 /** @returns {[() => false, (value: boolean) => void]} */
diff --git a/packages/svelte/tests/html_equal.js b/packages/svelte/tests/html_equal.js
index 9303fea184..a53f3ef35e 100644
--- a/packages/svelte/tests/html_equal.js
+++ b/packages/svelte/tests/html_equal.js
@@ -77,7 +77,7 @@ export function normalize_html(
 	try {
 		const node = window.document.createElement('div');
 		node.innerHTML = html
-			.replace(/(<!--.*?-->)/g, preserveComments ? '$1' : '')
+			.replace(/(<!(--)?.*?\2>)/g, preserveComments ? '$1' : '')
 			.replace(/(data-svelte-h="[^"]+")/g, removeDataSvelte ? '' : '$1')
 			.replace(/>[ \t\n\r\f]+</g, '><')
 			.trim();
@@ -135,15 +135,15 @@ export function setup_html_equal(options = {}) {
 		try {
 			assert.deepEqual(
 				withoutNormalizeHtml
-					? normalize_new_line(actual)
+					? normalize_new_line(actual.trim())
 							.replace(/(\sdata-svelte-h="[^"]+")/g, options.removeDataSvelte ? '' : '$1')
-							.replace(/(<!--.*?-->)/g, preserveComments !== false ? '$1' : '')
-					: normalize_html(window, actual, { ...options, preserveComments }),
+							.replace(/(<!(--)?.*?\2>)/g, preserveComments !== false ? '$1' : '')
+					: normalize_html(window, actual.trim(), { ...options, preserveComments }),
 				withoutNormalizeHtml
-					? normalize_new_line(expected)
+					? normalize_new_line(expected.trim())
 							.replace(/(\sdata-svelte-h="[^"]+")/g, options.removeDataSvelte ? '' : '$1')
-							.replace(/(<!--.*?-->)/g, preserveComments !== false ? '$1' : '')
-					: normalize_html(window, expected, { ...options, preserveComments }),
+							.replace(/(<!(--)?.*?\2>)/g, preserveComments !== false ? '$1' : '')
+					: normalize_html(window, expected.trim(), { ...options, preserveComments }),
 				message
 			);
 		} catch (e) {
diff --git a/packages/svelte/tests/server-side-rendering/samples/head-meta-hydrate-duplicate/_expected-head.html b/packages/svelte/tests/server-side-rendering/samples/head-meta-hydrate-duplicate/_expected-head.html
index 74821a4d73..0e12a4a9de 100644
--- a/packages/svelte/tests/server-side-rendering/samples/head-meta-hydrate-duplicate/_expected-head.html
+++ b/packages/svelte/tests/server-side-rendering/samples/head-meta-hydrate-duplicate/_expected-head.html
@@ -1,6 +1,6 @@
-<!--ssr:0-->
+<!ssr:0>
 <title>Some Title</title>
 <link rel="canonical" href="/">
 <meta name="description" content="some description">
 <meta name="keywords" content="some keywords">
-<!--ssr:0-->
+<!ssr:0>
diff --git a/packages/svelte/tests/server-side-rendering/samples/head-meta-hydrate-duplicate/_expected.html b/packages/svelte/tests/server-side-rendering/samples/head-meta-hydrate-duplicate/_expected.html
index b5fd3947d5..b43330ef0a 100644
--- a/packages/svelte/tests/server-side-rendering/samples/head-meta-hydrate-duplicate/_expected.html
+++ b/packages/svelte/tests/server-side-rendering/samples/head-meta-hydrate-duplicate/_expected.html
@@ -1 +1 @@
-<!--ssr:0--><div>Just a dummy page.</div><!--ssr:0-->
\ No newline at end of file
+<!ssr:0><div>Just a dummy page.</div><!ssr:0>