Merge branch 'main' into update/cats-core-2.7.0

scala-steward · scala-steward · commit c399e53df1fd · 2021-12-31T01:13:10.000+01:00
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -8,7 +8,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        scala: [2.12.15, 2.13.7]
+        scala: [2.13.7]
         java: [adopt@1.8]
     runs-on: ${{ matrix.os }}
     steps:
diff --git a/.mergify.yml b/.mergify.yml
@@ -11,7 +11,7 @@ pull_request_rules:
     conditions:
       - author=scala-steward
       - body~=labels:.*semver-patch.*
-      - status-success=Build and Test (ubuntu-latest, 2.12.15, adopt@1.8)
+#      - status-success=Build and Test (ubuntu-latest, 2.12.15, adopt@1.8)
       - status-success=Build and Test (ubuntu-latest, 2.13.7, adopt@1.8)
     actions:
       merge:
diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiChip.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiChip.scala
@@ -4,7 +4,7 @@ import scala.scalajs.js
 import scala.scalajs.js.annotation.JSImport
 
 import japgolly.scalajs.react.ReactEvent
-import japgolly.scalajs.react.raw.React
+import japgolly.scalajs.react.facade.React
 import japgolly.scalajs.react.vdom.html_<^._
 
 import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithPropsNoChildren}
diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiFormControlLabel.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiFormControlLabel.scala
@@ -5,7 +5,7 @@ import scala.scalajs.js.annotation.JSImport
 import scala.scalajs.js.|
 
 import japgolly.scalajs.react.ReactEvent
-import japgolly.scalajs.react.raw.React
+import japgolly.scalajs.react.facade.React
 import japgolly.scalajs.react.vdom.html_<^._
 
 import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithPropsNoChildren}
diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiNativeSelect.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiNativeSelect.scala
@@ -4,7 +4,7 @@ import scala.scalajs.js
 import scala.scalajs.js.annotation.JSImport
 import scala.scalajs.js.|
 
-import japgolly.scalajs.react.raw.React
+import japgolly.scalajs.react.facade.React
 import japgolly.scalajs.react.vdom.html_<^.VdomNode
 
 import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps}
diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiSelect.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiSelect.scala
@@ -5,7 +5,7 @@ import scala.scalajs.js.annotation.JSImport
 import scala.scalajs.js.|
 
 import japgolly.scalajs.react.ReactEventFromInput
-import japgolly.scalajs.react.raw.React
+import japgolly.scalajs.react.facade.React
 import japgolly.scalajs.react.vdom.html_<^.VdomNode
 
 import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps}
diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiStepper.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiStepper.scala
@@ -3,7 +3,7 @@ package io.kinoplan.scalajs.react.material.ui.core
 import scala.scalajs.js
 import scala.scalajs.js.annotation.JSImport
 
-import japgolly.scalajs.react.raw.React
+import japgolly.scalajs.react.facade.React
 
 import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps}
 import io.kinoplan.scalajs.react.material.ui.core.internal.PaperClassKey
diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/package.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/package.scala
@@ -5,8 +5,8 @@ import scala.scalajs.js.annotation.JSGlobal
 import scala.scalajs.js.|
 
 import japgolly.scalajs.react.{Callback, ReactEventTypes}
