diff options
| author | Florian Dold <florian.dold@gmail.com> | 2017-08-14 05:01:11 +0200 |
|---|---|---|
| committer | Florian Dold <florian.dold@gmail.com> | 2017-08-14 05:02:09 +0200 |
| commit | 363723fc84f7b8477592e0105aeb331ec9a017af (patch) | |
| tree | 29f92724f34131bac64d6a318dd7e30612e631c7 /node_modules/enhanced-resolve/lib/Resolver.js | |
| parent | 5634e77ad96bfe1818f6b6ee70b7379652e5487f (diff) | |
node_modules
Diffstat (limited to 'node_modules/enhanced-resolve/lib/Resolver.js')
| -rw-r--r-- | node_modules/enhanced-resolve/lib/Resolver.js | 50 |
1 files changed, 29 insertions, 21 deletions
diff --git a/node_modules/enhanced-resolve/lib/Resolver.js b/node_modules/enhanced-resolve/lib/Resolver.js index 6b8074569..5994d5d61 100644 --- a/node_modules/enhanced-resolve/lib/Resolver.js +++ b/node_modules/enhanced-resolve/lib/Resolver.js @@ -38,14 +38,8 @@ Resolver.prototype.resolve = function resolve(context, path, request, callback) request: request
};
- var localMissing = [];
- var missing = callback.missing ? {
- push: function(item) {
- callback.missing.push(item);
- localMissing.push(item);
- }
- } : localMissing;
- var log = [];
+ var localMissing;
+ var log;
var message = "resolve '" + request + "' in '" + path + "'";
function writeLog(msg) {
@@ -56,26 +50,40 @@ Resolver.prototype.resolve = function resolve(context, path, request, callback) return log.join("\n");
}
- function onResolved(err, result) {
+ function onError(err, result) {
if(callback.log) {
for(var i = 0; i < log.length; i++)
callback.log(log[i]);
}
+
if(err) return callback(err);
- if(!result) {
- var error = new Error("Can't " + message);
- error.details = logAsString();
- error.missing = localMissing;
- resolver.applyPlugins("no-resolve", obj, error);
- return callback(error);
+
+ var error = new Error("Can't " + message);
+ error.details = logAsString();
+ error.missing = localMissing;
+ resolver.applyPlugins("no-resolve", obj, error);
+ return callback(error);
+ }
+
+ function onResolve(err, result) {
+ if(!err && result) {
+ return callback(null, result.path === false ? false : result.path + (result.query || ""), result);
}
- return callback(null, result.path === false ? false : result.path + (result.query || ""), result);
+
+ localMissing = [];
+ log = [];
+
+ return resolver.doResolve("resolve", obj, message, createInnerCallback(onError, {
+ log: writeLog,
+ missing: localMissing,
+ stack: callback.stack
+ }));
}
- return this.doResolve("resolve", obj, message, createInnerCallback(onResolved, {
- log: writeLog,
- missing: missing,
- stack: callback.stack
- }, null));
+
+ onResolve.missing = callback.missing;
+ onResolve.stack = callback.stack;
+
+ return this.doResolve("resolve", obj, message, onResolve);
};
Resolver.prototype.doResolve = function doResolve(type, request, message, callback) {
|