Skip to content

Commit d3274ec

Browse files
committed
make babel optional, tweak peer deps
1 parent 840c31e commit d3274ec

File tree

2 files changed

+16
-3
lines changed

2 files changed

+16
-3
lines changed

lib/loader.js

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,13 @@ 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
19+
try {
20+
require('babel-loader')
21+
} catch (e) {
22+
hasBabel = false
23+
}
24+
1825
var rewriterInjectRE = /\b(css(?:-loader)?(?:\?[^!]+)?)(?:!|$)/
1926

2027
var defaultLang = {
@@ -42,9 +49,11 @@ module.exports = function (content) {
4249
var defaultLoaders = {
4350
html: templateCompilerPath + '?id=' + moduleId,
4451
css: styleLoaderPath + '!css-loader' + (needCssSourceMap ? '?sourceMap' : ''),
45-
js: this.options.babel
46-
? 'babel-loader' // respect user options
47-
: 'babel-loader?presets[]=es2015&plugins[]=transform-runtime&comments=false'
52+
js: hasBabel
53+
? this.options.babel
54+
? 'babel-loader' // respect user options
55+
: 'babel-loader?presets[]=es2015&plugins[]=transform-runtime&comments=false'
56+
: ''
4857
}
4958

5059
// check if there are custom loaders specified via

package.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,10 @@
4040
"vue-style-loader": "^1.0.0",
4141
"vue-template-compiler": "^2.0.0-alpha.2"
4242
},
43+
"peerDependencies": {
44+
"css-loader": "^0.23.1",
45+
"file-loader": "^0.8.5"
46+
},
4347
"devDependencies": {
4448
"babel-core": "^6.8.0",
4549
"babel-loader": "^6.2.4",

0 commit comments

Comments
 (0)