folder template-html-loader into vue-loader

Author: yyx990803

lib/loader.js

@@ -17,6 +17,8 @@ var rewriters = {
   style: require.resolve('./style-rewriter')
 }
 
+var templateLoader = require.resolve('./template-loader')
+
 module.exports = function (content) {
 
   var defaultLoaders = {
@@ -105,7 +107,7 @@ module.exports = function (content) {
       // unknown lang, infer the loader to be used
       switch (type) {
         case 'template':
-          return defaultLoaders.html + '!' + rewriter + 'template-html-loader?raw&engine=' + lang + '!'
+          return defaultLoaders.html + '!' + rewriter + templateLoader + '?raw&engine=' + lang + '!'
         case 'style':
           return defaultLoaders.css + '!' + rewriter + lang + '!'
         case 'script':

lib/template-loader.js

@@ -0,0 +1,39 @@
+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.parseQuery(this.query)
+
+  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]) {
+    throw new Error(
+      'Template engine \'' + opt.engine + '\' ' +
+      'isn\'t available in Consolidate.js'
+    )
+  }
+
+  // for relative includes
+  opt.filename = this.resourcePath
+
+  cons[opt.engine].render(content, opt, function (err, html) {
+    if (err) {
+      throw err
+    }
+    exportContent(html)
+  })
+}

package.json

@@ -30,6 +30,7 @@
   },
   "dependencies": {
     "autoprefixer": "^6.0.3",
+    "consolidate": "^0.14.0",
     "de-indent": "^1.0.0",
     "hash-sum": "^1.0.2",
     "loader-utils": "^0.2.10",
@@ -73,7 +74,6 @@
     "rimraf": "^2.4.0",
     "vue-style-loader": "^1.0.0",
     "stylus-loader": "^1.4.0",
-    "template-html-loader": "^0.0.3",
     "vue-hot-reload-api": "^1.2.0",
     "vue-html-loader": "^1.0.0",
     "webpack": "^1.12.2"