Merge pull request #271 from cquiroz/next-lib

Upgrade scalajs-react
cquiroz · Jul 21, 2021 · 7c3346d · 7c3346d
2 parents 534707f + 5fd2b7b
commit 7c3346d
Show file tree

Hide file tree

Showing 315 changed files with 4,034 additions and 4,351 deletions.
diff --git a/build.sbt b/build.sbt
@@ -1,10 +1,9 @@
 import org.scalajs.linker.interface.ModuleSplitStyle
 
-val reactJS      = "16.13.1"
-val scalaJsReact = "1.7.7"
+val reactJS      = "17.0.2"
+val scalaJsReact = "2.0.0-RC2"
 val FUILess      = "2.8.7"
 val reactSUI     = "2.0.3"
-val Toasts       = "0.6.5"
 
 cancelable in Global := true
 
@@ -87,16 +86,14 @@ lazy val facade =
         "react"                 -> reactJS,
         "react-dom"             -> reactJS,
         "semantic-ui-react"     -> reactSUI,
-        "react-semantic-toasts" -> Toasts,
         "chokidar"              -> "3.4.2"
       ),
       libraryDependencies ++= Seq(
         "com.github.japgolly.scalajs-react" %%% "core"      % scalaJsReact,
         "com.github.japgolly.scalajs-react" %%% "extra"     % scalaJsReact,
         "com.github.japgolly.scalajs-react" %%% "test"      % scalaJsReact % Test,
-        "io.github.cquiroz.react"           %%% "common"    % "0.11.3",
+        "io.github.cquiroz.react"           %%% "common"    % "0.13.0",
         "org.scalameta"                     %%% "munit"     % "0.7.27"     % Test,
-        "com.lihaoyi"                       %%% "utest"     % "0.7.10"      % Test,
         "org.typelevel"                     %%% "cats-core" % "2.6.1"      % Test
       ),
       Test / webpackConfigFile := Some(baseDirectory.value / "test.webpack.config.js"),

diff --git a/demo/package.json b/demo/package.json
@@ -5,8 +5,8 @@
   "license": "MIT",
   "dependencies": {
     "fomantic-ui-less": "^2.8.7",
-    "react": "^16.3.1",
-    "react-dom": "16.3.1",
+    "react": "^17.0.2",
+    "react-dom": "^17.0.2",
     "react-semantic-toasts": "^0.6.5",
     "semantic-ui-react": "^2.0.3"
   },

diff --git a/demo/src/main/scala/react/semanticui/demo/HomeComponent.scala b/demo/src/main/scala/react/semanticui/demo/HomeComponent.scala
@@ -2,8 +2,6 @@ package react.semanticui.demo
 
 import japgolly.scalajs.react._
 import japgolly.scalajs.react.vdom.html_<^._
-import react.semanticui.toasts._
-import react.semanticui.elements.button.Button
 
 object HomeComponent {
   private val component =
@@ -33,11 +31,7 @@ object HomeComponent {
                 "Semantic React UI"
               )
             )
-          ),
-          Button(onClick = toastCB(ToastOptions("Greetings"), onClose = Callback.log("here")))(
-            "Toast"
-          ),
-          SemanticToastContainer()
+          )
         )
       }
       .build

diff --git a/demo/src/main/scala/react/semanticui/demo/elements/LabelsComponent.scala b/demo/src/main/scala/react/semanticui/demo/elements/LabelsComponent.scala
@@ -2,6 +2,7 @@ package react.semanticui.demo
 
 import japgolly.scalajs.react._
 import japgolly.scalajs.react.vdom.html_<^._
+import react.common.syntax.all._
 import react.semanticui.elements.icon._
 import react.semanticui.elements.label.Label
 import react.semanticui.elements.label.LabelDetail

diff --git a/facade/src/main/scala/react/semanticui/addons/portal/Portal.scala b/facade/src/main/scala/react/semanticui/addons/portal/Portal.scala
@@ -3,9 +3,9 @@ package react.semanticui.addons.portal
 import scala.scalajs.js
 import js.annotation._
 import japgolly.scalajs.react._
-import japgolly.scalajs.react.raw.JsNumber
+import japgolly.scalajs.react.facade.JsNumber
 import japgolly.scalajs.react.vdom.VdomNode
-import japgolly.scalajs.react.raw.React
+import japgolly.scalajs.react.facade.React
 import react.common._
 import japgolly.scalajs.react.vdom.TagMod
 

diff --git a/facade/src/main/scala/react/semanticui/addons/portal/PortalInner.scala b/facade/src/main/scala/react/semanticui/addons/portal/PortalInner.scala
@@ -4,7 +4,7 @@ import scala.scalajs.js
 import js.annotation._
 import japgolly.scalajs.react._
 // import japgolly.scalajs.react.Ref
