Skip to content

Commit e56e448

Browse files
kazievabkazievab
authored
Merge pull request #4 from kinoplan/next
Next
2 parents 3814b4a + c3b8a3d commit e56e448

File tree

378 files changed

+1949
-1571
lines changed

Some content is hidden

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

378 files changed

+1949
-1571
lines changed

‎.scalafix.conf

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
rules = [
2+
OrganizeImports,
3+
RemoveUnused
4+
]
5+
6+
RemoveUnused {
7+
imports = false
8+
}
9+
10+
OrganizeImports {
11+
expandRelative = true
12+
groupedImports = Merge
13+
groupExplicitlyImportedImplicitsSeparately = false
14+
groups = [
15+
"java.",
16+
"javax.",
17+
"scala.",
18+
"akka.",
19+
"*",
20+
"io.kinoplan."
21+
]
22+
importSelectorsOrder = Ascii
23+
importsOrder = SymbolsFirst
24+
removeUnused = true
25+
}

‎build.sbt

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ lazy val muiColorsGenerator = taskKey[Seq[File]]("mui-colors-generator")
3131
lazy val core = (project in file("core"))
3232
.dependsOn(bridge)
3333
.configure(Settings.publishArtifactSettings)
34-
.settings(commonSettings).settings(
34+
.configure(commonSettings).settings(
3535
name := "scalajs-react-material-ui-core",
3636
scalaJSUseMainModuleInitializer := false,
3737
npmDependencies in Compile ++= Settings.npmDependenciesCore.value,
@@ -42,14 +42,14 @@ lazy val core = (project in file("core"))
4242
(npmInstallDependencies in Compile).value
4343
),
4444
sourceGenerators in Compile += muiColorsGenerator.taskValue
45-
).enablePlugins(ScalaJSBundlerPlugin)
45+
)
4646

4747
lazy val muiIconsGenerator = taskKey[Seq[File]]("mui-icons-generator")
4848

4949
lazy val icons = (project in file("icons"))
5050
.dependsOn(bridge)
5151
.configure(Settings.publishArtifactSettings)
52-
.settings(commonSettings).settings(
52+
.configure(commonSettings).settings(
5353
name := "scalajs-react-material-ui-icons",
5454
scalaJSUseMainModuleInitializer := false,
5555
npmDependencies in Compile ++= Settings.npmDependenciesIcons.value,
@@ -60,21 +60,21 @@ lazy val icons = (project in file("icons"))
6060
(npmInstallDependencies in Compile).value
6161
),
6262
sourceGenerators in Compile += muiIconsGenerator.taskValue
63-
).enablePlugins(ScalaJSBundlerPlugin)
63+
)
6464

6565
lazy val lab = (project in file("lab"))
6666
.dependsOn(bridge)
6767
.configure(Settings.publishArtifactSettings)
68-
.settings(commonSettings).settings(
68+
.configure(commonSettings).settings(
6969
name := "scalajs-react-material-ui-lab",
7070
scalaJSUseMainModuleInitializer := false,
7171
npmDependencies in Compile ++= Settings.npmDependenciesLab.value,
7272
npmResolutions in Compile ++= (npmDependencies in Compile).value.toMap,
7373
libraryDependencies ++= Settings.scalajsDependenciesLib.value
74-
).enablePlugins(ScalaJSBundlerPlugin)
74+
)
7575

7676
lazy val demo = (project in file("demo")).dependsOn(core, lab, bridge)
77-
.settings(commonSettings).settings(
77+
.configure(commonSettings).settings(
7878
scalaJSUseMainModuleInitializer := true,
7979
scalaJSLinkerConfig ~= (_.withSourceMap(false)),
8080
stUseScalaJsDom := false,
@@ -88,19 +88,20 @@ lazy val demo = (project in file("demo")).dependsOn(core, lab, bridge)
8888
yarnExtraArgs := Seq("--silent"),
8989
webpackConfigFile in fastOptJS := Some(baseDirectory.value / "dev.webpack.config.js"),
9090
skip in publish := true
91-
).enablePlugins(ScalaJSBundlerPlugin, ScalablyTypedConverterPlugin)
91+
).enablePlugins(ScalablyTypedConverterPlugin)
9292

9393
lazy val bridge = (project in file("utils/bridge"))
9494
.configure(Settings.publishArtifactSettings)
95-
.settings(commonSettings).settings(
95+
.configure(commonSettings).settings(
9696
name := "scalajs-react-bridge",
9797
scalaJSUseMainModuleInitializer := false,
9898
npmDependencies in Compile ++= Settings.npmDependenciesBridge.value,
9999
npmResolutions in Compile ++= (npmDependencies in Compile).value.toMap,
100-
libraryDependencies ++= Settings.scalajsDependenciesBridge.value
101-
).enablePlugins(ScalaJSBundlerPlugin, BridgeGeneratorPlugin)
100+
libraryDependencies ++= Settings.scalajsDependenciesLib.value
101+
).enablePlugins(BridgeGeneratorPlugin)
102102

