File tree 2 files changed +3
-7
lines changed
2 files changed +3
-7
lines changed Original file line number Diff line number Diff line change @@ -4,6 +4,7 @@ const p = require('path');
4
4
const flatten = require ( './fn' ) . flatten ;
5
5
const isObject = require ( './fn' ) . isObject ;
6
6
const co = require ( 'bluebird' ) . coroutine ;
7
+ const requireRelative = require ( 'require-relative' ) ;
7
8
const $ = require ( './utils' ) ;
8
9
9
10
const rgx = / ^ @ ( t a s k r | f l y ) | ( t a s k r | f l y ) - / i;
@@ -18,13 +19,7 @@ const join = p.join;
18
19
*/
19
20
function req ( name , base ) {
20
21
try {
21
- try {
22
- name = require . resolve ( name ) ;
23
- } catch ( _ ) {
24
- name = join ( base , name ) ;
25
- } finally {
26
- return require ( name ) ;
27
- }
22
+ return requireRelative ( name , base ) ;
28
23
} catch ( e ) {
29
24
$ . alert ( e . message ) ;
30
25
}
Original file line number Diff line number Diff line change 19
19
" taskr.d.ts"
20
20
],
21
21
"dependencies" : {
22
+ "require-relative" : " ^0.8.7" ,
22
23
"bluebird" : " ^3.5.0" ,
23
24
"clorox" : " ^1.0.1" ,
24
25
"glob" : " ^7.1.2" ,
You can’t perform that action at this time.
0 commit comments