-import japgolly.scalajs.react.raw.React
+import japgolly.scalajs.react.facade.React
 import react.common._
 import japgolly.scalajs.react.vdom.TagMod
 

diff --git a/facade/src/main/scala/react/semanticui/addons/radio/Radio.scala b/facade/src/main/scala/react/semanticui/addons/radio/Radio.scala
@@ -4,7 +4,7 @@ import scala.scalajs.js
 import js.annotation._
 import js.|
 import japgolly.scalajs.react._
-import japgolly.scalajs.react.raw.JsNumber
+import japgolly.scalajs.react.facade.JsNumber
 import react.common._
 import react.semanticui._
 import react.semanticui.modules.checkbox._

diff --git a/facade/src/main/scala/react/semanticui/addons/select/Select.scala b/facade/src/main/scala/react/semanticui/addons/select/Select.scala
@@ -1,7 +1,7 @@
 package react.semanticui.addons.select
 
 import japgolly.scalajs.react._
-import japgolly.scalajs.react.raw.JsNumber
+import japgolly.scalajs.react.facade.JsNumber
 import japgolly.scalajs.react.vdom.TagMod
 import japgolly.scalajs.react.vdom.VdomNode
 import scala.scalajs.js

diff --git a/facade/src/main/scala/react/semanticui/addons/textarea/TextArea.scala b/facade/src/main/scala/react/semanticui/addons/textarea/TextArea.scala
@@ -4,7 +4,7 @@ import scala.scalajs.js
 import js.annotation._
 import js.|
 import japgolly.scalajs.react._
-import japgolly.scalajs.react.raw.JsNumber
+import japgolly.scalajs.react.facade.JsNumber
 import japgolly.scalajs.react.vdom.TagMod
 import react.common._
 import react.semanticui._

diff --git a/facade/src/main/scala/react/semanticui/collections/form/Form.scala b/facade/src/main/scala/react/semanticui/collections/form/Form.scala
@@ -3,7 +3,7 @@ package react.semanticui.collections.form
 import scala.scalajs.js
 import js.annotation._
 import japgolly.scalajs.react._
-import japgolly.scalajs.react.raw.React
+import japgolly.scalajs.react.facade.React
 import react.common._
 import react.semanticui._
 import react.semanticui.{ raw => suiraw }

diff --git a/facade/src/main/scala/react/semanticui/collections/form/FormButton.scala b/facade/src/main/scala/react/semanticui/collections/form/FormButton.scala
@@ -4,7 +4,7 @@ import scala.scalajs.js
 import scala.scalajs.js.|
 import js.annotation._
 import japgolly.scalajs.react._
-import japgolly.scalajs.react.raw.React
+import japgolly.scalajs.react.facade.React
 import react.common._
 import react.semanticui._
 import react.semanticui.elements.label.Label

diff --git a/facade/src/main/scala/react/semanticui/collections/form/FormCheckbox.scala b/facade/src/main/scala/react/semanticui/collections/form/FormCheckbox.scala
@@ -4,8 +4,8 @@ import scala.scalajs.js
 import scala.scalajs.js.|
 import js.annotation._
 import japgolly.scalajs.react._
-import japgolly.scalajs.react.raw.React
-import japgolly.scalajs.react.raw.JsNumber
+import japgolly.scalajs.react.facade.React
+import japgolly.scalajs.react.facade.JsNumber
 import react.common._
 import react.semanticui._
 import react.semanticui.elements.label.Label

diff --git a/facade/src/main/scala/react/semanticui/collections/form/FormDropdown.scala b/facade/src/main/scala/react/semanticui/collections/form/FormDropdown.scala
@@ -11,8 +11,8 @@ import react.semanticui.elements.label.Label
 import react.semanticui.elements.icon.Icon
 import react.semanticui.modules.dropdown._
 import react.semanticui.{ raw => suiraw }
-import japgolly.scalajs.react.raw.React
-import japgolly.scalajs.react.raw.JsNumber
+import japgolly.scalajs.react.facade.React
+import japgolly.scalajs.react.facade.JsNumber
 import japgolly.scalajs.react.vdom.TagMod
 import japgolly.scalajs.react.vdom.VdomNode
 

diff --git a/facade/src/main/scala/react/semanticui/collections/form/FormGroup.scala b/facade/src/main/scala/react/semanticui/collections/form/FormGroup.scala
@@ -4,7 +4,7 @@ import scala.scalajs.js
 import js.|
 import js.annotation._
 import japgolly.scalajs.react._
