enhanced-resolve - npm Package Compare versions

Comparing version 0.5.7 to 0.5.8

lib/ModuleAliasPlugin.js

@@ -14,23 +14,43 @@ /*
 		var fs = this.fileSystem;
-		var keys = Object.keys(aliasMap)
-		for(var i = 0; i < keys.length; i++) {
-			var aliasName = keys[i];
-			if(request.request.indexOf(aliasName) === 0) {
-				var aliasValue = aliasMap[aliasName];
-				if(request.request.indexOf(aliasValue) !== 0) {
-					var newRequest = this.parse(aliasValue + request.request.substr(aliasName.length));
-					var obj = {
-						path: request.path,
-						request: newRequest.path,
-						query: newRequest.query,
-						directory: newRequest.directory
-					};
-					if(newRequest.module) return this.doResolve("module", obj, callback);
-					if(newRequest.directory) return this.doResolve("directory", obj, callback);
-					return this.doResolve(["file", "directory"], obj, callback);
+		var keys = Object.keys(aliasMap);
+		var i = 0;
+		(function next() {
+			for(;i < keys.length; i++) {
+				var aliasName = keys[i];
+				if(request.request.indexOf(aliasName) === 0) {
+					var aliasValue = aliasMap[aliasName];
+					if(request.request.indexOf(aliasValue + "/") !== 0 && request.request != aliasValue) {
+						var resolveWithAlias = function() {
+							var newRequest = this.parse(aliasValue + request.request.substr(aliasName.length));
+							var obj = {
+								path: request.path,
+								request: newRequest.path,
+								query: newRequest.query,
+								directory: newRequest.directory
+							};
+							if(newRequest.module) return this.doResolve("module", obj, callback);
+							if(newRequest.directory) return this.doResolve("directory", obj, callback);
+							return this.doResolve(["file", "directory"], obj, callback);
+						}.bind(this);
+						if(request.request != aliasName) {
+							// Check if aliasValue resolves to a file.
+							// If it do so, we do not alias the module as the user
+							//  only want to alias the module as directory
+							var newRequest = this.parse(aliasValue);
+							return this.doResolve("file", {
+								path: request.path,
+								request: newRequest.path,
+								query: newRequest.query,
+								directory: newRequest.directory
+							}, function(err, result) {
+								if(!err && result) return i++, next.call(this);
+								return resolveWithAlias();
+							}.bind(this));
+						} else return resolveWithAlias();
+					}
 				}
 			}
-		}
-		return callback();
+			return callback();
+		}.call(this));
 	});
 };

lib/Resolver.js

@@ -107,2 +107,3 @@ /*
 Resolver.prototype.join = function join(path, request) {
+	if(request == "") return this.normalize(path);
 	if(absoluteWinRegExp.test(request)) return this.normalize(request.replace(/\//g, "\\"));
@@ -109,0 +110,0 @@ if(absoluteNixRegExp.test(request)) return this.normalize(request);

package.json

 {
 	"name": "enhanced-resolve",
-	"version": "0.5.7",
+	"version": "0.5.8",
 	"author": "Tobias Koppers @sokra",
@@ -5,0 +5,0 @@ "description": "Offers a async require.resolve function. It's highly configurable.",

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Worsened metrics

Total package byte prevSize

44421

decreased by-8.04%

Number of package files

51

decreased by-10.53%

Lines of code

1242

decreased by-11.91%

No dependency changes