fix(ssr): should also escape static text content

fix vuejs#6345
FranklinTesla · Sep 5, 2017 · 0a1653a · 0a1653a
1 parent 90323b1
commit 0a1653a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/src/server/optimizing-compiler/codegen.js b/src/server/optimizing-compiler/codegen.js
@@ -22,8 +22,8 @@ import {
   applyModelTransform
 } from './modules'
 
+import { escape } from 'web/server/util'
 import { optimizability } from './optimizer'
-
 import type { CodegenResult } from 'compiler/codegen/index'
 
 export type StringSegment = {
@@ -222,7 +222,7 @@ function nodesToSegments (
     } else if (c.type === 2) {
       segments.push({ type: INTERPOLATION, value: c.expression })
     } else if (c.type === 3) {
-      segments.push({ type: RAW, value: c.text })
+      segments.push({ type: RAW, value: escape(c.text) })
     }
   }
   return segments

diff --git a/test/ssr/ssr-string.spec.js b/test/ssr/ssr-string.spec.js
@@ -908,6 +908,15 @@ describe('SSR: renderToString', () => {
       done()
     })
   })
+
+  it('should escape static strings', done => {
+    renderVmWithOptions(({
+      template: `<div>&lt;foo&gt;</div>`
+    }), res => {
+      expect(res).toBe(`<div data-server-rendered="true">&lt;foo&gt;</div>`)
+      done()
+    })
+  })
 })
 
 function renderVmWithOptions (options, cb) {