From 0de1bff190c57110d1c7c49bf1282aa147ba6a32 Mon Sep 17 00:00:00 2001
From: "Daniel J. Summers" <daniel@bitbadger.solutions>
Date: Fri, 3 Jul 2026 16:59:41 -0400
Subject: [PATCH] More WIP to get htmx served; still no luck (#59)

---
 src/MyWebLog/Program.fs | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/MyWebLog/Program.fs b/src/MyWebLog/Program.fs
index f83ab00..029fbdb 100644
--- a/src/MyWebLog/Program.fs
+++ b/src/MyWebLog/Program.fs
@@ -145,9 +145,14 @@ open RethinkDB.DistributedCache
 [<EntryPoint>]
 let main args =
 
-    let builder = WebApplication.CreateBuilder args
-    let _ = builder.Services.Configure<ForwardedHeadersOptions>(fun (opts : ForwardedHeadersOptions) ->
-        opts.ForwardedHeaders <- ForwardedHeaders.XForwardedFor ||| ForwardedHeaders.XForwardedProto)
+    let builder = WebApplication.CreateBuilder(
+        WebApplicationOptions(
+            ContentRootPath = Directory.GetCurrentDirectory(),
+            WebRootPath     = Path.Combine(Directory.GetCurrentDirectory(), "wwwroot"),
+            Args            = args))
+    let _ = builder.Services.Configure<ForwardedHeadersOptions>(
+        fun (opts: ForwardedHeadersOptions) ->
+            opts.ForwardedHeaders <- ForwardedHeaders.XForwardedFor ||| ForwardedHeaders.XForwardedProto)
     let _ =
         builder.Services
             .AddAuthentication(CookieAuthenticationDefaults.AuthenticationScheme)
@@ -202,8 +207,8 @@ let main args =
         opts.IdleTimeout        <- TimeSpan.FromMinutes 60.
         opts.Cookie.HttpOnly    <- true
         opts.Cookie.IsEssential <- true)
-    let _ = builder.WebHost.UseStaticWebAssets()
     let _ = builder.Services.AddGiraffe()
+    let _ = builder.WebHost.UseStaticWebAssets()
 
     // Set up DotLiquid
     DotLiquidBespoke.register ()
@@ -238,17 +243,16 @@ let main args =
         |> isNotNull
         |> function true -> app.UseCanonicalDomains() |> ignore | false -> ()
 
-        let _ = app.UseCookiePolicy(CookiePolicyOptions (MinimumSameSitePolicy = SameSiteMode.Strict))
+        let _ = app.UseCookiePolicy(CookiePolicyOptions(MinimumSameSitePolicy = SameSiteMode.Strict))
         let _ = app.UseMiddleware<WebLogMiddleware>()
         let _ = app.UseMiddleware<RedirectRuleMiddleware>()
         let _ = app.UseAuthentication()
         let _ = app.UseRouting()
-        let _ = app.UseStaticFiles()
-        //let _ = app.MapStaticAssets()
         let _ = app.UseSession()
         let _ = app.UseGiraffe Handlers.Routes.endpoints
+        let _ = app.UseStaticFiles()
 
-        app.Run()
+        do! app.RunAsync()
     }
     |> Async.AwaitTask |> Async.RunSynchronously