Skip to content

Allow configuration of JSEnv used for Scala.js tests and runs #628

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 3 commits into from
Jun 13, 2019
Merged
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
4 changes: 3 additions & 1 deletion build.sc
Original file line number Diff line number Diff line change
@@ -230,7 +230,9 @@ object scalajslib extends MillModule {
Agg(
ivy"org.scala-js::scalajs-tools:1.0.0-M2",
ivy"org.scala-js::scalajs-sbt-test-adapter:1.0.0-M2",
ivy"org.scala-js::scalajs-env-nodejs:1.0.0-M2"
ivy"org.scala-js::scalajs-env-nodejs:1.0.0-M2",
ivy"org.scala-js::scalajs-env-jsdom-nodejs:1.0.0-M2",
ivy"org.scala-js::scalajs-env-phantomjs:1.0.0-M2"
)
}
}
7 changes: 5 additions & 2 deletions contrib/bloop/src/mill.contrib.bloop/BloopImpl.scala
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@ import mill.api.Loose
import mill.define.{Module => MillModule, _}
import mill.eval.Evaluator
import mill.scalajslib.ScalaJSModule
import mill.scalajslib.api.ModuleKind
import mill.scalajslib.api.{JsEnvConfig, ModuleKind}
import mill.scalalib._
import mill.scalanativelib.ScalaNativeModule
import mill.scalanativelib.api.ReleaseMode
@@ -226,7 +226,10 @@ class BloopImpl(ev: () => Evaluator, wd: Path) extends ExternalModule { outer =>
case ModuleKind.CommonJSModule =>
Config.ModuleKindJS.CommonJSModule
},
emitSourceMaps = m.nodeJSConfig().sourceMap,
emitSourceMaps = m.jsEnvConfig() match{
case c: JsEnvConfig.NodeJs => c.sourceMap
case _ => false
},
jsdom = Some(false),
),
mainClass = module.mainClass()
33 changes: 24 additions & 9 deletions scalajslib/api/src/ScalaJSWorkerApi.scala
Original file line number Diff line number Diff line change
@@ -9,9 +9,9 @@ trait ScalaJSWorkerApi {
fullOpt: Boolean,
moduleKind: ModuleKind): Result[File]

def run(config: NodeJSConfig, linkedFile: File): Unit
def run(config: JsEnvConfig, linkedFile: File): Unit

