Revert modification on JS integration to avoid to break the compatibi…

…lity
com-lihaoyi · May 13, 2024 · 9e7b2dc · 9e7b2dc
1 parent 2c18b55
commit 9e7b2dc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git 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
@@ -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