Merge branch 'master' into cb-io

Author: japgolly

.github/dependabot.yml

@@ -0,0 +1,9 @@
+version: 2
+updates:
+
+- package-ecosystem: github-actions
+  directory: "/"
+  schedule:
+    interval: daily
+  open-pull-requests-limit: 10
+

.github/workflows/ci.yml

@@ -21,7 +21,7 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Setup Scala
-        uses: japgolly/setup-everything-scala@v1.0
+        uses: japgolly/setup-everything-scala@v2.0
         with:
           java-version: adopt@1.${{ matrix.java }}
 

bin/ci

@@ -45,6 +45,7 @@ cmd=(
     ++$SCALA_VER
     'set ThisBuild / parallelExecution := false'
     'set Global / concurrentRestrictions += Tags.limit(ScalaJSTags.Link, 1)'
+    clean
     test                                                # Test development-mode
     'set ThisBuild / scalaJSStage := FullOptStage' test # Test production-mode
     publishLocal                                        # For downstream tests

build.sbt

@@ -1,8 +1,9 @@
-ThisBuild / organization := "com.github.japgolly.scalajs-react"
-ThisBuild / homepage     := Some(url("https://github.com/japgolly/scalajs-react"))
-ThisBuild / licenses     := ("Apache-2.0", url("http://opensource.org/licenses/Apache-2.0")) :: Nil
-ThisBuild / shellPrompt  := ((s: State) => Project.extract(s).currentRef.project + "> ")
-sonatypeProfileName      :=  "com.github.japgolly"
+ThisBuild / organization  := "com.github.japgolly.scalajs-react"
+ThisBuild / homepage      := Some(url("https://github.com/japgolly/scalajs-react"))
+ThisBuild / licenses      := ("Apache-2.0", url("http://opensource.org/licenses/Apache-2.0")) :: Nil
+ThisBuild / shellPrompt   := ((s: State) => Project.extract(s).currentRef.project + "> ")
+ThisBuild / versionScheme := Some("early-semver")
+sonatypeProfileName       := "com.github.japgolly"
 
 val callback              = ScalaJsReact.callback
 val callbackExtCats       = ScalaJsReact.callbackExtCats
@@ -23,6 +24,7 @@ val ghpagesMacros         = ScalaJsReact.ghpagesMacros
 val root                  = ScalaJsReact.root
 val scalafixRules         = ScalaJsReact.scalafixRules
 val tests                 = ScalaJsReact.tests
+val testUtilMacros        = ScalaJsReact.testUtilMacros
 val testUtil              = ScalaJsReact.testUtil
 val util                  = ScalaJsReact.util
 val utilCatsEffect        = ScalaJsReact.utilCatsEffect

callback/src/main/scala-2/japgolly/scalajs/react/callback/CallbackTo.scala

@@ -5,8 +5,7 @@ import japgolly.scalajs.react.util.Effect.Sync
 import japgolly.scalajs.react.util.JsUtil
 import japgolly.scalajs.react.util.Util.{catchAll, identityFn}
 import java.time.{Duration, Instant}
-import org.scalajs.dom.raw.Window
-import org.scalajs.dom.window
+import org.scalajs.dom.{Window, window}
 import scala.annotation.tailrec
 import scala.collection.BuildFrom
 import scala.concurrent.duration.{FiniteDuration, MILLISECONDS}

callback/src/main/scala-3/japgolly/scalajs/react/callback/CallbackTo.scala

@@ -5,7 +5,7 @@ import japgolly.scalajs.react.util.Effect.Sync
 import japgolly.scalajs.react.util.JsUtil
 import japgolly.scalajs.react.util.Util.{catchAll, identityFn}
 import java.time.{Duration, Instant}
-import org.scalajs.dom.raw.Window
+import org.scalajs.dom.Window
 import org.scalajs.dom.window
 import scala.annotation.tailrec
 import scala.collection.BuildFrom

coreGeneric/src/main/scala-2/japgolly/scalajs/react/internal/ConfigMacros.scala

@@ -0,0 +1,22 @@
+package japgolly.scalajs.react.internal
+
+import japgolly.microlibs.compiletime._
+import scala.reflect.macros.blackbox.Context
+
+abstract class ConfigMacros(val c: Context) extends MacroUtils {
+  import c.universe._
+
+  protected def readConfig(key: String): Option[String] =
+    (Option(System.getProperty(key, null)) orElse Option(System.getenv(key)))
+      .map(_.trim.toLowerCase)
+      .filter(_.nonEmpty)
+
+  protected def modStr(expr: c.Expr[String])(f: String => c.Expr[String]): c.Expr[String] =
+    expr match {
+      case Expr(Literal(Constant(s: String))) => f(s)
+      case _                                  => expr
+    }
+
+  protected implicit def lit(s: String): c.Expr[String] =
+    c.Expr(Literal(Constant(s)))
+}

coreGeneric/src/main/scala-2/japgolly/scalajs/react/internal/ScalaJsReactConfigMacros.scala

@@ -1,33 +1,16 @@
 package japgolly.scalajs.react.internal
 
-import japgolly.microlibs.compiletime._
 import scala.reflect.macros.blackbox.Context
 
 object ScalaJsReactConfigMacros {
   final val KeyCompNameAll = "japgolly.scalajs.react.component.names.all"
   final val KeyCompNameAuto = "japgolly.scalajs.react.component.names.implicit"
 }
 
-class ScalaJsReactConfigMacros(val c: Context) extends MacroUtils {
+class ScalaJsReactConfigMacros(override val c: Context) extends ConfigMacros(c) {
   import ScalaJsReactConfigMacros._
   import c.universe._
 
-  private def readConfig(key: String): Option[String] =
-    (Option(System.getProperty(key, null)) orElse Option(System.getenv(key)))
-      .map(_.trim.toLowerCase)
-      .filter(_.nonEmpty)
-
-  private def modStr(expr: c.Expr[String])(f: String => c.Expr[String]): c.Expr[String] =
-    expr match {
-      case Expr(Literal(Constant(s: String))) => f(s)
-      case _ =>
-        // warn(s"Unable to transform component name:\n  $expr\n  ${showRaw(expr)}")
-        expr
-    }
-
-  private implicit def lit(s: String): c.Expr[String] =
-    c.Expr(Literal(Constant(s)))
-
   def automaticComponentName(displayName: c.Expr[String]): c.Expr[String] =
     modStr(displayName)(_automaticComponentName(_))
 

coreGeneric/src/main/scala-2/japgolly/scalajs/react/vdom/Attr.scala

@@ -63,22 +63,24 @@ object Attr {
       O.foreach(callback)(prepare(_)())
   }
 
-  trait EventCallback0 {
-    implicit def dispatch[F[_]](implicit F: Dispatch[F]): EventCallback[F[Unit]] =
-      new EventCallback(fa => F.dispatchFn(fa))
-
+  trait EventCallback1 {
     implicit def reusableDispatch[F[_]](implicit F: Dispatch[F]): EventCallback[Reusable[F[Unit]]] =
       new EventCallback(fa => F.dispatchFn(fa))
   }
 
-  object EventCallback extends EventCallback0 {
-    import DefaultEffects.{Sync => D}
+  trait EventCallback2 extends EventCallback1 {
+    implicit def dispatch[F[_]](implicit F: Dispatch[F]): EventCallback[F[Unit]] =
+      new EventCallback(fa => F.dispatchFn(fa))
+  }
 
-    implicit val defaultSync: EventCallback[D[Unit]] =
-      dispatch(D)
+  trait EventCallback3 extends EventCallback2 {
+    implicit lazy val reusableDefaultSync: EventCallback[Reusable[DefaultEffects.Sync[Unit]]] =
+      reusableDispatch(DefaultEffects.Sync)
+  }
 
-    implicit lazy val reusableDefaultSync: EventCallback[Reusable[D[Unit]]] =
-      reusableDispatch(D)
+  object EventCallback extends EventCallback3 {
+    implicit val defaultSync: EventCallback[DefaultEffects.Sync[Unit]] =
+      dispatch(DefaultEffects.Sync)
   }
 
   type EventHandler[E[+x <: dom.Node] <: facade.SyntheticEvent[x]] =

coreGeneric/src/main/scala-3/japgolly/scalajs/react/vdom/Attr.scala

@@ -79,22 +79,24 @@ object Attr {
       O.foreach(callback)(prepare(_)())
   }
 
-  trait EventCallback0 {
-    implicit def dispatch[F[_]](implicit F: Dispatch[F]): EventCallback[F[Unit]] =
-      new EventCallback(fa => F.dispatchFn(fa))
-
+  trait EventCallback1 {
     implicit def reusableDispatch[F[_]](implicit F: Dispatch[F]): EventCallback[Reusable[F[Unit]]] =
       new EventCallback(fa => F.dispatchFn(fa))
   }
 
-  object EventCallback extends EventCallback0 {
-    import DefaultEffects.{Sync => D}
+  trait EventCallback2 extends EventCallback1 {
+    implicit def dispatch[F[_]](implicit F: Dispatch[F]): EventCallback[F[Unit]] =
+      new EventCallback(fa => F.dispatchFn(fa))
+  }
 
-    implicit val defaultSync: EventCallback[D[Unit]] =
-      dispatch(D)
+  trait EventCallback3 extends EventCallback2 {
+    implicit lazy val reusableDefaultSync: EventCallback[Reusable[DefaultEffects.Sync[Unit]]] =
+      reusableDispatch(DefaultEffects.Sync)
+  }
 
-    implicit lazy val reusableDefaultSync: EventCallback[Reusable[D[Unit]]] =
-      reusableDispatch(D)
+  object EventCallback extends EventCallback3 {
+    implicit val defaultSync: EventCallback[DefaultEffects.Sync[Unit]] =
+      dispatch(DefaultEffects.Sync)
   }
 
   type EventHandler[E[+x <: dom.Node] <: facade.SyntheticEvent[x]] =