From 9f923cddbc25d33c9af771204bc6b9447b1c545a Mon Sep 17 00:00:00 2001
From: Andre Asselin <andre.asselin@pointsource.com>
Date: Thu, 26 Jan 2017 16:06:34 -0500
Subject: [PATCH 1/3] Tweak to add the vue template compiler onto any loader
 specified in the vue.loaders configuration.

This enables, for example, using a markdown loader via <template lang="md"> in a .vue file.  Without this tweak, the webpack config has
to specify both the loader that converts the markdown (e.g.) to HTML AND template-compiler to compile it.  That, however doesn't fully work
because the webpack config can't know the moduleId generated by lib/loader.js and pass it in via the `id` parameter, so scoped styles won't
work.
---
 lib/loader.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/loader.js b/lib/loader.js
index 0fd2e973a..a75ae9240 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -57,10 +57,11 @@ module.exports = function (content) {
 
   var bubleOptions = hasBuble && options.buble ? '?' + JSON.stringify(options.buble) : ''
   var defaultLoaders = {
-    html: templateCompilerPath + '?id=' + moduleId,
+    html: '',
     css: (isServer ? '' : styleLoaderPath + '!') + 'css-loader' + (needCssSourceMap ? '?sourceMap' : ''),
     js: hasBuble ? ('buble-loader' + bubleOptions) : hasBabel ? 'babel-loader' : ''
   }
+  var templateCompilerLoaderCommand = templateCompilerPath + '?id=' + moduleId
 
   // check if there are custom loaders specified via
   // webpack config, otherwise use defaults
@@ -147,6 +148,9 @@ module.exports = function (content) {
       if (type === 'styles') {
         loader = addCssModulesToLoader(loader, part, index)
       }
+      if (type === 'template') {
+        loader = templateCompilerLoaderCommand + '!' + loader
+      }
       // inject rewriter before css/html loader for
       // extractTextPlugin use cases
       if (rewriterInjectRE.test(loader)) {
@@ -161,7 +165,7 @@ module.exports = function (content) {
       // unknown lang, infer the loader to be used
       switch (type) {
         case 'template':
-          return defaultLoaders.html + '!' + templateLoaderPath + '?raw&engine=' + lang + '!'
+          return templateCompilerLoaderCommand + '!' + templateLoaderPath + '?raw&engine=' + lang + '!'
         case 'styles':
           loader = addCssModulesToLoader(defaultLoaders.css, part, index)
           return loader + '!' + rewriter + ensureBang(ensureLoader(lang))

From 90051c4a8b3968c31cb09d3b0f714e8571905553 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Tue, 31 Jan 2017 12:27:42 -0500
Subject: [PATCH 2/3] adjustments

---
 lib/loader.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/loader.js b/lib/loader.js
index a75ae9240..657fe3a9d 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -57,11 +57,10 @@ module.exports = function (content) {
 
   var bubleOptions = hasBuble && options.buble ? '?' + JSON.stringify(options.buble) : ''
   var defaultLoaders = {
-    html: '',
+    html: templateCompilerPath + '?id=' + moduleId,
     css: (isServer ? '' : styleLoaderPath + '!') + 'css-loader' + (needCssSourceMap ? '?sourceMap' : ''),
     js: hasBuble ? ('buble-loader' + bubleOptions) : hasBabel ? 'babel-loader' : ''
   }
-  var templateCompilerLoaderCommand = templateCompilerPath + '?id=' + moduleId
 
   // check if there are custom loaders specified via
   // webpack config, otherwise use defaults
@@ -148,8 +147,9 @@ module.exports = function (content) {
       if (type === 'styles') {
         loader = addCssModulesToLoader(loader, part, index)
       }
-      if (type === 'template') {
-        loader = templateCompilerLoaderCommand + '!' + loader
+      // if user defines custom loaders for html, add template compiler to it
+      if (type === 'template' && loader !== defaultLoaders.html) {
+        loader = defaultLoaders.html + '!' + loader
       }
       // inject rewriter before css/html loader for
       // extractTextPlugin use cases
@@ -165,7 +165,7 @@ module.exports = function (content) {
       // unknown lang, infer the loader to be used
       switch (type) {
         case 'template':
-          return templateCompilerLoaderCommand + '!' + templateLoaderPath + '?raw&engine=' + lang + '!'
+          return defaultLoaders.html + '!' + templateLoaderPath + '?raw&engine=' + lang + '!'
         case 'styles':
           loader = addCssModulesToLoader(defaultLoaders.css, part, index)
           return loader + '!' + rewriter + ensureBang(ensureLoader(lang))

From d8d75aeac36d7c2ccbf5293e63a409eb0daec151 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Tue, 31 Jan 2017 12:51:19 -0500
Subject: [PATCH 3/3] add tests for custom html loader

---
 package.json               |  1 +
 test/fixtures/markdown.vue |  1 +
 test/test.js               | 20 ++++++++++++++++++++
 3 files changed, 22 insertions(+)
 create mode 100644 test/fixtures/markdown.vue

diff --git a/package.json b/package.json
index 53f39f140..e9fe58ad2 100644
--- a/package.json
+++ b/package.json
@@ -62,6 +62,7 @@
     "file-loader": "^0.9.0",
     "inject-loader": "^2.0.0",
     "jsdom": "^9.2.1",
+    "marked": "^0.3.6",
     "memory-fs": "^0.3.0",
     "mkdirp": "^0.5.1",
     "mocha": "^3.2.0",
diff --git a/test/fixtures/markdown.vue b/test/fixtures/markdown.vue
new file mode 100644
index 000000000..ea398f3d6
--- /dev/null
+++ b/test/fixtures/markdown.vue
@@ -0,0 +1 @@
+<template>## {{msg}}</template>
diff --git a/test/test.js b/test/test.js
index e7809c5a4..662ffb92a 100644
--- a/test/test.js
+++ b/test/test.js
@@ -497,4 +497,24 @@ describe('vue-loader', function () {
       done()
     })
   })
+
+  it('should allow adding custom html loaders', done => {
+    test({
+      entry: './test/fixtures/markdown.vue',
+      vue: {
+        loaders: {
+          html: 'marked'
+        }
+      }
+    }, (window, module) => {
+      var vnode = mockRender(module, {
+        msg: 'hi'
+      })
+      // <h2 id="-msg-">{{msg}}</h2>
+      expect(vnode.tag).to.equal('h2')
+      expect(vnode.data.attrs.id).to.equal('-msg-')
+      expect(vnode.children[0]).to.equal('hi')
+      done()
+    })
+  })
 })