Merge branch 'historyapifallback-struggles'

Author: SpaceK33z

lib/Server.js

@@ -228,8 +228,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)
 				);
 			}
 		},
@@ -310,7 +309,7 @@ function Server(compiler, options) {
 	if(options.watchContentBase)
 		defaultFeatures.push("watchContentBase");
 	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;
@@ -110,4 +111,20 @@ describe("HistoryApiFallback", function() {
 			.expect(200, /Other file/, done);
 		});
 	});
+
+	describe("in-memory files", function() {
+		before(function(done) {
+			server = helper.start(config3, {
+				contentBase: path.join(__dirname, "fixtures/historyapifallback-3-config"),
+				historyApiFallback: true
+			}, done);
+			req = request(server.app);
+		});
+
+		it("should take precedence over contentBase files", function(done) {
+			req.get("/foo")
+			.accept("html")
+			.expect(200, /In-memory file/, done);
+		});
+	});
 });

test/fixtures/historyapifallback-3-config/bar.html

@@ -0,0 +1 @@
+In-memory file

test/fixtures/historyapifallback-3-config/foo.js

@@ -0,0 +1,2 @@
+require("./bar.html");
+console.log("Hey.");

test/fixtures/historyapifallback-3-config/index.html

@@ -0,0 +1 @@
+contentBase file

test/fixtures/historyapifallback-3-config/webpack.config.js

@@ -0,0 +1,17 @@
+module.exports = {
+	context: __dirname,
+	entry: "./foo.js",
+	output: {
+		filename: "bundle.js",
+		path: "/"
+	},
+	module: {
+		loaders: [
+			{
+				test: /\.html$/,
+				loader: "file",
+				query: { name: "index.html" }
+			}
+		]
+	}
+};