-import japgolly.scalajs.react.raw.React
+import japgolly.scalajs.react.facade.React
 import react.common._
 import react.semanticui._
 import react.semanticui.{ raw => suiraw }

diff --git a/facade/src/main/scala/react/semanticui/collections/form/FormInput.scala b/facade/src/main/scala/react/semanticui/collections/form/FormInput.scala
@@ -4,8 +4,8 @@ import scala.scalajs.js
 import scala.scalajs.js.|
 import js.annotation._
 import japgolly.scalajs.react._
-import japgolly.scalajs.react.raw.React
-import japgolly.scalajs.react.raw.JsNumber
+import japgolly.scalajs.react.facade.React
+import japgolly.scalajs.react.facade.JsNumber
 import react.common._
 import react.semanticui._
 import react.semanticui.elements.label.Label

diff --git a/facade/src/main/scala/react/semanticui/collections/form/FormSelect.scala b/facade/src/main/scala/react/semanticui/collections/form/FormSelect.scala
@@ -10,7 +10,7 @@ import react.semanticui._
 import react.semanticui.elements.label.Label
 import react.semanticui.elements.icon.Icon
 import react.semanticui.{ raw => suiraw }
-import japgolly.scalajs.react.raw.JsNumber
+import japgolly.scalajs.react.facade.JsNumber
 import japgolly.scalajs.react.vdom.TagMod
 import japgolly.scalajs.react.vdom.VdomNode
 import react.semanticui.addons.select.Select

diff --git a/facade/src/main/scala/react/semanticui/collections/form/FormTextArea.scala b/facade/src/main/scala/react/semanticui/collections/form/FormTextArea.scala
@@ -10,7 +10,7 @@ import react.semanticui.elements.label.Label
 import react.semanticui.{ raw => suiraw }
 import react.semanticui.addons.textarea.TextArea
 import japgolly.scalajs.react.vdom.TagMod
