File tree Expand file tree Collapse file tree 2 files changed +21
-11
lines changed Expand file tree Collapse file tree 2 files changed +21
-11
lines changed Original file line number Diff line number Diff line change @@ -2,9 +2,10 @@ var path = require('path')
2
2
var hash = require ( 'hash-sum' )
3
3
var parse = require ( './parser' )
4
4
var genId = require ( './utils/gen-id' )
5
- var normalize = require ( './utils/normalize' )
6
- var loaderUtils = require ( 'loader-utils' )
7
5
var querystring = require ( 'querystring' )
6
+ var loaderUtils = require ( 'loader-utils' )
7
+ var normalize = require ( './utils/normalize' )
8
+ var hasLoader = require ( './utils/has-loader' )
8
9
9
10
// internal lib loaders
10
11
var selectorPath = normalize . lib ( 'selector' )
@@ -17,15 +18,9 @@ var componentNormalizerPath = normalize.lib('component-normalizer')
17
18
var styleLoaderPath = normalize . dep ( 'vue-style-loader' )
18
19
var hotReloadAPIPath = normalize . dep ( 'vue-hot-reload-api' )
19
20
20
- var hasBabel = false
21
- try {
22
- hasBabel = ! ! require ( 'babel-loader' )
23
- } catch ( e ) { }
24
-
25
- var hasBuble = false
26
- try {
27
- hasBuble = ! ! require ( 'buble-loader' )
28
- } catch ( e ) { }
21
+ // check whether default js loader exists
22
+ var hasBabel = hasLoader ( 'babel' )
23
+ var hasBuble = hasLoader ( 'buble' )
29
24
30
25
var rewriterInjectRE = / \b ( c s s (?: - l o a d e r ) ? (?: \? [ ^ ! ] + ) ? ) (?: ! | $ ) /
31
26
Original file line number Diff line number Diff line change
1
+ var fs = require ( 'fs' )
2
+ var path = require ( 'path' )
3
+ var cwd = process . cwd ( )
4
+
5
+ module . exports = function ( loader ) {
6
+ loader += '-loader'
7
+ var hasLoader = false
8
+ try {
9
+ hasLoader = ! ! require ( loader )
10
+ } catch ( e ) { }
11
+ if ( ! hasLoader ) {
12
+ hasLoader = fs . existsSync ( path . resolve ( cwd , 'node_modules' , loader ) )
13
+ }
14
+ return hasLoader
15
+ }
You can’t perform that action at this time.
0 commit comments