-import japgolly.scalajs.react.raw.SyntheticEvent
-import org.scalajs.dom.raw.HTMLElement
+import japgolly.scalajs.react.facade.SyntheticEvent
+import org.scalajs.dom.HTMLElement
 
 package object core {
   type JsFun0                                   = js.Function0[Callback]
diff --git a/demo/dev.webpack.config.js b/demo/dev.webpack.config.js
@@ -4,16 +4,16 @@ var path = require("path");
 module.exports = generatedConfig;
 
 module.exports.devServer = {
-    contentBase: [
+    static: [
         __dirname,
         path.join(__dirname, "../../../../src/main/resources")
     ],
-    watchContentBase: true
+    port: 8080
     // hot: true
 };
 
 module.exports.mode = "development";
 
 module.exports.performance = {
     maxEntrypointSize: 400000
-};
+};
diff --git a/demo/lib/scalajs-react-material-ui-icons_sjs1_2.13-0.1.0+1-5e41edb4+20201105-1130-SNAPSHOT.jar b/demo/lib/scalajs-react-material-ui-icons_sjs1_2.13-0.1.0+1-5e41edb4+20201105-1130-SNAPSHOT.jar
diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/AppBar/MenuAppBar.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/AppBar/MenuAppBar.scala
@@ -5,7 +5,7 @@ import scala.scalajs.js.JSConverters._
 import japgolly.scalajs.react.{BackendScope, Callback, ReactEvent, ReactEventFromHtml, ReactEventFromInput, ScalaComponent}
 import japgolly.scalajs.react.vdom.Attr
 import japgolly.scalajs.react.vdom.all.{VdomElement, _}
-import org.scalajs.dom.raw.HTMLElement
+import org.scalajs.dom.HTMLElement
 import scalacss.ScalaCssReactImplicits
 
 import io.kinoplan.demo.components.ComponentContainer
diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/AppBar/PrimarySearchAppBar.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/AppBar/PrimarySearchAppBar.scala
@@ -6,7 +6,7 @@ import cats.syntax.option._
 import japgolly.scalajs.react.{BackendScope, Callback, ReactEvent, ReactEventFromHtml, ScalaComponent}
 import japgolly.scalajs.react.vdom.Attr
 import japgolly.scalajs.react.vdom.all.{VdomElement, _}
-import org.scalajs.dom.raw.HTMLElement
+import org.scalajs.dom.HTMLElement
 import scalacss.ScalaCssReactImplicits
 
 import io.kinoplan.demo.components.ComponentContainer
diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Menus/FadeMenu.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Menus/FadeMenu.scala
@@ -5,7 +5,7 @@ import scala.scalajs.js.JSConverters._
 
 import japgolly.scalajs.react.{BackendScope, Callback, ReactEvent, ReactEventFromHtml, ScalaComponent}
 import japgolly.scalajs.react.vdom.all._
-import org.scalajs.dom.raw.HTMLElement
+import org.scalajs.dom.HTMLElement
 import scalacss.ScalaCssReactImplicits
 
 import io.kinoplan.demo.components.ComponentContainer
diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Menus/LongMenu.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Menus/LongMenu.scala
@@ -6,7 +6,7 @@ import scala.scalajs.js.JSConverters._
 import japgolly.scalajs.react.{BackendScope, Callback, ReactEvent, ReactEventFromHtml, ScalaComponent}
 import japgolly.scalajs.react.vdom.Attr
 import japgolly.scalajs.react.vdom.all._
-import org.scalajs.dom.raw.HTMLElement
+import org.scalajs.dom.HTMLElement
 import scalacss.ScalaCssReactImplicits
 
 import io.kinoplan.demo.components.ComponentContainer
diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Menus/SimpleListMenu.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Menus/SimpleListMenu.scala
@@ -5,7 +5,7 @@ import scala.scalajs.js.JSConverters._
 import japgolly.scalajs.react.{BackendScope, Callback, ReactEvent, ReactEventFromHtml, ScalaComponent}
 import japgolly.scalajs.react.vdom.Attr
 import japgolly.scalajs.react.vdom.all._
-import org.scalajs.dom.raw.HTMLElement
+import org.scalajs.dom.HTMLElement
 import scalacss.ScalaCssReactImplicits
 
 import io.kinoplan.demo.components.{ComponentContainer, Layout}
diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Menus/SimpleMenu.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Menus/SimpleMenu.scala
@@ -4,7 +4,7 @@ import scala.scalajs.js.JSConverters._
 
 import japgolly.scalajs.react.{BackendScope, Callback, ReactEvent, ReactEventFromHtml, ScalaComponent}
 import japgolly.scalajs.react.vdom.all._
-import org.scalajs.dom.raw.HTMLElement
+import org.scalajs.dom.HTMLElement
 import scalacss.ScalaCssReactImplicits
 
 import io.kinoplan.demo.components.ComponentContainer
diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Selects/MultipleSelect.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Selects/MultipleSelect.scala
@@ -4,10 +4,10 @@ import scala.scalajs.js
 import scala.scalajs.js.JSConverters._
 
 import japgolly.scalajs.react.{BackendScope, ReactEventFromInput, ScalaComponent}
-import japgolly.scalajs.react.raw.React
+import japgolly.scalajs.react.facade.React
 import japgolly.scalajs.react.vdom.Attr
 import japgolly.scalajs.react.vdom.all._
-import org.scalajs.dom.raw.HTMLSelectElement
+import org.scalajs.dom.HTMLSelectElement
 import scalacss.ScalaCssReactImplicits
 
 import io.kinoplan.demo.components.ComponentContainer
diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Selects/SimpleSelect.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Selects/SimpleSelect.scala
@@ -3,7 +3,7 @@ package io.kinoplan.demo.components.demos.Selects
 import scala.scalajs.js
 
 import japgolly.scalajs.react.{BackendScope, ReactDOM, ReactEventFromInput, ScalaComponent}
-import japgolly.scalajs.react.raw.React
+import japgolly.scalajs.react.facade.React
 import japgolly.scalajs.react.vdom.all._
 import org.scalajs.dom.{Element, document}
 import scalacss.ScalaCssReactImplicits
diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Tables/wrappers/EnhancedTableToolbar.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Tables/wrappers/EnhancedTableToolbar.scala
@@ -1,7 +1,7 @@
 package io.kinoplan.demo.components.demos.Tables.wrappers
 
 import japgolly.scalajs.react._
-import japgolly.scalajs.react.raw.React
+import japgolly.scalajs.react.facade.React
 import japgolly.scalajs.react.vdom.all._
 import scalacss.ScalaCssReactImplicits
 
diff --git a/demo/src/main/scala/io/kinoplan/demo/models/Tables/Row.scala b/demo/src/main/scala/io/kinoplan/demo/models/Tables/Row.scala
@@ -2,7 +2,7 @@ package io.kinoplan.demo.models.Tables
 
 import scala.scalajs.js.|
 
-import japgolly.scalajs.react.raw._
+import japgolly.scalajs.react.facade.React
 import org.scalajs.dom.html
 
 case class Row(
diff --git a/demo/src/main/scala/io/kinoplan/demo/utils/CSSUtils.scala b/demo/src/main/scala/io/kinoplan/demo/utils/CSSUtils.scala
@@ -1,7 +1,6 @@
 package io.kinoplan.demo.utils
 
-import org.scalajs.dom.document
-import org.scalajs.dom.raw.HTMLStyleElement
+import org.scalajs.dom.{HTMLStyleElement, document}
 
 object CSSUtils {
   def createStyleElement(styleStr: String): HTMLStyleElement = {
diff --git a/demo/src/main/scala/io/kinoplan/demo/utils/props/MuiInputProps.scala b/demo/src/main/scala/io/kinoplan/demo/utils/props/MuiInputProps.scala
@@ -3,7 +3,7 @@ package io.kinoplan.demo.utils.props
 import scala.scalajs.js
 import scala.scalajs.js.JSConverters._
 
-import japgolly.scalajs.react.raw.React
+import japgolly.scalajs.react.facade.React
 
 @js.native
 trait MuiInputProps extends js.Object {
diff --git a/lab/src/main/scala/io/kinoplan/scalajs/react/material/ui/lab/MuiSlider.scala b/lab/src/main/scala/io/kinoplan/scalajs/react/material/ui/lab/MuiSlider.scala
@@ -4,7 +4,7 @@ import scala.scalajs.js
 import scala.scalajs.js.annotation.JSImport
 
 import japgolly.scalajs.react.ReactEvent
-import japgolly.scalajs.react.raw.React
+import japgolly.scalajs.react.facade.React
 
 import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps}
 
diff --git a/lab/src/main/scala/io/kinoplan/scalajs/react/material/ui/lab/MuiSpeedDial.scala b/lab/src/main/scala/io/kinoplan/scalajs/react/material/ui/lab/MuiSpeedDial.scala
@@ -4,7 +4,7 @@ import scala.scalajs.js
 import scala.scalajs.js.annotation.JSImport
 import scala.scalajs.js.|
 
-import japgolly.scalajs.react.raw.React
+import japgolly.scalajs.react.facade.React
 import japgolly.scalajs.react.vdom.VdomNode
 
 import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps}
diff --git a/lab/src/main/scala/io/kinoplan/scalajs/react/material/ui/lab/package.scala b/lab/src/main/scala/io/kinoplan/scalajs/react/material/ui/lab/package.scala
@@ -4,7 +4,7 @@ import scala.scalajs.js
 import scala.scalajs.js.|
 
 import japgolly.scalajs.react.Callback
-import japgolly.scalajs.react.raw.SyntheticEvent
+import japgolly.scalajs.react.facade.SyntheticEvent
 
 package object lab {
   type Handler1[A]                              = A => Callback
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -4,10 +4,10 @@ import org.portablescala.sbtplatformdeps.PlatformDepsPlugin.autoImport._
 object Dependencies {
 
   object Versions {
-    val catsCoreV = "2.7.0"
-    val scalaCssV = "0.7.0"
-    val scalaJsDomV = "1.2.0"
-    val scalaJsReactV = "1.7.7"
+    val catsCoreV = "2.6.1"
+    val scalaCssV = "1.0.0"
+    val scalaJsDomV = "2.0.0"
+    val scalaJsReactV = "2.0.0"
   }
 
   import Versions._
diff --git a/project/DependenciesNPM.scala b/project/DependenciesNPM.scala
@@ -1,8 +1,8 @@
 object DependenciesNPM {
 
   object Versions {
-    val reactV = "16.13.1"
-    val reactSwipeableViewsV = "0.13.9"
+    val reactV = "17.0.2"
+    val reactSwipeableViewsV = "0.14.0"
   }
 
   import Versions._
@@ -15,8 +15,9 @@ object DependenciesNPM {
   val reactDom                      = "react-dom"                          -> reactV
   val reactSwipeableViews           = "react-swipeable-views"              -> reactSwipeableViewsV
   val reactSwipeableViewsUtils      = "react-swipeable-views-utils"        -> reactSwipeableViewsV
-  val typesReact                    = "@types/react"                       -> "16.9.42"
-  val typesReactDom                 = "@types/react-dom"                   -> "16.9.8"
-  val typesReactSwipeableViews      = "@types/react-swipeable-views"       -> "0.13.0"
-  val typesReactSwipeableViewsUtils = "@types/react-swipeable-views-utils" -> "0.13.2"
+  val typesReact                    = "@types/react"                       -> "17.0.38"
+  val typesReactDom                 = "@types/react-dom"                   -> "17.0.11"
+  val typesReactSwipeableViews      = "@types/react-swipeable-views"       -> "0.13.1"
+  val typesReactSwipeableViewsUtils = "@types/react-swipeable-views-utils" -> "0.13.3"
+
 }
diff --git a/project/Modules.scala b/project/Modules.scala
@@ -68,11 +68,11 @@ object Modules {
     .settings(
       scalaJSUseMainModuleInitializer := true,
       scalaJSLinkerConfig ~= (_.withSourceMap(false)),
-      webpackDevServerExtraArgs := Seq("--inline"),
+      fastOptJS / webpackDevServerExtraArgs := Seq("--hot"),
       yarnExtraArgs := Seq("--silent"),
       fastOptJS / webpackConfigFile := Some(baseDirectory.value / "dev.webpack.config.js"),
       stUseScalaJsDom := false,
-      stFlavour := Flavour.Japgolly,
+      stFlavour := Flavour.ScalajsReact,
       stIgnore ++= List(
         "react-dom",
         "@material-ui/core",
@@ -106,7 +106,7 @@ object Modules {
         DependenciesNPM.typesReact,
         DependenciesNPM.typesReactDom
       ),
-      Compile / npmResolutions ++= (Compile / npmDependencies).value.toMap,
+      Compile / npmResolutions ++= (Compile / npmDependencies).value.toMap
     )
     .settings(publish / skip := true)
 
diff --git a/project/ProjectSettings.scala b/project/ProjectSettings.scala
@@ -12,13 +12,13 @@ object ProjectSettings {
   lazy val commonProfile: Project => Project = _
     .enablePlugins(ScalaJSBundlerPlugin, ScalafixPlugin)
     .settings(
-      crossScalaVersions := Seq("2.12.15", "2.13.7"),
+      crossScalaVersions := Seq("2.13.7"),
       scalaVersion := crossScalaVersions.value.last,
       webpackBundlingMode := BundlingMode.LibraryOnly(),
       useYarn := true,
-      webpack / version := "4.41.5",
-      startWebpackDevServer / version := "3.10.2",
-      webpackCliVersion := "3.3.10",
+      webpack / version := "5.65.0",
+      startWebpackDevServer / version := "4.7.2",
+      webpackCliVersion := "4.9.1",
       scalacOptions ~= (_.filterNot(
         Set(
           "-Wdead-code",
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,10 +1,10 @@
 val scalaJSVersion = Option(System.getenv("SCALAJS_VERSION")).getOrElse("1.8.0")
 
-addSbtPlugin("org.scalablytyped.converter" % "sbt-converter" % "1.0.0-beta33")
+addSbtPlugin("org.scalablytyped.converter" % "sbt-converter" % "1.0.0-beta37")
 
 addSbtPlugin("org.scala-js" % "sbt-scalajs" % scalaJSVersion)
 
-addSbtPlugin("ch.epfl.scala" % "sbt-scalajs-bundler" % "0.20.0")
+addSbtPlugin("ch.epfl.scala" % "sbt-scalajs-bundler" % "0.21.0-RC1")
 
 addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.1.20")
 
diff --git a/utils/bridge/src/main/scala/io/kinoplan/scalajs/react/bridge/package.scala b/utils/bridge/src/main/scala/io/kinoplan/scalajs/react/bridge/package.scala
@@ -8,8 +8,8 @@ import scala.scalajs.js.JSConverters._
 
 import japgolly.scalajs.react.{CallbackTo, Children, CtorType}
 import japgolly.scalajs.react.component.Js
-import japgolly.scalajs.react.raw.React
-import japgolly.scalajs.react.vdom.{TagMod, VdomElement, VdomNode}
+import japgolly.scalajs.react.facade.React
+import japgolly.scalajs.react.vdom.{TagMod, VdomBuilder, VdomElement, VdomNode}
 import japgolly.scalajs.react.vdom.Implicits._
 
 package object bridge extends GeneratedImplicits {
@@ -89,7 +89,7 @@ package object bridge extends GeneratedImplicits {
   type JsComponentType = Js.ComponentSimple[Object, CtorType.Summoner.Aux[Object, Children.Varargs, CtorType.PropsAndChildren]#CT, Js.UnmountedWithRawType[Object, Null, Js.RawMounted[Object, Null]]]
 
   def extractPropsAndChildren(attrAndChildren: Seq[TagMod]): (js.Object, List[VdomNode]) = {
-    val b = new japgolly.scalajs.react.vdom.Builder.ToJs {}
+    val b = new VdomBuilder.ToJs {}
     attrAndChildren.toTagMod.applyTo(b)
     b.addClassNameToProps()
     b.addStyleToProps()
