From 0ea07270b008d6f11155bf131d31a2d000d6442b Mon Sep 17 00:00:00 2001
From: crupest <crupest@outlook.com>
Date: Fri, 5 Jun 2020 16:51:42 +0800
Subject: feat(back): Add option to use proxy to serve front end in
 development.

---
 Timeline/Startup.cs | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'Timeline/Startup.cs')

diff --git a/Timeline/Startup.cs b/Timeline/Startup.cs
index 77b48466..35c47712 100644
--- a/Timeline/Startup.cs
+++ b/Timeline/Startup.cs
@@ -21,7 +21,6 @@ using Timeline.Services;
 
 namespace Timeline
 {
-    [System.Diagnostics.CodeAnalysis.SuppressMessage("Performance", "CA1822:Mark members as static")]
     public class Startup
     {
         private readonly bool disableFrontEnd;
@@ -91,7 +90,7 @@ namespace Timeline
                 options.UseSqlite($"Data Source={pathProvider.GetDatabaseFilePath()}");
             });
 
-            if (!disableFrontEnd)
+            if (!disableFrontEnd && !Environment.IsDevelopment())
             {
                 services.AddSpaStaticFiles(config =>
                 {
@@ -121,7 +120,7 @@ namespace Timeline
 
             app.UseRouting();
 
-            if (!disableFrontEnd)
+            if (!disableFrontEnd && !Environment.IsDevelopment())
             {
                 app.UseSpaStaticFiles(new StaticFileOptions
                 {
@@ -145,7 +144,14 @@ namespace Timeline
 
                     if (Environment.IsDevelopment())
                     {
-                        SpaServices.SpaDevelopmentServerMiddlewareExtensions.UseSpaDevelopmentServer(spa, packageManager: "yarn", npmScript: "install-and-start", port: 3000);
+                        if (Configuration.GetValue<bool?>(ApplicationConfiguration.FrontEndProxyOnlyKey) ?? false)
+                        {
+                            spa.UseProxyToSpaDevelopmentServer(new UriBuilder("http", "localhost", 3000).Uri);
+                        }
+                        else
+                        {
+                            SpaServices.SpaDevelopmentServerMiddlewareExtensions.UseSpaDevelopmentServer(spa, packageManager: "yarn", npmScript: "install-and-start", port: 3000);
+                        }
                     }
                 });
             }
-- 
cgit v1.2.3