src/Common/Common.fs

@@ -3,7 +3,7 @@
 module Giraffe.Htmx.Common
 
 /// <summary>The version of htmx embedded in the package</summary>
-let HtmxVersion = "4.0.0-beta5"
+let HtmxVersion = "4.0.0"
 
 /// <summary>URLs for the included htmx library static web assets</summary>
 module StaticAssetUrl =

src/Directory.Build.props

@@ -3,16 +3,10 @@
     <PropertyGroup>
         <TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
         <VersionPrefix>4.0.0</VersionPrefix>
-        <VersionSuffix>beta5</VersionSuffix>
         <GenerateDocumentationFile>true</GenerateDocumentationFile>
-        <PackageReleaseNotes>Update htmx 4 to beta5
-- [Common] Update provided htmx/htmax 4 to 4.0.0-beta5
-- [Common] Add StaticAssetUrl module with static asset paths for htmx and htmax
-- [Server] Unobsolete HX-Prompt header, note that it requires hx-prompt extension
-- [View Engine] Unobsolete hx-prompt attribute, note that it requires hx-prompt extension
-- [View Engine] Updated CDN script tags to pull htmx / htmax 4.0.0-beta5
+        <PackageReleaseNotes>htmx 4.0.0 Initial Release
 
-See package and prior alpha release READMEs; v2 to v4 is not an update-and-forget-it release
+See package and prior alpha/beta release READMEs; v2 to v4 is not an update-and-forget-it release. If you encounter build errors after installing this, install v4.0.0-beta5 instead; obsolete elements will generate a warning with suggestions of what to use instead.
         </PackageReleaseNotes>
         <Authors>danieljsummers</Authors>
         <Company>Bit Badger Solutions</Company>

src/Directory.Packages.props

@@ -3,11 +3,11 @@
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
   </PropertyGroup>
   <ItemGroup>
-    <PackageVersion Include="Expecto" Version="11.0.0" />
-    <PackageVersion Include="Giraffe" Version="8.2.0" />
+    <PackageVersion Include="Expecto" Version="11.1.0" />
+    <PackageVersion Include="Giraffe" Version="8.3.0" />
     <PackageVersion Include="Giraffe.ViewEngine" Version="1.4.0" />
-    <PackageVersion Include="NSubstitute" Version="5.3.0" />
-    <PackageVersion Include="FSharp.Core" Version="10.1.301" />
+    <PackageVersion Include="NSubstitute" Version="6.2.0" />
+    <PackageVersion Include="FSharp.Core" Version="10.1.400" />
     <!-- <PackageVersion Update="FSharp.Core" Version="10.0.0" /> -->
   </ItemGroup>
 </Project>

src/Htmx/Htmx.fs

@@ -91,16 +91,6 @@ type IHeaderDictionary with
                     Some (parts[0], if parts[1] <> "" then Some parts[1] else None)
             | None -> None
 
-    /// <summary>The <c>id</c> attribute of the triggered element if it exists</summary>
-    [<Obsolete "HX-Trigger is removed in v4; use the second item of HX-Source">]
-    member this.HxTrigger
-        with get () = hdr this "HX-Trigger"
-
-    /// <summary>The <c>name</c> attribute of the triggered element if it exists</summary>
-    [<Obsolete "HX-Trigger-Name is removed in v4; may be available via extension, but will be removed from this library">]
-    member this.HxTriggerName
-        with get () = hdr this "HX-Trigger-Name"
-
 
 /// Extensions for the request object
 type HttpRequest with
@@ -209,38 +199,6 @@ module Handlers =
     let withHxTriggerMany evts : HttpHandler =
         toJson evts |> setHttpHeader "HX-Trigger"
 
-    /// <summary>Allows you to trigger a single client side event after changes have settled</summary>
-    /// <param name="evt">The call to the event that should be triggered</param>
-    /// <returns>An HTTP handler with the <c>HX-Trigger-After-Settle</c> header set</returns>
-    /// <seealso href="https://htmx.org/headers/hx-trigger/">Documentation</seealso>
-    [<Obsolete "Removed in v4; use withHxTrigger">]
-    let withHxTriggerAfterSettle (evt: string) : HttpHandler =
-        setHttpHeader "HX-Trigger" evt
-
-    /// <summary>Allows you to trigger multiple client side events after changes have settled</summary>
-    /// <param name="evts">The calls to events that should be triggered</param>
-    /// <returns>An HTTP handler with the <c>HX-Trigger-After-Settle</c> header set for all given events</returns>
-    /// <seealso href="https://htmx.org/headers/hx-trigger/">Documentation</seealso>
-    [<Obsolete "Removed in v4; use withHxTrigger">]
-    let withHxTriggerManyAfterSettle evts : HttpHandler =
-        toJson evts |> setHttpHeader "HX-Trigger"
-
-    /// <summary>Allows you to trigger a single client side event after DOM swapping occurs</summary>
-    /// <param name="evt">The call to the event that should be triggered</param>
-    /// <returns>An HTTP handler with the <c>HX-Trigger-After-Swap</c> header set</returns>
-    /// <seealso href="https://htmx.org/headers/hx-trigger/">Documentation</seealso>
-    [<Obsolete "Removed in v4; use withHxTrigger">]
-    let withHxTriggerAfterSwap (evt: string) : HttpHandler =
-        setHttpHeader "HX-Trigger" evt
-
-    /// <summary>Allows you to trigger multiple client side events after DOM swapping occurs</summary>
-    /// <param name="evts">The calls to events that should be triggered</param>
-    /// <returns>An HTTP handler with the <c>HX-Trigger-After-Swap</c> header set for all given events</returns>
-    /// <seealso href="https://htmx.org/headers/hx-trigger/">Documentation</seealso>
-    [<Obsolete "Removed in v4; use withHxTrigger">]
-    let withHxTriggerManyAfterSwap evts : HttpHandler =
-        toJson evts |> setHttpHeader "HX-Trigger"
-
 
 /// <summary>Load the package-provided version of the htmx script</summary>
 [<RequireQualifiedAccess>]

src/Tests/Common.fs

@@ -6,7 +6,7 @@ open Giraffe.Htmx
 /// Test to ensure the version was updated
 let version =
     test "HtmxVersion is correct" {
-        Expect.equal HtmxVersion "4.0.0-beta5" "htmx version incorrect"
+        Expect.equal HtmxVersion "4.0.0" "htmx version incorrect"
     }
 
 let staticAssetUrl =

src/Tests/Htmx.fs

@@ -441,76 +441,5 @@ let script =
         }
     ]
 
