Use separated react -core and -dom facades

scommons · Aug 26, 2021 · 2f0a105 · 2f0a105
1 parent c11989e
commit 2f0a105
Show file tree

Hide file tree

Showing 19 changed files with 82 additions and 154 deletions.
diff --git a/core/src/main/resources/scommons/react/raw/CreateClass.js b/core/src/main/resources/scommons/react/raw/CreateClass.js
diff --git a/core/src/main/scala/scommons/react/ClassComponent.scala b/core/src/main/scala/scommons/react/ClassComponent.scala
@@ -16,48 +16,15 @@ trait ClassComponent[T] extends UiComponent[T] {
     componentWillUnmount: Self[T, S] => Unit = null,
     componentDidCatch: (Self[T, S], js.Object, js.Dynamic) => Unit = null
   ): ReactClass = {
-
-    raw.CreateClass.create(
+    React.createClass(
+      render = render,
       displayName = displayName,
-      render = js.ThisFunction.fromFunction1((native: js.Dynamic) => {
-        render(Self(native))
-      }),
-      getInitialState = js.ThisFunction.fromFunction1((native: js.Dynamic) => {
-        if (getInitialState != null) {
-          React.stateToNative(getInitialState(Self(native)))
-        } else {
-          React.stateToNative(())
-        }
-      }),
-      componentDidMount = js.ThisFunction.fromFunction1((native: js.Dynamic) => {
-        if (componentDidMount != null) {
-          componentDidMount(Self(native))
-        }
-      }),
-      shouldComponentUpdate = js.ThisFunction.fromFunction3((native: js.Dynamic, nextProps: js.Dynamic, nextState: js.Dynamic) => {
-        if (shouldComponentUpdate != null) {
-          shouldComponentUpdate(Self(native), Props(nextProps), React.stateFromNative(nextState))
-        }
-        else true
-      }),
-      componentDidUpdate = js.ThisFunction.fromFunction3((native: js.Dynamic, prevProps: js.Dynamic, prevState: js.Dynamic) => {
-        if (componentDidUpdate != null) {
-          componentDidUpdate(Self(native), Props(prevProps), React.stateFromNative(prevState))
-        }
-      }),
-      componentWillUnmount = js.ThisFunction.fromFunction1((native: js.Dynamic) => {
-        if (componentWillUnmount != null) {
-          componentWillUnmount(Self(native))
-        }
-      }),
-      componentDidCatch = {
-        if (componentDidCatch != null) {
-          js.ThisFunction.fromFunction3((native: js.Dynamic, error: js.Object, info: js.Dynamic) => {
-            componentDidCatch(Self(native), error, info)
-          })
-        }
-        else null
-      }
+      componentDidMount = componentDidMount,
+      shouldComponentUpdate = shouldComponentUpdate,
+      componentDidUpdate = componentDidUpdate,
+      componentWillUnmount = componentWillUnmount,
+      componentDidCatch = componentDidCatch,
+      getInitialState = getInitialState
     )
   }
 }
diff --git a/core/src/main/scala/scommons/react/raw/CreateClass.scala b/core/src/main/scala/scommons/react/raw/CreateClass.scala
diff --git a/dom/src/main/scala/scommons/react/dom/package.scala b/dom/src/main/scala/scommons/react/dom/package.scala
@@ -0,0 +1,10 @@
+package scommons.react
+
+import io.github.shogowada.scalajs.reactjs.ReactDomVirtualDOM
+import io.github.shogowada.scalajs.reactjs.VirtualDOM._
+
+package object dom {
+
+  implicit class ReactDomVirtualDOMAttributes(attributes: VirtualDOMAttributes)
+    extends ReactDomVirtualDOM.EventVirtualDOMAttributes(attributes)
+}
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,16 +1,16 @@
 //resolvers += "Typesafe repository" at "https://repo.typesafe.com/typesafe/releases/"