def getFramework(config: NodeJSConfig,
def getFramework(config: JsEnvConfig,
frameworkName: String,
linkedFile: File): (() => Unit, sbt.testing.Framework)

@@ -30,12 +30,27 @@ object ModuleKind{
}


object NodeJSConfig {
sealed trait JsEnvConfig
object JsEnvConfig{


import upickle.default.{ReadWriter => RW, macroRW}
implicit def rw: RW[NodeJSConfig] = macroRW
implicit def rwNodeJs: RW[NodeJs] = macroRW
implicit def rwJsDom: RW[JsDom] = macroRW
implicit def rwPhantom: RW[Phantom] = macroRW
implicit def rw: RW[JsEnvConfig] = macroRW

final case class NodeJs(executable: String = "node",
args: List[String] = Nil,
env: Map[String, String] = Map.empty,
sourceMap: Boolean = true) extends JsEnvConfig

final case class JsDom(executable: String = "node",
args: List[String] = Nil,
env: Map[String, String] = Map.empty) extends JsEnvConfig

final case class Phantom(executable: String,
args: List[String],
env: Map[String, String],
autoExit: Boolean) extends JsEnvConfig
}

final case class NodeJSConfig(executable: String = "node",
args: List[String] = Nil,
env: Map[String, String] = Map.empty,
sourceMap: Boolean = true)
17 changes: 11 additions & 6 deletions scalajslib/src/ScalaJSModule.scala
Original file line number Diff line number Diff line change
@@ -41,13 +41,18 @@ trait ScalaJSModule extends scalalib.ScalaModule { outer =>
ivy"org.scala-js::scalajs-sbt-test-adapter:${scalaJSVersion()}"
)
val envDep = scalaJSBinaryVersion() match {
case v if v.startsWith("0.6") => ivy"org.scala-js::scalajs-js-envs:${scalaJSVersion()}"
case v if v.startsWith("1.0") => ivy"org.scala-js::scalajs-env-nodejs:${scalaJSVersion()}"
case v if v.startsWith("0.6") => Seq(ivy"org.scala-js::scalajs-js-envs:${scalaJSVersion()}")
case v if v.startsWith("1.0") =>
Seq(
ivy"org.scala-js::scalajs-env-nodejs:${scalaJSVersion()}",
ivy"org.scala-js::scalajs-env-jsdom-nodejs:${scalaJSVersion()}",
ivy"org.scala-js::scalajs-env-phantomjs:${scalaJSVersion()}"
)
}
resolveDependencies(
repositories,
Lib.depToDependency(_, "2.12.4", ""),
commonDeps :+ envDep,
commonDeps ++ envDep,
ctx = Some(implicitly[mill.util.Ctx.Log])
)
}
@@ -84,7 +89,7 @@ trait ScalaJSModule extends scalalib.ScalaModule { outer =>
case Right(_) =>
ScalaJSWorkerApi.scalaJSWorker().run(
toolsClasspath().map(_.path),
nodeJSConfig(),
jsEnvConfig(),
fastOpt().path.toIO
)
Result.Success(())
@@ -147,7 +152,7 @@ trait ScalaJSModule extends scalalib.ScalaModule { outer =>

override def platformSuffix = s"_sjs${artifactScalaJSVersion()}"

def nodeJSConfig = T { NodeJSConfig() }
def jsEnvConfig: T[JsEnvConfig] = T { JsEnvConfig.NodeJs() }

def moduleKind: T[ModuleKind] = T { ModuleKind.NoModule }
}
@@ -178,7 +183,7 @@ trait TestScalaJSModule extends ScalaJSModule with TestModule {
override def test(args: String*) = T.command {
val (close, framework) = mill.scalajslib.ScalaJSWorkerApi.scalaJSWorker().getFramework(
toolsClasspath().map(_.path),
nodeJSConfig(),
jsEnvConfig(),
testFrameworks().head,
fastOptTest().path.toIO
)
4 changes: 2 additions & 2 deletions scalajslib/src/ScalaJSWorkerApi.scala
Original file line number Diff line number Diff line change
@@ -50,13 +50,13 @@ class ScalaJSWorker {
).map(os.Path(_))
}

def run(toolsClasspath: Agg[os.Path], config: NodeJSConfig, linkedFile: File)
def run(toolsClasspath: Agg[os.Path], config: JsEnvConfig, linkedFile: File)
(implicit ctx: Ctx.Home): Unit = {
bridge(toolsClasspath).run(config, linkedFile)
}

def getFramework(toolsClasspath: Agg[os.Path],
config: NodeJSConfig,
config: JsEnvConfig,
frameworkName: String,
linkedFile: File)
(implicit ctx: Ctx.Home): (() => Unit, sbt.testing.Framework) = {
4 changes: 2 additions & 2 deletions scalajslib/test/src/NodeJSConfigTests.scala
Original file line number Diff line number Diff line change
@@ -33,7 +33,7 @@ object NodeJSConfigTests extends TestSuite {
class BuildModule(val crossScalaVersion: String, nodeArgs: List[String]) extends HelloJSWorldModule {
override def artifactName = "hello-js-world"
def scalaJSVersion = NodeJSConfigTests.scalaJSVersion
override def nodeJSConfig = T { NodeJSConfig(args = nodeArgs) }
override def jsEnvConfig = T { JsEnvConfig.NodeJs(args = nodeArgs) }
}

object buildUTest extends Cross[BuildModuleUtest](matrix:_*)
@@ -45,7 +45,7 @@ object NodeJSConfigTests extends TestSuite {
override def ivyDeps = Agg(
ivy"com.lihaoyi::utest::$utestVersion"
)
override def nodeJSConfig = T { NodeJSConfig(args = nodeArgs) }
override def jsEnvConfig = T { JsEnvConfig.NodeJs(args = nodeArgs) }
}
}

43 changes: 30 additions & 13 deletions scalajslib/worker/0.6/src/ScalaJSWorkerImpl.scala
Original file line number Diff line number Diff line change
@@ -11,9 +11,8 @@ import org.scalajs.core.tools.jsdep.ResolvedJSDependency
import org.scalajs.core.tools.linker.{ModuleInitializer, StandardLinker, Semantics, ModuleKind => ScalaJSModuleKind}
import org.scalajs.core.tools.logging.ScalaConsoleLogger
import org.scalajs.jsenv._
import org.scalajs.jsenv.nodejs._
import org.scalajs.testadapter.TestAdapter
import mill.scalajslib.api.{ModuleKind, NodeJSConfig}
import mill.scalajslib.api.{ModuleKind, JsEnvConfig}
class ScalaJSWorkerImpl extends mill.scalajslib.api.ScalaJSWorkerApi {
def link(sources: Array[File],
libraries: Array[File],
@@ -49,16 +48,16 @@ class ScalaJSWorkerImpl extends mill.scalajslib.api.ScalaJSWorkerApi {
}
}

def run(config: NodeJSConfig, linkedFile: File): Unit = {
nodeJSEnv(config)
def run(config: JsEnvConfig, linkedFile: File): Unit = {
jsEnv(config)
.jsRunner(FileVirtualJSFile(linkedFile))
.run(new ScalaConsoleLogger, ConsoleJSConsole)
}

def getFramework(config: NodeJSConfig,
def getFramework(config: JsEnvConfig,
frameworkName: String,
linkedFile: File): (() => Unit, sbt.testing.Framework) = {
val env = nodeJSEnv(config).loadLibs(
val env = jsEnv(config).loadLibs(
Seq(ResolvedJSDependency.minimal(new FileVirtualJSFile(linkedFile)))
)

@@ -76,12 +75,30 @@ class ScalaJSWorkerImpl extends mill.scalajslib.api.ScalaJSWorkerApi {
)
}

def nodeJSEnv(config: NodeJSConfig): NodeJSEnv = {
new NodeJSEnv(
NodeJSEnv.Config()
.withExecutable(config.executable)
.withArgs(config.args)
.withEnv(config.env)
.withSourceMap(config.sourceMap))
def jsEnv(config: JsEnvConfig): ComJSEnv = config match{
case config: JsEnvConfig.NodeJs =>
new org.scalajs.jsenv.nodejs.NodeJSEnv(
org.scalajs.jsenv.nodejs.NodeJSEnv.Config()
.withExecutable(config.executable)
.withArgs(config.args)
.withEnv(config.env)
.withSourceMap(config.sourceMap)
)

case config: JsEnvConfig.JsDom =>
new org.scalajs.jsenv.jsdomnodejs.JSDOMNodeJSEnv(
org.scalajs.jsenv.jsdomnodejs.JSDOMNodeJSEnv.Config()
.withExecutable(config.executable)
.withArgs(config.args)
.withEnv(config.env)
)
case config: JsEnvConfig.Phantom =>
new org.scalajs.jsenv.phantomjs.PhantomJSEnv(
org.scalajs.jsenv.phantomjs.PhantomJSEnv.Config()
.withExecutable(config.executable)
.withArgs(config.args)
.withEnv(config.env)
.withAutoExit(config.autoExit)
)
}
}
42 changes: 30 additions & 12 deletions scalajslib/worker/1.0/src/ScalaJSWorkerImpl.scala
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@ package scalajslib
package worker

import java.io.File
import mill.scalajslib.api.{ModuleKind, NodeJSConfig}
import mill.scalajslib.api.{ModuleKind, JsEnvConfig}
import mill.api.Result
import org.scalajs.core.tools.io._
import org.scalajs.core.tools.linker.{ModuleInitializer, Semantics, StandardLinker, ModuleKind => ScalaJSModuleKind}
@@ -49,16 +49,16 @@ class ScalaJSWorkerImpl extends mill.scalajslib.api.ScalaJSWorkerApi {
}
}

def run(config: NodeJSConfig, linkedFile: File): Unit = {
nodeJSEnv(config)
def run(config: JsEnvConfig, linkedFile: File): Unit = {
jsEnv(config)
.jsRunner(Seq(FileVirtualJSFile(linkedFile)))
.run(new ScalaConsoleLogger, ConsoleJSConsole)
}

def getFramework(config: NodeJSConfig,
def getFramework(config: JsEnvConfig,
frameworkName: String,
linkedFile: File): (() => Unit, sbt.testing.Framework) = {
val env = nodeJSEnv(config)
val env = jsEnv(config)
val tconfig = TestAdapter.Config().withLogger(new ScalaConsoleLogger)

val adapter =
@@ -74,12 +74,30 @@ class ScalaJSWorkerImpl extends mill.scalajslib.api.ScalaJSWorkerApi {
)
}

def nodeJSEnv(config: NodeJSConfig): NodeJSEnv = {
new NodeJSEnv(
NodeJSEnv.Config()
.withExecutable(config.executable)
.withArgs(config.args)
.withEnv(config.env)
.withSourceMap(config.sourceMap))
def jsEnv(config: JsEnvConfig): org.scalajs.jsenv.ComJSEnv = config match{
case config: JsEnvConfig.NodeJs =>
new org.scalajs.jsenv.nodejs.NodeJSEnv(
org.scalajs.jsenv.nodejs.NodeJSEnv.Config()
.withExecutable(config.executable)
.withArgs(config.args)
.withEnv(config.env)
.withSourceMap(config.sourceMap)
)

case config: JsEnvConfig.JsDom =>
new org.scalajs.jsenv.jsdomnodejs.JSDOMNodeJSEnv(
org.scalajs.jsenv.jsdomnodejs.JSDOMNodeJSEnv.Config()
.withExecutable(config.executable)
.withArgs(config.args)
.withEnv(config.env)
)
case config: JsEnvConfig.Phantom =>
new org.scalajs.jsenv.phantomjs.PhantomJSEnv(
org.scalajs.jsenv.phantomjs.PhantomJSEnv.Config()
.withExecutable(config.executable)
.withArgs(config.args)
.withEnv(config.env)
.withAutoExit(config.autoExit)
)
}
}