kinoplan · kazievab · Nov 11, 2020 · Nov 10, 2020 · Nov 10, 2020 · Nov 11, 2020
diff --git a/.scalafix.conf b/.scalafix.conf
@@ -0,0 +1,25 @@
+rules = [
+  OrganizeImports,
+  RemoveUnused
+]
+
+RemoveUnused {
+  imports  = false
+}
+
+OrganizeImports {
+  expandRelative                             = true
+  groupedImports                             = Merge
+  groupExplicitlyImportedImplicitsSeparately = false
+  groups                                     = [
+    "java.",
+    "javax.",
+    "scala.",
+    "akka.",
+    "*",
+    "io.kinoplan."
+  ]
+  importSelectorsOrder                       = Ascii
+  importsOrder                               = SymbolsFirst
+  removeUnused                               = true
+}
diff --git a/build.sbt b/build.sbt
@@ -31,7 +31,7 @@ lazy val muiColorsGenerator = taskKey[Seq[File]]("mui-colors-generator")
 lazy val core = (project in file("core"))
   .dependsOn(bridge)
   .configure(Settings.publishArtifactSettings)
-  .settings(commonSettings).settings(
+  .configure(commonSettings).settings(
   name := "scalajs-react-material-ui-core",
   scalaJSUseMainModuleInitializer := false,
   npmDependencies in Compile ++= Settings.npmDependenciesCore.value,
@@ -42,14 +42,14 @@ lazy val core = (project in file("core"))
     (npmInstallDependencies in Compile).value
   ),
   sourceGenerators in Compile += muiColorsGenerator.taskValue
-).enablePlugins(ScalaJSBundlerPlugin)
+)
 
 lazy val muiIconsGenerator = taskKey[Seq[File]]("mui-icons-generator")
 
 lazy val icons = (project in file("icons"))
   .dependsOn(bridge)
   .configure(Settings.publishArtifactSettings)
-  .settings(commonSettings).settings(
+  .configure(commonSettings).settings(
   name := "scalajs-react-material-ui-icons",
   scalaJSUseMainModuleInitializer := false,
   npmDependencies in Compile ++= Settings.npmDependenciesIcons.value,
@@ -60,21 +60,21 @@ lazy val icons = (project in file("icons"))
     (npmInstallDependencies in Compile).value
   ),
   sourceGenerators in Compile += muiIconsGenerator.taskValue
-).enablePlugins(ScalaJSBundlerPlugin)
+)
 
 lazy val lab = (project in file("lab"))
   .dependsOn(bridge)
   .configure(Settings.publishArtifactSettings)
-  .settings(commonSettings).settings(
+  .configure(commonSettings).settings(
   name := "scalajs-react-material-ui-lab",
   scalaJSUseMainModuleInitializer := false,
   npmDependencies in Compile ++= Settings.npmDependenciesLab.value,
   npmResolutions in Compile ++= (npmDependencies in Compile).value.toMap,
   libraryDependencies ++= Settings.scalajsDependenciesLib.value
-).enablePlugins(ScalaJSBundlerPlugin)
+)
 
 lazy val demo = (project in file("demo")).dependsOn(core, lab, bridge)
-  .settings(commonSettings).settings(
+  .configure(commonSettings).settings(
   scalaJSUseMainModuleInitializer := true,
   scalaJSLinkerConfig ~= (_.withSourceMap(false)),
   stUseScalaJsDom := false,
@@ -88,19 +88,20 @@ lazy val demo = (project in file("demo")).dependsOn(core, lab, bridge)
   yarnExtraArgs := Seq("--silent"),
   webpackConfigFile in fastOptJS := Some(baseDirectory.value / "dev.webpack.config.js"),
   skip in publish := true
-).enablePlugins(ScalaJSBundlerPlugin, ScalablyTypedConverterPlugin)
+).enablePlugins(ScalablyTypedConverterPlugin)
 
 lazy val bridge = (project in file("utils/bridge"))
   .configure(Settings.publishArtifactSettings)
