Fix contentBase taking preference over in-memory files

Also, the test I wrote earlier was not correct.

Ref #640

Author: SpaceK33z

lib/Server.js

@@ -226,8 +226,7 @@ function Server(compiler, options) {
 			if(options.historyApiFallback) {
 				// Fall back to /index.html if nothing else matches.
 				app.use(
-					historyApiFallback(typeof options.historyApiFallback === "object" ? options.historyApiFallback : null),
-					contentBase ? express.static(contentBase) : undefined
+					historyApiFallback(typeof options.historyApiFallback === "object" ? options.historyApiFallback : null)
 				);
 			}
 		},
@@ -294,7 +293,7 @@ function Server(compiler, options) {
 	if(contentBase !== false)
 		defaultFeatures.push("contentBaseFiles");
 	if(options.historyApiFallback)
-		defaultFeatures.push("historyApiFallback", "middleware");
+		defaultFeatures.push("historyApiFallback", "middleware", "contentBaseFiles");
 	defaultFeatures.push("magicHtml");
 	if(contentBase !== false)
 		defaultFeatures.push("contentBaseIndex");

test/HistoryApiFallback.test.js

@@ -3,6 +3,7 @@ var request = require("supertest");
 var helper = require("./helper");
 var config = require("./fixtures/historyapifallback-config/webpack.config");
 var config2 = require("./fixtures/historyapifallback-2-config/webpack.config");
+var config3 = require("./fixtures/historyapifallback-3-config/webpack.config");
 
 describe("HistoryApiFallback", function() {
 	var server;
@@ -113,7 +114,7 @@ describe("HistoryApiFallback", function() {
 
 	describe("in-memory files", function() {
 		before(function(done) {
-			server = helper.start(config2, {
+			server = helper.start(config3, {
 				contentBase: path.join(__dirname, "fixtures/historyapifallback-3-config"),
 				historyApiFallback: true
 			}, done);