From fd94b8e9821ae0cbd24ab02fa27ec910e1478e7a Mon Sep 17 00:00:00 2001 From: Romain Gilles Date: Thu, 2 May 2024 18:34:05 +0200 Subject: [PATCH] Revert modification on JS integration to avoid to break the compatibility --- scalajslib/src/mill/scalajslib/ScalaJSModule.scala | 3 +-- scalajslib/src/mill/scalajslib/api/ScalaJSApi.scala | 9 ++------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/scalajslib/src/mill/scalajslib/ScalaJSModule.scala b/scalajslib/src/mill/scalajslib/ScalaJSModule.scala index ca70d94ee45..9ee319bed21 100644 --- a/scalajslib/src/mill/scalajslib/ScalaJSModule.scala +++ b/scalajslib/src/mill/scalajslib/ScalaJSModule.scala @@ -373,8 +373,7 @@ trait TestScalaJSModule extends ScalaJSModule with TestModule { T.testReporter, TestRunnerUtils.globFilter(globSelectors()) ) - val res = - TestModule.handleResults(doneMsg, results, T.ctx(), testReportXml(), jsEnvConfig().env) + val res = TestModule.handleResults(doneMsg, results, T.ctx(), testReportXml()) // Hack to try and let the Node.js subprocess finish streaming it's stdout // to the JVM. Without this, the stdout can still be streaming when `close()` // is called, and some of the output is dropped onto the floor. diff --git a/scalajslib/src/mill/scalajslib/api/ScalaJSApi.scala b/scalajslib/src/mill/scalajslib/api/ScalaJSApi.scala index dff9eb9f2e6..fd2412870db 100644 --- a/scalajslib/src/mill/scalajslib/api/ScalaJSApi.scala +++ b/scalajslib/src/mill/scalajslib/api/ScalaJSApi.scala @@ -71,9 +71,7 @@ object ModuleSplitStyle { implicit val rw: RW[ModuleSplitStyle] = macroRW } -sealed trait JsEnvConfig { - val env: Map[String, String] -} +sealed trait JsEnvConfig object JsEnvConfig { implicit def rwNodeJs: RW[NodeJs] = macroRW implicit def rwJsDom: RW[JsDom] = macroRW @@ -132,10 +130,7 @@ object JsEnvConfig { */ final class Selenium private ( val capabilities: Selenium.Capabilities - ) extends JsEnvConfig { - override val env: Map[String, String] = Map.empty - } - + ) extends JsEnvConfig object Selenium { implicit def rwCapabilities: RW[Capabilities] = macroRW