103-
lazy val commonSettings = Seq(
103+
lazy val commonSettings: Project => Project =
104+
_.enablePlugins(ScalaJSBundlerPlugin, ScalafixPlugin).settings(
104105
crossScalaVersions := Seq("2.12.11", "2.13.3"),
105106
scalaVersion := crossScalaVersions.value.last,
106107
description := Settings.description,
@@ -110,7 +111,6 @@ lazy val commonSettings = Seq(
110111
version in startWebpackDevServer := Settings.versions.bundler.webpackDev,
111112
webpackCliVersion := Settings.versions.bundler.webpackCli,
112113
javacOptions ++= Settings.javacOptions,
113-
scalacOptions ++= Settings.scalacOptions,
114114
scalacOptions ~= (_.filterNot(
115115
Set(
116116
"-Wdead-code",

‎commands.sbt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1+
addCommandAlias("fix", "; all compile:scalafix")
12
addCommandAlias("runDev", "; demo/fastOptJS::stopWebpackDevServer; ~demo/fastOptJS::startWebpackDevServer")

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package io.kinoplan.scalajs.react.material.ui.core
22

3-
import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps}
4-
import io.kinoplan.scalajs.react.material.ui.core.internal.PaperClassKey
5-
63
import scala.scalajs.js
74
import scala.scalajs.js.annotation.JSImport
85

6+
import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps}
7+
import io.kinoplan.scalajs.react.material.ui.core.internal.PaperClassKey
8+
99
object MuiAppBar extends ReactBridgeComponent with MuiAppBarExtensions {
1010
override protected lazy val componentValue: js.Function = RawComponent
1111

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package io.kinoplan.scalajs.react.material.ui.core
22

3-
import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps}
4-
53
import scala.scalajs.js
64
import scala.scalajs.js.annotation.JSImport
75

6+
import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps}
7+
88
object MuiAvatar extends ReactBridgeComponent with MuiAvatarExtensions {
99
override protected lazy val componentValue: js.Function = RawComponent
1010

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package io.kinoplan.scalajs.react.material.ui.core
22

3-
import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithPropsNoChildren}
4-
53
import scala.scalajs.js
64
import scala.scalajs.js.annotation.JSImport
75
import scala.scalajs.js.|
86

7+
import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithPropsNoChildren}
8+
99
object MuiBackdrop extends ReactBridgeComponent with MuiBackdropExtensions {
1010
override protected lazy val componentValue: js.Function = RawComponent
1111

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
package io.kinoplan.scalajs.react.material.ui.core
22

3-
import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps}
4-
import japgolly.scalajs.react.vdom.VdomNode
5-
63
import scala.scalajs.js
74
import scala.scalajs.js.annotation.JSImport
85

6+
import japgolly.scalajs.react.vdom.VdomNode
7+
8+
import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps}
9+
910
object MuiBadge extends ReactBridgeComponent with MuiBadgeExtensions {
1011
override protected lazy val componentValue: js.Function = RawComponent
1112

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
package io.kinoplan.scalajs.react.material.ui.core
22

3-
import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps}
4-
import japgolly.scalajs.react.ReactEvent
5-
63
import scala.scalajs.js
74
import scala.scalajs.js.annotation.JSImport
85

6+
import japgolly.scalajs.react.ReactEvent
7+
8+
import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps}
9+
910
object MuiBottomNavigation extends ReactBridgeComponent with MuiBottomNavigationExtensions {
1011
override protected lazy val componentValue: js.Function = RawComponent
1112

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
package io.kinoplan.scalajs.react.material.ui.core
22

3-
import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps}
4-
import japgolly.scalajs.react.vdom.html_<^._
5-
63
import scala.scalajs.js
74
import scala.scalajs.js.annotation.JSImport
85

6+
import japgolly.scalajs.react.vdom.html_<^._
7+
8+
import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps}
9+
910
object MuiBottomNavigationAction extends ReactBridgeComponent with MuiBottomNavigationActionExtensions {
1011
override protected lazy val componentValue: js.Object = RawComponent
1112

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package io.kinoplan.scalajs.react.material.ui.core
22

3-
import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps}
4-
53
import scala.scalajs.js
64
import scala.scalajs.js.annotation.JSImport
75

6+
import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps}
7+
88
object MuiButton extends ReactBridgeComponent with MuiButtonExtensions {
99
override protected lazy val componentValue: js.Function = RawComponent
1010

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package io.kinoplan.scalajs.react.material.ui.core
22

3-
import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps}
4-
53
import scala.scalajs.js
64
import scala.scalajs.js.annotation.JSImport
75

6+
import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps}
7+
88
object MuiButtonBase extends ReactBridgeComponent with MuiButtonBaseExtensions {
99
override protected lazy val componentValue: js.Function = RawComponent
1010

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package io.kinoplan.scalajs.react.material.ui.core
22

3-
import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithPropsNoChildren}
4-
import io.kinoplan.scalajs.react.material.ui.core.internal.PaperClassKey
5-
63
import scala.scalajs.js
74
import scala.scalajs.js.annotation.JSImport
85

