Merge pull request #3 from kinoplan/new

Add cross-build for ScalaJS 1.x and 0.6.x, add cross-build for 2.12x …

Author: kazievab

.github/workflows/release.yml

@@ -8,13 +8,20 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v1
-      - uses: olafurpg/setup-scala@v2
+      - uses: olafurpg/setup-scala@v10
       - uses: actions/setup-node@v1
       - uses: olafurpg/setup-gpg@v2
       - name: Publish
-        run: sbt -mem 4096 ci-release
+        run: DEMO_ENABLED=0 sbt -mem 4096 ci-release
         env:
           PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}
           PGP_SECRET: ${{ secrets.PGP_SECRET }}
           SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
           SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
+      - name: Publish 0.6
+        run: SCALAJS_VERSION=0.6.33 DEMO_ENABLED=0 sbt -mem 4096 ci-release
+        env:
+          PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}
+          PGP_SECRET: ${{ secrets.PGP_SECRET }}
+          SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
+          SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}

.github/workflows/scala.yml

@@ -1,6 +1,6 @@
 name: Scala CI
 
-on: [push]
+on: [push, pull_request]
 
 jobs:
   build:
@@ -11,5 +11,7 @@ jobs:
       uses: actions/setup-java@v1
       with:
         java-version: 1.8
-    - name: Run tests
-      run: sbt -mem 4096 test
+    - name: Run test
+      run: sbt -mem 4096 clean test
+    - name: Run test 0.6
+      run: SCALAJS_VERSION=0.6.33 DEMO_ENABLED=0 sbt -mem 4096 clean test

.gitignore

@@ -4,6 +4,7 @@ target/
 .idea/
 .metals/
 .bloop/
+.bsp/
 local.*
 node_modules/
 package-lock.json

README.md