-  .settings(commonSettings).settings(
+  .configure(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)
+  libraryDependencies ++= Settings.scalajsDependenciesLib.value
+).enablePlugins(BridgeGeneratorPlugin)
 
-lazy val commonSettings = Seq(
+lazy val commonSettings: Project => Project  =
+  _.enablePlugins(ScalaJSBundlerPlugin, ScalafixPlugin).settings(
   crossScalaVersions := Seq("2.12.11", "2.13.3"),
   scalaVersion := crossScalaVersions.value.last,
   description := Settings.description,
@@ -110,7 +111,6 @@ lazy val commonSettings = Seq(
   version in startWebpackDevServer := Settings.versions.bundler.webpackDev,
   webpackCliVersion := Settings.versions.bundler.webpackCli,
   javacOptions ++= Settings.javacOptions,
-  scalacOptions ++= Settings.scalacOptions,
   scalacOptions ~= (_.filterNot(
     Set(
       "-Wdead-code",

diff --git a/commands.sbt b/commands.sbt
@@ -1 +1,2 @@
+addCommandAlias("fix", "; all compile:scalafix")
 addCommandAlias("runDev", "; demo/fastOptJS::stopWebpackDevServer; ~demo/fastOptJS::startWebpackDevServer")
diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiAppBar.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiAppBar.scala
@@ -1,11 +1,11 @@
 package io.kinoplan.scalajs.react.material.ui.core
 
-import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps}
-import io.kinoplan.scalajs.react.material.ui.core.internal.PaperClassKey
-
 import scala.scalajs.js
 import scala.scalajs.js.annotation.JSImport
 
+import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps}
+import io.kinoplan.scalajs.react.material.ui.core.internal.PaperClassKey
+
 object MuiAppBar extends ReactBridgeComponent with MuiAppBarExtensions {
   override protected lazy val componentValue: js.Function = RawComponent
 

diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiAvatar.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiAvatar.scala
@@ -1,10 +1,10 @@
 package io.kinoplan.scalajs.react.material.ui.core
 
-import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps}
-
 import scala.scalajs.js
 import scala.scalajs.js.annotation.JSImport
 
+import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps}
+
 object MuiAvatar extends ReactBridgeComponent with MuiAvatarExtensions {
   override protected lazy val componentValue: js.Function = RawComponent
 

diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiBackdrop.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiBackdrop.scala
@@ -1,11 +1,11 @@
 package io.kinoplan.scalajs.react.material.ui.core
 
-import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithPropsNoChildren}
-
 import scala.scalajs.js
 import scala.scalajs.js.annotation.JSImport
 import scala.scalajs.js.|
 
+import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithPropsNoChildren}
+
 object MuiBackdrop extends ReactBridgeComponent with MuiBackdropExtensions {
   override protected lazy val componentValue: js.Function = RawComponent
 

diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiBadge.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiBadge.scala
@@ -1,11 +1,12 @@
 package io.kinoplan.scalajs.react.material.ui.core
 
-import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps}
-import japgolly.scalajs.react.vdom.VdomNode
-
 import scala.scalajs.js
 import scala.scalajs.js.annotation.JSImport
 
+import japgolly.scalajs.react.vdom.VdomNode
+
+import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps}
+
 object MuiBadge extends ReactBridgeComponent with MuiBadgeExtensions {
   override protected lazy val componentValue: js.Function = RawComponent
 

diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiBottomNavigation.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiBottomNavigation.scala
@@ -1,11 +1,12 @@
 package io.kinoplan.scalajs.react.material.ui.core
 
-import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps}
-import japgolly.scalajs.react.ReactEvent
-
 import scala.scalajs.js
 import scala.scalajs.js.annotation.JSImport
 
+import japgolly.scalajs.react.ReactEvent
+
+import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps}
+
 object MuiBottomNavigation extends ReactBridgeComponent with MuiBottomNavigationExtensions {
   override protected lazy val componentValue: js.Function = RawComponent
 

diff --git a/...src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiBottomNavigationAction.scala b/...src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiBottomNavigationAction.scala
@@ -1,11 +1,12 @@
 package io.kinoplan.scalajs.react.material.ui.core
 
-import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps}
-import japgolly.scalajs.react.vdom.html_<^._
-
 import scala.scalajs.js
 import scala.scalajs.js.annotation.JSImport
 
