feat: support for compiler 2.6 outputSourceRange

Author: yyx990803

lib/loaders/templateLoader.js

@@ -20,7 +20,10 @@ module.exports = function (source) {
 
   // allow using custom compiler via options
   const compiler = options.compiler || require('vue-template-compiler')
-  const compilerOptions = Object.assign({}, options.compilerOptions, {
+
+  const compilerOptions = Object.assign({
+    outputSourceRange: true
+  }, options.compilerOptions, {
     scopeId: query.scoped ? `data-v-${id}` : null,
     comments: query.comments
   })
@@ -45,17 +48,29 @@ module.exports = function (source) {
   // tips
   if (compiled.tips && compiled.tips.length) {
     compiled.tips.forEach(tip => {
-      loaderContext.emitWarning(tip)
+      loaderContext.emitWarning(typeof tip === 'object' ? tip.msg : tip)
     })
   }
 
   // errors
   if (compiled.errors && compiled.errors.length) {
-    loaderContext.emitError(
-      `\n  Error compiling template:\n${pad(compiled.source)}\n` +
-        compiled.errors.map(e => `  - ${e}`).join('\n') +
+    // 2.6 compiler outputs errors as objects with range
+    if (compiler.generateCodeFrame && finalOptions.outputSourceRange) {
+      loaderContext.emitError(
+        `\n\n  Errors compiling template:\n\n` +
+        compiled.errors.map(({ msg, start, end }) => {
+          const frame = compiler.generateCodeFrame(source, start, end)
+          return `  ${msg}\n\n${pad(frame)}`
+        }).join(`\n\n`) +
         '\n'
-    )
+      )
+    } else {
+      loaderContext.emitError(
+        `\n  Error compiling template:\n${pad(compiled.source)}\n` +
+          compiled.errors.map(e => `  - ${e}`).join('\n') +
+          '\n'
+      )
+    }
   }
 
   const { code } = compiled