Use separated react -dom facade

scommons · Aug 27, 2021 · 3ac4459 · 3ac4459
1 parent a8bcb68
commit 3ac4459
Show file tree

Hide file tree

Showing 15 changed files with 30 additions and 9 deletions.
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,8 +1,8 @@
 //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/"
 
-//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")
 
 addSbtPlugin("com.typesafe.sbt" % "sbt-web" % "1.4.3")
 

diff --git a/project/src/main/scala/common/Libs.scala b/project/src/main/scala/common/Libs.scala
@@ -7,9 +7,9 @@ import scommons.sbtplugin.project.CommonLibs
 object Libs extends CommonLibs {
 
   val scommonsNodejsVersion = "0.5.0"
-  val scommonsReactVersion = "0.5.1"
+  val scommonsReactVersion = "1.0.0-SNAPSHOT"
   private val scommonsApiVersion = "0.5.0"
-  private val sjsReactJsVer = "0.15.0"
+  private val sjsReactJsVer = "0.16.0-SNAPSHOT"
 
   lazy val scommonsApiXhr = Def.setting("org.scommons.api" %%% "scommons-api-xhr" % scommonsApiVersion)
 

diff --git a/project/src/main/scala/definitions/ScalaJsModule.scala b/project/src/main/scala/definitions/ScalaJsModule.scala
@@ -1,13 +1,14 @@
 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 scommons.sbtplugin.ScommonsPlugin.autoImport._
-import scommons.sbtplugin.project.CommonClientModule
-
 import scalajsbundler.sbtplugin.ScalaJSBundlerPlugin
 import scalajsbundler.sbtplugin.ScalaJSBundlerPlugin.autoImport._
+import scommons.sbtplugin.ScommonsPlugin.autoImport._
+import scommons.sbtplugin.project.CommonClientModule
 
 trait ScalaJsModule extends ClientModule {
 
@@ -17,7 +18,15 @@ trait ScalaJsModule extends ClientModule {
       .settings(CommonClientModule.settings: _*)
       .settings(
         scommonsRequireWebpackInTest := true,
-        webpackConfigFile in Test := Some(baseDirectory.value / "test.webpack.config.js")
+        webpackConfigFile in Test := Some(baseDirectory.value / "test.webpack.config.js"),
+
+        // required for node.js >= v12.12.0
+        // see:
+        //   https://github.com/nodejs/node/pull/29919
+        jsEnv in Test := new NodeJSEnv(NodeJSEnv.Config().withArgs(List("--enable-source-maps"))),
+        scalaJSLinkerConfig in Test ~= {
+          _.withSourceMap(true)
+        }
       )
   }
 }
diff --git a/ui/src/main/scala/scommons/client/ui/ImageButton.scala b/ui/src/main/scala/scommons/client/ui/ImageButton.scala
@@ -3,6 +3,7 @@ package scommons.client.ui
 import io.github.shogowada.scalajs.reactjs.events.MouseSyntheticEvent
 import org.scalajs.dom.raw.HTMLButtonElement
 import scommons.react._
+import scommons.react.dom._
 import scommons.react.hooks._
 
 case class ImageButtonProps(data: ImageButtonData,

diff --git a/ui/src/main/scala/scommons/client/ui/ImageCheckBox.scala b/ui/src/main/scala/scommons/client/ui/ImageCheckBox.scala
@@ -3,6 +3,7 @@ package scommons.client.ui
 import io.github.shogowada.scalajs.reactjs.events.FormSyntheticEvent
 import org.scalajs.dom.raw.HTMLInputElement
 import scommons.react._
+import scommons.react.dom._
 import scommons.react.hooks._
 
 import scala.scalajs.js

diff --git a/ui/src/main/scala/scommons/client/ui/PasswordField.scala b/ui/src/main/scala/scommons/client/ui/PasswordField.scala
@@ -4,6 +4,7 @@ import io.github.shogowada.scalajs.reactjs.events.{FormSyntheticEvent, KeyboardS
 import org.scalajs.dom.ext.KeyCode
 import org.scalajs.dom.raw.HTMLInputElement
 import scommons.react._
+import scommons.react.dom._
 import scommons.react.hooks._
 
 case class PasswordFieldProps(password: String,

diff --git a/ui/src/main/scala/scommons/client/ui/SimpleButton.scala b/ui/src/main/scala/scommons/client/ui/SimpleButton.scala
@@ -3,6 +3,7 @@ package scommons.client.ui
 import io.github.shogowada.scalajs.reactjs.events.MouseSyntheticEvent
 import org.scalajs.dom.raw.HTMLButtonElement
 import scommons.react._
+import scommons.react.dom._
 import scommons.react.hooks._
 
 case class SimpleButtonProps(data: SimpleButtonData,

diff --git a/ui/src/main/scala/scommons/client/ui/TextField.scala b/ui/src/main/scala/scommons/client/ui/TextField.scala
@@ -4,6 +4,7 @@ import io.github.shogowada.scalajs.reactjs.events.{FormSyntheticEvent, KeyboardS
 import org.scalajs.dom.ext.KeyCode
 import org.scalajs.dom.raw.HTMLInputElement
 import scommons.react._
+import scommons.react.dom._
 import scommons.react.hooks._
 
 case class TextFieldProps(text: String,

diff --git a/ui/src/main/scala/scommons/client/ui/list/ListBox.scala b/ui/src/main/scala/scommons/client/ui/list/ListBox.scala
@@ -5,6 +5,7 @@ import io.github.shogowada.scalajs.reactjs.events.MouseSyntheticEvent
 import scommons.client.ui.ImageLabelWrapper
 import scommons.client.ui.list.ListBoxCss._
 import scommons.react._
+import scommons.react.dom._
 
 case class ListBoxProps(items: List[ListBoxData],
                         selectedIds: Set[String] = Set.empty,

diff --git a/ui/src/main/scala/scommons/client/ui/list/PickButtons.scala b/ui/src/main/scala/scommons/client/ui/list/PickButtons.scala
@@ -3,6 +3,7 @@ package scommons.client.ui.list
 import io.github.shogowada.scalajs.reactjs.events.MouseSyntheticEvent
 import io.github.shogowada.statictags.Element
 import scommons.react._
+import scommons.react.dom._
 
 case class PickButtonsProps(addEnabled: Boolean = true,
                             removeEnabled: Boolean = true,

diff --git a/ui/src/main/scala/scommons/client/ui/page/PaginationPanel.scala b/ui/src/main/scala/scommons/client/ui/page/PaginationPanel.scala
@@ -3,6 +3,7 @@ package scommons.client.ui.page
 import io.github.shogowada.scalajs.reactjs.events.MouseSyntheticEvent
 import io.github.shogowada.statictags.Element
 import scommons.react._
+import scommons.react.dom._
 import scommons.react.hooks._
 
 case class PaginationPanelProps(totalPages: Int,

diff --git a/ui/src/main/scala/scommons/client/ui/popup/ModalHeader.scala b/ui/src/main/scala/scommons/client/ui/popup/ModalHeader.scala
@@ -2,6 +2,7 @@ package scommons.client.ui.popup
 
 import io.github.shogowada.scalajs.reactjs.events.MouseSyntheticEvent
 import scommons.react._
+import scommons.react.dom._
 
 case class ModalHeaderProps(header: String,
                             onClose: () => Unit,

diff --git a/ui/src/main/scala/scommons/client/ui/tab/TabPanel.scala b/ui/src/main/scala/scommons/client/ui/tab/TabPanel.scala
@@ -3,6 +3,7 @@ package scommons.client.ui.tab
 import io.github.shogowada.scalajs.reactjs.events.MouseSyntheticEvent
 import scommons.client.ui.ImageLabelWrapper
 import scommons.react._
+import scommons.react.dom._
 
 case class TabPanelProps(items: List[TabItemData],
                          selectedIndex: Int = 0,

diff --git a/ui/src/main/scala/scommons/client/ui/table/TablePanel.scala b/ui/src/main/scala/scommons/client/ui/table/TablePanel.scala
@@ -3,6 +3,7 @@ package scommons.client.ui.table
 import io.github.shogowada.scalajs.reactjs.events.MouseSyntheticEvent
 import scommons.client.ui.table.TablePanelCss._
 import scommons.react._
+import scommons.react.dom._
 
 case class TablePanelProps[K, T](header: List[TableColumnData],
                                  rows: Seq[T],

diff --git a/ui/src/main/scala/scommons/client/ui/tree/TreeNode.scala b/ui/src/main/scala/scommons/client/ui/tree/TreeNode.scala
@@ -2,6 +2,7 @@ package scommons.client.ui.tree
 
 import io.github.shogowada.scalajs.reactjs.events.MouseSyntheticEvent
 import scommons.react._
+import scommons.react.dom._
 
 case class TreeNodeProps(isNode: Boolean,
                          paddingLeft: Int,