node_modules

5 files changed, 44 insertions, 30 deletions

diff --git a/node_modules/enhanced-resolve/README.md b/node_modules/enhanced-resolve/README.md
index df659f830..c701448d7 100644
--- a/node_modules/enhanced-resolve/README.md
+++ b/node_modules/enhanced-resolve/README.md
@@ -32,12 +32,13 @@ Take a look at `lib/ResolveFactory.js` to understand how everything fits togethe
 | mainFiles                | ["index"]                   | A list of main files in directories |

 | extensions               | [".js", ".json", ".node"]   | A list of extensions which should be tried for files |

 | enforceExtension         | false                       | Enforce that a extension from extensions must be used |

-| moduleExtensions         | []                          | A list of module extsions which should be tried for modules |

+| moduleExtensions         | []                          | A list of module extensions which should be tried for modules |

 | enforceModuleExtension   | false                       | Enforce that a extension from moduleExtensions must be used |

 | alias                    | []                          | A list of module alias configurations or an object which maps key to value |

 | resolveToContext         | false                       | Resolve to a context instead of a file |

 | unsafeCache              | false                       | Use this cache object to unsafely cache the successful requests |

-| cachePredicate           | function() { return true }; | A function which decides wheter a request should be cached or not. An object is passed to the function with `path` and `request` properties. |

+| cacheWithContext         | true                        | If unsafe cache is enabled, includes `request.context` in the cache key  |

+| cachePredicate           | function() { return true }; | A function which decides whether a request should be cached or not. An object is passed to the function with `path` and `request` properties. |

 | fileSystem               |                             | The file system which should be used |

 | resolver                 | undefined                   | A prepared Resolver to which the plugins are attached |

 

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) {

diff --git a/node_modules/enhanced-resolve/lib/ResolverFactory.js b/node_modules/enhanced-resolve/lib/ResolverFactory.js
index 682ef4640..cd167aaf7 100644
--- a/node_modules/enhanced-resolve/lib/ResolverFactory.js
+++ b/node_modules/enhanced-resolve/lib/ResolverFactory.js
@@ -78,6 +78,9 @@ exports.createResolver = function(options) {
 	// Use this cache object to unsafely cache the successful requests

 	var unsafeCache = options.unsafeCache || false;

 

+	// Whether or not the unsafeCache should include request context as part of the cache key.

+	var cacheWithContext = typeof options.cacheWithContext !== "undefined" ? options.cacheWithContext : true;

+

 	// A function which decides whether a request should be cached or not.

 	// an object is passed with `path` and `request` properties.

 	var cachePredicate = options.cachePredicate || function() {

@@ -145,7 +148,7 @@ exports.createResolver = function(options) {
 

 	// resolve

 	if(unsafeCache) {

-		plugins.push(new UnsafeCachePlugin("resolve", cachePredicate, unsafeCache, "new-resolve"));

+		plugins.push(new UnsafeCachePlugin("resolve", cachePredicate, unsafeCache, cacheWithContext, "new-resolve"));

 		plugins.push(new ParsePlugin("new-resolve", "parsed-resolve"));

 	} else {

 		plugins.push(new ParsePlugin("resolve", "parsed-resolve"));

diff --git a/node_modules/enhanced-resolve/lib/UnsafeCachePlugin.js b/node_modules/enhanced-resolve/lib/UnsafeCachePlugin.js
index 61d9b4730..ed07fd561 100644
--- a/node_modules/enhanced-resolve/lib/UnsafeCachePlugin.js
+++ b/node_modules/enhanced-resolve/lib/UnsafeCachePlugin.js
@@ -4,17 +4,18 @@
 */

 var createInnerCallback = require("./createInnerCallback");

 

-function UnsafeCachePlugin(source, filterPredicate, cache, target) {

+function UnsafeCachePlugin(source, filterPredicate, cache, withContext, target) {

 	this.source = source;

 	this.filterPredicate = filterPredicate;

+	this.withContext = withContext;

 	this.cache = cache || {};

 	this.target = target;

 }

 module.exports = UnsafeCachePlugin;

 

-function getCacheId(request) {

+function getCacheId(request, withContext) {

 	return JSON.stringify({

-		context: request.context,

+		context: withContext ? request.context : "",

 		path: request.path,

 		query: request.query,

 		request: request.request

@@ -25,9 +26,10 @@ UnsafeCachePlugin.prototype.apply = function(resolver) {
 	var filterPredicate = this.filterPredicate;

 	var cache = this.cache;

 	var target = this.target;

+	var withContext = this.withContext;

 	resolver.plugin(this.source, function(request, callback) {

 		if(!filterPredicate(request)) return callback();

-		var cacheId = getCacheId(request);

+		var cacheId = getCacheId(request, withContext);

 		var cacheEntry = cache[cacheId];

 		if(cacheEntry) {

 			return callback(null, cacheEntry);

diff --git a/node_modules/enhanced-resolve/package.json b/node_modules/enhanced-resolve/package.json
index 78a08b4b7..74c95f18d 100644
--- a/node_modules/enhanced-resolve/package.json
+++ b/node_modules/enhanced-resolve/package.json
@@ -1,6 +1,6 @@
 {
   "name": "enhanced-resolve",
-  "version": "3.1.0",
+  "version": "3.3.0",
   "author": "Tobias Koppers @sokra",
   "description": "Offers a async require.resolve function. It's highly configurable.",
   "files": [
@@ -38,7 +38,7 @@
   "scripts": {
     "beautify-lint": "beautify-lint lib/**.js test/*.js",
     "beautify": "beautify-rewrite lib/**.js test/*.js",
-    "lint": "eslint lib",
+    "lint": "eslint lib test",
     "pretest": "npm run lint && npm run beautify-lint",
     "test": "mocha --full-trace --check-leaks",
     "precover": "npm run lint && npm run beautify-lint",