propagate trigger files to combined cross build and let js tasks depend on compile. this makes `cbt loop fastOptJs` work (and depending on compile seems generally a good idea)

1 files changed, 9 insertions, 2 deletions

diff --git a/plugins/scalajs/ScalaJs.scala b/plugins/scalajs/ScalaJs.scala
index 6a19d05..9677896 100644
--- a/plugins/scalajs/ScalaJs.scala
+++ b/plugins/scalajs/ScalaJs.scala
@@ -32,6 +32,8 @@ trait ScalaJsBuild extends BaseBuild with ScalaJsSbtDependencyDsl with ScalaJsIn
       Seq(s"-Xplugin:${scalaJsCompilerDep.jar.getAbsolutePath}", "-Xplugin-require:scalajs")
   }
 
+  override def triggerLoopFiles = super.triggerLoopFiles ++ (jvmBuild.sources ++ jsBuild.sources).distinct
+
   def jvmDependencies = Seq.empty[Dependency]
   //TODO: implement
   def jsDependencies = Seq.empty[Dependency]
@@ -69,9 +71,14 @@ trait ScalaJsBuild extends BaseBuild with ScalaJsSbtDependencyDsl with ScalaJsIn
         jsBuild.target.getAbsolutePath) ++
         jsBuild.dependencies.collect{case d: BoundMavenDependency => d.jar.getAbsolutePath},
       scalaJsCliDep.classLoader(jsBuild.context.classLoaderCache))
+  def fastOptJS = {
+    compile
+    link(FastOptJS, fastOptOutput, scalaJsOptions)
+  }
+  def fullOptJS = {
+    compile
+    link(FullOptJS, fastOptOutput, scalaJsOptions)
   }
-  def fastOptJS = link(FastOptJS, fastOptOutput)
-  def fullOptJS = link(FullOptJS, fullOptOutput)
   def fastOptOutput: String = output(FastOptJS)
   def fullOptOutput: String = output(FullOptJS)
 }