Skip to content

Commit fac9899

Browse files
committed
auto pick up buble-loader if it is present
1 parent 1f64dbf commit fac9899

File tree

1 file changed

+9
-6
lines changed

1 file changed

+9
-6
lines changed

lib/loader.js

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,15 @@ var styleRewriterPath = normalize.lib('style-rewriter')
1515
var styleLoaderPath = normalize.dep('vue-style-loader')
1616
var hotReloadAPIPath = normalize.dep('vue-hot-reload-api')
1717

18-
var hasBabel = true
18+
var hasBabel = false
1919
try {
20-
require('babel-loader')
21-
} catch (e) {
22-
hasBabel = false
23-
}
20+
hasBabel = !!require('babel-loader')
21+
} catch (e) {}
22+
23+
var hasBuble = false
24+
try {
25+
hasBuble = !!require('buble-loader')
26+
} catch (e) {}
2427

2528
var rewriterInjectRE = /\b(css(?:-loader)?(?:\?[^!]+)?)(?:!|$)/
2629

@@ -55,7 +58,7 @@ module.exports = function (content) {
5558
var defaultLoaders = {
5659
html: templateCompilerPath + '?id=' + moduleId,
5760
css: styleLoaderPath + '!css-loader' + (needCssSourceMap ? '?sourceMap' : ''),
58-
js: hasBabel ? 'babel-loader' : ''
61+
js: hasBuble ? 'buble-loader' : hasBabel ? 'babel-loader' : ''
5962
}
6063

6164
// check if there are custom loaders specified via

0 commit comments

Comments
 (0)