-import japgolly.scalajs.react.raw.JsNumber
+import japgolly.scalajs.react.facade.JsNumber
 import japgolly.scalajs.react.vdom.VdomNode
 
 final case class FormTextArea(

diff --git a/facade/src/main/scala/react/semanticui/collections/grid/Grid.scala b/facade/src/main/scala/react/semanticui/collections/grid/Grid.scala
@@ -4,7 +4,7 @@ import scala.scalajs.js
 import js.annotation._
 import js.|
 import japgolly.scalajs.react._
-import japgolly.scalajs.react.raw.React
+import japgolly.scalajs.react.facade.React
 import react.common._
 import react.semanticui._
 import react.semanticui.{ raw => suiraw }

diff --git a/facade/src/main/scala/react/semanticui/collections/grid/GridColumn.scala b/facade/src/main/scala/react/semanticui/collections/grid/GridColumn.scala
@@ -3,7 +3,7 @@ package react.semanticui.collections.grid
 import scala.scalajs.js
 import js.annotation._
 import japgolly.scalajs.react._
-import japgolly.scalajs.react.raw.React
+import japgolly.scalajs.react.facade.React
 import react.common._
 import react.semanticui._
 import react.semanticui.{ raw => suiraw }

diff --git a/facade/src/main/scala/react/semanticui/collections/grid/GridRow.scala b/facade/src/main/scala/react/semanticui/collections/grid/GridRow.scala
@@ -4,7 +4,7 @@ import scala.scalajs.js
 import js.annotation._
 import js.|
 import japgolly.scalajs.react._
-import japgolly.scalajs.react.raw.React
+import japgolly.scalajs.react.facade.React
 import react.common._
 import react.semanticui._
 import react.semanticui.{ raw => suiraw }

diff --git a/facade/src/main/scala/react/semanticui/collections/menu/Menu.scala b/facade/src/main/scala/react/semanticui/collections/menu/Menu.scala
@@ -4,7 +4,7 @@ import scala.scalajs.js
 import scala.scalajs.js.|
 import js.annotation._
 import japgolly.scalajs.react._
-import japgolly.scalajs.react.raw.React
+import japgolly.scalajs.react.facade.React
 import react.common._
 import react.semanticui._
 import react.semanticui.{ raw => suiraw }

diff --git a/facade/src/main/scala/react/semanticui/collections/menu/MenuHeader.scala b/facade/src/main/scala/react/semanticui/collections/menu/MenuHeader.scala
@@ -3,7 +3,7 @@ package react.semanticui.collections.menu
 import scala.scalajs.js
 import js.annotation._
 import japgolly.scalajs.react._
-import japgolly.scalajs.react.raw.React
+import japgolly.scalajs.react.facade.React
 import react.common._
 import react.semanticui._
 import react.semanticui.{ raw => suiraw }

diff --git a/facade/src/main/scala/react/semanticui/collections/menu/MenuItem.scala b/facade/src/main/scala/react/semanticui/collections/menu/MenuItem.scala
@@ -4,7 +4,7 @@ import scala.scalajs.js
 import scala.scalajs.js.|
 import js.annotation._
 import japgolly.scalajs.react._
-import japgolly.scalajs.react.raw.React
+import japgolly.scalajs.react.facade.React
 import react.common._
 import react.semanticui._
 import react.semanticui.{ raw => suiraw }

diff --git a/facade/src/main/scala/react/semanticui/collections/menu/MenuMenu.scala b/facade/src/main/scala/react/semanticui/collections/menu/MenuMenu.scala
@@ -3,7 +3,7 @@ package react.semanticui.collections.menu
 import scala.scalajs.js
 import js.annotation._
 import japgolly.scalajs.react._
-import japgolly.scalajs.react.raw.React
+import japgolly.scalajs.react.facade.React
 import react.common._
 import react.semanticui._
 import react.semanticui.{ raw => suiraw }

diff --git a/facade/src/main/scala/react/semanticui/collections/message/Message.scala b/facade/src/main/scala/react/semanticui/collections/message/Message.scala
@@ -5,7 +5,7 @@ import js.|
 import js.annotation._
 import js.JSConverters._
 import japgolly.scalajs.react._
-import japgolly.scalajs.react.raw.React
+import japgolly.scalajs.react.facade.React
 import react.common._
 import react.semanticui._
 import react.semanticui.{ raw => suiraw }

diff --git a/facade/src/main/scala/react/semanticui/collections/message/MessageContent.scala b/facade/src/main/scala/react/semanticui/collections/message/MessageContent.scala
@@ -3,7 +3,7 @@ package react.semanticui.collections.message
 import scala.scalajs.js
 import js.annotation._
 import japgolly.scalajs.react._
-import japgolly.scalajs.react.raw.React
+import japgolly.scalajs.react.facade.React
 import react.common._
 import react.semanticui._
 import react.semanticui.{ raw => suiraw }

diff --git a/facade/src/main/scala/react/semanticui/collections/message/MessageHeader.scala b/facade/src/main/scala/react/semanticui/collections/message/MessageHeader.scala
@@ -3,7 +3,7 @@ package react.semanticui.collections.message
 import scala.scalajs.js
 import js.annotation._
 import japgolly.scalajs.react._
-import japgolly.scalajs.react.raw.React
+import japgolly.scalajs.react.facade.React
 import react.common._
 import react.semanticui._
 import react.semanticui.{ raw => suiraw }

diff --git a/facade/src/main/scala/react/semanticui/collections/message/MessageItem.scala b/facade/src/main/scala/react/semanticui/collections/message/MessageItem.scala
@@ -3,7 +3,7 @@ package react.semanticui.collections.message
 import scala.scalajs.js
 import js.annotation._
 import japgolly.scalajs.react._
-import japgolly.scalajs.react.raw.React
+import japgolly.scalajs.react.facade.React
 import react.common._
 import react.semanticui._
 import react.semanticui.{ raw => suiraw }

diff --git a/facade/src/main/scala/react/semanticui/collections/message/MessageList.scala b/facade/src/main/scala/react/semanticui/collections/message/MessageList.scala
@@ -3,7 +3,7 @@ package react.semanticui.collections.message
 import scala.scalajs.js
 import js.annotation._
 import japgolly.scalajs.react._
-import japgolly.scalajs.react.raw.React
+import japgolly.scalajs.react.facade.React
 import react.common._
 import react.semanticui._
 import react.semanticui.{ raw => suiraw }

diff --git a/facade/src/main/scala/react/semanticui/collections/table/Table.scala b/facade/src/main/scala/react/semanticui/collections/table/Table.scala
@@ -4,7 +4,7 @@ import scala.scalajs.js
 import js.annotation._
 import js.|
 import japgolly.scalajs.react._
-import japgolly.scalajs.react.raw.React
+import japgolly.scalajs.react.facade.React
 import japgolly.scalajs.react.vdom.html_<^._
 import react.common._
 import react.semanticui.{ raw => suiraw }

diff --git a/facade/src/main/scala/react/semanticui/collections/table/TableBody.scala b/facade/src/main/scala/react/semanticui/collections/table/TableBody.scala
@@ -3,7 +3,7 @@ package react.semanticui.collections.table
 import scala.scalajs.js
 import js.annotation._
 import japgolly.scalajs.react._
-import japgolly.scalajs.react.raw.React
+import japgolly.scalajs.react.facade.React
 import japgolly.scalajs.react.vdom.html_<^._
 import react.common._
 import react.semanticui._

diff --git a/facade/src/main/scala/react/semanticui/collections/table/TableCell.scala b/facade/src/main/scala/react/semanticui/collections/table/TableCell.scala
@@ -3,7 +3,7 @@ package react.semanticui.collections.table
 import scala.scalajs.js
 import js.annotation._
 import japgolly.scalajs.react._
-import japgolly.scalajs.react.raw.React
+import japgolly.scalajs.react.facade.React
 import japgolly.scalajs.react.vdom.html_<^._
 import react.common._
 import react.semanticui.elements.icon.Icon

diff --git a/facade/src/main/scala/react/semanticui/collections/table/TableFooter.scala b/facade/src/main/scala/react/semanticui/collections/table/TableFooter.scala
@@ -3,7 +3,7 @@ package react.semanticui.collections.table
 import scala.scalajs.js
 import js.annotation._
 import japgolly.scalajs.react._
-import japgolly.scalajs.react.raw.React
+import japgolly.scalajs.react.facade.React
 import japgolly.scalajs.react.vdom.html_<^._
 import japgolly.scalajs.react.vdom.VdomNode
 import react.common._

diff --git a/facade/src/main/scala/react/semanticui/collections/table/TableHeader.scala b/facade/src/main/scala/react/semanticui/collections/table/TableHeader.scala
@@ -3,7 +3,7 @@ package react.semanticui.collections.table
 import scala.scalajs.js
 import js.annotation._
 import japgolly.scalajs.react._
-import japgolly.scalajs.react.raw.React
+import japgolly.scalajs.react.facade.React
 import japgolly.scalajs.react.vdom.html_<^._
 import japgolly.scalajs.react.vdom.VdomNode
 import react.common._

diff --git a/facade/src/main/scala/react/semanticui/collections/table/TableHeaderCell.scala b/facade/src/main/scala/react/semanticui/collections/table/TableHeaderCell.scala
@@ -3,7 +3,7 @@ package react.semanticui.collections.table
 import scala.scalajs.js
 import js.annotation._
 import japgolly.scalajs.react._
-import japgolly.scalajs.react.raw.React
+import japgolly.scalajs.react.facade.React
 import japgolly.scalajs.react.vdom.html_<^._
 import react.common._
 import react.semanticui.elements.icon.Icon

diff --git a/facade/src/main/scala/react/semanticui/collections/table/TableRow.scala b/facade/src/main/scala/react/semanticui/collections/table/TableRow.scala
@@ -5,7 +5,7 @@ import js.annotation._
 import js.|
 import js.JSConverters._
 import japgolly.scalajs.react._
-import japgolly.scalajs.react.raw.React
+import japgolly.scalajs.react.facade.React
 import japgolly.scalajs.react.vdom.html_<^._
 import react.common._
 import react.semanticui.{ raw => suiraw }

diff --git a/facade/src/main/scala/react/semanticui/elements/button/Button.scala b/facade/src/main/scala/react/semanticui/elements/button/Button.scala
@@ -4,7 +4,7 @@ import scala.scalajs.js
 import js.annotation._
 import js.|
 import japgolly.scalajs.react._
-import japgolly.scalajs.react.raw.React
+import japgolly.scalajs.react.facade.React
 import react.common._
 import react.semanticui.{ raw => suiraw }
 import react.semanticui._

diff --git a/facade/src/main/scala/react/semanticui/elements/button/ButtonContent.scala b/facade/src/main/scala/react/semanticui/elements/button/ButtonContent.scala
@@ -3,7 +3,7 @@ package react.semanticui.elements.button
 import scala.scalajs.js
 import js.annotation._
 import japgolly.scalajs.react._
-import japgolly.scalajs.react.raw.React
+import japgolly.scalajs.react.facade.React
 import react.common._
 import react.semanticui._
 import react.semanticui.{ raw => suiraw }

diff --git a/facade/src/main/scala/react/semanticui/elements/button/ButtonGroup.scala b/facade/src/main/scala/react/semanticui/elements/button/ButtonGroup.scala
@@ -5,7 +5,7 @@ import js.annotation._
 import js.|
 import js.JSConverters._
 import japgolly.scalajs.react._
-import japgolly.scalajs.react.raw.React
+import japgolly.scalajs.react.facade.React
 import japgolly.scalajs.react.vdom.VdomNode
 import react.common._
 import react.semanticui.{ raw => suiraw }