Improved jQuery demo build configuration: two modules with shared sources

Author: Mateusz Starzec

.travis.yml

@@ -4,7 +4,7 @@ dist: trusty
 jdk: oraclejdk8
 scala:
   - 2.11.12
-  - 2.12.6
+  - 2.12.7
 
 before_script:
   - "export DISPLAY=:99.0"
@@ -24,4 +24,4 @@ before_script:
 script:
   - sbt ++$TRAVIS_SCALA_VERSION test
   - sbt ++$TRAVIS_SCALA_VERSION publishLocal
-  - cd example && sbt ++$TRAVIS_SCALA_VERSION compile jquery-demo/fullOptJS jquery-bundler-demo/compileStatics
+  - cd example && sbt ++$TRAVIS_SCALA_VERSION compile jquery-global-demo/fullOptJS jquery-bundler-demo/compileStatics

example/README.md

@@ -4,10 +4,10 @@ The `build.sbt` file contains two configurations:
 
 ### How to use?
 
-Run `sbt fastOptJS` or `sbt fullOptJS` to compile this demo. You can find all generated files 
-in the `generated` directory. Open `index.html` in your browser. 
+Run `sbt jquery-global-demo/fastOptJS` or `sbt jquery-global-demo/fullOptJS` to compile this demo. You can find all generated files 
+in the `generated/global` directory. Open `index.html` in your browser. 
 
 ### How to use? (ScalaJSBundlerPlugin)
 
-Run `sbt compileStatics` to compile this demo. You can find all generated files 
-in the `generated` directory. Open `index.html` in your browser. 
+Run `sbt jquery-bundler-demo/compileStatics` to compile this demo. You can find all generated files 
+in the `generated/bundler` directory. Open `index.html` in your browser. 

example/build.sbt

@@ -27,19 +27,20 @@ inThisBuild(Seq(
   },
 ))
 
-val generatedDir = file("generated")
-val compileStatics = taskKey[Unit]("Compiles all static files.")
+val generatedGlobalDir = file("generated/global")
 val copyAssets = taskKey[Unit]("Copies all assets to the target directory.")
-val `jquery-demo` = project.in(file(".")).enablePlugins(ScalaJSPlugin)
+val `jquery-global-demo` = project.in(file("global-demo")).enablePlugins(ScalaJSPlugin)
   .settings(
     libraryDependencies ++= Dependencies.deps.value,
     jsDependencies ++= Dependencies.jsDeps.value,
 
+    sourceDirsSettings(_.getParentFile),
+
     /* move these files out of target/. */
-    Compile / fullOptJS / crossTarget := generatedDir,
-    Compile / fastOptJS / crossTarget := generatedDir,
-    Compile / packageJSDependencies / crossTarget := generatedDir,
-    Compile / packageMinifiedJSDependencies / crossTarget := generatedDir,
+    Compile / fullOptJS / crossTarget := generatedGlobalDir,
+    Compile / fastOptJS / crossTarget := generatedGlobalDir,
+    Compile / packageJSDependencies / crossTarget := generatedGlobalDir,
+    Compile / packageMinifiedJSDependencies / crossTarget := generatedGlobalDir,
 
     Compile / fastOptJS := (Compile / fastOptJS).dependsOn(copyAssets).value,
     Compile / fullOptJS := (Compile / fullOptJS).dependsOn(copyAssets).value,
@@ -48,8 +49,8 @@ val `jquery-demo` = project.in(file(".")).enablePlugins(ScalaJSPlugin)
 
     copyAssets := {
       IO.copyFile(
-        sourceDirectory.value / "main/assets/index-global.html",
-        generatedDir / "index.html"
+        sourceDirectory.value / "main/assets/index.html",
+        generatedGlobalDir / "index.html"
       )
     },
 
@@ -63,30 +64,55 @@ val `jquery-demo` = project.in(file(".")).enablePlugins(ScalaJSPlugin)
       (Compile / packageMinifiedJSDependencies / crossTarget).value / "scripts" / "frontend-deps.js"
   )
 
-val `jquery-bundler-demo` = project.in(file("."))
+val generatedBundlerDir = file("generated/bundler")
+val compileStatics = taskKey[Unit]("Compiles all static files.")
+val `jquery-bundler-demo` = project.in(file("bundler-demo"))
   .enablePlugins(ScalaJSBundlerPlugin)
   .settings(
     libraryDependencies ++= Dependencies.deps.value,
+    
+    sourceDirsSettings(_.getParentFile),
 
     Compile / scalaJSUseMainModuleInitializer := true,
 
     copyAssets := {
       IO.copyFile(
-        sourceDirectory.value / "main/assets/index-bundler.html",
-        generatedDir / "index.html"
+        sourceDirectory.value / "main/assets/index.html",
+        generatedBundlerDir / "index.html"
       )
     },
 
     compileStatics := {
       val sjsFileName = (Compile / fastOptJS).value.data.name.stripSuffix(".js")
       IO.copyFile(
         (Compile / npmUpdate / crossTarget).value / s"$sjsFileName-bundle.js",
-        generatedDir / "scripts/frontend.js"
+        generatedBundlerDir / "scripts/frontend.js"
       )
       IO.copyFile(
         (Compile / npmUpdate / crossTarget).value / s"$sjsFileName-bundle.js.map",
-        generatedDir / "scripts/frontend.js.map"
+        generatedBundlerDir / "scripts/frontend.js.map"
       )
     },
     compileStatics := compileStatics.dependsOn(Compile / fastOptJS / webpack, copyAssets).value,
-  )
+  )
+
+def mkSourceDirs(base: File, scalaBinary: String, conf: String): Seq[File] = Seq(
+  base / "src" / conf / "scala",
+  base / "src" / conf / s"scala-$scalaBinary",
+  base / "src" / conf / "java"
+)
+
+def mkResourceDirs(base: File, conf: String): Seq[File] = Seq(
+  base / "src" / conf / "resources"
+)
+
+def sourceDirsSettings(baseMapper: File => File) = Seq(
+  Compile / unmanagedSourceDirectories ++=
+    mkSourceDirs(baseMapper(baseDirectory.value), scalaBinaryVersion.value, "main"),
+  Compile / unmanagedResourceDirectories ++=
+    mkResourceDirs(baseMapper(baseDirectory.value), "main"),
+  Test / unmanagedSourceDirectories ++=
+    mkSourceDirs(baseMapper(baseDirectory.value), scalaBinaryVersion.value, "test"),
+  Test / unmanagedResourceDirectories ++=
+    mkResourceDirs(baseMapper(baseDirectory.value), "test"),
+)