@@ -52,7 +52,7 @@ In the demo you can also find very detailed examples of using a bunch of:
 - [ScalablyTyped/Distribution](https://github.com/ScalablyTyped/Distribution)
 
 Start:
-1. `sbt -mem 2048 restartWDS`
+1. `sbt -mem 2048 runDev`
 2. Open in browser `localhost:8080`
 
 ## License

build.sbt

@@ -1,20 +1,18 @@
-addCommandAlias("restartWDS", "; demo/fastOptJS::stopWebpackDevServer; ~demo/fastOptJS::startWebpackDevServer")
-
-lazy val root = project.in(file(".")).settings(commonSettings).aggregate(core, icons, lab, demo).settings(
-  name            := "scalajs-react-material-ui",
-  skip in publish := true
-)
+lazy val root = if (Settings.isDemoEnabled)
+  project.in(file(".")).aggregate(core, icons, lab, bridge, demo).configure(Settings.rootProject)
+    else
+  project.in(file(".")).aggregate(core, icons, lab, bridge).configure(Settings.rootProject)
 
 inThisBuild(
   List(
     homepage := Some(url("https://github.com/kinoplan/scalajs-react-material-ui")),
     licenses := Seq("MIT" -> url("http://opensource.org/licenses/MIT")),
     developers := List(
       Developer(
-        "kazievab",
-        "Alexey Kaziev",
-        "kazievab@gmail.com",
-        url("https://github.com/kazievab")
+        "kinoplan",
+        "Kinoplan",
+        "job@kinoplan.ru",
+        url("https://kinoplan.tech")
       )
     ),
     scmInfo := Some(
@@ -28,53 +26,80 @@ inThisBuild(
 
 lazy val muiColorsGenerator = taskKey[Seq[File]]("mui-colors-generator")
 
-lazy val core = (project in file("core")).settings(commonSettings).settings(
+lazy val core = (project in file("core")).dependsOn(bridge)
+  .settings(commonSettings).settings(
   name := "scalajs-react-material-ui-core",
-  scalaJSUseMainModuleInitializer  := false,
+  scalaJSUseMainModuleInitializer := false,
   npmDependencies in Compile ++= Settings.npmDependenciesCore.value,
+  npmResolutions in Compile ++= (npmDependencies in Compile).value.toMap,
   libraryDependencies ++= Settings.scalajsDependenciesLib.value,
-  muiColorsGenerator := Settings.generateColors(
+  muiColorsGenerator := Generator.muiColors(
     (sourceManaged in Compile).value / "io" / "kinoplan" / "scalajs" / "react" / "material" / "ui" / "core" / "colors",
     (npmInstallDependencies in Compile).value
   ),
-  sourceGenerators in Compile += muiColorsGenerator.taskValue
+  sourceGenerators in Compile += muiColorsGenerator.taskValue,
+  sources in(Compile, doc) := Seq.empty,
+  publishArtifact in(Compile, packageDoc) := false,
 ).enablePlugins(ScalaJSBundlerPlugin)
 
 lazy val muiIconsGenerator = taskKey[Seq[File]]("mui-icons-generator")
 
-lazy val icons = (project in file("icons")).settings(commonSettings).settings(
+lazy val icons = (project in file("icons")).dependsOn(bridge)
+  .settings(commonSettings).settings(
   name := "scalajs-react-material-ui-icons",
-  scalaJSUseMainModuleInitializer  := false,
+  scalaJSUseMainModuleInitializer := false,
   npmDependencies in Compile ++= Settings.npmDependenciesIcons.value,
+  npmResolutions in Compile ++= (npmDependencies in Compile).value.toMap,
   libraryDependencies ++= Settings.scalajsDependenciesLib.value,
-  muiIconsGenerator := Settings.generateIcons(
+  muiIconsGenerator := Generator.muiIcons(
     (sourceManaged in Compile).value / "io" / "kinoplan" / "scalajs" / "react" / "material" / "ui" / "icons",
     (npmInstallDependencies in Compile).value
   ),
-  sourceGenerators in Compile += muiIconsGenerator.taskValue
+  sourceGenerators in Compile += muiIconsGenerator.taskValue,
+  sources in(Compile, doc) := Seq.empty,
+  publishArtifact in(Compile, packageDoc) := false,
 ).enablePlugins(ScalaJSBundlerPlugin)
 
-lazy val lab = (project in file("lab")).settings(commonSettings).settings(
+lazy val lab = (project in file("lab")).dependsOn(bridge)
+  .settings(commonSettings).settings(
   name := "scalajs-react-material-ui-lab",
-  scalaJSUseMainModuleInitializer  := false,
+  scalaJSUseMainModuleInitializer := false,
   npmDependencies in Compile ++= Settings.npmDependenciesLab.value,
-  libraryDependencies ++= Settings.scalajsDependenciesLib.value
+  npmResolutions in Compile ++= (npmDependencies in Compile).value.toMap,
+  libraryDependencies ++= Settings.scalajsDependenciesLib.value,
+  sources in(Compile, doc) := Seq.empty,
+  publishArtifact in(Compile, packageDoc) := false,
 ).enablePlugins(ScalaJSBundlerPlugin)
 
-lazy val demo = (project in file("demo")).dependsOn(core, lab)
+lazy val demo = (project in file("demo")).dependsOn(core, lab, bridge)
   .settings(commonSettings).settings(
-  scalaJSUseMainModuleInitializer  := true,
+  scalaJSUseMainModuleInitializer := true,
+  scalaJSLinkerConfig ~= (_.withSourceMap(false)),
+  stUseScalaJsDom := false,
+  stFlavour := Flavour.Japgolly,
+  stIgnore ++= Settings.stIgnore,
+  stOutputPackage := "io.kinoplan.scalajs.react.libs.external",
   npmDependencies in Compile ++= Settings.npmDependenciesDemo.value,
+  npmResolutions in Compile ++= (npmDependencies in Compile).value.toMap,
   libraryDependencies ++= Settings.scalajsDependenciesDemo.value,
-  webpackDevServerExtraArgs        := Seq("--inline"),
-  yarnExtraArgs                    := Seq("--silent"),
-  webpackConfigFile in fastOptJS   := Some(baseDirectory.value / "dev.webpack.config.js"),
+  webpackDevServerExtraArgs := Seq("--inline"),
+  yarnExtraArgs := Seq("--silent"),
+  webpackConfigFile in fastOptJS := Some(baseDirectory.value / "dev.webpack.config.js"),
   skip in publish := true
-).enablePlugins(ScalaJSBundlerPlugin)
+).enablePlugins(ScalaJSBundlerPlugin, ScalablyTypedConverterPlugin)
+
+lazy val bridge = (project in file("utils/bridge")).settings(commonSettings).settings(
+  name := "scalajs-react-bridge",
+  scalaJSUseMainModuleInitializer := false,
+  npmDependencies in Compile ++= Settings.npmDependenciesBridge.value,
+  npmResolutions in Compile ++= (npmDependencies in Compile).value.toMap,
+  libraryDependencies ++= Settings.scalajsDependenciesBridge.value
+).enablePlugins(ScalaJSBundlerPlugin, BridgeGeneratorPlugin)
 
 lazy val commonSettings = Seq(
   version := Settings.version,
-  scalaVersion := Settings.versions.scala,
+  crossScalaVersions := Seq("2.12.11", "2.13.3"),
+  scalaVersion := crossScalaVersions.value.last,
   organization := Settings.organization,
   description := Settings.description,
   homepage := Some(url("https://github.com/kinoplan/scalajs-react-material-ui")),
@@ -85,7 +110,23 @@ lazy val commonSettings = Seq(
   version in webpack := Settings.versions.bundler.webpack,
   version in startWebpackDevServer := Settings.versions.bundler.webpackDev,
   webpackCliVersion := Settings.versions.bundler.webpackCli,
-  emitSourceMaps := false,
   javacOptions ++= Settings.javacOptions,
-  scalacOptions in ThisBuild ++= Settings.scalacOptions
+  scalacOptions ++= Settings.scalacOptions,
+  scalacOptions ~= (_.filterNot(
+    Set(
+      "-Wdead-code",
+      "-Wunused:params",
+      "-Ywarn-dead-code",
+      "-Ywarn-unused:params",
+      "-Ywarn-unused:patvars",
+      "-Wunused:explicits"
+    )
+  ))
 )
+
+onLoad in Global := (
+  "project bridge" ::
+  "bridgeImplicitsGenerator" ::
+  "project root" ::
+  (_: State)
+) compose (onLoad in Global).value

commands.sbt

@@ -0,0 +1 @@
+addCommandAlias("runDev", "; demo/fastOptJS::stopWebpackDevServer; ~demo/fastOptJS::startWebpackDevServer")

core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/JsWriterImplicits.scala

@@ -1,6 +1,6 @@
 package io.kinoplan.scalajs.react.material.ui.core
 
-import com.payalabs.scalajs.react.bridge.{ReactBridgeComponent, WithProps}
+import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps}
 import io.kinoplan.scalajs.react.material.ui.core.internal.PaperClassKey
 
 import scala.scalajs.js
@@ -17,7 +17,7 @@ object MuiAppBar extends ReactBridgeComponent with MuiAppBarExtensions {
     classes: js.UndefOr[Map[ClassKey.Value, String]] = js.undefined,
     color: js.UndefOr[Color.Value] = js.undefined,
     position: js.UndefOr[Position.Value] = js.undefined,
-    component: OptComponentPropType = js.undefined,
+    component: js.UndefOr[ComponentPropType] = js.undefined,
     elevation: js.UndefOr[Int] = js.undefined,
     square: js.UndefOr[Boolean] = js.undefined
   ): WithProps = auto

core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiAppBar.scala

@@ -1,6 +1,6 @@
 package io.kinoplan.scalajs.react.material.ui.core
 
-import com.payalabs.scalajs.react.bridge.{ReactBridgeComponent, WithProps}
+import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps}
 
 import scala.scalajs.js
 import scala.scalajs.js.annotation.JSImport
@@ -14,7 +14,7 @@ object MuiAvatar extends ReactBridgeComponent with MuiAvatarExtensions {
 
   def apply(
     classes: js.UndefOr[Map[ClassKey.Value, String]] = js.undefined,
-    component: OptComponentPropType = js.undefined,
+    component: js.UndefOr[ComponentPropType] = js.undefined,
     imgProps: js.UndefOr[js.Object] = js.undefined
   ): WithProps = auto
 }

core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiAvatar.scala

@@ -1,6 +1,6 @@
 package io.kinoplan.scalajs.react.material.ui.core
 
-import com.payalabs.scalajs.react.bridge.{ReactBridgeComponent, WithPropsNoChildren}
+import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithPropsNoChildren}
 
 import scala.scalajs.js
 import scala.scalajs.js.annotation.JSImport