fix #5591: keep ssr template interpolation whitespace-insensitive (#5597)

HerringtonDarkholme · yyx990803 · commit 9ac4c4188d03 · 2017-05-07T21:43:02.000+08:00
diff --git a/src/server/template-renderer/parse-template.js b/src/server/template-renderer/parse-template.js
@@ -2,7 +2,7 @@
 
 const compile = require('lodash.template')
 const compileOptions = {
-  escape: /{{[^{]([\s\S]+?)[^}]}}/g,
+  escape: /{{([^{][\s\S]+?[^}])}}/g,
   interpolate: /{{{([\s\S]+?)}}}/g
 }
 
diff --git a/test/ssr/ssr-template.spec.js b/test/ssr/ssr-template.spec.js
@@ -330,5 +330,38 @@ describe('SSR: template option', () => {
         })
       })
     })
+
+    it('whitespace insensitive interpolation', done => {
+      const interpolateTemplate = `<html><head><title>{{title}}</title></head><body><!--vue-ssr-outlet-->{{{snippet}}}</body></html>`
+      const renderer = createRenderer({
+        template: interpolateTemplate
+      })
+
+      const context = {
+        title: '<script>hacks</script>',
+        snippet: '<div>foo</div>',
+        head: '<meta name="viewport" content="width=device-width">',
+        styles: '<style>h1 { color: red }</style>',
+        state: { a: 1 }
+      }
+
+      renderer.renderToString(new Vue({
+        template: '<div>hi</div>'
+      }), context, (err, res) => {
+        expect(err).toBeNull()
+        expect(res).toContain(
+          `<html><head>` +
+          // double mustache should be escaped
+          `<title>&lt;script&gt;hacks&lt;/script&gt;</title>` +
+          `${context.head}${context.styles}</head><body>` +
+          `<div data-server-rendered="true">hi</div>` +
+          `<script>window.__INITIAL_STATE__={"a":1}</script>` +
+          // triple should be raw
+          `<div>foo</div>` +
+          `</body></html>`
+        )
+        done()
+      })
+    })
   }
 })

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`const compile = require('lodash.template')`
`4`	`4`	`const compileOptions = {`
`5`		`- escape: /{{[^{]([\s\S]+?)[^}]}}/g,`
	`5`	`+ escape: /{{([^{][\s\S]+?[^}])}}/g,`
`6`	`6`	`interpolate: /{{{([\s\S]+?)}}}/g`
`7`	`7`	`}`
`8`	`8`