File tree Expand file tree Collapse file tree 3 files changed +4356
-5
lines changed Expand file tree Collapse file tree 3 files changed +4356
-5
lines changed Original file line number Diff line number Diff line change 1- var fs = require ( 'fs' )
2- var path = require ( 'path' )
31var cwd = process . cwd ( )
2+ var resolve = require ( 'resolve' )
43
54// attempts to first require a dep using projects cwd (when vue-loader is linked)
65// then try a normal require.
76module . exports = function tryRequire ( dep ) {
8- var cwdPath = path . resolve ( cwd , 'node_modules' , dep )
9- if ( fs . existsSync ( cwdPath ) ) {
10- return require ( cwdPath )
7+ var fromCwd
8+ try {
9+ fromCwd = resolve . sync ( dep , { basedir : cwd } )
10+ } catch ( e ) { }
11+ if ( fromCwd ) {
12+ return require ( fromCwd )
1113 } else {
1214 try {
1315 return require ( dep )
Original file line number Diff line number Diff line change 3737 "postcss" : " ^5.0.21" ,
3838 "postcss-load-config" : " ^1.1.0" ,
3939 "postcss-selector-parser" : " ^2.0.0" ,
40+ "resolve" : " ^1.3.3" ,
4041 "source-map" : " ^0.5.6" ,
4142 "vue-hot-reload-api" : " ^2.1.0" ,
4243 "vue-style-loader" : " ^3.0.0" ,
You can’t perform that action at this time.
0 commit comments