Merge pull request #1002 from japgolly/topic/cbio2

Add CB/IO core bundle

Author: japgolly

build.sbt

@@ -10,6 +10,7 @@ val callbackExtCats       = ScalaJsReact.callbackExtCats
 val callbackExtCatsEffect = ScalaJsReact.callbackExtCatsEffect
 val coreBundleCallback    = ScalaJsReact.coreBundleCallback
 val coreBundleCatsEffect  = ScalaJsReact.coreBundleCatsEffect
+val coreBundleCBIO        = ScalaJsReact.coreBundleCBIO
 val coreExtCats           = ScalaJsReact.coreExtCats
 val coreExtCatsEffect     = ScalaJsReact.coreExtCatsEffect
 val coreGeneric           = ScalaJsReact.coreGeneric

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/package.scala

@@ -0,0 +1,9 @@
+package japgolly.scalajs
+
+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.callback.Exports
+     with japgolly.scalajs.react.ReactCats

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

@@ -0,0 +1,23 @@
+package japgolly.scalajs.react.util
+
+import cats.effect._
+import japgolly.scalajs.react.callback._
+
+// DefaultEffects
+
+sealed trait DefaultEffectsLowPri extends DefaultEffectsApiLowPri {
+  override final type Async[A] = IO[A]
+  @inline override final implicit lazy val Async: EffectCatsEffect.io.type = EffectCatsEffect.io
+}
+
+object DefaultEffects extends DefaultEffectsLowPri with DefaultEffectsApi {
+  override type Sync[A] = CallbackTo[A]
+  @inline override implicit val Sync: EffectCallback.callback.type = EffectCallback.callback
+}
+
+// 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
+}

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

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

coreGeneric/src/main/scala/japgolly/scalajs/react/component/ScalaFn.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 {
 

doc/MODULES.md

@@ -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,6 +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-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/changelog/2.0.0.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/).

downstream-tests/build.sbt

@@ -80,10 +80,12 @@ lazy val root = Project("root", file("."))
           jvm           / clean,
           js            / clean,
           jsCE          / clean,
+          jsCBIO        / clean,
                    Test / compile,
           jvm    / Test / test,
           js     / Test / test,
           jsCE   / Test / test,
+          jsCBIO / Test / test
         ).value
       else
         Def.sequential(
@@ -174,6 +176,26 @@ lazy val jsCE = project
     },
   )
 
+lazy val jsCBIO = project
+  .in(file("js-cbio"))
+  .enablePlugins(ScalaJSPlugin)
+  .dependsOn(macros)
+  .configure(commonSettings, utestSettings, addReactJsDependencies(Test))
+  .settings(
+    scalaJSStage := jsStage,
+    libraryDependencies ++= {
+      val ver = version.value.stripSuffix("-SNAPSHOT") + "-SNAPSHOT"
+      Seq(
+        "com.github.japgolly.scalajs-react" %%% "core-bundle-cb_io" % ver,
+        "com.github.japgolly.scalajs-react" %%% "extra" % ver,
+        "com.github.japgolly.scalajs-react" %%% "test" % ver % Test,
+        Dep.microlibsCompileTime.value % Test,
+        Dep.microlibsTestUtil.value % Test,
+        Dep.scalaJsJavaTime.value % Test,
+      )
+    },
+  )
+
 lazy val generic = project
   .enablePlugins(ScalaJSPlugin)
   .configure(commonSettings)

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

@@ -0,0 +1,28 @@
+package downstream
+
+import cats.effect.IO
+import japgolly.scalajs.react._
+import japgolly.scalajs.react.vdom.html_<^._
+
+object Catnip {
+
+  final class Backend($: BackendScope[String, Int]) {
+    def render(p: String, s: Int) =
+      <.div(s"Hello($s) ", p)
+
+    def onMount: Callback =
+      $.props.map { p =>
+        Globals.catnipMounts :+= p
+      }
+
+    def onMount2: IO[Unit] =
+      $.setStateAsync(1)
+  }
+
+  val Component = ScalaComponent.builder[String]
+    .initialState(0)
+    .renderBackend[Backend]
+    .componentDidMount(_.backend.onMount)
+    .componentDidMount(_.backend.onMount2)
+    .build
+}