From eb9252b22b41acd20d2592ddcbe41e88f79f0fc0 Mon Sep 17 00:00:00 2001
From: Clark Du <clark.duxin@gmail.com>
Date: Fri, 30 Nov 2018 12:53:28 +0000
Subject: [PATCH 1/3] fix(ssr): renderToString cannot render comment

---
 src/server/optimizing-compiler/codegen.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/server/optimizing-compiler/codegen.js b/src/server/optimizing-compiler/codegen.js
index 26097c07b48..9399761383a 100644
--- a/src/server/optimizing-compiler/codegen.js
+++ b/src/server/optimizing-compiler/codegen.js
@@ -225,7 +225,11 @@ function nodesToSegments (
     } else if (c.type === 2) {
       segments.push({ type: INTERPOLATION, value: c.expression })
     } else if (c.type === 3) {
-      segments.push({ type: RAW, value: escape(c.text) })
+      let text = escape(c.text)
+      if (c.isComment) {
+        text = '<!--' + text + '-->'
+      }
+      segments.push({ type: RAW, value: text })
     }
   }
   return segments

From fdb5c45b1870b7b2cd4498aa4b94413703d67b7c Mon Sep 17 00:00:00 2001
From: Clark Du <clark.duxin@gmail.com>
Date: Wed, 12 Dec 2018 14:53:42 +0000
Subject: [PATCH 2/3] test: add ssr comments test

---
 .../server-compiler/compiler-options.spec.js        | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 test/unit/modules/server-compiler/compiler-options.spec.js

diff --git a/test/unit/modules/server-compiler/compiler-options.spec.js b/test/unit/modules/server-compiler/compiler-options.spec.js
new file mode 100644
index 00000000000..dac831e26b5
--- /dev/null
+++ b/test/unit/modules/server-compiler/compiler-options.spec.js
@@ -0,0 +1,13 @@
+import { ssrCompile } from 'web/server/compiler'
+
+describe('ssrCompile options', () => {
+  it('comments', done => {
+    const compiled = ssrCompile(`
+      <div>
+        <!-- test comments -->
+      </div>
+    `, { comments: true })
+
+    expect(compiled.render).toContain('<!-- test comments -->')
+  })
+})

From 922a111e8b855da98f422372afdc237fda35637b Mon Sep 17 00:00:00 2001
From: Clark Du <clark.duxin@gmail.com>
Date: Wed, 12 Dec 2018 14:59:19 +0000
Subject: [PATCH 3/3] test: remove done

---
 test/unit/modules/server-compiler/compiler-options.spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/unit/modules/server-compiler/compiler-options.spec.js b/test/unit/modules/server-compiler/compiler-options.spec.js
index dac831e26b5..aa151a89f59 100644
--- a/test/unit/modules/server-compiler/compiler-options.spec.js
+++ b/test/unit/modules/server-compiler/compiler-options.spec.js
@@ -1,7 +1,7 @@
 import { ssrCompile } from 'web/server/compiler'
 
 describe('ssrCompile options', () => {
-  it('comments', done => {
+  it('comments', () => {
     const compiled = ssrCompile(`
       <div>
         <!-- test comments -->