Refactored front-end and fixed uber jar creation

Author: espinhogr

README.md

@@ -10,13 +10,20 @@ Seed project for Play framework + ScalaJS using Apollo client and Sangria.
 - Node installed on the dev box
 - SBT installed on the dev box
 
+## Commands
+
+- run: runs the server and live reloads the changes
+- web_client/Compile/managedSources: generates schema.graphql and query/mutation objects for the client
+- assembly: generates the uber jar 
+
 ## Problems
 
 - WebpackDevServer is not used at the moment
 - Some scalajs is not picked up by Intellij as valid (i.e. the components defined with macros).
 - When a new dependency is added to the npmDependencies the bundle.js is not rebuilt.
-- When a graphql query is changed if the browser is refreshed the new query does not get picked up
 - The build is slow because some files are not cached
+- Add test framework
+- Refetching the queries instead of changing the apollo cache.
 
 ## Credits
 

project/Packaging.scala

@@ -1,17 +1,10 @@
 import com.typesafe.sbt.packager.Keys._
 import com.typesafe.sbt.packager.docker.DockerPlugin.autoImport.{Docker, dockerExposedPorts, dockerExposedVolumes}
-import com.typesafe.sbt.packager.jdkpackager.JDKPackagerPlugin.autoImport.{JDKPackager, jdkAppIcon, jdkPackagerBasename}
 import com.typesafe.sbt.packager.universal.UniversalPlugin.autoImport.{Universal, useNativeZip}
 import sbt.Keys._
 import sbt._
 
 object Packaging {
-  private[this] lazy val iconGlob = sys.props("os.name").toLowerCase match {
-    case os if os.contains("mac") => "*.icns"
-    case os if os.contains("win") => "*.ico"
-    case _ => "*.png"
-  }
-
   private[this] def isConf(x: (File, String)) = x._1.getAbsolutePath.contains("conf/")
 
   val settings = useNativeZip ++ Seq(
@@ -22,7 +15,7 @@ object Packaging {
     mappings in Universal := (mappings in Universal).value.filterNot(isConf),
 
     // Docker
-    dockerExposedPorts := Seq(9000),
+    dockerExposedPorts := Seq(Shared.projectPort),
     dockerLabels ++= Map("project" -> Shared.projectId),
     dockerUpdateLatest := true,
     defaultLinuxInstallLocation in Docker := s"/opt/${Shared.projectId}",
@@ -31,13 +24,6 @@ object Packaging {
     version in Docker := version.value,
     dockerUsername := Some(Shared.projectId),
 
-    // JDK Packager
-    jdkAppIcon := (sourceDirectory.value ** iconGlob).getPaths.headOption.map(file),
-    jdkPackagerBasename := Shared.projectName,
-    name in JDKPackager := Shared.projectName,
-
     javaOptions in Universal ++= Seq("-J-Xmx2g", "-J-Xms256m", s"-Dproject=${Shared.projectId}")
   )
-
-}
-
+}

project/ProjectVersionManager.scala

@@ -6,12 +6,12 @@ object ProjectVersionManager {
     val content =s"""
                     |package util
                     |
-      |object Version {
+                    |object Version {
                     |  val projectId = "$projectId"
                     |  val projectName = "$projectName"
                     |  val projectPort = $projectPort
                     |
-      |  val version = "${version.value}"
+                    |  val version = "${version.value}"
                     |}
                     |""".stripMargin.trim
 

project/Server.scala

@@ -48,16 +48,14 @@ object Server {
     // Sbt-Web
     JsEngineKeys.engineType := JsEngineKeys.EngineType.Node,
     pipelineStages in Assets := Seq(scalaJSPipeline),
-//    pipelineStages in Assets ++= Seq(digest),
-//    includeFilter in digest := "*.js",
-
 
     // Fat-Jar Assembly
     assemblyJarName in assembly := Shared.projectId + ".jar",
     assemblyMergeStrategy in assembly := {
       case "play/reference-overrides.conf" => MergeStrategy.concat
       case x => (assemblyMergeStrategy in assembly).value(x)
     },
+    mainClass in assembly := Some("Bootstrap"),
     fullClasspath in assembly += Attributed.blank(PlayKeys.playPackageAssets.value),
   )
 

project/Shared.scala

@@ -51,10 +51,12 @@ object Shared {
       case PathList("META-INF", "io.netty.versions.properties") => MergeStrategy.first
       case PathList("sqlj", _ @ _*) => MergeStrategy.first
       case PathList("play", "reference-overrides.conf") => MergeStrategy.first
+      case PathList("util", "Version$.class") => MergeStrategy.first
       case "module-info.class" => MergeStrategy.discard
       case "messages" => MergeStrategy.concat
       case "pom.xml" => MergeStrategy.discard
       case "JS_DEPENDENCIES" => MergeStrategy.discard
+      case "NPM_DEPENDENCIES" => MergeStrategy.discard
       case "pom.properties" => MergeStrategy.discard
       case "application.conf" => MergeStrategy.concat
       case x => (assemblyMergeStrategy in assembly).value(x)

project/WebClient.scala

@@ -34,6 +34,7 @@ object WebClient {
       "react-dom" -> reactVer,
       "react-proxy" -> "1.1.8",
       "apollo-boost" -> "0.1.16",
+      "apollo-cache-inmemory" -> "1.4.3",
       "react-apollo" -> "2.2.2",
       "graphql-tag" -> "2.10.0",
       "graphql" -> "14.0.2",
@@ -47,7 +48,7 @@ object WebClient {
       "copy-webpack-plugin" -> "4.5.4",
       "clean-webpack-plugin" -> "1.0.0",
       "webpack-merge" -> "4.1.4",
-      "apollo" -> "2.5.1" 
+      "apollo" -> "2.5.3"
     ),
 
     webpack / version := "4.21.0",
@@ -67,7 +68,7 @@ object WebClient {
 
   lazy val web_client = (project in file("web_client"))
     .settings(clientSettings: _*)
-    .settings(addCommandAlias("dev", ";fastOptJS::startWebpackDevServer;~fastOptJS"): _*)
+//    .settings(addCommandAlias("dev", ";fastOptJS::startWebpackDevServer;~fastOptJS"): _*)
     .enablePlugins(ScalaJSPlugin, ScalaJSWeb, ScalaJSBundlerPlugin)
     .dependsOn(Shared.sharedJs, Schema.schema)
 }

schema/src/main/scala/something/GraphQLSchema.scala

@@ -30,7 +30,7 @@ object GraphQLSchema {
 
   val Id = Argument("id", StringType)
 
-  val QueryType = ObjectType("Query", fields[RequestContext, Unit](
+  val QueryType = ObjectType("Query", fields[RequestContext, Any](
     Field("product", OptionType(ProductType),
       description = Some("Returns a product with specific `id`."),
       arguments = Id :: Nil,
@@ -44,8 +44,8 @@ object GraphQLSchema {
   val DescriptionArg = Argument("description", StringType)
 
   val MutationType = ObjectType("Mutation",
-    fields[RequestContext, Unit](
-      Field("addProduct", OptionType(IntType),
+    fields[RequestContext, Any](
+      Field("addProduct", ProductType,
         arguments = NameArg :: DescriptionArg :: Nil,
         resolve = req => req.ctx.productRepo.addProduct(req.arg(NameArg), req.arg(DescriptionArg))
       )

schema/src/main/scala/something/ProductRepoLike.scala

@@ -8,6 +8,6 @@ trait ProductRepoLike {
 
   def products: List[RetailProduct]
 
-  def addProduct(name: String, description: String): Int
+  def addProduct(name: String, description: String): RetailProduct
 
 }

server/app/controllers/HomeController.scala

@@ -1,15 +1,15 @@
 package controllers
 
 import javax.inject._
-import play.api._
+import play.Environment
 import play.api.mvc._
 
 /**
  * This controller creates an `Action` to handle HTTP requests to the
  * application's home page.
  */
 @Singleton
-class HomeController @Inject()(cc: ControllerComponents) extends AbstractController(cc) {
+class HomeController @Inject()(cc: ControllerComponents, env: Environment) extends AbstractController(cc) {
 
   /**
    * Create an Action to render an HTML page.
@@ -19,6 +19,6 @@ class HomeController @Inject()(cc: ControllerComponents) extends AbstractControl
    * a path of `/`.
    */
   def index() = Action { implicit request: Request[AnyContent] =>
-    Ok(views.html.index())
+    Ok(views.html.index(env.isDev))
   }
 }

server/app/repositories/ProductRepo.scala

@@ -13,10 +13,10 @@ class ProductRepo extends ProductRepoLike {
 
   def products: List[Product] = productList.toList
 
-  def addProduct(name: String, description: String): Int = {
+  def addProduct(name: String, description: String): Product = {
     val newId = productList.size + 1
     productList = productList :+ Product(newId.toString, name, description)
-    newId
+    Product(newId.toString, name, description)
   }
 }