Share model across fe and be and add websocket support

1 files changed, 17 insertions, 5 deletions

diff --git a/build.sc b/build.sc
index 10354e9..3799ef2 100644
--- a/build.sc
+++ b/build.sc
@@ -1,11 +1,23 @@
 import mill._, scalalib._, scalajslib._
 
-object server extends ScalaModule {
-  def scalaVersion = "2.13.1"
+trait Shared extends ScalaModule {
+  def sharedSources = T.sources(build.millSourcePath / "shared")
+
+  def sources = T.sources(
+    super.sources() ++ sharedSources()
+  )
 
   def ivyDeps = Agg(
+    ivy"com.lihaoyi::scalatags::0.7.0", // html rendering DSL http://www.lihaoyi.com/scalatags/
+    ivy"com.lihaoyi::upickle::0.8.0" // json serializatio, is also included by cask http://www.lihaoyi.com/upickle/
+  )
+}
+
+object server extends ScalaModule with Shared {
+  def scalaVersion = "2.13.1"
+
+  def ivyDeps = super.ivyDeps() ++ Agg(
     ivy"com.lihaoyi::cask:0.3.6", // web framework, http://www.lihaoyi.com/cask/
-    ivy"com.lihaoyi::scalatags:0.7.0", // html rendering DSL http://www.lihaoyi.com/scalatags/
     ivy"io.getquill::quill-jdbc:3.4.10", // language integrated queries https://getquill.io/#docs
     ivy"org.xerial:sqlite-jdbc:3.28.0" // actual database driver, note the single ':'
   )
@@ -18,11 +30,11 @@ object server extends ScalaModule {
 
 }
 
-object webapp extends ScalaJSModule {
+object webapp extends ScalaJSModule with Shared {
   def scalaVersion = "2.13.1"
   def scalaJSVersion = "0.6.31" // https://www.scala-js.org/
 
-  def ivyDeps = Agg(
+  def ivyDeps = super.ivyDeps() ++ Agg(
     ivy"org.scala-js::scalajs-dom::0.9.7" // http://scala-js.github.io/scala-js-dom/
   )