Merge pull request #374 from BerndWessels/master

Extend contentBase to support array with multiple sources.

Author: sokra

lib/Server.js

@@ -197,7 +197,11 @@ function Server(compiler, options) {
 			if(options.contentBase !== false) {
 				var contentBase = options.contentBase || process.cwd();
 
-				if(typeof contentBase === "object") {
+				if(Array.isArray(contentBase)) {
+					contentBase.forEach(function(item, index, array) {
+						app.get("*", express.static(item), serveIndex(item));
+					});
+				} else if(typeof contentBase === "object") {
 					console.log('Using contentBase as a proxy is deprecated and will be removed in the next major version. Please use the proxy option instead.\n\nTo update remove the contentBase option from webpack.config.js and add this:');
 					console.log('proxy: {\n\t"*": <your current contentBase configuration>\n}');
 					// Proxy every request to contentBase.target