feat(ssr): upgrade to support Meteor 2.7

Author: Akryum

packages/vue-ssr/package.js

@@ -1,6 +1,6 @@
 Package.describe({
   name: 'akryum:vue-ssr',
-  version: '0.4.0',
+  version: '0.5.0',
   summary: 'Render Vue server-side',
   git: 'https://github.com/Akryum/meteor-vue-component',
   documentation: 'README.md',
@@ -19,7 +19,7 @@ Package.onUse(function (api) {
     'routepolicy',
     'url',
     'akryum:[email protected]',
-    'staringatlights:fast-render@3.2.0',
+    'communitypackages:fast-render@4.0.6',
     'ejson',
     'server-render',
   ])

packages/vue-ssr/server/context.js

@@ -1,7 +1,7 @@
 // server/ssr_context.js
 // stolen from https://github.com/kadirahq/flow-router/blob/ssr/server/ssr_context.js
 
-import { FastRender } from 'meteor/staringatlights:fast-render'
+import { FastRender } from 'meteor/communitypackages:fast-render'
 
 export default class SsrContext {
   constructor () {

packages/vue-ssr/server/index.js

@@ -2,8 +2,7 @@ import Vue from 'vue'
 import { createRenderer } from 'vue-server-renderer'
 import { WebApp } from 'meteor/webapp'
 import cookieParser from 'cookie-parser'
-import { onPageLoad } from 'meteor/server-render'
-import { FastRender } from 'meteor/staringatlights:fast-render'
+import { FastRender } from 'meteor/communitypackages:fast-render'
 
 import SsrContext from './context'
 import patchSubscribeData from './data'
@@ -70,98 +69,59 @@ function writeServerError (sink) {
 
 WebApp.rawConnectHandlers.use(cookieParser())
 
-onPageLoad(sink => new Promise((resolve, reject) => {
+FastRender.onPageLoad(sink => new Promise(async (resolve, reject) => {
   const req = sink.request
 
-  // Fast render
-  const loginToken = req.cookies['meteor_login_token']
-  const headers = req.headers
-  const frLoginContext = new FastRender._Context(loginToken, { headers })
-
-  FastRender.frContext.withValue(frLoginContext, function () {
-    // we're stealing all the code from FlowRouter SSR
-    // https://github.com/kadirahq/flow-router/blob/ssr/server/route.js#L61
-    const ssrContext = new SsrContext()
-
-    VueSSR.ssrContext.withValue(ssrContext, () => {
-      try {
-        // const frData = InjectData.getData(res, 'fast-render-data')
-        // if (frData) {
-        //   ssrContext.addData(frData.collectionData)
-        // }
-
-        // Vue
-        const context = { url: req.url }
-        let asyncResult
-        const result = VueSSR.createApp(context)
-        if (result && typeof result.then === 'function') {
-          asyncResult = result
-        } else {
-          asyncResult = Promise.resolve(result)
-        }
-
-        asyncResult.then(app => {
-          renderer.renderToString(
-            app,
-            context,
-            (error, html) => {
-              if (error) {
-                console.error(error)
-                writeServerError(sink)
-                return
-              }
-
-              // const frContext = FastRender.frContext.get()
-              // const data = frContext.getData()
-              // // InjectData.pushData(res, 'fast-render-data', data)
-              // const injectData = EJSON.stringify({
-              //   'fast-render-data': data,
-              // })
-              // // sink.appendToHead(`<script type="text/inject-data">${encodeURIComponent(injectData)}</script>`)
-
-              let appendHtml
-              if (typeof context.appendHtml === 'function') appendHtml = context.appendHtml()
-
-              const head = ((appendHtml && appendHtml.head) || context.head) || ''
-              const body = ((appendHtml && appendHtml.body) || context.body) || ''
-              const js = ((appendHtml && appendHtml.js) || context.js) || ''
-
-              const script = js && `<script type="text/javascript">${js}</script>`
-
-              sink.renderIntoElementById(VueSSR.outlet, html)
-              sink.appendToHead(head)
-              sink.appendToBody([body, script])
-
-              resolve()
-            },
-          )
-        }).catch(e => {
-          console.error(e)
-          writeServerError(sink)
-          resolve()
-        })
-      } catch (error) {
-        console.error(error)
-        writeServerError(sink)
-        resolve()
+  const ssrContext = new SsrContext()
+
+  await VueSSR.ssrContext.withValue(ssrContext, () => {
+    try {
+      // Vue
+      const context = { url: req.url }
+      let asyncResult
+      const result = VueSSR.createApp(context)
+      if (result && typeof result.then === 'function') {
+        asyncResult = result
+      } else {
+        asyncResult = Promise.resolve(result)
       }
-    })
-  })
-}))
-
-return
-
-/* eslint-disable */
 
-Meteor.bindEnvironment(function () {
-  WebApp.rawConnectHandlers.use(cookieParser())
-
-  WebApp.connectHandlers.use((req, res, next) => {
-    if (!IsAppUrl(req)) {
-      next()
-      return
+      asyncResult.then(app => {
+        renderer.renderToString(
+          app,
+          context,
+          (error, html) => {
+            if (error) {
+              console.error(error)
+              writeServerError(sink)
+              return
+            }
+
+            let appendHtml
+            if (typeof context.appendHtml === 'function') appendHtml = context.appendHtml()
+
+            const head = ((appendHtml && appendHtml.head) || context.head) || ''
+            const body = ((appendHtml && appendHtml.body) || context.body) || ''
+            const js = ((appendHtml && appendHtml.js) || context.js) || ''
+
+            const script = js && `<script type="text/javascript">${js}</script>`
+
+            sink.renderIntoElementById(VueSSR.outlet, html)
+            sink.appendToHead(head)
+            sink.appendToBody([body, script])
+
+            resolve()
+          },
+        )
+      }).catch(e => {
+        console.error(e)
+        writeServerError(sink)
+        resolve()
+      })
+    } catch (error) {
+      console.error(error)
+      writeServerError(sink)
+      resolve()
     }
-
-
   })
-})()
+}))