-#nowarn 44 // Obsolete items still have tests
-let dictExtensionsObs =
-    testList "IHeaderDictionaryExtensions (Obsolete)" [
-        testList "HxTrigger" [
-            test "succeeds when the header is not present" {
-                let ctx = Substitute.For<HttpContext>()
-                ctx.Request.Headers.ReturnsForAnyArgs (HeaderDictionary ()) |> ignore
-                Expect.isNone ctx.Request.Headers.HxTrigger "There should not have been a header returned"
-            }
-            test "succeeds when the header is present" {
-                let ctx = Substitute.For<HttpContext>()
-                let dic = HeaderDictionary()
-                dic.Add("HX-Trigger", "#trig")
-                ctx.Request.Headers.ReturnsForAnyArgs dic |> ignore
-                Expect.isSome ctx.Request.Headers.HxTrigger "There should be a header present"
-                Expect.equal ctx.Request.Headers.HxTrigger.Value "#trig" "The header value was incorrect"
-            }
-        ]
-        testList "HxTriggerName" [
-            test "succeeds when the header is not present" {
-                let ctx = Substitute.For<HttpContext>()
-                ctx.Request.Headers.ReturnsForAnyArgs(HeaderDictionary()) |> ignore
-                Expect.isNone ctx.Request.Headers.HxTriggerName "There should not have been a header returned"
-            }
-            test "HxTriggerName succeeds when the header is present" {
-                let ctx = Substitute.For<HttpContext>()
-                let dic = HeaderDictionary()
-                dic.Add("HX-Trigger-Name", "click")
-                ctx.Request.Headers.ReturnsForAnyArgs dic |> ignore
-                Expect.isSome ctx.Request.Headers.HxTriggerName "There should be a header present"
-                Expect.equal ctx.Request.Headers.HxTriggerName.Value "click" "The header value was incorrect"
-            }
-        ]
-    ]
-
-let handlerObs =
-    testList "Handler Tests (Obsolete)" [
-        testTask "withHxTriggerAfterSettle succeeds" {
-            let ctx = Substitute.For<HttpContext>()
-            let dic = HeaderDictionary()
-            ctx.Response.Headers.ReturnsForAnyArgs dic |> ignore
-            let! _ = withHxTriggerAfterSettle "byTheWay" next ctx
-            Expect.isTrue (dic.ContainsKey "HX-Trigger") "The HX-Trigger header should be present"
-            Expect.equal dic["HX-Trigger"].[0] "byTheWay" "The HX-Trigger value was incorrect"
-        }
-        testTask "withHxTriggerManyAfterSettle succeeds" {
-            let ctx = Substitute.For<HttpContext>()
-            let dic = HeaderDictionary()
-            ctx.Response.Headers.ReturnsForAnyArgs dic |> ignore
-            let! _ = withHxTriggerManyAfterSettle [ "oof", "ouch"; "hmm", "uh" ] next ctx
-            Expect.isTrue (dic.ContainsKey "HX-Trigger") "The HX-Trigger header should be present"
-            Expect.equal dic["HX-Trigger"].[0] """{ "oof": "ouch", "hmm": "uh" }""" "The HX-Trigger value was incorrect"
-        }
-        testTask "withHxTriggerAfterSwap succeeds" {
-            let ctx = Substitute.For<HttpContext>()
-            let dic = HeaderDictionary()
-            ctx.Response.Headers.ReturnsForAnyArgs dic |> ignore
-            let! _ = withHxTriggerAfterSwap "justASec" next ctx
-            Expect.isTrue (dic.ContainsKey "HX-Trigger") "The HX-Trigger header should be present"
-            Expect.equal dic["HX-Trigger"].[0] "justASec" "The HX-Trigger value was incorrect"
-        }
-        testTask "withHxTriggerManyAfterSwap succeeds" {
-            let ctx = Substitute.For<HttpContext>()
-            let dic = HeaderDictionary()
-            ctx.Response.Headers.ReturnsForAnyArgs dic |> ignore
-            let! _ = withHxTriggerManyAfterSwap [ "this", "1"; "that", "2" ] next ctx
-            Expect.isTrue (dic.ContainsKey "HX-Trigger") "The HX-Trigger header should be present"
-            Expect.equal dic["HX-Trigger"].[0] """{ "this": "1", "that": "2" }""" "The HX-Trigger value was incorrect"
-        }
-    ]
-
 /// All tests for this module
-let allTests = testList "Htmx" [ dictExtensions; reqExtensions; handlers; script; dictExtensionsObs; handlerObs ]
+let allTests = testList "Htmx" [ dictExtensions; reqExtensions; handlers; script ]

src/Tests/ViewEngine.fs

@@ -863,474 +863,6 @@ let renderFragment =
         ]
     ]
 
