Update script tags to pull v1.9.12

- Update Git repo paths in package metadata

.gitignore

@@ -6,6 +6,3 @@
 .idea
 *.user
 .vscode
-src/*.nupkg
-src/tests*.txt
-

README.md

@@ -14,8 +14,6 @@ htmx uses attributes and HTTP headers to attain its interactivity; the libraries
 |---|---|
 |[![Nuget](https://img.shields.io/nuget/v/Giraffe.Htmx?style=plastic)](https://www.nuget.org/packages/Giraffe.Htmx/)|[![Nuget](https://img.shields.io/nuget/v/Giraffe.ViewEngine.Htmx?style=plastic)](https://www.nuget.org/packages/Giraffe.ViewEngine.Htmx/)|
 
-Both of these packages will also install `Giraffe.Htmx.Common`, which has some common definitions and provides a local-to-your-project version of the htmx JavaScript _(as of v2.0.8)_.
-
 ## Server Side (`Giraffe.Htmx`)
 
 In addition to the regular HTTP request payloads, htmx sets [one or more headers](https://htmx.org/docs/#request_headers) along with the request. Once `Giraffe.Htmx` is opened, these are available as properties on `HttpContext.Request.Headers`. These consist of the header name, translated to a .NET name (ex. `HX-Current-URL` becomes `HxCurrentUrl`), and a strongly-typed property based on the expected value of that header. Additionally, they are all exposed as `Option`s, as they may or may not be present for any given request.
@@ -27,10 +25,9 @@ A server may want to respond to a request that originated from htmx differently
   // "view" can be whatever your view engine needs for the body of the page
   let result view : HttpHandler =
     fun next ctx ->
-        if ctx.Request.IsHtmx && not ctx.Request.IsHtmxRefresh then
-            partial view
-        else
-            full view
+      match ctx.Request.IsHtmx && not ctx.Request.IsHtmxRefresh with
+      | true -> partial view
+      | false -> full view
 ```
 
 htmx also utilizes [response headers](https://htmx.org/docs/#response_headers) to affect client-side behavior. For each of these, this library provides `HttpHandler`s that can be chained along with the response. As an example, if the server returns a redirect response (301, 302, 303, 307), the `XMLHttpRequest` handler on the client will follow the redirection before htmx can do anything with it. To redirect to a new page, you would return an OK (200) response with an `HX-Redirect` header set in the response.
@@ -44,8 +41,6 @@ let theHandler : HttpHandler =
 
 Of note is that the `HX-Trigger` headers can take either one or more events. For a single event with no parameters, use `withHxTrigger`; for a single event with parameters, or multiple events, use `withHxTriggerMany`. Both these have `AfterSettle` and `AfterSwap` versions as well.
 
-`HtmxScript.local` provides an `HtmlString` with a script tag to load the package-provided htmx library. This can be used in code, Razor templates, etc. (If you're using Giraffe.ViewEngine, see below.)
-
 ## View Engine (`Giraffe.ViewEngine.Htmx`)
 
 As htmx uses [attributes](https://htmx.org/docs/#attributes) to extend HTML, the primary part of this library defines attributes that can be used within Giraffe views. Simply open `Giraffe.ViewEngine.Htmx`, and these attributes, along with support modules, will be visible.
@@ -54,9 +49,7 @@ As an example, creating a `div` that loads data once the HTML is rendered:
 
 ```fsharp
   let autoload =
-    div [ _hxGet "/lazy-load-data"; _hxTrigger HxTrigger.Load ] [
-        str "Loading..."
-    ]
+    div [ _hxGet "/lazy-load-data"; _hxTrigger "load" ] [ str "Loading..." ]
 ```
 
 _(As `hx-boost="true"` is the usual desire for boosting, `_hxBoost` implies true. To disable it for an element, use `_hxNoBoost` instead.)_
@@ -70,7 +63,7 @@ let shiftClick =
       ]
 ```
 
-If you want to use the package-provided htmx library, `Htmx.Script.local` will create the `script` tag for you. To load htmx from jsDelivr, `Htmx.Script.cdnMinified` or `Htmx.Script.cdnUnminified` can be used to load the script in your HTML trees. In this case, if you are using a Content Security Policy (CSP) header, `cdn.jsdelivr.net` will need to be added to the `script-src` list.
+If you want to load htmx from unpkg, `Htmx.Script.minified` or `Htmx.Script.unminified` can be used to load the script in your HTML trees.
 
 ## Feedback / Help
 

src/Common/Common.fs

@@ -1,59 +1,28 @@
-/// <summary>Common definitions shared between attribute values and response headers</summary>
+/// Common definitions shared between attribute values and response headers
 [<AutoOpen>]
 module Giraffe.Htmx.Common
 
-/// <summary>The version of htmx embedded in the package</summary>
-let HtmxVersion = "2.0.8"
-
-/// <summary>The path for the provided htmx script</summary>
-let internal htmxLocalScript = $"/_content/Giraffe.Htmx.Common/htmx.min.js?ver={HtmxVersion}"
-
-/// <summary>Serialize a list of key/value pairs to JSON (very rudimentary)</summary>
-/// <param name="pairs">The key/value pairs to be serialized to JSON</param>
-/// <returns>A string with the key/value pairs serialized to JSON</returns>
-let internal toJson (pairs: (string * string) list) =
-    pairs
-    |> List.map (fun pair -> sprintf "\"%s\": \"%s\"" (fst pair) ((snd pair).Replace ("\"", "\\\"")))
-    |> String.concat ", "
-    |> sprintf "{ %s }"
-
-/// <summary>Convert a boolean to lowercase "true" or "false"</summary>
-/// <param name="boolValue">The boolean value to convert</param>
-/// <returns>"true" for <c>true</c>, "false" for <c>false</c></returns>
-let internal toLowerBool (boolValue: bool) =
-    (string boolValue).ToLowerInvariant()
-
-
-/// <summary>Valid values for the <c>hx-swap</c> attribute / <c>HX-Reswap</c> header</summary>
-/// <remarks>May be combined with <c>swap</c> / <c>settle</c> / <c>scroll</c> / <c>show</c> config)</remarks>
-/// <seealso href="https://htmx.org/attributes/hx-swap/">Documentation</seealso>
+/// Valid values for the `hx-swap` attribute / `HX-Reswap` header (may be combined with swap/settle/scroll/show config)
 [<RequireQualifiedAccess>]
 module HxSwap =
     
-    /// <summary>The default, replace the inner HTML of the target element</summary>
-    [<Literal>]
+    /// The default, replace the inner html of the target element
     let InnerHtml = "innerHTML"
     
-    /// <summary>Replace the entire target element with the response</summary>
-    [<Literal>]
+    /// Replace the entire target element with the response
     let OuterHtml = "outerHTML"
     
-    /// <summary>Insert the response before the target element</summary>
-    [<Literal>]
+    /// Insert the response before the target element
     let BeforeBegin = "beforebegin"
     
-    /// <summary>Insert the response before the first child of the target element</summary>
-    [<Literal>]
+    /// Insert the response before the first child of the target element
     let AfterBegin = "afterbegin"
     
-    /// <summary>Insert the response after the last child of the target element</summary>
-    [<Literal>]
+    /// Insert the response after the last child of the target element
     let BeforeEnd = "beforeend"
     
-    /// <summary>Insert the response after the target element</summary>
-    [<Literal>]
+    /// Insert the response after the target element
     let AfterEnd = "afterend"
     
-    /// <summary>Does not append content from response (out of band items will still be processed).</summary>
-    [<Literal>]
+    /// Does not append content from response (out of band items will still be processed).
     let None = "none"

src/Common/Giraffe.Htmx.Common.fsproj

@@ -1,10 +1,9 @@
-<Project Sdk="Microsoft.NET.Sdk.Razor">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <Description>Common definitions for Giraffe.Htmx</Description>
     <PackageReadmeFile>README.md</PackageReadmeFile>
-    <DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
   </PropertyGroup>
 
   <ItemGroup>
@@ -17,8 +16,4 @@
     <PackageReference Update="FSharp.Core" Version="6.0.0" />
   </ItemGroup>
 
-  <ItemGroup>
-    <InternalsVisibleTo Include="Giraffe.Htmx" />
-    <InternalsVisibleTo Include="Giraffe.ViewEngine.Htmx" />
-  </ItemGroup>
 </Project>

src/Common/README.md

@@ -1,5 +1,5 @@
 ## Giraffe.Htmx.Common
 
-This package contains common code shared between [`Giraffe.Htmx`](https://www.nuget.org/packages/Giraffe.Htmx) and [`Giraffe.ViewEngine.Htmx`](https://www.nuget.org/packages/Giraffe.ViewEngine.Htmx), and will be automatically installed when you install either one. It also contains htmx as a static web asset, allowing it to be loaded from your local (or published) project.
+This package contains common code shared between [`Giraffe.Htmx`](https://www.nuget.org/packages/Giraffe.Htmx) and [`Giraffe.ViewEngine.Htmx`](https://www.nuget.org/packages/Giraffe.ViewEngine.Htmx), and will be automatically installed when you install either one.
 
-**htmx version: 2.0.8**
+**htmx version: 1.9.12**

src/Directory.Build.props

@@ -1,18 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     <PropertyGroup>
-        <TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
-        <VersionPrefix>2.0.8</VersionPrefix>
-        <GenerateDocumentationFile>true</GenerateDocumentationFile>
-        <PackageReleaseNotes>- Adds package-provided script (available via Giraffe.Htmx.Common); use app.MapStaticAssets() for publish support, use builder.UseStaticWebAssets() for non-development/non-published execution
-- [View Engine] Deprecates Script.minified and Script.unminified (use Script.cdnMinified and Script.cdnUnminified instead)
-- Updates script tags to pull htmx 2.0.8 (no header or attribute changes)
-- Adds .NET 10 support
-
-See full release notes, including more info about the package-provided script, at https://git.bitbadger.solutions/bit-badger/Giraffe.Htmx/releases/tag/v2.0.8
-
-NOTE: As of 2.0.6, the CDN for htmx changed from unpkg.com to cdn.jsdelivr.net; sites with Content-Security-Policy headers will want to update their allowed script-src domains accordingly
-        </PackageReleaseNotes>
+        <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
+        <VersionPrefix>1.9.12</VersionPrefix>
+        <PackageReleaseNotes>Update script tags to pull htmx 1.9.12</PackageReleaseNotes>
         <Authors>danieljsummers</Authors>
         <Company>Bit Badger Solutions</Company>
         <PackageProjectUrl>https://git.bitbadger.solutions/bit-badger/Giraffe.Htmx</PackageProjectUrl>

src/Htmx/Giraffe.Htmx.fsproj

@@ -4,7 +4,6 @@
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <Description>htmx header extensions and helpers for Giraffe</Description>
     <PackageReadmeFile>README.md</PackageReadmeFile>
-    <DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
   </PropertyGroup>
 
   <ItemGroup>
@@ -14,7 +13,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Giraffe" Version="6.4.0" />
+    <PackageReference Include="Giraffe" Version="6.2.0" />
     <PackageReference Update="FSharp.Core" Version="6.0.0" />
   </ItemGroup>
 

src/Htmx/Htmx.fs

@@ -11,174 +11,121 @@ let private hdr (headers : IHeaderDictionary) hdr =
 /// Extensions to the header dictionary
 type IHeaderDictionary with
   
-    /// <summary>Indicates that the request is via an element using <c>hx-boost</c></summary>
-    member this.HxBoosted
-        with get () = hdr this "HX-Boosted" |> Option.map bool.Parse
+    /// Indicates that the request is via an element using `hx-boost`
+    member this.HxBoosted with get () = hdr this "HX-Boosted" |> Option.map bool.Parse
     
-    /// <summary>The current URL of the browser <em>(note that this does not update until after settle)</em></summary>
-    member this.HxCurrentUrl
-        with get () = hdr this "HX-Current-URL" |> Option.map Uri
+    /// The current URL of the browser _(note that this does not update until after settle)_
+    member this.HxCurrentUrl with get () = hdr this "HX-Current-URL" |> Option.map Uri
     
-    /// <summary><c>true</c> if the request is for history restoration after a miss in the local history cache</summary>
-    member this.HxHistoryRestoreRequest
-        with get () = hdr this "HX-History-Restore-Request" |> Option.map bool.Parse
+    /// `true` if the request is for history restoration after a miss in the local history cache
+    member this.HxHistoryRestoreRequest with get () = hdr this "HX-History-Restore-Request" |> Option.map bool.Parse
     
-    /// <summary>The user response to an <c>hx-prompt</c></summary>
-    member this.HxPrompt
-        with get () = hdr this "HX-Prompt"
+    /// The user response to an `hx-prompt`
+    member this.HxPrompt with get () = hdr this "HX-Prompt"
 
-    /// <summary><c>true</c> if the request came from htmx</summary>
-    member this.HxRequest
-        with get () = hdr this "HX-Request" |> Option.map bool.Parse
+    /// `true` if the request came from HTMX
+    member this.HxRequest with get () = hdr this "HX-Request" |> Option.map bool.Parse
 
-    /// <summary>The <c>id</c> attribute of the target element if it exists</summary>
-    member this.HxTarget
-        with get () = hdr this "HX-Target"
+    /// The `id` of the target element if it exists
+    member this.HxTarget with get () = hdr this "HX-Target"
 
-    /// <summary>The <c>id</c> attribute of the triggered element if it exists</summary>
-    member this.HxTrigger
-        with get () = hdr this "HX-Trigger"
+    /// The `id` of the triggered element if it exists
+    member this.HxTrigger with get () = hdr this "HX-Trigger"
 
-    /// <summary>The <c>name</c> attribute of the triggered element if it exists</summary>
-    member this.HxTriggerName
-        with get () = hdr this "HX-Trigger-Name"
+    /// The `name` of the triggered element if it exists
+    member this.HxTriggerName with get () = hdr this "HX-Trigger-Name"
 
 
 /// Extensions for the request object
 type HttpRequest with
 
-    /// <summary>Whether this request was initiated from htmx</summary>
-    member this.IsHtmx
-        with get () = this.Headers.HxRequest |> Option.defaultValue false
+    /// Whether this request was initiated from htmx
+    member this.IsHtmx with get () = this.Headers.HxRequest |> Option.defaultValue false
 
-    /// <summary>Whether this request is an htmx history-miss refresh request</summary>
-    member this.IsHtmxRefresh
-        with get () = this.IsHtmx && (this.Headers.HxHistoryRestoreRequest |> Option.defaultValue false)
+    /// Whether this request is an htmx history-miss refresh request
+    member this.IsHtmxRefresh with get () =
+        this.IsHtmx && (this.Headers.HxHistoryRestoreRequest |> Option.defaultValue false)
 
 
-/// <summary>HTTP handlers for setting output headers</summary>
+/// HTTP handlers for setting output headers
 [<AutoOpen>]
 module Handlers =
 
-    open Giraffe.Htmx.Common
+    /// Convert a boolean to lowercase `true` or `false`
+    let private toLowerBool (trueOrFalse : bool) =
+        (string trueOrFalse).ToLowerInvariant ()
 
-    /// <summary>Instruct htmx to perform a client-side redirect for content</summary>
-    /// <param name="path">The path where the content should be found</param>
-    /// <returns>An HTTP handler with the <c>HX-Location</c> header set</returns>
-    /// <seealso href="https://htmx.org/headers/hx-location/">Documentation</seealso>
-    let withHxLocation (path: string) : HttpHandler =
-        setHttpHeader "HX-Location" path
+    /// Serialize a list of key/value pairs to JSON (very rudimentary)
+    let private toJson (evts : (string * string) list) =
+        evts
+        |> List.map (fun evt -> sprintf "\"%s\": \"%s\"" (fst evt) ((snd evt).Replace ("\"", "\\\"")))
+        |> String.concat ", "
+        |> sprintf "{ %s }"
 
-    /// <summary>Pushes a new url into the history stack</summary>
-    /// <param name="url">The URL to be pushed</param>
-    /// <returns>An HTTP handler with the <c>HX-Push-Url</c> header set</returns>
-    /// <remarks>Use <see cref="withHxNoPushUrl" /> to explicitly not push a new URL</remarks>
-    /// <seealso href="https://htmx.org/headers/hx-push-url/">Documentation</seealso>
-    let withHxPushUrl (url: string) : HttpHandler =
-        setHttpHeader "HX-Push-Url" url
+    /// Pushes a new url into the history stack
+    let withHxPushUrl : string -> HttpHandler =
+        setHttpHeader "HX-Push-Url"
 
-    /// <summary>Explicitly do not push a new URL into the history stack</summary>
-    /// <returns>An HTTP handler with the <c>HX-Push-Url</c> header set to <c>false</c></returns>
-    /// <seealso href="https://htmx.org/headers/hx-push-url/">Documentation</seealso>
+    /// Explicitly do not push a new URL into the history stack
     let withHxNoPushUrl : HttpHandler =
         toLowerBool false |> withHxPushUrl
       
-    /// <summary>Can be used to do a client-side redirect to a new location</summary>
-    /// <param name="url">The URL to which the client should be redirected</param>
-    /// <returns>An HTTP handler with the <c>HX-Redirect</c> header set</returns>
-    /// <seealso href="https://htmx.org/headers/hx-redirect/">Documentation</seealso>
-    let withHxRedirect (url: string) : HttpHandler =
-        setHttpHeader "HX-Redirect" url
+    /// Pushes a new url into the history stack
+    [<Obsolete "Use withHxPushUrl; HX-Push was replaced by HX-Push-Url in v1.8.0">]
+    let withHxPush = withHxPushUrl
     
-    /// <summary>If set to <c>true</c> the client side will do a full refresh of the page</summary>
-    /// <param name="shouldRefresh">Whether the client should refresh their page</param>
-    /// <returns>An HTTP handler with the <c>HX-Refresh</c> header set</returns>
-    let withHxRefresh shouldRefresh : HttpHandler =
-        (toLowerBool >> setHttpHeader "HX-Refresh") shouldRefresh
+    /// Explicitly do not push a new URL into the history stack
+    [<Obsolete "Use withHxNoPushUrl; HX-Push was replaced by HX-Push-Url in v1.8.0">]
+    let withHxNoPush = withHxNoPushUrl
       
-    /// <summary>Replaces the current URL in the history stack</summary>
-    /// <param name="url">The URL to place in the history stack in place of the current one</param>
-    /// <returns>An HTTP handler with the <c>HX-Replace-URL</c> header set</returns>
-    /// <remarks>Use <see cref="withHxNoRelaceUrl" /> to explicitly not replace the current URL</remarks>
-    /// <seealso href="https://htmx.org/headers/hx-replace-url/">Documentation</seealso>
-    let withHxReplaceUrl url : HttpHandler =
-        setHttpHeader "HX-Replace-Url" url
+    /// Can be used to do a client-side redirect to a new location
+    let withHxRedirect : string -> HttpHandler =
+        setHttpHeader "HX-Redirect"
 
-    /// <summary>Explicitly do not replace the current URL in the history stack</summary>
-    /// <returns>An HTTP handler with the <c>HX-Replace-URL</c> header set to <c>false</c></returns>
-    /// <seealso href="https://htmx.org/headers/hx-replace-url/">Documentation</seealso>
+    /// If set to `true` the client side will do a a full refresh of the page
+    let withHxRefresh : bool -> HttpHandler =
+        toLowerBool >> setHttpHeader "HX-Refresh"
+
+    /// Replaces the current URL in the history stack
+    let withHxReplaceUrl : string -> HttpHandler =
+        setHttpHeader "HX-Replace-Url"
+
+    /// Explicitly do not replace the current URL in the history stack
     let withHxNoReplaceUrl : HttpHandler =
         toLowerBool false |> withHxReplaceUrl
     
-    /// <summary>Override which portion of the response will be swapped into the target document</summary>
-    /// <param name="target">The selector for the new response target</param>
-    /// <returns>An HTTP handler with the <c>HX-Reselect</c> header set</returns>
-    let withHxReselect (target: string) : HttpHandler =
-        setHttpHeader "HX-Reselect" target
+    /// Override which portion of the response will be swapped into the target document
+    let withHxReselect : string -> HttpHandler =
+        setHttpHeader "HX-Reselect"
     
-    /// <summary>Override the <c>hx-swap</c> attribute from the initiating element</summary>
-    /// <param name="swap">The swap value to override</param>
-    /// <returns>An HTTP handler with the <c>HX-Reswap</c> header set</returns>
-    /// <remarks>Use <see cref="T:Giraffe.Htmx.Common.HxSwap">HxSwap</see> constants for best results</remarks>
-    let withHxReswap (swap: string) : HttpHandler =
-        setHttpHeader "HX-Reswap" swap
+    /// Override the `hx-swap` attribute from the initiating element
+    let withHxReswap : string -> HttpHandler =
+        setHttpHeader "HX-Reswap"
 
-    /// <summary>Allows you to override the <c>hx-target</c> attribute</summary>
-    /// <param name="target">The new target for the response</param>
-    /// <returns>An HTTP handler with the <c>HX-Retarget</c> header set</returns>
-    let withHxRetarget (target: string) : HttpHandler =
-        setHttpHeader "HX-Retarget" target
+    /// Allows you to override the `hx-target` attribute
+    let withHxRetarget : string -> HttpHandler =
+        setHttpHeader "HX-Retarget"
 
-    /// <summary>Allows you to trigger a single client side event</summary>
-    /// <param name="evt">The call to the event that should be triggered</param>
-    /// <returns>An HTTP handler with the <c>HX-Trigger</c> header set</returns>
-    /// <seealso href="https://htmx.org/headers/hx-trigger/">Documentation</seealso>
-    let withHxTrigger (evt: string) : HttpHandler =
-        setHttpHeader "HX-Trigger" evt
+    /// Allows you to trigger a single client side event
+    let withHxTrigger : string -> HttpHandler =
+        setHttpHeader "HX-Trigger"
 
-    /// <summary>Allows you to trigger multiple client side events</summary>
-    /// <param name="evts">The calls to events that should be triggered</param>
-    /// <returns>An HTTP handler with the <c>HX-Trigger</c> header set for all given events</returns>
-    /// <seealso href="https://htmx.org/headers/hx-trigger/">Documentation</seealso>
+    /// Allows you to trigger multiple client side events
     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>
-    let withHxTriggerAfterSettle (evt: string) : HttpHandler =
-        setHttpHeader "HX-Trigger-After-Settle" evt
+    /// Allows you to trigger a single client side event after changes have settled
+    let withHxTriggerAfterSettle : string -> HttpHandler =
+        setHttpHeader "HX-Trigger-After-Settle"
 
-    /// <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>
+    /// Allows you to trigger multiple client side events after changes have settled
     let withHxTriggerManyAfterSettle evts : HttpHandler =
         toJson evts |> setHttpHeader "HX-Trigger-After-Settle"
 
-    /// <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>
-    let withHxTriggerAfterSwap (evt: string) : HttpHandler =
-        setHttpHeader "HX-Trigger-After-Swap" evt
+    /// Allows you to trigger a single client side event after DOM swapping occurs
+    let withHxTriggerAfterSwap : string -> HttpHandler =
+        setHttpHeader "HX-Trigger-After-Swap"
 
-    /// <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>
+    /// Allows you to trigger multiple client side events after DOM swapping occurs
     let withHxTriggerManyAfterSwap evts : HttpHandler =
         toJson evts |> setHttpHeader "HX-Trigger-After-Swap"
-
-
-/// <summary>Load the package-provided version of the htmx script</summary>
-[<RequireQualifiedAccess>]
-module HtmxScript =
-    
-    open Giraffe.Htmx.Common
-    open Microsoft.AspNetCore.Html
-
-    /// <summary><c>script</c> tag to load the package-provided version of the htmx script</summary>
-    let local = HtmlString $"""<script src="{htmxLocalScript}"></script>"""
-    

src/Htmx/README.md

@@ -2,9 +2,7 @@
 
 This package enables server-side support for [htmx](https://htmx.org) within [Giraffe](https://giraffe.wiki) and ASP.NET's `HttpContext`.
 
-**htmx version: 2.0.8**
-
-_Upgrading from v1.x: the [migration guide](https://htmx.org/migration-guide-htmx-1/) does not currently specify any request or response header changes. This means that there are no required code changes in moving from v1.* to v2.*._
+**htmx version: 1.9.12**
 
 ### Setup
 
@@ -34,8 +32,6 @@ let myHandler : HttpHander =
 
 The `HxSwap` module has constants to use for the `HX-Reswap` header. These may be extended with settle, show, and other qualifiers; see the htmx documentation for the `hx-swap` attribute for more information.
 
-To load the package-provided htmx library without using Giraffe.ViewEngine, use `HtmxScript.local`.
-
 ### Learn
 
 The naming conventions of this library were selected to mirror those provided by htmx. The header properties become `Hx*` on the `ctx.Request.Headers` object, and the response handlers are `withHx*` based on the header being set. The only part that does not line up is `withHxTrigger*` and `withHxTriggerMany`; the former set work with a single string (to trigger a single event with no arguments), while the latter set supports both arguments and multiple events.

src/Tests/Common.fs

@@ -3,12 +3,6 @@ module Common
 open Expecto
 open Giraffe.Htmx
 
-/// Test to ensure the version was updated
-let version =
-    test "HtmxVersion is correct" {
-        Expect.equal HtmxVersion "2.0.8" "htmx version incorrect"
-    }
-
 /// Tests for the HxSwap module
 let swap =
     testList "HxSwap" [
@@ -36,4 +30,4 @@ let swap =
     ]
 
 /// All tests for this module
-let allTests = testList "Htmx.Common" [ version; swap ]
+let allTests = testList "Htmx.Common" [ swap ]

src/Tests/Htmx.fs

@@ -3,7 +3,6 @@ module Htmx
 open System
 open Expecto
 open Giraffe.Htmx
-open Microsoft.AspNetCore.Html
 open Microsoft.AspNetCore.Http
 open NSubstitute
 
@@ -208,14 +207,6 @@ let next (ctx: HttpContext) = Task.FromResult(Some ctx)
 /// Tests for the HttpHandler functions provided in the Handlers module
 let handlers =
     testList "HandlerTests" [
-        testTask "withHxLocation succeeds" {
-            let ctx = Substitute.For<HttpContext>()
-            let dic = HeaderDictionary()
-            ctx.Response.Headers.ReturnsForAnyArgs dic |> ignore
-            let! _ = withHxLocation "/pagina-otro.html" next ctx
-            Expect.isTrue (dic.ContainsKey "HX-Location") "The HX-Location header should be present"
-            Expect.equal dic["HX-Location"].[0] "/pagina-otro.html" "The HX-Location value was incorrect"
-        }
         testTask "withHxPushUrl succeeds" {
             let ctx = Substitute.For<HttpContext> ()
             let dic = HeaderDictionary ()
@@ -355,16 +346,5 @@ let handlers =
         }
     ]
 
-/// Tests for the HtmxScript module
-let script =
-    testList "HtmxScript" [
-        test "local generates correct link" {
-            Expect.equal
-                (string HtmxScript.local)
-                $"""<script src="/_content/Giraffe.Htmx.Common/htmx.min.js?ver={HtmxVersion}"></script>"""
-                "htmx script link is incorrect"
-        }
-    ]
-
 /// All tests for this module
-let allTests = testList "Htmx" [ dictExtensions; reqExtensions; handlers; script ]
+let allTests = testList "Htmx" [ dictExtensions; reqExtensions; handlers ]

src/Tests/Program.fs

@@ -3,4 +3,4 @@ open Expecto
 let allTests = testList "Giraffe" [ Common.allTests; Htmx.allTests; ViewEngine.allTests ]
 
 [<EntryPoint>]
-let main args = runTestsWithCLIArgs [] args allTests
+let main args = runTestsWithArgs defaultConfig args allTests

src/Tests/Tests.fsproj

@@ -18,9 +18,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Expecto" Version="10.2.1" />
-    <PackageReference Include="NSubstitute" Version="5.1.0" />
-    <PackageReference Update="FSharp.Core" Version="8.0.300" />
+    <PackageReference Include="Expecto" Version="9.0.4" />
+    <PackageReference Include="NSubstitute" Version="5.0.0" />
   </ItemGroup>
 
 </Project>

src/Tests/ViewEngine.fs

@@ -406,8 +406,8 @@ let hxEvent =
                 Expect.equal (XhrProgress.ToHxOnString()) "xhr:progress" "XhrProgress hx-on event name not correct"
             }
         ]
-    ]
         
+    ]
 /// Tests for the HxHeaders module
 let hxHeaders =
     testList "HxHeaders" [
@@ -497,32 +497,6 @@ let hxRequest =
         ]
     ]
 
-/// Tests for the HxSync module
-let hxSync =
-    testList "HxSync" [
-        test "Drop is correct" {
-            Expect.equal HxSync.Drop "drop" "Drop is incorrect"
-        }
-        test "Abort is correct" {
-            Expect.equal HxSync.Abort "abort" "Abort is incorrect"
-        }
-        test "Replace is correct" {
-            Expect.equal HxSync.Replace "replace" "Replace is incorrect"
-        }
-        test "Queue is correct" {
-            Expect.equal HxSync.Queue "queue" "Queue is incorrect"
-        }
-        test "QueueFirst is correct" {
-            Expect.equal HxSync.QueueFirst "queue first" "QueueFirst is incorrect"
-        }
-        test "QueueLast is correct" {
-            Expect.equal HxSync.QueueLast "queue last" "QueueLast is incorrect"
-        }
-        test "QueueAll is correct" {
-            Expect.equal HxSync.QueueAll "queue all" "QueueAll is incorrect"
-        }
-    ]
-
 /// Tests for the HxTrigger module
 let hxTrigger =
     testList "HxTrigger" [
@@ -662,9 +636,6 @@ let hxTrigger =
             test "succeeds when it is not the first modifier" {
                 Expect.equal (HxTrigger.Queue "def" "click") "click queue:def" "Queue modifier incorrect"
             }
-            test "succeeds when no type of queueing is given" {
-                Expect.equal (HxTrigger.Queue "" "blur") "blur queue" "Queue modifier incorrect"
-            }
         ]
         testList "QueueFirst" [
             test "succeeds when it is the first modifier" {
@@ -755,7 +726,7 @@ let attributes =
             |> shouldRender """<figure hx-headers="{ &quot;X-Special-Header&quot;: &quot;some-header&quot; }"></figure>"""
         }
         test "_hxHistory succeeds" {
-            span [ _hxHistory false ] [] |> shouldRender """<span hx-history="false"></span>"""
+            span [ _hxHistory "false" ] [] |> shouldRender """<span hx-history="false"></span>"""
         }
         test "_hxHistoryElt succeeds" {
             table [ _hxHistoryElt ] [] |> shouldRender """<table hx-history-elt></table>"""
@@ -786,7 +757,7 @@ let attributes =
             hr [ _hxPost "/hear-ye-hear-ye" ] |> shouldRender """<hr hx-post="/hear-ye-hear-ye">"""
         }
         test "_hxPreserve succeeds" {
-            img [ _hxPreserve ] |> shouldRender """<img hx-preserve>"""
+            img [ _hxPreserve ] |> shouldRender """<img hx-preserve="true">"""
         }
         test "_hxPrompt succeeds" {
             strong [ _hxPrompt "Who goes there?" ] []
@@ -810,6 +781,10 @@ let attributes =
         test "_hxSelectOob succeeds" {
             section [ _hxSelectOob "#oob" ] [] |> shouldRender """<section hx-select-oob="#oob"></section>"""
         }
+        test "_hxSse succeeds" {
+            footer [ _hxSse "connect:/my-events" ] []
+            |> shouldRender """<footer hx-sse="connect:/my-events"></footer>"""
+        }
         test "_hxSwap succeeds" {
             del [ _hxSwap "innerHTML" ] [] |> shouldRender """<del hx-swap="innerHTML"></del>"""
         }
@@ -821,8 +796,7 @@ let attributes =
             li [ _hxSwapOob "true" ] [] |> shouldRender """<li hx-swap-oob="true"></li>"""
         }
         test "_hxSync succeeds" {
-            nav [ _hxSync "closest form" HxSync.Abort ] []
-            |> shouldRender """<nav hx-sync="closest form:abort"></nav>"""
+            nav [ _hxSync "closest form:abort" ] [] |> shouldRender """<nav hx-sync="closest form:abort"></nav>"""
         }
         test "_hxTarget succeeds" {
             header [ _hxTarget "#somewhereElse" ] [] |> shouldRender """<header hx-target="#somewhereElse"></header>"""
@@ -834,39 +808,27 @@ let attributes =
             dt [ _hxVals """{ "extra": "values" }""" ] []
             |> shouldRender """<dt hx-vals="{ &quot;extra&quot;: &quot;values&quot; }"></dt>"""
         }
-        test "_sseSwap succeeds" {
-            ul [ _sseSwap "sseMessageName" ] [] |> shouldRender """<ul sse-swap="sseMessageName"></ul>"""
-        }
-        test "_sseConnect succeeds" {
-            div [ _sseConnect "/gps/sse" ] [] |> shouldRender """<div sse-connect="/gps/sse"></div>"""
+        test "_hxWs succeeds" {
+            ul [ _hxWs "connect:/web-socket" ] [] |> shouldRender """<ul hx-ws="connect:/web-socket"></ul>"""
         }
     ]
 
-open Giraffe.Htmx.Common
-
 /// Tests for the Script module
 let script =
     testList "Script" [
-        test "local succeeds" {
-            let html = RenderView.AsString.htmlNode Script.local
+        test "minified succeeds" {
+            let html = RenderView.AsString.htmlNode Script.minified
             Expect.equal
                 html
-                $"""<script src="/_content/Giraffe.Htmx.Common/htmx.min.js?ver={HtmxVersion}"></script>"""
-                "Local script tag is incorrect"
+                """<script src="https://unpkg.com/htmx.org@1.9.12" integrity="sha384-ujb1lZYygJmzgSwoxRggbCHcjc0rB2XoQrxeTUQyRjrOnlCoYta87iKBWq3EsdM2" crossorigin="anonymous"></script>"""
+                "Minified script tag is incorrect"
         }
-        test "cdnMinified succeeds" {
-            let html = RenderView.AsString.htmlNode Script.cdnMinified
+        test "unminified succeeds" {
+            let html = RenderView.AsString.htmlNode Script.unminified
             Expect.equal
                 html
-                $"""<script src="https://cdn.jsdelivr.net/npm/htmx.org@{HtmxVersion}/dist/htmx.min.js" integrity="sha256-Iig+9oy3VFkU8KiKG97cclanA9HVgMHSVSF9ClDTExM=" crossorigin="anonymous"></script>"""
-                "CDN minified script tag is incorrect"
-        }
-        test "cdnUnminified succeeds" {
-            let html = RenderView.AsString.htmlNode Script.cdnUnminified
-            Expect.equal
-                html
-                $"""<script src="https://cdn.jsdelivr.net/npm/htmx.org@{HtmxVersion}/dist/htmx.js" integrity="sha256-upUwYnay6R+DA68rROTAP+EdfO3NvOqtE513PgDyAYM=" crossorigin="anonymous"></script>"""
-                "CDN unminified script tag is incorrect"
+                """<script src="https://unpkg.com/htmx.org@1.9.12/dist/htmx.js" integrity="sha384-qbtR4rS9RrUMECUWDWM2+YGgN3U4V4ZncZ0BvUcg9FGct0jqXz3PUdVpU1p0yrXS" crossorigin="anonymous"></script>"""
+                "Unminified script tag is incorrect"
         }
     ]
 
@@ -1017,6 +979,18 @@ let renderFragment =
         ]
     ]
 
+#nowarn "44"
+
+/// Tests for the HtmxAttrs module
+let deprecatedAttributes =
+    testList "Deprecated Attributes" [
+        test "_hxOn succeeds" {
+            let newLine = "\n"
+            strong [ _hxOn "submit: alert('oops')\nclick: alert('howdy!')" ] []
+            |> shouldRender $"""<strong hx-on="submit: alert(&#39;oops&#39;){newLine}click: alert(&#39;howdy!&#39;)"></strong>"""
+        }
+    ]
+
 /// All tests in this module
 let allTests =
     testList "ViewEngine.Htmx" [
@@ -1025,10 +999,10 @@ let allTests =
         hxHeaders
         hxParams
         hxRequest
-        hxSync
         hxTrigger
         hxVals
         attributes
         script
         renderFragment
+        deprecatedAttributes
     ]

src/ViewEngine.Htmx/Giraffe.ViewEngine.Htmx.fsproj

@@ -4,7 +4,6 @@
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <Description>Extensions to Giraffe View Engine to support htmx attributes and their values</Description>
     <PackageReadmeFile>README.md</PackageReadmeFile>
-    <DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
   </PropertyGroup>
 
   <ItemGroup>

src/ViewEngine.Htmx/README.md

@@ -2,9 +2,7 @@
 
 This package enables [htmx](https://htmx.org) support within the [Giraffe](https://giraffe.wiki) view engine.
 
-**htmx version: 2.0.8**
-
-_Upgrading from v1.x: see [the migration guide](https://htmx.org/migration-guide-htmx-1/) for changes_
+**htmx version: 1.9.12**
 
 ### Setup
 
@@ -29,7 +27,7 @@ Support modules include:
 - `HxTrigger`
 - `HxVals`
 
-`Htmx.Script.local` creates an `XmlNode` to load the package-provided htmx library. There are also two `XmlNode`s that will load the htmx script from jsdelivr; `Htmx.Script.cdnMinified` loads the minified version, and `Htmx.Script.cdnUnminified` loads the unminified version (useful for debugging). When using the CDN nodes and a Content Security Policy (CSP) header, `cdn.jsdelivr.net` needs to be listed as an allowable `script-src`.
+There are two `XmlNode`s that will load the htmx script from unpkg; `Htmx.Script.minified` loads the minified version, and `Htmx.Script.unminified` loads the unminified version (useful for debugging).
 
 This also supports [fragment rendering](https://bitbadger.solutions/blog/2022/fragment-rendering-in-giraffe-view-engine.html), providing the flexibility to render an entire template, or only a portion of it (based on the element's `id` attribute).
 

src/pack.sh

@@ -1,7 +0,0 @@
-#!/bin/bash
-dotnet pack Common/Giraffe.Htmx.Common.fsproj -c Release
-dotnet pack Htmx/Giraffe.Htmx.fsproj -c Release
-dotnet pack ViewEngine.Htmx/Giraffe.ViewEngine.Htmx.fsproj -c Release
-cp Common/bin/Release/Giraffe.Htmx.Common.*.nupkg .
-cp Htmx/bin/Release/Giraffe.Htmx.*.nupkg .
-cp ViewEngine.Htmx/bin/Release/Giraffe.ViewEngine.Htmx.*.nupkg .