Merge pull request #17 from eikek/update-htmx

Update to htmx 2.0.1
eikek · Jul 16, 2024 · 242a313 · 242a313
2 parents 8926c66 + 6070272
commit 242a313
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/modules/http4s/src/main/scala/htmx4s/http4s/WebjarRoute.scala b/modules/http4s/src/main/scala/htmx4s/http4s/WebjarRoute.scala
@@ -80,9 +80,7 @@ object WebjarRoute:
     def apply(segment: String)(name: String, version: String, path: String*): Webjar =
       Webjar(segment, name, version, path.toList)
     def htmx(version: String): Webjar = Webjar("htmx")("htmx.org", version, "dist")
-    val htmx1911 = htmx("1.9.11")
-    val htmx1912 = htmx("1.9.12")
-    val htmx2 = htmx("2.0.0")
+    val htmx2 = htmx("2.0.1")
 
   val defaultExtensions = Set(
     ".js",

diff --git a/modules/http4s/src/main/scala/htmx4s/http4s/util/ValidationErrors.scala b/modules/http4s/src/main/scala/htmx4s/http4s/util/ValidationErrors.scala
@@ -16,6 +16,9 @@ final case class ValidationErrors[K, M](
 
   def findList(key: K): List[M] = find(key).map(_.toList).getOrElse(Nil)
 
+  def mkString(sep: String): String =
+    errors.flatMap(_.messages).toList.mkString(sep)
+
 object ValidationErrors:
   def of[K, M](em: ErrorMessage[K, M], ems: ErrorMessage[K, M]*): ValidationErrors[K, M] =
     ValidationErrors(NonEmptyList(em, ems.toList))

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -6,7 +6,7 @@ object Dependencies {
     val scala3 = "3.4.2"
     val doobie = "1.0.0-RC5"
     val h2 = "2.3.230"
-    val htmx = "2.0.0"
+    val htmx = "2.0.1"
     val http4s = "0.23.27"
     val http4sScalatags = "0.25.2"
     val munit = "1.0.0"
@@ -30,7 +30,7 @@ object Dependencies {
   )
 
   val htmx = Seq(
-    "org.webjars.npm" % "htmx.org" % s"${V.htmx}-beta4"
+    "org.webjars.npm" % "htmx.org" % s"${V.htmx}"
   )
 
   val http4s = Seq(

diff --git a/project/HtmxSourceGeneratorPlugin.scala b/project/HtmxSourceGeneratorPlugin.scala
@@ -27,7 +27,6 @@ object HtmxSourceGeneratorPlugin extends AutoPlugin {
 
   val htmxSettings = Seq(
     htmxRepositoryUrl := "https://github.com/bigskysoftware/htmx",
-    htmxRepositoryRef := "v2.0.0",
     htmxRepositoryTarget := (Compile / Keys.target).value / "htmx-repo",
     htmxReferencePath := "www/content/reference.md",
     htmxGenerateSettings := HtmxSettings(),