Skip to content
This repository was archived by the owner on Feb 10, 2023. It is now read-only.

Commit 7c3346d

Browse files
cquirozcquiroz
authored
Merge pull request #271 from cquiroz/next-lib
Upgrade scalajs-react
2 parents 534707f + 5fd2b7b commit 7c3346d

File tree

315 files changed

+4034
-4351
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

315 files changed

+4034
-4351
lines changed

‎build.sbt

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
import org.scalajs.linker.interface.ModuleSplitStyle
22

3-
val reactJS = "16.13.1"
4-
val scalaJsReact = "1.7.7"
3+
val reactJS = "17.0.2"
4+
val scalaJsReact = "2.0.0-RC2"
55
val FUILess = "2.8.7"
66
val reactSUI = "2.0.3"
7-
val Toasts = "0.6.5"
87

98
cancelable in Global := true
109

@@ -87,16 +86,14 @@ lazy val facade =
8786
"react" -> reactJS,
8887
"react-dom" -> reactJS,
8988
"semantic-ui-react" -> reactSUI,
90-
"react-semantic-toasts" -> Toasts,
9189
"chokidar" -> "3.4.2"
9290
),
9391
libraryDependencies ++= Seq(
9492
"com.github.japgolly.scalajs-react" %%% "core" % scalaJsReact,
9593
"com.github.japgolly.scalajs-react" %%% "extra" % scalaJsReact,
9694
"com.github.japgolly.scalajs-react" %%% "test" % scalaJsReact % Test,
97-
"io.github.cquiroz.react" %%% "common" % "0.11.3",
95+
"io.github.cquiroz.react" %%% "common" % "0.13.0",
9896
"org.scalameta" %%% "munit" % "0.7.27" % Test,
99-
"com.lihaoyi" %%% "utest" % "0.7.10" % Test,
10097
"org.typelevel" %%% "cats-core" % "2.6.1" % Test
10198
),
10299
Test / webpackConfigFile := Some(baseDirectory.value / "test.webpack.config.js"),

‎demo/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
"license": "MIT",
66
"dependencies": {
77
"fomantic-ui-less": "^2.8.7",
8-
"react": "^16.3.1",
9-
"react-dom": "16.3.1",
8+
"react": "^17.0.2",
9+
"react-dom": "^17.0.2",
1010
"react-semantic-toasts": "^0.6.5",
1111
"semantic-ui-react": "^2.0.3"
1212
},

‎demo/src/main/scala/react/semanticui/demo/HomeComponent.scala

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@ package react.semanticui.demo
22

33
import japgolly.scalajs.react._
44
import japgolly.scalajs.react.vdom.html_<^._
5-
import react.semanticui.toasts._
6-
import react.semanticui.elements.button.Button
75

86
object HomeComponent {
97
private val component =
@@ -33,11 +31,7 @@ object HomeComponent {
3331
"Semantic React UI"
3432
)
3533
)
36-
),
37-
Button(onClick = toastCB(ToastOptions("Greetings"), onClose = Callback.log("here")))(
38-
"Toast"
39-
),
40-
SemanticToastContainer()
34+
)
4135
)
4236
}
4337
.build

‎demo/src/main/scala/react/semanticui/demo/elements/LabelsComponent.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package react.semanticui.demo
22

33
import japgolly.scalajs.react._
44
import japgolly.scalajs.react.vdom.html_<^._
5+
import react.common.syntax.all._
56
import react.semanticui.elements.icon._
67
import react.semanticui.elements.label.Label
78
import react.semanticui.elements.label.LabelDetail

‎facade/src/main/scala/react/semanticui/addons/portal/Portal.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ package react.semanticui.addons.portal
33
import scala.scalajs.js
44
import js.annotation._
55
import japgolly.scalajs.react._
6-
import japgolly.scalajs.react.raw.JsNumber
6+
import japgolly.scalajs.react.facade.JsNumber
77
import japgolly.scalajs.react.vdom.VdomNode
8-
import japgolly.scalajs.react.raw.React
8+
import japgolly.scalajs.react.facade.React
99
import react.common._
1010
import japgolly.scalajs.react.vdom.TagMod
1111

‎facade/src/main/scala/react/semanticui/addons/portal/PortalInner.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import scala.scalajs.js
44
import js.annotation._
55
import japgolly.scalajs.react._
66
// import japgolly.scalajs.react.Ref
7-
import japgolly.scalajs.react.raw.React
7+
import japgolly.scalajs.react.facade.React
88
import react.common._
99
import japgolly.scalajs.react.vdom.TagMod
1010

‎facade/src/main/scala/react/semanticui/addons/radio/Radio.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import scala.scalajs.js
44
import js.annotation._
55
import js.|
66
import japgolly.scalajs.react._
7-
import japgolly.scalajs.react.raw.JsNumber
7+
import japgolly.scalajs.react.facade.JsNumber
88
import react.common._
99
import react.semanticui._
1010
import react.semanticui.modules.checkbox._

