feat: implement template option for vue-server-renderer

yyx990803 · yyx990803 · commit 1c7959252433 · 2017-02-13T13:34:05.000-05:00
diff --git a/flow/modules.js b/flow/modules.js
@@ -31,12 +31,18 @@ declare module 'de-indent' {
 }
 
 declare module 'vue-ssr-html-stream' {
+  declare interface parsedTemplate {
+    head: string;
+    neck: string;
+    tail: string;
+  }
   declare interface HTMLStreamOptions {
-    template: string;
-    context: Object;
+    template: string | parsedTemplate;
+    context?: ?Object;
   }
-  declare class HTMLStream extends stream$Transform {
+  declare class exports extends stream$Transform {
     constructor(options: HTMLStreamOptions): void;
+    static parseTemplate(template: string): parsedTemplate;
+    static renderTemplate(template: parsedTemplate, content: string, context?: ?Object): string;
   }
-  declare module.exports: HTMLStream
 }
diff --git a/package.json b/package.json
@@ -111,6 +111,7 @@
     "selenium-server": "^2.53.1",
     "typescript": "^2.0.9",
     "uglify-js": "^2.6.2",
+    "vue-ssr-html-stream": "^2.1.0",
     "vue-ssr-webpack-plugin": "^1.0.0",
     "webpack": "^2.2.0",
     "weex-js-runtime": "^0.17.0-alpha4",
diff --git a/packages/vue-server-renderer/README.md b/packages/vue-server-renderer/README.md
@@ -110,34 +110,16 @@ bundleRenderer
 
 ## Renderer Options
 
-### directives
-
-Allows you to provide server-side implementations for your custom directives:
-
-``` js
-const renderer = createRenderer({
-  directives: {
-    example (vnode, directiveMeta) {
-      // transform vnode based on directive binding metadata
-    }
-  }
-})
-```
-
-As an example, check out [`v-show`'s server-side implementation](https://github.com/vuejs/vue/blob/dev/src/platforms/web/server/directives/show.js).
-
----
-
 ### cache
 
-Provide a [component cache](#component-caching) implementation. The cache object must implement the following interface:
+Provide a [component cache](#component-caching) implementation. The cache object must implement the following interface (using Flow notations):
 
 ``` js
-{
-  get: (key: string, [cb: Function]) => string | void,
-  set: (key: string, val: string) => void,
-  has?: (key: string, [cb: Function]) => boolean | void // optional
-}
+type RenderCache = {
+  get: (key: string, cb?: Function) => string | void;
+  set: (key: string, val: string) => void;
+  has?: (key: string, cb?: Function) => boolean | void;
+};
 ```
 
 A typical usage is passing in an [lru-cache](https://github.com/isaacs/node-lru-cache):
@@ -170,6 +152,60 @@ const renderer = createRenderer({
 })
 ```
 
+---
+
+### template
+
+> New in 2.2.0
+
+Provide a template for the entire page's HTML. The template should contain a comment `<!--vue-ssr-outlet-->` which serves as the placeholder for rendered app content.
+
+In addition, when both a template and a render context is provided (e.g. when using the `bundleRenderer`), the renderer will also automatically inject the following properties found on the render context:
+
+- `context.head`: (string) any head markup that should be injected into the head of the page. Note when using the bundle format generated with `vue-ssr-webpack-plugin`, this property will automatically contain `<link rel="preload/prefetch">` directives for chunks in the bundle.
+
+- `context.styles`: (string) any inline CSS that should be injected into the head of the page. Note that `vue-loader` 10.2.0+ (which uses `vue-style-loader` 2.0) will automatically populate this property with styles used in rendered components.
+
+- `context.state`: (Object) initial Vuex store state that should be inlined in the page as `window.__INITIAL_STATE__`. The inlined JSON is automatically sanitized with [serialize-javascript](https://github.com/yahoo/serialize-javascript).
+
+**Example:**
+
+``` js
+const renderer = createRenderer({
+  template:
+    '<!DOCTYPE html>' +
+    '<html lang="en">' +
+      '<head>' +
+        '<meta charset="utf-8">' +
+        // context.head will be injected here
+        // context.styles will be injected here
+      '</head>' +
+      '<body>' +
+        '<!--vue-ssr-outlet-->' + // <- app content rendered here
+        // context.state will be injected here
+      '</body>' +
+    '</html>'
+})
+```
+
+---
+
+### directives
+
+Allows you to provide server-side implementations for your custom directives:
+
+``` js
+const renderer = createRenderer({
+  directives: {
+    example (vnode, directiveMeta) {
+      // transform vnode based on directive binding metadata
+    }
+  }
+})
+```
+
+As an example, check out [`v-show`'s server-side implementation](https://github.com/vuejs/vue/blob/dev/src/platforms/web/server/directives/show.js).
+
 ## Why Use `bundleRenderer`?
 
 In a typical Node.js app, the server is a long-running process. If we directly require our application code, the instantiated modules will be shared across every request. This imposes some inconvenient restrictions to the application structure: we will have to avoid any use of global stateful singletons (e.g. the store), otherwise state mutations caused by one request will affect the result of the next.
diff --git a/packages/vue-server-renderer/package.json b/packages/vue-server-renderer/package.json
@@ -19,7 +19,9 @@
   },
   "dependencies": {
     "he": "^1.1.0",
-    "de-indent": "^1.0.2"
+    "de-indent": "^1.0.2",
+    "source-map": "0.5.6",
+    "vue-ssr-html-stream": "^2.1.0"
   },
   "homepage": "https://github.com/vuejs/vue/tree/dev/packages/vue-server-renderer#readme"
 }
diff --git a/src/entries/web-server-renderer.js b/src/entries/web-server-renderer.js
@@ -12,14 +12,16 @@ export function createRenderer (options?: Object = {}): {
   renderToString: Function,
   renderToStream: Function
 } {
-  // user can provide server-side implementations for custom directives
-  // when creating the renderer.
-  const directives = Object.assign(baseDirectives, options.directives)
   return _createRenderer({
     isUnaryTag,
     modules,
-    directives,
-    cache: options.cache
+    // user can provide server-side implementations for custom directives
+    // when creating the renderer.
+    directives: Object.assign(baseDirectives, options.directives),
+    // component cache (optional)
+    cache: options.cache,
+    // page template (optional)
+    template: options.template
   })
 }
 
diff --git a/src/server/create-bundle-renderer.js b/src/server/create-bundle-renderer.js
@@ -60,7 +60,7 @@ export function createBundleRendererCreator (createRenderer: () => Renderer) {
             renderer.renderToString(app, (err, res) => {
               rewriteErrorTrace(err, maps)
               cb(err, res)
-            })
+            }, context)
           }
         })
       },
@@ -76,11 +76,23 @@ export function createBundleRendererCreator (createRenderer: () => Renderer) {
           })
         }).then(app => {
           if (app) {
-            const renderStream = renderer.renderToStream(app)
+            const renderStream = renderer.renderToStream(app, context)
+
             renderStream.on('error', err => {
               rewriteErrorTrace(err, maps)
               res.emit('error', err)
             })
+
+            // relay HTMLStream special events
+            if (rendererOptions && rendererOptions.template) {
+              renderStream.on('beforeStart', () => {
+                res.emit('beforeStart')
+              })
+              renderStream.on('beforeEnd', () => {
+                res.emit('beforeEnd')
+              })
+            }
+
             renderStream.pipe(res)
           }
         })
diff --git a/src/server/create-renderer.js b/src/server/create-renderer.js
@@ -1,12 +1,14 @@
 /* @flow */
 
+const HTMLStream = require('vue-ssr-html-stream')
+
 import RenderStream from './render-stream'
 import { createWriteFunction } from './write'
 import { createRenderFunction } from './render'
 
 export type Renderer = {
   renderToString: (component: Component, cb: (err: ?Error, res: ?string) => void) => void;
-  renderToStream: (component: Component) => RenderStream;
+  renderToStream: (component: Component) => stream$Readable;
 };
 
 type RenderCache = {
@@ -27,32 +29,54 @@ export function createRenderer ({
   modules = [],
   directives = {},
   isUnaryTag = (() => false),
+  template,
   cache
 }: RenderOptions = {}): Renderer {
   const render = createRenderFunction(modules, directives, isUnaryTag, cache)
+  const parsedTemplate = template && HTMLStream.parseTemplate(template)
 
   return {
     renderToString (
       component: Component,
-      done: (err: ?Error, res: ?string) => any
+      done: (err: ?Error, res: ?string) => any,
+      context?: ?Object
     ): void {
       let result = ''
       const write = createWriteFunction(text => {
         result += text
       }, done)
       try {
         render(component, write, () => {
+          if (parsedTemplate) {
+            result = HTMLStream.renderTemplate(parsedTemplate, result, context)
+          }
           done(null, result)
         })
       } catch (e) {
         done(e)
       }
     },
 
-    renderToStream (component: Component): RenderStream {
-      return new RenderStream((write, done) => {
+    renderToStream (
+      component: Component,
+      context?: ?Object
+    ): stream$Readable {
+      const renderStream = new RenderStream((write, done) => {
         render(component, write, done)
       })
+      if (!parsedTemplate) {
+        return renderStream
+      } else {
+        const htmlStream = new HTMLStream({
+          template: parsedTemplate,
+          context
+        })
+        renderStream.on('error', err => {
+          htmlStream.emit('error', err)
+        })
+        renderStream.pipe(htmlStream)
+        return htmlStream
+      }
     }
   }
 }
diff --git a/test/ssr/ssr-bundle-render.spec.js b/test/ssr/ssr-bundle-render.spec.js
@@ -4,12 +4,7 @@ import MemoeryFS from 'memory-fs'
 import VueSSRPlugin from 'vue-ssr-webpack-plugin'
 import { createBundleRenderer } from '../../packages/vue-server-renderer'
 
-const rendererCache = {}
 function createRenderer (file, cb, options) {
-  if (!options && rendererCache[file]) {
-    return cb(rendererCache[file])
-  }
-
   const asBundle = !!(options && options.asBundle)
   if (options) delete options.asBundle
 
@@ -41,7 +36,7 @@ function createRenderer (file, cb, options) {
     const bundle = asBundle
       ? JSON.parse(fs.readFileSync('/vue-ssr-bundle.json', 'utf-8'))
       : fs.readFileSync('/bundle.js', 'utf-8')
-    const renderer = rendererCache[file] = createBundleRenderer(bundle, options)
+    const renderer = createBundleRenderer(bundle, options)
     cb(renderer)
   })
 }
@@ -224,4 +219,56 @@ describe('SSR: bundle renderer', () => {
       })
     }, { asBundle: true })
   })
+
+  it('renderToString with template', done => {
+    createRenderer('app.js', renderer => {
+      const context = {
+        head: '<meta name="viewport" content="width=device-width">',
+        styles: '<style>h1 { color: red }</style>',
+        state: { a: 1 },
+        url: '/test'
+      }
+      renderer.renderToString(context, (err, res) => {
+        expect(err).toBeNull()
+        expect(res).toContain(
+          `<html><head>${context.head}${context.styles}</head><body>` +
+          `<div server-rendered="true">/test</div>` +
+          `<script>window.__INITIAL_STATE__={"a":1}</script>` +
+          `</body></html>`
+        )
+        expect(context.msg).toBe('hello')
+        done()
+      })
+    }, {
+      template: `<html><head></head><body><!--vue-ssr-outlet--></body></html>`
+    })
+  })
+
+  it('renderToStream with template', done => {
+    createRenderer('app.js', renderer => {
+      const context = {
+        head: '<meta name="viewport" content="width=device-width">',
+        styles: '<style>h1 { color: red }</style>',
+        state: { a: 1 },
+        url: '/test'
+      }
+      const stream = renderer.renderToStream(context)
+      let res = ''
+      stream.on('data', chunk => {
+        res += chunk.toString()
+      })
+      stream.on('end', () => {
+        expect(res).toContain(
+          `<html><head>${context.head}${context.styles}</head><body>` +
+          `<div server-rendered="true">/test</div>` +
+          `<script>window.__INITIAL_STATE__={"a":1}</script>` +
+          `</body></html>`
+        )
+        expect(context.msg).toBe('hello')
+        done()
+      })
+    }, {
+      template: `<html><head></head><body><!--vue-ssr-outlet--></body></html>`
+    })
+  })
 })
diff --git a/test/ssr/ssr-stream.spec.js b/test/ssr/ssr-stream.spec.js
@@ -102,4 +102,34 @@ describe('SSR: renderToStream', () => {
     stream1.read(1)
     stream2.read(1)
   })
+
+  it('should accept template option', done => {
+    const renderer = createRenderer({
+      template: `<html><head></head><body><!--vue-ssr-outlet--></body></html>`
+    })
+
+    const context = {
+      head: '<meta name="viewport" content="width=device-width">',
+      styles: '<style>h1 { color: red }</style>',
+      state: { a: 1 }
+    }
+
+    const stream = renderer.renderToStream(new Vue({
+      template: '<div>hi</div>'
+    }), context)
+
+    let res = ''
+    stream.on('data', chunk => {
+      res += chunk
+    })
+    stream.on('end', () => {
+      expect(res).toContain(
+        `<html><head>${context.head}${context.styles}</head><body>` +
+        `<div server-rendered="true">hi</div>` +
+        `<script>window.__INITIAL_STATE__={"a":1}</script>` +
+        `</body></html>`
+      )
+      done()
+    })
+  })
 })
diff --git a/test/ssr/ssr-string.spec.js b/test/ssr/ssr-string.spec.js
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -31,12 +31,18 @@ declare module 'de-indent' {`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`declare module 'vue-ssr-html-stream' {`
	`34`	`+ declare interface parsedTemplate {`
	`35`	`+ head: string;`
	`36`	`+ neck: string;`
	`37`	`+ tail: string;`
	`38`	`+ }`
`34`	`39`	`declare interface HTMLStreamOptions {`
`35`		`- template: string;`
`36`		`- context: Object;`
	`40`	`+ template: string \| parsedTemplate;`
	`41`	`+ context?: ?Object;`
`37`	`42`	`}`
`38`		`- declare class HTMLStream extends stream$Transform {`
	`43`	`+ declare class exports extends stream$Transform {`
`39`	`44`	`constructor(options: HTMLStreamOptions): void;`
	`45`	`+ static parseTemplate(template: string): parsedTemplate;`
	`46`	`+ static renderTemplate(template: parsedTemplate, content: string, context?: ?Object): string;`
`40`	`47`	`}`
`41`		`- declare module.exports: HTMLStream`
`42`	`48`	`}`
-Original file line number
+Diff line change
   version "5.0.3"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.0.3.tgz#77466de589cd5d3c95f138aa78bc569a3cb5d27a"
 +serialize-javascript@^1.3.0:
 +  version "1.3.0"
 +  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.3.0.tgz#86a4f3752f5c7e47295449b0bbb63d64ba533f05"
++
 set-blocking@^2.0.0, set-blocking@~2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-2.0.1.tgz#c066afb582bb1cb4128d60ea92392e94d5e9dbec"
 +vue-ssr-html-stream@^2.1.0:
 +  version "2.1.0"
 +  resolved "https://registry.yarnpkg.com/vue-ssr-html-stream/-/vue-ssr-html-stream-2.1.0.tgz#d26f5ae744ee43ca99e1b4652316f74e93a67a22"
 +  dependencies:
 +    serialize-javascript "^1.3.0"
++
 vue-ssr-webpack-plugin@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/vue-ssr-webpack-plugin/-/vue-ssr-webpack-plugin-1.0.0.tgz#00b35a6b7d23689c65c1af838ef416b0a772b8f5"