-#nowarn 44 // Obsolete events still have tests
-
-let hxEventObs =
-    testList "HxEvent (Obsolete)" [
-        testList "AfterOnLoad" [
-            test "ToString succeeds" {
-                Expect.equal (string AfterOnLoad) "afterOnLoad" "AfterOnLoad event name not correct"
-            }
-            test "ToHxOnString succeeds" {
-                Expect.equal (AfterOnLoad.ToHxOnString()) "after:init" "AfterOnLoad hx-on event name not correct"
-            }
-        ]
-        testList "AfterProcessNode" [
-            test "ToString succeeds" {
-                Expect.equal (string AfterProcessNode) "afterProcessNode" "AfterProcessNode event name not correct"
-            }
-            test "ToHxOnString succeeds" {
-                Expect.equal
-                    (AfterProcessNode.ToHxOnString()) "after:process" "AfterProcessNode hx-on event name not correct"
-            }
-        ]
-        testList "AfterSseMessage" [
-            test "ToString succeeds" {
-                Expect.equal (string AfterSseMessage) "afterSseMessage" "AfterSseMessage event name not correct"
-            }
-            test "ToHxOnString succeeds" {
-                Expect.equal
-                    (AfterSseMessage.ToHxOnString()) "after:sse:message" "AfterSseMessage hx-on event name not correct"
-            }
-        ]
-        testList "AfterSseStream" [
-            test "ToString succeeds" {
-                Expect.equal (string AfterSseStream) "afterSseStream" "AfterSseStream event name not correct"
-            }
-            test "ToHxOnString succeeds" {
-                Expect.equal
-                    (AfterSseStream.ToHxOnString()) "after:sse:stream" "AfterSseStream hx-on event name not correct"
-            }
-        ]
-        testList "BeforeCleanupElement" [
-            test "ToString succeeds" {
-                Expect.equal
-                    (string BeforeCleanupElement) "beforeCleanupElement" "BeforeCleanupElement event name not correct"
-            }
-            test "ToHxOnString succeeds" {
-                Expect.equal
-                    (BeforeCleanupElement.ToHxOnString())
-                    "before:cleanup"
-                    "BeforeCleanupElement hx-on event name not correct"
-            }
-        ]
-        testList "BeforeHistorySave" [
-            test "ToString succeeds" {
-                Expect.equal (string BeforeHistorySave) "beforeHistorySave" "BeforeHistorySave event name not correct"
-            }
-            test "ToHxOnString succeeds" {
-                Expect.equal
-                    (BeforeHistorySave.ToHxOnString())
-                    "before:history:update"
-                    "BeforeHistorySave hx-on event name not correct"
-            }
-        ]
-        testList "BeforeOnLoad" [
-            test "ToString succeeds" {
-                Expect.equal (string BeforeOnLoad) "beforeOnLoad" "BeforeOnLoad event name not correct"
-            }
-            test "ToHxOnString succeeds" {
-                Expect.equal (BeforeOnLoad.ToHxOnString()) "before:init" "BeforeOnLoad hx-on event name not correct"
-            }
-        ]
-        testList "BeforeProcessNode" [
-            test "ToString succeeds" {
-                Expect.equal (string BeforeProcessNode) "beforeProcessNode" "BeforeProcessNode event name not correct"
-            }
-            test "ToHxOnString succeeds" {
-                Expect.equal
-                    (BeforeProcessNode.ToHxOnString()) "before:process" "BeforeProcessNode hx-on event name not correct"
-            }
-        ]
-        testList "BeforeSend" [
-            test "ToString succeeds" {
-                Expect.equal (string BeforeSend) "beforeSend" "BeforeSend event name not correct"
-            }
-            test "ToHxOnString succeeds" {
-                Expect.equal (BeforeSend.ToHxOnString()) "before:request" "BeforeSend hx-on event name not correct"
-            }
-        ]
-        testList "BeforeSseMessage" [
-            test "ToString succeeds" {
-                Expect.equal (string BeforeSseMessage) "beforeSseMessage" "BeforeSseMessage event name not correct"
-            }
-            test "ToHxOnString succeeds" {
-                Expect.equal
-                    (BeforeSseMessage.ToHxOnString())
-                    "before:sse:message"
-                    "BeforeSseMessage hx-on event name not correct"
-            }
-        ]
-        testList "BeforeSseReconnect" [
-            test "ToString succeeds" {
-                Expect.equal
-                    (string BeforeSseReconnect) "beforeSseReconnect" "BeforeSseReconnect event name not correct"
-            }
-            test "ToHxOnString succeeds" {
-                Expect.equal
-                    (BeforeSseReconnect.ToHxOnString())
-                    "before:sse:reconnect"
-                    "BeforeSseReconnect hx-on event name not correct"
-            }
-        ]
-        testList "BeforeSseStream" [
-            test "ToString succeeds" {
-                Expect.equal (string BeforeSseStream) "beforeSseStream" "BeforeSseStream event name not correct"
-            }
-            test "ToHxOnString succeeds" {
-                Expect.equal
-                    (BeforeSseStream.ToHxOnString()) "before:sse:stream" "BeforeSseStream hx-on event name not correct"
-            }
-        ]
-        testList "HistoryCacheError" [
-            test "ToString succeeds" {
-                Expect.equal (string HistoryCacheError) "historyCacheError" "HistoryCacheError event name not correct"
-            }
-            test "ToHxOnString succeeds" {
-                Expect.equal
-                    (HistoryCacheError.ToHxOnString())
-                    "history-cache-error"
-                    "HistoryCacheError hx-on event name not correct"
-            }
-        ]
-        testList "HistoryCacheMiss" [
-            test "ToString succeeds" {
-                Expect.equal (string HistoryCacheMiss) "historyCacheMiss" "HistoryCacheMiss event name not correct"
-            }
-            test "ToHxOnString succeeds" {
-                Expect.equal
-                    (HistoryCacheMiss.ToHxOnString())
-                    "before:history:restore"
-                    "HistoryCacheMiss hx-on event name not correct"
-            }
-        ]
-        testList "HistoryCacheMissError" [
-            test "ToString succeeds" {
-                Expect.equal
-                    (string HistoryCacheMissError)
-                    "historyCacheMissError"
-                    "HistoryCacheMissError event name not correct"
-            }
-            test "ToHxOnString succeeds" {
-                Expect.equal
-                    (HistoryCacheMissError.ToHxOnString())
-                    "history-cache-miss-error"
-                    "HistoryCacheMissError hx-on event name not correct"
-            }
-        ]
-        testList "HistoryCacheMissLoad" [
-            test "ToString succeeds" {
-                Expect.equal
-                    (string HistoryCacheMissLoad) "historyCacheMissLoad" "HistoryCacheMissLoad event name not correct"
-            }
-            test "ToHxOnString succeeds" {
-                Expect.equal
-                    (HistoryCacheMissLoad.ToHxOnString())
-                    "before:history:restore"
-                    "HistoryCacheMissLoad hx-on event name not correct"
-            }
-        ]
-        testList "HistoryRestore" [
-            test "ToString succeeds" {
-                Expect.equal (string HistoryRestore) "historyRestore" "HistoryRestore event name not correct"
-            }
-            test "ToHxOnString succeeds" {
-                Expect.equal
-                    (HistoryRestore.ToHxOnString())
-                    "before:history:restore"
-                    "HistoryRestore hx-on event name not correct"
-            }
-        ]
-        testList "Load" [
-            test "ToString succeeds" {
-                Expect.equal (string Load) "load" "Load event name not correct"
-            }
-            test "ToHxOnString succeeds" {
-                Expect.equal (Load.ToHxOnString()) "after:init" "Load hx-on event name not correct"
-            }
-        ]
-        testList "NoSseSourceError" [
-            test "ToString succeeds" {
-                Expect.equal (string NoSseSourceError) "noSSESourceError" "NoSseSourceError event name not correct"
-            }
-            test "ToHxOnString succeeds" {
-                Expect.equal (NoSseSourceError.ToHxOnString()) "error" "NoSseSourceError hx-on event name not correct"
-            }
-        ]
-        testList "OnLoadError" [
-            test "ToString succeeds" {
-                Expect.equal (string OnLoadError) "onLoadError" "OnLoadError event name not correct"
-            }
-            test "ToHxOnString succeeds" {
-                Expect.equal (OnLoadError.ToHxOnString()) "error" "OnLoadError hx-on event name not correct"
-            }
-        ]
-        testList "OobAfterSwap" [
-            test "ToString succeeds" {
-                Expect.equal (string OobAfterSwap) "oobAfterSwap" "OobAfterSwap event name not correct"
-            }
-            test "ToHxOnString succeeds" {
-                Expect.equal (OobAfterSwap.ToHxOnString()) "after:swap" "OobAfterSwap hx-on event name not correct"
-            }
-        ]
-        testList "OobBeforeSwap" [
-            test "ToString succeeds" {
-                Expect.equal (string OobBeforeSwap) "oobBeforeSwap" "OobBeforeSwap event name not correct"
-            }
-            test "ToHxOnString succeeds" {
-                Expect.equal (OobBeforeSwap.ToHxOnString()) "before:swap" "OobBeforeSwap hx-on event name not correct"
-            }
-        ]
-        testList "OobErrorNoTarget" [
-            test "ToString succeeds" {
-                Expect.equal (string OobErrorNoTarget) "oobErrorNoTarget" "OobErrorNoTarget event name not correct"
-            }
-            test "ToHxOnString succeeds" {
-                Expect.equal (OobErrorNoTarget.ToHxOnString()) "error" "OobErrorNoTarget hx-on event name not correct"
-            }
-        ]
-        testList "Prompt" [
-            test "ToString succeeds" {
-                Expect.equal (string Prompt) "prompt" "Prompt event name not correct"
-            }
-            test "ToHxOnString succeeds" {
-                Expect.equal (Prompt.ToHxOnString()) "prompt" "Prompt hx-on event name not correct"
-            }
-        ]
-        testList "PushedIntoHistory" [
-            test "ToString succeeds" {
-                Expect.equal (string PushedIntoHistory) "pushedIntoHistory" "PushedIntoHistory event name not correct"
-            }
-            test "ToHxOnString succeeds" {
-                Expect.equal
-                    (PushedIntoHistory.ToHxOnString())
-                    "after:push:into:history"
-                    "PushedIntoHistory hx-on event name not correct"
-            }
-        ]
-        testList "SendError" [
-            test "ToString succeeds" {
-                Expect.equal (string SendError) "sendError" "SendError event name not correct"
-            }
-            test "ToHxOnString succeeds" {
-                Expect.equal (SendError.ToHxOnString()) "error" "SendError hx-on event name not correct"
-            }
-        ]
-        testList "SseError" [
-            test "ToString succeeds" {
-                Expect.equal (string SseError) "sseError" "SseError event name not correct"
-            }
-            test "ToHxOnString succeeds" {
-                Expect.equal (SseError.ToHxOnString()) "sse:error" "SseError hx-on event name not correct"
-            }
-        ]
-        testList "SseOpen" [
-            test "ToString succeeds" {
-                Expect.equal (string SseOpen) "sseOpen" "SseOpen event name not correct"
-            }
-            test "ToHxOnString succeeds" {
-                Expect.equal (SseOpen.ToHxOnString()) "after:sse:connection" "SseOpen hx-on event name not correct"
-            }
-        ]
-        testList "SwapError" [
-            test "ToString succeeds" {
-                Expect.equal (string SwapError) "swapError" "SwapError event name not correct"
-            }
-            test "ToHxOnString succeeds" {
-                Expect.equal (SwapError.ToHxOnString()) "error" "SwapError hx-on event name not correct"
-            }
-        ]
-        testList "TargetError" [
-            test "ToString succeeds" {
-                Expect.equal (string TargetError) "targetError" "TargetError event name not correct"
-            }
-            test "ToHxOnString succeeds" {
-                Expect.equal (TargetError.ToHxOnString()) "error" "TargetError hx-on event name not correct"
-            }
-        ]
-        testList "Timeout" [
-            test "ToString succeeds" {
-                Expect.equal (string Timeout) "timeout" "Timeout event name not correct"
-            }
-            test "ToHxOnString succeeds" {
-                Expect.equal (Timeout.ToHxOnString()) "error" "Timeout hx-on event name not correct"
-            }
-        ]
-        testList "ValidationValidate" [
-            test "ToString succeeds" {
-                Expect.equal
-                    (string ValidationValidate) "validation:validate" "ValidationValidate event name not correct"
-            }
-            test "ToHxOnString succeeds" {
-                Expect.equal
-                    (ValidationValidate.ToHxOnString())
-                    "validation:validate"
-                    "ValidationValidate hx-on event name not correct"
-            }
-        ]
-        testList "ValidationFailed" [
-            test "ToString succeeds" {
-                Expect.equal (string ValidationFailed) "validation:failed" "ValidationFailed event name not correct"
-            }
-            test "ToHxOnString succeeds" {
-                Expect.equal
-                    (ValidationFailed.ToHxOnString())
-                    "validation:failed"
-                    "ValidationFailed hx-on event name not correct"
-            }
-        ]
-        testList "ValidationHalted" [
-            test "ToString succeeds" {
-                Expect.equal (string ValidationHalted) "validation:halted" "ValidationHalted event name not correct"
-            }
-            test "ToHxOnString succeeds" {
-                Expect.equal
-                    (ValidationHalted.ToHxOnString())
-                    "validation:halted"
-                    "ValidationHalted hx-on event name not correct"
-            }
-        ]
-        testList "XhrAbort" [
-            test "ToString succeeds" {
-                Expect.equal (string XhrAbort) "xhr:abort" "XhrAbort event name not correct"
-            }
-            test "ToHxOnString succeeds" {
-                Expect.equal (XhrAbort.ToHxOnString()) "error" "XhrAbort hx-on event name not correct"
-            }
-        ]
-        testList "XhrLoadEnd" [
-            test "ToString succeeds" {
-                Expect.equal (string XhrLoadEnd) "xhr:loadend" "XhrLoadEnd event name not correct"
-            }
-            test "ToHxOnString succeeds" {
-                Expect.equal (XhrLoadEnd.ToHxOnString()) "finally:request" "XhrLoadEnd hx-on event name not correct"
-            }
-        ]
-        testList "XhrLoadStart" [
-            test "ToString succeeds" {
-                Expect.equal (string XhrLoadStart) "xhr:loadstart" "XhrLoadStart event name not correct"
-            }
-            test "ToHxOnString succeeds" {
-                Expect.equal (XhrLoadStart.ToHxOnString()) "xhr:loadstart" "XhrLoadStart hx-on event name not correct"
-            }
-        ]
-        testList "XhrProgress" [
-            test "ToString succeeds" {
-                Expect.equal (string XhrProgress) "xhr:progress" "XhrProgress event name not correct"
-            }
-            test "ToHxOnString succeeds" {
-                Expect.equal (XhrProgress.ToHxOnString()) "xhr:progress" "XhrProgress hx-on event name not correct"
-            }
-        ]
-    ]
-
-/// Tests for the HxParams module
-let hxParamsObs =
-    testList "HxParams" [
-        test "All is correct" {
-            Expect.equal HxParams.All "*" "All is not correct"
-        }
-        test "None is correct" {
-            Expect.equal HxParams.None "none" "None is not correct"
-        }
-        testList "With" [
-            test "succeeds with empty list" {
-                Expect.equal (HxParams.With []) "" "With with empty list should have been blank"
-            }
-            test "succeeds with one list item" {
-                Expect.equal (HxParams.With [ "boo" ]) "boo" "With single item incorrect"
-            }
-            test "succeeds with multiple list items" {
-                Expect.equal (HxParams.With [ "foo"; "bar"; "baz" ]) "foo,bar,baz" "With multiple items incorrect"
-            }
-        ]
-        testList "Except" [
-            test "succeeds with empty list" {
-                Expect.equal (HxParams.Except []) "not " "Except with empty list incorrect"
-            }
-            test "succeeds with one list item" {
-                Expect.equal (HxParams.Except [ "that" ]) "not that" "Except single item incorrect"
-            }
-            test "succeeds with multiple list items" {
-                Expect.equal (HxParams.Except [ "blue"; "green" ]) "not blue,green" "Except multiple items incorrect"
-            }
-        ]
-    ]
-
-/// Tests for the HxConfig module
-let hxRequestObs =
-    testList "HxRequest (Obsolete)" [
-        testList "Configure" [
-            test "succeeds with an empty list" {
-                Expect.equal (HxRequest.Configure []) "{  }" "Configure with empty list incorrect"
-            }
-            test "succeeds with a non-empty list" {
-                Expect.equal
-                    (HxRequest.Configure [ "\"a\": \"b\""; "\"c\": \"d\"" ]) """{ "a": "b", "c": "d" }"""
-                    "Configure with a non-empty list incorrect"
-            }
-            test "succeeds with all known params configured" {
-                Expect.equal
-                    (HxRequest.Configure
-                        [ HxRequest.Timeout 1000; HxRequest.Credentials false; HxRequest.NoHeaders true ])
-                    """{ "timeout": 1000, "credentials": false, "noHeaders": true }"""
-                    "Configure with all known params incorrect"
-            }
-        ]
-        test "Timeout succeeds" {
-            Expect.equal (HxRequest.Timeout 50) "\"timeout\": 50" "Timeout value incorrect"
-        }
-        testList "Credentials" [
-            test "succeeds when set to true" {
-                Expect.equal (HxRequest.Credentials true) "\"credentials\": true" "Credentials value incorrect"
-            }
-            test "succeeds when set to false" {
-                Expect.equal (HxRequest.Credentials false) "\"credentials\": false" "Credentials value incorrect"
-            }
-        ]
-        testList "NoHeaders" [
-            test "succeeds when set to true" {
-                Expect.equal (HxRequest.NoHeaders true) "\"noHeaders\": true" "NoHeaders value incorrect"
-            }
-            test "succeeds when set to false" {
-                Expect.equal (HxRequest.NoHeaders false) "\"noHeaders\": false" "NoHeaders value incorrect"
-            }
-        ]
-    ]
-
-let attributesObs =
-    testList "Attributes (Obsolete)" [
-        test "_hxDisabledElt succeeds" {
-            button [ _hxDisabledElt "this" ] [] |> shouldRender """<button hx-disabled-elt="this"></button>"""
-        }
-        test "_hxDisinherit succeeds" {
-            strong [ _hxDisinherit "*" ] [] |> shouldRender """<strong hx-disinherit="*"></strong>"""
-        }
-        test "_hxExt succeeds" {
-            section [ _hxExt "extendme" ] [] |> shouldRender """<section hx-ext="extendme"></section>"""
-        }
-        test "_hxHistory succeeds" {
-            span [ _hxHistory false ] [] |> shouldRender """<span hx-history="false"></span>"""
-        }
-        test "_hxHistoryElt succeeds" {
-            table [ _hxHistoryElt ] [] |> shouldRender """<table hx-history-elt></table>"""
-        }
-        test "_hxParams succeeds" {
-            br [ _hxParams "[p1,p2]" ] |> shouldRender """<br hx-params="[p1,p2]">"""
-        }
-        test "_hxRequest succeeds" {
-            u [ _hxRequest "noHeaders" ] [] |> shouldRender """<u hx-request="noHeaders"></u>"""
-        }
-        test "_sseConnect succeeds" {
-            div [ _sseConnect "/gps/sse" ] [] |> shouldRender """<div sse-connect="/gps/sse"></div>"""
-        }
-        test "_sseSwap succeeds" {
-            ul [ _sseSwap "sseMessageName" ] [] |> shouldRender """<ul sse-swap="sseMessageName"></ul>"""
-        }
-    ]
-
-let obsolete = testList "Obsolete" [ hxEventObs; hxParamsObs; hxRequestObs; attributesObs ]
-
 /// All tests in this module
 let allTests =
     testList "ViewEngine.Htmx" [
@@ -1345,5 +877,4 @@ let allTests =
         hxTags
         script
         renderFragment
-        obsolete
     ]