‎facade/src/main/scala/react/semanticui/addons/select/Select.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package react.semanticui.addons.select
22

33
import japgolly.scalajs.react._
4-
import japgolly.scalajs.react.raw.JsNumber
4+
import japgolly.scalajs.react.facade.JsNumber
55
import japgolly.scalajs.react.vdom.TagMod
66
import japgolly.scalajs.react.vdom.VdomNode
77
import scala.scalajs.js

‎facade/src/main/scala/react/semanticui/addons/textarea/TextArea.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import scala.scalajs.js
44
import js.annotation._
55
import js.|
66
import japgolly.scalajs.react._
7-
import japgolly.scalajs.react.raw.JsNumber
7+
import japgolly.scalajs.react.facade.JsNumber
88
import japgolly.scalajs.react.vdom.TagMod
99
import react.common._
1010
import react.semanticui._

‎facade/src/main/scala/react/semanticui/collections/form/Form.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package react.semanticui.collections.form
33
import scala.scalajs.js
44
import js.annotation._
55
import japgolly.scalajs.react._
6-
import japgolly.scalajs.react.raw.React
6+
import japgolly.scalajs.react.facade.React
77
import react.common._
88
import react.semanticui._
99
import react.semanticui.{ raw => suiraw }

‎facade/src/main/scala/react/semanticui/collections/form/FormButton.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import scala.scalajs.js
44
import scala.scalajs.js.|
55
import js.annotation._
66
import japgolly.scalajs.react._
7-
import japgolly.scalajs.react.raw.React
7+
import japgolly.scalajs.react.facade.React
88
import react.common._
99
import react.semanticui._
1010
import react.semanticui.elements.label.Label

‎facade/src/main/scala/react/semanticui/collections/form/FormCheckbox.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import scala.scalajs.js
44
import scala.scalajs.js.|
55
import js.annotation._
66
import japgolly.scalajs.react._
7-
import japgolly.scalajs.react.raw.React
8-
import japgolly.scalajs.react.raw.JsNumber
7+
import japgolly.scalajs.react.facade.React
8+
import japgolly.scalajs.react.facade.JsNumber
99
import react.common._
1010
import react.semanticui._
1111
import react.semanticui.elements.label.Label

‎facade/src/main/scala/react/semanticui/collections/form/FormDropdown.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ import react.semanticui.elements.label.Label
1111
import react.semanticui.elements.icon.Icon
1212
import react.semanticui.modules.dropdown._
1313
import react.semanticui.{ raw => suiraw }
14-
import japgolly.scalajs.react.raw.React
15-
import japgolly.scalajs.react.raw.JsNumber
14+
import japgolly.scalajs.react.facade.React
15+
import japgolly.scalajs.react.facade.JsNumber
1616
import japgolly.scalajs.react.vdom.TagMod
1717
import japgolly.scalajs.react.vdom.VdomNode
1818

‎facade/src/main/scala/react/semanticui/collections/form/FormGroup.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import scala.scalajs.js
44
import js.|
55
import js.annotation._
66
import japgolly.scalajs.react._
7-
import japgolly.scalajs.react.raw.React
7+
import japgolly.scalajs.react.facade.React
88
import react.common._
99
import react.semanticui._
1010
import react.semanticui.{ raw => suiraw }

‎facade/src/main/scala/react/semanticui/collections/form/FormInput.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import scala.scalajs.js
44
import scala.scalajs.js.|
55
import js.annotation._
66
import japgolly.scalajs.react._
7-
import japgolly.scalajs.react.raw.React
8-
import japgolly.scalajs.react.raw.JsNumber
7+
import japgolly.scalajs.react.facade.React
8+
import japgolly.scalajs.react.facade.JsNumber
99
import react.common._
1010
import react.semanticui._
1111
import react.semanticui.elements.label.Label

‎facade/src/main/scala/react/semanticui/collections/form/FormSelect.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import react.semanticui._
1010
import react.semanticui.elements.label.Label
1111
import react.semanticui.elements.icon.Icon
1212
import react.semanticui.{ raw => suiraw }
13-
import japgolly.scalajs.react.raw.JsNumber
13+
import japgolly.scalajs.react.facade.JsNumber
1414
import japgolly.scalajs.react.vdom.TagMod
1515
import japgolly.scalajs.react.vdom.VdomNode
1616
import react.semanticui.addons.select.Select

‎facade/src/main/scala/react/semanticui/collections/form/FormTextArea.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import react.semanticui.elements.label.Label
1010
import react.semanticui.{ raw => suiraw }
1111
import react.semanticui.addons.textarea.TextArea
1212
import japgolly.scalajs.react.vdom.TagMod
13-
import japgolly.scalajs.react.raw.JsNumber
13+
import japgolly.scalajs.react.facade.JsNumber
1414
import japgolly.scalajs.react.vdom.VdomNode
1515

