Setting contentBase to false with historyApiFallback on works properly #791 (#797)

* Setting contentBase to false with historyApiFallback on works properly #791

* Remove console.log

Author: coltonw

lib/Server.js

@@ -318,8 +318,11 @@ function Server(compiler, options) {
 		defaultFeatures.push("contentBaseFiles");
 	if(options.watchContentBase)
 		defaultFeatures.push("watchContentBase");
-	if(options.historyApiFallback)
-		defaultFeatures.push("historyApiFallback", "middleware", "contentBaseFiles");
+	if(options.historyApiFallback) {
+		defaultFeatures.push("historyApiFallback", "middleware");
+		if(contentBase !== false)
+			defaultFeatures.push("contentBaseFiles");
+	}
 	defaultFeatures.push("magicHtml");
 	if(contentBase !== false)
 		defaultFeatures.push("contentBaseIndex");

test/HistoryApiFallback.test.js

@@ -75,6 +75,24 @@ describe("HistoryApiFallback", function() {
 		});
 	});
 
+	describe("as object with contentBase set to false", function() {
+		before(function(done) {
+			server = helper.start(config3, {
+				contentBase: false,
+				historyApiFallback: {
+					index: "/bar.html"
+				}
+			}, done);
+			req = request(server.app);
+		});
+
+		it("historyApiFallback should work and ignore static content", function(done) {
+			req.get("/index.html")
+			.accept("html")
+			.expect(200, /In-memory file/, done);
+		});
+	});
+
 	describe("as object with contentBase and rewrites", function() {
 		before(function(done) {
 			server = helper.start(config2, {