fixes and performance improvements

lib/NormalModuleFactory.js

@@ -20,7 +20,7 @@ function NormalModuleFactory(context, resolvers, parser, options) {
 	this.plugin("factory", function() {
 		var _this = this;
 		return function(result, callback) {
-			var resolver = _this.applyPluginsWaterfall("resolver", null);
+			var resolver = _this.applyPluginsWaterfall0("resolver", null);
 
 			// Ignored
 			if(!resolver) return callback();
@@ -53,7 +53,7 @@ function NormalModuleFactory(context, resolvers, parser, options) {
 						);
 					}
 
-					createdModule = _this.applyPluginsWaterfall("module", createdModule);
+					createdModule = _this.applyPluginsWaterfall0("module", createdModule);
 
 					return callback(null, createdModule);
 				});
@@ -161,7 +161,7 @@ NormalModuleFactory.prototype.create = function(context, dependency, callback) {
 		// Ignored
 		if(!result) return callback();
 
-		var factory = _this.applyPluginsWaterfall("factory", null);
+		var factory = _this.applyPluginsWaterfall0("factory", null);
 
 		// Ignored
 		if(!factory) return callback();

lib/WebpackOptionsDefaulter.js

@@ -71,6 +71,7 @@ function WebpackOptionsDefaulter() {
 	this.set("node.__dirname", "mock");
 
 	this.set("resolve", {});
+	this.set("resolve.unsafeCache", true);
 	this.set("resolve.modules", ["node_modules"]);
 	this.set("resolve.extensions", [".js", ".json"]);
 	this.set("resolve.aliasFields", "make", function(options) {
@@ -87,6 +88,7 @@ function WebpackOptionsDefaulter() {
 	});
 
 	this.set("resolveLoader", {});
+	this.set("resolveLoader.unsafeCache", true);
 	this.set("resolveLoader.mainFields", ["loader", "main"]);
 	this.set("resolveLoader.extensions", [".js", ".json"]);
 	this.set("resolveLoader.moduleExtensions", ["-loader"]);

package.json

@@ -7,7 +7,7 @@
     "acorn": "^2.4.0",
     "async": "^1.3.0",
     "clone": "^1.0.2",
-    "enhanced-resolve": "^2.0.0",
+    "enhanced-resolve": "^2.2.0",
     "interpret": "^1.0.0",
     "loader-runner": "^2.1.0",
     "loader-utils": "^0.2.11",

test/TestCases.test.js

@@ -149,13 +149,13 @@ describe("TestCases", function() {
 								module: {
 									loaders: [{
 										test: /\.json$/,
-										loader: "json"
+										loader: "json-loader"
 									}, {
 										test: /\.coffee$/,
-										loader: "coffee"
+										loader: "coffee-loader"
 									}, {
 										test: /\.jade$/,
-										loader: "jade"
+										loader: "jade-loader"
 									}]
 								},
 								plugins: (config.plugins || []).concat(

test/configCases/target/web/webpack.config.js

@@ -1,3 +1,8 @@
 module.exports = {
-	target: "web"
+	target: "web",
+	module: {
+		loaders: [
+			{ test: /\.json$/, loader: "json-loader" }
+		]
+	}
 };