enhanced-resolve
Advanced tools
Comparing version 0.6.1 to 0.7.0
@@ -16,9 +16,10 @@ /* | ||
fs.stat(directory, function(err, stat) { | ||
if(!err && stat && stat.isDirectory()) | ||
return callback(null, { | ||
path: directory, | ||
query: request.query, | ||
resolved: true, | ||
directory: true | ||
}); | ||
if(!err && stat && stat.isDirectory()) { | ||
return this.doResolve("result", { | ||
path: directory, | ||
query: request.query, | ||
directory: true, | ||
resolved: true | ||
}, callback); | ||
} | ||
if(callback.log) { | ||
@@ -29,4 +30,4 @@ if(err) callback.log(directory + " doesn't exist"); | ||
return callback(); | ||
}); | ||
}.bind(this)); | ||
}); | ||
}; |
@@ -29,3 +29,3 @@ /* | ||
if(!validAddr) return callback(); | ||
return callback(null, { | ||
return this.doResolve("result", { | ||
path: validAddr, | ||
@@ -35,5 +35,5 @@ query: request.query, | ||
resolved: true | ||
}); | ||
}); | ||
}, callback); | ||
}.bind(this)); | ||
}); | ||
}; |
@@ -39,3 +39,3 @@ /* | ||
if(err) return callback(err); | ||
return callback(null, result.path + (result.query || "")); | ||
return callback(null, result.path === false ? false : result.path + (result.query || "")); | ||
} | ||
@@ -68,2 +68,3 @@ onResolved.log = callback.log; | ||
if(result) return callback(null, result); | ||
if(types[0] === "result") return callback(null, request); | ||
var error = new Error("Cannot resolve " + types[0] + " " + request.request + " in " + request.path); | ||
@@ -70,0 +71,0 @@ error.details = logAsString(); |
{ | ||
"name": "enhanced-resolve", | ||
"version": "0.6.1", | ||
"version": "0.7.0", | ||
"author": "Tobias Koppers @sokra", | ||
@@ -5,0 +5,0 @@ "description": "Offers a async require.resolve function. It's highly configurable.", |
59848
62
1616