src/ViewEngine.Htmx/Htmx.fs

@@ -50,7 +50,6 @@ module HxEncoding =
     let MultipartForm = "multipart/form-data"
 
 
-#nowarn 44 // Obsolete elements still have entries in the conversion map; will be removed for v4 final
 /// <summary>The events recognized by htmx</summary>
 /// <seealso href="https://four.htmx.org/events/">Documentation</seealso>
 [<Struct>]
@@ -68,15 +67,9 @@ type HxEvent =
     /// <summary>Triggered after a request has initialized</summary>
     | AfterInit
 
-    /// <summary>Triggered after an AJAX request has completed processing a successful response</summary>
-    | [<System.Obsolete "Removed in v4; use AfterInit">] AfterOnLoad
-
     /// <summary>Triggered after htmx has initialized a DOM node or subtree</summary>
     | AfterProcess
 
-    /// <summary>Triggered after htmx has initialized a node</summary>
-    | [<System.Obsolete "Removed in v4; use AfterProcess">] AfterProcessNode
-
     /// <summary>Triggered after new content is saved to the history cache</summary>
     | AfterPushIntoHistory
 
@@ -89,12 +82,6 @@ type HxEvent =
     /// <summary>Triggered after the DOM has settled</summary>
     | AfterSettle
 
