Skip to content

Refactoring *.sbt & project/*.scala files #94

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 28, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
131 changes: 31 additions & 100 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,8 +1,36 @@
lazy val root =
if (Settings.isDemoEnabled)
project.in(file(".")).aggregate(core, icons, lab, bridge, demo).configure(Settings.rootProject)
if (ProjectSettings.isDemoEnabled)
project.in(file(".")).aggregate(core, icons, lab, bridge, demo).configure(ProjectSettings.rootProfile)
else
project.in(file(".")).aggregate(core, icons, lab, bridge).configure(Settings.rootProject)
project.in(file(".")).aggregate(core, icons, lab, bridge).configure(ProjectSettings.rootProfile)

lazy val core = project
.in(file("core"))
.enablePlugins(MuiColorsGeneratorPlugin)
.configure(Modules.coreProfile)
.dependsOn(bridge)

lazy val icons = project
.in(file("icons"))
.enablePlugins(MuiIconsGeneratorPlugin)
.configure(Modules.iconsProfile)
.dependsOn(bridge)

lazy val lab = project
.in(file("lab"))
.configure(Modules.labProfile)
.dependsOn(bridge)

lazy val demo = project
.in(file("demo"))
.enablePlugins(ScalablyTypedConverterPlugin)
.configure(Modules.demoProfile)
.dependsOn(core, icons, lab, bridge)

lazy val bridge = project
.in(file("utils/bridge"))
.enablePlugins(BridgeGeneratorPlugin)
.configure(Modules.bridgeProfile)

// format: off
inThisBuild(
Expand All @@ -23,103 +51,6 @@ inThisBuild(
)
// format: on

lazy val muiColorsGenerator = taskKey[Seq[File]]("mui-colors-generator")

lazy val core = (project in file("core"))
.dependsOn(bridge)
.configure(commonProfile)
.settings(
name := "scalajs-react-material-ui-core",
scalaJSUseMainModuleInitializer := false,
npmDependencies in Compile ++= Settings.npmDependenciesCore.value,
npmResolutions in Compile ++= (npmDependencies in Compile).value.toMap,
libraryDependencies ++= Settings.scalajsDependenciesLib.value,
muiColorsGenerator := Generator.muiColors(
(sourceManaged in Compile).value / "io" / "kinoplan" / "scalajs" / "react" / "material" / "ui" / "core" / "colors",
(npmInstallDependencies in Compile).value
),
sourceGenerators in Compile += muiColorsGenerator.taskValue
)

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

lazy val icons = (project in file("icons"))
.dependsOn(bridge)
.configure(commonProfile)
.settings(
name := "scalajs-react-material-ui-icons",
scalaJSUseMainModuleInitializer := false,
npmDependencies in Compile ++= Settings.npmDependenciesIcons.value,
npmResolutions in Compile ++= (npmDependencies in Compile).value.toMap,
libraryDependencies ++= Settings.scalajsDependenciesLib.value,
muiIconsGenerator := Generator.muiIcons(
(sourceManaged in Compile).value / "io" / "kinoplan" / "scalajs" / "react" / "material" / "ui" / "icons",
(npmInstallDependencies in Compile).value
),
sourceGenerators in Compile += muiIconsGenerator.taskValue
)

lazy val lab = (project in file("lab"))
.dependsOn(bridge)
.configure(commonProfile)
.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
)

lazy val demo = (project in file("demo")).dependsOn(core, icons, lab, bridge)
.configure(commonProfile).settings(
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"),
skip in publish := true
).enablePlugins(ScalablyTypedConverterPlugin)

lazy val bridge = (project in file("utils/bridge"))
.configure(commonProfile)
.settings(
name := "scalajs-react-bridge",
scalaJSUseMainModuleInitializer := false,
npmDependencies in Compile ++= Settings.npmDependenciesBridge.value,
npmResolutions in Compile ++= (npmDependencies in Compile).value.toMap,
libraryDependencies ++= Settings.scalajsDependenciesLib.value
).enablePlugins(BridgeGeneratorPlugin)

lazy val commonProfile: Project => Project =
_.enablePlugins(ScalaJSBundlerPlugin, ScalafixPlugin).settings(
crossScalaVersions := Seq("2.12.15", "2.13.7"),
scalaVersion := crossScalaVersions.value.last,
description := Settings.description,
webpackBundlingMode := BundlingMode.LibraryOnly(),
useYarn := true,
version in webpack := Settings.versions.bundler.webpack,
version in startWebpackDevServer := Settings.versions.bundler.webpackDev,
webpackCliVersion := Settings.versions.bundler.webpackCli,
javacOptions ++= Settings.javacOptions,
scalacOptions ~= (_.filterNot(
Set(
"-Wdead-code",
"-Wunused:params",
"-Ywarn-dead-code",
"-Ywarn-unused:params",
"-Ywarn-unused:patvars",
"-Wunused:explicits"
)
))
)

onLoad in Global := (
"project bridge" ::
"bridgeImplicitsGenerator" ::
Expand Down
3 changes: 1 addition & 2 deletions commands.sbt
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
addCommandAlias("fix", ";+scalafixAll")
addCommandAlias("fixCheck", ";scalafixAll --check")
addCommandAlias("fix", "+scalafixAll")

addCommandAlias("dev", "; demo/fastOptJS::stopWebpackDevServer; ~demo/fastOptJS::startWebpackDevServer")
44 changes: 40 additions & 4 deletions project/BridgeGeneratorPlugin.scala
Original file line number Diff line number Diff line change
@@ -1,16 +1,52 @@
import sbt.Keys._
import sbt.plugins.JvmPlugin
import sbt._
import sbt.plugins._

object BridgeGeneratorPlugin extends AutoPlugin {
override def requires = JvmPlugin

lazy val bridgeImplicitsGenerator = taskKey[Seq[File]]("bridge-implicits-generator")

override lazy val projectSettings = Seq(
bridgeImplicitsGenerator := Generator.bridgeImplicits(
(sourceManaged in Compile).value / "io" / "kinoplan" / "scalajs" / "react" / "bridge"
bridgeImplicitsGenerator := bridgeImplicits(
(Compile / sourceManaged).value / "io" / "kinoplan" / "scalajs" / "react" / "bridge"
),
sourceGenerators in Compile += bridgeImplicitsGenerator.taskValue
Compile / sourceGenerators += bridgeImplicitsGenerator.taskValue
)

def bridgeImplicits(src: File) = {
val moduleFile: File = src / "GeneratedImplicits.scala"

val functions = (0 to 22).map { arity =>
val indices = 1 to arity
val types = indices.map(i => s"T$i") :+ "R"
val tParams = types.mkString(", ")
val params = indices.map(i => s"x$i: T$i").mkString(", ")
val args = indices.map(i => s"x$i").mkString(", ")

s"""
| implicit def function${arity}Writer[$tParams](implicit writerR: JsWriter[R]): JsWriter[Function$arity[$tParams]] = {
| new JsWriter[Function$arity[$tParams]] {
| override def toJs(value: Function$arity[$tParams]): js.Any =
| fromFunction$arity(($params) => writerR.toJs(value($args)))
| }
| }""".stripMargin
}.mkString("\n")

IO.write(
moduleFile,
s"""
|package io.kinoplan.scalajs.react.bridge
|
|import scala.scalajs.js
|import scala.scalajs.js.Any._
|
|trait GeneratedImplicits {
| $functions
|}
""".stripMargin.trim
)

Seq(moduleFile)
}
}
7 changes: 4 additions & 3 deletions project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,20 @@ import org.portablescala.sbtplatformdeps.PlatformDepsPlugin.autoImport._
object Dependencies {

object Versions {
val catsCoreV = "2.6.1"
val scalaCssV = "0.7.0"
val scalaJsDomV = "1.2.0"
val scalaJsReactV = "1.7.7"
}

import Versions._

//A -> Z
val catsCore = Def.setting("org.typelevel" %%% "cats-core" % "2.6.1")
val catsCore = Def.setting("org.typelevel" %%% "cats-core" % catsCoreV)
val scalaCssCore = Def.setting("com.github.japgolly.scalacss" %%% "core" % scalaCssV)
val scalaCssExtReact = Def.setting("com.github.japgolly.scalacss" %%% "ext-react" % scalaCssV)
val scalaCssExtScalatags = Def.setting("com.github.japgolly.scalacss" %% "ext-scalatags" % scalaCssV)
val scalaJsDom = Def.setting("org.scala-js" %%% "scalajs-dom" % "1.2.0")
val scalaJsDom = Def.setting("org.scala-js" %%% "scalajs-dom" % scalaJsDomV)
val scalaJsReactCore = Def.setting("com.github.japgolly.scalajs-react" %%% "core" % scalaJsReactV)
val scalaJsReactExtra = Def.setting("com.github.japgolly.scalajs-react" %%% "extra" % scalaJsReactV)
val scalablyTypedRuntime = Def.setting("com.olvind" %%% "scalablytyped-runtime" % "2.1.0")
}
105 changes: 0 additions & 105 deletions project/Generator.scala

This file was deleted.

Loading