Upgraded to react v17

Author: viktor-podzigun

project/plugins.sbt

@@ -5,12 +5,12 @@ 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.6.0-SNAPSHOT").changing())
-  addSbtPlugin("org.scommons.sbt" % "sbt-scommons-plugin-sjs06" % "0.6.0")
+  addSbtPlugin(("org.scommons.sbt" % "sbt-scommons-plugin-sjs06" % "0.7.0-SNAPSHOT").changing())
+  //addSbtPlugin("org.scommons.sbt" % "sbt-scommons-plugin-sjs06" % "0.7.0")
 }
 else {
-  //addSbtPlugin(("org.scommons.sbt" % "sbt-scommons-plugin" % "0.6.0-SNAPSHOT").changing())
-  addSbtPlugin("org.scommons.sbt" % "sbt-scommons-plugin" % "0.6.0")
+  addSbtPlugin(("org.scommons.sbt" % "sbt-scommons-plugin" % "0.7.0-SNAPSHOT").changing())
+  //addSbtPlugin("org.scommons.sbt" % "sbt-scommons-plugin" % "0.7.0")
 }
 
 addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.5")

project/src/main/scala/common/Libs.scala

@@ -6,11 +6,10 @@ import scommons.sbtplugin.project.CommonLibs
 
 object Libs extends CommonLibs {
 
-  val scommonsNodejsVersion = "0.6.0"
-  private val sjsReactJsVer = "0.16.0"
+  val scommonsNodejsVersion = "0.6.3"
+  private val sjsReactJsVer = "0.17.0-SNAPSHOT"
 
   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)
 }

project/src/main/scala/definitions/ReactTest.scala

@@ -19,7 +19,7 @@ object ReactTest extends ScalaJsModule {
       coverageExcludedPackages := "scommons.react.test.raw",
 
       npmDependencies in Compile ++= Seq(
-        "react-test-renderer" -> "^16.8.0"
+        "react-test-renderer" -> "^17.0.1"
       )
     )
 

project/src/main/scala/definitions/ScalaJsModule.scala

@@ -1,13 +1,11 @@
 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 scalajsbundler.sbtplugin.ScalaJSBundlerPlugin.autoImport._
-import scommons.sbtplugin.project.CommonModule.ideExcludedDirectories
+import scommons.sbtplugin.project.CommonNodeJsModule
 import scoverage.ScoverageKeys.{coverageEnabled, coverageScalacPluginVersion}
 import scoverage.ScoverageSbtPlugin._
 
@@ -16,7 +14,7 @@ trait ScalaJsModule extends ReactModule {
   override def definition: Project = {
     super.definition
       .enablePlugins(ScalaJSPlugin, ScalaJSBundlerPlugin)
-      .settings(ScalaJsModule.settings: _*)
+      .settings(CommonNodeJsModule.settings: _*)
       .settings(
         //TODO: remove these temporal fixes for Scala.js 1.1+ and scoverage
         coverageScalacPluginVersion := {
@@ -41,38 +39,3 @@ 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"
-      )
-    }
-  )
-}

showcase/src/test/scala/scommons/react/showcase/ErrorBoundaryDemoSpec.scala

@@ -29,14 +29,13 @@ class ErrorBoundaryDemoSpec extends TestSpec with TestRendererUtils {
     //then
     js.Dynamic.global.console.error = savedConsoleError
 
-    assertNativeComponent(result,
-      <.div()(
-        s"Error: java.lang.Exception: test exception",
+    assertNativeComponent(result, <.div()(), inside(_) { case List(error, info) =>
+      error shouldBe s"Error: java.lang.Exception: test exception"
+      info.toString should startWith (
         """Info: 
-          |    in ErrorBoundaryDemoSpec$$anon$1
-          |    in ErrorBoundaryDemo""".stripMargin
+          |    at ErrorBoundaryDemoSpec$$anon$1""".stripMargin
       )
-    )
+    })
   }
 
   it should "render children" in {