codeex
diff --git a/Collapse file
‎src/Microsoft.AspNetCore.SpaServices.Extensions/ReactDevelopmentServer/ReactDevelopmentServerMiddleware.cs‎
Copy file name to clipboardExpand all lines: src/Microsoft.AspNetCore.SpaServices.Extensions/ReactDevelopmentServer/ReactDevelopmentServerMiddleware.cs
+7-5Lines changed: 7 additions & 5 deletions b/Collapse file
‎src/Microsoft.AspNetCore.SpaServices.Extensions/ReactDevelopmentServer/ReactDevelopmentServerMiddleware.cs‎
Copy file name to clipboardExpand all lines: src/Microsoft.AspNetCore.SpaServices.Extensions/ReactDevelopmentServer/ReactDevelopmentServerMiddleware.cs
+7-5Lines changed: 7 additions & 5 deletions
@@ -66,13 +66,16 @@ private static async Task<int> StartCreateReactAppServerAsync(
                 sourcePath, npmScriptName, null, envVars);
             npmScriptRunner.AttachToLogger(logger);
 
-            Match openBrowserLine;
             using (var stdErrReader = new EventedStreamStringReader(npmScriptRunner.StdErr))
             {
                 try
                 {
-                    openBrowserLine = await npmScriptRunner.StdOut.WaitForMatch(
-                        new Regex("Local:\\s*(http\\S+)", RegexOptions.None, RegexMatchTimeout),
+                    // Although the React dev server may eventually tell us the URL it's listening on,
+                    // it doesn't do so until it's finished compiling, and even then only if there were
+                    // no compiler warnings. So instead of waiting for that, consider it ready as soon
+                    // as it starts listening for requests.
+                    await npmScriptRunner.StdOut.WaitForMatch(
+                        new Regex("Starting the development server", RegexOptions.None, RegexMatchTimeout),
                         StartupTimeout);
                 }
                 catch (EndOfStreamException ex)
@@ -91,8 +94,7 @@ private static async Task<int> StartCreateReactAppServerAsync(
                 }
             }
 
-            var uri = new Uri(openBrowserLine.Groups[1].Value);
-            return uri.Port;
+            return portNumber;
         }
     }
 }
Original file line number	Diff line number	Diff line change
`@@ -66,13 +66,16 @@ private static async Task<int> StartCreateReactAppServerAsync(`
`66`	`66`	`sourcePath, npmScriptName, null, envVars);`
`67`	`67`	`npmScriptRunner.AttachToLogger(logger);`
`68`	`68`
`69`		`- Match openBrowserLine;`
`70`	`69`	`using (var stdErrReader = new EventedStreamStringReader(npmScriptRunner.StdErr))`
`71`	`70`	`{`
`72`	`71`	`try`
`73`	`72`	`{`
`74`		`- openBrowserLine = await npmScriptRunner.StdOut.WaitForMatch(`
`75`		`- new Regex("Local:\\s*(http\\S+)", RegexOptions.None, RegexMatchTimeout),`
	`73`	`+ // Although the React dev server may eventually tell us the URL it's listening on,`
	`74`	`+ // it doesn't do so until it's finished compiling, and even then only if there were`
	`75`	`+ // no compiler warnings. So instead of waiting for that, consider it ready as soon`
	`76`	`+ // as it starts listening for requests.`
	`77`	`+ await npmScriptRunner.StdOut.WaitForMatch(`
	`78`	`+ new Regex("Starting the development server", RegexOptions.None, RegexMatchTimeout),`
`76`	`79`	`StartupTimeout);`
`77`	`80`	`}`
`78`	`81`	`catch (EndOfStreamException ex)`
`@@ -91,8 +94,7 @@ private static async Task<int> StartCreateReactAppServerAsync(`
`91`	`94`	`}`
`92`	`95`	`}`
`93`	`96`
`94`		`- var uri = new Uri(openBrowserLine.Groups[1].Value);`
`95`		`- return uri.Port;`
	`97`	`+ return portNumber;`
`96`	`98`	`}`
`97`	`99`	`}`
`98`	`100`	`}`