Tidied up args

Author: Ellis Kenyo

src/Middleware/SpaServices.Extensions/src/DevelopmentServer/DevelopmentServerMiddleware.cs

@@ -25,6 +25,7 @@ public static void Attach(
             ISpaBuilder spaBuilder,
             string npmScriptName,
             string waitText,
+            Dictionary<string, string> extraArgs,
             string serverName = "App")
         {
             var sourcePath = spaBuilder.Options.SourcePath;
@@ -41,7 +42,7 @@ public static void Attach(
             // Start create-react-app and attach to middleware pipeline
             var appBuilder = spaBuilder.ApplicationBuilder;
             var logger = LoggerFinder.GetOrCreateLogger(appBuilder, LogCategoryName);
-            var portTask = StartDevServerAsync(sourcePath, npmScriptName, waitText, serverName, logger);
+            var portTask = StartDevServerAsync(sourcePath, npmScriptName, waitText, serverName, logger, extraArgs);
 
             // Everything we proxy is hardcoded to target http://localhost because:
             // - the requests are always from the local machine (we're not accepting remote
@@ -73,17 +74,13 @@ private static async Task<int> StartDevServerAsync(
             {
                 { "PORT", portNumber.ToString() }
             };
-            if (extraArgs == null)
-            {
-                extraArgs = new Dictionary<string, string>
-                {
-                    { "BROWSER", "None" }
-                };
-            }
-            var extraKeys = new HashSet<string>(extraArgs.Keys);
-            extraKeys.UnionWith(envVars.Keys);
+
+            waitText = waitText.Replace("$PORT", portNumber.ToString());
+
+            extraArgs = extraArgs.ToDictionary(kvp => kvp.Key, kvp => kvp.Value.Replace("$PORT", portNumber.ToString()));
+
             var npmScriptRunner = new NpmScriptRunner(
-                sourcePath, npmScriptName, null, envVars);
+                sourcePath, npmScriptName, string.Join(" ", extraArgs.Select(x => x.Key + " " + x.Value).ToArray()), envVars);
             npmScriptRunner.AttachToLogger(logger);
 
             using (var stdErrReader = new EventedStreamStringReader(npmScriptRunner.StdErr))

src/Middleware/SpaServices.Extensions/src/DevelopmentServer/DevelopmentServerMiddlewareExtensions.cs

@@ -3,6 +3,7 @@
 
 using Microsoft.AspNetCore.Builder;
 using System;
+using System.Collections.Generic;
 
 namespace Microsoft.AspNetCore.SpaServices.DevelopmentServer
 {
@@ -27,7 +28,8 @@ public static void UseDevelopmentServer(
             this ISpaBuilder spaBuilder,
             string npmScript,
             string waitText,
-            string serverName = "App")
+            string serverName = "App",
+            Dictionary<string, string> extraArgs = null)
         {
 
             if (string.IsNullOrEmpty(waitText))
@@ -47,7 +49,7 @@ public static void UseDevelopmentServer(
                 throw new InvalidOperationException($"To use {nameof(UseDevelopmentServer)}, you must supply a non-empty value for the {nameof(SpaOptions.SourcePath)} property of {nameof(SpaOptions)} when calling {nameof(SpaApplicationBuilderExtensions.UseSpa)}.");
             }
 
-            DevelopmentServerMiddleware.Attach(spaBuilder, npmScript, waitText, serverName);
+            DevelopmentServerMiddleware.Attach(spaBuilder, npmScript, waitText, extraArgs, serverName);
         }
     }
 }

src/Middleware/SpaServices.Extensions/src/ReactDevelopmentServer/ReactDevelopmentServerMiddlewareExtensions.cs

@@ -26,7 +26,7 @@ public static void UseReactDevelopmentServer(
             this ISpaBuilder spaBuilder,
             string npmScript)
         {
-            DevelopmentServerMiddlewareExtensions.UseReactDevelopmentServer(spaBuilder, npmScript, "Starting the development server", "create-react-app");
+            DevelopmentServerMiddlewareExtensions.UseDevelopmentServer(spaBuilder, npmScript, "Starting the development server", "create-react-app");
         }
     }
 }