-//resolvers += "Sonatype Snapshots" at "https://oss.sonatype.org/content/repositories/snapshots/"
+resolvers += "Sonatype Snapshots" at "https://oss.sonatype.org/content/repositories/snapshots/"
 
 val scalaJSVersion =
   Option(System.getenv("SCALAJS_VERSION")).getOrElse("0.6.31")
 
 if (scalaJSVersion.startsWith("0.6")) {
-  //addSbtPlugin(("org.scommons.sbt" % "sbt-scommons-plugin-sjs06" % "0.5.0-SNAPSHOT").changing())
-  addSbtPlugin("org.scommons.sbt" % "sbt-scommons-plugin-sjs06" % "0.5.0")
+  addSbtPlugin(("org.scommons.sbt" % "sbt-scommons-plugin-sjs06" % "0.6.0-SNAPSHOT").changing())
+  //addSbtPlugin("org.scommons.sbt" % "sbt-scommons-plugin-sjs06" % "0.5.0")
 }
 else {
-  //addSbtPlugin(("org.scommons.sbt" % "sbt-scommons-plugin" % "0.5.0-SNAPSHOT").changing())
-  addSbtPlugin("org.scommons.sbt" % "sbt-scommons-plugin" % "0.5.0")
+  addSbtPlugin(("org.scommons.sbt" % "sbt-scommons-plugin" % "0.6.0-SNAPSHOT").changing())
+  //addSbtPlugin("org.scommons.sbt" % "sbt-scommons-plugin" % "0.5.0")
 }
 
 addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.5")

diff --git a/project/src/main/scala/common/Libs.scala b/project/src/main/scala/common/Libs.scala
@@ -7,11 +7,10 @@ import scommons.sbtplugin.project.CommonLibs
 object Libs extends CommonLibs {
 
   val scommonsNodejsVersion = "0.5.0"
-  private val sjsReactJsVer = "0.15.0"
+  private val sjsReactJsVer = "0.16.0-SNAPSHOT"
 
-  lazy val sjsReactJs = Def.setting("org.scommons.shogowada" %%% "scalajs-reactjs" % sjsReactJsVer)
-  lazy val sjsReactJsRouterDom = Def.setting("org.scommons.shogowada" %%% "scalajs-reactjs-router-dom" % sjsReactJsVer)
-  lazy val sjsReactJsRouterRedux = Def.setting("org.scommons.shogowada" %%% "scalajs-reactjs-router-redux" % sjsReactJsVer)
+  lazy val sjsReactJsCore = Def.setting("org.scommons.shogowada" %%% "scalajs-reactjs-core" % sjsReactJsVer)
+  lazy val sjsReactJsDom = Def.setting("org.scommons.shogowada" %%% "scalajs-reactjs-dom" % sjsReactJsVer)
   lazy val sjsReactJsRedux = Def.setting("org.scommons.shogowada" %%% "scalajs-reactjs-redux" % sjsReactJsVer)
-  lazy val sjsReactJsReduxDevTools = Def.setting("org.scommons.shogowada" %%% "scalajs-reactjs-redux-devtools" % sjsReactJsVer)
+  //lazy val sjsReactJsReduxDevTools = Def.setting("org.scommons.shogowada" %%% "scalajs-reactjs-redux-devtools" % sjsReactJsVer)
 }
diff --git a/project/src/main/scala/definitions/ReactCore.scala b/project/src/main/scala/definitions/ReactCore.scala
@@ -5,8 +5,6 @@ import sbt.Keys._
 import sbt._
 import scoverage.ScoverageKeys.coverageExcludedPackages
 
