From d7a5d0924c3646d651586615b3f3923d052d978c Mon Sep 17 00:00:00 2001
From: Guillaume Chau <alphadelta.fg@gmail.com>
Date: Sun, 28 Jan 2018 03:06:12 +0100
Subject: [PATCH] Versions bumps + deps update + internal refactoring

---
 .eslintrc.js                                  |   1 +
 packages/npm-check/package.js                 |   1 -
 packages/vue-coffee/package.js                |   2 +-
 .../.npm/package/npm-shrinkwrap.json          | 162 ++++++----------
 packages/vue-component-dev-client/package.js  |   1 -
 packages/vue-component-dev-server/package.js  |   1 -
 packages/vue-component/package.js             |  15 +-
 packages/vue-component/plugin/post-css.js     |  15 +-
 packages/vue-component/plugin/tag-handler.js  | 175 +++++++----------
 packages/vue-component/plugin/tag-scanner.js  | 111 -----------
 packages/vue-component/plugin/vue-compiler.js |  17 +-
 packages/vue-less/package.js                  |   2 +-
 packages/vue-pug/package.js                   |   2 +-
 packages/vue-router2/package.js               |   3 +-
 packages/vue-sass/package.js                  |   5 +-
 packages/vue-ssr/README.md                    |  15 +-
 packages/vue-ssr/package.js                   |   9 +-
 packages/vue-ssr/server/index.js              | 182 +++++++++---------
 packages/vue-stylus/package.js                |   3 +-
 19 files changed, 248 insertions(+), 474 deletions(-)
 delete mode 100644 packages/vue-component/plugin/tag-scanner.js

diff --git a/.eslintrc.js b/.eslintrc.js
index b7f7735..dcfc56e 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -16,6 +16,7 @@ module.exports = {
   // Global vars
   globals: {
     'Package': true,
+    'Npm': true,
     'Meteor': true,
     'Tracker': true,
   },
diff --git a/packages/npm-check/package.js b/packages/npm-check/package.js
index ac178e0..be00eac 100644
--- a/packages/npm-check/package.js
+++ b/packages/npm-check/package.js
@@ -18,6 +18,5 @@ Package.registerBuildPlugin({
 })
 
 Package.onUse(function (api) {
-  api.versionsFrom('1.6')
   api.use('isobuild:compiler-plugin@1.0.0')
 })
diff --git a/packages/vue-coffee/package.js b/packages/vue-coffee/package.js
index 9a2dcc9..329503c 100644
--- a/packages/vue-coffee/package.js
+++ b/packages/vue-coffee/package.js
@@ -8,7 +8,7 @@ Package.describe({
 
 Package.registerBuildPlugin({
   name: 'vue-component-coffee',
-  use: ['ecmascript@0.10.0', 'coffeescript-compiler@2.0.3_1'],
+  use: ['ecmascript@0.10.0', 'coffeescript-compiler@2.0.3_4'],
   sources: ['vue-coffee.js'],
 })
 
diff --git a/packages/vue-component-dev-client/.npm/package/npm-shrinkwrap.json b/packages/vue-component-dev-client/.npm/package/npm-shrinkwrap.json
index a53e300..50fc416 100644
--- a/packages/vue-component-dev-client/.npm/package/npm-shrinkwrap.json
+++ b/packages/vue-component-dev-client/.npm/package/npm-shrinkwrap.json
@@ -2,14 +2,19 @@
   "lockfileVersion": 1,
   "dependencies": {
     "after": {
-      "version": "0.8.1",
-      "resolved": "https://registry.npmjs.org/after/-/after-0.8.1.tgz",
-      "integrity": "sha1-q11PuIP1loFtNRX495HAr0ht1ic="
+      "version": "0.8.2",
+      "resolved": "https://registry.npmjs.org/after/-/after-0.8.2.tgz",
+      "integrity": "sha1-/ts5T58OAqqXaOcCvaI7UF+ufh8="
     },
     "arraybuffer.slice": {
-      "version": "0.0.6",
-      "resolved": "https://registry.npmjs.org/arraybuffer.slice/-/arraybuffer.slice-0.0.6.tgz",
-      "integrity": "sha1-8zshWfBTKj8xB6JywMz70a0peco="
+      "version": "0.0.7",
+      "resolved": "https://registry.npmjs.org/arraybuffer.slice/-/arraybuffer.slice-0.0.7.tgz",
+      "integrity": "sha512-wGUIVQXuehL5TCqQun8OW81jGzAWycqzFF8lFp+GOM5BXLYj3bKNsYC4daB7n6XjCqxQA/qgTJ+8ANR3acjrog=="
+    },
+    "async-limiter": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.0.tgz",
+      "integrity": "sha512-jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg=="
     },
     "backo2": {
       "version": "1.0.2",
@@ -17,14 +22,9 @@
       "integrity": "sha1-MasayLEpNjRj41s+u2n038+6eUc="
     },
     "base64-arraybuffer": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.2.tgz",
-      "integrity": "sha1-R030qfLaJOBd8xWMOx2zw81GoVQ="
-    },
-    "benchmark": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/benchmark/-/benchmark-1.0.0.tgz",
-      "integrity": "sha1-Lx4vpMNZ8REiqhgwgiGOlX45DHM="
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz",
+      "integrity": "sha1-c5JncZI7Whl0etZmqlzUv5xunOg="
     },
     "better-assert": {
       "version": "1.0.2",
@@ -47,9 +47,9 @@
       "integrity": "sha1-AMYIq33Nk4l8AAllGx06jh5zu9E="
     },
     "component-emitter": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.0.tgz",
-      "integrity": "sha1-zNETqGOI0GSC0D3j/H35hSa6jv4="
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz",
+      "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY="
     },
     "component-inherit": {
       "version": "0.0.3",
@@ -57,38 +57,24 @@
       "integrity": "sha1-ZF/ErfWLcrZJ1crmUTVhnbJv8UM="
     },
     "debug": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
