make AMD require work without fn expr

sokra · sokra · commit f5e6c6b930e7 · 2013-11-27T23:04:14.000+01:00
diff --git a/lib/dependencies/AMDRequireDependenciesBlockParserPlugin.js b/lib/dependencies/AMDRequireDependenciesBlockParserPlugin.js
@@ -59,7 +59,6 @@ module.exports = AbstractPlugin.create({
 		case 2:
 			var param = this.evaluateExpression(expr.arguments[0]);
 			if(!param.isArray()) return;
-			if(expr.arguments[1].type !== "FunctionExpression") return;
 			var dep = new AMDRequireDependenciesBlock(expr, param.range, expr.arguments[1].range);
 			dep.loc = expr.loc;
 			var old = this.state.current;
@@ -73,14 +72,16 @@ module.exports = AbstractPlugin.create({
 						}
 					}, this);
 				}.bind(this));
-				this.inScope(expr.arguments[1].params.filter(function(i) {
-					return ["require", "module", "exports"].indexOf(i.name) < 0;
-				}), function() {
-					if(expr.arguments[1].body.type === "BlockStatement")
-						this.walkStatement(expr.arguments[1].body);
-					else
-						this.walkExpression(expr.arguments[1].body);
-				}.bind(this));
+				if(expr.arguments[1].type === "FunctionExpression") {
+					this.inScope(expr.arguments[1].params.filter(function(i) {
+						return ["require", "module", "exports"].indexOf(i.name) < 0;
+					}), function() {
+						if(expr.arguments[1].body.type === "BlockStatement")
+							this.walkStatement(expr.arguments[1].body);
+						else
+							this.walkExpression(expr.arguments[1].body);
+					}.bind(this));
+				}
 			} finally {
 				this.state.current = old;
 				this.state.current.addBlock(dep);
diff --git a/test/browsertest/lib/index.web.js b/test/browsertest/lib/index.web.js
@@ -407,6 +407,16 @@ describe("main", function() {
 		it("should not crash on require.js require only with array", function() {
 			require(["./circular"]);
 		});
+		it("should be able to use AMD require without function expression (empty array)", function(done) {
+			require([], done);
+		});
+		it("should be able to use AMD require without function expression", function(done) {
+			require(["./circular"], fn);
+			function fn(c) {
+				c.should.be.eql(1);
+				done();
+			}
+		});
 		it("should create a chunk for require.js require", function(done) {
 			var sameTick = true;
 			require(["./c"], function(c) {
