huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix UseWebpackDevMiddleware with no options

This commit is contained in:
SteveSandersonMS 2016-03-24 11:39:38 +00:00
parent 980054b321
commit f1fa20afeb
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/Microsoft.AspNet.SpaServices/Webpack/WebpackDevMiddleware.cs
View File

@ -18,10 +18,11 @@ namespace Microsoft.AspNet.Builder
public static void UseWebpackDevMiddleware(this IApplicationBuilder appBuilder, WebpackDevMiddlewareOptions options = null) { public static void UseWebpackDevMiddleware(this IApplicationBuilder appBuilder, WebpackDevMiddlewareOptions options = null) {
// Validate options // Validate options
if (options != null) { if (options == null) {
if (options.ReactHotModuleReplacement && !options.HotModuleReplacement) { options = new WebpackDevMiddlewareOptions();
throw new ArgumentException("To enable ReactHotModuleReplacement, you must also enable HotModuleReplacement."); }
} if (options.ReactHotModuleReplacement && !options.HotModuleReplacement) {
throw new ArgumentException("To enable ReactHotModuleReplacement, you must also enable HotModuleReplacement.");
} }
// Unlike other consumers of NodeServices, WebpackDevMiddleware dosen't share Node instances, nor does it // Unlike other consumers of NodeServices, WebpackDevMiddleware dosen't share Node instances, nor does it
@ -43,7 +44,7 @@ namespace Microsoft.AspNet.Builder
// Tell Node to start the server hosting webpack-dev-middleware // Tell Node to start the server hosting webpack-dev-middleware
var devServerOptions = new { var devServerOptions = new {
webpackConfigPath = Path.Combine(appEnv.ApplicationBasePath, options.ConfigFile ?? DefaultConfigFile), webpackConfigPath = Path.Combine(appEnv.ApplicationBasePath, options.ConfigFile ?? DefaultConfigFile),
suppliedOptions = options ?? new WebpackDevMiddlewareOptions() suppliedOptions = options
}; };
var devServerInfo = nodeServices.InvokeExport<WebpackDevServerInfo>(nodeScript.FileName, "createWebpackDevServer", JsonConvert.SerializeObject(devServerOptions)).Result; var devServerInfo = nodeServices.InvokeExport<WebpackDevServerInfo>(nodeScript.FileName, "createWebpackDevServer", JsonConvert.SerializeObject(devServerOptions)).Result;