@@ -30,22 +30,22 @@ module.exports = function resolve(x, options, callback) {
3030 var readFile = opts . readFile || fs . readFile ;
3131
3232 var extensions = opts . extensions || [ '.js' ] ;
33- var y = opts . basedir || path . dirname ( caller ( ) ) ;
33+ var basedir = opts . basedir || path . dirname ( caller ( ) ) ;
3434
3535 opts . paths = opts . paths || [ ] ;
3636
3737 if ( / ^ (?: \. \. ? (?: \/ | $ ) | \/ | ( [ A - Z a - z ] : ) ? [ / \\ ] ) / . test ( x ) ) {
38- var res = path . resolve ( y , x ) ;
38+ var res = path . resolve ( basedir , x ) ;
3939 if ( x === '..' || x . slice ( - 1 ) === '/' ) res += '/' ;
40- if ( / \/ $ / . test ( x ) && res === y ) {
40+ if ( / \/ $ / . test ( x ) && res === basedir ) {
4141 loadAsDirectory ( res , opts . package , onfile ) ;
4242 } else loadAsFile ( res , opts . package , onfile ) ;
43- } else loadNodeModules ( x , y , function ( err , n , pkg ) {
43+ } else loadNodeModules ( x , basedir , function ( err , n , pkg ) {
4444 if ( err ) cb ( err ) ;
4545 else if ( n ) cb ( null , n , pkg ) ;
4646 else if ( core [ x ] ) return cb ( null , x ) ;
4747 else {
48- var moduleError = new Error ( "Cannot find module '" + x + "' from '" + y + "'" ) ;
48+ var moduleError = new Error ( "Cannot find module '" + x + "' from '" + basedir + "'" ) ;
4949 moduleError . code = 'MODULE_NOT_FOUND' ;
5050 cb ( moduleError ) ;
5151 }
@@ -58,7 +58,7 @@ module.exports = function resolve(x, options, callback) {
5858 if ( err ) cb ( err ) ;
5959 else if ( d ) cb ( null , d , pkg ) ;
6060 else {
61- var moduleError = new Error ( "Cannot find module '" + x + "' from '" + y + "'" ) ;
61+ var moduleError = new Error ( "Cannot find module '" + x + "' from '" + basedir + "'" ) ;
6262 moduleError . code = 'MODULE_NOT_FOUND' ;
6363 cb ( moduleError ) ;
6464 }
0 commit comments