-    /// <summary>Triggered after a Server Sent Events (SSE) message is read</summary>
-    | [<System.Obsolete "Removed in v4; use Htmax.HxEvents.AfterSseMessage">] AfterSseMessage
-
-    /// <summary>Triggered after a Server Sent Events (SSE) stream is closed</summary>
-    | [<System.Obsolete "Removed in v4; SSE is assumed to be a stream">] AfterSseStream
-
     /// <summary>Triggered after new content has been swapped in</summary>
     | AfterSwap
 
@@ -104,27 +91,15 @@ type HxEvent =
     /// <summary>Triggered before htmx disables an element or removes it from the DOM</summary>
     | BeforeCleanup
 
-    /// <summary>Triggered before htmx disables an element or removes it from the DOM</summary>
-    | [<System.Obsolete "Removed in v4; use BeforeCleanup">] BeforeCleanupElement
-
-    /// <summary>Triggered before content is saved to the history cache</summary>
-    | [<System.Obsolete "Removed in v4; use BeforeHistoryUpdate">] BeforeHistorySave
-
     /// <summary>Triggered before content is saved to the history cache</summary>
     | BeforeHistoryUpdate
 
     /// <summary>Triggered before htmx initializes a node</summary>
     | BeforeInit
 
-    /// <summary>Triggered before any response processing occurs</summary>
-    | [<System.Obsolete "Removed in v4; use BeforeInit">] BeforeOnLoad
-
     /// <summary>Triggered before htmx begins processing a DOM node or subtree</summary>
     | BeforeProcess
 
-    /// <summary>Triggered before htmx initializes a node</summary>
-    | [<System.Obsolete "Removed in v4; use BeforeProcess">] BeforeProcessNode
-
     /// <summary>Triggered before an HTTP request is made</summary>
     | BeforeRequest
 
@@ -134,18 +109,6 @@ type HxEvent =
     /// <summary>Triggered before a history restore request is made</summary>
     | BeforeRestoreHistory
 
