Merge 9c75640 into 3524653

README.md

@@ -1,7 +1,7 @@
 
 [![CI](https://github.com/scommons/scommons-material-ui/actions/workflows/ci.yml/badge.svg?branch=master)](https://github.com/scommons/scommons-material-ui/actions/workflows/ci.yml?query=workflow%3Aci+branch%3Amaster)
 [![Coverage Status](https://coveralls.io/repos/github/scommons/scommons-material-ui/badge.svg?branch=master)](https://coveralls.io/github/scommons/scommons-material-ui/?branch=master)
-[![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)
 
 ## Scala Commons Material UI
 

build.sbt

@@ -6,7 +6,7 @@ lazy val `scommons-material-ui` = (project in file("."))
   .settings(CommonModule.settings: _*)
   .settings(MaterialUiModule.settings: _*)
   .settings(
-    skip in publish := true,
+    publish / skip := true,
     publish := ((): Unit),
     publishLocal := ((): Unit),
     publishM2 := ((): Unit)

project/build.properties

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

project/plugins.sbt

@@ -1,10 +1,10 @@
-//resolvers += "Sonatype Snapshots" at "https://oss.sonatype.org/content/repositories/snapshots/"
+resolvers += "Sonatype Snapshots" at "https://oss.sonatype.org/content/repositories/snapshots/"
 
-//addSbtPlugin(("org.scommons.sbt" % "sbt-scommons-plugin" % "0.8.0-SNAPSHOT").changing())
-addSbtPlugin("org.scommons.sbt" % "sbt-scommons-plugin" % "0.8.0")
+addSbtPlugin(("org.scommons.sbt" % "sbt-scommons-plugin" % "0.9.0-SNAPSHOT").changing())
+//addSbtPlugin("org.scommons.sbt" % "sbt-scommons-plugin" % "0.8.0")
 
 addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.5")
 addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.0")
 
-addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.6.1")
+addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.7.3")
 addSbtPlugin("org.scoverage" % "sbt-coveralls" % "1.2.7")

project/src/main/scala/common/Libs.scala

@@ -6,8 +6,8 @@ import scommons.sbtplugin.project.CommonLibs
 
 object Libs extends CommonLibs {
 
-  val scommonsNodejsVersion = "0.8.0"
-  val scommonsReactVersion = "0.8.0"
+  val scommonsNodejsVersion = "1.0.0-SNAPSHOT"
+  val scommonsReactVersion = "1.0.0-SNAPSHOT"
 
   lazy val scommonsNodejsCore = Def.setting("org.scommons.nodejs" %%% "scommons-nodejs-core" % scommonsNodejsVersion)
   lazy val scommonsReactCore = Def.setting("org.scommons.react" %%% "scommons-react-core" % scommonsReactVersion)

project/src/main/scala/definitions/MaterialUiCodeGen.scala

@@ -2,18 +2,19 @@ package definitions
 
 import sbt.Keys._
 import sbt._
-import scoverage.ScoverageKeys.coverageExcludedPackages
 import scalajsbundler.sbtplugin.ScalaJSBundlerPlugin.autoImport._
+import scommons.sbtplugin.project.CommonNodeJsModule
+import scoverage.ScoverageKeys.coverageExcludedPackages
 
-object MaterialUiCodeGen extends NodeJsModule {
+object MaterialUiCodeGen extends MaterialUiModule with CommonNodeJsModule {
 
   override val id = "scommons-material-ui-codegen"
 
   override val base: File = file("codegen")
 
   override def definition: Project = super.definition
     .settings(
-      skip in publish := true,
+      publish / skip := true,
       publish := ((): Unit),
       publishLocal := ((): Unit),
       publishM2 := ((): Unit),
@@ -22,7 +23,7 @@ object MaterialUiCodeGen extends NodeJsModule {
         "scommons.doctrine.raw" +
           ";scommons.reactdocgen.raw",
 
-      npmDependencies in Compile ++= Seq(
+      Compile / npmDependencies ++= Seq(
         "doctrine" -> "^3.0.0",
         "react-docgen" -> "^5.4.0"
       )

project/src/main/scala/definitions/MaterialUiCore.scala

@@ -18,16 +18,12 @@ object MaterialUiCore extends ScalaJsModule {
 
       coverageExcludedPackages := "scommons.materialui.raw",
 
-      npmDependencies in Compile ++= Seq(
+      Compile / npmDependencies ++= Seq(
         "@material-ui/core" -> "^4.12.3",
         "@material-ui/icons" -> "^4.11.2"
       ),
 
-      npmDevDependencies in Compile ++= Seq(
-        "babel-loader" -> "8.0.5",
-        "@babel/core" -> "7.4.0",
-        "@babel/preset-env" -> "7.4.2",
-
+      Compile / npmDevDependencies ++= Seq(
         "webpack-node-externals" -> "2.5.2",
         "webpack-merge" -> "4.2.1"
       )

project/src/main/scala/definitions/MaterialUiModule.scala

@@ -28,7 +28,7 @@ object MaterialUiModule {
     //
     sonatypeProfileName := "org.scommons",
     publishMavenStyle := true,
-    publishArtifact in Test := false,
+    Test / publishArtifact := false,
     publishTo := sonatypePublishToBundle.value,
     pomExtra := {
       <url>https://github.com/scommons/scommons-material-ui</url>

project/src/main/scala/definitions/MaterialUiShowcase.scala

@@ -15,7 +15,7 @@ object MaterialUiShowcase extends ScalaJsModule {
 
   override def definition: Project = super.definition
     .settings(
-      skip in publish := true,
+      publish / skip := true,
       publish := ((): Unit),
       publishLocal := ((): Unit),
       publishM2 := ((): Unit),
@@ -31,12 +31,12 @@ object MaterialUiShowcase extends ScalaJsModule {
       // we substitute references to material-ui modules with our custom mocks during test
       scommonsNodeJsTestLibs := Seq("scommons.materialui.aliases.js"),
       scommonsRequireWebpackInTest := true,
-      webpackConfigFile in Test := Some(baseDirectory.value / "test.webpack.config.js"),
+      Test / webpackConfigFile := Some(baseDirectory.value / "test.webpack.config.js"),
 
       //dev
-      webpackConfigFile in fastOptJS := Some(baseDirectory.value / "client.webpack.config.js"),
+      fastOptJS / webpackConfigFile := Some(baseDirectory.value / "client.webpack.config.js"),
       //production
-      webpackConfigFile in fullOptJS := Some(baseDirectory.value / "client.webpack.config.js")
+      fullOptJS / webpackConfigFile := Some(baseDirectory.value / "client.webpack.config.js")
     )
 
   override val internalDependencies: Seq[ClasspathDep[ProjectReference]] = Seq(

project/src/main/scala/definitions/MaterialUiTest.scala

@@ -18,7 +18,7 @@ object MaterialUiTest extends ScalaJsModule {
 
       coverageExcludedPackages := "scommons.materialui.test.raw",
 
-      npmDevDependencies in Compile ++= Seq(
+      Compile / npmDevDependencies ++= Seq(
         "module-alias" -> "2.2.2"
       )
     )

project/src/main/scala/definitions/ScalaJsModule.scala

@@ -2,8 +2,9 @@ package definitions
 
 import common.{Libs, TestLibs}
 import sbt._
+import scommons.sbtplugin.project.CommonNodeJsModule
 
-trait ScalaJsModule extends NodeJsModule {
+trait ScalaJsModule extends MaterialUiModule with CommonNodeJsModule {
 
   override def superRepoProjectsDependencies: Seq[(String, String, Option[String])] = {
     super.superRepoProjectsDependencies ++ Seq(

showcase/client.webpack.config.js

@@ -1,6 +1,6 @@
 const merge = require("webpack-merge")
 
 const generatedConfig = require('./scalajs.webpack.config')
-const commonBabelConfig = require("./sc-babel.webpack.config.js")
+const commonConfig = require("./common.webpack.config.js")
 
-module.exports = merge(generatedConfig, commonBabelConfig)
+module.exports = merge(generatedConfig, commonConfig)

showcase/common.webpack.config.js

@@ -0,0 +1,13 @@
+
+module.exports = {
+  stats: {
+    children: false // disable child plugin/loader logging
+  },
+
+  resolve: {
+    modules: [
+      './node_modules',
+      '.'
+    ]
+  }
+}

version.sbt

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