Merge branch 'hmr-fix'

Author: Guillaume Chau

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

@@ -201,7 +201,7 @@ exports.reload = tryWrap((id, options) => {
         // preserve pre 2.2 behavior for global mixin handling
         record.Ctor.extendOptions = options
       }
-      const newCtor = record.Ctor.super.extend(options)
+      const newCtor = (record.Ctor.super || record.Ctor).extend(options)
       record.Ctor.options = newCtor.options
       record.Ctor.cid = newCtor.cid
       record.Ctor.prototype = newCtor.prototype

packages/vue-component/plugin/tag-handler.js

@@ -114,7 +114,6 @@ VueComponentTagHandler = class VueComponentTagHandler {
       }
 
       // Export
-      script += `\nreturn require('${this.inputFile.getDisplayPath()}').default`
 
       // Babel
       if (useBabel) {
@@ -180,7 +179,7 @@ VueComponentTagHandler = class VueComponentTagHandler {
       map.names = lastMap.names
       map.file = this.inputFile.getPathInPackage()
 
-      js += '__vue_script__ = (function(){ ' + script + '\n})()'
+      js += 'module.exportDefault = function(value) { __vue_script__ = value; }; (function(){ if (!module.watch) {console.log(\'module\', module);} ' + script + '\n})();'
     }
 
     // Template

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

@@ -342,8 +342,8 @@ class ComponentWatcher {
           this.refresh()
         }
       }, 100, {
-        leading: true,
-        trailing: false,
+        leading: false,
+        trailing: true,
       }))
       this.watcher.on('error', (error) => console.error(error))
     }