vuejs-fr
diff --git a/‎lib/loader.js
Copy file name to clipboardExpand all lines: lib/loader.js
+6-4Lines changed: 6 additions & 4 deletions b/‎lib/loader.js
Copy file name to clipboardExpand all lines: lib/loader.js
+6-4Lines changed: 6 additions & 4 deletions
diff --git a/‎package.json
Copy file name to clipboardExpand all lines: package.json
+2-2Lines changed: 2 additions & 2 deletions b/‎package.json
Copy file name to clipboardExpand all lines: package.json
+2-2Lines changed: 2 additions & 2 deletions
@@ -105,15 +105,17 @@ module.exports = function (content) {
       output += getRequire('style', style, i, style.scoped)
     })
 
-    // only one script tag allowed
+    // add require for script
     if (parts.script.length) {
       output += 'module.exports = ' +
         getRequire('script', parts.script[0], 0)
     }
 
-    // only one template tag allowed
+    // add require for template
     if (parts.template.length) {
-      output += 'module.exports.template = ' +
+      output += ';(typeof module.exports === "function" ' +
+        '? module.exports.options ' +
+        ': module.exports).template = ' +
         getRequire('template', parts.template[0], 0, hasLocalStyles)
     }
 
@@ -140,7 +142,7 @@ module.exports = function (content) {
             'var hotAPI = require(' + hotReloadAPIPath + ')\n' +
             'hotAPI.install(require("vue"))\n' +
             'if (!hotAPI.compatible) return\n' +
-            'var id = module.exports.hotID = ' + (scriptString || templateString) + '\n' +
+            'var id = ' + (scriptString || templateString) + '\n' +
             // create the record
             'hotAPI.createRecord(id, module.exports)\n' +
             'module.hot.accept(' + JSON.stringify(accepted) + ', function () {\n' +
 
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "4.0.9",
+  "version": "4.0.10",
   "description": "Vue.js component loader for Webpack",
   "main": "index.js",
   "repository": {
@@ -28,7 +28,7 @@
     "parse5": "^1.5.0",
     "postcss": "^4.1.16",
     "postcss-selector-parser": "^1.1.2",
-    "vue-hot-reload-api": "^1.1.0"
+    "vue-hot-reload-api": "^1.2.0"
   },
   "peerDependencies": {
     "vue-html-loader": "*",