Added scalatestModulesJS project that aggregates all js modules, and changed js modules to use GenScalaTestJS.genScalaPackages.

Author: cheeseng

build.sbt

@@ -70,4 +70,5 @@ lazy val scalatestWordSpecJS = ScalatestBuild.scalatestWordSpecJS
 lazy val scalatestDiagramsJS = ScalatestBuild.scalatestDiagramsJS
 lazy val scalatestMatchersCoreJS = ScalatestBuild.scalatestMatchersCoreJS
 lazy val scalatestShouldMatchersJS = ScalatestBuild.scalatestShouldMatchersJS
-lazy val scalatestMustMatchersJS = ScalatestBuild.scalatestMustMatchersJS
+lazy val scalatestMustMatchersJS = ScalatestBuild.scalatestMustMatchersJS
+lazy val scalatestModulesJS = ScalatestBuild.scalatestModulesJS

project/GenModulesJS.scala

@@ -84,25 +84,67 @@ object GenModulesJS {
   }
 
   def genScalaTestFeatureSpec(targetDir: File, version: String, scalaVersion: String): Seq[File] = 
-    copyDir("scalatest/src/main/scala/org/scalatest/featurespec", "org/scalatest/featurespec", targetDir, List.empty)
+    GenScalaTestJS.genScalaPackages.filter { case (packagePath, skipList) =>
+      List(
+        "org/scalatest/featurespec"
+      ).contains(packagePath)
+    }.flatMap { case (packagePath, skipList) =>
+      copyDir("scalatest/src/main/scala/" + packagePath, packagePath, targetDir, skipList)
+    }.toList
 
   def genScalaTestFlatSpec(targetDir: File, version: String, scalaVersion: String): Seq[File] = 
-    copyDir("scalatest/src/main/scala/org/scalatest/flatspec", "org/scalatest/flatspec", targetDir, List.empty)
+    GenScalaTestJS.genScalaPackages.filter { case (packagePath, skipList) =>
+      List(
+        "org/scalatest/flatspec"
+      ).contains(packagePath)
+    }.flatMap { case (packagePath, skipList) =>
+      copyDir("scalatest/src/main/scala/" + packagePath, packagePath, targetDir, skipList)
+    }.toList
 
   def genScalaTestFreeSpec(targetDir: File, version: String, scalaVersion: String): Seq[File] = 
-    copyDir("scalatest/src/main/scala/org/scalatest/freespec", "org/scalatest/freespec", targetDir, List.empty)
+    GenScalaTestJS.genScalaPackages.filter { case (packagePath, skipList) =>
+      List(
+        "org/scalatest/freespec"
+      ).contains(packagePath)
+    }.flatMap { case (packagePath, skipList) =>
+      copyDir("scalatest/src/main/scala/" + packagePath, packagePath, targetDir, skipList)
+    }.toList
 
   def genScalaTestFunSuite(targetDir: File, version: String, scalaVersion: String): Seq[File] = 
-    copyDir("scalatest/src/main/scala/org/scalatest/funsuite", "org/scalatest/funsuite", targetDir, List.empty)
+    GenScalaTestJS.genScalaPackages.filter { case (packagePath, skipList) =>
+      List(
+        "org/scalatest/funsuite"
+      ).contains(packagePath)
+    }.flatMap { case (packagePath, skipList) =>
+      copyDir("scalatest/src/main/scala/" + packagePath, packagePath, targetDir, skipList)
+    }.toList
 
   def genScalaTestPropSpec(targetDir: File, version: String, scalaVersion: String): Seq[File] = 
-    copyDir("scalatest/src/main/scala/org/scalatest/propspec", "org/scalatest/propspec", targetDir, List.empty)
+    GenScalaTestJS.genScalaPackages.filter { case (packagePath, skipList) =>
+      List(
+        "org/scalatest/propspec"
+      ).contains(packagePath)
+    }.flatMap { case (packagePath, skipList) =>
+      copyDir("scalatest/src/main/scala/" + packagePath, packagePath, targetDir, skipList)
+    }.toList
 
   def genScalaTestWordSpec(targetDir: File, version: String, scalaVersion: String): Seq[File] = 
-    copyDir("scalatest/src/main/scala/org/scalatest/wordspec", "org/scalatest/wordspec", targetDir, List.empty)
+    GenScalaTestJS.genScalaPackages.filter { case (packagePath, skipList) =>
+      List(
+        "org/scalatest/wordspec"
+      ).contains(packagePath)
+    }.flatMap { case (packagePath, skipList) =>
+      copyDir("scalatest/src/main/scala/" + packagePath, packagePath, targetDir, skipList)
+    }.toList
 
   def genScalaTestDiagrams(targetDir: File, version: String, scalaVersion: String): Seq[File] = 
-    copyDir("scalatest/src/main/scala/org/scalatest/diagrams", "org/scalatest/diagrams", targetDir, List.empty)
+    GenScalaTestJS.genScalaPackages.filter { case (packagePath, skipList) =>
+      List(
+        "org/scalatest/diagrams"
+      ).contains(packagePath)
+    }.flatMap { case (packagePath, skipList) =>
+      copyDir("scalatest/src/main/scala/" + packagePath, packagePath, targetDir, skipList)
+    }.toList 
 
   def genScalaTestMatchersCore(targetDir: File, version: String, scalaVersion: String): Seq[File] = 
     GenScalaTestJS.genScalaPackages.filter { case (packagePath, skipList) =>

project/JsBuild.scala

@@ -815,4 +815,25 @@ trait JsBuild { this: BuildCommons =>
       )
     ).dependsOn(scalacticMacroJS % "compile-internal, test-internal", scalatestMatchersCoreJS).enablePlugins(ScalaJSPlugin)              
 
+  lazy val scalatestModulesJS = (project in file("modules/js/modules-aggregation"))
+    .settings(sharedSettings: _*)
+    .settings(
+      publishArtifact := false,
+      publish := {},
+      publishLocal := {},
+      scalacOptions in (Compile, doc) := List.empty
+    ).aggregate(
+      scalatestCoreJS, 
+      scalatestFeatureSpecJS, 
+      scalatestFlatSpecJS, 
+      scalatestFreeSpecJS, 
+      scalatestFunSuiteJS, 
+      scalatestPropSpecJS, 
+      scalatestWordSpecJS, 
+      scalatestDiagramsJS, 
+      scalatestMatchersCoreJS, 
+      scalatestShouldMatchersJS, 
+      scalatestMustMatchersJS
+    )
+
 }