refactor: improve comment handling in renderVNode to avoid escaping anchors

diff --git a/packages/compiler-ssr/__tests__/ssrVaporAnchors.spec.ts b/packages/compiler-ssr/__tests__/ssrVaporAnchors.spec.ts
index 9b25d11231b4d22059d7bc8a578b942142e65374..d530ee1f4c1253da48aea72b8db28da4b09c6f28 100644 (file)
--- a/packages/compiler-ssr/__tests__/ssrVaporAnchors.spec.ts
+++ b/packages/compiler-ssr/__tests__/ssrVaporAnchors.spec.ts
@@ -178,16 +178,16 @@ describe('insertion anchors', () => {
                     (_ctx.foo)
                       ? (_openBlock(), _createBlock(_Fragment, { key: 0 }, [
                           _createVNode("span"),
-                          _createCommentVNode("if")
+                          _createCommentVNode("<!--if-->")
                         ], 64 /* STABLE_FRAGMENT */))
                       : (_ctx.bar)
                         ? (_openBlock(), _createBlock(_Fragment, { key: 1 }, [
                             _createVNode("span"),
-                            _createCommentVNode("if--><!--if")
+                            _createCommentVNode("<!--if--><!--if-->")
                           ], 64 /* STABLE_FRAGMENT */))
                         : (_openBlock(), _createBlock(_Fragment, { key: 2 }, [
                             _createVNode("span"),
-                            _createCommentVNode("if--><!--if")
+                            _createCommentVNode("<!--if--><!--if-->")
                           ], 64 /* STABLE_FRAGMENT */)),
                     _createCommentVNode("p]"),
                     _createVNode("span")
@@ -335,7 +335,7 @@ describe('insertion anchors', () => {
                             _createCommentVNode("p]"),
                             _createVNode("span")
                           ]),
-                          _createCommentVNode("if")
+                          _createCommentVNode("<!--if-->")
                         ], 64 /* STABLE_FRAGMENT */))
                       : (_ctx.bar)
                         ? (_openBlock(), _createBlock(_Fragment, { key: 1 }, [
@@ -348,7 +348,7 @@ describe('insertion anchors', () => {
                               _createCommentVNode("p]"),
                               _createVNode("span")
                             ]),
-                            _createCommentVNode("if--><!--if")
+                            _createCommentVNode("<!--if--><!--if-->")
                           ], 64 /* STABLE_FRAGMENT */))
                         : (_openBlock(), _createBlock(_Fragment, { key: 2 }, [
                             _createVNode("span", null, [
@@ -360,7 +360,7 @@ describe('insertion anchors', () => {
                               _createCommentVNode("p]"),
                               _createVNode("span")
                             ]),
-                            _createCommentVNode("if--><!--if")
+                            _createCommentVNode("<!--if--><!--if-->")
                           ], 64 /* STABLE_FRAGMENT */)),
                     _createCommentVNode("p]"),
                     _createVNode("span")
@@ -617,21 +617,21 @@ describe('block anchors', () => {
                 (_ctx.count === 1)
                   ? (_openBlock(), _createBlock(_Fragment, { key: 0 }, [
                       _createVNode("span", null, "1"),
-                      _createCommentVNode("if")
+                      _createCommentVNode("<!--if-->")
                     ], 64 /* STABLE_FRAGMENT */))
                   : (_ctx.count === 2)
                     ? (_openBlock(), _createBlock(_Fragment, { key: 1 }, [
                         _createVNode("span", null, "2"),
-                        _createCommentVNode("if--><!--if")
+                        _createCommentVNode("<!--if--><!--if-->")
                       ], 64 /* STABLE_FRAGMENT */))
                     : (_ctx.count === 3)
                       ? (_openBlock(), _createBlock(_Fragment, { key: 2 }, [
                           _createVNode("span", null, "3"),
-                          _createCommentVNode("if--><!--if--><!--if")
+                          _createCommentVNode("<!--if--><!--if--><!--if-->")
                         ], 64 /* STABLE_FRAGMENT */))
                       : (_openBlock(), _createBlock(_Fragment, { key: 3 }, [
                           _createVNode("span", null, "4"),
-                          _createCommentVNode("if--><!--if--><!--if")
+                          _createCommentVNode("<!--if--><!--if--><!--if-->")
                         ], 64 /* STABLE_FRAGMENT */))
               ]
             }
@@ -682,18 +682,18 @@ describe('block anchors', () => {
                 (_ctx.count === 1)
                   ? (_openBlock(), _createBlock(_Fragment, { key: 0 }, [
                       _createVNode("span", { innerHTML: _ctx.html }, null, 8 /* PROPS */, ["innerHTML"]),
-                      _createCommentVNode("if")
+                      _createCommentVNode("<!--if-->")
                     ], 64 /* STABLE_FRAGMENT */))
                   : (_ctx.count === 2)
                     ? (_openBlock(), _createBlock(_Fragment, { key: 1 }, [
                         _createVNode("span", {
                           textContent: _toDisplayString(_ctx.txt)
                         }, null, 8 /* PROPS */, ["textContent"]),
-                        _createCommentVNode("if--><!--if")
+                        _createCommentVNode("<!--if--><!--if-->")
                       ], 64 /* STABLE_FRAGMENT */))
                     : (_openBlock(), _createBlock(_Fragment, { key: 2 }, [
                         _createVNode("span", null, "4"),
-                        _createCommentVNode("if--><!--if")
+                        _createCommentVNode("<!--if--><!--if-->")
                       ], 64 /* STABLE_FRAGMENT */))
               ]
             }

diff --git a/packages/compiler-ssr/src/transforms/ssrTransformComponent.ts b/packages/compiler-ssr/src/transforms/ssrTransformComponent.ts
index e3833a6ef966a3821d1b1d2a583b76af64ca1c64..55ae8e453466f4f65ab9d5d59f00c825c42c0ecd 100644 (file)
--- a/packages/compiler-ssr/src/transforms/ssrTransformComponent.ts
+++ b/packages/compiler-ssr/src/transforms/ssrTransformComponent.ts
@@ -529,9 +529,7 @@ function injectIfAnchors(
     if (blockAnchorLabel) {
       const repeatCount = j - i - (isElse ? 1 : 0) + 1
       wrapperNode.children.push(
-        createAnchor(
-          `<!--${blockAnchorLabel}-->`.repeat(repeatCount).slice(4, -3),
-        ),
+        createAnchor(`<!--${blockAnchorLabel}-->`.repeat(repeatCount)),
       )
     }
     node.children = injectVaporAnchors(node.children, node)

diff --git a/packages/server-renderer/src/render.ts b/packages/server-renderer/src/render.ts
index 221d3895e2288f80699d918f333d3631498825f2..2ff0c499f2794db1fffdfbcee710b703532f6712 100644 (file)
--- a/packages/server-renderer/src/render.ts
+++ b/packages/server-renderer/src/render.ts
@@ -236,11 +236,17 @@ export function renderVNode(
       push(escapeHtml(children as string))
       break
     case Comment:
-      push(
-        children
-          ? `<!--${escapeHtmlComment(children as string)}-->`
-          : `<!---->`,
-      )
+      if (children) {
+        const content = children as string
+        // avoid escaping comments
+        if (content.startsWith('<!--') && content.endsWith('-->')) {
+          push(content)
+        } else {
+          push(`<!--${escapeHtmlComment(content)}-->`)
+        }
+      } else {
+        push(`<!---->`)
+      }
       break
     case Static:
       push(children as string)