Review and tweaks

Author: japgolly

coreBundleCBIO/src/main/scala/japgolly/scalajs/react/internal/ReactCallbackExtensions.scala

@@ -0,0 +1 @@
+../../../../../../../../coreBundleCallback/src/main/scala/japgolly/scalajs/react/internal/ReactCallbackExtensions.scala

coreBundleCBIO/src/main/scala/japgolly/scalajs/react/internal/ReactCallbackExtensions.scala

@@ -5,5 +5,5 @@ import japgolly.scalajs.react.util.DefaultEffects._
 package object react
   extends japgolly.scalajs.react.internal.CoreGeneralF[Sync]
      with japgolly.scalajs.react.internal.ReactCallbackExtensions
-     with japgolly.scalajs.react.ReactCats 
-     with japgolly.scalajs.react.callback.Exports
+     with japgolly.scalajs.react.callback.Exports
+     with japgolly.scalajs.react.ReactCats

coreBundleCBIO/src/main/scala/japgolly/scalajs/react/package.scala

@@ -7,7 +7,6 @@ import japgolly.scalajs.react.callback._
 
 sealed trait DefaultEffectsLowPri extends DefaultEffectsApiLowPri {
   override final type Async[A] = IO[A]
-  
   @inline override final implicit lazy val Async: EffectCatsEffect.io.type = EffectCatsEffect.io
 }
 
@@ -19,6 +18,6 @@ object DefaultEffects extends DefaultEffectsLowPri with DefaultEffectsApi {
 // Effect highest-priority
 
 abstract class EffectFallbacks extends EffectFallbacks1 {
-  override implicit def callback : Effect.Sync [CallbackTo] = EffectCallback.callback
-  override implicit def io       : Effect.Async[IO        ] = EffectCatsEffect.io
+  override implicit def callback: Effect.Sync [CallbackTo] = EffectCallback.callback
+  override implicit def io      : Effect.Async[IO        ] = EffectCatsEffect.io
 }

coreBundleCBIO/src/main/scala/japgolly/scalajs/react/util/DefaultEffectsCBIO.scala

@@ -39,7 +39,8 @@ object EffectCatsEffect {
 
   // ===================================================================================================================
 
-  implicit lazy val io: AsyncIO = new AsyncIO(ReactCatsEffect.runtimeFn)
+  implicit lazy val io: AsyncIO =
+    new AsyncIO(ReactCatsEffect.runtimeFn)
 
   class AsyncIO(runtime: () => IORuntime) extends Async.WithDefaults[IO] {
 

coreExtCatsEffect/src/main/scala/japgolly/scalajs/react/util/EffectCatsEffect.scala

@@ -3,9 +3,8 @@ package japgolly.scalajs.react.component
 import japgolly.scalajs.react.hooks.HookComponentBuilder
 import japgolly.scalajs.react.internal._
 import japgolly.scalajs.react.vdom.VdomNode
-import japgolly.scalajs.react.{Children, CtorType, PropsChildren, facade}
+import japgolly.scalajs.react.{Children, CtorType, PropsChildren, Reusability, facade}
 import scala.scalajs.js
-import japgolly.scalajs.react.Reusability
 
 object ScalaFn {
 

coreGeneric/src/main/scala/japgolly/scalajs/react/component/ScalaFn.scala

@@ -15,7 +15,7 @@ with the opt-in optional features shown for you to accept or remove.
 Add to sbt:
 
 ```scala
-val ScalaJsReactVer = "2.0.0-RC3"
+val ScalaJsReactVer = "<latest>"
 
 libraryDependencies ++= Seq(
 
@@ -118,7 +118,7 @@ These are all the modules meant for end-user selection.
 | `callback-ext-cats_effect` | For classes in the `callback` module: <ul><li>`cats.effect.{Sync,Async}` instances</li><li>Conversions from/to `cats.effect.{SyncIO,IO}`</li></ul>  |
 | `core`                     | Core scalajs-react functionality with `{Callback,AsyncCallback}` as the default effects |
 | `core-bundle-cats_effect`  | Core scalajs-react functionality with `cats.effect.{SyncIO,IO}` as the default effects<br>*(Note: `callback` module not included. Add as a separate dependency if required.)* |
-| `core-bundle-cb_io`        | Core scalajs-react functionality with `Callback` as the default sync effect and `cats.effect.IO` as the default async effect.<br>*(Note: both `callback` and `core-ext-cats_effect` modules are included.* |
+| `core-bundle-cb_io`        | Core scalajs-react functionality with `Callback` as the default sync effect and `cats.effect.IO` as the default async effect.<br>*(Note: both `callback` and `core-ext-cats_effect` modules are included.)* |
 | `core-ext-cats`            | Extensions to the `core` module for Cats |
 | `core-ext-cats_effect`     | Extensions to the `core` module for Cats Effect |
 | `extra`                    | Optional utils exclusive to scalajs-react. ([details](./EXTRA.md)) |

doc/MODULES.md

@@ -374,6 +374,10 @@ You can run the script in the Migration section at the bottom of the page to aut
   * UnivEq to 2.0.0
 
 
+# Changes in RC5
+  * Add a new bundle called `core-bundle-cb_io` with provides core scalajs-react functionality with `Callback` as the default sync effect and `cats.effect.IO` as the default async effect. (Thanks [@rpiaggio](https://github.com/rpiaggio))
+
+s
 # Thanks
 
 A lot of this was kindly sponsored by [Gemini](https://www.gemini.edu/)/[NOIRLab](https://nationalastro.org/)/[AURA](https://www.aura-astronomy.org/).

doc/changelog/2.0.0.md

@@ -22,6 +22,7 @@ object Catnip {
   val Component = ScalaComponent.builder[String]
     .initialState(0)
     .renderBackend[Backend]
-    .componentDidMount($ =>  $.backend.onMount2)
+    .componentDidMount(_.backend.onMount)
+    .componentDidMount(_.backend.onMount2)
     .build
 }

downstream-tests/js-cbio/src/main/scala/downstream/Catnip.scala

@@ -1,17 +1,16 @@
 package downstream
 
+import concurrent.ExecutionContext.Implicits.global
 import japgolly.microlibs.testutil.TestUtil._
 import japgolly.scalajs.react.test.ReactTestUtils._
-import utest._
 import scala.concurrent.Future
 import scala.concurrent.Promise
-import concurrent.ExecutionContext.Implicits.global
-import cats.effect.IO
 import scalajs.js
+import utest._
 
 object CBIOBundleTests extends TestSuite {
 
-  def delay(milliseconds: Int): Future[Unit] = {
+  private def delay(milliseconds: Int): Future[Unit] = {
     val p = Promise[Unit]()
     js.timers.setTimeout(milliseconds) {
       p.success(())
@@ -23,14 +22,14 @@ object CBIOBundleTests extends TestSuite {
     Globals.clear()
 
     "catnip" - {
-      // withRenderedIntoDocumentAsync(Catnip.Component("omg")) { m =>
       withRenderedIntoDocumentFuture(Catnip.Component("omg")) { m =>
-        delay(500).map(_ =>
-          // assertEq(Globals.catnipMounts, List("omg"))
-            assertEq(m.showDom(), "<div>Hello(1) omg</div>")
-          )
+        delay(500).map { _ =>
+          assertEq(Globals.catnipMounts, List("omg"))
+          assertEq(m.showDom(), "<div>Hello(1) omg</div>")
+        }
+      }.map { _ =>
+        assertEq(Globals.catnipMounts, List("omg"))
       }
-      // assertEq(Globals.catnipMounts, List("omg"))
     }
 
   }