support an empty context

sokra · sokra · commit c0686c443016 · 2014-10-12T11:24:42.000+02:00
fixed webpack#524
diff --git a/lib/ContextModule.js b/lib/ContextModule.js
@@ -66,17 +66,19 @@ ContextModule.prototype.build = function(options, compilation, resolver, fs, cal
 	var addon = this.addon;
 	this.resolveDependencies(fs, this.context, this.recursive, this.regExp, function(err, dependencies) {
 		if(err) return callback(err);
-		dependencies.forEach(function(dep) {
-			dep.userRequest = dep.request;
-			dep.request = addon + dep.userRequest;
-		});
+		if(dependencies) {
+			dependencies.forEach(function(dep) {
+				dep.userRequest = dep.request;
+				dep.request = addon + dep.userRequest;
+			});
+		}
 		this.dependencies = dependencies;
 		callback();
 	}.bind(this));
 };
 
 ContextModule.prototype.source = function(dependencyTemplates, outputOptions, requestShortener) {
-	if(this.dependencies.length > 0) {
+	if(this.dependencies && this.dependencies.length > 0) {
 		var map = {};
 		this.dependencies.slice().sort(function(a,b) {
 			if(a.userRequest === b.userRequest) return 0;
@@ -105,9 +107,10 @@ ContextModule.prototype.source = function(dependencyTemplates, outputOptions, re
 			"function webpackContext(req) {\n",
 			"\tthrow new Error(\"Cannot find module '\" + req + \"'.\");\n",
 			"}\n",
-			"webpackContext.resolve = webpackContext;\n",
 			"webpackContext.keys = function() { return []; };\n",
-			"module.exports = webpackContext;\n"
+			"webpackContext.resolve = webpackContext;\n",
+			"module.exports = webpackContext;\n",
+			"webpackContext.id = "+this.id+";\n",
 		];
 	}
 	if(this.useSourceMap) {
diff --git a/test/cases/context/issue-524/index.js b/test/cases/context/issue-524/index.js
@@ -0,0 +1,11 @@
+it("should support an empty context", function() {
+	var c = require.context(".", true, /^nothing$/);
+	c.id.should.be.type("number");
+	(function() {
+		c.resolve("");
+	}).should.throw();
+	(function() {
+		c("");
+	}).should.throw();
+	c.keys().should.be.eql([]);
+});