+import japgolly.scalajs.react.vdom.html_<^._
+
+import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps}
+
 object MuiBottomNavigationAction extends ReactBridgeComponent with MuiBottomNavigationActionExtensions {
   override protected lazy val componentValue: js.Object = RawComponent
 

diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiButton.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiButton.scala
@@ -1,10 +1,10 @@
 package io.kinoplan.scalajs.react.material.ui.core
 
-import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps}
-
 import scala.scalajs.js
 import scala.scalajs.js.annotation.JSImport
 
+import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps}
+
 object MuiButton extends ReactBridgeComponent with MuiButtonExtensions {
   override protected lazy val componentValue: js.Function = RawComponent
 

diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiButtonBase.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiButtonBase.scala
@@ -1,10 +1,10 @@
 package io.kinoplan.scalajs.react.material.ui.core
 
-import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps}
-
 import scala.scalajs.js
 import scala.scalajs.js.annotation.JSImport
 
+import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps}
+
 object MuiButtonBase extends ReactBridgeComponent with MuiButtonBaseExtensions {
   override protected lazy val componentValue: js.Function = RawComponent
 

diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiCard.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiCard.scala
@@ -1,11 +1,11 @@
 package io.kinoplan.scalajs.react.material.ui.core
 
-import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithPropsNoChildren}
-import io.kinoplan.scalajs.react.material.ui.core.internal.PaperClassKey
-
 import scala.scalajs.js
 import scala.scalajs.js.annotation.JSImport
 
+import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithPropsNoChildren}
+import io.kinoplan.scalajs.react.material.ui.core.internal.PaperClassKey
+
 object MuiCard extends ReactBridgeComponent with MuiCardExtensions {
   override protected lazy val componentValue: js.Function = RawComponent
 

diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiCardActionArea.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiCardActionArea.scala
@@ -1,10 +1,10 @@
 package io.kinoplan.scalajs.react.material.ui.core
 
-import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps}
-
 import scala.scalajs.js
 import scala.scalajs.js.annotation.JSImport
 
+import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps}
+
 object MuiCardActionArea extends ReactBridgeComponent with MuiCardActionAreaExtensions {
   override protected lazy val componentValue: js.Function = RawComponent
 

diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiCardActions.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiCardActions.scala
@@ -1,10 +1,10 @@
 package io.kinoplan.scalajs.react.material.ui.core
 
-import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps}
-
 import scala.scalajs.js
 import scala.scalajs.js.annotation.JSImport
 
+import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps}
+
 object MuiCardActions extends ReactBridgeComponent with MuiCardActionsExtensions {
   override protected lazy val componentValue: js.Function = RawComponent
 

diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiCardContent.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiCardContent.scala
@@ -1,10 +1,10 @@
 package io.kinoplan.scalajs.react.material.ui.core
 
-import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithPropsNoChildren}
-
 import scala.scalajs.js
 import scala.scalajs.js.annotation.JSImport
 
+import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithPropsNoChildren}
+
 object MuiCardContent extends ReactBridgeComponent with MuiCardContentExtensions {
   override protected lazy val componentValue: js.Function = RawComponent
 

diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiCardHeader.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiCardHeader.scala
@@ -1,11 +1,12 @@
 package io.kinoplan.scalajs.react.material.ui.core
 
-import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithPropsNoChildren}
-import japgolly.scalajs.react.vdom.html_<^._
-
 import scala.scalajs.js
 import scala.scalajs.js.annotation.JSImport
 
