Fix #142

Author: Guillaume Chau

packages/vue-component-dev-client/client/dev-client.js

@@ -1,10 +1,10 @@
 
 import Vue from 'vue'
-import {Reload} from 'meteor/reload'
-import {Meteor} from 'meteor/meteor'
-import {Tracker} from 'meteor/tracker'
-import {Autoupdate} from 'meteor/autoupdate'
-import {ReactiveVar} from 'meteor/reactive-var'
+import { Reload } from 'meteor/reload'
+import { Meteor } from 'meteor/meteor'
+import { Tracker } from 'meteor/tracker'
+import { Autoupdate } from 'meteor/autoupdate'
+import { ReactiveVar } from 'meteor/reactive-var'
 import VueHot1 from './vue-hot'
 import VueHot2 from './vue2-hot'
 
@@ -112,6 +112,7 @@ Meteor.startup(function () {
     while (regResult = jsImportsReg.exec(js)) {
       args.push(regResult[2])
     }
+    console.log(args, js)
     args.push(function (require, exports, module) {
       try {
         eval(js)
@@ -161,12 +162,17 @@ Meteor.startup(function () {
   _socket.on('render', function ({hash, template, path}) {
     if (vueVersion === 2) {
       console.log('[HMR] Rerendering ' + path)
-      // console.log(template)
-      var obj
-      eval(`obj = ${template};`)
-      // console.log(obj)
-      VueHotReloadApi.rerender(hash, obj)
-      _suppressNextReload = true
+      console.log(template)
+      let error = true
+      try {
+        var obj
+        eval(`obj = ${template};`)
+        // console.log(obj)
+        VueHotReloadApi.rerender(hash, obj)
+      } catch (e) {
+        error = true
+      }
+      _suppressNextReload = !error
     }
   })
 

packages/vue-component-dev-client/client/vue2-hot.js

@@ -2,7 +2,6 @@ var Vue // late bind
 var version
 var map = window.__VUE_HOT_MAP__ = Object.create(null)
 var installed = false
-var isBrowserify = false
 var initHookName = 'beforeCreate'
 
 exports.install = function (vue, browserify) {
@@ -11,7 +10,6 @@ exports.install = function (vue, browserify) {
 
   Vue = vue.__esModule ? vue.default : vue
   version = Vue.version.split('.').map(Number)
-  isBrowserify = browserify
 
   // compat with < 2.0.0-alpha.7
   if (Vue.config._lifecycleHooks.indexOf('init') > -1) {
@@ -45,7 +43,7 @@ exports.createRecord = function (id, options) {
   makeOptionsHot(id, options)
   map[id] = {
     Ctor: Vue.extend(options),
-    instances: []
+    instances: [],
   }
 }
 
@@ -86,35 +84,45 @@ function injectHook (options, name, hook) {
 
 function tryWrap (fn) {
   return function (id, arg) {
-    try {
-      return fn(id, arg)
-    } catch (e) {
+    try { fn(id, arg) } catch (e) {
       console.error(e)
       console.warn('Something went wrong during Vue component hot-reload. Full reload required.')
       throw e
     }
   }
 }
 
-exports.rerender = tryWrap(function (id, fns) {
+exports.rerender = tryWrap(function (id, options) {
   var record = map[id]
-  record.Ctor.options.render = fns.render
-  record.Ctor.options.staticRenderFns = fns.staticRenderFns
+  console.log(id, record, map)
+  if (typeof options === 'function') {
+    options = options.options
+  }
+  console.log(options)
+  record.Ctor.options.render = options.render
+  record.Ctor.options.staticRenderFns = options.staticRenderFns
   record.instances.slice().forEach(function (instance) {
-    instance.$options.render = fns.render
-    instance.$options.staticRenderFns = fns.staticRenderFns
+    instance.$options.render = options.render
+    instance.$options.staticRenderFns = options.staticRenderFns
     instance._staticTrees = [] // reset static trees
     instance.$forceUpdate()
   })
 })
 
 exports.reload = tryWrap(function (id, options) {
+  if (typeof options === 'function') {
+    options = options.options
+  }
   makeOptionsHot(id, options)
   var record = map[id]
-  record.Ctor.extendOptions = options
-  var newCtor = Vue.extend(options)
+  if (version[1] < 2) {
+    // preserve pre 2.2 behavior for global mixin handling
+    record.Ctor.extendOptions = options
+  }
+  var newCtor = record.Ctor.super.extend(options)
   record.Ctor.options = newCtor.options
   record.Ctor.cid = newCtor.cid
+  record.Ctor.prototype = newCtor.prototype
   if (newCtor.release) {
     // temporary global mixin strategy used in < 2.0.0-alpha.6
     newCtor.release()
@@ -125,8 +133,8 @@ exports.reload = tryWrap(function (id, options) {
       instance.$vnode.context.$forceUpdate()
     } else {
       console.warn('Root or manually mounted instance modified. Full reload required.')
-      needsReload = true;
+      needsReload = true
     }
-  });
+  })
   return needsReload
 })

packages/vue-component-dev-client/package.js

@@ -1,6 +1,6 @@
 Package.describe({
   name: 'akryum:vue-component-dev-client',
-  version: '0.2.6',
+  version: '0.2.7',
   summary: 'Hot-reloading client for vue components',
   git: 'https://github.com/Akryum/meteor-vue-component',
   documentation: 'README.md',

packages/vue-component/package.js

@@ -1,6 +1,6 @@
 Package.describe({
   name: 'akryum:vue-component',
-  version: '0.8.13',
+  version: '0.8.14',
   summary: 'VueJS single-file components that hot-reloads',
   git: 'https://github.com/Akryum/meteor-vue-component',
   documentation: 'README.md'

packages/vue-component/plugin/vue-compiler.js

@@ -596,7 +596,7 @@ function generateJs (vueId, inputFile, compileResult, isHotReload = false) {
 
   if (!isHotReload) {
     // Hot-reloading
-    if (isDev && Meteor.isClient) {
+    if (isDev && inputFile.getArch().indexOf('web') !== -1) {
       js += `\nif(!window.__vue_hot__){
         window.__vue_hot_pending__ = window.__vue_hot_pending__ || {};
         window.__vue_hot_pending__['${vueId}'] = __vue_script__;