Skip to content

Commit

Permalink
Revert modification on JS integration to avoid to break the compatibi…
Browse files Browse the repository at this point in the history
…lity
  • Loading branch information
romain-gilles-ultra committed May 2, 2024
1 parent 8c0e4b1 commit fd94b8e
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 9 deletions.
3 changes: 1 addition & 2 deletions scalajslib/src/mill/scalajslib/ScalaJSModule.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
9 changes: 2 additions & 7 deletions scalajslib/src/mill/scalajslib/api/ScalaJSApi.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand Down

0 comments on commit fd94b8e

Please sign in to comment.