enhanced-resolve - npm Package Compare versions

Comparing version 0.5.14 to 0.5.15

lib/CachedInputFileSystem.js

@@ -0,0 +0,0 @@ /*

lib/DirectoryDefaultFilePlugin.js

@@ -0,0 +0,0 @@ /*

lib/DirectoryDescriptionFilePlugin.js

@@ -0,0 +0,0 @@ /*

lib/DirectoryResultPlugin.js

@@ -0,0 +0,0 @@ /*

lib/FileAppendPlugin.js

@@ -0,0 +0,0 @@ /*

lib/MemoryInputFileSystem.js

@@ -0,0 +0,0 @@ /*

lib/ModuleAliasPlugin.js

@@ -0,0 +0,0 @@ /*

lib/ModuleAsDirectoryPlugin.js

@@ -32,3 +32,3 @@ /*
 					query: request.query
-				}, callback);
+				}, callback, true);
 			}
@@ -35,0 +35,0 @@ return callback();

lib/ModuleAsFilePlugin.js

@@ -16,7 +16,4 @@ /*
 		if(i >= 0 || j >= 0 || request.directory) return callback();
-		return this.doResolve("file", request, function(err, result) {
-			if(!err && result) return callback(null, result);
-			return callback();
-		});
+		return this.doResolve("file", request, callback, true);
 	});
 };

lib/ModulesInDirectoriesPlugin.js

@@ -0,0 +0,0 @@ /*

lib/ModulesInRootPlugin.js

@@ -0,0 +0,0 @@ /*

lib/ModuleTemplatesPlugin.js

@@ -0,0 +0,0 @@ /*

lib/node.js

@@ -0,0 +0,0 @@ /*

lib/NodeJsInputFileSystem.js

@@ -0,0 +0,0 @@ /*

lib/Resolver.js

@@ -44,10 +44,10 @@ /*
 
-Resolver.prototype.doResolve = function doResolve(types, request, callback) {
+Resolver.prototype.doResolve = function doResolve(types, request, callback, noError) {
 	if(!Array.isArray(types)) types = [types];
 	this.applyPlugins("resolve-step", types, request);
-	if(types.length == 1) {
+	if(types.length == 1 && !noError) {
 		// If only one type, we can pass the error.
 		return this.applyPluginsParallelBailResult(types[0], request, function(err, result) {
 			if(err) return callback(err);
-			if(!result) return callback(new Error("Cannot resolve " + types[0] + " " + request.request + " in " + request.path + "."));
+			if(!result) return callback(new Error("Cannot resolve " + types[0] + " " + request.request + " in " + request.path));
 			return callback(null, result);
@@ -63,3 +63,4 @@ });
 	}.bind(this), function(result) {
-		if(!result) return callback(new Error("Cannot resolve " + types.join(" or ") + " " + request.request + " in " + request.path + "."));
+		if(noError && !result) return callback();
+		if(!result) return callback(new Error("Cannot resolve " + types.join(" or ") + " " + request.request + " in " + request.path));
 		return callback(null, result);
@@ -66,0 +67,0 @@ });

lib/SyncNodeJsInputFileSystem.js

@@ -0,0 +0,0 @@ /*

lib/UnsafeCachePlugin.js

@@ -0,0 +0,0 @@ /*

package.json

 {
 	"name": "enhanced-resolve",
-	"version": "0.5.14",
+	"version": "0.5.15",
 	"author": "Tobias Koppers @sokra",
@@ -17,3 +17,3 @@ "description": "Offers a async require.resolve function. It's highly configurable.",
 		"mocha": "1.8.x",
-		"should": "1.1.x"
+		"should": "2.0.x"
 	},
@@ -20,0 +20,0 @@ "engines": {

README.md

@@ -0,0 +0,0 @@ # enhanced-resolve

test/alias.js

@@ -0,0 +0,0 @@ var Resolver = require("../lib/Resolver");

test/CachedInputFileSystem.js

@@ -0,0 +0,0 @@ var CachedInputFileSystem = require("../lib/CachedInputFileSystem");

test/fixtures/a.js

 module.exports = function a() {
 	return "This is a";
 };

test/fixtures/b.js

 module.exports = function b() {
 	return "This is b";
 };

test/fixtures/c.js

@@ -0,0 +0,0 @@ module.exports = function b() {

test/fixtures/complex.js

@@ -0,0 +0,0 @@ var complex1 = require("./lib/complex1");

test/fixtures/main1.js

@@ -0,0 +0,0 @@ var a = require("./a");

test/fixtures/main2.js

@@ -0,0 +0,0 @@ var a = require("./a");

test/fixtures/main3.js

@@ -0,0 +0,0 @@ var a = require("./a");

test/fixtures/node_modules/m1/a.js

 module.exports = function a() {
 	return "This is m1/a";
 };

test/fixtures/node_modules/m1/b.js

 module.exports = function a() {
 	return "This is m1/b";
 };

test/fixtures/node_modules/m2-loader/b.js

 module.exports = function() {
 	"module.exports = 'This is m2-loader/b';";
 }

test/fixtures/node_modules/m2/b.js

 module.exports = "This is m2/b";

test/memory-filesystem.js

@@ -0,0 +0,0 @@ var MemoryInputFileSystem = require("../lib/MemoryInputFileSystem");

test/resolve.js

@@ -83,2 +83,6 @@ /*
 		path.join(fixtures, "node_modules", "complexm", "web_modules", "m1"), "m2/b.js", path.join(fixtures, "node_modules", "m2", "b.js"));
+	testResolve("from nested directory to overwritten file in module",
+		path.join(fixtures, "multiple_modules"), "m1/a.js", path.join(fixtures, "multiple_modules", "node_modules", "m1", "a.js"));
+	testResolve("from nested directory to not overwritten file in module",
+		path.join(fixtures, "multiple_modules"), "m1/b.js", path.join(fixtures, "node_modules", "m1", "b.js"));
 
@@ -85,0 +89,0 @@ testResolve("file with query",

test/simple.js

@@ -17,3 +17,3 @@ var resolve = require("../");
 				should.exist(filename);
-				filename.should.be.a("string");
+				filename.should.have.type("string");
 				filename.should.be.eql(path.join(__dirname, "..", "lib", "node.js"));
@@ -26,3 +26,3 @@ done();
 			should.exist(filename);
-			filename.should.be.a("string");
+			filename.should.have.type("string");
 			filename.should.be.eql(path.join(__dirname, "..", "lib", "node.js"));
@@ -29,0 +29,0 @@ });

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

Improved metrics

Total package byte prevSize

49536

increased by4.08%

Number of package files

54

increased by1.89%

Lines of code

1377

increased by0.29%

No dependency changes