-      "integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo="
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA=="
     },
     "engine.io-client": {
-      "version": "1.6.9",
-      "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-1.6.9.tgz",
-      "integrity": "sha1-HWrUgEilCDyVCWlDsp0279shJAE=",
-      "dependencies": {
-        "component-emitter": {
-          "version": "1.1.2",
-          "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.1.2.tgz",
-          "integrity": "sha1-KWWU8nU9qmOZbSrwjRWpURbJrsM="
-        }
-      }
+      "version": "3.1.4",
+      "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.1.4.tgz",
+      "integrity": "sha1-T88TcLRxY70s6b4nM5ckMDUNTqE="
     },
     "engine.io-parser": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-1.2.4.tgz",
-      "integrity": "sha1-4Il7C/FOeS1M0qWVBVORnFaUjEI=",
-      "dependencies": {
-        "has-binary": {
-          "version": "0.1.6",
-          "resolved": "https://registry.npmjs.org/has-binary/-/has-binary-0.1.6.tgz",
-          "integrity": "sha1-JTJvOc+k9hath4eJTjryz7x7bhA="
-        }
-      }
-    },
-    "has-binary": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/has-binary/-/has-binary-0.1.7.tgz",
-      "integrity": "sha1-aOYesWIQyVRaClzOBqhzkS/h5ow="
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-2.1.2.tgz",
+      "integrity": "sha512-dInLFzr80RijZ1rGpx1+56/uFoH7/7InhH3kZt+Ms6hT8tNx3NGW/WNSA/f8As1WkOfkuyb3tnRyuXGxusclMw=="
+    },
+    "has-binary2": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-binary2/-/has-binary2-1.0.2.tgz",
+      "integrity": "sha1-6D26SfC5vk0CbSc2U1DZ8D9Uvpg="
     },
     "has-cors": {
       "version": "1.1.0",
@@ -101,61 +87,44 @@
       "integrity": "sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10="
     },
     "isarray": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-      "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8="
-    },
-    "json3": {
-      "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/json3/-/json3-3.3.2.tgz",
-      "integrity": "sha1-PAQ0dD35Pi9cQq7nsZvLSDV19OE="
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.1.tgz",
+      "integrity": "sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4="
     },
     "ms": {
-      "version": "0.7.1",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz",
-      "integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg="
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
     },
     "object-component": {
       "version": "0.0.3",
       "resolved": "https://registry.npmjs.org/object-component/-/object-component-0.0.3.tgz",
       "integrity": "sha1-8MaapQ78lbhmwYb0AKM3acsvEpE="
     },
-    "options": {
-      "version": "0.0.6",
-      "resolved": "https://registry.npmjs.org/options/-/options-0.0.6.tgz",
-      "integrity": "sha1-7CLTEoBrtT5zF3Pnza788cZDEo8="
-    },
-    "parsejson": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/parsejson/-/parsejson-0.0.1.tgz",
-      "integrity": "sha1-mxDGwNglq1ieaFFTgm3go7oni8w="
-    },
     "parseqs": {
-      "version": "0.0.2",
-      "resolved": "https://registry.npmjs.org/parseqs/-/parseqs-0.0.2.tgz",
-      "integrity": "sha1-nf5wss3aw4i95PNbHyQPpYrb5sc="
+      "version": "0.0.5",
+      "resolved": "https://registry.npmjs.org/parseqs/-/parseqs-0.0.5.tgz",
+      "integrity": "sha1-1SCKNzjkZ2bikbouoXNoSSGouJ0="
     },
     "parseuri": {
-      "version": "0.0.4",
-      "resolved": "https://registry.npmjs.org/parseuri/-/parseuri-0.0.4.tgz",
-      "integrity": "sha1-gGWCo5iH4eoY3V4v4OAZAiaOk1A="
+      "version": "0.0.5",
+      "resolved": "https://registry.npmjs.org/parseuri/-/parseuri-0.0.5.tgz",
+      "integrity": "sha1-gCBKUNTbt3m/3G6+J3jZDkvOMgo="
+    },
+    "safe-buffer": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
+      "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="
     },
     "socket.io-client": {
-      "version": "1.4.6",
-      "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-1.4.6.tgz",
-      "integrity": "sha1-SbC6U379FbgpfIQBbmQuHHx1LD0="
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-2.0.4.tgz",
+      "integrity": "sha1-CRilUkBtxeVAs4Dc2Xr8SmQzL44="
     },
     "socket.io-parser": {
-      "version": "2.2.6",
-      "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-2.2.6.tgz",
-      "integrity": "sha1-ON/WHfUNz4qx2eIJEyK/kCuii5k=",
-      "dependencies": {
-        "component-emitter": {
-          "version": "1.1.2",
-          "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.1.2.tgz",
-          "integrity": "sha1-KWWU8nU9qmOZbSrwjRWpURbJrsM="
-        }
-      }
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.1.2.tgz",
+      "integrity": "sha1-28IoIVH8T6675Aru3Ady66YZ9/I="
     },
     "to-array": {
       "version": "0.1.4",
@@ -163,24 +132,19 @@
       "integrity": "sha1-F+bBH3PdTz10zaek/zI46a2b+JA="
     },
     "ultron": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.0.2.tgz",
-      "integrity": "sha1-rOEWq1V80Zc4ak6I9GhTeMiy5Po="
-    },
-    "utf8": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/utf8/-/utf8-2.1.0.tgz",
-      "integrity": "sha1-DP7FyAUtRKI+OqqQgQToB1+V39U="
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.1.1.tgz",
+      "integrity": "sha512-UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og=="
     },
     "ws": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-1.0.1.tgz",
