summaryrefslogtreecommitdiff
path: root/scalajslib/src
diff options
context:
space:
mode:
authorLi Haoyi <haoyi.sg@gmail.com>2018-03-19 21:05:34 -0700
committerLi Haoyi <haoyi.sg@gmail.com>2018-03-19 21:05:34 -0700
commit4263195436228ab5e4e781c1b1ec3090add59e35 (patch)
treea3bf1696d1d7371caf92e30d0df8c5d3db9c45b9 /scalajslib/src
parent1c507efbc4ce13ad39a056c4c77eb280f0b224e7 (diff)
downloadmill-4263195436228ab5e4e781c1b1ec3090add59e35.tar.gz
mill-4263195436228ab5e4e781c1b1ec3090add59e35.tar.bz2
mill-4263195436228ab5e4e781c1b1ec3090add59e35.zip
avoid showing a stack trace if the ScalaJSModule gives a linking error, since the stdout will have the necessary information for debugging anyway
Diffstat (limited to 'scalajslib/src')
-rw-r--r--scalajslib/src/mill/scalajslib/ScalaJSBridge.scala7
-rw-r--r--scalajslib/src/mill/scalajslib/ScalaJSModule.scala5
2 files changed, 6 insertions, 6 deletions
diff --git a/scalajslib/src/mill/scalajslib/ScalaJSBridge.scala b/scalajslib/src/mill/scalajslib/ScalaJSBridge.scala
index 59ed6450..c9947e88 100644
--- a/scalajslib/src/mill/scalajslib/ScalaJSBridge.scala
+++ b/scalajslib/src/mill/scalajslib/ScalaJSBridge.scala
@@ -5,6 +5,7 @@ import java.net.URLClassLoader
import ammonite.ops.Path
import mill.define.Discover
+import mill.eval.Result
import mill.util.Ctx
import mill.{Agg, T}
@@ -50,7 +51,7 @@ class ScalaJSWorker {
main: Option[String],
fullOpt: Boolean,
moduleKind: ModuleKind)
- (implicit ctx: Ctx.Home): Unit = {
+ (implicit ctx: Ctx.Home): Result[Path] = {
bridge(toolsClasspath).link(
sources.items.map(_.toIO).toArray,
libraries.items.map(_.toIO).toArray,
@@ -58,7 +59,7 @@ class ScalaJSWorker {
main.orNull,
fullOpt,
moduleKind
- )
+ ).map(Path(_))
}
def run(toolsClasspath: Agg[Path], config: NodeJSConfig, linkedFile: File)
@@ -82,7 +83,7 @@ trait ScalaJSBridge {
dest: File,
main: String,
fullOpt: Boolean,
- moduleKind: ModuleKind): Unit
+ moduleKind: ModuleKind): Result[File]
def run(config: NodeJSConfig, linkedFile: File): Unit
diff --git a/scalajslib/src/mill/scalajslib/ScalaJSModule.scala b/scalajslib/src/mill/scalajslib/ScalaJSModule.scala
index 099b8bc2..3b566e13 100644
--- a/scalajslib/src/mill/scalajslib/ScalaJSModule.scala
+++ b/scalajslib/src/mill/scalajslib/ScalaJSModule.scala
@@ -117,7 +117,7 @@ trait ScalaJSModule extends scalalib.ScalaModule { outer =>
runClasspath: Agg[PathRef],
mainClass: Option[String],
mode: OptimizeMode,
- moduleKind: ModuleKind)(implicit ctx: Ctx): PathRef = {
+ moduleKind: ModuleKind)(implicit ctx: Ctx): Result[PathRef] = {
val outputPath = ctx.dest / "out.js"
mkdir(ctx.dest)
@@ -137,8 +137,7 @@ trait ScalaJSModule extends scalalib.ScalaModule { outer =>
mainClass,
mode == FullOpt,
moduleKind
- )
- PathRef(outputPath)
+ ).map(PathRef(_))
}
override def scalacPluginIvyDeps = T{