|
@@ -7,9 +7,9 @@ lazy val server: Project = (project in file("server"))
|
|
|
.settings(commonSettings)
|
|
.settings(commonSettings)
|
|
|
.settings(
|
|
.settings(
|
|
|
scalaJSProjects := Seq(client),
|
|
scalaJSProjects := Seq(client),
|
|
|
- pipelineStages in Assets := Seq(scalaJSPipeline),
|
|
|
|
|
- compile in Compile := ((compile in Compile) dependsOn scalaJSPipeline).value,
|
|
|
|
|
- javaOptions in Test += "-Dconfig.file=conf/testing.conf",
|
|
|
|
|
|
|
+ Assets / pipelineStages := Seq(scalaJSPipeline),
|
|
|
|
|
+ Compile / compile := ((Compile / compile) dependsOn scalaJSPipeline).value,
|
|
|
|
|
+ Test / javaOptions += "-Dconfig.file=conf/testing.conf",
|
|
|
libraryDependencies ++= Seq(
|
|
libraryDependencies ++= Seq(
|
|
|
evolutions,
|
|
evolutions,
|
|
|
guice,
|
|
guice,
|
|
@@ -33,7 +33,7 @@ lazy val client = (project in file("client"))
|
|
|
.settings(
|
|
.settings(
|
|
|
scalaJSUseMainModuleInitializer := true,
|
|
scalaJSUseMainModuleInitializer := true,
|
|
|
Compile / apiDefinitions += PlayEndpointFile(server),
|
|
Compile / apiDefinitions += PlayEndpointFile(server),
|
|
|
- libraryDependencies += "org.querki" %%% "jquery-facade" % "2.0"
|
|
|
|
|
|
|
+ libraryDependencies += "org.querki" %%% "jquery-facade" % "2.1"
|
|
|
)
|
|
)
|
|
|
.enablePlugins(ScalaJSPlugin, RestRPC, ScalaJSWeb)
|
|
.enablePlugins(ScalaJSPlugin, RestRPC, ScalaJSWeb)
|
|
|
.dependsOn(sharedJs)
|
|
.dependsOn(sharedJs)
|
|
@@ -50,6 +50,6 @@ lazy val sharedJvm = shared.jvm
|
|
|
lazy val sharedJs = shared.js
|
|
lazy val sharedJs = shared.js
|
|
|
|
|
|
|
|
// loads the server project at sbt startup
|
|
// loads the server project at sbt startup
|
|
|
-onLoad in Global := (onLoad in Global).value.andThen(
|
|
|
|
|
|
|
+Global / onLoad := (Global / onLoad).value.andThen(
|
|
|
state => "project server" :: state
|
|
state => "project server" :: state
|
|
|
)
|
|
)
|