From fcaaa693bc4986b21f99c70ab2a9a16b572eeef8 Mon Sep 17 00:00:00 2001 From: "Daniel J. Summers" Date: Wed, 22 Nov 2023 16:09:52 -0500 Subject: [PATCH] Bump htmx version; add .NET 8 support --- .github/workflows/ci.yml | 2 +- src/Directory.Build.props | 6 +++--- src/Tests/ViewEngine.fs | 4 ++-- src/ViewEngine.Htmx/Htmx.fs | 8 ++++---- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 385c464..044a7bc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,7 +13,7 @@ jobs: strategy: matrix: - dotnet-version: [ "6.0", "7.0" ] + dotnet-version: [ "6.0", "7.0", "8.0" ] steps: - uses: actions/checkout@v3 diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 5b48cc8..f189553 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -1,9 +1,9 @@  - net6.0;net7.0 - 1.9.6 - Add support for hx-disabled-elt attribute; update script tags to pull htmx 1.9.6 + net6.0;net7.0;net8.0 + 1.9.8 + Update script tags to pull htmx 1.9.8; add support for .NET 8 danieljsummers Bit Badger Solutions https://github.com/bit-badger/Giraffe.Htmx diff --git a/src/Tests/ViewEngine.fs b/src/Tests/ViewEngine.fs index aed484d..8668302 100644 --- a/src/Tests/ViewEngine.fs +++ b/src/Tests/ViewEngine.fs @@ -425,14 +425,14 @@ let script = let html = RenderView.AsString.htmlNode Script.minified Expect.equal html - """""" + """""" "Minified script tag is incorrect" } test "unminified succeeds" { let html = RenderView.AsString.htmlNode Script.unminified Expect.equal html - """""" + """""" "Unminified script tag is incorrect" } ] diff --git a/src/ViewEngine.Htmx/Htmx.fs b/src/ViewEngine.Htmx/Htmx.fs index 1401054..4b8a10c 100644 --- a/src/ViewEngine.Htmx/Htmx.fs +++ b/src/ViewEngine.Htmx/Htmx.fs @@ -299,14 +299,14 @@ module Script = /// Script tag to load the minified version from unpkg.com let minified = - script [ _src "https://unpkg.com/htmx.org@1.9.6" - _integrity "sha384-FhXw7b6AlE/jyjlZH5iHa/tTe9EpJ1Y55RjcgPbjeWMskSxZt1v9qkxLJWNJaGni" + script [ _src "https://unpkg.com/htmx.org@1.9.8" + _integrity "sha384-rgjA7mptc2ETQqXoYC3/zJvkU7K/aP44Y+z7xQuJiVnB/422P/Ak+F/AqFR7E4Wr" _crossorigin "anonymous" ] [] /// Script tag to load the unminified version from unpkg.com let unminified = - script [ _src "https://unpkg.com/htmx.org@1.9.6/dist/htmx.js" - _integrity "sha384-DyaDHx3hlXQ3QqTsQbNECvRW/A/B+4OtEWLCHbsDRPI3oJ98ekMiWJ4Yyrrqimog" + script [ _src "https://unpkg.com/htmx.org@1.9.8/dist/htmx.js" + _integrity "sha384-zOAIsdGekNHQVAjCjVrQ1xHoxyvnxgr63EH6IyXsCfvKZdRFRyG1u8GbWxO5oZ38" _crossorigin "anonymous" ] []