13 changed files with 88 additions and 86 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@ -2,10 +2,9 @@ name: CI

 on:
  push:
-    branches: [ "main", "htmx-version-2" ]
+    branches: [ "main" ]
  pull_request:
    branches: [ "main" ]
-  workflow_dispatch:

 jobs:
  build-and-test:
@ -17,9 +16,9 @@ jobs:
        dotnet-version: [ "6.0", "7.0", "8.0" ]
    
    steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v3
    - name: Setup .NET ${{ matrix.dotnet-version }}.x
-      uses: actions/setup-dotnet@v4
+      uses: actions/setup-dotnet@v3
      with:
        dotnet-version: ${{ matrix.dotnet-version }}.x
    - name: Restore dependencies
@ -32,11 +31,11 @@ jobs:
    runs-on: ubuntu-latest
    needs: build-and-test
    steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v3
    - name: Setup .NET
-      uses: actions/setup-dotnet@v4
+      uses: actions/setup-dotnet@v3
      with:
-        dotnet-version: "8.0"
+        dotnet-version: "7.0"
    - name: Package Common library
      run: dotnet pack src/Common/Giraffe.Htmx.Common.fsproj -c Release
    - name: Move Common package
@ -50,7 +49,7 @@ jobs:
    - name: Move View Engine package
      run: cp src/ViewEngine.Htmx/bin/Release/Giraffe.ViewEngine.Htmx.*.nupkg .
    - name: Save Packages
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v3
      with:
        name: packages
        path: |
--- a/.gitignore
+++ b/.gitignore
@ -6,4 +6,3 @@
 .idea
 *.user
 .vscode