-    /// <summary>Triggered just before an ajax request is sent</summary>
-    | [<System.Obsolete "Removed in v4; use BeforeRequest">] BeforeSend
-
-    /// <summary>Triggered before a Server Sent Events (SSE) message is read</summary>
-    | [<System.Obsolete "Removed in v4; use Htmax.HxEvents.BeforeSseMessage">] BeforeSseMessage
-
-    /// <summary>Triggered before a Server Sent Events (SSE) connection is reconnected</summary>
-    | [<System.Obsolete "Removed in v4; use fetch event handlers">] BeforeSseReconnect
-
-    /// <summary>Triggered before a Server Sent Events (SSE) stream is opened</summary>
-    | [<System.Obsolete "Removed in v4; SSE is assumed to be a stream">] BeforeSseStream
-
     /// <summary>Triggered before a swap is done, allows you to configure the swap</summary>
     | BeforeSwap
 
@@ -166,153 +129,35 @@ type HxEvent =
     /// <summary>Triggered after an HTTP request is made, whether it was successful or not</summary>
     | FinallyRequest
 
-    /// <summary>Triggered on an error during cache writing</summary>
-    | [<System.Obsolete "Removed in v4; history no longer uses localStorage">] HistoryCacheError
-
-    /// <summary>Triggered on a cache miss in the history subsystem</summary>
-    | [<System.Obsolete "Removed in v4; use BeforeRestoreHistory">] HistoryCacheMiss
-
-    /// <summary>Triggered on a unsuccessful remote retrieval</summary>
-    | [<System.Obsolete "Removed in v4; history no longer uses localStorage">] HistoryCacheMissError
-
-    /// <summary>Triggered on a successful remote retrieval</summary>
-    | [<System.Obsolete "Removed in v4; use BeforeRestoreHistory">] HistoryCacheMissLoad
-
-    /// <summary>Triggered when htmx handles a history restoration action</summary>
-    | [<System.Obsolete "Removed in v4; use BeforeRestoreHistory">] HistoryRestore
-
-    /// <summary>Triggered when new content is added to the DOM</summary>
-    | [<System.Obsolete "Removed in v4; use AfterInit">] Load
-
-    /// <summary>
-    /// Triggered when an element refers to a SSE event in its trigger, but no parent SSE source has been defined
-    /// </summary>
-    | [<System.Obsolete "Removed in v4; use Error (all errors consolidated)">] NoSseSourceError
-
-    /// <summary>Triggered when an exception occurs during the onLoad handling in htmx</summary>
-    | [<System.Obsolete "Removed in v4; use Error (all errors consolidated)">] OnLoadError
-
-    /// <summary>Triggered after an out of band element as been swapped in</summary>
-    | [<System.Obsolete "Removed in v4; use AfterSwap (no separate OOB event)">] OobAfterSwap
-
-    /// <summary>Triggered before an out of band element swap is done, allows you to configure the swap</summary>
-    | [<System.Obsolete "Removed in v4; use BeforeSwap (no separate OOB event)">] OobBeforeSwap
-
-    /// <summary>Triggered when an out of band element does not have a matching ID in the current DOM</summary>
-    | [<System.Obsolete "Removed in v4; use Error (all errors consolidated)">] OobErrorNoTarget
-
-    /// <summary>Triggered after a prompt is shown</summary>
-    | [<System.Obsolete "Removed in v4; use Confirm with custom JavaScript">] Prompt
-
-    /// <summary>Triggered after an url is pushed into history</summary>
-    | [<System.Obsolete "Removed in v4; use AfterPushIntoHistory (or AfterHistoryUpdate to catch new and updated content)">] PushedIntoHistory
-
     /// <summary>Triggered when an HTTP response error (non-200 or 300 response code) occurs</summary>
     | ResponseError
 
-    /// <summary>Triggered when a network error prevents an HTTP request from happening</summary>
-    | [<System.Obsolete "Removed in v4; use Error (all errors consolidated)">] SendError
-
-    /// <summary>Triggered when an error occurs with a SSE source</summary>
-    | [<System.Obsolete "Removed in v4; use Htmax.HxEvents.SseError)">] SseError
-
-    /// <summary>Triggered when an SSE source is opened</summary>
-    | [<System.Obsolete "Removed in v4; use Htmax.HxEvents.AfterSseConnection">] SseOpen
-
-    /// <summary>Triggered when an error occurs during the swap phase</summary>
-    | [<System.Obsolete "Removed in v4; use Error (all errors consolidated)">] SwapError
-
-    /// <summary>Triggered when an invalid target is specified</summary>
-    | [<System.Obsolete "Removed in v4; use Error (all errors consolidated)">] TargetError
-
-    /// <summary>Triggered when a request timeout occurs</summary>
-    | [<System.Obsolete "Removed in v4; use Error (timeout is exposed as an error)">] Timeout
-
-    /// <summary>Triggered before an element is validated</summary>
-    | [<System.Obsolete "Removed in v4; use native validation API">] ValidationValidate
-
-    /// <summary>Triggered when an element fails validation</summary>
-    | [<System.Obsolete "Removed in v4; use native validation API">] ValidationFailed
-
-    /// <summary>Triggered when a request is halted due to validation errors</summary>
-    | [<System.Obsolete "Removed in v4; use native validation API">] ValidationHalted
-
-    /// <summary>Triggered when an ajax request aborts</summary>
-    | [<System.Obsolete "Removed in v4; use fetch event listeners or Error event">] XhrAbort
-
-    /// <summary>Triggered when an ajax request ends</summary>
-    | [<System.Obsolete "Removed in v4; use fetch event listeners or FinallyRequest event">] XhrLoadEnd
-
-    /// <summary>Triggered when an ajax request starts</summary>
-    | [<System.Obsolete "Removed in v4; use fetch event listeners">] XhrLoadStart
-
-    /// <summary>Triggered periodically during an ajax request that supports progress events</summary>
-    | [<System.Obsolete "Removed in v4; use fetch event listeners">] XhrProgress
-
     /// The htmx event name (fst) and kebab-case name (snd, for use with hx-on)
     static member private Values = Map [
         Abort, ("abort", "abort")
         AfterCleanup, ("afterCleanup", "after:cleanup")
         AfterHistoryUpdate, ("afterHistoryUpdate", "after:history:update")
         AfterInit, ("afterInit", "after:init")
-        AfterOnLoad, ("afterOnLoad", "after:init")
-        AfterProcessNode, ("afterProcessNode", "after:process")
         AfterPushIntoHistory, ("afterPushIntoHistory", "after:push:into:history")
         AfterReplaceIntoHistory, ("afterReplaceIntoHistory", "after:replace:into:history")
         AfterRequest, ("afterRequest", "after:request")
         AfterSettle, ("afterSettle", "after:settle")
-        AfterSseMessage, ("afterSseMessage", "after:sse:message")
-        AfterSseStream, ("afterSseStream", "after:sse:stream")
         AfterSwap, ("afterSwap", "after:swap")
         AfterViewTransition, ("afterViewTransition", "after:viewTransition")
         BeforeCleanup, ("beforeCleanup", "before:cleanup")
-        BeforeCleanupElement, ("beforeCleanupElement", "before:cleanup")
-        BeforeHistorySave, ("beforeHistorySave", "before:history:update")
         BeforeHistoryUpdate, ("beforeHistoryUpdate", "before:history:update")
         BeforeInit, ("beforeInit", "before:init")
-        BeforeOnLoad, ("beforeOnLoad", "before:init")
         BeforeProcess, ("beforeProcess", "before:process")
-        BeforeProcessNode, ("beforeProcessNode", "before:process")
         BeforeRequest, ("beforeRequest", "before:request")
         BeforeResponse, ("beforeResponse", "before:response")
         BeforeRestoreHistory, ("beforeRestoreHistory", "before:restore:history")
-        BeforeSend, ("beforeSend", "before:request")
-        BeforeSseMessage, ("beforeSseMessage", "before:sse:message")
-        BeforeSseReconnect, ("beforeSseReconnect", "before:sse:reconnect")
-        BeforeSseStream, ("beforeSseStream", "before:sse:stream")
         BeforeSwap, ("beforeSwap", "before:swap")
         BeforeViewTransition, ("beforeTransition", "before:viewTransition")
         ConfigRequest, ("configRequest", "config:request")
         Confirm, ("confirm", "confirm")
         Error, ("error", "error")
         FinallyRequest, ("finallyRequest", "finally:request")
-        HistoryCacheError, ("historyCacheError", "history-cache-error")
-        HistoryCacheMiss, ("historyCacheMiss", "before:history:restore")
-        HistoryCacheMissError, ("historyCacheMissError", "history-cache-miss-error")
-        HistoryCacheMissLoad, ("historyCacheMissLoad", "before:history:restore")
-        HistoryRestore, ("historyRestore", "before:history:restore")
-        Load, ("load", "after:init")
-        NoSseSourceError, ("noSSESourceError", "error")
-        OnLoadError, ("onLoadError", "error")
-        OobAfterSwap, ("oobAfterSwap", "after:swap")
-        OobBeforeSwap, ("oobBeforeSwap", "before:swap")
-        OobErrorNoTarget, ("oobErrorNoTarget", "error")
-        Prompt, ("prompt", "prompt")
-        PushedIntoHistory, ("pushedIntoHistory", "after:push:into:history")
         ResponseError, ("responseError", "response:error")
-        SendError, ("sendError", "error")
-        SseError, ("sseError", "sse:error")
-        SseOpen, ("sseOpen", "after:sse:connection")
-        SwapError, ("swapError", "error")
-        TargetError, ("targetError", "error")
-        Timeout, ("timeout", "error")
-        ValidationValidate, ("validation:validate", "validation:validate")
-        ValidationFailed, ("validation:failed", "validation:failed")
-        ValidationHalted, ("validation:halted", "validation:halted")
-        XhrAbort, ("xhr:abort", "error")
-        XhrLoadEnd, ("xhr:loadend", "finally:request")
-        XhrLoadStart, ("xhr:loadstart", "xhr:loadstart")
-        XhrProgress, ("xhr:progress", "xhr:progress")
     ]
 
     /// <summary>The htmx event name</summary>
