diff options
Diffstat (limited to 'scalajslib/src')
| -rw-r--r-- | scalajslib/src/ScalaJSModule.scala | 6 | ||||
| -rw-r--r-- | scalajslib/src/ScalaJSWorkerApi.scala | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/scalajslib/src/ScalaJSModule.scala b/scalajslib/src/ScalaJSModule.scala index 51b04e6a..93fe2637 100644 --- a/scalajslib/src/ScalaJSModule.scala +++ b/scalajslib/src/ScalaJSModule.scala @@ -84,7 +84,7 @@ trait ScalaJSModule extends scalalib.ScalaModule { outer => case Right(_) => ScalaJSWorkerApi.scalaJSWorker().run( toolsClasspath().map(_.path), - nodeJSConfig(), + jsEnvConfig(), fastOpt().path.toIO ) Result.Success(()) @@ -147,7 +147,7 @@ trait ScalaJSModule extends scalalib.ScalaModule { outer => override def platformSuffix = s"_sjs${artifactScalaJSVersion()}" - def nodeJSConfig = T { NodeJSConfig() } + def jsEnvConfig = T { JsEnvConfig.NodeJs() } def moduleKind: T[ModuleKind] = T { ModuleKind.NoModule } } @@ -178,7 +178,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 ) diff --git a/scalajslib/src/ScalaJSWorkerApi.scala b/scalajslib/src/ScalaJSWorkerApi.scala index bcaeb2d3..c67ea7ea 100644 --- a/scalajslib/src/ScalaJSWorkerApi.scala +++ b/scalajslib/src/ScalaJSWorkerApi.scala @@ -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) = { |