From 2906c20efab053b0de9f612f8d3d110accc8e73c Mon Sep 17 00:00:00 2001
From: "Daniel J. Summers" <daniel@bitbadger.solutions>
Date: Thu, 14 Jul 2022 18:55:52 -0400
Subject: [PATCH] Upgrade htmx to v1.8.0 (#18)

---
 src/MyWebLog.Data/MyWebLog.Data.fsproj |  2 +-
 src/MyWebLog/DotLiquidBespoke.fs       | 24 ++++++++++++------------
 src/MyWebLog/Handlers/Helpers.fs       |  2 +-
 src/MyWebLog/MyWebLog.fsproj           |  4 ++--
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/MyWebLog.Data/MyWebLog.Data.fsproj b/src/MyWebLog.Data/MyWebLog.Data.fsproj
index 846ab8a..53fccf5 100644
--- a/src/MyWebLog.Data/MyWebLog.Data.fsproj
+++ b/src/MyWebLog.Data/MyWebLog.Data.fsproj
@@ -11,7 +11,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.Data.Sqlite" Version="6.0.6" />
+		<PackageReference Include="Microsoft.Data.Sqlite" Version="6.0.7" />
 		<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="6.0.0" />
 		<PackageReference Include="Microsoft.FSharpLu.Json" Version="0.11.7" />
 		<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
diff --git a/src/MyWebLog/DotLiquidBespoke.fs b/src/MyWebLog/DotLiquidBespoke.fs
index c004fa3..78786b3 100644
--- a/src/MyWebLog/DotLiquidBespoke.fs
+++ b/src/MyWebLog/DotLiquidBespoke.fs
@@ -222,17 +222,17 @@ let register () =
     Template.RegisterTag<PageFootTag>  "page_foot"
     Template.RegisterTag<UserLinksTag> "user_links"
     
-    [   // Domain types
-        typeof<CustomFeed>; typeof<Episode>; typeof<Episode option>;    typeof<MetaItem>; typeof<Page>
-        typeof<RssOptions>; typeof<TagMap>;  typeof<UploadDestination>; typeof<WebLog>
-        // View models
-        typeof<DashboardModel>; typeof<DisplayCategory>;       typeof<DisplayCustomFeed>;   typeof<DisplayPage>
-        typeof<DisplayUpload>;  typeof<EditCategoryModel>;     typeof<EditCustomFeedModel>; typeof<EditPageModel>
-        typeof<EditPostModel>;  typeof<EditRssModel>;          typeof<EditTagMapModel>;     typeof<EditUserModel>
-        typeof<LogOnModel>;     typeof<ManagePermalinksModel>; typeof<PostDisplay>;         typeof<PostListItem>
-        typeof<SettingsModel>;  typeof<UserMessage>
-        // Framework types
-        typeof<AntiforgeryTokenSet>; typeof<DateTime option>; typeof<int option>;    typeof<KeyValuePair>
-        typeof<MetaItem list>;       typeof<string list>;     typeof<string option>; typeof<TagMap list>
+    [ // Domain types
+      typeof<CustomFeed>; typeof<Episode>; typeof<Episode option>;    typeof<MetaItem>; typeof<Page>
+      typeof<RssOptions>; typeof<TagMap>;  typeof<UploadDestination>; typeof<WebLog>
+      // View models
+      typeof<DashboardModel>; typeof<DisplayCategory>;       typeof<DisplayCustomFeed>;   typeof<DisplayPage>
+      typeof<DisplayUpload>;  typeof<EditCategoryModel>;     typeof<EditCustomFeedModel>; typeof<EditPageModel>
+      typeof<EditPostModel>;  typeof<EditRssModel>;          typeof<EditTagMapModel>;     typeof<EditUserModel>
+      typeof<LogOnModel>;     typeof<ManagePermalinksModel>; typeof<PostDisplay>;         typeof<PostListItem>
+      typeof<SettingsModel>;  typeof<UserMessage>
+      // Framework types
+      typeof<AntiforgeryTokenSet>; typeof<DateTime option>; typeof<int option>;    typeof<KeyValuePair>
+      typeof<MetaItem list>;       typeof<string list>;     typeof<string option>; typeof<TagMap list>
     ]
     |> List.iter (fun it -> Template.RegisterSafeType (it, [| "*" |]))
diff --git a/src/MyWebLog/Handlers/Helpers.fs b/src/MyWebLog/Handlers/Helpers.fs
index 35e6d9b..e3efe15 100644
--- a/src/MyWebLog/Handlers/Helpers.fs
+++ b/src/MyWebLog/Handlers/Helpers.fs
@@ -138,7 +138,7 @@ let bareForTheme theme template next ctx = fun (hash : Hash) -> task {
                 | Some detail -> $"{m.level}|||{m.message}|||{detail}"
                 | None -> $"{m.level}|||{m.message}"
                 |> setHttpHeader "X-Message")
-        withHxNoPush
+        withHxNoPushUrl
         htmlString (layoutTemplate.Render hash)
         }
     
diff --git a/src/MyWebLog/MyWebLog.fsproj b/src/MyWebLog/MyWebLog.fsproj
index f993c63..2883e6a 100644
--- a/src/MyWebLog/MyWebLog.fsproj
+++ b/src/MyWebLog/MyWebLog.fsproj
@@ -28,8 +28,8 @@
   <ItemGroup>
     <PackageReference Include="DotLiquid" Version="2.2.656" />
     <PackageReference Include="Giraffe" Version="6.0.0" />
-    <PackageReference Include="Giraffe.Htmx" Version="1.7.0" />
-    <PackageReference Include="Giraffe.ViewEngine.Htmx" Version="1.7.0" />
+    <PackageReference Include="Giraffe.Htmx" Version="1.8.0" />
+    <PackageReference Include="Giraffe.ViewEngine.Htmx" Version="1.8.0" />
     <PackageReference Include="NeoSmart.Caching.Sqlite" Version="6.0.1" />
     <PackageReference Include="RethinkDB.DistributedCache" Version="1.0.0-rc1" />
     <PackageReference Update="FSharp.Core" Version="6.0.5" />