6+
import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithPropsNoChildren}
7+
import io.kinoplan.scalajs.react.material.ui.core.internal.PaperClassKey
8+
99
object MuiCard extends ReactBridgeComponent with MuiCardExtensions {
1010
override protected lazy val componentValue: js.Function = RawComponent
1111

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package io.kinoplan.scalajs.react.material.ui.core
22

3-
import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps}
4-
53
import scala.scalajs.js
64
import scala.scalajs.js.annotation.JSImport
75

6+
import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps}
7+
88
object MuiCardActionArea extends ReactBridgeComponent with MuiCardActionAreaExtensions {
99
override protected lazy val componentValue: js.Function = RawComponent
1010

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package io.kinoplan.scalajs.react.material.ui.core
22

3-
import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps}
4-
53
import scala.scalajs.js
64
import scala.scalajs.js.annotation.JSImport
75

6+
import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps}
7+
88
object MuiCardActions extends ReactBridgeComponent with MuiCardActionsExtensions {
99
override protected lazy val componentValue: js.Function = RawComponent
1010

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package io.kinoplan.scalajs.react.material.ui.core
22

3-
import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithPropsNoChildren}
4-
53
import scala.scalajs.js
64
import scala.scalajs.js.annotation.JSImport
75

6+
import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithPropsNoChildren}
7+
88
object MuiCardContent extends ReactBridgeComponent with MuiCardContentExtensions {
99
override protected lazy val componentValue: js.Function = RawComponent
1010

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
package io.kinoplan.scalajs.react.material.ui.core
22

3-
import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithPropsNoChildren}
4-
import japgolly.scalajs.react.vdom.html_<^._
5-
63
import scala.scalajs.js
74
import scala.scalajs.js.annotation.JSImport
85

6+
import japgolly.scalajs.react.vdom.html_<^._
7+
8+
import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithPropsNoChildren}
9+
910
object MuiCardHeader extends ReactBridgeComponent with MuiCardHeaderExtensions {
1011
override protected lazy val componentValue: js.Function = RawComponent
1112

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package io.kinoplan.scalajs.react.material.ui.core
22

3-
import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithPropsNoChildren}
4-
53
import scala.scalajs.js
64
import scala.scalajs.js.annotation.JSImport
75

6+
import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithPropsNoChildren}
7+
88
object MuiCardMedia extends ReactBridgeComponent with MuiCardMediaExtensions {
99
override protected lazy val componentValue: js.Function = RawComponent
1010

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
package io.kinoplan.scalajs.react.material.ui.core
22

3-
import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithPropsNoChildren}
4-
import japgolly.scalajs.react.vdom.all._
5-
63
import scala.scalajs.js
74
import scala.scalajs.js.annotation.JSImport
85

6+
import japgolly.scalajs.react.vdom.all._
7+
8+
import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithPropsNoChildren}
9+
910
object MuiCheckbox extends ReactBridgeComponent with MuiCheckboxExtensions {
1011
override protected lazy val componentValue: js.Function = RawComponent
1112

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
package io.kinoplan.scalajs.react.material.ui.core
22

3-
import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithPropsNoChildren}
3+
import scala.scalajs.js
4+
import scala.scalajs.js.annotation.JSImport
5+
46
import japgolly.scalajs.react.ReactEvent
57
import japgolly.scalajs.react.raw.React
68
import japgolly.scalajs.react.vdom.html_<^._
79

8-
import scala.scalajs.js
9-
import scala.scalajs.js.annotation.JSImport
10+
import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithPropsNoChildren}
1011

1112
object MuiChip extends ReactBridgeComponent with MuiChipExtensions {
1213
override protected lazy val componentValue: js.Function = RawComponent

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package io.kinoplan.scalajs.react.material.ui.core
22

3-
import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps}
4-
53
import scala.scalajs.js
64
import scala.scalajs.js.annotation.JSImport
75
import scala.scalajs.js.|
86

7+
import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps}
8+
99
object MuiCircularProgress extends ReactBridgeComponent with MuiCircularProgressExtensions {
1010
override protected lazy val componentValue: js.Function = RawComponent
1111

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
package io.kinoplan.scalajs.react.material.ui.core
22

3-
import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps}
4-
import japgolly.scalajs.react.ReactEventFromHtml
5-
63
import scala.scalajs.js
74
import scala.scalajs.js.annotation.JSImport
85
import scala.scalajs.js.|
96

7+
import japgolly.scalajs.react.ReactEventFromHtml
8+
9+
import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps}
10+
1011
object MuiClickAwayListener extends ReactBridgeComponent with MuiClickAwayListenerExtensions {
1112
override protected lazy val componentValue: js.Function = RawComponent
1213

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
package io.kinoplan.scalajs.react.material.ui.core
22

3-
import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps}
4-
import org.scalajs.dom.html
5-
63
import scala.scalajs.js
74
import scala.scalajs.js.annotation.JSImport
85
import scala.scalajs.js.|
96

7+
import org.scalajs.dom.html
8+
9+
import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps}
10+
1011
object MuiCollapse extends ReactBridgeComponent with MuiCollapseExtensions {
1112
override protected lazy val componentValue: js.Function = RawComponent
1213

0 commit comments

Comments
 (0)