-src/*.nupkg
--- a/README.md
+++ b/README.md
@ -21,23 +21,22 @@ In addition to the regular HTTP request payloads, htmx sets [one or more headers
 A server may want to respond to a request that originated from htmx differently than a regular request. One way htmx can provide the same feel as a Single Page Application (SPA) is by swapping out the `body` content (or an element within it) instead of reloading the entire page. In this case, the developer can provide a partial layout to be used for these responses, while returning the full page for regular requests. The `IsHtmx` property makes this easy...

 ```fsharp
-// "partial" and "full" are handlers that return the contents;
-// "view" can be whatever your view engine needs for the body of the page
-let result view : HttpHandler =
+  // "partial" and "full" are handlers that return the contents;
+  // "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.

 ```fsharp
-let theHandler : HttpHandler =
+  let theHandler : HttpHandler =
    fun next ctx ->
-        // some interesting stuff
-        withHxRedirect "/the-new-url" >=> Successful.OK
+      // some interesting stuff
+      withHxRedirect "/the-new-url" >=> Successful.OK
 ```

 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.
@ -49,10 +48,8 @@ As htmx uses [attributes](https://htmx.org/docs/#attributes) to extend HTML, the
 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..."
-    ]
+  let autoload =
+    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.)_
@ -60,10 +57,10 @@ _(As `hx-boost="true"` is the usual desire for boosting, `_hxBoost` implies true
 Some attributes have known values, such as `hx-trigger` and `hx-swap`; for these, there are modules with those values. For example, `HxTrigger.Load` could be used in the example above, to ensure that the known values are spelled correctly. `hx-trigger` can also take modifiers, such as an action that only responds to `Ctrl`+click. The `HxTrigger` module has a `Filter` submodule to assist with defining these actions.

 ```fsharp
-let shiftClick =
+  let shiftClick =
    p [ _hxGet = "/something"; _hxTrigger (HxTrigger.Filter.Shift HxTrigger.Click) ] [
-        str "hold down Shift and click me"
-    ]
+      str "hold down Shift and click me"
+      ]
 ```

 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.
--- a/src/Common/README.md
+++ b/src/Common/README.md
@ -2,4 +2,4 @@

 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.3**
+**htmx version: 1.9.10**
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
    <PropertyGroup>
-        <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
-        <VersionPrefix>2.0.3</VersionPrefix>
-        <PackageReleaseNotes>Update script tags to pull htmx 2.0.3 (no header or attribute changes)</PackageReleaseNotes>
+        <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
+        <VersionPrefix>1.9.10</VersionPrefix>
+        <PackageReleaseNotes>Update script tags to pull htmx 1.9.10; add support for hx-on:* attributes; require lowest FSharp.Core version; fix _hxDisabledElt spelling</PackageReleaseNotes>
        <Authors>danieljsummers</Authors>
        <Company>Bit Badger Solutions</Company>
-        <PackageProjectUrl>https://git.bitbadger.solutions/bit-badger/Giraffe.Htmx</PackageProjectUrl>
+        <PackageProjectUrl>https://github.com/bit-badger/Giraffe.Htmx</PackageProjectUrl>
        <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
-        <RepositoryUrl>https://git.bitbadger.solutions/bit-badger/Giraffe.Htmx</RepositoryUrl>
+        <RepositoryUrl>https://github.com/bit-badger/Giraffe.Htmx</RepositoryUrl>
        <RepositoryType>Git</RepositoryType>
        <Copyright>MIT License</Copyright>
        <PackageLicenseExpression>MIT</PackageLicenseExpression>
--- a/src/Htmx/Giraffe.Htmx.fsproj
+++ b/src/Htmx/Giraffe.Htmx.fsproj
@ -13,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>

--- a/src/Htmx/README.md
+++ b/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.3**
-
-_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.10**

 ### Setup

@ -16,20 +14,20 @@ _Upgrading from v1.x: the [migration guide](https://htmx.org/migration-guide-htm
 To obtain a request header, using the `IHeaderDictionary` extension properties:

 ```fsharp
-let myHandler : HttpHander =
+  let myHandler : HttpHander =
    fun next ctx ->
-        match ctx.HxPrompt with
-        | Some prompt -> ... // do something with the text the user provided
-        | None -> ... // no text provided
+      match ctx.HxPrompt with
+      | Some prompt -> ... // do something with the text the user provided
+      | None -> ... // no text provided
 ```

 To set a response header:

 ```fsharp
-let myHandler : HttpHander =
+  let myHandler : HttpHander =
    fun next ctx ->
-        // some meaningful work
-        withHxPushUrl "/some/new/url" >=> [other handlers]
+      // some meaningful work
+      withHxPushUrl "/some/new/url" >=> [other handlers]
 ```

 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.
--- a/src/Tests/Program.fs
+++ b/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
--- a/src/Tests/Tests.fsproj
+++ b/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>
--- a/src/Tests/ViewEngine.fs
+++ b/src/Tests/ViewEngine.fs
@ -781,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>"""
        }
@ -804,11 +808,8 @@ 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>"""
        }
    ]

@ -819,14 +820,14 @@ let script =
            let html = RenderView.AsString.htmlNode Script.minified
            Expect.equal
                html
-                """<script src="https://unpkg.com/htmx.org@2.0.3" integrity="sha384-0895/pl2MU10Hqc6jd4RvrthNlDiE9U1tWmX7WRESftEDRosgxNsQG/Ze9YMRzHq" crossorigin="anonymous"></script>"""
+                """<script src="https://unpkg.com/htmx.org@1.9.10" integrity="sha384-D1Kt99CQMDuVetoL1lrYwg5t+9QdHe7NLX/SoJYkXDFfX37iInKRy5xLSi8nO7UC" crossorigin="anonymous"></script>"""
                "Minified script tag is incorrect"
        }
        test "unminified succeeds" {
            let html = RenderView.AsString.htmlNode Script.unminified
            Expect.equal
                html
-                """<script src="https://unpkg.com/htmx.org@2.0.3/dist/htmx.js" integrity="sha384-BBDmZzVt6vjz5YbQqZPtFZW82o8QotoM7RUp5xOxV3nSJ8u2pSdtzFAbGKzTlKtg" crossorigin="anonymous"></script>"""
+                """<script src="https://unpkg.com/htmx.org@1.9.10/dist/htmx.js" integrity="sha384-j1TtLExqttdT7C3Z/rJy8UZcCGiuqwwN9++coZ6up+5O/l2FHdp3IGfuJOvst6d1" crossorigin="anonymous"></script>"""
                "Unminified script tag is incorrect"
        }
    ]
@ -978,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" [
@ -991,4 +1004,5 @@ let allTests =
        attributes
        script
        renderFragment
+        deprecatedAttributes
    ]
--- a/src/ViewEngine.Htmx/Htmx.fs
+++ b/src/ViewEngine.Htmx/Htmx.fs
@ -317,6 +317,7 @@ module HxVals =
    /// Create values from a list of key/value pairs
    let From = toJson

+open System

 /// Attributes and flags for htmx
 [<AutoOpen>]
@ -367,6 +368,10 @@ module HtmxAttrs =
    /// Overrides a previous `hx-boost`
    let _hxNoBoost    = attr "hx-boost" "false"
    
+    /// Attach an event handler for DOM or htmx events
+    [<Obsolete "This will be removed in htmx 2; use _hxOnEvent or _hxOnHxEvent instead">]
+    let _hxOn         = attr "hx-on"
+
    /// Attach an event handler for DOM events
    let _hxOnEvent evtName =
        attr $"hx-on:%s{evtName}"
@ -408,6 +413,9 @@ module HtmxAttrs =
    /// Selects a subset of an out-of-band server response
    let _hxSelectOob  = attr "hx-select-oob"
    
+    /// Establishes and listens to Server Sent Event (SSE) sources for events
+    let _hxSse        = attr "hx-sse"
+    
    /// Controls how the response content is swapped into the DOM (e.g. 'outerHTML' or 'beforeEnd')
    let _hxSwap       = attr "hx-swap"
    
@ -433,26 +441,23 @@ module HtmxAttrs =
    /// Adds to the parameters that will be submitted with the request
    let _hxVals       = attr "hx-vals"
    
-    /// The name of the message to swap into the DOM.
-    let _sseSwap      = attr "sse-swap"
-
-    /// The URL of the SSE server.
-    let _sseConnect   = attr "sse-connect"
+    /// Establishes a WebSocket or sends information to one
+    let _hxWs         = attr "hx-ws"


-/// Script tags to pull htmx into a web page
+/// Script tags to pull htmx into an web page
 module Script =
  
    /// Script tag to load the minified version from unpkg.com
    let minified =
-        script [ _src         "https://unpkg.com/htmx.org@2.0.3"
-                 _integrity   "sha384-0895/pl2MU10Hqc6jd4RvrthNlDiE9U1tWmX7WRESftEDRosgxNsQG/Ze9YMRzHq"
+        script [ _src         "https://unpkg.com/htmx.org@1.9.10"
+                 _integrity   "sha384-D1Kt99CQMDuVetoL1lrYwg5t+9QdHe7NLX/SoJYkXDFfX37iInKRy5xLSi8nO7UC"
                 _crossorigin "anonymous" ] []

    /// Script tag to load the unminified version from unpkg.com
    let unminified =
-        script [ _src         "https://unpkg.com/htmx.org@2.0.3/dist/htmx.js"
-                 _integrity   "sha384-BBDmZzVt6vjz5YbQqZPtFZW82o8QotoM7RUp5xOxV3nSJ8u2pSdtzFAbGKzTlKtg"
+        script [ _src         "https://unpkg.com/htmx.org@1.9.10/dist/htmx.js"
+                 _integrity   "sha384-j1TtLExqttdT7C3Z/rJy8UZcCGiuqwwN9++coZ6up+5O/l2FHdp3IGfuJOvst6d1"
                 _crossorigin "anonymous" ] []


--- a/src/ViewEngine.Htmx/README.md
+++ b/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.3**
-
-_Upgrading from v1.x: see [the migration guide](https://htmx.org/migration-guide-htmx-1/) for changes_
+**htmx version: 1.9.10**

 ### Setup

@ -16,7 +14,7 @@ _Upgrading from v1.x: see [the migration guide](https://htmx.org/migration-guide
 Following Giraffe View Engine's lead, there are a set of attribute functions for htmx; for many of the attributes, there are also helper modules to assist with typing the values. The example below utilizes both:

 ```fsharp
-let autoload =
+  let autoload =
    div [ _hxGet "/this/data"; _hxTrigger HxTrigger.Load ] [ str "Loading..." ]
 ```

@ -45,19 +43,19 @@ The support modules contain named properties for known values (as illustrated wi
 - `HxRequest` has a `Configure` function, which takes a list of strings; the other functions in the module allow for configuring the request.

 ```fsharp
-HxRequest.Configure [ HxRequest.Timeout 500 ] |> _hxRequest 
+  HxRequest.Configure [ HxRequest.Timeout 500 ] |> _hxRequest 
 ```
 - `HxTrigger` is _(by far)_ the most complex of these modules. Most uses won't need that complexity; however, complex triggers can be defined by piping into or composing with other functions. For example, to define an event that responds to a shift-click anywhere on the document, with a delay of 3 seconds before firing:

 ```fsharp
-HxTrigger.Click
-|> HxTrigger.Filter.Shift
-|> HxTrigger.FromDocument
-|> HxTrigger.Delay "3s"
-|> _hxTrigger
-
-// or
-
-(HxTrigger.Filter.Shift >> HxTrigger.FromDocument >> HxTrigger.Delay "3s") HxTrigger.Click
-|> _hxTrigger
+  HxTrigger.Click
+  |> HxTrigger.Filter.Shift
+  |> HxTrigger.FromDocument
+  |> HxTrigger.Delay "3s"
+  |> _hxTrigger
+  
+  // or
+  
+  (HxTrigger.Filter.Shift >> HxTrigger.FromDocument >> HxTrigger.Delay "3s") HxTrigger.Click
+  |> _hxTrigger
 ```
--- a/src/pack.sh
+++ b/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 .