simplify template preprocessor

Author: yyx990803

lib/loader.js

@@ -254,7 +254,7 @@ module.exports = function (content) {
       // unknown lang, infer the loader to be used
       switch (type) {
         case 'template':
-          return defaultLoaders.html + '!' + templatePreprocessorPath + '?raw&engine=' + lang + '!'
+          return defaultLoaders.html + '!' + templatePreprocessorPath + '?engine=' + lang + '!'
         case 'styles':
           loader = addCssModulesToLoader(defaultLoaders.css, part, index)
           return loader + '!' + styleCompiler + ensureBang(ensureLoader(lang))

lib/template-compiler/preprocessor.js

@@ -2,35 +2,12 @@
 
 var cons = require('consolidate')
 var loaderUtils = require('loader-utils')
-var extname = require('path').extname
 
 module.exports = function (content) {
   this.cacheable && this.cacheable()
   var callback = this.async()
   var opt = loaderUtils.getOptions(this) || {}
 
-  // this is never documented and should be deprecated
-  // but we'll keep it so we don't break stuff
-  var vue = this.options.__vueOptions__
-  if (vue && vue.template) {
-    for (var key in vue.template) {
-      opt[key] = vue.template[key]
-    }
-  }
-
-  function exportContent (content) {
-    if (opt.raw) {
-      callback(null, content)
-    } else {
-      callback(null, 'module.exports = ' + JSON.stringify(content))
-    }
-  }
-
-  // with no engine given, use the file extension as engine
-  if (!opt.engine) {
-    opt.engine = extname(this.request).substr(1).toLowerCase()
-  }
-
   if (!cons[opt.engine]) {
     return callback(new Error(
       'Template engine \'' + opt.engine + '\' ' +
@@ -45,6 +22,6 @@ module.exports = function (content) {
     if (err) {
       return callback(err)
     }
-    exportContent(html)
+    callback(null, html)
   })
 }