Merge pull request webpack#4317 from jquense/add-resolver-context

sokra · web-flow · commit ebf33fa61e9c · 2017-02-22T14:22:18.000+01:00
Add resolver result to module callback
diff --git a/lib/NormalModuleFactory.js b/lib/NormalModuleFactory.js
@@ -116,16 +116,23 @@ function NormalModuleFactory(context, resolvers, options) {
 				},
 				function(callback) {
 					if(resource === "" || resource[0] === "?")
-						return callback(null, resource);
-					_this.resolvers.normal.resolve(resolveContextInfo, context, resource, function(err, result) {
+						return callback(null, {
+							resource: resource
+						});
+
+					_this.resolvers.normal.resolve(resolveContextInfo, context, resource, function(err, resource, resourceResolveData) {
 						if(err) return callback(err);
-						callback(null, result);
+						callback(null, {
+							resourceResolveData: resourceResolveData,
+							resource: resource,
+						});
 					});
 				}
 			], function(err, results) {
 				if(err) return callback(err);
 				var loaders = results[0];
-				resource = results[1];
+				var resourceResolveData = results[1].resourceResolveData;
+				resource = results[1].resource;
 
 				// translate option idents
 				try {
@@ -194,6 +201,7 @@ function NormalModuleFactory(context, resolvers, options) {
 						rawRequest: request,
 						loaders: loaders,
 						resource: resource,
+						resourceResolveData: resourceResolveData,
 						parser: _this.getParser(settings.parser)
 					});
 				}