-      "integrity": "sha1-fQsqLljN3YGQOcKcneZQReGzEOk="
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-3.3.3.tgz",
+      "integrity": "sha512-nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA=="
     },
     "xmlhttprequest-ssl": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.1.tgz",
-      "integrity": "sha1-O3dB/qSoZnWXbpCNKW1ERZYfqmc="
+      "version": "1.5.5",
+      "resolved": "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.5.tgz",
+      "integrity": "sha1-wodrBhaKrcQOV9l+gRkayPQ5iz4="
     },
     "yeast": {
       "version": "0.1.2",
diff --git a/packages/vue-component-dev-client/package.js b/packages/vue-component-dev-client/package.js
index 5ae2b57..19253da 100644
--- a/packages/vue-component-dev-client/package.js
+++ b/packages/vue-component-dev-client/package.js
@@ -8,7 +8,6 @@ Package.describe({
 })
 
 Package.onUse(function (api) {
-  api.versionsFrom('1.6')
   api.use('ecmascript')
   api.use('reload')
   api.use('autoupdate')
diff --git a/packages/vue-component-dev-server/package.js b/packages/vue-component-dev-server/package.js
index 120ec46..4acf05e 100644
--- a/packages/vue-component-dev-server/package.js
+++ b/packages/vue-component-dev-server/package.js
@@ -8,7 +8,6 @@ Package.describe({
 })
 
 Package.onUse(function (api) {
-  api.versionsFrom('1.6')
   api.use('ecmascript')
   api.use('webapp')
   api.mainModule('server/main.js', 'server')
diff --git a/packages/vue-component/package.js b/packages/vue-component/package.js
index 341db10..2bae03e 100644
--- a/packages/vue-component/package.js
+++ b/packages/vue-component/package.js
@@ -10,7 +10,7 @@ Package.registerBuildPlugin({
   name: 'vue-component',
   use: [
     'ecmascript@0.10.0',
-    'caching-compiler@1.1.9',
+    'caching-compiler@1.1.11',
     'babel-compiler@7.0.0',
     'templating-tools@1.1.2',
   ],
@@ -19,33 +19,30 @@ Package.registerBuildPlugin({
     'plugin/utils.js',
     'plugin/dev-server.js',
     'plugin/post-css.js',
-    'plugin/tag-scanner.js',
     'plugin/tag-handler.js',
     'plugin/vue-compiler.js',
     'plugin/plugin.js',
   ],
   npmDependencies: {
-    'postcss': '5.2.17',
+    'postcss': '6.0.16',
     'postcss-load-config': '1.2.0',
     'postcss-selector-parser': '2.2.3',
-    'postcss-modules': '0.6.4',
+    'postcss-modules': '1.1.0',
     'socket.io': '2.0.4',
-    'async': '2.5.0',
+    'async': '2.6.0',
     'lodash': '4.17.4',
     'hash-sum': '1.0.2',
-    'source-map': '0.6.1',
+    'source-map': '0.7.0',
     'source-map-merger': '0.2.0',
     'generate-source-map': '0.0.5',
-    'autoprefixer': '6.7.7',
+    'autoprefixer': '7.2.5',
     'vue-template-compiler': '2.5.13',
     'vue-template-es2015-compiler': '1.6.0',
-    'parse5': '3.0.2',
     'colors': '1.1.2',
   },
 })
 
 Package.onUse(function (api) {
-  api.versionsFrom('1.6')
   api.use('isobuild:compiler-plugin@1.0.0')
   api.use('akryum:vue-component-dev-server@0.1.0')
   api.use('akryum:vue-component-dev-client@0.4.0')
diff --git a/packages/vue-component/plugin/post-css.js b/packages/vue-component/plugin/post-css.js
index 7704bac..2865e29 100644
--- a/packages/vue-component/plugin/post-css.js
+++ b/packages/vue-component/plugin/post-css.js
@@ -65,9 +65,9 @@ scopeId = postcss.plugin('add-id', ({ id }) => root => {
           }
           // /deep/ alias for >>>, since >>> doesn't work in SASS
           if (n.type === 'tag' && n.value === '/deep/') {
-            const next = n.next()
-            if (next.type === 'combinator' && next.value === ' ') {
-              next.remove()
+            const prev = n.prev()
+            if (prev && prev.type === 'combinator' && prev.value === ' ') {
+              prev.remove()
             }
             n.remove()
             return false
@@ -99,10 +99,11 @@ scopeId = postcss.plugin('add-id', ({ id }) => root => {
       if (/-?animation$/.test(decl.prop)) {
         decl.value = decl.value.split(',')
           .map(v => {
-            const vals = v.split(/\s+/)
-            const name = vals[0]
-            if (keyframes[name]) {
-              return [keyframes[name]].concat(vals.slice(1)).join(' ')
+            const vals = v.trim().split(/\s+/)
+            const i = vals.findIndex(val => keyframes[val])
+            if (i !== -1) {
+              vals.splice(i, 1, keyframes[vals[i]])
+              return vals.join(' ')
             } else {
               return v
             }
diff --git a/packages/vue-component/plugin/tag-handler.js b/packages/vue-component/plugin/tag-handler.js
index d09c756..c1e1728 100644
--- a/packages/vue-component/plugin/tag-handler.js
+++ b/packages/vue-component/plugin/tag-handler.js
@@ -8,85 +8,45 @@ global._vue_js_cache = global._vue_js_cache || {}
 
 // Tag handler
 VueComponentTagHandler = class VueComponentTagHandler {
-  constructor ({ inputFile, parts, babelOptions, dependencyManager }) {
+  constructor ({ inputFile, parts, babelOptions, dependencyManager, sfcDescriptor }) {
     this.inputFile = inputFile
     this.parts = parts
     this.babelOptions = babelOptions
     this.dependencyManager = dependencyManager
-
-    this.component = {
-      template: null,
-      script: null,
-      styles: [],
-    }
+    this.sfcDescriptor = sfcDescriptor
+
+    // Load 'src'
+    this.sfcDescriptor.template && this.processBlockSrc(this.sfcDescriptor.template)
+    this.sfcDescriptor.script && this.processBlockSrc(this.sfcDescriptor.script)
+    this.sfcDescriptor.styles && this.sfcDescriptor.styles.forEach(
+      block => this.processBlockSrc(block)
+    )
   }
 
-  addTagToResults (tag) {
-    this.tag = tag
-
-    if (this.tag.tagName === 'template') {
-      if (this.component.template) {
-        throwCompileError({
-          inputFile: this.inputFile,
-          message: 'Only one <template> allowed in component file',
-          tag: 'template',
-          charIndex: this.tag.tagStartIndex,
-        })
-      }
-
-      this.component.template = this.tag
-    } else if (this.tag.tagName === 'script') {
-      if (this.component.script) {
-        throwCompileError({
-          inputFile: this.inputFile,
-          message: 'Only one <script> allowed in component file',
-          tag: 'script',
-          charIndex: this.tag.tagStartIndex,
-        })
-      }
-
-      this.component.script = this.tag
-    } else if (this.tag.tagName === 'style') {
-      this.component.styles.push(this.tag)
-    } else {
-      throwCompileError({
-        inputFile: this.inputFile,
-        message: 'Expected <template>, <script>, or <style> tag in template file',
-      })
-    }
-
-    if (tag.attribs.src) {
-      if (tag.contents.trim()) {
-        throwCompileError({
-          inputFile: this.inputFile,
-          message: `Should not have any contents if using the 'src' attribute.`,
-          tag: tag.tagName,
-          charIndex: tag.tagStartIndex,
-        })
-      } else {
-        const filePath = path.resolve(path.dirname(getFilePath(this.inputFile)), tag.attribs.src)
-        try {
-          tag.origin = Object.assign({}, tag)
-          tag.basePath = filePath
-          tag.contents = tag.fileContents = getFileContents(filePath)
-          tag.sourceName = filePath
-          tag.tagStartIndex = 0
-          this.dependencyManager.addDependency(filePath)
-        } catch (e) {
-          if (e.message === 'file-not-found') {
-            throwCompileError({
-              inputFile: this.inputFile,
-              message: `File ${filePath} not found.`,
-              tag: tag.tagName,
-              charIndex: tag.tagStartIndex,
-            })
-          } else {
-            throw e
-          }
+  processBlockSrc (sfcBlock) {
+    if (sfcBlock.src) {
+      const filePath = path.resolve(path.dirname(getFilePath(this.inputFile)), sfcBlock.src)
+      try {
+        sfcBlock.origin = Object.assign({}, sfcBlock)
+        sfcBlock.module = filePath
+        sfcBlock.content = getFileContents(filePath)
+        sfcBlock.start = 0
+        sfcBlock.end = sfcBlock.content.length
+        this.dependencyManager.addDependency(filePath)
+      } catch (e) {
+        if (e.message === 'file-not-found') {
+          throwCompileError({
+            inputFile: this.inputFile,
+            message: `File ${filePath} not found.`,
+            tag: sfcBlock.module,
+            charIndex: sfcBlock.start,
+          })
+        } else {
+          throw e
         }
       }
     } else {
-      tag.basePath = path.resolve(getFilePath(this.inputFile))
+      sfcBlock.module = path.resolve(getFilePath(this.inputFile))
     }
   }
 
@@ -102,26 +62,26 @@ VueComponentTagHandler = class VueComponentTagHandler {
     let styles = []
 
     // Script
-    if (this.parts.script && this.component.script) {
-      let tag = this.component.script
-      let script = tag.contents
+    if (this.parts.script && this.sfcDescriptor.script) {
+      let sfcBlock = this.sfcDescriptor.script
+      let script = sfcBlock.content
       let useBabel = true
       jsHash = Hash(script)
 
       const maps = []
 
-      maps.push(generateSourceMap(inputFilePath, source, script, getLineNumber(source, tag.tagStartIndex)))
+      maps.push(generateSourceMap(inputFilePath, source, script, getLineNumber(source, sfcBlock.start)))
 
       // Lang
-      if (tag.attribs.lang !== undefined) {
-        let lang = tag.attribs.lang
+      if (sfcBlock.lang !== undefined) {
+        let lang = sfcBlock.lang
         try {
           let compile = global.vue.lang[lang]
           if (!compile) {
             throwCompileError({
               inputFile: this.inputFile,
               tag: 'script',
-              charIndex: tag.tagStartIndex,
+              charIndex: sfcBlock.start,
               action: 'compiling',
               lang,
               message: `Can't find handler for lang '${lang}', did you install it?`.yellow,
@@ -131,7 +91,7 @@ VueComponentTagHandler = class VueComponentTagHandler {
             let result = compile({
               source: script,
               inputFile: this.inputFile,
-              basePath: tag.basePath,
+              basePath: sfcBlock.module,
               dependencyManager: this.dependencyManager,
             })
             script = result.script
@@ -144,7 +104,7 @@ VueComponentTagHandler = class VueComponentTagHandler {
           throwCompileError({
             inputFile: this.inputFile,
             tag: 'script',
-            charIndex: tag.tagStartIndex,
+            charIndex: sfcBlock.start,
             action: 'compiling',
             lang,
             error: e,
@@ -162,7 +122,7 @@ VueComponentTagHandler = class VueComponentTagHandler {
         this.babelOptions.babelrc = true
         this.babelOptions.sourceMap = true
         this.babelOptions.filename =
-          this.babelOptions.sourceFileName = tag.basePath
+          this.babelOptions.sourceFileName = sfcBlock.module
         this.babelOptions.sourceMapTarget = this.babelOptions.filename + '.map'
 
         // Babel compilation
@@ -176,7 +136,7 @@ VueComponentTagHandler = class VueComponentTagHandler {
           let errorOptions = {
             inputFile: this.inputFile,
             tag: 'script',
-            charIndex: tag.tagStartIndex,
+            charIndex: sfcBlock.start,
             action: 'compiling',
             message: (e.message ? e.message : `An Babel error occured`),
             error: e,
@@ -186,7 +146,7 @@ VueComponentTagHandler = class VueComponentTagHandler {
             errorOptions.line = e.loc.line
             errorOptions.column = e.loc.column
           } else {
-            errorOptions.charIndex = tag.tagStartIndex
+            errorOptions.charIndex = sfcBlock.start
             if (!e.message) {
               errorOptions.showError = true
             } else {
@@ -225,20 +185,20 @@ VueComponentTagHandler = class VueComponentTagHandler {
 
     // Template
     let template
-    if (this.parts.template && this.component.template) {
-      let templateTag = this.component.template
-      template = templateTag.contents
+    if (this.parts.template && this.sfcDescriptor.template) {
+      let sfcBlock = this.sfcDescriptor.template
+      template = sfcBlock.content
 
       // Lang
-      if (templateTag.attribs.lang !== undefined && templateTag.attribs.lang !== 'html') {
-        let lang = templateTag.attribs.lang
+      if (sfcBlock.lang !== undefined && sfcBlock.lang !== 'html') {
+        let lang = sfcBlock.lang
         try {
           let compile = global.vue.lang[lang]
           if (!compile) {
             throwCompileError({
               inputFile: this.inputFile,
               tag: 'template',
-              charIndex: templateTag.tagStartIndex,
+              charIndex: sfcBlock.start,
               action: 'compiling',
               lang,
               message: `Can't find handler for lang '${lang}', did you install it?`.yellow,
@@ -248,7 +208,7 @@ VueComponentTagHandler = class VueComponentTagHandler {
             let result = compile({
               source: template,
               inputFile: this.inputFile,
-              basePath: templateTag.basePath,
+              basePath: sfcBlock.module,
               dependencyManager: this.dependencyManager,
             })
             template = result.template
@@ -257,7 +217,7 @@ VueComponentTagHandler = class VueComponentTagHandler {
           throwCompileError({
             inputFile: this.inputFile,
             tag: 'template',
-            charIndex: templateTag.tagStartIndex,
+            charIndex: sfcBlock.start,
             action: 'compiling',
             lang,
             error: e,
@@ -283,20 +243,20 @@ VueComponentTagHandler = class VueComponentTagHandler {
     // Styles
     let cssModules
     if (this.parts.style) {
-      for (let styleTag of this.component.styles) {
-        let css = styleTag.contents
+      for (let sfcBlock of this.sfcDescriptor.styles) {
+        let css = sfcBlock.content
         let cssMap = null
 
         // Lang
-        if (styleTag.attribs.lang !== undefined && styleTag.attribs.lang !== 'css') {
-          let lang = styleTag.attribs.lang
+        if (sfcBlock.lang !== undefined && sfcBlock.lang !== 'css') {
+          let lang = sfcBlock.lang
           try {
             let compile = global.vue.lang[lang]
             if (!compile) {
               throwCompileError({
                 inputFile: this.inputFile,
                 tag: 'style',
-                charIndex: styleTag.tagStartIndex,
+                charIndex: sfcBlock.start,
                 action: 'compiling',
                 lang,
                 message: `Can't find handler for lang '${lang}', did you install it?`.yellow,
@@ -306,7 +266,7 @@ VueComponentTagHandler = class VueComponentTagHandler {
               let result = compile({
                 source: css,
                 inputFile: this.inputFile,
-                basePath: styleTag.basePath,
+                basePath: sfcBlock.module,
                 dependencyManager: this.dependencyManager,
               })
               // console.log('Css result', result)
@@ -317,7 +277,7 @@ VueComponentTagHandler = class VueComponentTagHandler {
             throwCompileError({
               inputFile: this.inputFile,
               tag: 'style',
-              charIndex: styleTag.tagStartIndex,
+              charIndex: sfcBlock.start,
               action: 'compiling',
               lang,
               error: e,
@@ -335,7 +295,7 @@ VueComponentTagHandler = class VueComponentTagHandler {
           throwCompileError({
             inputFile: this.inputFile,
             tag: 'style',
-            charIndex: styleTag.tagStartIndex,
+            charIndex: sfcBlock.start,
             action: 'configuring PostCSS (custom configuration)',
             error: e,
             showError: true,
@@ -354,7 +314,7 @@ VueComponentTagHandler = class VueComponentTagHandler {
         plugins.push(trimCSS)
 
         // Scoped
-        if (styleTag.attribs.scoped) {
+        if (sfcBlock.scoped) {
           plugins.push(scopeId({
             id: hash,
           }))
@@ -363,7 +323,7 @@ VueComponentTagHandler = class VueComponentTagHandler {
         // CSS Modules
         let isAsync = false
         let defaultModuleName = '$style'
-        if (styleTag.attribs.module) {
+        if (sfcBlock.attrs.module) {
           if (global.vue.cssModules) {
             try {
               let compile = global.vue.cssModules
@@ -373,7 +333,7 @@ VueComponentTagHandler = class VueComponentTagHandler {
                 map: cssMap,
                 inputFile: this.inputFile,
                 dependencyManager: this.dependencyManager,
-                tag: styleTag,
+                tag: sfcBlock,
                 cssModules,
               })
               // console.log('Css result', result)
@@ -387,26 +347,21 @@ VueComponentTagHandler = class VueComponentTagHandler {
               throwCompileError({
                 inputFile: this.inputFile,
                 tag: 'style',
-                charIndex: styleTag.tagStartIndex,
+                charIndex: sfcBlock.start,
                 action: 'compiling css modules',
                 error: e,
                 showError: true,
               })
             }
           } else {
-            const moduleName = typeof styleTag.attribs.module === 'string' ? styleTag.attribs.module : defaultModuleName
-            const scopedModuleName = moduleName !== defaultModuleName ? `__${moduleName}` : ''
+            const moduleName = typeof sfcBlock.attrs.module === 'string' ? sfcBlock.attrs.module : defaultModuleName
             plugins.push(postcssModules({
               getJSON (cssFilename, json) {
                 if (cssModules === undefined) { cssModules = {} }
                 cssModules[moduleName] = { ...(cssModules[moduleName] || {}), ...json }
               },
               generateScopedName (exportedName, filePath) {
-                const path = require('path')
-                let sanitisedPath = path.relative(process.cwd(), filePath).replace(/.*\{}[/\\]/, '').replace(/.*\{.*?}/, 'packages').replace(/\.[^./\\]+$/, '').replace(/[\W_]+/g, '_')
-                const filename = path.basename(filePath).replace(/\.[^./\\]+$/, '').replace(/[\W_]+/g, '_')
-                sanitisedPath = sanitisedPath.replace(new RegExp(`_(${filename})$`), '__$1')
-                return `_${sanitisedPath}${scopedModuleName}__${exportedName}`
+                return `vue-module-${Hash(filePath)}-${Hash(exportedName)}`
               },
             }))
             isAsync = true
@@ -414,7 +369,7 @@ VueComponentTagHandler = class VueComponentTagHandler {
         }
 
         // Autoprefixer
-        if (styleTag.attribs.autoprefix !== 'off') {
+        if (sfcBlock.attrs.autoprefix !== 'off') {
           plugins.push(autoprefixer())
         }
 
diff --git a/packages/vue-component/plugin/tag-scanner.js b/packages/vue-component/plugin/tag-scanner.js
deleted file mode 100644
index 9865332..0000000
--- a/packages/vue-component/plugin/tag-scanner.js
+++ /dev/null
@@ -1,111 +0,0 @@
-import parse5 from 'parse5'
-import { Meteor } from 'meteor/meteor'
-
-scanHtmlForTags = function scanHtmlForTags (options) {
-  try {
-    return parseHtml(options)
-  } catch (e) {
-    throwCompileError(e)
-  }
-}
-
-const parseHtml = Meteor.wrapAsync(({
-  sourceName,
-  contents,
-  tagNames,
-}, cb) => {
-  const tags = []
-
-  const parser = new parse5.SAXParser({
-    locationInfo: true,
-  })
-
-  let depth = 0
-  let info
-
-  function addTag () {
-    const tagContents = contents.substring(info.start.index, info.end.index)
-
-    const tag = {
-      tagName: info.tag.name,
-      attribs: info.tag.attrs,
-      contents: tagContents,
-      contentsStartIndex: info.start.index,
-      tagStartIndex: info.tag.index,
-      fileContents: contents,
-      sourceName: sourceName,
-      startLine: info.start.line,
-      endLine: info.end.line,
-    }
-
-    // save the tag
-    tags.push(tag)
-  }
-
-  parser.on('startTag', (name, attrs, selfClosing, location) => {
-    if (depth === 0) {
-      if (tagNames.indexOf(name) !== -1) {
-        info = {
-          tag: {
-            name,
-            attrs: attrs.reduce((dic, attr) => {
-              const value = attr.value === '' ? true : attr.value
-              dic[attr.name] = value
-              return dic
-            }, {}),
-            index: location.startOffset,
-          },
-          start: {
-            line: location.line,
-            index: location.endOffset,
-          },
-        }
-
-        if (selfClosing) {
-          info.end = {
-            line: location.line,
-            index: location.endOffset,
-          }
-
-          addTag()
-        } else {
-          depth++
-        }
-      }
-    } else if (name === info.tag.name) {
-      depth++
-    }
-  })
-
-  parser.on('endTag', (name, location) => {
-    if (depth !== 0 && name === info.tag.name) {
-      depth--
-
-      if (depth === 0) {
-        info.end = {
-          line: location.line,
-          index: location.startOffset - 1,
-        }
-
-        addTag()
-      }
-    }
-  })
-
-  parser.on('end', () => {
-    if (depth !== 0) {
-      cb({
-        path: sourceName,
-        line: info.start.line,
-        tag: info.tag.name,
-        message: `Missing closing </${info.tag.name}>`,
-      }, null)
-      return
-    }
-
-    cb(null, tags)
-  })
-
-  parser.write(contents)
-  parser.end()
-})
diff --git a/packages/vue-component/plugin/vue-compiler.js b/packages/vue-component/plugin/vue-compiler.js
index 3a5263d..f3c0c65 100644
--- a/packages/vue-component/plugin/vue-compiler.js
+++ b/packages/vue-component/plugin/vue-compiler.js
@@ -531,34 +531,25 @@ class DependencyManager {
   }
 }
 
-function compileTags (inputFile, tags, parts, babelOptions, dependencyManager) {
+function compileTags (inputFile, sfcDescriptor, parts, babelOptions, dependencyManager) {
   var handler = new VueComponentTagHandler({
     inputFile,
     parts,
     babelOptions,
     dependencyManager,
-  })
-
-  tags.forEach((tag) => {
-    handler.addTagToResults(tag)
+    sfcDescriptor,
   })
 
   return handler.getResults()
 }
 
 function compileOneFileWithContents (inputFile, contents, parts, babelOptions) {
-  const inputPath = inputFile.getPathInPackage()
-
   try {
     const cache = Cache.getCache(inputFile)
 
-    const tags = scanHtmlForTags({
-      sourceName: inputPath,
-      contents: contents,
-      tagNames: ['template', 'script', 'style'],
-    })
+    const sfcDescriptor = templateCompiler.parseComponent(contents, { pad: 'line' })
 
-    return compileTags(inputFile, tags, parts, babelOptions, cache.dependencyManager)
+    return compileTags(inputFile, sfcDescriptor, parts, babelOptions, cache.dependencyManager)
   } catch (e) {
     if (e.message && e.line) {
       inputFile.error({
diff --git a/packages/vue-less/package.js b/packages/vue-less/package.js
index 416d0a8..e72e7be 100644
--- a/packages/vue-less/package.js
+++ b/packages/vue-less/package.js
@@ -15,7 +15,7 @@ Package.registerBuildPlugin({
     'vue-less.js',
   ],
   npmDependencies: {
-    'less': '2.7.1',
+    'less': '2.7.3',
   },
 })
 
diff --git a/packages/vue-pug/package.js b/packages/vue-pug/package.js
index 55908cc..38a1bc6 100644
--- a/packages/vue-pug/package.js
+++ b/packages/vue-pug/package.js
@@ -15,7 +15,7 @@ Package.registerBuildPlugin({
     'vue-pug.js',
   ],
   npmDependencies: {
-    'pug': '2.0.0-beta11',
+    'pug': '2.0.0-rc.4',
   },
 })
 
diff --git a/packages/vue-router2/package.js b/packages/vue-router2/package.js
index 928533d..b6c4160 100644
--- a/packages/vue-router2/package.js
+++ b/packages/vue-router2/package.js
@@ -10,7 +10,7 @@ Package.registerBuildPlugin({
   name: 'vue-router',
   use: [
     'ecmascript@0.10.0',
-    'caching-compiler@1.0.5',
+    'caching-compiler@1.1.11',
     'babel-compiler@7.0.0',
   ],
   sources: [
@@ -19,7 +19,6 @@ Package.registerBuildPlugin({
 })
 
 Package.onUse(function (api) {
-  api.versionsFrom('1.6')
   api.use('isobuild:compiler-plugin@1.0.0')
   api.use('ecmascript')
   api.use('akryum:npm-check@0.1.0')
diff --git a/packages/vue-sass/package.js b/packages/vue-sass/package.js
index b7450ec..9a85669 100644
--- a/packages/vue-sass/package.js
+++ b/packages/vue-sass/package.js
@@ -15,12 +15,11 @@ Package.registerBuildPlugin({
     'vue-sass.js',
   ],
   npmDependencies: {
-    'node-sass': '4.5.3',
-    'meteor-project-path': '0.0.1',
+    'node-sass': '4.7.2',
+    'meteor-project-path': '0.0.3',
   },
 })
 
 Package.onUse(function (api) {
-  api.versionsFrom('1.6')
   api.use('isobuild:compiler-plugin@1.0.0')
 })
diff --git a/packages/vue-ssr/README.md b/packages/vue-ssr/README.md
index 7c179bd..4a03ad5 100644
--- a/packages/vue-ssr/README.md
+++ b/packages/vue-ssr/README.md
@@ -96,23 +96,16 @@ VueSSR.createApp = function (context) {
 }
 ```
 
-Add the `<!--vue-ssr-outlet-->` comment in you HTML where you want to render the Vue app. If you don't, the app will be rendered at the beginning of the page body.
+Add the `<div id="app"></div>` element in you HTML where you want to render the Vue app. If you don't, the app will be rendered at the beginning of the page body.
 
-You can change the replacing snippet by setting the `VUE_OUTLET` environment variable, or by setting the `VueSSR.outlet` property:
+You can change the id of the element by setting the `VUE_OUTLET` environment variable, or by setting the `VueSSR.outlet` property:
 
 ```javascript
-VueSSR.outlet = '<!--my-app-here-->'
+VueSSR.outlet = 'my-app'
 ```
 
-You can also customize the template of the rendered HTML with the `VueSSR.template` property:
+In this example, Vue SSR expects a `<div id="my-app">` element in the HTML page.
 
-```javascript
-VueSSR.template = `
-<div class="app-wrapper">
-  <!--vue-ssr-outlet-->
-</div>
-`
-```
 
 *:warning: The CSS can flicker in developpement mode and load after the app is rendered. This is due to the HMR system having to append dynamic style tags in the page to get the fastest reloading possible. This is not the case in production mode (try running your app with `meteor --production`).*
 
diff --git a/packages/vue-ssr/package.js b/packages/vue-ssr/package.js
index 6b262bf..4e2985b 100644
--- a/packages/vue-ssr/package.js
+++ b/packages/vue-ssr/package.js
@@ -7,7 +7,6 @@ Package.describe({
 })
 
 Package.onUse(function (api) {
-  api.versionsFrom('1.6')
   api.use([
     'isobuild:compiler-plugin@1.0.0',
     'ecmascript',
@@ -19,8 +18,9 @@ Package.onUse(function (api) {
     'routepolicy',
     'url',
     'akryum:npm-check@0.1.0',
-    'staringatlights:fast-render@2.16.2',
-    'staringatlights:inject-data@2.0.4',
+    'staringatlights:fast-render@2.16.5',
+    'ejson',
+    'server-render',
   ])
   api.mainModule('server/index.js', 'server')
   api.export('VueSSR', 'server')
@@ -29,6 +29,5 @@ Package.onUse(function (api) {
 Npm.depends({
   'vue-server-renderer': '2.5.13',
   'vue-ssr-html-stream': '2.2.0',
-  'cookie-parser': '1.4.1',
-  'cheerio': '0.20.0',
+  'cookie-parser': '1.4.3',
 })
diff --git a/packages/vue-ssr/server/index.js b/packages/vue-ssr/server/index.js
index 8db211e..4c9dac5 100644
--- a/packages/vue-ssr/server/index.js
+++ b/packages/vue-ssr/server/index.js
@@ -2,7 +2,7 @@ import Vue from 'vue'
 import VueServerRenderer from 'vue-server-renderer/build.js'
 import { WebApp } from 'meteor/webapp'
 import cookieParser from 'cookie-parser'
-import Cheerio from 'cheerio'
+import { onPageLoad } from 'meteor/server-render'
 
 import SsrContext from './context'
 import patchSubscribeData from './data'
@@ -26,9 +26,7 @@ function IsAppUrl (req) {
 
 VueSSR = {}
 
-VueSSR.outlet = process.env.VUE_OUTLET || '<!--vue-ssr-outlet-->'
-
-VueSSR.template = VueSSR.outlet
+VueSSR.outlet = process.env.VUE_OUTLET || 'app'
 
 VueSSR.defaultAppTemplate = `
 <div id="not-the-app" style="font-family: sans-serif;">
@@ -65,11 +63,92 @@ patchSubscribeData(VueSSR)
 
 const renderer = VueServerRenderer.createRenderer()
 
-function writeServerError (res) {
-  res.writeHead(500)
-  res.end('Server Error')
+function writeServerError (sink) {
+  sink.appendToBody('Server Error')
 }
 
+WebApp.rawConnectHandlers.use(cookieParser())
+
+onPageLoad(sink => new Promise((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
+        let asyncResult
+        const result = VueSSR.createApp({ url: req.url })
+        if (result && typeof result.then === 'function') {
+          asyncResult = result
+        } else {
+          asyncResult = Promise.resolve(result)
+        }
+
+        asyncResult.then(result => {
+          let app
+          if (result.app) {
+            app = result.app
+          } else {
+            app = result
+          }
+
+          renderer.renderToString(
+            app,
+            (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>`)
+
+              const script = (result.js && `<script type="text/javascript">${result.js}</script>`) || ''
+
+              sink.renderIntoElementById(VueSSR.outlet, html)
+              sink.appendToBody(script)
+
+              resolve()
+            },
+          )
+        }).catch(e => {
+          console.error(e)
+          writeServerError(sink)
+          resolve()
+        })
+      } catch (error) {
+        console.error(error)
+        writeServerError(sink)
+        resolve()
+      }
+    })
+  })
+}))
+
+return
+
+/* eslint-disable */
+
 Meteor.bindEnvironment(function () {
   WebApp.rawConnectHandlers.use(cookieParser())
 
@@ -79,95 +158,6 @@ Meteor.bindEnvironment(function () {
       return
     }
 
-    // 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
-          let asyncResult
-          const result = VueSSR.createApp({ url: req.url })
-          if (result && typeof result.then === 'function') {
-            asyncResult = result
-          } else {
-            asyncResult = Promise.resolve(result)
-          }
 
-          asyncResult.then(result => {
-            let app
-            if (result.app) {
-              app = result.app
-            } else {
-              app = result
-            }
-
-            renderer.renderToString(
-              app,
-              (error, html) => {
-                if (error) {
-                  console.error(error)
-                  writeServerError(res)
-                  return
-                }
-
-                const frContext = FastRender.frContext.get()
-                const data = frContext.getData()
-                InjectData.pushData(res, 'fast-render-data', data)
-
-                const script = (result.js && `<script type="text/javascript">${result.js}</script>`) || ''
-
-                res.write = patchResWrite(res.write, VueSSR.template.replace(VueSSR.outlet, html) + script)
-
-                next()
-              },
-            )
-          }).catch(e => {
-            console.error(e)
-            writeServerError(res)
-          })
-        } catch (error) {
-          console.error(error)
-          writeServerError(res)
-        }
-      })
-    })
   })
 })()
-
-function patchResWrite (originalWrite, html) {
-  return function (data) {
-    if (typeof data === 'string' && data.indexOf('<!DOCTYPE html>') === 0) {
-      if (data.indexOf(VueSSR.outlet) !== -1) {
-        data = data.replace(VueSSR.outlet, html)
-      } else {
-        data = moveScripts(data)
-        data = data.replace('<body>', '<body>' + html)
-      }
-    }
-
-    originalWrite.call(this, data)
-  }
-}
-
-function moveScripts (data) {
-  const $ = Cheerio.load(data, {
-    decodeEntities: false,
-  })
-  const heads = $('head script')
-  $('body').append(heads)
-  $('head').html($('head').html().replace(/(^[ \t]*\n)/gm, ''))
-
-  return $.html()
-}
diff --git a/packages/vue-stylus/package.js b/packages/vue-stylus/package.js
index 05cc967..412cdac 100644
--- a/packages/vue-stylus/package.js
+++ b/packages/vue-stylus/package.js
@@ -16,11 +16,10 @@ Package.registerBuildPlugin({
   ],
   npmDependencies: {
     stylus: 'https://github.com/meteor/stylus/tarball/bb47a357d132ca843718c63998eb37b90013a449', // fork of 0.54.5
-    nib: '1.1.0',
+    nib: '1.1.2',
   },
 })
 
 Package.onUse(function (api) {
-  api.versionsFrom('1.6')
   api.use('isobuild:compiler-plugin@1.0.0')
 })