drjunksdev
diff --git a/Collapse file
‎src/Microsoft.AspNetCore.SpaServices/Webpack/ConditionalProxyMiddleware.cs‎
Copy file name to clipboardExpand all lines: src/Microsoft.AspNetCore.SpaServices/Webpack/ConditionalProxyMiddleware.cs
+6-1Lines changed: 6 additions & 1 deletion b/Collapse file
‎src/Microsoft.AspNetCore.SpaServices/Webpack/ConditionalProxyMiddleware.cs‎
Copy file name to clipboardExpand all lines: src/Microsoft.AspNetCore.SpaServices/Webpack/ConditionalProxyMiddleware.cs
+6-1Lines changed: 6 additions & 1 deletion
diff --git a/Collapse file
‎src/Microsoft.AspNetCore.SpaServices/Webpack/WebpackDevMiddleware.cs‎
Copy file name to clipboardExpand all lines: src/Microsoft.AspNetCore.SpaServices/Webpack/WebpackDevMiddleware.cs
+1-1Lines changed: 1 addition & 1 deletion b/Collapse file
‎src/Microsoft.AspNetCore.SpaServices/Webpack/WebpackDevMiddleware.cs‎
Copy file name to clipboardExpand all lines: src/Microsoft.AspNetCore.SpaServices/Webpack/WebpackDevMiddleware.cs
+1-1Lines changed: 1 addition & 1 deletion
@@ -28,6 +28,11 @@ public ConditionalProxyMiddleware(
             string pathPrefix,
             ConditionalProxyMiddlewareOptions options)
         {
+            if (!pathPrefix.StartsWith("/"))
+            {
+                pathPrefix = "/" + pathPrefix;
+            }
+
             _next = next;
             _pathPrefix = pathPrefix;
             _options = options;
@@ -65,7 +70,7 @@ private async Task<bool> PerformProxyRequest(HttpContext context)
 
             requestMessage.Headers.Host = _options.Host + ":" + _options.Port;
             var uriString =
-                $"{_options.Scheme}://{_options.Host}:{_options.Port}{context.Request.PathBase}{context.Request.Path}{context.Request.QueryString}";
+                $"{_options.Scheme}://{_options.Host}:{_options.Port}{context.Request.Path}{context.Request.QueryString}";
             requestMessage.RequestUri = new Uri(uriString);
             requestMessage.Method = new HttpMethod(context.Request.Method);
 
 
@@ -101,9 +101,9 @@ public static void UseWebpackDevMiddleware(
             // plus /__webpack_hmr is proxied with infinite timeout, because it's an EventSource (long-lived request).
             foreach (var publicPath in devServerInfo.PublicPaths)
             {
+                appBuilder.UseProxyToLocalWebpackDevMiddleware(publicPath + hmrEndpoint, devServerInfo.Port, Timeout.InfiniteTimeSpan);
                 appBuilder.UseProxyToLocalWebpackDevMiddleware(publicPath, devServerInfo.Port, TimeSpan.FromSeconds(100));
             }
-            appBuilder.UseProxyToLocalWebpackDevMiddleware(hmrEndpoint, devServerInfo.Port, Timeout.InfiniteTimeSpan);
         }
 
         private static void UseProxyToLocalWebpackDevMiddleware(this IApplicationBuilder appBuilder, string publicPath, int proxyToPort, TimeSpan requestTimeout)
Original file line number	Diff line number	Diff line change
`@@ -101,9 +101,9 @@ public static void UseWebpackDevMiddleware(`
`101`	`101`	`// plus /__webpack_hmr is proxied with infinite timeout, because it's an EventSource (long-lived request).`
`102`	`102`	`foreach (var publicPath in devServerInfo.PublicPaths)`
`103`	`103`	`{`
	`104`	`+ appBuilder.UseProxyToLocalWebpackDevMiddleware(publicPath + hmrEndpoint, devServerInfo.Port, Timeout.InfiniteTimeSpan);`
`104`	`105`	`appBuilder.UseProxyToLocalWebpackDevMiddleware(publicPath, devServerInfo.Port, TimeSpan.FromSeconds(100));`
`105`	`106`	`}`
`106`		`- appBuilder.UseProxyToLocalWebpackDevMiddleware(hmrEndpoint, devServerInfo.Port, Timeout.InfiniteTimeSpan);`
`107`	`107`	`}`
`108`	`108`
`109`	`109`	`private static void UseProxyToLocalWebpackDevMiddleware(this IApplicationBuilder appBuilder, string publicPath, int proxyToPort, TimeSpan requestTimeout)`