Fix prePR and CI

Author: japgolly

.github/workflows/ci.yml

@@ -25,7 +25,7 @@ jobs:
         run: sbt -DCI=1 "++${{ matrix.scalaversion }}" test package doc
 
       - name: Validate formatting
-        run: sbt -DCI=1 "++${{ matrix.scalaversion }}" scalafmtCheck
+        run: sbt -DCI=1 "++${{ matrix.scalaversion }}" dom/scalafmtCheck
 
       - name: Validate api report
         if: matrix.scalaversion != '2.11.12' && matrix.scalaversion != '3.0.1'

prePR.sbt

@@ -4,20 +4,43 @@ addCommandAlias("prePR", "+prePR_nonCross")
 
 val prePR_nonCross = taskKey[Unit]("Performs all necessary work required before submitting a PR, for a single version of Scala.")
 
+// Unfortunately we can't just call `root/Test/compile` because it doesn't take aggregation into account :(
 ThisBuild / prePR_nonCross := Def.sequential(
-  root / clean,
+
+  Def.task {
+    (root           / clean).value
+    (scalafixRules  / clean).value
+    (dom            / clean).value
+    (testsShared    / clean).value
+    (testsWebworker / clean).value
+    (testsChrome    / clean).value
+    (testsFirefox   / clean).value
+    (testsNodeJsdom / clean).value
+    (example        / clean).value
+  },
+
   dom / Compile / scalafmt,
   Def.taskDyn {
     if (scalaVersion.value.startsWith("2."))
       (dom / Compile / scalafix).toTask("")
     else
       Def.task[Unit]((dom / Compile / compile).value)
   },
-  root / Test / compile,
+
+  Def.task {
+    (testsShared    / Test / compile).value
+    (testsWebworker / Test / compile).value
+    (testsChrome    / Test / compile).value
+    (testsFirefox   / Test / compile).value
+    (testsNodeJsdom / Test / compile).value
+    (example        / Test / compile).value
+  },
+
   Def.taskDyn {
     if (scalaVersion.value.startsWith("2.12."))
       Def.task[Unit]((readme / Compile / compile).value)
     else
       Def.task(())
   },
+
 ).value

tests-shared/src/main/scala/org/scalajs/dom/tests/shared/AsyncTesting.scala

@@ -9,24 +9,24 @@ object AsyncTesting {
 
   type AsyncResult = Future[Try[Unit]]
 
-  implicit final def global: ExecutionContext =
+  implicit def global: ExecutionContext =
     ExecutionContext.global
 
   def async(run: => Future[Any]): AsyncResult = {
-      val p = Promise[Try[Unit]]()
-      val timeout = setTimeout(1200) {
-        p.tryComplete(Failure(new RuntimeException("Test timed out.")))
-      }
-      setTimeout(1) {
-        p.completeWith(run.transform { ta =>
-          clearTimeout(timeout)
-          Success(ta.map(_ => ()))
-        })
-      }
-      p.future
+    val p = Promise[Try[Unit]]()
+    val timeout = setTimeout(1200) {
+      p.tryComplete(Failure(new RuntimeException("Test timed out.")))
+    }
+    setTimeout(1) {
+      p.completeWith(run.transform { ta =>
+        clearTimeout(timeout)
+        Success(ta.map(_ => ()))
+      })
+    }
+    p.future
   }
 
-  implicit class AsyncFutureOps[A](private val self: Future[A]) extends AnyVal {
+  implicit final class AsyncFutureOps[A](private val self: Future[A]) extends AnyVal {
     def tap(f: A => Any): Future[A] =
       self.map { a => f(a); a }
 

tests-webworker/src/main/scala/org/scalajs/dom/tests/webworker/WebWorkerTests.scala

@@ -29,7 +29,7 @@ import WebWorkerCmd._
 trait WebWorkerTests {
   import Client.{global => client}
 
-  final def webWorkerTest(test: (WebWorkerCmd, String)) = async {
+  final protected def webWorkerTest(test: (WebWorkerCmd, String)) = async {
     client.send(test._1).assertEquals(test._2)
   }