Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions lib/loader.js
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,10 @@ module.exports = function (content) {
if (type === 'styles') {
loader = addCssModulesToLoader(loader, part, index)
}
// 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
if (rewriterInjectRE.test(loader)) {
Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@
"file-loader": "^0.10.0",
"inject-loader": "^2.0.0",
"jsdom": "^9.2.1",
"marked": "^0.3.6",
"memory-fs": "^0.4.1",
"mkdirp": "^0.5.1",
"mocha": "^3.2.0",
Expand Down
1 change: 1 addition & 0 deletions test/fixtures/markdown.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<template>## {{msg}}</template>
20 changes: 20 additions & 0 deletions test/test.js
Original file line number Diff line number Diff line change
Expand Up @@ -504,6 +504,26 @@ describe('vue-loader', function () {
})
})

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()
})
})

it('support chaining with other loaders', done => {
const mockLoaderPath = require.resolve('./mock-loader')
test({
Expand Down