Address feedback from #31564

Author: javiercn

src/Middleware/Spa/SpaProxy/src/SpaHostingStartup.cs

@@ -1,10 +1,10 @@
-// Copyright (c) .NET Foundation. All rights reserved.
+// Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.DependencyInjection;
 using System;
 using System.IO;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.DependencyInjection;
 
 [assembly: HostingStartup(typeof(Microsoft.AspNetCore.SpaProxy.SpaHostingStartup))]
 

src/Middleware/Spa/SpaProxy/src/SpaProxyLaunchManager.cs

@@ -1,17 +1,16 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Hosting;
-using Microsoft.Extensions.Logging;
 using System;
 using System.Diagnostics;
 using System.IO;
 using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.Logging;
 
 namespace Microsoft.AspNetCore.SpaProxy
 {
@@ -63,7 +62,7 @@ private async Task<bool> ProbeSpaDevelopmentServerUrl(CancellationToken cancella
             }
             catch (HttpRequestException httpException)
             {
-                _logger.LogDebug(httpException, "Failed to reach the SPA Development proxy.");
+                _logger.LogDebug(httpException, "Failed to connect to the SPA Development proxy.");
                 return false;
             }
         }
@@ -104,6 +103,8 @@ private void LaunchDevelopmentProxy()
         {
             try
             {
+                // Launch command is going to be something like `npm/yarn <<verb>> <<options>>`
+                // We split it into two to separate the tool (command) from the verb and the rest of the arguments.
                 var space = _options.LaunchCommand.IndexOf(' ');
                 var command = _options.LaunchCommand[0..space];
                 var arguments = _options.LaunchCommand[++space..];
@@ -153,7 +154,7 @@ protected virtual void Dispose(bool disposing)
 
                 try
                 {
-                    if (_spaProcess != null)
+                    if (_spaProcess != null && !_spaProcess.HasExited)
                     {
                         // Review: Whether or not to do this at all. Turns out that if we try to kill the
                         // npm.cmd/ps1 process that we start, even with this option we only stop this process

src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/aspnetcore-https.js

@@ -9,11 +9,11 @@ const baseFolder =
     : `${process.env.HOME}/.aspnet/https`;
 
 const certificateName = process.argv.map(arg => arg.match(/--name=(?<value>.+)/i))
-                                    .filter(Boolean)
-                                    .reduce((previous, current) => previous || current.groups.value, undefined) ||
-  process.env.npm_package_name;
+  .filter(Boolean)
+  .reduce((previous, current) => previous || current.groups.value, undefined) ||
+    process.env.npm_package_name;
 
-if(!certificateName){
+if (!certificateName) {
   console.error('Invalid certificate name. Run this script in the context of an npm/yarn script or pass --name=<<app>> explicitly.')
   process.exit(-1);
 }