+import japgolly.scalajs.react.vdom.html_<^._
+
+import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithPropsNoChildren}
+
 object MuiCardHeader extends ReactBridgeComponent with MuiCardHeaderExtensions {
   override protected lazy val componentValue: js.Function = RawComponent
 

diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiCardMedia.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiCardMedia.scala
@@ -1,10 +1,10 @@
 package io.kinoplan.scalajs.react.material.ui.core
 
-import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithPropsNoChildren}
-
 import scala.scalajs.js
 import scala.scalajs.js.annotation.JSImport
 
+import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithPropsNoChildren}
+
 object MuiCardMedia extends ReactBridgeComponent with MuiCardMediaExtensions {
   override protected lazy val componentValue: js.Function = RawComponent
 

diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiCheckbox.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiCheckbox.scala
@@ -1,11 +1,12 @@
 package io.kinoplan.scalajs.react.material.ui.core
 
-import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithPropsNoChildren}
-import japgolly.scalajs.react.vdom.all._
-
 import scala.scalajs.js
 import scala.scalajs.js.annotation.JSImport
 
+import japgolly.scalajs.react.vdom.all._
+
+import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithPropsNoChildren}
+
 object MuiCheckbox extends ReactBridgeComponent with MuiCheckboxExtensions {
   override protected lazy val componentValue: js.Function = RawComponent
 

diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiChip.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiChip.scala
@@ -1,12 +1,13 @@
 package io.kinoplan.scalajs.react.material.ui.core
 
-import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithPropsNoChildren}
+import scala.scalajs.js
+import scala.scalajs.js.annotation.JSImport
+
 import japgolly.scalajs.react.ReactEvent
 import japgolly.scalajs.react.raw.React
 import japgolly.scalajs.react.vdom.html_<^._
 
-import scala.scalajs.js
-import scala.scalajs.js.annotation.JSImport
+import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithPropsNoChildren}
 
 object MuiChip extends ReactBridgeComponent with MuiChipExtensions {
   override protected lazy val componentValue: js.Function = RawComponent

diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiCircularProgress.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiCircularProgress.scala
@@ -1,11 +1,11 @@
 package io.kinoplan.scalajs.react.material.ui.core
 
-import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps}
-
 import scala.scalajs.js
 import scala.scalajs.js.annotation.JSImport
 import scala.scalajs.js.|
 
+import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps}
+
 object MuiCircularProgress extends ReactBridgeComponent with MuiCircularProgressExtensions {
   override protected lazy val componentValue: js.Function = RawComponent
 

diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiClickAwayListener.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiClickAwayListener.scala
@@ -1,12 +1,13 @@
 package io.kinoplan.scalajs.react.material.ui.core
 
-import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps}
-import japgolly.scalajs.react.ReactEventFromHtml
-
 import scala.scalajs.js
 import scala.scalajs.js.annotation.JSImport
 import scala.scalajs.js.|
 
+import japgolly.scalajs.react.ReactEventFromHtml
+
+import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps}
+
 object MuiClickAwayListener extends ReactBridgeComponent with MuiClickAwayListenerExtensions {
   override protected lazy val componentValue: js.Function = RawComponent
 

diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiCollapse.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiCollapse.scala
@@ -1,12 +1,13 @@
 package io.kinoplan.scalajs.react.material.ui.core
 
-import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps}
-import org.scalajs.dom.html
-
 import scala.scalajs.js
 import scala.scalajs.js.annotation.JSImport
 import scala.scalajs.js.|
 
+import org.scalajs.dom.html
+
+import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps}
+
 object MuiCollapse extends ReactBridgeComponent with MuiCollapseExtensions {
   override protected lazy val componentValue: js.Function = RawComponent
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		addCommandAlias("fix", "; all compile:scalafix")
		addCommandAlias("runDev", "; demo/fastOptJS::stopWebpackDevServer; ~demo/fastOptJS::startWebpackDevServer")