ScalaJS plugin build

2 files changed, 71 insertions, 5 deletions

diff --git a/build.sbt b/build.sbt
index 31a21556..f1d795ee 100644
--- a/build.sbt
+++ b/build.sbt
@@ -1,3 +1,5 @@
+import java.io.File
+
 val sharedSettings = Seq(
   scalaVersion := "2.12.4",
   organization := "com.lihaoyi",
@@ -131,9 +133,42 @@ lazy val scalaplugin = project
     baseDirectory in Test := (baseDirectory in Test).value / "..",
     javaOptions := bridgeProps.value.toSeq
   )
-
+lazy val scalajsplugin = project
+  .dependsOn(scalaplugin % "compile->compile;test->test")
+  .settings(
+    sharedSettings,
+    name := "mill-scalajsplugin",
+    fork in Test := true,
+    baseDirectory in (Test, test) := (baseDirectory in (Test, test)).value / "..",
+    javaOptions in (Test, test) := bridgeProps.value.toSeq
+  )
+def jsbridge(binary: String, version: String) =
+  Project(
+    id = "scalajsbridge_" + binary.replace('.', '_'),
+    base = file("scalajsplugin/bridge_" + binary.replace('.', '_'))
+  )
+  .settings(
+    organization := "com.lihaoyi",
+    scalaVersion := "2.12.4",
+    name := "mill-js-bridge",
+    libraryDependencies ++= Seq("org.scala-js" %% "scalajs-tools" % version)
+  )
+lazy val scalajsbridge_0_6 = jsbridge("0.6", "0.6.21")
+lazy val scalajsbridge_1_0 = jsbridge("1.0", "1.0.0-M2")
+val jsbridgeProps = Def.task{
+  def bridgeClasspath(depClasspath: Classpath, jar: File) = {
+    (depClasspath.files :+ jar).map(_.absolutePath).mkString(File.pathSeparator)
+  }
+  val mapping = Map(
+    "MILL_SCALAJS_BRIDGE_0_6" -> bridgeClasspath((dependencyClasspath in (scalajsbridge_0_6, Compile)).value,
+                                                 (packageBin in (scalajsbridge_0_6, Compile)).value),
+    "MILL_SCALAJS_BRIDGE_1_0" -> bridgeClasspath((dependencyClasspath in (scalajsbridge_1_0, Compile)).value,
+                                                 (packageBin in (scalajsbridge_1_0, Compile)).value)
+  )
+  for((k, v) <- mapping) yield s"-D$k=$v"
+}
 lazy val bin = project
-  .dependsOn(scalaplugin)
+  .dependsOn(scalaplugin, scalajsplugin)
   .settings(
     sharedSettings,
     fork := true,
@@ -146,7 +181,7 @@ lazy val bin = project
         prependShellScript = Some(
           Seq(
             "#!/usr/bin/env sh",
-            s"""exec java ${bridgeProps.value.mkString(" ")} -cp "$$0" mill.Main "$$@" """
+            s"""exec java ${(bridgeProps.value ++ jsbridgeProps.value).mkString(" ")} -cp "$$0" mill.Main "$$@" """
           )
         )
       )
diff --git a/build.sc b/build.sc
index 9ee3001d..5fdfaa2a 100755
--- a/build.sc
+++ b/build.sc
@@ -1,4 +1,6 @@
 import $file.shared
+import java.io.File
+
 import ammonite.ops._
 import coursier.maven.MavenRepository
 import mill._
@@ -143,8 +145,37 @@ object ScalaPlugin extends MillModule {
     }
   }
 }
+val jsbridges = for{
+  scalajsBinary <- mill.define.Cross("0.6", "1.0")
+} yield new MillModule{
+  def basePath = pwd / 'scalajsplugin / s"bridge_${scalajsBinary.replace('.', '_')}"
+  val scalajsVersion = scalajsBinary match {
+    case "0.6" => "0.6.21"
+    case "1.0" => "1.0.0-M2"
+  }
+  override def ivyDeps = Seq(
+    Dep("org.scala-js", "scalajs-tools", scalajsVersion)
+  )
+}
+
+object ScalaJSPlugin extends MillModule {
+
+  def projectDeps = Seq(ScalaPlugin)
+  def basePath = pwd / 'scalajsplugin
+
+  def bridgeClasspath(runDepClasspath: Seq[PathRef], classes: PathRef) =
+    (runDepClasspath :+ classes).map(_.path).mkString(File.pathSeparator)
+  def testArgs = T{
+    val mapping = Map(
+      "MILL_SCALAJS_BRIDGE_0_6" -> bridgeClasspath(jsbridges("0.6").runDepClasspath(), jsbridges("0.6").compile().classes),
+      "MILL_SCALAJS_BRIDGE_1_0" -> bridgeClasspath(jsbridges("1.0").runDepClasspath(), jsbridges("1.0").compile().classes)
+    )
+    for((k, v) <- mapping.toSeq) yield s"-D$k=$v"
+  }
+
+}
 
-val assemblyProjects = Seq(ScalaPlugin)
+val assemblyProjects = Seq(ScalaPlugin, ScalaJSPlugin)
 
 def assemblyClasspath = mill.define.Task.traverse(assemblyProjects)(_.assemblyClasspath)
 
@@ -163,7 +194,7 @@ def assemblyBase(classpath: Seq[Path], extraArgs: String)
 }
 
 def devAssembly = T{
-  assemblyBase(assemblyClasspath().flatten, ScalaPlugin.testArgs().mkString(" "))
+  assemblyBase(assemblyClasspath().flatten, (ScalaPlugin.testArgs() ++ ScalaJSPlugin.testArgs()).mkString(" "))
 }
 
 def releaseAssembly = T{