Merge branch 'series/0.17.x' into series/next

tulz-app · Jan 20, 2024 · c741a2d · c741a2d
2 parents 7e53a4b + 4a46f43
commit c741a2d
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 22 deletions.
diff --git a/modules/tailwind-default-theme/src/test/scala/com/raquo/laminar/utils/LaminarSpec.scala b/modules/tailwind-default-theme/src/test/scala/com/raquo/laminar/utils/LaminarSpec.scala
@@ -28,10 +28,16 @@ trait LaminarSpec extends MountOps with RuleImplicits[Tag.Base, CommentNode, Htm
 
   def sentinel: ExpectedNode = ExpectedNode.comment
 
+  /**
+   * You can use this when `sentinel` does not make sense semantically
+   */
+  def emptyCommentNode: ExpectedNode = ExpectedNode.comment
+
   def mount(
     node: ReactiveElement.Base,
     clue: String = defaultMountedElementClue
   )(implicit
+    prettifier: scalactic.Prettifier,
     pos: scalactic.source.Position
   ): Unit = {
     mountedElementClue = clue
@@ -43,12 +49,18 @@ trait LaminarSpec extends MountOps with RuleImplicits[Tag.Base, CommentNode, Htm
     clue: String,
     node: ReactiveElement.Base
   )(implicit
+    prettifier: scalactic.Prettifier,
     pos: scalactic.source.Position
   ): Unit = {
-    mount(node, clue)(pos)
+    mount(node, clue)(prettifier, pos)
   }
 
-  override def unmount(clue: String = "unmount")(implicit pos: scalactic.source.Position): Unit = {
+  override def unmount(
+    clue: String = "unmount"
+  )(implicit
+    prettifier: scalactic.Prettifier,
+    pos: scalactic.source.Position
+  ): Unit = {
     assertRootNodeMounted("unmount:" + clue)
     doAssert(
       root != null,

diff --git a/project/DependencyVersions.scala b/project/DependencyVersions.scala
@@ -1,12 +1,12 @@
 object DependencyVersions {
 
   val jsdom        = "16.4.0"
-  val laminar      = "17.0.0-M2"
+  val laminar      = "17.0.0-M6"
   val `scala-test` = "3.2.9"
   val stringdiff   = "0.3.4"
-  val domtestutils = "17.0.0"
+  val domtestutils = "18.0.1"
   val cats         = "2.10.0"
-  val upickle      = "3.1.3"
+  val upickle      = "3.1.4"
   val circe        = "0.14.6"
 
   // -- website

diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.9.7
+sbt.version=1.9.8
diff --git a/website/src/main/resources/doc/core/helpers.md b/website/src/main/resources/doc/core/helpers.md
@@ -20,22 +20,6 @@ div(
 )
 ```
 
-## `when` 
-## `whenNot`
-
-```scala
-val b: Boolean = ???
-
-div(
-  when(b) {
-    span("b is true")
-  },
-  whenNot(b) {
-    span("b is false")
-  }
-)
-```
-
 ## `unsafeAppendRawChild`
 
 Use when you know what you're doing.