adjust renderToString context argument position

yyx990803 · yyx990803 · commit 67d02fbf3ff8 · 2017-04-20T10:15:41.000+08:00
diff --git a/src/server/bundle-renderer/create-bundle-renderer.js b/src/server/bundle-renderer/create-bundle-renderer.js
@@ -89,10 +89,10 @@ export function createBundleRendererCreator (createRenderer: () => Renderer) {
           cb(err)
         }).then(app => {
           if (app) {
-            renderer.renderToString(app, (err, res) => {
+            renderer.renderToString(app, context, (err, res) => {
               rewriteErrorTrace(err, maps)
               cb(err, res)
-            }, context)
+            })
           }
         })
       },
diff --git a/src/server/create-renderer.js b/src/server/create-renderer.js
@@ -7,8 +7,8 @@ import { createRenderFunction } from './render'
 import type { ClientManifest } from './template-renderer/index'
 
 export type Renderer = {
-  renderToString: (component: Component, cb: (err: ?Error, res: ?string) => void) => void;
-  renderToStream: (component: Component) => stream$Readable;
+  renderToString: (component: Component, context: any, cb: any) => void;
+  renderToStream: (component: Component, context?: Object) => stream$Readable;
 };
 
 type RenderCache = {
@@ -51,9 +51,13 @@ export function createRenderer ({
   return {
     renderToString (
       component: Component,
-      done: (err: ?Error, res: ?string) => any,
-      context?: ?Object
+      context: any,
+      done: any
     ): void {
+      if (typeof context === 'function') {
+        done = context
+        context = {}
+      }
       if (context) {
         templateRenderer.bindRenderFns(context)
       }
@@ -76,7 +80,7 @@ export function createRenderer ({
 
     renderToStream (
       component: Component,
-      context?: ?Object
+      context?: Object
     ): stream$Readable {
       if (context) {
         templateRenderer.bindRenderFns(context)
diff --git a/test/ssr/ssr-template.spec.js b/test/ssr/ssr-template.spec.js
@@ -54,7 +54,7 @@ describe('SSR: template option', () => {
 
     renderer.renderToString(new Vue({
       template: '<div>hi</div>'
-    }), (err, res) => {
+    }), context, (err, res) => {
       expect(err).toBeNull()
       expect(res).toContain(
         `<html><head>${context.head}${context.styles}</head><body>` +
@@ -63,7 +63,7 @@ describe('SSR: template option', () => {
         `</body></html>`
       )
       done()
-    }, context)
+    })
   })
 
   it('renderToString with interpolation', done => {
@@ -81,7 +81,7 @@ describe('SSR: template option', () => {
 
     renderer.renderToString(new Vue({
       template: '<div>hi</div>'
-    }), (err, res) => {
+    }), context, (err, res) => {
       expect(err).toBeNull()
       expect(res).toContain(
         `<html><head>` +
@@ -95,7 +95,7 @@ describe('SSR: template option', () => {
         `</body></html>`
       )
       done()
-    }, context)
+    })
   })
 
   it('renderToStream', done => {
