adding support to pass Env param to webpack

Jordan McDonald · SteveSandersonMS · commit 7c07beb494f4 · 2018-01-24T17:00:59.000-08:00
diff --git a/src/Microsoft.AspNetCore.SpaServices/Webpack/WebpackDevMiddlewareOptions.cs b/src/Microsoft.AspNetCore.SpaServices/Webpack/WebpackDevMiddlewareOptions.cs
@@ -50,5 +50,10 @@ public class WebpackDevMiddlewareOptions
         /// the webpack compiler.
         /// </summary>
         public IDictionary<string, string> EnvironmentVariables { get; set; }
+
+        /// <summary>
+        /// Pass in the env parameter to webpack.
+        /// </summary>
+        public object EnvParam { get; set; }
     }
 }
diff --git a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack/src/WebpackDevMiddleware.ts b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack/src/WebpackDevMiddleware.ts
@@ -32,6 +32,7 @@ interface DevServerOptions {
     HotModuleReplacementServerPort: number;
     HotModuleReplacementClientOptions: StringMap<string>;
     ReactHotModuleReplacement: boolean;
+    EnvParam: any;
 }
 
 // We support these three kinds of webpack.config.js export. We don't currently support exported promises
@@ -248,7 +249,7 @@ export function createWebpackDevServer(callback: CreateDevServerCallback, option
         // In the future, we could add support for configuring the 'env' param in Startup.cs. But right
         // now, it's not clear that people will want to do that (and they can always make up their own
         // default env values in their webpack.config.js).
-        webpackConfigExport = webpackConfigExport();
+        webpackConfigExport = webpackConfigExport(options.suppliedOptions.EnvParam);
     }
     const webpackConfigArray = webpackConfigExport instanceof Array ? webpackConfigExport : [webpackConfigExport];
 

Original file line number	Diff line number	Diff line change
`@@ -50,5 +50,10 @@ public class WebpackDevMiddlewareOptions`
`50`	`50`	`/// the webpack compiler.`
`51`	`51`	`/// </summary>`
`52`	`52`	`public IDictionary<string, string> EnvironmentVariables { get; set; }`
	`53`	`+`
	`54`	`+ /// <summary>`
	`55`	`+ /// Pass in the env parameter to webpack.`
	`56`	`+ /// </summary>`
	`57`	`+ public object EnvParam { get; set; }`
`53`	`58`	`}`
`54`	`59`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,7 @@ interface DevServerOptions {`
`32`	`32`	`HotModuleReplacementServerPort: number;`
`33`	`33`	`HotModuleReplacementClientOptions: StringMap<string>;`
`34`	`34`	`ReactHotModuleReplacement: boolean;`
	`35`	`+ EnvParam: any;`
`35`	`36`	`}`
`36`	`37`
`37`	`38`	`// We support these three kinds of webpack.config.js export. We don't currently support exported promises`
`@@ -248,7 +249,7 @@ export function createWebpackDevServer(callback: CreateDevServerCallback, option`
`248`	`249`	`// In the future, we could add support for configuring the 'env' param in Startup.cs. But right`
`249`	`250`	`// now, it's not clear that people will want to do that (and they can always make up their own`
`250`	`251`	`// default env values in their webpack.config.js).`
`251`		`- webpackConfigExport = webpackConfigExport();`
	`252`	`+ webpackConfigExport = webpackConfigExport(options.suppliedOptions.EnvParam);`
`252`	`253`	`}`
`253`	`254`	`const webpackConfigArray = webpackConfigExport instanceof Array ? webpackConfigExport : [webpackConfigExport];`
`254`	`255`