-import scalajsbundler.sbtplugin.ScalaJSBundlerPlugin.autoImport._
-
 object ReactCore extends ScalaJsModule {
 
   override val id: String = "scommons-react-core"
@@ -22,7 +20,7 @@ object ReactCore extends ScalaJsModule {
   override val internalDependencies: Seq[ClasspathDep[ProjectReference]] = Nil
 
   override val runtimeDependencies: Def.Initialize[Seq[ModuleID]] = Def.setting(Seq(
-    Libs.sjsReactJs.value
+    Libs.sjsReactJsCore.value
   ))
 
   override val testDependencies: Def.Initialize[Seq[ModuleID]] = Def.setting(Seq(

diff --git a/project/src/main/scala/definitions/ReactDom.scala b/project/src/main/scala/definitions/ReactDom.scala
@@ -24,6 +24,7 @@ object ReactDom extends ScalaJsModule {
   )
 
   override val runtimeDependencies: Def.Initialize[Seq[ModuleID]] = Def.setting(Seq(
+    Libs.sjsReactJsDom.value,
     Libs.scalajsDom.value
   ))
 

diff --git a/project/src/main/scala/definitions/ReactTest.scala b/project/src/main/scala/definitions/ReactTest.scala
@@ -21,11 +21,6 @@ object ReactTest extends ScalaJsModule {
       npmDependencies in Compile ++= Seq(
         "react-test-renderer" -> "^16.8.0"
       )
-
-//      npmResolutions in Test := Map(
-//        "react" -> "^16.8.0",
-//        "react-dom" -> "^16.8.0" //TODO: remove dependency on the react-dom !!!
-//      ),
     )
 
   override val internalDependencies: Seq[ClasspathDep[ProjectReference]] = Seq(

diff --git a/project/src/main/scala/definitions/ScalaJsModule.scala b/project/src/main/scala/definitions/ScalaJsModule.scala
@@ -1,11 +1,13 @@
 package definitions
 
+import org.scalajs.jsenv.nodejs.NodeJSEnv
 import org.scalajs.sbtplugin.ScalaJSPlugin
 import org.scalajs.sbtplugin.ScalaJSPlugin.autoImport._
 import sbt.Keys._
 import sbt._
 import scalajsbundler.sbtplugin.ScalaJSBundlerPlugin
-import scommons.sbtplugin.project.CommonClientModule
+import scalajsbundler.sbtplugin.ScalaJSBundlerPlugin.autoImport._
+import scommons.sbtplugin.project.CommonModule.ideExcludedDirectories
 import scoverage.ScoverageKeys.{coverageEnabled, coverageScalacPluginVersion}
 import scoverage.ScoverageSbtPlugin._
 
@@ -14,7 +16,7 @@ trait ScalaJsModule extends ReactModule {
   override def definition: Project = {
     super.definition
       .enablePlugins(ScalaJSPlugin, ScalaJSBundlerPlugin)
-      .settings(CommonClientModule.settings: _*)
+      .settings(ScalaJsModule.settings: _*)
       .settings(
         //TODO: remove these temporal fixes for Scala.js 1.1+ and scoverage
         coverageScalacPluginVersion := {
@@ -39,3 +41,38 @@ trait ScalaJsModule extends ReactModule {
       )
   }
 }
+
+object ScalaJsModule {
+
+  val settings: Seq[Setting[_]] = Seq(
+    scalaJSLinkerConfig ~= {
+      _.withModuleKind(ModuleKind.CommonJSModule)
+        .withSourceMap(false)
+        .withESFeatures(_.withUseECMAScript2015(false))
+    },
+    //Opt-in @ScalaJSDefined by default
+    scalacOptions += {
+      if (scalaJSVersion.startsWith("0.6")) "-P:scalajs:sjsDefinedByDefault"
+      else ""
+    },
+    requireJsDomEnv in Test := false,
+    version in webpack := "4.29.0",
+    webpackEmitSourceMaps := false,
+
+    // required for node.js >= v12.12.0
+    // see:
+    //   https://github.com/nodejs/node/pull/29919
+    scalaJSLinkerConfig in Test ~= {
+      _.withSourceMap(true)
+    },
+    jsEnv in Test := new NodeJSEnv(NodeJSEnv.Config().withArgs(List("--enable-source-maps"))),
+
+    ideExcludedDirectories ++= {
+      val base = baseDirectory.value
+      List(
+        base / "build",
+        base / "node_modules"
+      )
+    }
+  )
+}
diff --git a/showcase/src/main/scala/scommons/react/showcase/ReactRefDemo.scala b/showcase/src/main/scala/scommons/react/showcase/ReactRefDemo.scala
@@ -3,6 +3,7 @@ package scommons.react.showcase
 import io.github.shogowada.scalajs.reactjs.events.MouseSyntheticEvent
 import org.scalajs.dom.raw.HTMLInputElement
 import scommons.react._
+import scommons.react.dom._
 
 object ReactRefDemo extends FunctionComponent[Unit] {
 

diff --git a/showcase/src/main/scala/scommons/react/showcase/app/counter/CounterPanel.scala b/showcase/src/main/scala/scommons/react/showcase/app/counter/CounterPanel.scala
@@ -3,6 +3,7 @@ package scommons.react.showcase.app.counter
 import io.github.shogowada.scalajs.reactjs.events.MouseSyntheticEvent
 import io.github.shogowada.scalajs.reactjs.redux.Redux.Dispatch
 import scommons.react._
+import scommons.react.dom._
 
 case class CounterPanelProps(dispatch: Dispatch,
                              actions: CounterActions,

diff --git a/showcase/src/main/scala/scommons/react/showcase/hooks/UseMemoDemo.scala b/showcase/src/main/scala/scommons/react/showcase/hooks/UseMemoDemo.scala
@@ -2,6 +2,7 @@ package scommons.react.showcase.hooks
 
 import io.github.shogowada.scalajs.reactjs.events.MouseSyntheticEvent
 import scommons.react._
+import scommons.react.dom._
 import scommons.react.hooks._
 
 import scala.scalajs.js

diff --git a/showcase/src/main/scala/scommons/react/showcase/hooks/UseReducerDemo.scala b/showcase/src/main/scala/scommons/react/showcase/hooks/UseReducerDemo.scala
@@ -2,6 +2,7 @@ package scommons.react.showcase.hooks
 
 import io.github.shogowada.scalajs.reactjs.events.MouseSyntheticEvent
 import scommons.react._
+import scommons.react.dom._
 import scommons.react.hooks._
 
 object UseReducerDemo extends FunctionComponent[Unit] {

diff --git a/showcase/src/main/scala/scommons/react/showcase/hooks/UseRefDemo.scala b/showcase/src/main/scala/scommons/react/showcase/hooks/UseRefDemo.scala
@@ -3,6 +3,7 @@ package scommons.react.showcase.hooks
 import io.github.shogowada.scalajs.reactjs.events.MouseSyntheticEvent
 import org.scalajs.dom.raw.HTMLInputElement
 import scommons.react._
+import scommons.react.dom._
 import scommons.react.hooks._
 
 object UseRefDemo extends FunctionComponent[Unit] {

diff --git a/showcase/src/main/scala/scommons/react/showcase/hooks/UseStateDemo.scala b/showcase/src/main/scala/scommons/react/showcase/hooks/UseStateDemo.scala
@@ -2,6 +2,7 @@ package scommons.react.showcase.hooks
 
 import io.github.shogowada.scalajs.reactjs.events.MouseSyntheticEvent
 import scommons.react._
+import scommons.react.dom._
 import scommons.react.hooks._
 
 object UseStateDemo extends FunctionComponent[Unit] {

diff --git a/test-dom/src/test/scala/scommons/react/test/dom/raw/SimulateSpec.scala b/test-dom/src/test/scala/scommons/react/test/dom/raw/SimulateSpec.scala
@@ -1,6 +1,7 @@
 package scommons.react.test.dom.raw
 
 import io.github.shogowada.scalajs.reactjs.events.MouseSyntheticEvent
+import scommons.react.dom._
 import scommons.react.test.TestSpec
 import scommons.react.test.dom.util.TestDOMUtils
 

diff --git a/test/src/test/scala/scommons/react/test/raw/TestRendererSpec.scala b/test/src/test/scala/scommons/react/test/raw/TestRendererSpec.scala
@@ -1,6 +1,5 @@
 package scommons.react.test.raw
 
-import org.scalajs.dom.raw.HTMLInputElement
 import scommons.react._
 import scommons.react.test.TestSpec
 import scommons.react.test.raw.TestRendererSpec._
@@ -12,9 +11,9 @@ class TestRendererSpec extends TestSpec {
   it should "mock reference" in {
     //given
     val comp = new ClassComponent[Unit] {
-      protected def create(): ReactClass = createClass[ReactRef[HTMLInputElement]](
+      protected def create(): ReactClass = createClass[ReactRef[js.Dynamic]](
         getInitialState = { _ =>
-          ReactRef.create[HTMLInputElement]
+          ReactRef.create[js.Dynamic]
         },
         componentDidMount = { self =>
           self.state.current.focus()
@@ -131,9 +130,9 @@ class TestRendererSpec extends TestSpec {
 
 object TestRendererSpec {
 
-  def createHTMLInputElement(focusMock: () => Unit): HTMLInputElement = {
+  def createHTMLInputElement(focusMock: () => Unit): js.Object = {
     js.Dynamic.literal(
       "focus" -> (focusMock: js.Function)
-    ).asInstanceOf[HTMLInputElement]
+    )
   }
 }