In WebpackDevMiddleware, allow configuration of ProjectPath (implements aspnet#262)

SteveSandersonMS · SteveSandersonMS · commit 0d0d25b032f9 · 2016-08-15T14:40:38.000-07:00
diff --git a/src/Microsoft.AspNetCore.SpaServices/Webpack/WebpackDevMiddleware.cs b/src/Microsoft.AspNetCore.SpaServices/Webpack/WebpackDevMiddleware.cs
@@ -35,15 +35,25 @@ public static void UseWebpackDevMiddleware(
                     "To enable ReactHotModuleReplacement, you must also enable HotModuleReplacement.");
             }
 
+            string projectPath;
+            if (options.ProjectPath == null)
+            {
+                var hostEnv = (IHostingEnvironment)appBuilder.ApplicationServices.GetService(typeof(IHostingEnvironment));
+                projectPath = hostEnv.ContentRootPath;
+            }
+            else
+            {
+                projectPath = options.ProjectPath;
+            }
+
             // Unlike other consumers of NodeServices, WebpackDevMiddleware dosen't share Node instances, nor does it
             // use your DI configuration. It's important for WebpackDevMiddleware to have its own private Node instance
             // because it must *not* restart when files change (if it did, you'd lose all the benefits of Webpack
             // middleware). And since this is a dev-time-only feature, it doesn't matter if the default transport isn't
             // as fast as some theoretical future alternative.
-            var hostEnv = (IHostingEnvironment)appBuilder.ApplicationServices.GetService(typeof(IHostingEnvironment));
             var nodeServices = Configuration.CreateNodeServices(new NodeServicesOptions
             {
-                ProjectPath = hostEnv.ContentRootPath,
+                ProjectPath = projectPath,
                 WatchFileExtensions = new string[] { } // Don't watch anything
             });
 
@@ -55,7 +65,7 @@ public static void UseWebpackDevMiddleware(
             // Tell Node to start the server hosting webpack-dev-middleware
             var devServerOptions = new
             {
-                webpackConfigPath = Path.Combine(hostEnv.ContentRootPath, options.ConfigFile ?? DefaultConfigFile),
+                webpackConfigPath = Path.Combine(projectPath, options.ConfigFile ?? DefaultConfigFile),
                 suppliedOptions = options
             };
             var devServerInfo =
diff --git a/src/Microsoft.AspNetCore.SpaServices/Webpack/WebpackDevMiddlewareOptions.cs b/src/Microsoft.AspNetCore.SpaServices/Webpack/WebpackDevMiddlewareOptions.cs
@@ -6,5 +6,6 @@ public class WebpackDevMiddlewareOptions
         public int HotModuleReplacementServerPort { get; set; }
         public bool ReactHotModuleReplacement { get; set; }
         public string ConfigFile { get; set; }
+        public string ProjectPath { get; set; }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -6,5 +6,6 @@ public class WebpackDevMiddlewareOptions`
`6`	`6`	`public int HotModuleReplacementServerPort { get; set; }`
`7`	`7`	`public bool ReactHotModuleReplacement { get; set; }`
`8`	`8`	`public string ConfigFile { get; set; }`
	`9`	`+ public string ProjectPath { get; set; }`
`9`	`10`	`}`
`10`	`11`	`}`