1616
final case class FormTextArea(

‎facade/src/main/scala/react/semanticui/collections/grid/Grid.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import scala.scalajs.js
44
import js.annotation._
55
import js.|
66
import japgolly.scalajs.react._
7-
import japgolly.scalajs.react.raw.React
7+
import japgolly.scalajs.react.facade.React
88
import react.common._
99
import react.semanticui._
1010
import react.semanticui.{ raw => suiraw }

‎facade/src/main/scala/react/semanticui/collections/grid/GridColumn.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package react.semanticui.collections.grid
33
import scala.scalajs.js
44
import js.annotation._
55
import japgolly.scalajs.react._
6-
import japgolly.scalajs.react.raw.React
6+
import japgolly.scalajs.react.facade.React
77
import react.common._
88
import react.semanticui._
99
import react.semanticui.{ raw => suiraw }

‎facade/src/main/scala/react/semanticui/collections/grid/GridRow.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import scala.scalajs.js
44
import js.annotation._
55
import js.|
66
import japgolly.scalajs.react._
7-
import japgolly.scalajs.react.raw.React
7+
import japgolly.scalajs.react.facade.React
88
import react.common._
99
import react.semanticui._
1010
import react.semanticui.{ raw => suiraw }

‎facade/src/main/scala/react/semanticui/collections/menu/Menu.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import scala.scalajs.js
44
import scala.scalajs.js.|
55
import js.annotation._
66
import japgolly.scalajs.react._
7-
import japgolly.scalajs.react.raw.React
7+
import japgolly.scalajs.react.facade.React
88
import react.common._
99
import react.semanticui._
1010
import react.semanticui.{ raw => suiraw }

‎facade/src/main/scala/react/semanticui/collections/menu/MenuHeader.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package react.semanticui.collections.menu
33
import scala.scalajs.js
44
import js.annotation._
55
import japgolly.scalajs.react._
6-
import japgolly.scalajs.react.raw.React
6+
import japgolly.scalajs.react.facade.React
77
import react.common._
88
import react.semanticui._
99
import react.semanticui.{ raw => suiraw }

‎facade/src/main/scala/react/semanticui/collections/menu/MenuItem.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import scala.scalajs.js
44
import scala.scalajs.js.|
55
import js.annotation._
66
import japgolly.scalajs.react._
7-
import japgolly.scalajs.react.raw.React
7+
import japgolly.scalajs.react.facade.React
88
import react.common._
99
import react.semanticui._
1010
import react.semanticui.{ raw => suiraw }

‎facade/src/main/scala/react/semanticui/collections/menu/MenuMenu.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package react.semanticui.collections.menu
33
import scala.scalajs.js
44
import js.annotation._
55
import japgolly.scalajs.react._
6-
import japgolly.scalajs.react.raw.React
6+
import japgolly.scalajs.react.facade.React
77
import react.common._
88
import react.semanticui._
99
import react.semanticui.{ raw => suiraw }

‎facade/src/main/scala/react/semanticui/collections/message/Message.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import js.|
55
import js.annotation._
66
import js.JSConverters._
77
import japgolly.scalajs.react._
8-
import japgolly.scalajs.react.raw.React
8+
import japgolly.scalajs.react.facade.React
99
import react.common._
1010
import react.semanticui._
1111
import react.semanticui.{ raw => suiraw }

‎facade/src/main/scala/react/semanticui/collections/message/MessageContent.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package react.semanticui.collections.message
33
import scala.scalajs.js
44
import js.annotation._
55
import japgolly.scalajs.react._
6-
import japgolly.scalajs.react.raw.React
6+
import japgolly.scalajs.react.facade.React
77
import react.common._
88
import react.semanticui._
99
import react.semanticui.{ raw => suiraw }

‎facade/src/main/scala/react/semanticui/collections/message/MessageHeader.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package react.semanticui.collections.message
33
import scala.scalajs.js
44
import js.annotation._
55
import japgolly.scalajs.react._
6-
import japgolly.scalajs.react.raw.React
6+
import japgolly.scalajs.react.facade.React
77
import react.common._
88
import react.semanticui._
99
import react.semanticui.{ raw => suiraw }

‎facade/src/main/scala/react/semanticui/collections/message/MessageItem.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package react.semanticui.collections.message
33
import scala.scalajs.js
44
import js.annotation._
55
import japgolly.scalajs.react._
6-
import japgolly.scalajs.react.raw.React
6+
import japgolly.scalajs.react.facade.React
77
import react.common._
88
import react.semanticui._
99
import react.semanticui.{ raw => suiraw }

‎facade/src/main/scala/react/semanticui/collections/message/MessageList.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package react.semanticui.collections.message
33
import scala.scalajs.js
44
import js.annotation._
55
import japgolly.scalajs.react._
6-
import japgolly.scalajs.react.raw.React
6+
import japgolly.scalajs.react.facade.React
77
import react.common._
88
import react.semanticui._
99
import react.semanticui.{ raw => suiraw }

‎facade/src/main/scala/react/semanticui/collections/table/Table.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import scala.scalajs.js
44
import js.annotation._
55
import js.|
66
import japgolly.scalajs.react._
7-
import japgolly.scalajs.react.raw.React
7+
import japgolly.scalajs.react.facade.React
88
import japgolly.scalajs.react.vdom.html_<^._
99
import react.common._
1010
import react.semanticui.{ raw => suiraw }

‎facade/src/main/scala/react/semanticui/collections/table/TableBody.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package react.semanticui.collections.table
33
import scala.scalajs.js
44
import js.annotation._
55
import japgolly.scalajs.react._
6-
import japgolly.scalajs.react.raw.React
6+
import japgolly.scalajs.react.facade.React
77
import japgolly.scalajs.react.vdom.html_<^._
88
import react.common._
99
import react.semanticui._

‎facade/src/main/scala/react/semanticui/collections/table/TableCell.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package react.semanticui.collections.table
33
import scala.scalajs.js
44
import js.annotation._
55
import japgolly.scalajs.react._
6-
import japgolly.scalajs.react.raw.React
6+
import japgolly.scalajs.react.facade.React
77
import japgolly.scalajs.react.vdom.html_<^._
88
import react.common._
99
import react.semanticui.elements.icon.Icon

‎facade/src/main/scala/react/semanticui/collections/table/TableFooter.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package react.semanticui.collections.table
33
import scala.scalajs.js
44
import js.annotation._
55
import japgolly.scalajs.react._
6-
import japgolly.scalajs.react.raw.React
6+
import japgolly.scalajs.react.facade.React
77
import japgolly.scalajs.react.vdom.html_<^._
88
import japgolly.scalajs.react.vdom.VdomNode
99
import react.common._

‎facade/src/main/scala/react/semanticui/collections/table/TableHeader.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package react.semanticui.collections.table
33
import scala.scalajs.js
44
import js.annotation._
55
import japgolly.scalajs.react._
6-
import japgolly.scalajs.react.raw.React
6+
import japgolly.scalajs.react.facade.React
77
import japgolly.scalajs.react.vdom.html_<^._
88
import japgolly.scalajs.react.vdom.VdomNode
99
import react.common._

‎facade/src/main/scala/react/semanticui/collections/table/TableHeaderCell.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package react.semanticui.collections.table
33
import scala.scalajs.js
44
import js.annotation._
55
import japgolly.scalajs.react._
6-
import japgolly.scalajs.react.raw.React
6+
import japgolly.scalajs.react.facade.React
77
import japgolly.scalajs.react.vdom.html_<^._
88
import react.common._
99
import react.semanticui.elements.icon.Icon

‎facade/src/main/scala/react/semanticui/collections/table/TableRow.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import js.annotation._
55
import js.|
66
import js.JSConverters._
77
import japgolly.scalajs.react._
8-
import japgolly.scalajs.react.raw.React
8+
import japgolly.scalajs.react.facade.React
99
import japgolly.scalajs.react.vdom.html_<^._
1010
import react.common._
1111
import react.semanticui.{ raw => suiraw }

‎facade/src/main/scala/react/semanticui/elements/button/Button.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import scala.scalajs.js
44
import js.annotation._
55
import js.|
66
import japgolly.scalajs.react._
7-
import japgolly.scalajs.react.raw.React
7+
import japgolly.scalajs.react.facade.React
88
import react.common._
99
import react.semanticui.{ raw => suiraw }
1010
import react.semanticui._

‎facade/src/main/scala/react/semanticui/elements/button/ButtonContent.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package react.semanticui.elements.button
33
import scala.scalajs.js
44
import js.annotation._
55
import japgolly.scalajs.react._
6-
import japgolly.scalajs.react.raw.React
6+
import japgolly.scalajs.react.facade.React
77
import react.common._
88
import react.semanticui._
99
import react.semanticui.{ raw => suiraw }

‎facade/src/main/scala/react/semanticui/elements/button/ButtonGroup.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import js.annotation._
55
import js.|
66
import js.JSConverters._
77
import japgolly.scalajs.react._
8-
import japgolly.scalajs.react.raw.React
8+
import japgolly.scalajs.react.facade.React
99
import japgolly.scalajs.react.vdom.VdomNode
1010
import react.common._
1111
import react.semanticui.{ raw => suiraw }

0 commit comments

Comments
 (0)