From 363723fc84f7b8477592e0105aeb331ec9a017af Mon Sep 17 00:00:00 2001
From: Florian Dold <florian.dold@gmail.com>
Date: Mon, 14 Aug 2017 05:01:11 +0200
Subject: node_modules

---
 node_modules/enhanced-resolve/lib/Resolver.js | 50 ++++++++++++++++-----------
 1 file changed, 29 insertions(+), 21 deletions(-)

(limited to 'node_modules/enhanced-resolve/lib/Resolver.js')

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) {
-- 
cgit v1.2.3