@@ -320,7 +165,6 @@ type HxEvent =
 
     /// <summary>The <c>hx-on</c> variant of the htmx event name</summary>
     member this.ToHxOnString() = snd HxEvent.Values[this]
-#warn 44 // restore obsolete warning
 
 
 /// <summary>Helper to create the <c>hx-headers</c> attribute</summary>
@@ -331,70 +175,6 @@ module HxHeaders =
     let From = Giraffe.Htmx.Common.toJson
 
 
-/// <summary>Values / helpers for the <c>hx-params</c> attribute</summary>
-/// <seealso href="https://htmx.org/attributes/hx-params/">Documentation</seealso>
-[<RequireQualifiedAccess>]
-[<System.Obsolete "Removed in v4; filter parameters via JavaScript in configRequest event">]
-module HxParams =
-
-    /// <summary>Include all parameters</summary>
-    [<Literal>]
-    let All = "*"
-
-    /// <summary>Include no parameters</summary>
-    [<Literal>]
-    let None = "none"
-
-    /// <summary>Include the specified parameters</summary>
-    /// <param name="fields">One or more fields to include in the request</param>
-    /// <returns>The list of fields for the <c>hx-params</c> attribute value</returns>
-    let With fields =
-        match fields with [] -> "" | _ -> fields |> List.reduce (fun acc it -> $"{acc},{it}")
-
-    /// <summary>Exclude the specified parameters</summary>
-    /// <param name="fields">One or more fields to exclude from the request</param>
-    /// <returns>The list of fields for the <c>hx-params</c> attribute value prefixed with "not"</returns>
-    let Except fields =
-        With fields |> sprintf "not %s"
-
-
-/// <summary>Helpers to define <c>hx-request</c> attribute values</summary>
-/// <seealso href="https://htmx.org/attributes/hx-request/">Documentation</seealso>
-[<RequireQualifiedAccess>]
-[<System.Obsolete "Removed in v4; change to HxConfig">]
-module HxRequest =
-
-    open Giraffe.Htmx.Common
-
-    /// <summary>Configure the request with various options</summary>
-    /// <param name="opts">The options to configure</param>
-    /// <returns>A string with the configured options</returns>
-    let Configure (opts: string list) =
-        opts
-        |> String.concat ", "
-        |> sprintf "{ %s }"
-
-    /// <summary>Set a timeout (in milliseconds)</summary>
-    /// <param name="ms">The milliseconds for the request timeout</param>
-    /// <returns>A string with the configured request timeout</returns>
-    let Timeout (ms: int) =
-        $"\"timeout\": {ms}"
-
-    /// <summary>Include or exclude credentials from the request</summary>
-    /// <param name="send"><c>true</c> if credentials should be sent, <c>false</c> if not</param>
-    /// <returns>A string with the configured credential options</returns>
-    let Credentials send =
-        (toLowerBool >> sprintf "\"credentials\": %s") send
-
-    /// <summary>Exclude or include headers from the request</summary>
-    /// <param name="exclude">
-    /// <c>true</c> if no headers should be sent; <c>false</c> if headers should be sent
-    /// </param>
-    /// <returns>A string with the configured header options</returns>
-    let NoHeaders exclude =
-        (toLowerBool >> sprintf "\"noHeaders\": %s") exclude
-
-
 /// <summary>Helpers for the <c>hx-sync</c> attribute</summary>
 /// <seealso href="https://htmx.org/attributes/hx-sync/">Documentation</seealso>
 [<RequireQualifiedAccess>]
@@ -663,22 +443,6 @@ module HtmxAttrs =
     let _hxDisable elt =
         attr "hx-disable" elt
 
