switch to vue-html-loader

Author: yyx990803

circle.yml

@@ -1,3 +1,3 @@
 machine:
   node:
-    version: iojs-v2.3.0
+    version: iojs-v4.0.0

lib/loader.js

@@ -23,7 +23,7 @@ module.exports = function (content) {
   // check if there are custom loaders specified with
   // vueLoader.withLoaders(), otherwise use defaults
   var loaders = loaderUtils.parseQuery(this.query)
-  loaders.html = loaders.html || 'html'
+  loaders.html = loaders.html || 'vue-html'
   loaders.css = loaders.css || 'style!css'
   loaders.js = loaders.js || ''
 
@@ -64,7 +64,7 @@ module.exports = function (content) {
       // unknown lang, assume a loader for it is used
       switch (type) {
       case 'template':
-        return 'html!' + rewriter + 'template-html-loader?raw&engine=' + lang + '!'
+        return 'vue-html!' + rewriter + 'template-html?raw&engine=' + lang + '!'
       case 'style':
         return 'style!css!' + rewriter + lang + '!'
       case 'script':
@@ -123,5 +123,5 @@ module.exports = function (content) {
  * end for the extracted parts of a component.
  */
 module.exports.withLoaders = function (opts) {
-  return 'vue-loader?' + JSON.stringify(opts).replace(/!/g, '\\u0021')
+  return 'vue?' + JSON.stringify(opts).replace(/!/g, '\\u0021')
 }

package.json

@@ -31,8 +31,8 @@
     "postcss-selector-parser": "^1.1.2"
   },
   "peerDependencies": {
+    "vue-html-loader": "^1.0.0",
     "css-loader": "*",
-    "html-loader": "*",
     "style-loader": "*"
   },
   "devDependencies": {
@@ -41,7 +41,7 @@
     "chai": "^3.0.0",
     "css-loader": "^0.15.4",
     "eslint": "^1.0.0-rc-1",
-    "html-loader": "^0.3.0",
+    "vue-html-loader": "^1.0.0",
     "jade": "^1.11.0",
     "jsdom": "^5.4.3",
     "mkdirp": "^0.5.1",