Upgraded Scala.js to v1.5.1 (#10)

Author: viktor-podzigun

README.md

@@ -2,11 +2,11 @@
 
 [![CI](https://github.com/scommons/scalajs-reactjs/actions/workflows/ci.yml/badge.svg?branch=master)](https://github.com/scommons/scalajs-reactjs/actions/workflows/ci.yml?query=workflow%3Aci+branch%3Amaster)
 [![scala-index](https://index.scala-lang.org/scommons/scalajs-reactjs/scalajs-reactjs-core/latest.svg)](https://index.scala-lang.org/scommons/scalajs-reactjs/scalajs-reactjs-core)
-[![Scala.js](https://www.scala-js.org/assets/badges/scalajs-1.1.0.svg)](https://www.scala-js.org)
+[![Scala.js](https://www.scala-js.org/assets/badges/scalajs-1.5.0.svg)](https://www.scala-js.org)
 
 Develop React applications with Scala.
 
-It is compatible with Scala `2.13+`, Scala.js `1.1+` and with React.js `v17+`.
+It is compatible with Scala `2.13+`, Scala.js `1.5+` and with React.js `v17+`.
 
 Optionally include `react-router` and `react-redux` facades, too.
 
@@ -44,12 +44,12 @@ ReactDOM.render(<.div(^.id := "hello-world")("Hello, World!"), mountNode)
 2. Depend on the libraries.
    ```
    libraryDependencies ++= Seq(
-     "org.scommons.shogowada" %%% "scalajs-reactjs-core" % "0.17.1",          // For react facade
-     "org.scommons.shogowada" %%% "scalajs-reactjs-dom" % "0.17.1",           // For react-dom facade
+     "org.scommons.shogowada" %%% "scalajs-reactjs-core" % [version],          // For react facade
+     "org.scommons.shogowada" %%% "scalajs-reactjs-dom" % [version],           // For react-dom facade
 
-     "org.scommons.shogowada" %%% "scalajs-reactjs-router-dom" % "0.17.1",    // Optional. For react-router-dom facade
-     "org.scommons.shogowada" %%% "scalajs-reactjs-redux" % "0.17.1",         // Optional. For react-redux facade
-     "org.scommons.shogowada" %%% "scalajs-reactjs-redux-devtools" % "0.17.1" // Optional. For redux-devtools facade
+     "org.scommons.shogowada" %%% "scalajs-reactjs-router-dom" % [version],    // Optional. For react-router-dom facade
+     "org.scommons.shogowada" %%% "scalajs-reactjs-redux" % [version],         // Optional. For react-redux facade
+     "org.scommons.shogowada" %%% "scalajs-reactjs-redux-devtools" % [version] // Optional. For redux-devtools facade
    )
    ```
 

build.sbt

@@ -10,7 +10,7 @@ val StaticTagsVersion = "2.7.1-SNAPSHOT"
 val commonSettings = Seq(
   organization := "org.scommons.shogowada",
 
-  scalaVersion := "2.13.1",
+  scalaVersion := "2.13.5",
   scalacOptions ++= Seq(
     "-deprecation", "-unchecked", "-feature", "-Xcheckinit", "-target:jvm-1.8", "-Xfatal-warnings"
   ),
@@ -20,7 +20,7 @@ val commonSettings = Seq(
   sonatypeProfileName := "org.scommons",
   publishArtifact := false,
   publishMavenStyle := true,
-  publishArtifact in Test := false,
+  Test / publishArtifact := false,
   publishTo := sonatypePublishToBundle.value,
   pomExtra := {
     <url>https://github.com/scommons/scalajs-reactjs</url>
@@ -56,7 +56,7 @@ val commonSettings = Seq(
 lazy val root = (project in file("."))
     .settings(commonSettings: _*)
     .settings(
-      skip in publish := true,
+      publish / skip := true,
       publish := ((): Unit),
       publishLocal := ((): Unit),
       publishM2 := ((): Unit)
@@ -90,11 +90,11 @@ lazy val core = project.in(file("core"))
       libraryDependencies ++= Seq(
         "org.scommons.shogowada" %%% "statictags" % StaticTagsVersion
       ),
-      npmDependencies in Compile ++= Seq(
+      Compile / npmDependencies ++= Seq(
         "react" -> ReactVersion
       ),
-      (webpack in(Compile, fastOptJS)) := Seq(),
-      (webpack in(Compile, fullOptJS)) := Seq(),
+      (Compile / fastOptJS / webpack) := Seq(),
+      (Compile / fullOptJS / webpack) := Seq(),
       publishArtifact := true
     )
     .enablePlugins(ScalaJSPlugin, ScalaJSBundlerPlugin)
@@ -104,13 +104,13 @@ lazy val dom = project.in(file("dom"))
     .settings(
       name := "scalajs-reactjs-dom",
       libraryDependencies ++= Seq(
-        "org.scala-js" %%% "scalajs-dom" % "0.9.8"
+        "org.scala-js" %%% "scalajs-dom" % "2.2.0"
       ),
-      npmDependencies in Compile ++= Seq(
+      Compile / npmDependencies ++= Seq(
         "react-dom" -> ReactVersion
       ),
-      (webpack in(Compile, fastOptJS)) := Seq(),
-      (webpack in(Compile, fullOptJS)) := Seq(),
+      (Compile / fastOptJS / webpack) := Seq(),
+      (Compile / fullOptJS / webpack) := Seq(),
       publishArtifact := true
     )
     .enablePlugins(ScalaJSPlugin, ScalaJSBundlerPlugin)
@@ -120,11 +120,11 @@ lazy val history = project.in(file("history"))
     .settings(commonSettings: _*)
     .settings(
       name := "scalajs-history",
-      npmDependencies in Compile ++= Seq(
+      Compile / npmDependencies ++= Seq(
         "history" -> HistoryVersion
       ),
-      (webpack in(Compile, fastOptJS)) := Seq(),
-      (webpack in(Compile, fullOptJS)) := Seq(),
+      (Compile / fastOptJS / webpack) := Seq(),
+      (Compile / fullOptJS / webpack) := Seq(),
       publishArtifact := true
     )
     .enablePlugins(ScalaJSPlugin, ScalaJSBundlerPlugin)
@@ -133,11 +133,11 @@ lazy val router = project.in(file("router"))
     .settings(commonSettings: _*)
     .settings(
       name := "scalajs-reactjs-router",
-      npmDependencies in Compile ++= Seq(
+      Compile / npmDependencies ++= Seq(
         "react-router" -> ReactRouterVersion
       ),
-      (webpack in(Compile, fastOptJS)) := Seq(),
-      (webpack in(Compile, fullOptJS)) := Seq(),
+      (Compile / fastOptJS / webpack) := Seq(),
+      (Compile / fullOptJS / webpack) := Seq(),
       publishArtifact := true
     )
     .enablePlugins(ScalaJSPlugin, ScalaJSBundlerPlugin)
@@ -147,11 +147,11 @@ lazy val routerDom = project.in(file("router-dom"))
     .settings(commonSettings: _*)
     .settings(
       name := "scalajs-reactjs-router-dom",
-      npmDependencies in Compile ++= Seq(
+      Compile / npmDependencies ++= Seq(
         "react-router-dom" -> ReactRouterVersion
       ),
-      (webpack in(Compile, fastOptJS)) := Seq(),
-      (webpack in(Compile, fullOptJS)) := Seq(),
+      (Compile / fastOptJS / webpack) := Seq(),
+      (Compile / fullOptJS / webpack) := Seq(),
       publishArtifact := true
     )
     .enablePlugins(ScalaJSPlugin, ScalaJSBundlerPlugin)
@@ -161,12 +161,12 @@ lazy val redux = project.in(file("redux"))
     .settings(commonSettings: _*)
     .settings(
       name := "scalajs-reactjs-redux",
-      npmDependencies in Compile ++= Seq(
+      Compile / npmDependencies ++= Seq(
         "react-redux" -> ReactReduxVersion,
         "redux" -> ReduxVersion
       ),
-      (webpack in(Compile, fastOptJS)) := Seq(),
-      (webpack in(Compile, fullOptJS)) := Seq(),
+      (Compile / fastOptJS / webpack) := Seq(),
+      (Compile / fullOptJS / webpack) := Seq(),
       publishArtifact := true
     )
     .enablePlugins(ScalaJSPlugin, ScalaJSBundlerPlugin)
@@ -176,11 +176,11 @@ lazy val reduxDevTools = project.in(file("redux-devtools"))
     .settings(commonSettings: _*)
     .settings(
       name := "scalajs-reactjs-redux-devtools",
-      npmDependencies in Compile ++= Seq(
+      Compile / npmDependencies ++= Seq(
         "redux-devtools-extension" -> ReduxDevToolsVersion
       ),
-      (webpack in(Compile, fastOptJS)) := Seq(),
-      (webpack in(Compile, fullOptJS)) := Seq(),
+      (Compile / fastOptJS / webpack) := Seq(),
+      (Compile / fullOptJS / webpack) := Seq(),
       publishArtifact := true
     )
     .enablePlugins(ScalaJSPlugin, ScalaJSBundlerPlugin)
@@ -189,7 +189,7 @@ lazy val reduxDevTools = project.in(file("redux-devtools"))
 val exampleCommonSettings = commonSettings ++ Seq(
   name := "scalajs-reactjs-example",
   scalaJSUseMainModuleInitializer := true,
-  (unmanagedResourceDirectories in Compile) += baseDirectory.value / "src" / "main" / "webapp"
+  (Compile / unmanagedResourceDirectories) += baseDirectory.value / "src" / "main" / "webapp"
 )
 
 lazy val exampleCustomVirtualDOM = project.in(file("example") / "custom-virtual-dom")
@@ -289,38 +289,38 @@ lazy val exampleTest = project.in(file("example") / "test")
       libraryDependencies ++= Seq(
         "org.eclipse.jetty" % "jetty-server" % "9.+",
 
-        "org.scalatestplus" %% "selenium-3-141" % "3.2.2.0",
-        "org.scalatest" %% "scalatest" % "3.2.2"
+        "org.scalatestplus" %% "selenium-3-141" % "3.2.9.0",
+        "org.scalatest" %% "scalatest" % "3.2.9"
       ).map(_ % "it,test"),
 
-      parallelExecution in Test := false,
-      parallelExecution in IntegrationTest := false,
+      Test / parallelExecution := false,
+      IntegrationTest / parallelExecution := false,
 
       javaOptions ++= Seq(
-        s"-Dtarget.path.custom-virtual-dom=${(crossTarget in exampleCustomVirtualDOM).value}",
-        s"-Dtarget.path.helloworld=${(crossTarget in exampleHelloWorld).value}",
-        s"-Dtarget.path.helloworld-function=${(crossTarget in exampleHelloWorldFunction).value}",
-        s"-Dtarget.path.interactive-helloworld=${(crossTarget in exampleInteractiveHelloWorld).value}",
-        s"-Dtarget.path.lifecycle=${(crossTarget in exampleLifecycle).value}",
-        s"-Dtarget.path.redux-devtools=${(crossTarget in exampleReduxDevTools).value}",
-        s"-Dtarget.path.redux-middleware=${(crossTarget in exampleReduxMiddleware).value}",
-        s"-Dtarget.path.router=${(crossTarget in exampleRouter).value}",
-        s"-Dtarget.path.style=${(crossTarget in exampleStyle).value}",
-        s"-Dtarget.path.todo-app=${(crossTarget in exampleTodoApp).value}",
-        s"-Dtarget.path.todo-app-redux=${(crossTarget in exampleTodoAppRedux).value}"
+        s"-Dtarget.path.custom-virtual-dom=${(exampleCustomVirtualDOM / crossTarget).value}",
+        s"-Dtarget.path.helloworld=${(exampleHelloWorld / crossTarget).value}",
+        s"-Dtarget.path.helloworld-function=${(exampleHelloWorldFunction / crossTarget).value}",
+        s"-Dtarget.path.interactive-helloworld=${(exampleInteractiveHelloWorld / crossTarget).value}",
+        s"-Dtarget.path.lifecycle=${(exampleLifecycle / crossTarget).value}",
+        s"-Dtarget.path.redux-devtools=${(exampleReduxDevTools / crossTarget).value}",
+        s"-Dtarget.path.redux-middleware=${(exampleReduxMiddleware / crossTarget).value}",
+        s"-Dtarget.path.router=${(exampleRouter / crossTarget).value}",
+        s"-Dtarget.path.style=${(exampleStyle / crossTarget).value}",
+        s"-Dtarget.path.todo-app=${(exampleTodoApp / crossTarget).value}",
+        s"-Dtarget.path.todo-app-redux=${(exampleTodoAppRedux / crossTarget).value}"
       ),
-      (test in IntegrationTest) := (test in IntegrationTest).dependsOn(
-        webpack in fastOptJS in Compile in exampleCustomVirtualDOM,
-        webpack in fastOptJS in Compile in exampleHelloWorld,
-        webpack in fastOptJS in Compile in exampleHelloWorldFunction,
-        webpack in fastOptJS in Compile in exampleInteractiveHelloWorld,
-        webpack in fastOptJS in Compile in exampleLifecycle,
-        webpack in fastOptJS in Compile in exampleReduxDevTools,
-        webpack in fastOptJS in Compile in exampleReduxMiddleware,
-        webpack in fastOptJS in Compile in exampleRouter,
-        webpack in fastOptJS in Compile in exampleStyle,
-        webpack in fastOptJS in Compile in exampleTodoApp,
-        webpack in fastOptJS in Compile in exampleTodoAppRedux
+      (IntegrationTest / test) := (IntegrationTest / test).dependsOn(
+        exampleCustomVirtualDOM / Compile / fastOptJS / webpack,
+        exampleHelloWorld / Compile / fastOptJS / webpack,
+        exampleHelloWorldFunction / Compile / fastOptJS / webpack,
+        exampleInteractiveHelloWorld / Compile / fastOptJS / webpack,
+        exampleLifecycle / Compile / fastOptJS / webpack,
+        exampleReduxDevTools / Compile / fastOptJS / webpack,
+        exampleReduxMiddleware / Compile / fastOptJS / webpack,
+        exampleRouter / Compile / fastOptJS / webpack,
+        exampleStyle / Compile / fastOptJS / webpack,
+        exampleTodoApp / Compile / fastOptJS / webpack,
+        exampleTodoAppRedux / Compile / fastOptJS / webpack
       ).value,
       fork := true
     )

dom/src/main/scala/io/github/shogowada/scalajs/reactjs/events/SyntheticEvent.scala

@@ -1,7 +1,6 @@
 package io.github.shogowada.scalajs.reactjs.events
 
-import org.scalajs.dom.raw.HTMLElement
-import org.scalajs.dom.{DataTransfer, EventTarget, TouchList}
+import org.scalajs.dom._
 
 import scala.scalajs.js
 

example/interactive-helloworld/src/main/scala/io/github/shogowada/scalajs/reactjs/example/interactive/helloworld/Main.scala

@@ -7,7 +7,7 @@ import io.github.shogowada.scalajs.reactjs.events.FormSyntheticEvent
 import io.github.shogowada.scalajs.reactjs.example.interactive.helloworld.LetterCase.{DEFAULT, LOWER_CASE, LetterCase, UPPER_CASE}
 import io.github.shogowada.scalajs.reactjs.{React, ReactDOM}
 import org.scalajs.dom
-import org.scalajs.dom.raw.HTMLInputElement
+import org.scalajs.dom.HTMLInputElement
 
 import scala.scalajs.js.annotation.JSExport
 

example/redux-devtools/src/main/scala/io/github/shogowada/scalajs/reactjs/example/redux/devtools/Main.scala

@@ -11,7 +11,7 @@ import io.github.shogowada.scalajs.reactjs.redux.devtools.ReduxDevTools
 import io.github.shogowada.scalajs.reactjs.redux.{Action, ReactRedux, Redux}
 import io.github.shogowada.scalajs.reactjs.{React, ReactDOM}
 import org.scalajs.dom
-import org.scalajs.dom.raw.HTMLInputElement
+import org.scalajs.dom.HTMLInputElement
 
 import scala.scalajs.js.annotation.JSExport
 

example/redux-middleware/src/main/scala/io/github/shogowada/scalajs/reactjs/example/redux/middleware/Main.scala

@@ -10,7 +10,7 @@ import io.github.shogowada.scalajs.reactjs.redux.devtools.ReduxDevTools
 import io.github.shogowada.scalajs.reactjs.redux.{Action, ReactRedux, Redux, Store}
 import io.github.shogowada.scalajs.reactjs.{React, ReactDOM}
 import org.scalajs.dom
-import org.scalajs.dom.raw.HTMLInputElement
+import org.scalajs.dom.HTMLInputElement
 
 import scala.concurrent.ExecutionContext.Implicits.global
 import scala.concurrent.Future

example/router/src/main/scala/io/github/shogowada/scalajs/reactjs/example/router/Main.scala

@@ -9,7 +9,7 @@ import io.github.shogowada.scalajs.reactjs.router.dom.RouterDOM._
 import io.github.shogowada.scalajs.reactjs.router.{RouterProps, WithRouter}
 import io.github.shogowada.scalajs.reactjs.{React, ReactDOM}
 import org.scalajs.dom
-import org.scalajs.dom.raw.HTMLInputElement
+import org.scalajs.dom.HTMLInputElement
 
 import scala.scalajs.js.annotation.JSExport
 

example/todo-app-redux/src/main/scala/io/github/shogowada/scalajs/reactjs/example/todoappredux/PresentationalComponents.scala

@@ -7,7 +7,7 @@ import io.github.shogowada.scalajs.reactjs.VirtualDOM._
 import io.github.shogowada.scalajs.reactjs.elements.ReactElement
 import io.github.shogowada.scalajs.reactjs.events.{FormSyntheticEvent, SyntheticEvent}
 import io.github.shogowada.scalajs.reactjs.example.todoappredux.ContainerComponents._
-import org.scalajs.dom.raw.HTMLInputElement
+import org.scalajs.dom.HTMLInputElement
 
 object Todo {
   case class Props(onClick: () => Unit, todoItem: TodoItem)

example/todo-app/src/main/scala/io/github/shogowada/scalajs/reactjs/example/todoapp/Main.scala

@@ -6,7 +6,7 @@ import io.github.shogowada.scalajs.reactjs.elements.ReactElement
 import io.github.shogowada.scalajs.reactjs.events.{FormSyntheticEvent, SyntheticEvent}
 import io.github.shogowada.scalajs.reactjs.{React, ReactDOM}
 import org.scalajs.dom
-import org.scalajs.dom.raw.HTMLInputElement
+import org.scalajs.dom.HTMLInputElement
 
 import scala.scalajs.js
 import scala.scalajs.js.annotation.JSExport

project/build.properties

@@ -1 +1 @@
-sbt.version=1.2.8
+sbt.version=1.5.2

project/plugins.sbt

@@ -1,8 +1,8 @@
 
 addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.0.0")
 
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.1.0")
-addSbtPlugin("ch.epfl.scala" % "sbt-scalajs-bundler" % "0.18.0")
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.5.1")
+addSbtPlugin("ch.epfl.scala" % "sbt-scalajs-bundler" % "0.20.0")
 
 addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.5")
 addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.0")

version.sbt

@@ -1 +1 @@
-version in ThisBuild := sys.env.getOrElse("version", default = "0.17.2-SNAPSHOT").stripPrefix("v")
+ThisBuild / version := sys.env.getOrElse("version", default = "1.0.0-SNAPSHOT").stripPrefix("v")