-    /// <summary>Specifies elements that should be disabled when an htmx request is in flight</summary>
-    /// <param name="elt">The element to disable when an htmx request is in flight</param>
-    /// <returns>A configured <c>hx-disabled-elt</c> attribute</returns>
-    /// <seealso href="https://htmx.org/attributes/hx-disabled-elt/">Documentation</seealso>
-    [<System.Obsolete "hx-disabled-elt has become hx-disable in v4">]
-    let _hxDisabledElt elt =
-        attr "hx-disabled-elt" elt
-
-    /// <summary>Disinherit all ("*") or specific htmx attributes</summary>
-    /// <param name="hxAttrs">The htmx attributes to disinherit (should start with "hx-")</param>
-    /// <returns>A configured <c>hx-disinherit</c> attribute</returns>
-    /// <seealso href="https://htmx.org/attributes/hx-disinherit/">Documentation</seealso>
-    [<System.Obsolete "hx-disinherit removed in v4; use explicit inheritance">]
-    let _hxDisinherit hxAttrs =
-        attr "hx-disinherit" hxAttrs
-
     /// <summary>Changes the request encoding type</summary>
     /// <param name="enc">The encoding type (use <c>HxEncoding</c> constants)</param>
     /// <returns>A configured <c>hx-encoding</c> attribute</returns>
@@ -687,14 +451,6 @@ module HtmxAttrs =
     let _hxEncoding enc =
         attr "hx-encoding" enc
 
-    /// <summary>Extensions to use for this element</summary>
-    /// <param name="exts">A list of extensions to apply to this element</param>
-    /// <returns>A configured <c>hx-ext</c> attribute</returns>
-    /// <seealso href="https://htmx.org/attributes/hx-ext/">Documentation</seealso>
-    [<System.Obsolete "hx-ext removed in v4; extensions register via JavaScript">]
-    let _hxExt exts =
-        attr "hx-ext" exts
-
     /// <summary>Issues a <c>GET</c> to the specified URL</summary>
     /// <param name="url">The URL to which the <c>GET</c> request should be sent</param>
     /// <returns>A configured <c>hx-get</c> attribute</returns>
@@ -709,22 +465,6 @@ module HtmxAttrs =
     let _hxHeaders hdrs =
         attr "hx-headers" hdrs
 
-    /// <summary>
-    /// Set to "false" to prevent pages with sensitive information from being stored in the history cache
-    /// </summary>
-    /// <param name="shouldStore">Whether the page should be stored in the history cache</param>
-    /// <returns>A configured <c>hx-history</c> attribute</returns>
-    /// <seealso href="https://htmx.org/attributes/hx-history/">Documentation</seealso>
-    [<System.Obsolete "hx-history removed in v4; history does not use localStorage">]
-    let _hxHistory shouldStore =
-        attr "hx-history" (toLowerBool shouldStore)
-
-    /// <summary>The element to snapshot and restore during history navigation</summary>
-    /// <seealso href="https://htmx.org/attributes/hx-history-elt/">Documentation</seealso>
-    [<System.Obsolete "hx-history-elt removed in v4; history based on target element">]
-    let _hxHistoryElt =
-        flag "hx-history-elt"
-
     /// <summary>Disables htmx processing for the given node and any children nodes</summary>
     /// <seealso href="https://four.htmx.org/attributes/hx-ignore/">Documentation</seealso>
     let _hxIgnore =
@@ -773,15 +513,6 @@ module HtmxAttrs =
     let _hxOnHxEvent (hxEvent: HxEvent) handler =
         _hxOnEvent $"htmx:{hxEvent.ToHxOnString()}" handler
 
-    /// <summary>Filters the parameters that will be submitted with a request</summary>
-    /// <param name="toInclude">The fields to include (use <c>HxParams</c> to generate this value)</param>
-    /// <returns>A configured <c>hx-params</c> attribute</returns>
-    /// <seealso cref="HxParams" />
-    /// <seealso href="https://htmx.org/attributes/hx-params/">Documentation</seealso>
-    [<System.Obsolete "hx-params removed in v4; use htmx:config:request to filter parameter">]
-    let _hxParams toInclude =
-        attr "hx-params" toInclude
-
     /// <summary>Issues a <c>PATCH</c> to the specified URL</summary>
     /// <param name="url">The URL to which the request should be directed</param>
     /// <returns>A configured <c>hx-patch</c> attribute</returns>
@@ -847,15 +578,6 @@ module HtmxAttrs =
     let _hxReplaceUrl spec =
         attr "hx-replace-url" spec
 
-    /// <summary>Configures various aspects of the request</summary>
-    /// <param name="spec">The configuration spec (use <c>HxRequest.Configure</c> to create value)</param>
-    /// <returns>A configured <c>hx-request</c> attribute</returns>
-    /// <seealso cref="HxRequest.Configure" />
-    /// <seealso href="https://htmx.org/attributes/hx-request/">Documentation</seealso>
-    [<System.Obsolete "hx-request removed in v4; use hx-config instead">]
-    let _hxRequest spec =
-        attr "hx-request" spec
-
     /// <summary>Selects a subset of the server response to process</summary>
     /// <param name="selector">A CSS selector for the content to be selected</param>
     /// <returns>A configured <c>hx-select</c> attribute</returns>
@@ -966,20 +688,6 @@ module HtmxAttrs =
     let _hxVals values =
         attr "hx-vals" values
 
-    /// <summary>The URL of the SSE server</summary>
-    /// <param name="url">The URL from which events will be received</param>
-    /// <returns>A configured <c>sse-connect</c> attribute</returns>
-    /// <seealso href="https://htmx.org/extensions/sse/#usage">Extension Docs</seealso>
-    let [<System.Obsolete "Removed in v4; use Htmax._hxSseConnect">] _sseConnect url =
-        attr "sse-connect" url
-
-    /// <summary>The name(s) of the message(s) to swap into the DOM</summary>
-    /// <param name="messages">The message names (comma-delimited) to swap (use "message" for unnamed events)</param>
-    /// <returns>A configured <c>sse-swap</c> attribute</returns>
-    /// <seealso href="https://htmx.org/extensions/sse/#usage">Extension Docs</seealso>
-    let [<System.Obsolete "Removed in v4; use hx-swap on target element">] _sseSwap messages =
-        attr "sse-swap" messages
-
 
 /// <summary>Modifiers for htmx attributes</summary>
 [<AutoOpen>]
@@ -1013,8 +721,6 @@ module HxTags =
 /// <summary>Script tags to pull htmx into a web page</summary>
 module Script =
 
-    open System
-
     /// <summary>Script tag to load the package-provided version of htmx</summary>
     let local = script [ _src StaticAssetUrl.htmx ] []
 
@@ -1052,14 +758,6 @@ module Script =
                      _integrity   "sha384-kjhVuvnX3/TsR1qH4JaIcHR6muh/WLMU5CTQRacCQZERzQlP4/r9p/TK7ucFwqvV"
                      _crossorigin "anonymous" ] []
 
-    /// <summary>Script tag to load the minified version from jsdelivr.net</summary>
-    [<Obsolete "Use cdnMinified instead; this will be removed in v4">]
-    let minified = cdnMinified
-
-    /// <summary>Script tag to load the unminified version from jsdelivr.net</summary>
-    [<Obsolete "Use cdnUnminified instead; this will be removed in v4">]
-    let unminified = cdnUnminified
-
 
 /// <summary>Functions to extract and render an HTML fragment from a document</summary>
 [<RequireQualifiedAccess>]